Add patch to fix compilation with gcc-4; bug #118858

(Portage version: 2.1_pre4)

5 files changed, 95 insertions, 30 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 827b774ed409..21010fe801ba 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/rpm
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.49 2005/08/25 21:26:16 ranger Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.50 2006/01/29 01:50:48 halcy0n Exp $
+
+  29 Jan 2006; Mark Loeser <halcy0n@gentoo.org> +files/rpm-4.2-gcc4.patch,
+  rpm-4.2-r1.ebuild:
+  Add patch to fix compilation with gcc-4; bug #118858
 
   25 Aug 2005; Brent Baude <ranger@gentoo.org> rpm-4.2-r1.ebuild,
   rpm-4.2.1.ebuild:
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index bd5652506c78..3ef0143d5150 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,25 +1,48 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c415d6c2592a9adf2359f3dc5edd47b2 ChangeLog 7083
+MD5 5b9fca5c5d9214648a901ce3808eba54 ChangeLog 7235
+RMD160 afb1a4689d0e3d1d37b428c9beff66e11ce4153d ChangeLog 7235
+SHA256 29b4db3f9f324943b38180e29d26b63574a9cf374d52e80200efb4ed434189c8 ChangeLog 7235
 MD5 e7ef0e369ef68d513461dd831eb1ef4f files/digest-rpm-4.0.4-r5 62
+RMD160 9155bdaf418b5c74459b33b788e57a805c200d8c files/digest-rpm-4.0.4-r5 62
+SHA256 2c44a58e25889c9fddc77684ca5219ca15f10f2599e1631cf9db49be87fc9c83 files/digest-rpm-4.0.4-r5 62
 MD5 25a887527d85208a2d3023df4e02a7a4 files/digest-rpm-4.2 60
-MD5 25a887527d85208a2d3023df4e02a7a4 files/digest-rpm-4.2-r1 60
+RMD160 3e4ad20757ae6168d429451721ae1908a3a4eddf files/digest-rpm-4.2 60
+SHA256 5ed7c77d231f33cabef813ce85953544ad46d4a9fc6881d7ed54c0441954da93 files/digest-rpm-4.2 60
+MD5 66362520b980d3ecf3dd71ef968898a5 files/digest-rpm-4.2-r1 226
+RMD160 46cf2ca3040c8847a3194d01b5187bc642f81fbd files/digest-rpm-4.2-r1 226
+SHA256 258cc5ba05ec9440240461feb79bbbbc749c385b57a5c4e02435e83815866fa8 files/digest-rpm-4.2-r1 226
 MD5 dd838f7f21d8a9eed6fdf9a18e7ba0e4 files/digest-rpm-4.2.1 62
+RMD160 b37adff31b3fc7ef5dd0c3bf251b160b27c5cedb files/digest-rpm-4.2.1 62
+SHA256 b0a694836d92a8424997d818940539d0de53ca12d57e3476b333d4f8b4297e16 files/digest-rpm-4.2.1 62
 MD5 806f307798e39d580d5286d99c44b965 files/rpm-4.0.4-glibc2.3.diff 495
+RMD160 0d75fdb3dd1729678d89be563ea0ab4641eac383 files/rpm-4.0.4-glibc2.3.diff 495
+SHA256 599c2ac6e8d800030659c2403e50bb7e58202daaea8431aa38ddc3bafaae35c4 files/rpm-4.0.4-glibc2.3.diff 495
 MD5 6b639232d435829fd97b09e10f58de81 files/rpm-4.0.4-system-popt.diff 18639
+RMD160 ae3c514c7bff9bf426846e6f7a611d63781a01a9 files/rpm-4.0.4-system-popt.diff 18639
+SHA256 8d69ce01c79777acf79746462cf9473bf1ade27958ef1397c66197126a172059 files/rpm-4.0.4-system-popt.diff 18639
+MD5 0a2690d9fc40cdf4e83f5e00de96a3e2 files/rpm-4.2-gcc4.patch 1288
+RMD160 400d98453b5dbb1903b077d6f073126bf5a846f7 files/rpm-4.2-gcc4.patch 1288
+SHA256 82e23c2b8fc3bb01cf7b690606c68f5188991956212063f733e60e67b10ad422 files/rpm-4.2-gcc4.patch 1288
 MD5 bf958533b48913899e576ad1808ac868 files/rpm-4.2-pic.patch 1094
+RMD160 ce821dd36bad79fe29bc874986c2bfeb4ef3d650 files/rpm-4.2-pic.patch 1094
+SHA256 33a1c232fe1973f0af908f9ae0d81c02c4740b4541831d70be6df93dbc75dc5c files/rpm-4.2-pic.patch 1094
 MD5 a440edb98e26eae7936e808d084e072b files/rpm-4.2-python2.3.diff 1559
