Hopefully bug #151025 is fixed. Also removed herd tag from metadata.xml because we do not need to add herd tag if package does not belong to any herd.

(Portage version: 2.1.1)
 (Unsigned Manifest commit)

3 files changed, 19 insertions, 124 deletions

diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index cb461c79a174..c282ec48ebf6 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,34 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX rpm-4.4.6-stupidness.patch 4548 RMD160 b19b84e0a76eff3e7c5c63f6b428ae88f1888ff6 SHA1 9698050929574a854a2a10ea76b888ca9e0d70d1 SHA256 e8f30eda707ee2c19dd607d338e9e6e7d9837e7522db147b5b9922f9eb712cbb
-MD5 a867d67e5d1190da7f32f65f1294ed68 files/rpm-4.4.6-stupidness.patch 4548
-RMD160 b19b84e0a76eff3e7c5c63f6b428ae88f1888ff6 files/rpm-4.4.6-stupidness.patch 4548
-SHA256 e8f30eda707ee2c19dd607d338e9e6e7d9837e7522db147b5b9922f9eb712cbb files/rpm-4.4.6-stupidness.patch 4548
+AUX rpm-4.4.6-stupidness.patch 6276 RMD160 747080e3ca02fca5a0643c19bcf468f569907fe3 SHA1 cae2b8f15abc4e8d10cef3ebf7f0c559ac51d200 SHA256 d23d71928196d411c8d1a55aef8f9826648b83b0eba4541c26ee503773840187
+MD5 155ba7d0190991e4d5c6803322117636 files/rpm-4.4.6-stupidness.patch 6276
+RMD160 747080e3ca02fca5a0643c19bcf468f569907fe3 files/rpm-4.4.6-stupidness.patch 6276
+SHA256 d23d71928196d411c8d1a55aef8f9826648b83b0eba4541c26ee503773840187 files/rpm-4.4.6-stupidness.patch 6276
 AUX rpm-4.4.6-with-sqlite.patch 594 RMD160 0f6f86fe359c312126470a82e03cc58adf64ba7c SHA1 1e8b9bb91b1102568bbfbf5c79162a0e7dfbea31 SHA256 af76988e16f02a4e8171826cc2a2cba6633de8364487642a1ed1dc30e8e41bfe
 MD5 4ced99d8956ba371e8575ecd7a985ffa files/rpm-4.4.6-with-sqlite.patch 594
 RMD160 0f6f86fe359c312126470a82e03cc58adf64ba7c files/rpm-4.4.6-with-sqlite.patch 594
 SHA256 af76988e16f02a4e8171826cc2a2cba6633de8364487642a1ed1dc30e8e41bfe files/rpm-4.4.6-with-sqlite.patch 594
 DIST rpm-4.4.6.tar.gz 17157249 RMD160 6b433d20a63fb2542244ae62eff0a8b5fe290439 SHA1 33221f95189671d1a083b4f140bcf9a88ecd4374 SHA256 1e1da50af2b9dfe34c79315eae7520e7e57087671e17ce26107d779ae2b0b595
