Version bump and fix #450286

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x7B087241

4 files changed, 68 insertions, 21 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 9924b510e6b0..c846ea65da37 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.162 2012/10/24 13:39:52 scarabeus Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.163 2013/01/05 00:00:32 sochotnicky Exp $
+
+*rpm-4.10.2 (04 Jan 2013)
+
+  04 Jan 2013; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  -rpm-4.10.1.ebuild, +rpm-4.10.2.ebuild, +files/rpm-4.10.2-autotools.patch:
+  Version bump and fix #450286
 
 *rpm-4.10.1 (24 Oct 2012)
 
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 4928a6ccc38b..ce7ba42119ed 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,29 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX rpm-4.10.2-autotools.patch 1320 SHA256 c491a15aad393b46df6f880d8e493073d81e173e95708dd70581ba1499bcbb63 SHA512 5cdf21c12a96f382927b9ffe58d2c31b8b3feeebf89c6fff83f824d1129e4d82553e01f7d0ee0719dc4ba0136d57bc168423604c54ed2ab397449c73f6b1150a WHIRLPOOL f2f3019e8199484ec92eefe5fe1d6ef5f81e0a99fd539ff8800e30e0f0420243c81607547400c0cdb3c85cfe6d640eb33e32cded4e71c36af8346561ea7fc1f6
 AUX rpm-4.8.1-autotools.patch 929 SHA256 2280de624d171399bb48dd4ae9144063ae4ab17f87e57313ba664a234a90e512 SHA512 35955ce9d84c4dc146d8bbf4d4e20d3594986e4e25ad604e8d830a9e2bfb41ca2848735ec808f6ffe2e9225e200352248b611f3b2304a485d1ae7847d8afd476 WHIRLPOOL 65d58110a3dec6a210f66a1c9c50034031f313bff9b52e8ecae399762131a749b2c143df2c04f55cec8302c968e8b9a4863e2c25f25bcff53e8517004c792058
 AUX rpm-4.8.1-db-path.patch 628 SHA256 791682c72dd3a24e5e8268bfa967412035aa135c7b8d4673541bed129b89a0f3 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005 WHIRLPOOL 96260c3669e3e4521f58e720aa27f365c293d82c85fe26a8a271e069b00e7971231a08b19d390f1282eecbb80aa49ec58a67ca80adef8a2fa95ae410f04cd4d3
 AUX rpm-4.9.1.2-libdir.patch 1056 SHA256 e4beb68b13861ccedcaa0a90c49f42c6dd7a2d7799360798b21eec7ea689437c SHA512 505faa54ccf196891f1e2231c776f8eadf547bf2003a495c90a2e5e4c93e31aadae5bac70541d316643a8aca85a1b2a3dc6b0ae2601834534ccded06a4a5fabc WHIRLPOOL 2a72aa223728f18fe186686dfee3e137e52f91a8150d4ed364fee9b9152941a4b2df366958901e4bdb733acf1eca77f5662755373fa0928f4f782e0723197caa
 DIST rpm-4.10.0.tar.bz2 3530378 SHA256 0e2e237235b64c07ee4a4152e4eb77aad4eb559737eac9b6713c5e1bcabfe4a9 SHA512 413362243e214cc16227142c26223e1a1deed83f57fe3d80951825f8cd325d11a8038654512815e04044e18e7c6f185e3330d5f652939c77f395ae14190413cd WHIRLPOOL 84d29e9f91b3b581ff0da9f0ce31128599931cc45acd5fd6bb60b8cc13b873c3e1be4e8e4c374913165950734dc8f4cd657ccd407f83549e472288a928f3d691
