Fix compile problems with recent gccs. Bug # 51528. Thanks J.C. Wren.

5 files changed, 91 insertions, 2 deletions

diff --git a/dev-libs/judy/ChangeLog b/dev-libs/judy/ChangeLog
index a9876021497d..3be4cdabcd4d 100644
--- a/dev-libs/judy/ChangeLog
+++ b/dev-libs/judy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/judy
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/judy/ChangeLog,v 1.3 2004/06/24 23:13:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/judy/ChangeLog,v 1.4 2004/07/06 19:42:37 twp Exp $
+
+*judy-20020627-r1 (06 Jul 2004)
+
+  06 Jul 2004; <twp@gentoo.org> +files/jhton.patch, +judy-20020627-r1.ebuild:
+  Fix compile problems with recent gccs. Bug # 51528. Thanks J.C. Wren.
 
 *judy-20020627 (12 Nov 2002)
 
diff --git a/dev-libs/judy/Manifest b/dev-libs/judy/Manifest
index 7b7f18bac71c..3bd3a811b8f9 100644
--- a/dev-libs/judy/Manifest
+++ b/dev-libs/judy/Manifest
@@ -1,3 +1,6 @@
+MD5 98e7f93e3c9be96d622b78dba09a4a1c judy-20020627-r1.ebuild 1202
 MD5 d2d3c9ec75475a3c7d8fff575ea479e1 judy-20020627.ebuild 1158
-MD5 9ea4898127212d639b5719185af6dff3 ChangeLog 340
+MD5 3ab19227fc53b8192cd31915c94ed220 ChangeLog 519
+MD5 68ca609eb067b7a74dc94e5d98c8712a files/digest-judy-20020627-r1 73
 MD5 68ca609eb067b7a74dc94e5d98c8712a files/digest-judy-20020627 73
+MD5 9ac997341b96dcfd1b2cefd0970ebdc5 files/jhton.patch 1287
diff --git a/dev-libs/judy/files/digest-judy-20020627-r1 b/dev-libs/judy/files/digest-judy-20020627-r1
new file mode 100644
index 000000000000..a0bb94e9af67
--- /dev/null
+++ b/dev-libs/judy/files/digest-judy-20020627-r1
@@ -0,0 +1 @@
+MD5 7ca6ca87a8fca531a0a4b505f51296d4 Judy-initial_LGPL.src.tar.gz 296274
diff --git a/dev-libs/judy/files/jhton.patch b/dev-libs/judy/files/jhton.patch
new file mode 100644
index 000000000000..4a2f8248efb8
--- /dev/null
+++ b/dev-libs/judy/files/jhton.patch
@@ -0,0 +1,31 @@
+--- jhton.c	2004-06-16 10:19:41.127799366 -0400
++++ jhton.c.new	2004-06-16 10:17:03.620619690 -0400
+@@ -690,8 +690,8 @@
+ 	    PageName and PageSection), and the ]W value from the second
+ 	    TD, for an nroff file header like this:
+ 
+-	    .\" Auto-translated from <file> by <prog> at <date>
+-	    .\" <revision string above>
++	    .\" Auto-translated from <file> by <prog> at <date>"
++	    .\" <revision string above>"
+ 	    .TA x
+ 	    .TH Judy<suffix> 3X
+ 	    .ds )H Hewlett-Packard Company
+@@ -704,7 +704,7 @@
+     </DL>
+ 
+     Note:  Anchors within <B><PRE> are not font-marked because this
+-    messes up nroff, which doesn't nest fonts well.
++    messes up nroff, which doesn''t nest fonts well.
+ 
+     Note:  Font C (computer) is preferred to bold for other markings,
+     but it only seems to work for ".C", not ".ft C" nor "\fC", and ".C"
+@@ -728,7 +728,7 @@
+     <I>text</I>		\fItext\fP
+ 
+     Note:  Ideally most <PRE> text that is not bold should be in ".C"
+-    font, but this requires ensuring there is no " on the line, and
++    font, but this requires ensuring there is no "" on the line, and
+     would simply make the line bold anyway for nroff; it would only be a
+     real improvement for troff (which we do not expect will be used with
+     these manual entries).
diff --git a/dev-libs/judy/judy-20020627-r1.ebuild b/dev-libs/judy/judy-20020627-r1.ebuild
new file mode 100644
index 000000000000..c8b41abafe46
--- /dev/null
+++ b/dev-libs/judy/judy-20020627-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/judy/judy-20020627-r1.ebuild,v 1.1 2004/07/06 19:42:37 twp Exp $
+
+DESCRIPTION="A C library that implements a dynamic array"
+HOMEPAGE="http://judy.sourceforge.net/"
+MY_PN=${PN/judy/Judy}
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-initial_LGPL.src.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="x86"
+
+DEPEND=""
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-initial_LGPL"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/tool
+	epatch ${FILESDIR}/jhton.patch
+	cd ${S}
+
+	# Modify the Makefile so that it doesn't try
+	# install itself into /opt and create symlinks
+	# everywhere, nor try to bzip2 the man pages.
+	#
+	# This is likely to break in the next release,
+	# so be careful.
+
+	mv Makefile.multi Makefile.multi.orig || die
+	sed -e "s|/opt/Judy|${D}|" \
+		-e 's#| $(COMPRESSPATH)##' \
+		-e '2410s|$(DELDIR)|$(DELDIR)/*|' \
+		-e '2414s|&&.*||' \
+		-e '2409d' -e '2415,2419d' \
+		Makefile.multi.orig > Makefile.multi || die
+}
+
+src_compile() {
+	cd ${S}
+	./configure || die "./configure failed"
+	make MANFILE_SUFFIX='' || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+}