Version bump to latest release.

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

4 files changed, 153 insertions, 15 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index b7108a6292b7..675ad8cb1f16 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/rpm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.173 2013/02/15 11:38:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.174 2013/03/26 18:17:24 scarabeus Exp $
+
+*rpm-4.11.0.1 (26 Mar 2013)
+
+  26 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/rpm-4.11.0-autotools.patch, +rpm-4.11.0.1.ebuild,
+  files/rpm-4.8.1-db-path.patch:
+  Version bump to latest release.
 
   15 Feb 2013; Tomáš Chvátal <scarabeus@gentoo.org>
   -files/rpm-4.8.1-autotools.patch, -rpm-4.10.0.ebuild:
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index d1f90a7f7bd7..dcc2d6254a22 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -2,26 +2,29 @@
 Hash: SHA256
 
 AUX rpm-4.10.2-autotools.patch 1320 SHA256 c491a15aad393b46df6f880d8e493073d81e173e95708dd70581ba1499bcbb63 SHA512 5cdf21c12a96f382927b9ffe58d2c31b8b3feeebf89c6fff83f824d1129e4d82553e01f7d0ee0719dc4ba0136d57bc168423604c54ed2ab397449c73f6b1150a WHIRLPOOL f2f3019e8199484ec92eefe5fe1d6ef5f81e0a99fd539ff8800e30e0f0420243c81607547400c0cdb3c85cfe6d640eb33e32cded4e71c36af8346561ea7fc1f6
+AUX rpm-4.11.0-autotools.patch 503 SHA256 f1020af54fcad6271376ff50e9a2a166e31bb8602401bbbeadb570a82dc8b11d SHA512 fdec043c3db2315aaabd3da91067a8d299ba564eaf53ba6465840352586f0660a5216cfd291b19398a53b2646f4a0b312076e14e56004d8e941d4ae279d54305 WHIRLPOOL 0acf50816eeec2fa4dca4488df83febece25b47b78fd94dcb0264c8e45ecc4b5e5ccd6e7d200dbe66c7737023c408d5549ef1070dcc8c3576eef959616b121d4
 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.2.tar.bz2 3545536 SHA256 e9278a2b40f08bae5a9592b9b42f11f88b2e880cc34e57113d53461ed7de6e7b SHA512 7e290e0c0a993a96d575c8c962250f0eac12e11cd678d2f46cb23fbdb1e8dc1b2d63dc4dfa3efe7fa8917d34598a279eaf845331b311f64d02bcc4e93faae266 WHIRLPOOL bdf781030a5760d99950cb7162d2780675b00fe41ecb51b2d9ba22466ce150499489c25fc0a234143403d4d244351afa81828e20fe57bb67cdeaff5f712fbc13
+DIST rpm-4.11.0.1.tar.bz2 3670158 SHA256 98496c0c73095d7c66a8b6f1d8ab00998e1daf4e46a017ae74190c65132ffb21 SHA512 72bd3054b2d0def1e25fba7113eda14def38baef62b558e65cafaf3b374823d0905d982772cffddfd9dc6698eff293251acb2ace7dfda0964085669caa88d535 WHIRLPOOL bf37145cfecb2820b21f3a79c7c28048bf6b1c25500720d4159083b75535cf79075840b8d73e3b5562aab6ad520e384d0fd4e2aff26fb4e212bb863115682afb
 EBUILD rpm-4.10.2.ebuild 2784 SHA256 32bb6b837adc44876ffaf3be99f9ad7a19db73f147c3dddc18e79c4905a4172d SHA512 e527ca794bef66a6447e554ddc460a09b87687e6e300313e4496418b0addbacf29d1827db7891306f63b758817443d66c70dd4dc76c287d1fda9aa0103a39a36 WHIRLPOOL 9b79bdf34b498693aab7d43a5077eeb417657ff022fc6b709a237725d1c240bbdb4955c0568f350f778946e04c94fcc4610588ad490e321601b9ce1f143e7d73
