New version

Package-Manager: portage-2.1_rc4

5 files changed, 358 insertions, 21 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 7761f948d6cb..f477b49ca6b9 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/rpm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.53 2006/04/27 09:25:15 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.54 2006/06/03 23:19:22 lu_zero Exp $
+
+*rpm-4.4.1 (03 Jun 2006)
+
+  03 Jun 2006; Luca Barbato <lu_zero@gentoo.org>
+  +files/rpm-4.4.1-ubuntu-fixup.patch, +rpm-4.4.1.ebuild:
+  New version, hopefully builds
 
   27 Apr 2006; Alec Warner <antarus@gentoo.org> files/digest-rpm-4.0.4-r5,
   files/digest-rpm-4.2, files/digest-rpm-4.2.1, Manifest:
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index baa5590fe558..1eae9ce809c7 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,59 +1,68 @@
-AUX rpm-4.0.4-glibc2.3.diff 495 RMD160 0d75fdb3dd1729678d89be563ea0ab4641eac383 SHA1 107cf4a3dd3a5ef5a2703a7e58a2a4b1ae0f24a0 SHA256 599c2ac6e8d800030659c2403e50bb7e58202daaea8431aa38ddc3bafaae35c4 size 495
+AUX rpm-4.0.4-glibc2.3.diff 495 RMD160 0d75fdb3dd1729678d89be563ea0ab4641eac383 SHA1 107cf4a3dd3a5ef5a2703a7e58a2a4b1ae0f24a0 SHA256 599c2ac6e8d800030659c2403e50bb7e58202daaea8431aa38ddc3bafaae35c4
 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
-AUX rpm-4.0.4-system-popt.diff 18639 RMD160 ae3c514c7bff9bf426846e6f7a611d63781a01a9 SHA1 9dadf15ab1dad04d7d8693d8aa53fdb80cc6572a SHA256 8d69ce01c79777acf79746462cf9473bf1ade27958ef1397c66197126a172059 size 18639
+AUX rpm-4.0.4-system-popt.diff 18639 RMD160 ae3c514c7bff9bf426846e6f7a611d63781a01a9 SHA1 9dadf15ab1dad04d7d8693d8aa53fdb80cc6572a SHA256 8d69ce01c79777acf79746462cf9473bf1ade27958ef1397c66197126a172059
 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
-AUX rpm-4.2-gcc4.patch 1288 RMD160 400d98453b5dbb1903b077d6f073126bf5a846f7 SHA1 979784da0afae0cf649a0959b854c3cd92fabb36 SHA256 82e23c2b8fc3bb01cf7b690606c68f5188991956212063f733e60e67b10ad422 size 1288
+AUX rpm-4.2-gcc4.patch 1288 RMD160 400d98453b5dbb1903b077d6f073126bf5a846f7 SHA1 979784da0afae0cf649a0959b854c3cd92fabb36 SHA256 82e23c2b8fc3bb01cf7b690606c68f5188991956212063f733e60e67b10ad422
 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
-AUX rpm-4.2-pic.patch 1094 RMD160 ce821dd36bad79fe29bc874986c2bfeb4ef3d650 SHA1 1df78c852c6509a4a242f0168be41d8560a61cf3 SHA256 33a1c232fe1973f0af908f9ae0d81c02c4740b4541831d70be6df93dbc75dc5c size 1094
+AUX rpm-4.2-pic.patch 1094 RMD160 ce821dd36bad79fe29bc874986c2bfeb4ef3d650 SHA1 1df78c852c6509a4a242f0168be41d8560a61cf3 SHA256 33a1c232fe1973f0af908f9ae0d81c02c4740b4541831d70be6df93dbc75dc5c
 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
