Fixed compilation with gcc4. Closes bug #126509.

Package-Manager: portage-2.1_pre6-r5

4 files changed, 62 insertions, 15 deletions

diff --git a/www-misc/htdig/ChangeLog b/www-misc/htdig/ChangeLog
index 07bb1d15dc3e..3f8ae272cb61 100644
--- a/www-misc/htdig/ChangeLog
+++ b/www-misc/htdig/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-misc/htdig
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/ChangeLog,v 1.14 2005/12/06 14:40:15 rl03 Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/ChangeLog,v 1.15 2006/03/22 19:45:58 eradicator Exp $
+
+  22 Mar 2006; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/htdig-3.2.0_beta6-gcc4.patch, htdig-3.2.0_beta6.ebuild:
+  Fixed compilation with gcc4.  Closes bug #126509.
 
   06 Dec 2005; Renat Lumpau <rl03@gentoo.org> -files/reconfig,
   htdig-3.2.0_beta6.ebuild:
diff --git a/www-misc/htdig/Manifest b/www-misc/htdig/Manifest
index b95c88a84bc9..47e9e1224674 100644
--- a/www-misc/htdig/Manifest
+++ b/www-misc/htdig/Manifest
@@ -1,19 +1,40 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fdee365334b22bf39c4917647b91dccd htdig-3.1.6-r7.ebuild 1927
-MD5 faa2257a518fbfa5674b35ee067348e9 htdig-3.2.0_beta6.ebuild 1473
-MD5 596ec3cf059d53bee3ed623cdec612f8 ChangeLog 5938
-MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
+MD5 c6a0c196ff6b0c50234b162cf6b663b5 ChangeLog 6119
+RMD160 4b7836c1ecdb37749badeffde1f8854f9810c362 ChangeLog 6119
+SHA256 ad2dc5c0d879540ee79ec36c10361f32a0d29979ecafb995189fba30895f3776 ChangeLog 6119
 MD5 8863dac1d260decb47f31d1a3fe422e2 files/CONFIG.in 2012
-MD5 8c097ca125d2c633f4a320d10a1cab61 files/htdig-3.2.0-fpic.patch 668
-MD5 d44854e0008c7b69a927940fe3f373d9 files/htdig-3.1.6-unescaped-output.diff 640
-MD5 6a2501fb2eb3dab0941d282339e42151 files/digest-htdig-3.2.0_beta6 66
+RMD160 00de2e0733ff9c292cea287a472d0de8ff25e4da files/CONFIG.in 2012
+SHA256 ae53df9c97edf9746b0282a6dfbf1ba16ee51d488a42ef0a90c15babb9f730ee files/CONFIG.in 2012
 MD5 10558a7c02e5ea20fdfe325e6186fc9d files/digest-htdig-3.1.6-r7 64