-DIST rpm-4.10.1.tar.bz2 3541216 SHA256 5fbc381740c041048b9db9c591a98e4a83764c439a0031ba650ad2cd031e156e SHA512 c48a57e7780e04f9ddc707147d26bedd2d94340cfecae6c1923abe4897b265652fa61807448387e907f807502bfedba03b3fa519a22524eec9bdbbd77e09db93 WHIRLPOOL 7ef0e930970413c70abd6de4942482d1d24c368e47c5812aae7f17e3134768fb8bcea2ed0dacc26bb02a851dddec287ebd837fa842e1b3bf44afa0e30ee43261
+DIST rpm-4.10.2.tar.bz2 3545536 SHA256 e9278a2b40f08bae5a9592b9b42f11f88b2e880cc34e57113d53461ed7de6e7b SHA512 7e290e0c0a993a96d575c8c962250f0eac12e11cd678d2f46cb23fbdb1e8dc1b2d63dc4dfa3efe7fa8917d34598a279eaf845331b311f64d02bcc4e93faae266 WHIRLPOOL bdf781030a5760d99950cb7162d2780675b00fe41ecb51b2d9ba22466ce150499489c25fc0a234143403d4d244351afa81828e20fe57bb67cdeaff5f712fbc13
 EBUILD rpm-4.10.0.ebuild 2694 SHA256 957abd23b6e2d1531918c47ed1cbab9f5857b1348c62c2261500a7dc4b1eeac3 SHA512 c43b43d1d2f8b3a66844ed2ea1d84885a11b1357d3b3b90d4c378c8f5ea443e95c4e996393e9c560f9b1ce091c81d9fbc833b815bb1a48573d2687e855bfa9dc WHIRLPOOL 6d525bb1e5eb2b2c7137930254ba9e52ecb831a820e37a82b62f8ee071db1a2a77c88812631acc1010a5e2ffa225c559cae0425d697e334ec400ff2b77fceffa
-EBUILD rpm-4.10.1.ebuild 2707 SHA256 980a2d8a28457f10bae0b44afb93cbe29eae62db4f698baa19cb622d9951c5a1 SHA512 052af4046df98d121f872e40706e60fe50fc7519de51a8120d6db2f285343f1e34375c5375d0d43805d4e2d7903748d688497d5f2578ab63b7b4381db0d715cc WHIRLPOOL 6a543b0898fc9934c541013013d3b82696ac8dec95f651c88d80de6285f1aa757a194d1bbeac60eba9bc202d00781db41644f2bf81e52236affc19076c9ee954
-MISC ChangeLog 25092 SHA256 53610fc2d3e0f699db161c7472a62ed24b3e33755b79f5b589804e4b138a8c22 SHA512 3eb2caa04f8bc0aaa7b8987aec030983d11df6f22781297c4ee2c0db0cca5694b2c9044c5c48ee9a8e4a4f329b7de19d4aa5889e19b0bfc292be4cd76b1c7d22 WHIRLPOOL cac80d2c2b1b7cb0905afeedbdf05d81e6b5b07b6f9c6fc7794e32376151ff33baa5082a07269143f711d0d8a594f2691a2538aff5ecde1a0dd083aa26ac8323
+EBUILD rpm-4.10.2.ebuild 2702 SHA256 b0eb88f62f329a97b118a5330893c0a0148711d81cda9ff3f4bfdb124333c444 SHA512 64623dde2abcfda5540ae1e4640ffd0a46d95afb1b6504499c1ad935da84f57772eb8e3c5fae1897e4935c7196e27c6ec8d5c0d80bee2eba97d3e9b7d290531d WHIRLPOOL 238efe82b4c80cc71627b4ca6293b29bd348c075990a25c798677d1129cca317aa2033d95c7050ae43e3d8c45727a6241aea4e40e43dd697ba769927b9f54222
+MISC ChangeLog 25291 SHA256 31c69148e4b6dc527e1d477f9b097d789214daa39c6613c37afeb2ef0ab1d574 SHA512 8e125d10c6d475f224c068767a1227fce908e25f3f6e9472c20fd76461c75a1f5c9b77795a23080e884e86275d07fe14ff796fc5d126507056f77dfbd83a200c WHIRLPOOL 39b13e71c7dbfd91da86cd9b8e55ba20ec716d6a7bbc442305b28fe2e7045b40ed94d77738030f13e1cd92f148b17f755edace4cf80a47b75575b8cf84861632
 MISC metadata.xml 258 SHA256 d18cd3c79f172a08970999a154c3ae331f1e6eabe37e677a4491e6ccf5122ab2 SHA512 a35165b524655cb15d343890439b14c3f5eaa998825338a5adc4cff8edad391869c31bc33b4f9bf7bb03a99653684c3f4eb5897b314c0ca1e89defba3f4b9dcf WHIRLPOOL c7d2a308b3d592fc50542eb844e302f214ee6b738b4853332e0a2c034c32cdefd646b5e6c50351e7735ac87f97bf5a5d211d121373a0ace625e564862a62f1ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQh+/sAAoJEOSiRoyO7jvo50UP/Rjty1x/dyOOw4ygUTVARUrh
