Punt 4.9.1 as 4.10.0 is stable everywhere.

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

3 files changed, 18 insertions, 127 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index b4edce5ce485..775c5e3b665b 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,9 @@
 # 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.160 2012/10/14 17:40:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.161 2012/10/24 13:32:36 scarabeus Exp $
+
+  24 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org> -rpm-4.9.1.3.ebuild:
+  Punt 4.9.1 as 4.10.0 is stable everywhere.
 
   14 Oct 2012; Raúl Porcel <armin76@gentoo.org> rpm-4.10.0.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #428148
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index c801f3a84968..20231bdd069d 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -5,15 +5,23 @@ AUX rpm-4.8.1-autotools.patch 929 SHA256 2280de624d171399bb48dd4ae9144063ae4ab17
 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.9.1.3.tar.bz2 3485850 SHA256 531894301e1a9891baf356fb32f732b10d1b313f5c5875a47fdcbdc0c3f67883 SHA512 6ebd842e1574359ca7e59a7074782126a8bf81fd09f486ea1fa48bf23fd457cb6140c41853c8806ab184dfa0c76f30e827c40c45992a324efbdcd0a2bf4590bd WHIRLPOOL 14561025e792ea536b3ffc3b8383fd55ff54d01d11739ccaa1c4a44ae2af317d52a93490240bd3a5366ac89c2422715fa8081550be2d7e7b49cf6285fb43e3b8
 EBUILD rpm-4.10.0.ebuild 2694 SHA256 957abd23b6e2d1531918c47ed1cbab9f5857b1348c62c2261500a7dc4b1eeac3 SHA512 c43b43d1d2f8b3a66844ed2ea1d84885a11b1357d3b3b90d4c378c8f5ea443e95c4e996393e9c560f9b1ce091c81d9fbc833b815bb1a48573d2687e855bfa9dc WHIRLPOOL 6d525bb1e5eb2b2c7137930254ba9e52ecb831a820e37a82b62f8ee071db1a2a77c88812631acc1010a5e2ffa225c559cae0425d697e334ec400ff2b77fceffa
-EBUILD rpm-4.9.1.3.ebuild 2651 SHA256 d24da1f673c2a8a884acf9bf56314ebc663dfb30b440753409b9ca2692b7b018 SHA512 51924da67d497e2c7156520a771a32e0cc73a7f2003acd10e65f4dd396715c54d47bb7c0aff5545ea1c1d34e24a0677653b99daf4030dfa0a74900364bc72d20 WHIRLPOOL 4e4644b5e60f2800fbe52e8d52ed31eda005118218ba93fb96d82dbb390764ef7af3bd6b4a6ef62ad8319b7d035ff9ed136a83fb8b7b4385d7a7afe9a95ecc74
-MISC ChangeLog 24801 SHA256 b8380045cd3048ba73052bc7eed61dfb5a5976960598141b934f26d8e2df117e SHA512 4bdc8b71dad990c9e02a2cba01db5625e2c129b61f586e3039af2c8e079470bd8575dbb72e0b33eaf31695697159d1c4e24ca9cba810064a7fae3001ab412ce6 WHIRLPOOL 8ff05c9795ad412c1b8e223a76fe62a09a108db99ca12825f8e2b229cf1b7aa6c6ccd680084dc5ce124d70a9e5f0bf930d358ca750ba9bac50d114d569cc023f
+MISC ChangeLog 24925 SHA256 076356083ed8699aaec77eea6417a1362f1d5ab2690575a8a32897bfa0a5f309 SHA512 7670d1501bd059af2c64a3759a8b2025261ed8156e32f23be54c846808df144c417ed46674ad7de6970f7a6df133776fa73f724371e7a02c20ddce25ba9a7e3a WHIRLPOOL 09b470043b825dbdd2f2841aacc9e2f1b10415f3c86d5f23fe1f767e9747b95d97ed0d274d846b813bfa8d638290735ee8af5938039dd301ff68ba3bd128b88f
 MISC metadata.xml 240 SHA256 6908752c868802ae5998a161fac8c88692197ebe00f8ae9bedb80b4fc2f2b2ad SHA512 0f1cafb4f2edd882dce7e41562232d1daf396c58f67e7a906ce22a6fc3a7ac3f13dfdf1b84f1e36c7ee66170c63a3be6d0ea423d23f10d5ae13da7154b0f921d WHIRLPOOL 9d8b6ceb028dca6d2e5956c304149c3a73fbc81b64fb3de04d5fea6daeec010d5f0ae3d8f3bc8a661d84e336eeb395c829b8512f6c02f8f3ca2d1f041373d04d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB6+R8ACgkQuQc30/atMkDfrQCeIdGiP3dpEX3T0HhHzLqcJNi6