+RMD160 a21423a349d38f102dd200a2c3d8151acfd1a05c files/digest-htdig-3.1.6-r7 64
+SHA256 2270e204d04ec2fbf90f90a339db44791efc1f7c2b7d6967b90fbc7a7ee3c0e3 files/digest-htdig-3.1.6-r7 64
+MD5 6a2501fb2eb3dab0941d282339e42151 files/digest-htdig-3.2.0_beta6 66
+RMD160 5ab530b5f2620629bb2fda03b41cd0176187375c files/digest-htdig-3.2.0_beta6 66
+SHA256 211eb05b17725f0e4a1765fa8850c674a04aacacd6f713c991bbb083fb9ab5b6 files/digest-htdig-3.2.0_beta6 66
+MD5 d44854e0008c7b69a927940fe3f373d9 files/htdig-3.1.6-unescaped-output.diff 640
+RMD160 112bbd3c2dcf392888183974d7604f0de5e0033b files/htdig-3.1.6-unescaped-output.diff 640
+SHA256 75cc4caefd3302fa06a851a1378de11e7a9a0986611478fdf2bc8457827ec63f files/htdig-3.1.6-unescaped-output.diff 640
+MD5 8c097ca125d2c633f4a320d10a1cab61 files/htdig-3.2.0-fpic.patch 668
+RMD160 246108212b4181df52b113dc685e2185b11b06af files/htdig-3.2.0-fpic.patch 668
+SHA256 38c7138a4a4529c8e9c2295884e8a5e0b57350cc95fdf38a37d3d5892197d55d files/htdig-3.2.0-fpic.patch 668
+MD5 2aeda683f95b58efc0978d7fe951de59 files/htdig-3.2.0_beta6-gcc4.patch 541
+RMD160 3b684305cee717d6cf4a628fbea6af1b7891164b files/htdig-3.2.0_beta6-gcc4.patch 541
+SHA256 729ea1d0fd415b5b144b2b95bba0575c4eef942f77adfbf54bb69e7da7dd58c3 files/htdig-3.2.0_beta6-gcc4.patch 541
+MD5 fdee365334b22bf39c4917647b91dccd htdig-3.1.6-r7.ebuild 1927
+RMD160 1565e2f715779072133d539de3e8696cb8f333f1 htdig-3.1.6-r7.ebuild 1927
+SHA256 2f3cfa956b2c2740b705f2ac6f87b8469b1954e2d6cb61e4ff50a69afd398450 htdig-3.1.6-r7.ebuild 1927
+MD5 e96f6d184841df65d4e4f43c1f74c818 htdig-3.2.0_beta6.ebuild 1556
+RMD160 3305be4133574041afd77d3c5a66dc6b59fb9c8a htdig-3.2.0_beta6.ebuild 1556
+SHA256 a874792cadb93ccd7f2180f328822bbf57bfba76c0e03949e16bc5dde234d5c8 htdig-3.2.0_beta6.ebuild 1556
+MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
+RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b metadata.xml 161
+SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 metadata.xml 161
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFDlaMDEzitwsaoONoRAoRjAKCsWT+UHrnkT9gFgXQfPjv16oCUUACdGygk
-2eOXNhC5u91ABmMocemGOeE=
-=yiTM
+iD8DBQFEIamIOpjtAl+gMRURApDJAJ973OvITcziSsN60WUNPq6gezdBVACfXk5N
+qSKdxkm4czM+noAgcbi7QMA=
+=pAHz
 -----END PGP SIGNATURE-----
diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch
new file mode 100644
index 000000000000..58dec13957e2
--- /dev/null
+++ b/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch
@@ -0,0 +1,15 @@
+diff -Naurp htdig-3.2.0b6.orig/htsearch/Collection.h htdig-3.2.0b6/htsearch/Collection.h
+--- htdig-3.2.0b6.orig/htsearch/Collection.h	2004-05-28 06:15:24.000000000 -0700
++++ htdig-3.2.0b6/htsearch/Collection.h	2006-03-22 11:35:40.000000000 -0800
+@@ -36,9 +36,9 @@ public:
+                const char *docExcerpt);
+     ~Collection();
+ 
+-    void Collection::Open();
++    void Open();
+ 
+-    void Collection::Close(); 
++    void Close(); 
+ 
+     char *getWordFile() { return wordFile.get(); }
+     DocumentRef         *getDocumentRef(int id);
diff --git a/www-misc/htdig/htdig-3.2.0_beta6.ebuild b/www-misc/htdig/htdig-3.2.0_beta6.ebuild
index e531505d7d34..c34b34ec198a 100644
--- a/www-misc/htdig/htdig-3.2.0_beta6.ebuild
+++ b/www-misc/htdig/htdig-3.2.0_beta6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/htdig-3.2.0_beta6.ebuild,v 1.5 2005/12/06 14:40:15 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/htdig-3.2.0_beta6.ebuild,v 1.6 2006/03/22 19:45:58 eradicator Exp $
 
 inherit webapp eutils flag-o-matic
 
@@ -20,6 +20,13 @@ DEPEND="${RDEPEND}"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc4.patch
+}
+
 src_compile() {
 	./configure \
 		--prefix=/usr \