Version bump to 4.9.1.3 wrt bug#410949.

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

4 files changed, 25 insertions, 134 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index c7c57f61ba2a..fca6c0adb746 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.140 2012/05/24 04:34:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.141 2012/06/01 13:59:04 scarabeus Exp $
+
+*rpm-4.9.1.3 (01 Jun 2012)
+
+  01 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> +rpm-4.9.1.3.ebuild,
+  -rpm-4.4.7-r6.ebuild, -rpm-4.9.1.2-r2.ebuild:
+  Version bump to 4.9.1.3 wrt bug#410949.
 
   24 May 2012; Mike Frysinger <vapier@gentoo.org> rpm-5.1.6.ebuild:
   Inherit user for enewuser/etc...
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index bccdc522ad54..a4cb9ffe626e 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -16,30 +16,29 @@ AUX rpm-4.8.1-autotools.patch 929 RMD160 9b4b1b08e38f79522a5b1e6ab487ed89b8234ad
 AUX rpm-4.8.1-db-path.patch 628 RMD160 cee347c45bbbebd724dd1346bd74b3344b6a7d06 SHA1 08c3aa65104db74c9851911970711b2f503dfcc8 SHA256 791682c72dd3a24e5e8268bfa967412035aa135c7b8d4673541bed129b89a0f3
 AUX rpm-4.9.1.2-libdir.patch 1056 RMD160 f9407d89f097a746947b7817f095dbe2ef07983e SHA1 74aea2f9b006b96a42625e0d895bc9f27ebaa0da SHA256 e4beb68b13861ccedcaa0a90c49f42c6dd7a2d7799360798b21eec7ea689437c
 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-4.9.1.3.tar.bz2 3485850 RMD160 6c9860c3d6f26c86e9512df94bf4cf8ebef5b10b SHA1 d1157a05a2368de07e06638daee01d3749107c8b SHA256 531894301e1a9891baf356fb32f732b10d1b313f5c5875a47fdcbdc0c3f67883
 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-r2.ebuild 2605 RMD160 aa0f324d00f8342e2dd028d3c38f3264c5d4390a SHA1 c3eea49dafd81acec58ddc738153662ef4893198 SHA256 b9496b91d0d95e6eb45a634e176c8f22816f40d6c3f1974f4f3f7aa908abf1c6
 EBUILD rpm-4.9.1.2.ebuild 2489 RMD160 b64969def0d21696540fddc9487d45236b8b926a SHA1 b791124a00b05a00200919a43564756bb5ab119f SHA256 d391dc7ad4a43b64422ab6e506883a936a7336b0e25cb9e1ef55d2479bbe080e
+EBUILD rpm-4.9.1.3.ebuild 2604 RMD160 fa34b8bf64646415ad2b1678c1de3616fb1a1e93 SHA1 90b7705ec3eb7514913f4fb2c6c5c7926364ced3 SHA256 8d5a6de694392a420bafd69545cd80f9fceb9b5de49a54c0f3c2e23910345342
 EBUILD rpm-5.1.6.ebuild 2965 RMD160 2def9d4e44cdfd12f8b4e7744064726bd23170ba SHA1 7c0a66d7a69fd4de660215718275e45dd870c62e SHA256 e54e87adb9d2947e6ce00c0bbffd022b2be989de27c76feab55adc70e0195b4e
-MISC ChangeLog 21833 RMD160 f65d90c222d78d8b6bbce9aead0a0d6e52e2c732 SHA1 a9ddc58421fb14b271fb9b99c2c810125b833104 SHA256 557ace973923ae2629ff9b1d48ae86c33e9a786544d5ffc4ff57b1de89cee72f
+MISC ChangeLog 22031 RMD160 d3618dbfca304bdf099f4b45138bd6e5edea8167 SHA1 d5dcc4082860de47bcbff7f91eceb3a3f4486be1 SHA256 4482acd95e383bd4d6c68cf540136a20f8a896adb843c1fab7acb302a8e56c2a
 MISC metadata.xml 412 RMD160 f80c92312d155e06f578bfafc5c6887a87a50029 SHA1 90899c21608493640f9e30dca30613b7823c9854 SHA256 49b33ada612c71654ff1706d78dbeb1d4150455e661c46b343cd5523386d3cd0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPvbqmAAoJELEHsLL7fEFWvtgP/2pMSYfvzUIs2+jxLAqrPg3a
