Mark ~x86 #135854. Add DEPEND on neon #135760.

Package-Manager: portage-2.1

4 files changed, 122 insertions, 5 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index f477b49ca6b9..076f481d568b 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/rpm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.54 2006/06/03 23:19:22 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.55 2006/06/10 08:10:48 chrb Exp $
+
+*rpm-4.4.1-r1 (10 Jun 2006)
+
+  10 Jun 2006; Chris Bainbridge <chrb@gentoo.org> +rpm-4.4.1-r1.ebuild:
+  Mark ~x86 #135854. Add DEPEND on neon #135760.
 
 *rpm-4.4.1 (03 Jun 2006)
 
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 1eae9ce809c7..32365beadc0a 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -54,14 +54,18 @@ EBUILD rpm-4.2.ebuild 2553 RMD160 4ffe8e36c34f85afc03c74a9c32bec84901ebbcb SHA1
 MD5 a8f99d032181d0baadf875871dc42f73 rpm-4.2.ebuild 2553
 RMD160 4ffe8e36c34f85afc03c74a9c32bec84901ebbcb rpm-4.2.ebuild 2553
 SHA256 13b9700ce9420e125eaed4b8f6729fe9063b8df926e1c01fdffede3f6d01c82d rpm-4.2.ebuild 2553
+EBUILD rpm-4.4.1-r1.ebuild 2657 RMD160 02ea5ce555ef1bf77c953c0178597aafef6db591 SHA1 947dee273730883ab5783f4ed9f4cfc08bae4130 SHA256 87172319ff377fc6c4414254915e9d60d276b19c265bea797ce73e66617485db
+MD5 f6b07d124a16a0259d0d9881174cf813 rpm-4.4.1-r1.ebuild 2657
+RMD160 02ea5ce555ef1bf77c953c0178597aafef6db591 rpm-4.4.1-r1.ebuild 2657
+SHA256 87172319ff377fc6c4414254915e9d60d276b19c265bea797ce73e66617485db rpm-4.4.1-r1.ebuild 2657
 EBUILD rpm-4.4.1.ebuild 2642 RMD160 8099f3ef103b4d331562dca00acdeeeb841c6cc6 SHA1 06594b34d50aa86aed7f42466b0dc73d8200e7b0 SHA256 acef5da64da227223b8b04fa81f9158dac04be759bc23ab7048ca12d30712505
 MD5 863d2e6bd7eaaf7d740b0327d1a7d28f rpm-4.4.1.ebuild 2642
 RMD160 8099f3ef103b4d331562dca00acdeeeb841c6cc6 rpm-4.4.1.ebuild 2642
 SHA256 acef5da64da227223b8b04fa81f9158dac04be759bc23ab7048ca12d30712505 rpm-4.4.1.ebuild 2642
-MISC ChangeLog 7951 RMD160 703f85ff4014ecb32765b518da9ebb0dbf969581 SHA1 830fb40fbce925d51d838b3328cc79f576f7b8af SHA256 8fbf32a591a3267923f845a3b8f0877985b98660cf2af394a70155bc11bc0b91
-MD5 aa5ce82e89b19c8754f8584f27d0bdb7 ChangeLog 7951
-RMD160 703f85ff4014ecb32765b518da9ebb0dbf969581 ChangeLog 7951
-SHA256 8fbf32a591a3267923f845a3b8f0877985b98660cf2af394a70155bc11bc0b91 ChangeLog 7951
+MISC ChangeLog 8099 RMD160 46123092a15d74c9ce339423a039e15e749a35c1 SHA1 700ba73b7ff2cc139bc3a7cd41c4a319dc3e835d SHA256 3954e8f94866831fdf6bb9148004cf3969cfd0fc7ae1ff34b5db99a59718a64c
+MD5 b1dc4896e8ab8910662d747c95ce6acc ChangeLog 8099
+RMD160 46123092a15d74c9ce339423a039e15e749a35c1 ChangeLog 8099
+SHA256 3954e8f94866831fdf6bb9148004cf3969cfd0fc7ae1ff34b5db99a59718a64c ChangeLog 8099
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
 MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
@@ -84,3 +88,6 @@ SHA256 7623c9587374f8164538ee6937ada48be87d8ca0f92ccb2d8a9be63be4003866 files/di
 MD5 9d38caac944f806b2be6ac458bffbeab files/digest-rpm-4.4.1 235
 RMD160 fd104cc3482b3eab61ca448324b2312d1f04f9c7 files/digest-rpm-4.4.1 235
 SHA256 db4eebd4f82cd87ab079bb9f098dca159877165316dbdcb54d2a9ae50667aacb files/digest-rpm-4.4.1 235