+RMD160 0d5ea654f8ec2b36a33408d461f8c926b9613e2a files/rpm-4.2-python2.3.diff 1559
+SHA256 43212529067d20cbfef8956271da4f01587e6ba65626eb7a78ff918e3691f33a files/rpm-4.2-python2.3.diff 1559
 MD5 0c884c21c81e004d6bf86d526aeeb855 files/rpm-4.2.1-lib64.patch 2398
+RMD160 71a6cbdf706c7e270c6c38f5b2963027bfab2610 files/rpm-4.2.1-lib64.patch 2398
+SHA256 815ae928b049d68df3f9602eee7901875b147c5dd1d35ff5779bfe88a398b6a1 files/rpm-4.2.1-lib64.patch 2398
 MD5 ec4886ca775cb1cb83aebcd42f20f59f files/rpm-4.2.1-python2.3.diff 1479
+RMD160 d7434c1f127ac6795cf53b2cc0fd0a08161a66be files/rpm-4.2.1-python2.3.diff 1479
+SHA256 e7ddc3bc0a32c6c634f3a5960d25c7bd05180345313b9768b1b44a5fbcf1d6f6 files/rpm-4.2.1-python2.3.diff 1479
 MD5 9606504c35345b4a1cbb2f8bea3987a7 rpm-4.0.4-r5.ebuild 1628
-MD5 b202c86318d4e5e18a3fe25ce1a4f116 rpm-4.2-r1.ebuild 2833
+RMD160 5c760cb25812ef57515e3bc78fbd0cd7021494e8 rpm-4.0.4-r5.ebuild 1628
+SHA256 55484c90e1cebe26f472f2a7e58d790de3b124f2a181ad3e05b31ca2ac664e5f rpm-4.0.4-r5.ebuild 1628
+MD5 8e685e3677e5837a9a326a036539af6a rpm-4.2-r1.ebuild 2899
+RMD160 023e286bb0090f488c324f2613839646acbf82bb rpm-4.2-r1.ebuild 2899
+SHA256 1f2a5ec9500793229a3a70db2e6fdc953dff752d66a33f28eac8f2f0865609fe rpm-4.2-r1.ebuild 2899
 MD5 c715497cdaaf2fdf24278443eab6f779 rpm-4.2.1.ebuild 2498
+RMD160 290e977b53c98c7475aaaa39fff56ad4f85a346a rpm-4.2.1.ebuild 2498
+SHA256 2e1ea04f73d72bf18952ee948cf40b24661fdbdabe32c833388a7c5405491655 rpm-4.2.1.ebuild 2498
 MD5 115fabc8d8e86dbe9e140bf8e4abb3fd rpm-4.2.ebuild 2507
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDzs+22+ySkm8kpY0RAh9ZAJ495gPIiU0N0rFhErCDbmBa749aawCfYobj
-qEzNkTVs6wmn2tPEU3W/d20=
-=l+wG
------END PGP SIGNATURE-----
+RMD160 474fb07639edd83e0758be3839584d92755ee822 rpm-4.2.ebuild 2507
+SHA256 e4bdff223f0ac21c2ab3cf8fba55bd9f283893ab8f45f6b43497e5be4e48705a rpm-4.2.ebuild 2507
diff --git a/app-arch/rpm/files/digest-rpm-4.2-r1 b/app-arch/rpm/files/digest-rpm-4.2-r1
index 112ee0c363a5..2f801a10f074 100644
--- a/app-arch/rpm/files/digest-rpm-4.2-r1
+++ b/app-arch/rpm/files/digest-rpm-4.2-r1
@@ -1 +1,3 @@
 MD5 b7610e5704dfc3e06ff7e2e84e0eb57c rpm-4.2.tar.gz 9742106
