Try to use libdir patch to be multilib strict wrt bug#365993. Also punt .la files.

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

4 files changed, 156 insertions, 6 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 849d4625e90e..92869445d84c 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.135 2012/03/19 21:32:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.136 2012/03/21 19:19:35 scarabeus Exp $
+
+*rpm-4.9.1.2-r1 (21 Mar 2012)
+
+  21 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/rpm-4.9.1.2-libdir.patch, +rpm-4.9.1.2-r1.ebuild:
+  Try to use libdir patch to be multilib strict wrt bug#365993. Also punt .la
+  files.
 
   19 Mar 2012; Markus Meier <maekke@gentoo.org> rpm-4.9.1.2.ebuild:
   arm stable, bug #406479
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index e87e22d21834..2844b5a0f81a 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -14,20 +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
 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.ebuild 2458 RMD160 77fd46c5115941ef3b3750f866c017fd3b207676 SHA1 1451e3876f1d0b8146037d0b4cd3628efa8fe15e SHA256 5d1e9e2910c7354aeb9363c2eb365fd1ab877dab05c5014d821e02b098fb1898
 EBUILD rpm-5.1.6.ebuild 2961 RMD160 af3d9eb849538de04e7ce81d58db72fc677cfa15 SHA1 ef6f5cbd788e174d6db219aef15fd45d9b139557 SHA256 af7970970ffcfb2d986e1aa53b4aba38bb5795d1d1c0ab7246d8e2c9e0a2f0f3
-MISC ChangeLog 20953 RMD160 22981dcdf6f769e315b2cb2656cc8de32fe61a97 SHA1 228f6237f9788b833fbe9cb66c87b7d2904311ec SHA256 6df13e07584013e5fa7cdbf727631786513beca6a55f22b746373282022b5c82
+MISC ChangeLog 21189 RMD160 e4f985234176e4836c18f7d9bea3d664377da5d6 SHA1 bf7838f25efd32ed2046a3dfba5fddff34b95d7d SHA256 a9aadc5f4f5a4a7736212080ba0a5c85650a69d11291fc5ee5e6ec3e51d6b2cc
 MISC metadata.xml 412 RMD160 f80c92312d155e06f578bfafc5c6887a87a50029 SHA1 90899c21608493640f9e30dca30613b7823c9854 SHA256 49b33ada612c71654ff1706d78dbeb1d4150455e661c46b343cd5523386d3cd0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9nprIACgkQkKaRLQcq0GJzcQCfZ0YB54NkVxog2d5jft+4W/zD
-O50AniBmZnzE1GBFcqHEcTtx8R+Koh5x
-=bKPV
+iQIcBAEBAgAGBQJPainVAAoJEOSiRoyO7jvo4IsP/3DJef3qTr9KnnYkj1+GIOks
+Plw12f+YkfytEPrz20ZxbNe0L7g7ZrNx4quIYCh3epTyqfC7m0UJ7Yr1VfY7zIOZ
+e31BqMaqZTFCcuxQxz0jWRfsn4E4YgafyZ0svfKzMr28aLoaXig2Ld8FLUmqDBj3
+IKabO3lS7E/pMexSHGUxtrrE20DmkDWdB8uKblB5kS3HOXKfXyVHXlLv6Km45l9a
+K96ncM/RxgAi2K02nqy9hUfUio8bT2G3ORV2JFlKZMmIL7b2Dbmdk7E8rTx1aczk
+q5ePnXfPfT84O40yxrQ6laq1C4TYsw6tFz+ClOQ0G7GZWuI22pEt2Va2k7MuaKIk
+ZKsfBYezOM8pVKfw9ybl2MzEewXWiIpF00LbDe4kPGXLjcWlSYxpO5Zr7z3s7so+
+nA/GhyWzdWQAXI2RfcCWRCHxzY6cu/UJMce4pEK3JYhZJKC9z6oupz+TvPXKnAq5
+Qy1CSt+8IxgUWeX34Ab9xOkz6ehc8L3vi+P0E55g0rgFVN+vouTl1hw/xyorHmq+
+PcveRkk1TsyLDfKVENc2fGZbrx+T+izUJNRM+EgVuJ9W89PCqnd68R/hQFPbJVZH
+ddC34U4G7W6IiggVyAaMqLl5+frg2x4vu3GQ7icBWYZWuPi/iRhzU/OW7xun6kCk
+ijFbCGES3FoVm/8M38fT
+=nwiu
 -----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
new file mode 100644
index 000000000000..2867de86e8e1
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch
@@ -0,0 +1,13 @@
+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
+@@ -1,7 +1,5 @@
+ # Internal binaries
+-## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
+-rpmlibexecdir = $(prefix)/lib/rpm
++rpmlibexecdir = $(pkglibexecdir)
+ 
+ # Host independent config files
+-## HACK: it probably should be $(datadir)/rpm
+-rpmconfigdir = $(prefix)/lib/rpm
++rpmconfigdir = $(pkglibexecdir)
diff --git a/app-arch/rpm/rpm-4.9.1.2-r1.ebuild b/app-arch/rpm/rpm-4.9.1.2-r1.ebuild
new file mode 100644
index 000000000000..d8aa363d5294
--- /dev/null
+++ b/app-arch/rpm/rpm-4.9.1.2-r1.ebuild
@@ -0,0 +1,118 @@
+# 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 $
+
+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="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+
+IUSE="nls python doc 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 )
+	lua? ( >=dev-lang/lua-5.1.0[deprecated] )
+	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
+	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
+}