Add patch to fix compilation with gcc-4.1 by tristanheaven AT gmail DOT com; bug #130819

Package-Manager: portage-2.1_pre10

4 files changed, 43 insertions, 16 deletions

diff --git a/app-admin/apachetop/ChangeLog b/app-admin/apachetop/ChangeLog
index 684735d2c7de..bb9608e40b60 100644
--- a/app-admin/apachetop/ChangeLog
+++ b/app-admin/apachetop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/apachetop
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/ChangeLog,v 1.35 2006/04/21 17:55:24 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/ChangeLog,v 1.36 2006/05/02 00:14:31 halcy0n Exp $
+
+  02 May 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/apachetop-0.12.6-gcc41.patch, apachetop-0.12.6.ebuild:
+  Add patch to fix compilation with gcc-4.1 by tristanheaven AT gmail DOT com;
+  bug #130819
 
 *apachetop-0.12.6 (21 Apr 2006)
 
diff --git a/app-admin/apachetop/Manifest b/app-admin/apachetop/Manifest
index 01a8e86af453..ea0449cdd129 100644
--- a/app-admin/apachetop/Manifest
+++ b/app-admin/apachetop/Manifest
@@ -5,20 +5,24 @@ AUX CAN-2005-2660.patch 577 RMD160 b1886b7cdd41a80d3dc8c547266904c8ddeebe2a SHA1
 MD5 ddba3662bcd820b6ba4b41b4e254724b files/CAN-2005-2660.patch 577
 RMD160 b1886b7cdd41a80d3dc8c547266904c8ddeebe2a files/CAN-2005-2660.patch 577
 SHA256 c8f5e126c32514dd05d5e20bb50eafd5814ac0b1dee75ad028b901bef1b688ce files/CAN-2005-2660.patch 577
+AUX apachetop-0.12.6-gcc41.patch 243 RMD160 866303a6de71002e4da924fb2089371b234b442c SHA1 410f8778c3412893a3f7e3653fdc18c01a3b0b8e SHA256 dcdb6b52b45079c06141bf6f28f5b925db78f5574e97a8bcdc41938643058669 size 243
+MD5 68662d14de4d21e051e2ff5f863cfea0 files/apachetop-0.12.6-gcc41.patch 243
+RMD160 866303a6de71002e4da924fb2089371b234b442c files/apachetop-0.12.6-gcc41.patch 243
+SHA256 dcdb6b52b45079c06141bf6f28f5b925db78f5574e97a8bcdc41938643058669 files/apachetop-0.12.6-gcc41.patch 243
 DIST apachetop-0.12.5.tar.gz 126967 size 126967
 DIST apachetop-0.12.6.tar.gz 126930 RMD160 bceb52e339100f244c0246423fb9b6972cde3d88 SHA256 850062414517055eab2440b788b503d45ebe9b290d4b2e027a5f887ad70f3f29 size 126930
 EBUILD apachetop-0.12.5-r1.ebuild 1103 RMD160 b59fd09b25fbbccbefe9efd1de9cdf91a67d3322 SHA1 ef8d37fa025459db2d4161a8e24b13eeca9a5954 SHA256 44b9dbf9f6b1dd26796aa554e62d73241363968595ffc04f160f53e1316cee22 size 1103
 MD5 7302352ee08f98fbfa56f71e03041c70 apachetop-0.12.5-r1.ebuild 1103
 RMD160 b59fd09b25fbbccbefe9efd1de9cdf91a67d3322 apachetop-0.12.5-r1.ebuild 1103
 SHA256 44b9dbf9f6b1dd26796aa554e62d73241363968595ffc04f160f53e1316cee22 apachetop-0.12.5-r1.ebuild 1103
