Version bump the libexecdir patch as I forgot to update one more place that uses /usr/lib hardcoded. Resolves bug#409729.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 46 insertions, 11 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 7cabca6d26b2..264322b165a1 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/rpm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.137 2012/03/24 17:24:42 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.138 2012/04/19 10:37:02 scarabeus Exp $
+
+*rpm-4.9.1.2-r2 (19 Apr 2012)
+
+  19 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> +rpm-4.9.1.2-r2.ebuild,
+  -rpm-4.9.1.2-r1.ebuild, files/rpm-4.9.1.2-libdir.patch:
+  Version bump the libexecdir patch as I forgot to update one more place that
+  uses /usr/lib hardcoded. Resolves bug#409729.
 
   24 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> rpm-4.9.1.2.ebuild:
   x86 stable wrt bug #406479
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index c4b7c2dbd7fa..01ed82efc940 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX rpm-4.4.6-autotools.patch 660 RMD160 63155d3737ffdf9927b1763ddf068c5964e168c9 SHA1 70dd2346df0e5d95ec4a06587485381b48d52b81 SHA256 dd4828899e760358b702d0c2ca75e781619f7b65140cf2cc5600ea687a085569
 AUX rpm-4.4.6-buffer-overflow.patch 1952 RMD160 468c71731ec6893de165b4e1047f85f5b240f2f7 SHA1 dc41417f4064eb9476de9ef51e616042e55e5f73 SHA256 6ae715632dabd6cc6c24a92312ac22c1bd57235ff2f027f68943df68dcfc957b
@@ -14,22 +14,32 @@ AUX rpm-4.4.7-qa-implicit-function-to-pointer.patch 604 RMD160 f87086379c28fa878
 AUX rpm-4.4.7-stupidness.patch 5268 RMD160 631f1bf3dc4553e27dec4a901fa84e17ffc7c7c9 SHA1 e957a9a549fa1ec52b449b1e8fc3ea14af7b7a09 SHA256 e563657e648e9b5ecfc0a653d7515f93db7785ec6867c81591663213965c0850
 AUX rpm-4.8.1-autotools.patch 929 RMD160 9b4b1b08e38f79522a5b1e6ab487ed89b8234add SHA1 f20c1d98d325efa64f54b046cda6a8b5d4463da4 SHA256 2280de624d171399bb48dd4ae9144063ae4ab17f87e57313ba664a234a90e512
 AUX rpm-4.8.1-db-path.patch 628 RMD160 cee347c45bbbebd724dd1346bd74b3344b6a7d06 SHA1 08c3aa65104db74c9851911970711b2f503dfcc8 SHA256 791682c72dd3a24e5e8268bfa967412035aa135c7b8d4673541bed129b89a0f3