-MISC ChangeLog 26435 SHA256 d3bfd7e7289018bb7052639040ffd5ef8871362b8164d0b4073ba70cbd6938cf SHA512 fdab5f22474af43468bb74088bb0eb8e2297249ce0bfba4d1efbae0b60dc281b9e17818428906e207e96c492355a367907b3a525bb71e330012d56424b1df3ac WHIRLPOOL 22a2ad0bf8584476a761438f3ee7a9ddf9701da317f48f25a61e08a0db217782ec16f0dfc4640dc8d5e356afe897bb78b7d6f46535254108f0b778cb6848d412
+EBUILD rpm-4.11.0.1.ebuild 2755 SHA256 4f16dadbdf0b53920116fb1dad0cf76600b8b26e90fd30b85e451898ff8bf84b SHA512 4c66cfbe74275a4ed39271b70d65a6419bc3f30053b64151157fff1f688b38e7bffbdf9f8a44ca70a27509ddd05d613a75d379d507c00c269c1908fa874f3a72 WHIRLPOOL a20382054a62fab5c8f6f9814ab333566dda040d95b73e37b7d8e6b8d90c0caad2dc814de0bfc51143096bc8da52d38869a6c9c22e2160e1df8ecf27b94a994e
+MISC ChangeLog 26646 SHA256 084b363d3ef5bcf0f489883f6648e350928122ce9357c8c9a944bb2c9bbb3fe7 SHA512 8771229f482e68d9979a80434fd9579411ce2547a6567bddc61b85c52b115926ddf92c2af8be3f66eaced178b5a506bea6954503e296ac4105fe03046933dcd3 WHIRLPOOL 0d0465f4318e70c68287f931784ad7f2f238661cdc2a5d19b9d615853d24e5a917980b0d87608b3dd040e41dc2ee8cc88a46c69daee4b0e2b0761ea624b1d663
 MISC metadata.xml 258 SHA256 d18cd3c79f172a08970999a154c3ae331f1e6eabe37e677a4491e6ccf5122ab2 SHA512 a35165b524655cb15d343890439b14c3f5eaa998825338a5adc4cff8edad391869c31bc33b4f9bf7bb03a99653684c3f4eb5897b314c0ca1e89defba3f4b9dcf WHIRLPOOL c7d2a308b3d592fc50542eb844e302f214ee6b738b4853332e0a2c034c32cdefd646b5e6c50351e7735ac87f97bf5a5d211d121373a0ace625e564862a62f1ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRHh5DAAoJEOSiRoyO7jvoaukP/0/Xq9jOdtfIh6Cv14G154ue