+RMD160 f7d0e8257d4e92bca358a30fa92fe99a62a13bb3 rpm-4.2.tar.gz 9742106
+SHA256 426d07a0aa841c83c7ae12cf3b1076a9153489fe535beef54cb0b21a02ac7e34 rpm-4.2.tar.gz 9742106
diff --git a/app-arch/rpm/files/rpm-4.2-gcc4.patch b/app-arch/rpm/files/rpm-4.2-gcc4.patch
new file mode 100644
index 000000000000..e8b49994b2bc
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.2-gcc4.patch
@@ -0,0 +1,35 @@
+--- rpm-4.2-orig/python/header-py.c	2006-01-15 22:12:45.000000000 -0600
++++ rpm-4.2/python/header-py.c	2006-01-15 22:13:44.000000000 -0600
+@@ -434,7 +434,7 @@
+ 	while (extensions->name) {
+ 	    if (extensions->type == HEADER_EXT_TAG
+ 		&& !xstrcasecmp(extensions->name + 7, str)) {
+-		(const struct headerSprintfExtension *) ext = extensions;
++		ext = extensions;
+ 	    }
+ 	    extensions++;
+ 	}
+diff -Naur rpm-4.2-orig/python/rpmmodule.c rpm-4.2/python/rpmmodule.c
+--- rpm-4.2-orig/python/rpmmodule.c	2006-01-15 22:12:45.000000000 -0600
++++ rpm-4.2/python/rpmmodule.c	2006-01-15 22:15:03.000000000 -0600
+@@ -263,7 +263,7 @@
+ 
+     while (extensions->name) {
+ 	if (extensions->type == HEADER_EXT_TAG) {
+-            (const struct headerSprintfExtension *) ext = extensions;
++            ext = extensions;
+             PyDict_SetItemString(d, (char *) extensions->name, o=PyCObject_FromVoidPtr(ext, NULL));
+ 	    Py_DECREF(o);
+             PyDict_SetItem(dict, tag, o=PyString_FromString(ext->name + 7));
+--- rpm-4.2-orig/python/rpmts-py.c	2006-01-15 22:39:42.000000000 -0600
++++ rpm-4.2/python/rpmts-py.c	2006-01-15 22:46:02.000000000 -0600
+@@ -27,7 +27,7 @@
+ 
+ /*@unchecked@*/
+ /*@-shadow@*/
+-static int _rpmts_debug = 0;
++extern int _rpmts_debug;
+ /*@=shadow@*/
+ 
+ /*@access alKey @*/
+
diff --git a/app-arch/rpm/rpm-4.2-r1.ebuild b/app-arch/rpm/rpm-4.2-r1.ebuild
index 99a89d7ad805..0421ec470008 100644
--- a/app-arch/rpm/rpm-4.2-r1.ebuild
+++ b/app-arch/rpm/rpm-4.2-r1.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/app-arch/rpm/rpm-4.2-r1.ebuild,v 1.2 2005/08/25 21:26:16 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2-r1.ebuild,v 1.3 2006/01/29 01:50:48 halcy0n Exp $
 
 inherit python flag-o-matic libtool eutils
 
@@ -26,15 +26,16 @@ RDEPEND="=sys-libs/db-3.2*
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/rpm-4.2-python2.3.diff
-	epatch ${FILESDIR}/rpm-4.2-pic.patch
+	epatch "${FILESDIR}"/rpm-4.2-python2.3.diff
+	epatch "${FILESDIR}"/rpm-4.2-pic.patch
+	epatch "${FILESDIR}"/${P}-gcc4.patch
 
 	# Disable the configue scripts handling of multilib libdirs
 	# since econf already sets --libdir correctly
 	sed -i -e 's:MARK64=64:MARK64=:' \
-		${S}/{,file,popt,beecrypt}/configure  || die "sed failed"
+		"${S}"/{,file,popt,beecrypt}/configure  || die "sed failed"
 	sed -i -e 's:$(libdir)/rpm:$(prefix)/lib/rpm:' \
-		${S}/Makefile.in || die "sed failed"
+		"${S}"/Makefile.in || die "sed failed"
 }
 
 src_compile() {
@@ -55,20 +56,20 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-	mv ${D}/bin/rpm ${D}/usr/bin
-	rm -rf ${D}/bin
+	make DESTDIR="${D}" install || die
+	mv "${D}"/bin/rpm "${D}"/usr/bin
+	rm -rf "${D}"/bin
 	# Fix for bug #8578 (app-arch/rpm create dead symlink)
 	# Local RH 7.3 install has no such symlink anywhere
 	# ------
 	# UPDATE for 4.1!
 	# There is a /usr/lib/rpm/rpmpopt-4.1 now
 	# the symlink is still created incorrectly. ???
-	rm -f ${D}/usr/lib/rpmpopt
-	rm -f ${D}/usr/$(get_libdir)/libpopt*
-	rm -f ${D}/usr/include/popt.h
-	use nls && rm -f  ${D}/usr/share/locale/*/LC_MESSAGES/popt.mo
-	rm -f ${D}/usr/share/man/man3/popt*
+	rm -f "${D}"/usr/lib/rpmpopt
+	rm -f "${D}"/usr/$(get_libdir)/libpopt*
+	rm -f "${D}"/usr/include/popt.h
+	use nls && rm -f  "${D}"/usr/share/locale/*/LC_MESSAGES/popt.mo
+	rm -f "${D}"/usr/share/man/man3/popt*
 
 	keepdir /var/lib/rpm
 	keepdir /usr/src/pc/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
@@ -76,7 +77,7 @@ src_install() {
 	keepdir /usr/src/pc
 	dodoc CHANGES CREDITS GROUPS README* RPM* TODO
 
-	use nls || rm -rf ${D}/usr/share/man/{ko,ja,fr,pl,ru,sk}
+	use nls || rm -rf "${D}"/usr/share/man/{ko,ja,fr,pl,ru,sk}
 
 	# create /usr/src/redhat/ and co for rpmbuild
 	for d in /usr/src/redhat/{BUILD,RPMS,SOURCES,SPECS,SRPMS}; do