-AUX rpm-4.9.1.2-libdir.patch 496 RMD160 f0ec6930186b4d2134be485fc8a651017b00c067 SHA1 f9d229de524ff97900885a821d89a71fe9af412a SHA256 ff3b35148283720bbe7fa8b8d61e44d2f096841ffef726d6e96b3f2b00826d2d
+AUX rpm-4.9.1.2-libdir.patch 1056 RMD160 f9407d89f097a746947b7817f095dbe2ef07983e SHA1 74aea2f9b006b96a42625e0d895bc9f27ebaa0da SHA256 e4beb68b13861ccedcaa0a90c49f42c6dd7a2d7799360798b21eec7ea689437c
 DIST rpm-4.4.6.tar.gz 17157249 RMD160 6b433d20a63fb2542244ae62eff0a8b5fe290439 SHA1 33221f95189671d1a083b4f140bcf9a88ecd4374 SHA256 1e1da50af2b9dfe34c79315eae7520e7e57087671e17ce26107d779ae2b0b595
 DIST rpm-4.4.7.tar.gz 14125623 RMD160 9002eb0fe1d680d8bff447d6918f9726c9a4e34c SHA1 b119fb0f10fd5e2eb330ba547b6a89e40f3c0e68 SHA256 18fde4195e4ac21a4290327336948f8c4fc58a680395edbb5f2f31bae67b18b5
 DIST rpm-4.9.1.2.tar.bz2 3500371 RMD160 3b3a8904f9f0d8ae03c1ab903ca7f420cb9178ee SHA1 5ec557424d90461f76d4ad30bfb6653b79920d58 SHA256 ea55e5c5b70703a3fea33e5debec27a694816ae86d1bf5ce99bc9e27db84b60a
 DIST rpm-5.1.6.tar.gz 8305612 RMD160 88645f4a7c2e25fffaa5628d267e86eaac137b35 SHA1 3ab7d1edf333102c748c22e9144ab90d9719ab0b SHA256 82ee1a737bd77ddd90b0fe1e9a2f478c46033e451fac3881d00ab9e166951799
 EBUILD rpm-4.4.6-r7.ebuild 3191 RMD160 5ca2a16ac107c914edbccccdf0d0b2ebeb96c4e2 SHA1 0b69289cf1bc48a453c0c7117e01dd1e4021005c SHA256 1c168326b03609d81932272281226a607db66a62f7ef3114a4baf07cca3f4676
 EBUILD rpm-4.4.7-r6.ebuild 3250 RMD160 2c00c3042d9dda857903372084e386671811ad79 SHA1 7ffba60598cb1b4a88434316791e91ad17226e45 SHA256 8c58fe71a4a054848bd7304fe894d7c1b435a59a588b674dc4414b4d971deb4a
-EBUILD rpm-4.9.1.2-r1.ebuild 2577 RMD160 ba9773d3794b2f28ce061f5aabe2e345f9277e13 SHA1 9b3764b259839ed0fbe1f6837d02619303e51af8 SHA256 db5e8d23c66c26cbfbfa9ae4476990740de7a10cbb97c69390ed3f865f0e83a8
+EBUILD rpm-4.9.1.2-r2.ebuild 2577 RMD160 839e2ad71786d625e89bb2a8d33760bc6559b676 SHA1 fdc1627562a6e2ef1e26e0c66e0ee20cb3dcdd1d SHA256 07d55a70bbb85943e8f1dc46eda05693f155808ee04ed4dcfaee5699a73a71bb
 EBUILD rpm-4.9.1.2.ebuild 2462 RMD160 2bce3b2e2e71c6459a8e8326d83fe783931b57f7 SHA1 69ede37963b4d386e873ed5ed8a48cc74cd35a8c SHA256 8247fcd55db19eb787ceeb05a75157cbb743290c68cb17e6c246f9bad6d68385
 EBUILD rpm-5.1.6.ebuild 2961 RMD160 af3d9eb849538de04e7ce81d58db72fc677cfa15 SHA1 ef6f5cbd788e174d6db219aef15fd45d9b139557 SHA256 af7970970ffcfb2d986e1aa53b4aba38bb5795d1d1c0ab7246d8e2c9e0a2f0f3
-MISC ChangeLog 21295 RMD160 d4bd4f38cb975ce7b4d2ffbfb4ed8da081864673 SHA1 6529f3c4502c089b5cfc66243f5c1d2b09227424 SHA256 9c310bbec6bae868889f27a65020bac5d23bc4cf8c6ff877fd7395456985af39
+MISC ChangeLog 21589 RMD160 fccd73d5c0642c99ebcd1736388828c2f3717c58 SHA1 f98b885141c5a1dbc9bf66c9ab0abed6214b054f SHA256 75e1609dbd1ce5b779ab1ce4e19076ab828968341fbf571a1d5d9e96713f9e37
 MISC metadata.xml 412 RMD160 f80c92312d155e06f578bfafc5c6887a87a50029 SHA1 90899c21608493640f9e30dca30613b7823c9854 SHA256 49b33ada612c71654ff1706d78dbeb1d4150455e661c46b343cd5523386d3cd0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk9uA2AACgkQuUQtlDBCeQKfBwCgg3g95G1Dl+j2+mtArmaNfhsD