-8ChSm7p/gF7uh3zI9teXTOvxr8qiXG7aTQt1KXk+uQGDdAawCZ4s6Bk3VM2E1pCg
-rLmKczeOhIcphh85Wh6Bh+TG+1jm3+dbkOEAbpbVUK+deWLb/8OKTOQhPd4khuYz
-+Anjzx++o78ng1Vp8eM5x0eKMUmtn3jG0UYNKVzEBkRFYtbT6pdrW7pvQuK2QsG+
-xpdiIng3jEQmdZL/asX7d1q5gzy/Yj/cOsPWIfhxHTWdxaljCuUmgP03CoyaHng2
-oE1cGfJO1x1gWX6BcfKkWRGT4PCUfLO4vjxDJ8AEETlWLzi8nK9X1EbQGncOc570
-x0DyUNrYHw458tEPdKbo25hYdiOZOIlKRpkmLOrouGRwmOIYXJcelawxHu5RfSrd
-M/n4uct42OCgHDTuHOQQ9uOevq5Vs5Kk5jLK7MIZ/syiHjvhhxRMhWWWtPw6BO9W
-7pblqxzz6tmWM3zyTLR9VBqs7PsSZU3V+MWVii42p9LHbuKpJE1Ypxluafl465VH
-rVj81ALHtL3E6lEkox3+y29r3W+PaAt+KWvk7FvxhAP9vI8Vxx1XbCrBcB6QXXXZ
-i64hu+M4lW2Q6tbnssuHbPdqdvjecaUENmQxoe37nk2e7mMfECdXNmA1MnZnidpw
-Txhavw+Td0Me+TTbhuDe
-=UKXc
+iQIcBAEBAgAGBQJPyMq1AAoJEOSiRoyO7jvobP8P/jsKTMW6QZbdj2wj1SQ1rfvk
+wieAOQkt6NI/qo34l/lBHF+C/IOQRV1TOH6F9KIj3DeH6Zw+Shcr+P85OEcw+5M9
+W+BhTcRfjkMH64ATRKdkhhsDxraquG867kUp3lIRa1hzTARm7YpODCigIS5jpQN+
+465NGqUDsEfJeMTwyUweFhQOVaBDZ0gJoZJbRtmJ2EFMCgi9bHXAv853Y/cTCEo8
+UQRnFwiNRp6aYRvmZ05+MWDJaNVwChZTbUcFmJwndNFmbEf0BGMf2XYNtB3MU56f
+WaQHR4o/LLwT5pIwkhv5FSwouiA7Os3/SQmpXa7+ZE27W7LDaiKB50hjX4uYrot6
+oemA+FA/OpSGtj5Dfo/RTZHL1Ni2zswE96JVRF1GY0jPH2U2g7dopa7ikc7FCx+u
+HIL5ocnkVlLlJVzap0EuESPg18YTrSfnmfuWH/5NBL6hrPN+gw1AjkH/Uu3HzKkL
+UNUB8UrCuStx5Vb0pXpnetT7VGEOQLcrlgSmAk3d2cw9Kbz4qHq81XcUqJsCI2c6
+VjaR5N2ARsv9EKIcd+OZZVZ9UtkVx02QNRkeJbWMhC7Y05XLI+sbQpWvRDvLmw/2
+soZiPVsToq85esLl7u7oKdD+qrhoEr4aiZ89eTq79+NoNzeLeZlDvgCA8tEE7hkm
+DMzAXzte1O/maJ4ifmj3
+=xDXq
 -----END PGP SIGNATURE-----