-AUX rpm-4.2-python2.3.diff 1559 RMD160 0d5ea654f8ec2b36a33408d461f8c926b9613e2a SHA1 00425e217aa47142a08ebd64a6b3bbc6671c74f8 SHA256 43212529067d20cbfef8956271da4f01587e6ba65626eb7a78ff918e3691f33a size 1559
+AUX rpm-4.2-python2.3.diff 1559 RMD160 0d5ea654f8ec2b36a33408d461f8c926b9613e2a SHA1 00425e217aa47142a08ebd64a6b3bbc6671c74f8 SHA256 43212529067d20cbfef8956271da4f01587e6ba65626eb7a78ff918e3691f33a
 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
-AUX rpm-4.2.1-lib64.patch 2398 RMD160 71a6cbdf706c7e270c6c38f5b2963027bfab2610 SHA1 c56416771f5e9e35f5a547f8292983f311bbdbd3 SHA256 815ae928b049d68df3f9602eee7901875b147c5dd1d35ff5779bfe88a398b6a1 size 2398
+AUX rpm-4.2.1-lib64.patch 2398 RMD160 71a6cbdf706c7e270c6c38f5b2963027bfab2610 SHA1 c56416771f5e9e35f5a547f8292983f311bbdbd3 SHA256 815ae928b049d68df3f9602eee7901875b147c5dd1d35ff5779bfe88a398b6a1
 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
-AUX rpm-4.2.1-python2.3.diff 1479 RMD160 d7434c1f127ac6795cf53b2cc0fd0a08161a66be SHA1 ea6d28321d62dce842e109cd018fc1dff0f0fd03 SHA256 e7ddc3bc0a32c6c634f3a5960d25c7bd05180345313b9768b1b44a5fbcf1d6f6 size 1479
+AUX rpm-4.2.1-python2.3.diff 1479 RMD160 d7434c1f127ac6795cf53b2cc0fd0a08161a66be SHA1 ea6d28321d62dce842e109cd018fc1dff0f0fd03 SHA256 e7ddc3bc0a32c6c634f3a5960d25c7bd05180345313b9768b1b44a5fbcf1d6f6
 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