-EBUILD apachetop-0.12.6.ebuild 1008 RMD160 6d0fe9b7f2f1b47faadc3e85cdce6599aa9fa1b9 SHA1 a8f36538dd409c59ad80db5ae321f0ec136bec54 SHA256 58236d48040464e97716ea247c50bd59d2edc99006a892ffe1fb0d0c0198c403 size 1008
-MD5 563bffe25557d8dc9b0032ead757dd7e apachetop-0.12.6.ebuild 1008
-RMD160 6d0fe9b7f2f1b47faadc3e85cdce6599aa9fa1b9 apachetop-0.12.6.ebuild 1008
-SHA256 58236d48040464e97716ea247c50bd59d2edc99006a892ffe1fb0d0c0198c403 apachetop-0.12.6.ebuild 1008
-MISC ChangeLog 4275 RMD160 6f86875feca00880215f43976948acedd0e71005 SHA1 abde541bbee365cbaaa84dae85dd9d29d95bd448 SHA256 437433451ff8043fa555a3eeb1c62b047ae38c45a88a2cb1ac279902683b7e83 size 4275
-MD5 80fa7cb5dd64e84f1886bcfd1ec0d041 ChangeLog 4275
-RMD160 6f86875feca00880215f43976948acedd0e71005 ChangeLog 4275
-SHA256 437433451ff8043fa555a3eeb1c62b047ae38c45a88a2cb1ac279902683b7e83 ChangeLog 4275
+EBUILD apachetop-0.12.6.ebuild 1093 RMD160 ff5fef45e6933041bf90d0a3add1e3f8733d5729 SHA1 5a9ded70f45cb4d6b757b2e885be4ab8c345c742 SHA256 0f9541f51dc62098130a1ff99a4dc90f37e918bf515d19cb29fd0f6b1c409aa7 size 1093
+MD5 dbf8ccc131b4fe2736545ce0f7263f38 apachetop-0.12.6.ebuild 1093
+RMD160 ff5fef45e6933041bf90d0a3add1e3f8733d5729 apachetop-0.12.6.ebuild 1093
+SHA256 0f9541f51dc62098130a1ff99a4dc90f37e918bf515d19cb29fd0f6b1c409aa7 apachetop-0.12.6.ebuild 1093
+MISC ChangeLog 4484 RMD160 889188ecfd65e20ffe890d18c978fc3372712f73 SHA1 bae76b06004a74ebe5e7e1efcf30b8d5dc41de31 SHA256 9ccc43fd396ad269811595a973762244f7b20cc47d67c4ba8d8dd08b380f35d7 size 4484
+MD5 24a7b127fe6f50810931a387443688f8 ChangeLog 4484
+RMD160 889188ecfd65e20ffe890d18c978fc3372712f73 ChangeLog 4484
+SHA256 9ccc43fd396ad269811595a973762244f7b20cc47d67c4ba8d8dd08b380f35d7 ChangeLog 4484
 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 size 161
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b metadata.xml 161
@@ -26,15 +30,13 @@ SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 metadata
 MD5 946d0848d81bf273d4d8a0cf79667a31 files/digest-apachetop-0.12.5-r1 68
 RMD160 c98b2bb7c1fe6a8d9cfa25a2aa9c222afcd01120 files/digest-apachetop-0.12.5-r1 68
 SHA256 2e4320189d450274a948ba60455b131c79297abb9aa3768b01ceea42b9b1f8cb files/digest-apachetop-0.12.5-r1 68
-size 68 files/digest-apachetop-0.12.5-r1 68
 MD5 52a3a588da14d575ce2b7ba2da060349 files/digest-apachetop-0.12.6 250
 RMD160 7582f20e648cb2441a6a51977d68018b2c853dd1 files/digest-apachetop-0.12.6 250
 SHA256 952b27140aa847964c3c72df266579f5f7b112f47823a47bd671e86d9b8f292d files/digest-apachetop-0.12.6 250
-size 250 files/digest-apachetop-0.12.6 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFESRyYEzitwsaoONoRAjZgAJ9vgW5tPrY4SfSfYS/w2VXbVI9K0wCfQFRA
-eRxGG7hhsoM14g80r7C74FU=
-=Gooj
+iD8DBQFEVqRuCRZPokWLroQRAvIJAKCrOupbqAEimcyLTFoK53nuJN8oSgCfUwlI
+LPiJJSfwG19o1/JoHE2phIk=
+=83xK
 -----END PGP SIGNATURE-----
diff --git a/app-admin/apachetop/apachetop-0.12.6.ebuild b/app-admin/apachetop/apachetop-0.12.6.ebuild
index e6432c23c1fd..eb0c23801a59 100644
--- a/app-admin/apachetop/apachetop-0.12.6.ebuild
+++ b/app-admin/apachetop/apachetop-0.12.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/apachetop-0.12.6.ebuild,v 1.1 2006/04/21 17:55:24 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/apachetop-0.12.6.ebuild,v 1.2 2006/05/02 00:14:30 halcy0n Exp $
 
 inherit eutils
 
@@ -20,6 +20,13 @@ DEPEND="sys-apps/sed
 	pcre? ( dev-libs/libpcre )
 	adns? ( net-libs/adns )"
 
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+}
+
 src_compile() {
 	useq apache2 && logfile="/var/log/apache2/access_log"
 	useq apache2 || logfile="/var/log/apache/access_log"
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch b/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch
new file mode 100644
index 000000000000..566c9226a3f7
--- /dev/null
+++ b/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch
@@ -0,0 +1,13 @@
+--- src/resolver.h
++++ src/resolver.h
+@@ -10,8 +10,8 @@
+ class Resolver
+ {
+ 	public:
+-	Resolver::Resolver(void);
+-	Resolver::~Resolver(void);
++	Resolver(void);
++	~Resolver(void);
+ 	int add_request(char *request, enum resolver_action act);
+ 
+