-ADEAoLUlkwxy/0i7RJVhqEMUNlEWrPV7
-=yg7u
+iQIcBAEBCAAGBQJQh+3cAAoJEOSiRoyO7jvo/xsP/1Iglb+AwIzm0OlECfdHR09+
+lJqfehO9kXr+bfAHiZkRK1q7eOylC6a5dqxaJUIrNzuhbB8l6B249SIocp1YtXnp
+O0j41dqVJcdgxQOk6AOQD3OpgYeAzPYJtf6G2IG4fE/dASuZjUmSoUpk37VxyRB7
+urk1cpRe+tmhpkvlUpdX5VVTvT1H99kouarJlZhVnL/X8QDTWAovWQfIr0tvUPmq
+Sd6UY1MIn5Q9iuCkQ+C90FdCVMbNAdnigvej52TO9uI5AZGiexJUaXfTt/F1T5G+
+rwOQgI3FmoxcxQF6DuIVhUGsPbwDM/feErPA6Iln46X4TdArn4y3yEuJ+V8Hh9Or
+jKCqyqA0m/5Xd01mKRiF0nN/cNxkyidnzFE/pA2LdJ39MTAZ5jOg4Y8xDZqg2mJA
+OYrDobVyv3dUkyCX5KgxItY/BCztfr0TvlKpT8U78caDZnsyiU/e/ehqOP0+vLpz
+tlInZDvCKhDNrJmL5ubSPInIPTqybJxuGrim5Gq8hMlZvTqTCKoO0/qnl8lWM/wQ
+EO6ibzn7uSK8mE+4qul2cJ5tsOIClfwNEC9rcpMu8sN6sXD53ErEenK4BN28B8n0
+RI40j1V9FjScNXEhUjUfxPFVzlMawpQy15okR8m8WlebQSoSYozyv9xJHzxc3OMr
+4OFtGsRKrBfA9/hBrbbV
+=7Lp3
 -----END PGP SIGNATURE-----
diff --git a/app-arch/rpm/rpm-4.9.1.3.ebuild b/app-arch/rpm/rpm-4.9.1.3.ebuild
deleted file mode 100644
index 48db6ba1782f..000000000000
--- a/app-arch/rpm/rpm-4.9.1.3.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# 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.3.ebuild,v 1.10 2012/08/11 18:26:03 swift Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-inherit eutils autotools flag-o-matic perl-module python
-
-DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="http://www.rpm.org"
-SRC_URI="http://rpm.org/releases/rpm-4.9.x/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-
-IUSE="nls python doc caps lua acl selinux"
-
-RDEPEND="!app-arch/rpm5
-	>=sys-libs/db-4.5
-	>=sys-libs/zlib-1.2.3-r1
-	>=app-arch/bzip2-1.0.1
-	>=dev-libs/popt-1.7
-	>=app-crypt/gnupg-1.2
-	dev-libs/elfutils
-	virtual/libintl
-	>=dev-lang/perl-5.8.8
-	dev-libs/nss
-	python? ( >=dev-lang/python-2.3 )
-	nls? ( virtual/libintl )
-	lua? ( >=dev-lang/lua-5.1.0[deprecated] )
-	acl? ( virtual/acl )
-	caps? ( >=sys-libs/libcap-2.0 )
-	selinux? ( sec-policy/selinux-rpm )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.8.1-autotools.patch \
-		"${FILESDIR}"/${PN}-4.8.1-db-path.patch \
-		"${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
-
-	# fix #356769
-	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-selinux \
-		--with-external-db \
-		$(use_enable python) \
-		$(use_with doc hackingdocs) \
-		$(use_enable nls) \
-		$(use_with lua) \
-		$(use_with caps cap) \
-		$(use_with acl)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	# remove la files
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	mv "${ED}"/bin/rpm "${ED}"/usr/bin
-	rmdir "${ED}"/bin
-	# fix symlinks to /bin/rpm (#349840)
-	for binary in rpmquery rpmverify;do
-		ln -sf rpm "${ED}"/usr/bin/${binary}
-	done
-
-	use nls || rm -rf "${ED}"/usr/share/man/??
-
-	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
-	dodoc CHANGES CREDITS GROUPS README*
-	if use doc; then
-		pushd doc/hacking/html
-		dohtml -p hacking -r .
-		popd
-		pushd doc/librpm/html
-		dohtml -p librpm -r .
-		popd
-	fi
-
-	# Fix perllocal.pod file collision
-	fixlocalpod
-}
-
-pkg_postinst() {
-	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
-		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}"
-	else
-		einfo "No RPM database found... Creating database..."
-		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}"
-	fi
-
-	use python && python_mod_optimize rpm
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup rpm
-}