+MD5 9d38caac944f806b2be6ac458bffbeab files/digest-rpm-4.4.1-r1 235
+RMD160 fd104cc3482b3eab61ca448324b2312d1f04f9c7 files/digest-rpm-4.4.1-r1 235
+SHA256 db4eebd4f82cd87ab079bb9f098dca159877165316dbdcb54d2a9ae50667aacb files/digest-rpm-4.4.1-r1 235
diff --git a/app-arch/rpm/files/digest-rpm-4.4.1-r1 b/app-arch/rpm/files/digest-rpm-4.4.1-r1
new file mode 100644
index 000000000000..2013664b71ca
--- /dev/null
+++ b/app-arch/rpm/files/digest-rpm-4.4.1-r1
@@ -0,0 +1,3 @@
+MD5 90ded9047b1b69d918c6c7c7b56fd7a9 rpm-4.4.1.tar.gz 11497447
+RMD160 b2b34d678c4707c1c1bf8e05e7b92a8956bb4226 rpm-4.4.1.tar.gz 11497447
+SHA256 4a5e2a5a64a47344b6447b54e046b8550ea7ee99344eee3e8d4c087cb148552b rpm-4.4.1.tar.gz 11497447
diff --git a/app-arch/rpm/rpm-4.4.1-r1.ebuild b/app-arch/rpm/rpm-4.4.1-r1.ebuild
new file mode 100644
index 000000000000..fe7d71ac32bd
--- /dev/null
+++ b/app-arch/rpm/rpm-4.4.1-r1.ebuild
@@ -0,0 +1,102 @@
+# 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.1-r1.ebuild,v 1.1 2006/06/10 08:10:48 chrb Exp $
+
+inherit python flag-o-matic libtool eutils
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="http://www.rpm.org/"
+SRC_URI="mirror://gentoo/${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 doc"
+
+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
+	>=dev-libs/beecrypt-3.1.0-r1
+	python? ( >=dev-lang/python-2.2 )
+	nls? ( virtual/libintl )
+	net-misc/neon"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/rpm-4.4.1-ubuntu-fixup.patch
+	cd ${S}
+	elibtoolize
+	libtoolize --copy --force
+}
+
+src_compile() {
+	strip-flags
+
+	unset LD_ASSUME_KERNEL
+	local myconf
+	myconf="--enable-posixmutexes --without-javaglue --without-selinux"
+
+	python_version
+	use python \
+		&& myconf="${myconf} --with-python=${PYVER}" \
+		|| myconf="${myconf} --without-python"
+
+	econf ${myconf} `use_enable nls` || die
+	make || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	mv ${D}/bin/rpm ${D}/usr/bin
+	mv ${D}/bin/rpmbuild ${D}/usr/bin
+	rm -rf ${D}/bin
+	# Fix for bug #8578 (app-arch/rpm create dead symlink)
+	# Local RH 7.3 install has no such symlink anywhere
+	# ------
+	# UPDATE for 4.1!
+	# There is a /usr/lib/rpm/rpmpopt-4.1 now
+	# the symlink is still created incorrectly. ???
+	rm -f ${D}/usr/lib/rpmpopt
+	rm -f ${D}/usr/lib/libpopt*
+	rm -f ${D}/usr/include/popt.h
+	use nls && rm -f  ${D}/usr/share/locale/*/LC_MESSAGES/popt.mo
+	rm -f ${D}/usr/share/man/man3/popt*
+
+	keepdir /var/lib/rpm
+	keepdir /usr/src/pc/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+	keepdir /usr/src/pc/RPMS/{noarch,i{3,4,5,6}86,athlon}
+	keepdir /usr/src/pc
+	dodoc CHANGES CREDITS GROUPS README* RPM* TODO
+
+	use nls || rm -rf ${D}/usr/share/man/{ko,ja,fr,pl,ru,sk}
+
+	# create /usr/src/redhat/ and co for rpmbuild
+	for d in /usr/src/redhat/{BUILD,RPMS,SOURCES,SPECS,SRPMS}; do
+		dodir "${d}"
+	done
+}
+
+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
+
+	python_version
+	python_mod_optimize /usr/lib/python${PYVER}/site-packages/rpmdb
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup
+}