Added latest upstream version. Fixed #356769,#308303

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 143 insertions, 11 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 0b28fbf0ee00..4e6d684351cc 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/rpm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.123 2011/04/24 14:51:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.124 2011/05/08 13:26:00 sochotnicky Exp $
+
+*rpm-4.9.0 (08 May 2011)
+*rpm-4.8.1-r2 (08 May 2011)
+
+  08 May 2011; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  -rpm-4.8.1-r1.ebuild, +rpm-4.8.1-r2.ebuild, +rpm-4.9.0.ebuild:
+  Added latest upstream version. Fixed #356769,#308303.
 
   24 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> rpm-4.8.1-r1.ebuild:
   QA: do not force presence of db-4.5, as it'll always use the latest one
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 19ecf1ba2468..bb17ebbbf16d 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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
@@ -17,17 +17,29 @@ AUX rpm-4.8.1-db-path.patch 628 RMD160 cee347c45bbbebd724dd1346bd74b3344b6a7d06
 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.8.1.tar.bz2 3714502 RMD160 9326931bb34f4919ee0366f6aa288e41b37cba30 SHA1 5811168721f6caa3fb883ebd491c8c5416d9bf57 SHA256 43ca026dd2b80e339066d12422f67d213dde9f1869a56b0b95aa0091a834c8fa
+DIST rpm-4.9.0.tar.bz2 3410799 RMD160 4aa5751750951e1659febfb691e37e3f8cb53d2c SHA1 6bb5a392705ef6edad26c305f9bc9b6ac66ab47d SHA256 9af1a56b05fc2c54935062e04a3e02999110c74d00bfd5b5c5ff3a03dde61688
 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.8.1-r1.ebuild 2445 RMD160 2d615d0c50a81f9ba412da2bcbb691287bea8931 SHA1 ede119a2f9da7ae5682b7afde13edb79c61ba8a3 SHA256 ac4ad59c51c9493a29afb13c7eb22f4a328f30a072ce93258fba6bf0b847e11a
+EBUILD rpm-4.8.1-r2.ebuild 2467 RMD160 56c3aeed97ccfaf849afe5b2d76020b6176befc1 SHA1 bf088eef5b2d276e0afbc117d1b7979d195535c0 SHA256 c95eb9a186350496bb8ae8880adc37f7bb9afc04af804f61f0de04946c2ad650
+EBUILD rpm-4.9.0.ebuild 2468 RMD160 74c065f129c76b399c766733866e97f1c5336252 SHA1 161c788fc6acc31dee27a58acbb2f94e336101e1 SHA256 99b185b6b890fe64e98e5228af12bc45a5851eced5279222f9cc098dea1c91b7
 EBUILD rpm-5.1.6.ebuild 2961 RMD160 af3d9eb849538de04e7ce81d58db72fc677cfa15 SHA1 ef6f5cbd788e174d6db219aef15fd45d9b139557 SHA256 af7970970ffcfb2d986e1aa53b4aba38bb5795d1d1c0ab7246d8e2c9e0a2f0f3
-MISC ChangeLog 19391 RMD160 80a4da75064f40c07410ac29c236d42309f04988 SHA1 4f822ea9dc443350e1d4cf991b58940ecb4fc4fb SHA256 c42777be3ce002064d509788519ef8000f7820b304d8e83d495f63bebce9e845
+MISC ChangeLog 19630 RMD160 00a35e0b769ba602915194297c58b5a4f2aaeff2 SHA1 9c487852209d010a82b2ead9a4ac4ca88d5b8541 SHA256 440d40a1abda7034abfc07274ddc4d0bcb131e853acd49238303cfa2cbb84867
 MISC metadata.xml 433 RMD160 a9e016d167fe73783ef50feedc00a09a2a84ac0c SHA1 8bdca4e6a26bc1d49efd244a93d8dab7c8c9ea94 SHA256 9cfbc2d47795431299888f776524d37950ff3bbd083940d5560a2f5eb958ef4f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk20OQYACgkQAiZjviIA2XiKqQCgnACq6iJlff+thWUOxPwgwGfy