-YOcAnRLRKEHGrkdWIvZixgoAtipFCm4c
-=WgfO
+iQIcBAEBAgAGBQJPj+rWAAoJEOSiRoyO7jvogl8P+wZvyD6Z3QMZFKYMWJ4NDjtS
+nTcmn8uTQfjErbh7K2YeGEyOsVjpBklQ4SC5OBV8LcUta8pGiCf5W3jGN8ntU+pq
+zry0Ohk/oNqE7bHkmcBxUdlSCE67QTSlq4353SlSmgm4j/IIUiMMJc77uWzdXgA/
+ebP3l1s4Fab9fOnQroaU/HC90MBarXclYHwihVkMUxVy8KmAGv3e1MAEnoW9yPzu
+6yQEU61oWQE+zsEqeBKhRJMvne94JdGiQGuqyyCop9JR2GCj/kuxCED6BPvxWzid
+AFttIe7vEEvt+qWX72TV/YS09h9uFJRP4gEUWXGM3WAxtzuZIKAECXkVgDFoTaZG
+Fx0XW80USQ4r0DV4GFoJ5CCrcroovLQg/g3/ZKPOFc628UlynjyEXolhUYq7wsA/
+7VecVB3vY8o9XZ5zPz6IvnOoOAmA5MPS8IVKd9X9rYip9l85BCeQguEITyWI4PR4
+QDAMaLPFP01i2shjOfhnW8FtZavGM1iALwo2GcqQTSBU/Tq2q/nppVCMF4RRpWxP
+E8KhfZy/VBqb694ixyjNhCrJ37ZljRIOXcODFm2CkEthVESfFrKYTpIhFuF21wYA
+Dc5YOkDYtJ65xYZmnq0mCGdE6q5ssWKE/PWFJHd5nQuvY38Wa7UzYHhuCtGQ3ZGg
+MxLx6LkpiucjZ8reknkR
+=xlaC
 -----END PGP SIGNATURE-----
diff --git a/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch b/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch
index 2867de86e8e1..221926494411 100644
--- a/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch
+++ b/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch
@@ -1,6 +1,24 @@
+diff -urN rpm-4.9.1.2.old/configure.ac rpm-4.9.1.2/configure.ac
+--- rpm-4.9.1.2.old/configure.ac	2012-04-19 12:18:27.584725220 +0200
++++ rpm-4.9.1.2/configure.ac	2012-04-19 12:34:50.302722933 +0200
+@@ -846,13 +846,7 @@
+ AC_SUBST(RPMCANONGNU)
+ AC_DEFINE_UNQUOTED([RPMCANONVENDOR],["${RPMCANONVENDOR}"],[canonical vendor])
+ 
+-if test X"$prefix" = XNONE ; then
+-    usrprefix="$ac_default_prefix"
+-else
+-    usrprefix=$prefix
+-fi
+-
+-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
++RPMCONFIGDIR="`echo ${libexecdir}/rpm/`"
+ AC_SUBST(RPMCONFIGDIR)
+ 
+ AC_SUBST(OBJDUMP)
 diff -urN rpm-4.9.1.2.old/rpm.am rpm-4.9.1.2/rpm.am
---- rpm-4.9.1.2.old/rpm.am	2012-03-21 19:57:33.942448288 +0100
-+++ rpm-4.9.1.2/rpm.am	2012-03-21 20:06:19.045419773 +0100
+--- rpm-4.9.1.2.old/rpm.am	2012-04-19 12:18:27.584725220 +0200
++++ rpm-4.9.1.2/rpm.am	2012-04-19 12:24:49.035724332 +0200
 @@ -1,7 +1,5 @@
  # Internal binaries
 -## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
diff --git a/app-arch/rpm/rpm-4.9.1.2-r1.ebuild b/app-arch/rpm/rpm-4.9.1.2-r2.ebuild
index d8aa363d5294..deac8965f4cc 100644
--- a/app-arch/rpm/rpm-4.9.1.2-r1.ebuild
+++ b/app-arch/rpm/rpm-4.9.1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.9.1.2-r1.ebuild,v 1.1 2012/03/21 19:19:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.9.1.2-r2.ebuild,v 1.1 2012/04/19 10:37:02 scarabeus Exp $
 
 EAPI=4