-5z4QWowvkWk0WD43wjSiIfXLDvo7tFCWOUOMdHweYH/Enb7E8pntyZh/YfvyErSm
-KnJNQFOoWy7NGHTUOWvSg+9Zdh3mRBZJ/DQKDnFvpcNa92jjaGPLFKQEhvEKd+zf
-RGf693m3eqeG+gl/PUjN7Mf2D1iYClkT0lSo5IzN5Ql2t5Q+PtAKW2kyXSS3/Avg
-4DY3Uk0/+nOj45c1lHm8OqIgkdbdLi47StGBoTLfw+Yyir1VmTeMOqH3AFlP9TRu
-nUvWGoimgBntXjeAuXoxpF4Jvh9m4j/lt2SM+kpN0igMqQw9D1pLKK96pnunr5kP
-26GJd7LFaqe48EBegaccTtrrOi5tcG8qeAJUZxQHoJaiuJxIj/1+ti85kN2RDwdc
-M4A2M/HbDHKKsrniebbLEgq2lFTi0aCZ9YbbJu4Tr6cFJ7zLUA4riPi61vd1hAEz
-k68HKtOXcI/gLsgbldqyZlI5MlBUZtzL9/RixuxJuWWtuXRAUoDbINlG63+oQO7d
-COAAWlR66KcSGduiH9S8vnNqHPOiAwq298buceRtZngsOwb+qsOzOXErrkTXz4DA
-A2UjoqxJDma2In40CzpMM2/RaA2sH4xvLWtpDbF9fMC1pb7eXQqqYxBDYPijMJRO
-49KAr7gNBkXYlr2S2Q0A
-=bFPj
+iQIcBAEBCAAGBQJRUeY1AAoJEOSiRoyO7jvoIaIP/RtUFw34+lGSBPVra5X3fcOi
+YWSoXAl7mJYfB24ESW8En/1CFHIpOpdQoewfaEoga2+5tUKTWfdp+JU6edQIRS0A
+kzEt2S3F4R7u6eGGfz+sDklXC5Sk6SKJTlaTEqSgRk7SG420ws1C7EHIIQaEuDjL
+jZLyWMvtODwSPWRO8QQai3uHLgkQ8FcyFX0mum2171z7Rwg/TcWDXLW4hqY1of7B
+gMS7z/a4pFxyrADtOwI0TQOMvMVQSaEolphRrdBmO++9vl1nppf3FU1KLaLnShs2
+PdFaDBNV+h5gL9Wyv9TxzfALaHa2IMlotB4rBmvaCq8pHRJWpn9cLjxBXaliNuQn
+XlEXeCsg0MxasykE1xNvBeD2U2XFlkuz4TRIPFsHl84xeHGmmRGBwpFzHvM7JmFw
+8FnM03nz83jMqWOnV8Gk4ugmcrP+CpALxfEKi8RTWryM0azZIdyPHKf1f74j0K1L
+ekP/simwxwtYKAII8Zq8Z7G0KAkgb7R9MYzfO2hQjTsA1m0hAaQG4pqKxtxkXMNh
+aABZ8D2BkHyhVI3VzPY/5xeLN8FlGMv2cl3BnWjdBztQKzxZfsiV5N5cq2Agj0gv
+IJELSaLnODShG1AJNIb+tt8v0G9UCd0H/yUgpldmHFtnafLIrLhLthMPCBzg4nyd
+7NPL9hSMd3gVah3F5wYa
+=gyWw
 -----END PGP SIGNATURE-----
diff --git a/app-arch/rpm/files/rpm-4.11.0-autotools.patch b/app-arch/rpm/files/rpm-4.11.0-autotools.patch
new file mode 100644
index 000000000000..2a2dcb129de3
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.11.0-autotools.patch
@@ -0,0 +1,14 @@
+diff -urN rpm-4.11.0.1.old/configure.ac rpm-4.11.0.1/configure.ac
+--- rpm-4.11.0.1.old/configure.ac	2013-03-26 18:38:35.137667450 +0100
++++ rpm-4.11.0.1/configure.ac	2013-03-26 18:44:08.632673258 +0100
+@@ -824,10 +810,6 @@
+ 
+ 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.11.0.1.ebuild b/app-arch/rpm/rpm-4.11.0.1.ebuild
new file mode 100644
index 000000000000..a70e78665860
--- /dev/null
+++ b/app-arch/rpm/rpm-4.11.0.1.ebuild
@@ -0,0 +1,114 @@
+# 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.11.0.1.ebuild,v 1.1 2013/03/26 18:17:23 scarabeus Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils autotools flag-o-matic perl-module python-single-r1 versionator
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="http://www.rpm.org"
+SRC_URI="http://rpm.org/releases/rpm-$(get_version_component_range 1-2).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? ( ${PYTHON_DEPS} )
+	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 )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.11.0-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
+
+	# Prevent automake maintainer mode from kicking in (#450448).
+	touch -r Makefile.am preinstall.am
+}
+
+src_configure() {
+	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
+	econf \
+		--without-selinux \
+		--with-external-db \
+		--without-beecrypt \
+		$(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
+	prune_libtool_files --all
+
+	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
+}