-p6gAn1RnJkU56b2WX59Mx0v4ii+C8HtM
-=gGz5
+iQIcBAEBCAAGBQJNxpn/AAoJELy9dS57CHJBWOsP/RcvKnjHodzIQZrzxg0xJa7M
+kd9C7tymbx6f06g/GsQWHHa/i661YB2Mu74VakxyWMEC8SurPeaVe5TFIfo6zbte
+RemzEJ+Bmd7pI4z6BWM0xpYdYLo3a5Z3ZD7TvpB1Tl2+wAOwn9ii6YqBKjtINnLh
+7yvDC9svMeTTmMK4Qz59RBmBHF01i90L/caKJjHPWNeG8L8zttnx07YDJxa4pGfb
+rTESmHrek+7mq3FoAgQRW4hCQJYkJCPwyGCoZj96vivOuynvN9paoYKGMtO0sSOL
+OrYpVTGe+62A8iV0ynDWtZNHDRpUMFhRL+gD9ubcsTYdEsk/YhBaIsoQefEbgiXq
+MLrdbAN2frTavQHAqYDUnPCkLRQuHIl2QqP78voBN41xUqY7pMqeYtpFoLgJgHyC
+TyHUsPCCJtvbRn114/APpG2YywyDuKbzqD61hcqUpQAmRj6xj+g6eD5aBpTY/aHo
+U0quta+0kcVkx8QQG+oIUfu1kOxk/xnGCizdeODUvin/JlXsqesDHmPqnrJEkWDb
+NVmihMI66q0P2Z6/3q5HYMe66tWop80zR7mRiTm3sdIrsVQ3fBKBnPMIq8aHt43L
+G8ZWMda2ya4whocSBqDuHvlGjyd47CiKQ8Zr2Cl27GhSnVb0X+oLc3TpJAPooLwc
+TQT/vTo8NxdpWlB8jypz
+=l3sm
 -----END PGP SIGNATURE-----
diff --git a/app-arch/rpm/rpm-4.8.1-r1.ebuild b/app-arch/rpm/rpm-4.8.1-r2.ebuild
index 09c895839542..fd1d9150bb99 100644
--- a/app-arch/rpm/rpm-4.8.1-r1.ebuild
+++ b/app-arch/rpm/rpm-4.8.1-r2.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.8.1-r1.ebuild,v 1.3 2011/04/24 14:51:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.8.1-r2.ebuild,v 1.1 2011/05/08 13:26:00 sochotnicky Exp $
 
 EAPI="3"
 
+PYTHON_DEPEND="2"
+
 inherit eutils autotools flag-o-matic perl-module python
 
 DESCRIPTION="Red Hat Package Management Utils"
@@ -36,13 +38,16 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	doc? ( app-doc/doxygen )"
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-autotools.patch
 	epatch "${FILESDIR}"/${P}-db-path.patch
 
-	# fix #326665
-	sed -i 's:rpmio/librpmio.la:rpmio/.libs/librpmio.la:' \
-			lib/Makefile.am || die "Patching librpm Makefile.am failed"
+	# fix #356769
+	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
 
 	eautoreconf
 }
diff --git a/app-arch/rpm/rpm-4.9.0.ebuild b/app-arch/rpm/rpm-4.9.0.ebuild
new file mode 100644
index 000000000000..486781411d32
--- /dev/null
+++ b/app-arch/rpm/rpm-4.9.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.9.0.ebuild,v 1.1 2011/05/08 13:26:00 sochotnicky Exp $
+
+EAPI="3"
+
+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="~amd64 ~x86"
+
+IUSE="nls python doc sqlite caps lua acl"
+
+RDEPEND=">=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 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	lua? ( >=dev-lang/lua-5.1.0 )
+	acl? ( virtual/acl )
+	caps? ( >=sys-libs/libcap-2.0 )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.8.1-autotools.patch
+	epatch "${FILESDIR}"/${PN}-4.8.1-db-path.patch
+
+	# fix #356769
+	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
+
+	eautoreconf
+}
+
+src_compile() {
+	default
+}
+
+src_configure() {
+	econf \
+		--without-selinux \
+		--with-external-db \
+		$(use_enable python) \
+		$(use_with doc hackingdocs) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable nls) \
+		$(use_with lua) \
+		$(use_with caps cap)\
+		$(use_with acl)\
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install || die "emake install failed"
+
+	mv "${D}"/bin/rpm "${D}"/usr/bin
+	rmdir "${D}"/bin
+	# fix symlinks to /bin/rpm (#349840)
+	for binary in rpmquery rpmverify;do
+		ln -sf rpm "${D}"/usr/bin/$binary
+	done
+
+	use nls || rm -rf "${D}"/usr/share/man/??
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	dodoc CHANGES CREDITS GROUPS README*
+	use doc && dohtml -r apidocs/html/*
+
+	# Fix perllocal.pod file collision
+	fixlocalpod
+}
+
+pkg_postinst() {
+	if [[ -f "${ROOT}"/var/lib/rpm/Packages ]] ; then
+		einfo "RPM database found... Rebuilding database (may take a while)..."
+		"${ROOT}"/usr/bin/rpmdb --rebuilddb --root="${ROOT}"
+	else
+		einfo "No RPM database found... Creating database..."
+		"${ROOT}"/usr/bin/rpmdb --initdb --root="${ROOT}"
+	fi
+
+	use python && python_mod_optimize rpm
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup rpm
+}