diff --git a/app-arch/rpm/rpm-4.4.7-r6.ebuild b/app-arch/rpm/rpm-4.4.7-r6.ebuild
deleted file mode 100644
index 7afa721869f4..000000000000
--- a/app-arch/rpm/rpm-4.4.7-r6.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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.4.7-r6.ebuild,v 1.4 2011/01/08 19:21:44 arfrever Exp $
-
-EAPI="3"
-
-inherit eutils autotools perl-module flag-o-matic python
-
-DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="http://www.rpm5.org/"
-SRC_URI="http://rpm5.org/files/rpm/rpm-4.4/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls python perl doc sqlite"
-
-RDEPEND=">=sys-libs/db-4
-	>=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-libs/beecrypt-3.1.0-r1
-	python? ( >=dev-lang/python-2.2 )
-	perl? ( >=dev-lang/perl-5.8.8 )
-	nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	>=net-libs/neon-0.28"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/rpm-4.4.6-with-sqlite.patch
-	epatch "${FILESDIR}"/rpm-4.4.7-stupidness.patch
-	epatch "${FILESDIR}"/rpm-4.4.6-autotools.patch
-	epatch "${FILESDIR}"/rpm-4.4.6-buffer-overflow.patch
-	epatch "${FILESDIR}"/${P}-qa-implicit-function-to-pointer.patch
-	epatch "${FILESDIR}"/${P}-qa-fix-undefined.patch
-	epatch "${FILESDIR}"/${P}-have-locale-h.patch
-	# bug 214799
-	epatch "${FILESDIR}"/${PN}-4.4.6-neon-0.28.patch
-
-	# rpm uses AM_GNU_GETTEXT() but fails to actually
-	# include any of the required gettext files
-	cp /usr/share/gettext/config.rpath . || die
-
-	# the following are additional libraries that might be packaged with
-	# the rpm sources. grep for "test -d" in configure.ac
-	cp file/src/{file,patchlevel}.h tools/
-	rm -rf beecrypt elfutils neon popt sqlite zlib intl file
-
-	sed -i -e "s:intl ::" Makefile.am
-	sed -i -e "s:intl/Makefile ::" configure.ac
-	AT_NO_RECURSIVE="yes" eautoreconf
-	# TODO Get rid of internal copies of lua, db and db3
-}
-
-src_configure() {
-	# Until strict aliasing is porperly fixed...
-	filter-flags -fstrict-aliasing
-	append-flags -fno-strict-aliasing
-	econf \
-		--enable-posixmutexes \
-		--without-javaglue \
-		--without-selinux \
-		$(use_with python python $(python_get_version)) \
-		$(use_with doc apidocs) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install || die "emake install failed"
-
-	mv "${D}"/bin/rpm "${D}"/usr/bin
-	rmdir "${D}"/bin
-
-	use nls || rm -rf "${D}"/usr/share/man/??
-
-	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
-	dodoc CHANGES CREDITS GROUPS README* RPM*
-	use doc && dohtml -r apidocs/html/*
-
-	# Fix perllocal.pod file collision
-	use perl && fixlocalpod
-
-	#remove .la file. Bug #300096
-	use python && python_clean_installation_image
-}
-
-pkg_postinst() {
-	if [[ -f "${ROOT}"/var/lib/rpm/Packages ]] ; then
-		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${ROOT}"/usr/bin/rpm --rebuilddb --root="${ROOT}"
-	else
-		einfo "No RPM database found... Creating database..."
-		"${ROOT}"/usr/bin/rpm --initdb --root="${ROOT}"
-	fi
-
-	use python && python_mod_optimize rpm
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup rpm
-}
diff --git a/app-arch/rpm/rpm-4.9.1.2-r2.ebuild b/app-arch/rpm/rpm-4.9.1.3.ebuild
index 00d4c94eec4d..7e46b855a427 100644
--- a/app-arch/rpm/rpm-4.9.1.2-r2.ebuild
+++ b/app-arch/rpm/rpm-4.9.1.3.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.2 2012/05/06 16:54:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.9.1.3.ebuild,v 1.1 2012/06/01 13:59:04 scarabeus Exp $
 
 EAPI=4