-iM//d1LqCv1bKU4DeLSIaZvZbIVxgSCq0KQXyEcUo1UZdVh14YX1nVvwMgL8sJLG
-kwybkBhRCKgL4AfgywxlWuQq0dZzETjV7wP9T3Q1jyOUOUcPYoJ5R7NrogaECWB6
-VBS3zVSv5FyY99+lqBTvVEuSglFHRWZUscVzBz2i7pV9fIzGg8xQC7PMjSelCxIK
-55Qc05pa6FTrNV0XDyZBZe/5OOwkst5Vfj8touEaf66RaTyCVQFzOY6ZT7OYxEuK
-a5OPZmB+r0TsxOrgjGBYQEpn9calUbQpfJc/9BgE108Sh6nqUvZNLgpVC5kVgs35
-b8iF5EOD4gTuwO79sKLLm/QJRMq2QWxaaqMpsmtNluw5/CQ4NcFE5/ZQSdmVqKzS
-Sj+6uZlviSX0L7sgQ7oQeqhRob6iJYiB6CK5jxtLhBQhnb3+xRVG/sZ+CQ+7c0lT
-6iAXHiIgemY1mFw+OXegetbbxI9vH3I9FzHXr5TxtlV8zdIP86VLAzCPsE0+o4Ao
-u/CtAl6txE2ddz0473TlagQwiD2lmji91tN3KGXMF0NAGhWrvhbQ27uochLlPbEo
-zPLDdqY00zx/RWD6i/8CHWNLAri3Tf3vdRsnz6LKIzTOMSJIB+QRNi7ZHyCCa3eM
-PjeFOT+RrZ62pjWcIHwA
-=s77R
+iQIcBAEBCAAGBQJQ520mAAoJELy9dS57CHJBaUAP/iYWUVZT93v6c3UC7ECBCSqj
+wCyNDYsfjoW4qkd7IR80gIkslYMxez24kjL5RxM9Yj7GdTO7GatX0M7iTu5qpU/b
+mZxni5JnrjYdMtZChX2P8znYdV1Bl6juN7Fg2Zmnh/pdOQsvOo3WQamglVYJYkP/
+wyJxoQBKA37Vlms4Ik+nGUs2KGNY6176WKKPBJ6noP6pteembm3RsDuc9ufKiRmu
+J9yVZyrCiRtoSB++vo+EmBsSHGeKNIKMEHlzJNZj6ju1yuWMJRq/70hEd2VnUGjC
+w3Kw4HMX6x6kWtUCTgfKn2N43XGNpPzZbdK251YYUWXzfrqgVY0lq/zONAFkAD92
+QgWLuOoAbRhuLgddnRDKeM+AFd1QZm+MRNWlPMqybbKjgEuQWmrrK+AAvf1vAIcB
+0o3Gb6TMPri54CAQ+IMBveBYEEtl8lgYI6cXTHZEJlGVmsK/96vvfI5C9VyD6Khb
++iTll69GBAFeXo7dBhWgDPUIkUsr/bSXk59f0g1I2GhKHe1YTHO0mv6phdLTPPL7
+9Z6HfrQDzBfIbkG5LMtk+XhWRImUey7CHQoydsUJ1bnp7Q94z3ayBmu5FRA3BGlW
++gsIWjBY8vJpp/ElE/yPAvVffACaGLvEkT+GXdykcA2QtM3WJbONoFcbue10AvPa
+X3otpHFFex+THfp0qL4a
+=P0+s
 -----END PGP SIGNATURE-----
