4.2-r1 fixes bug #81982, marked 4.2.1 -amd64.

(Portage version: 2.0.51.21-r1)

5 files changed, 121 insertions, 19 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 064a8bf181a4..0a680651f3a1 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/rpm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.46 2005/05/10 22:16:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.47 2005/05/12 13:26:04 herbs Exp $
+
+*rpm-4.2-r1 (12 May 2005)
+
+  12 May 2005; Herbie Hopkins <herbs@gentoo.org> +rpm-4.2-r1.ebuild,
+  rpm-4.2.1.ebuild:
+  4.2-r1 fixes bug #81982, marked 4.2.1 -amd64 per cretins request.
 
   10 May 2005; Aron Griffis <agriffis@gentoo.org> rpm-4.2.1.ebuild:
   Revert blubb's patch which breaks rpm run-time on all arches
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 51b9a82edb84..06728e42e884 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 337bc707ebd84f28bf40062a3500ac47 ChangeLog 6520
-MD5 39d86265f90a025d3f73664b09444960 rpm-4.2.1.ebuild 2496
-MD5 9606504c35345b4a1cbb2f8bea3987a7 rpm-4.0.4-r5.ebuild 1628
 MD5 115fabc8d8e86dbe9e140bf8e4abb3fd rpm-4.2.ebuild 2507
+MD5 3a1be097aa17437e263a46dc090302c3 rpm-4.2.1.ebuild 2497
+MD5 b13a0d4b15fe790694e0795c3b5e5cc5 rpm-4.2-r1.ebuild 2829
+MD5 9c7c4256a9416a580d5b78f1183ea79d ChangeLog 6705
+MD5 9606504c35345b4a1cbb2f8bea3987a7 rpm-4.0.4-r5.ebuild 1628
+MD5 25a887527d85208a2d3023df4e02a7a4 files/digest-rpm-4.2-r1 60
+MD5 e7ef0e369ef68d513461dd831eb1ef4f files/digest-rpm-4.0.4-r5 62
 MD5 dd838f7f21d8a9eed6fdf9a18e7ba0e4 files/digest-rpm-4.2.1 62
+MD5 806f307798e39d580d5286d99c44b965 files/rpm-4.0.4-glibc2.3.diff 495
 MD5 bf958533b48913899e576ad1808ac868 files/rpm-4.2-pic.patch 1094
 MD5 0c884c21c81e004d6bf86d526aeeb855 files/rpm-4.2.1-lib64.patch 2398
+MD5 25a887527d85208a2d3023df4e02a7a4 files/digest-rpm-4.2 60
 MD5 ec4886ca775cb1cb83aebcd42f20f59f files/rpm-4.2.1-python2.3.diff 1479
-MD5 e7ef0e369ef68d513461dd831eb1ef4f files/digest-rpm-4.0.4-r5 62
 MD5 a440edb98e26eae7936e808d084e072b files/rpm-4.2-python2.3.diff 1559
-MD5 806f307798e39d580d5286d99c44b965 files/rpm-4.0.4-glibc2.3.diff 495
-MD5 25a887527d85208a2d3023df4e02a7a4 files/digest-rpm-4.2 60
 MD5 6b639232d435829fd97b09e10f58de81 files/rpm-4.0.4-system-popt.diff 18639
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCgTMEBXaUFmZvwyMRAqn5AJ9uFdQLfwIejRTlNE2EMCW5/VOLvACfT3DX
-DdM2U9xZ+G0Fl+un17NlyTE=
-=80IE
------END PGP SIGNATURE-----
diff --git a/app-arch/rpm/files/digest-rpm-4.2-r1 b/app-arch/rpm/files/digest-rpm-4.2-r1
new file mode 100644
index 000000000000..112ee0c363a5
--- /dev/null
+++ b/app-arch/rpm/files/digest-rpm-4.2-r1
@@ -0,0 +1 @@
+MD5 b7610e5704dfc3e06ff7e2e84e0eb57c rpm-4.2.tar.gz 9742106
diff --git a/app-arch/rpm/rpm-4.2-r1.ebuild b/app-arch/rpm/rpm-4.2-r1.ebuild
new file mode 100644
index 000000000000..1b4236147091
--- /dev/null
+++ b/app-arch/rpm/rpm-4.2-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2-r1.ebuild,v 1.1 2005/05/12 13:26:04 herbs Exp $
+
+inherit python flag-o-matic libtool eutils
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="http://www.rpm.org/"
+SRC_URI="mirror://gentoo/rpm-4.2.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~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
+	nls? ( sys-devel/gettext )
+	python? ( >=dev-lang/python-2.2 )
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/rpm-4.2-python2.3.diff
+	epatch ${FILESDIR}/rpm-4.2-pic.patch
+
+	# Disable the configue scripts handling of multilib libdirs
+	# since econf already sets --libdir correctly
+	sed -i -e 's:MARK64=64:MARK64=:' \
+		${S}/{,file,popt,beecrypt}/configure  || die "sed failed"
+	sed -i -e 's:$(libdir)/rpm:$(prefix)/lib/rpm:' \
+		${S}/Makefile.in || die "sed failed"
+}
+
+src_compile() {
+	strip-flags
+	elibtoolize
+
+	unset LD_ASSUME_KERNEL
+	local myconf
+	myconf="--enable-posixmutexes --without-javaglue"
+
+	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
+	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/$(get_libdir)/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/$(get_libdir)/python${PYVER}/site-packages/rpmdb
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup
+}
diff --git a/app-arch/rpm/rpm-4.2.1.ebuild b/app-arch/rpm/rpm-4.2.1.ebuild
index 370152fb0f59..848452f817d9 100644
--- a/app-arch/rpm/rpm-4.2.1.ebuild
+++ b/app-arch/rpm/rpm-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2.1.ebuild,v 1.25 2005/05/10 22:16:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2.1.ebuild,v 1.26 2005/05/12 13:26:04 herbs Exp $
 
 inherit python flag-o-matic libtool eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/rpm-4.2.1.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sparc -x86 ~mips ppc64"
+KEYWORDS="alpha -amd64 arm hppa ia64 ppc s390 sparc -x86 ~mips ppc64"
 IUSE="nls python doc"
 
 RDEPEND="=sys-libs/db-3.2*