-DIST rpm-4.0.4.tar.gz 5865692 RMD160 be09ac0449901f413fe78d93feb56feb7747aad2 SHA256 caf7ddc0b107d492d1af3d8706d263c825c09e5983f5b78342bb8f91c3f707ac size 5865692
-DIST rpm-4.2.1.tar.gz 8449073 RMD160 eefe0c53a7bbefaf5b8a164b9ca1fd75a4745f83 SHA256 e22a796ddf18630d608108a4acd36e7b9cdd6a7b7a6a16ae7b84f2517c2b820f size 8449073
-DIST rpm-4.2.tar.gz 9742106 RMD160 f7d0e8257d4e92bca358a30fa92fe99a62a13bb3 SHA256 426d07a0aa841c83c7ae12cf3b1076a9153489fe535beef54cb0b21a02ac7e34 size 9742106
-EBUILD rpm-4.0.4-r5.ebuild 1628 RMD160 5c760cb25812ef57515e3bc78fbd0cd7021494e8 SHA1 c62753257e72677b0b3039f0d547490e831af2c7 SHA256 55484c90e1cebe26f472f2a7e58d790de3b124f2a181ad3e05b31ca2ac664e5f size 1628
+AUX rpm-4.4.1-ubuntu-fixup.patch 6933 RMD160 aec2ca427389d83af1318a7ac2ef6215d75ecac2 SHA1 66ae8cf96e2fbc951f99b4c89ff0c0828b8364b4 SHA256 af50f7b052e4ffa55132aa44db6e52c227e93d5145662259d73b944293072800
+MD5 f7dd268f3740a449f961309918bd9bcd files/rpm-4.4.1-ubuntu-fixup.patch 6933
+RMD160 aec2ca427389d83af1318a7ac2ef6215d75ecac2 files/rpm-4.4.1-ubuntu-fixup.patch 6933
+SHA256 af50f7b052e4ffa55132aa44db6e52c227e93d5145662259d73b944293072800 files/rpm-4.4.1-ubuntu-fixup.patch 6933
+DIST rpm-4.0.4.tar.gz 5865692 RMD160 be09ac0449901f413fe78d93feb56feb7747aad2 SHA256 caf7ddc0b107d492d1af3d8706d263c825c09e5983f5b78342bb8f91c3f707ac
+DIST rpm-4.2.1.tar.gz 8449073 RMD160 eefe0c53a7bbefaf5b8a164b9ca1fd75a4745f83 SHA1 acea7afb435c88fa2949edd5f933a417ed37dce6 SHA256 e22a796ddf18630d608108a4acd36e7b9cdd6a7b7a6a16ae7b84f2517c2b820f
+DIST rpm-4.2.tar.gz 9742106 RMD160 f7d0e8257d4e92bca358a30fa92fe99a62a13bb3 SHA1 d72d62a8cb4376085570be290c1a6fd2c1c1db26 SHA256 426d07a0aa841c83c7ae12cf3b1076a9153489fe535beef54cb0b21a02ac7e34
+DIST rpm-4.4.1.tar.gz 11497447 RMD160 b2b34d678c4707c1c1bf8e05e7b92a8956bb4226 SHA1 12b754c71e5257fa399b24a7b748f22dad6243b7 SHA256 4a5e2a5a64a47344b6447b54e046b8550ea7ee99344eee3e8d4c087cb148552b
+EBUILD rpm-4.0.4-r5.ebuild 1628 RMD160 5c760cb25812ef57515e3bc78fbd0cd7021494e8 SHA1 c62753257e72677b0b3039f0d547490e831af2c7 SHA256 55484c90e1cebe26f472f2a7e58d790de3b124f2a181ad3e05b31ca2ac664e5f
 MD5 9606504c35345b4a1cbb2f8bea3987a7 rpm-4.0.4-r5.ebuild 1628
 RMD160 5c760cb25812ef57515e3bc78fbd0cd7021494e8 rpm-4.0.4-r5.ebuild 1628
 SHA256 55484c90e1cebe26f472f2a7e58d790de3b124f2a181ad3e05b31ca2ac664e5f rpm-4.0.4-r5.ebuild 1628
-EBUILD rpm-4.2-r1.ebuild 2949 RMD160 1213d307c59eca29e6aff6d3dabb69c0da65d700 SHA1 58084047e9c60d1b61a8fa898d91c240daf4d1d3 SHA256 612bbf4471625058eb19128134847ad86636a6103b3f114cd2e370c9298e71eb size 2949
+EBUILD rpm-4.2-r1.ebuild 2949 RMD160 1213d307c59eca29e6aff6d3dabb69c0da65d700 SHA1 58084047e9c60d1b61a8fa898d91c240daf4d1d3 SHA256 612bbf4471625058eb19128134847ad86636a6103b3f114cd2e370c9298e71eb
 MD5 b81122309ad10fa93d573a1f5cfc4c2c rpm-4.2-r1.ebuild 2949
 RMD160 1213d307c59eca29e6aff6d3dabb69c0da65d700 rpm-4.2-r1.ebuild 2949
 SHA256 612bbf4471625058eb19128134847ad86636a6103b3f114cd2e370c9298e71eb rpm-4.2-r1.ebuild 2949
-EBUILD rpm-4.2-r2.ebuild 2929 RMD160 5409a87931ce6dd238471c983c98d228818ad7fa SHA1 ed5382b17c835b77d0a86687202536a4b80e6cd6 SHA256 c91d9c9406ac1c8e0882ea010ac3ed3dbcea38c0f1124d344cbb42d791005117 size 2929
+EBUILD rpm-4.2-r2.ebuild 2929 RMD160 5409a87931ce6dd238471c983c98d228818ad7fa SHA1 ed5382b17c835b77d0a86687202536a4b80e6cd6 SHA256 c91d9c9406ac1c8e0882ea010ac3ed3dbcea38c0f1124d344cbb42d791005117
 MD5 5243bccdba05ca4d6dcbd365b0629863 rpm-4.2-r2.ebuild 2929
 RMD160 5409a87931ce6dd238471c983c98d228818ad7fa rpm-4.2-r2.ebuild 2929
 SHA256 c91d9c9406ac1c8e0882ea010ac3ed3dbcea38c0f1124d344cbb42d791005117 rpm-4.2-r2.ebuild 2929