diff --git a/app-arch/rpm/files/rpm-4.10.2-autotools.patch b/app-arch/rpm/files/rpm-4.10.2-autotools.patch
new file mode 100644
index 000000000000..e3ae0f9721d2
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.10.2-autotools.patch
@@ -0,0 +1,40 @@
+diff --git a/configure.ac b/configure.ac
+index 19e32bc..c74221a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -245,18 +245,12 @@ AM_CONDITIONAL(LIBDWARF,[test "$WITH_LIBDWARF" = yes])
+ # which we use too and hopefully is slightly more unique to NSS.
+ WITH_NSS_INCLUDE=
+ WITH_NSS_LIB=
+-AC_CHECK_HEADERS([nspr.h nss.h sechash.h], [], [
+-  AC_MSG_ERROR([missing required NSPR / NSS header])
+-])
+-AC_CHECK_LIB(nss3, NSS_NoDB_Init, [
+-  WITH_NSS_LIB=-lnss3
+-  AC_CHECK_LIB(nss3, NSS_InitContext, [
+-    AC_DEFINE(HAVE_NSS_INITCONTEXT, 1, [Define to 1 if NSS has NSS_InitContext])
+-    AC_SUBST(HAVE_NSS_INITCONTEXT, [1])
+-  ])
+-], [
+-  AC_MSG_ERROR([missing required NSS library 'nss3'])
+-])
++# NSS_InitContext() was added in 3.12.5
++PKG_CHECK_MODULES(NSS, [ nss >= 3.12.5 ])
++AC_DEFINE(HAVE_NSS_INITCONTEXT, 1, [Define to 1 if NSS has NSS_InitContext])
++AC_SUBST(HAVE_NSS_INITCONTEXT, [1])
++WITH_NSS_INCLUDE=$NSS_CFLAGS
++WITH_NSS_LIB=$NSS_LIBS
+ AC_SUBST(WITH_NSS_INCLUDE)
+ AC_SUBST(WITH_NSS_LIB)
+ 
+@@ -797,10 +791,6 @@ AC_SUBST(RPMCONFIGDIR)
+ 
+ AC_SUBST(OBJDUMP)
+ 
+-if test "$with_external_db" = no; then
+-    AC_CONFIG_SUBDIRS(db3)
+-fi
+-
+ AM_CONDITIONAL([WITH_INTERNAL_DB],[test "$with_external_db" = no])
+ AM_CONDITIONAL([DOXYGEN],[test "$DOXYGEN" != no])
+ AM_CONDITIONAL([HACKINGDOCS],[test "$with_hackingdocs" = yes])
diff --git a/app-arch/rpm/rpm-4.10.1.ebuild b/app-arch/rpm/rpm-4.10.2.ebuild
index 45d2afb1323a..3bc3164898c1 100644
--- a/app-arch/rpm/rpm-4.10.1.ebuild
+++ b/app-arch/rpm/rpm-4.10.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.10.1.ebuild,v 1.1 2012/10/24 13:39:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.10.2.ebuild,v 1.1 2013/01/05 00:00:32 sochotnicky Exp $
 
 EAPI=4
 
@@ -46,7 +46,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PN}-4.8.1-autotools.patch \
+		"${FILESDIR}"/${P}-autotools.patch \
 		"${FILESDIR}"/${PN}-4.8.1-db-path.patch \
 		"${FILESDIR}"/${PN}-4.9.1.2-libdir.patch