-EBUILD rpm-4.4.6-r1.ebuild 2490 RMD160 71f273126978df0bd0af3406f783e704004e0673 SHA1 524a9343376590fa156a9792a9474eea8493a493 SHA256 9b7e1c1d0696d5afb27088965296e9deb3e7f87afbc974fad56998369c2d177c
-MD5 c580939898aa93ec3176f918c2559036 rpm-4.4.6-r1.ebuild 2490
-RMD160 71f273126978df0bd0af3406f783e704004e0673 rpm-4.4.6-r1.ebuild 2490
-SHA256 9b7e1c1d0696d5afb27088965296e9deb3e7f87afbc974fad56998369c2d177c rpm-4.4.6-r1.ebuild 2490
-MISC ChangeLog 9820 RMD160 c3b33ca78def9a708324e5abdc5ebdfccdd687d5 SHA1 43d1e7b8fc9bd2eb75931e079700dead7c101e20 SHA256 4b42bb6804173ced80e623106d11ab47631bd6ca5f87f44f8fc69d49e7b62996
-MD5 928b68bfc4ebb5b506a9ad26845fee93 ChangeLog 9820
-RMD160 c3b33ca78def9a708324e5abdc5ebdfccdd687d5 ChangeLog 9820
-SHA256 4b42bb6804173ced80e623106d11ab47631bd6ca5f87f44f8fc69d49e7b62996 ChangeLog 9820
-MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
-MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
-RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
-SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a metadata.xml 231
-MD5 5ee2f2cd59d279b728247d54548a3529 files/digest-rpm-4.4.6-r1 235
-RMD160 cb1beebaaafaa9024dca4713846df4da6877e723 files/digest-rpm-4.4.6-r1 235
-SHA256 1a9d97d24a7c07cfd808a471e9fd22ced0813b41a109f6716b1d216fc828ecce files/digest-rpm-4.4.6-r1 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFMv9IamhnQswr0vIRAqOSAJ9H47kOwLOg9QLCZvaUrCSKvxP+cgCdGRVK
-pZ0UWqZWZJBSmmc6obcdR5c=
-=H8/Y
------END PGP SIGNATURE-----
+EBUILD rpm-4.4.6-r2.ebuild 2487 RMD160 0673a9b358fa233eb8b1fe7328d52a189a603b03 SHA1 828ecfa8b25f3479dc057731bb22a87006923b7d SHA256 47619cd818c5b2b32bb2c33ab1c793aab387e339d7a81bad520c6e59308fbfa1
+MD5 97ba0036810b3a7ee01294367e76be80 rpm-4.4.6-r2.ebuild 2487
+RMD160 0673a9b358fa233eb8b1fe7328d52a189a603b03 rpm-4.4.6-r2.ebuild 2487
+SHA256 47619cd818c5b2b32bb2c33ab1c793aab387e339d7a81bad520c6e59308fbfa1 rpm-4.4.6-r2.ebuild 2487
+MISC ChangeLog 10145 RMD160 8a781b91de372044f8723462cd71f6e820452c2e SHA1 10442d1f4e6d55cc10c3874ae6d18f79b01f242b SHA256 a466850376de875e972331e23e7b7b8765c1adcf5a16088229f5112ede7c066a
+MD5 246647ccf232750e1890efb5feae0d24 ChangeLog 10145
+RMD160 8a781b91de372044f8723462cd71f6e820452c2e ChangeLog 10145
+SHA256 a466850376de875e972331e23e7b7b8765c1adcf5a16088229f5112ede7c066a ChangeLog 10145
+MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
+MD5 c667f921ee8d48ce17ebef0f8d601ea4 metadata.xml 210
+RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 metadata.xml 210
+SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 metadata.xml 210
+MD5 5ee2f2cd59d279b728247d54548a3529 files/digest-rpm-4.4.6-r2 235
+RMD160 cb1beebaaafaa9024dca4713846df4da6877e723 files/digest-rpm-4.4.6-r2 235
+SHA256 1a9d97d24a7c07cfd808a471e9fd22ced0813b41a109f6716b1d216fc828ecce files/digest-rpm-4.4.6-r2 235
diff --git a/app-arch/rpm/files/digest-rpm-4.4.6-r1 b/app-arch/rpm/files/digest-rpm-4.4.6-r1
deleted file mode 100644
index 8dae251f56e0..000000000000
--- a/app-arch/rpm/files/digest-rpm-4.4.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 baa6f371446c65b4080d1cd1f194a7ae rpm-4.4.6.tar.gz 17157249
-RMD160 6b433d20a63fb2542244ae62eff0a8b5fe290439 rpm-4.4.6.tar.gz 17157249
-SHA256 1e1da50af2b9dfe34c79315eae7520e7e57087671e17ce26107d779ae2b0b595 rpm-4.4.6.tar.gz 17157249
diff --git a/app-arch/rpm/rpm-4.4.6-r1.ebuild b/app-arch/rpm/rpm-4.4.6-r1.ebuild
deleted file mode 100644
index ea35941d70b1..000000000000
--- a/app-arch/rpm/rpm-4.4.6-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.6-r1.ebuild,v 1.1 2006/10/16 03:18:47 vapier Exp $
-
-inherit eutils autotools distutils perl-module
-
-DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="http://www.rpm.org/"
-SRC_URI="http://wraptastic.org/pub/rpm-4.4.x/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls python perl doc sqlite"
-
-RDEPEND="=sys-libs/db-3.2*
-	>=sys-libs/zlib-1.1.3
-	>=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-misc/neon"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/rpm-4.4.6-with-sqlite.patch
-	epatch "${FILESDIR}"/rpm-4.4.6-stupidness.patch
-
-	# 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 file, lua, db and db3
-}
-
-src_compile() {
-	python_version
-	econf \
-		--enable-posixmutexes \
-		--without-javaglue \
-		--without-selinux \
-		$(use_with python python ${PYVER}) \
-		$(use_with doc apidocs) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_enable nls) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" 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
-}
-
-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
-
-	distutils_pkg_postinst
-}