-EBUILD rpm-4.2.1.ebuild 2548 RMD160 466af33f76cceff48bb2696c5bd697049a443f3b SHA1 73a9723b4cda9f82cb80919281fe197cb6f1e6d1 SHA256 cf2e9497ce51bf0ae60cd8b74f7734197eaf83522207aa1ac3f4a3bf9a890d0e size 2548
+EBUILD rpm-4.2.1.ebuild 2548 RMD160 466af33f76cceff48bb2696c5bd697049a443f3b SHA1 73a9723b4cda9f82cb80919281fe197cb6f1e6d1 SHA256 cf2e9497ce51bf0ae60cd8b74f7734197eaf83522207aa1ac3f4a3bf9a890d0e
 MD5 f84c35917bf9c3af54586b7f4a9b4706 rpm-4.2.1.ebuild 2548
 RMD160 466af33f76cceff48bb2696c5bd697049a443f3b rpm-4.2.1.ebuild 2548
 SHA256 cf2e9497ce51bf0ae60cd8b74f7734197eaf83522207aa1ac3f4a3bf9a890d0e rpm-4.2.1.ebuild 2548
-EBUILD rpm-4.2.ebuild 2553 RMD160 4ffe8e36c34f85afc03c74a9c32bec84901ebbcb SHA1 1289639836f742df9e8ec66940c7befa03762ff4 SHA256 13b9700ce9420e125eaed4b8f6729fe9063b8df926e1c01fdffede3f6d01c82d size 2553
+EBUILD rpm-4.2.ebuild 2553 RMD160 4ffe8e36c34f85afc03c74a9c32bec84901ebbcb SHA1 1289639836f742df9e8ec66940c7befa03762ff4 SHA256 13b9700ce9420e125eaed4b8f6729fe9063b8df926e1c01fdffede3f6d01c82d
 MD5 a8f99d032181d0baadf875871dc42f73 rpm-4.2.ebuild 2553
 RMD160 4ffe8e36c34f85afc03c74a9c32bec84901ebbcb rpm-4.2.ebuild 2553
 SHA256 13b9700ce9420e125eaed4b8f6729fe9063b8df926e1c01fdffede3f6d01c82d rpm-4.2.ebuild 2553
-MISC ChangeLog 7785 RMD160 377eb1918e839d1729d8cbf4f985fe0d8c1303ac SHA1 7ed5328c3eaab81a21a591a72664ffdff5f7fd03 SHA256 c9e6adff1e881cbaf3834aa21070bd14741116f545ee39cb8d7647cc72a85e22 size 7785
-MD5 04cd760353a73b7a693a60972357f47e ChangeLog 7785
-RMD160 377eb1918e839d1729d8cbf4f985fe0d8c1303ac ChangeLog 7785
-SHA256 c9e6adff1e881cbaf3834aa21070bd14741116f545ee39cb8d7647cc72a85e22 ChangeLog 7785
-MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a size 231
+EBUILD rpm-4.4.1.ebuild 2642 RMD160 8099f3ef103b4d331562dca00acdeeeb841c6cc6 SHA1 06594b34d50aa86aed7f42466b0dc73d8200e7b0 SHA256 acef5da64da227223b8b04fa81f9158dac04be759bc23ab7048ca12d30712505
+MD5 863d2e6bd7eaaf7d740b0327d1a7d28f rpm-4.4.1.ebuild 2642
+RMD160 8099f3ef103b4d331562dca00acdeeeb841c6cc6 rpm-4.4.1.ebuild 2642
+SHA256 acef5da64da227223b8b04fa81f9158dac04be759bc23ab7048ca12d30712505 rpm-4.4.1.ebuild 2642
+MISC ChangeLog 7951 RMD160 703f85ff4014ecb32765b518da9ebb0dbf969581 SHA1 830fb40fbce925d51d838b3328cc79f576f7b8af SHA256 8fbf32a591a3267923f845a3b8f0877985b98660cf2af394a70155bc11bc0b91
+MD5 aa5ce82e89b19c8754f8584f27d0bdb7 ChangeLog 7951
+RMD160 703f85ff4014ecb32765b518da9ebb0dbf969581 ChangeLog 7951
+SHA256 8fbf32a591a3267923f845a3b8f0877985b98660cf2af394a70155bc11bc0b91 ChangeLog 7951
+MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
 MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
 SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a metadata.xml 231
@@ -72,3 +81,6 @@ SHA256 258cc5ba05ec9440240461feb79bbbbc749c385b57a5c4e02435e83815866fa8 files/di
 MD5 f0d54c47c617a212a9809680ed856525 files/digest-rpm-4.2.1 232
 RMD160 78000c58d4fc1d9dd043db8179ea6d215945dd30 files/digest-rpm-4.2.1 232
 SHA256 7623c9587374f8164538ee6937ada48be87d8ca0f92ccb2d8a9be63be4003866 files/digest-rpm-4.2.1 232
+MD5 9d38caac944f806b2be6ac458bffbeab files/digest-rpm-4.4.1 235
+RMD160 fd104cc3482b3eab61ca448324b2312d1f04f9c7 files/digest-rpm-4.4.1 235
+SHA256 db4eebd4f82cd87ab079bb9f098dca159877165316dbdcb54d2a9ae50667aacb files/digest-rpm-4.4.1 235
diff --git a/app-arch/rpm/files/digest-rpm-4.4.1 b/app-arch/rpm/files/digest-rpm-4.4.1
new file mode 100644
index 000000000000..2013664b71ca
--- /dev/null
+++ b/app-arch/rpm/files/digest-rpm-4.4.1
@@ -0,0 +1,3 @@
+MD5 90ded9047b1b69d918c6c7c7b56fd7a9 rpm-4.4.1.tar.gz 11497447
+RMD160 b2b34d678c4707c1c1bf8e05e7b92a8956bb4226 rpm-4.4.1.tar.gz 11497447
+SHA256 4a5e2a5a64a47344b6447b54e046b8550ea7ee99344eee3e8d4c087cb148552b rpm-4.4.1.tar.gz 11497447
diff --git a/app-arch/rpm/files/rpm-4.4.1-ubuntu-fixup.patch b/app-arch/rpm/files/rpm-4.4.1-ubuntu-fixup.patch
new file mode 100644
index 000000000000..339f0b435024
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.4.1-ubuntu-fixup.patch
@@ -0,0 +1,215 @@
+--- rpm-4.4.1.orig/configure.ac
++++ rpm-4.4.1/configure.ac
+@@ -1180,9 +1180,9 @@
+ 
+ dnl XXX Choose /usr/lib or /usr/lib64 for library installs.
+ MARK64=
+-case "${target_cpu}" in
+-x86_64*|ppc64*|powerpc64*|sparc64*|s390x*)	MARK64=64 ;;
+-esac
++dnl case "${target_cpu}" in
++dnl x86_64*|ppc64*|powerpc64*|sparc64*|s390x*)	MARK64=64 ;;
++dnl esac
+ AC_SUBST(MARK64)
+ 
+ dnl Determine the canonical arch-vendor-os for the build machine
+--- rpm-4.4.1.orig/po/de.po
++++ rpm-4.4.1/po/de.po
+@@ -190,7 +190,7 @@
+ #: rpmqv.c:370
+ msgid "one type of query/verify may be performed at a time"
+ msgstr ""
+-"Nur nur eine Art der Anfrage/Überprüfung kann pro Programmlauf durchgeführt "
++"Nur eine Art der Anfrage/Überprüfung kann pro Programmlauf durchgeführt "
+ "werden"
+ 
+ #: rpmqv.c:374
+@@ -4612,7 +4612,7 @@
+ 
+ # oder besser: "... verletzen" ?
+ #~ msgid "removing these packages would break dependencies:\n"
+-#~ msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n"
++#~ msgstr "Das Entfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n"
+ 
+ #, fuzzy
+ #~ msgid "package %s has unsatisfied Requires: %s\n"
+@@ -5520,7 +5520,7 @@
+ 
+ #, fuzzy
+ #~ msgid "rename of %s to %s failed: %s\n"
+-#~ msgstr "umbennen von %s nach %s fehlgeschlagen: %s"
++#~ msgstr "umbenennen von %s nach %s fehlgeschlagen: %s"
+ 
+ #, fuzzy
+ #~ msgid "removal of %s failed: %s\n"
+--- rpm-4.4.1.orig/lib/depends.c
++++ rpm-4.4.1/lib/depends.c
+@@ -1294,14 +1294,12 @@
+ 	    switch (rpmteType(p)) {
+ 	    case TR_REMOVED:
+ 		/* Skip if not %preun/%postun requires or legacy prereq. */
+-		if (isInstallPreReq(Flags)
+-		 || !( isErasePreReq(Flags) || isLegacyPreReq(Flags) ) )
++		if (!( isErasePreReq(Flags) || isLegacyPreReq(Flags) ) )
+ 		    /*@innercontinue@*/ continue;
+ 		/*@switchbreak@*/ break;
+ 	    case TR_ADDED:
+ 		/* Skip if not %pre/%post requires or legacy prereq. */
+-		if (isErasePreReq(Flags)
+-		 || !( isInstallPreReq(Flags) || isLegacyPreReq(Flags) ) )
++		if (!( isInstallPreReq(Flags) || isLegacyPreReq(Flags) ) )
+ 		    /*@innercontinue@*/ continue;
+ 		/*@switchbreak@*/ break;
+ 	    }
+--- rpm-4.4.1.orig/python/header-py.c
++++ rpm-4.4.1/python/header-py.c
+@@ -477,7 +477,7 @@
+ 	while (extensions->name) {
+ 	    if (extensions->type == HEADER_EXT_TAG
+ 		&& !xstrcasecmp(extensions->name + 7, str)) {
+-		(const struct headerSprintfExtension *) ext = extensions;
++		ext = extensions;
+ 	    }
+ 	    extensions++;
+ 	}
+--- rpm-4.4.1.orig/lsb-rpm.1
++++ rpm-4.4.1/lsb-rpm.1
+@@ -0,0 +1,16 @@
++.TH LSB-RPM 1
++.SH NAME
++lsb-rpm \- build a LSB package 
++.SH SYNOPSIS
++.B lsb-rpm -b package.spec
++.SH "DESCRIPTION"
++This is a special version of rpm that can only be used to build RPM v3
++format packages, for use as LSB packages. It cannot query or install
++packages, just build them. See the BUILD OPTIONS section of
++.BR rpm (8)
++for the details.
++.SH "SEE ALSO"
++.BR rpm (8)
++.SH AUTHOR
++This manual page was written by Joey Hess,
++for the Debian GNU/Linux system.
+--- rpm-4.4.1.orig/macros.in
++++ rpm-4.4.1/macros.in
+@@ -218,7 +218,7 @@
+ %_tmppath		%{_var}/tmp
+ 
+ #	Path to top of build area.
+-%_topdir		%{_usrsrc}/redhat
++%_topdir		%{_usrsrc}/rpm
+ 
+ #	The path to the unzip executable (legacy, use %{__unzip} instead).
+ %_unzipbin		%{__unzip}
+@@ -658,8 +658,8 @@
+ 
+ # Horowitz Key Protocol server configuration
+ #
+-%_hkp_keyserver         hkp://pgp.mit.edu
+-%_hkp_keyserver_query   %{_hkp_keyserver}/pks/lookup?op=get&search=0x
++#%_hkp_keyserver         hkp://pgp.mit.edu
++#%_hkp_keyserver_query   %{_hkp_keyserver}/pks/lookup?op=get&search=0x
+ 
+ #==============================================================================
+ # ---- Transaction macros.
+@@ -1058,15 +1058,15 @@
+ %_sbindir		%{_exec_prefix}/sbin
+ %_libexecdir		%{_exec_prefix}/libexec
+ %_datadir		%{_prefix}/share
+-%_sysconfdir		%{_prefix}/etc
++%_sysconfdir		/etc
+ %_sharedstatedir	%{_prefix}/com
+-%_localstatedir		%{_prefix}/var
++%_localstatedir		/var
+ %_lib			lib
+ %_libdir		%{_exec_prefix}/%{_lib}
+ %_includedir		%{_prefix}/include
+ %_oldincludedir		/usr/include
+-%_infodir		%{_prefix}/info
+-%_mandir		%{_prefix}/man
++%_infodir		/usr/share/info
++%_mandir		/usr/share/man
+ 
+ #==============================================================================
+ # ---- config.guess platform macros.
+--- rpm-4.4.1.orig/platform.in
++++ rpm-4.4.1/platform.in
+@@ -28,7 +28,7 @@
+ %_oldincludedir		@oldincludedir@
+ %_infodir		@infodir@
+ %_mandir		@mandir@
+-%_initrddir		%{_sysconfdir}/rc.d/init.d
++%_initrddir		%{_sysconfdir}/init.d
+ 
+ %_defaultdocdir		@DEFAULTDOCDIR@
+ 
+--- rpm-4.4.1.orig/lib/poptI.c
++++ rpm-4.4.1/lib/poptI.c
+@@ -16,8 +16,7 @@
+ /*@unchecked@*/
+ struct rpmInstallArguments_s rpmIArgs = {
+     0,			/* transFlags */
+-			/* probFilter */
+-    (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
++    0,			/* probFilter */
+     0,			/* installInterfaceFlags */
+     0,			/* eraseInterfaceFlags */
+     0,			/* qva_flags */
+--- rpm-4.4.1.orig/lib/rpmal.c
++++ rpm-4.4.1/lib/rpmal.c
+@@ -744,7 +744,7 @@
+ 
+     /*@-branchstate@*/ /* FIX: ret is a problem */
+     for (found = 0, ret = NULL;
+-	 die <= al->dirs + al->numDirs && dieCompare(die, dieNeedle) == 0;
++	 die < al->dirs + al->numDirs && dieCompare(die, dieNeedle) == 0;
+ 	 die++)
+     {
+ 
+--- rpm-4.4.1.orig/rpmio/rpmio.h
++++ rpm-4.4.1/rpmio/rpmio.h
+@@ -637,7 +637,7 @@
+ /*@unused@*/ int timedRead(FD_t fd, /*@out@*/ void * bufptr, int length)
+ 	/*@globals fileSystem @*/
+ 	/*@modifies fd, *bufptr, fileSystem @*/;
+-#define	timedRead	ufdio->read
++#define	timedRead	(ufdio->read)
+ 
+ /*@-exportlocal@*/
+ /**
+--- rpm-4.4.1.orig/lib/rpmlib.h
++++ rpm-4.4.1/lib/rpmlib.h
+@@ -501,8 +501,7 @@
+     RPMSENSE_EQUAL	= (1 << 3),
+     RPMSENSE_PROVIDES	= (1 << 4), /* only used internally by builds */
+     RPMSENSE_CONFLICTS	= (1 << 5), /* only used internally by builds */
+-	/* bit 6 used to be RPMSENSE_PREREQ */
+-#define	RPMSENSE_PREREQ	RPMSENSE_ANY
++    RPMSENSE_PREREQ     = (1 << 6),     /*!< @todo Legacy. */
+     RPMSENSE_OBSOLETES	= (1 << 7), /* only used internally by builds */
+     RPMSENSE_INTERP	= (1 << 8),	/*!< Interpreter used by scriptlet. */
+     RPMSENSE_SCRIPT_PRE	= ((1 << 9)|RPMSENSE_PREREQ), /*!< %pre dependency. */
+--- rpm-4.4.1.orig/python/rpmmodule.c
++++ rpm-4.4.1/python/rpmmodule.c
+@@ -293,7 +293,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.4.1.orig/lib/transaction.c
++++ rpm-4.4.1/lib/transaction.c
+@@ -2285,7 +2285,7 @@
+ 	p->fi = rpmfiFree(p->fi);
+ 
+ 	/* If no post-transaction script, then don't bother. */
+-	if (haspostscript)
++	if (!haspostscript)
+ 	    continue;
+ 
+ 	p->fd = ts->notify(p->h, RPMCALLBACK_INST_OPEN_FILE, 0, 0,
+
diff --git a/app-arch/rpm/rpm-4.4.1.ebuild b/app-arch/rpm/rpm-4.4.1.ebuild
new file mode 100644
index 000000000000..6fb2ecfa6783
--- /dev/null
+++ b/app-arch/rpm/rpm-4.4.1.ebuild
@@ -0,0 +1,101 @@
+# 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.4.1.ebuild,v 1.1 2006/06/03 23:19:22 lu_zero Exp $
+
+inherit python flag-o-matic libtool eutils
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="http://www.rpm.org/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha -amd64 ~arm ~hppa ~ia64 ~mips ~ppc -ppc64 ~s390 ~sh ~sparc -x86"
+IUSE="nls python doc"
+
+RDEPEND="=sys-libs/db-3.2*
+	>=sys-libs/zlib-1.1.3
+	>=app-arch/bzip2-1.0.1
+	>=dev-libs/popt-1.7
+	>=app-crypt/gnupg-1.2
+	dev-libs/elfutils
+	>=dev-libs/beecrypt-3.1.0-r1
+	python? ( >=dev-lang/python-2.2 )
+	nls? ( virtual/libintl )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/rpm-4.4.1-ubuntu-fixup.patch
+	cd ${S}
+	elibtoolize
+	libtoolize --copy --force
+}
+
+src_compile() {
+	strip-flags
+
+	unset LD_ASSUME_KERNEL
+	local myconf
+	myconf="--enable-posixmutexes --without-javaglue --without-selinux"
+
+	python_version
+	use python \
+		&& myconf="${myconf} --with-python=${PYVER}" \
+		|| myconf="${myconf} --without-python"
+
+	econf ${myconf} `use_enable nls` || die
+	make || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	mv ${D}/bin/rpm ${D}/usr/bin
+	mv ${D}/bin/rpmbuild ${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/lib/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}
+	keepdir /usr/src/pc/RPMS/{noarch,i{3,4,5,6}86,athlon}
+	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}
+
+	# create /usr/src/redhat/ and co for rpmbuild
+	for d in /usr/src/redhat/{BUILD,RPMS,SOURCES,SPECS,SRPMS}; do
+		dodir "${d}"
+	done
+}
+
+pkg_postinst() {
+	if [ -f ${ROOT}/var/lib/rpm/Packages ]; then
+		einfo "RPM database found... Rebuilding database (may take a while)..."
+		${ROOT}/usr/bin/rpm --rebuilddb --root=${ROOT}
+	else
+		einfo "No RPM database found... Creating database..."
+		${ROOT}/usr/bin/rpm --initdb --root=${ROOT}
+	fi
+
+	python_version
+	python_mod_optimize /usr/lib/python${PYVER}/site-packages/rpmdb
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup
+}