rpm does not need db-3.2

(Portage version: 2.1_pre5-r2)

4 files changed, 121 insertions, 11 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index ddf095adb44c..5b6207433543 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.51 2006/02/17 00:07:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.52 2006/03/03 20:01:52 cretin Exp $
+
+*rpm-4.2-r2 (03 Mar 2006)
+
+  03 Mar 2006; Stefan Jones <cretin@gentoo.org> +rpm-4.2-r2.ebuild:
+  rpm does not need db-3.2 Thanks to Marco at bug #99354
 
   17 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> +metadata.xml,
   rpm-4.2.ebuild, rpm-4.2-r1.ebuild, rpm-4.2.1.ebuild:
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 6f98721d6ff9..1c8e52245b6f 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8d03358db6b6b581bed0559fb0767ae6 ChangeLog 7457
 RMD160 8ebf6bda1581986e3855409bea6552f10f28c83a ChangeLog 7457
 SHA256 712fca89484585cca0150bf0830d8be33fd865307ef6c63157402573765dee6c ChangeLog 7457
@@ -13,6 +10,9 @@ SHA256 5ed7c77d231f33cabef813ce85953544ad46d4a9fc6881d7ed54c0441954da93 files/di
 MD5 66362520b980d3ecf3dd71ef968898a5 files/digest-rpm-4.2-r1 226
 RMD160 46cf2ca3040c8847a3194d01b5187bc642f81fbd files/digest-rpm-4.2-r1 226
 SHA256 258cc5ba05ec9440240461feb79bbbbc749c385b57a5c4e02435e83815866fa8 files/digest-rpm-4.2-r1 226
+MD5 66362520b980d3ecf3dd71ef968898a5 files/digest-rpm-4.2-r2 226
+RMD160 46cf2ca3040c8847a3194d01b5187bc642f81fbd files/digest-rpm-4.2-r2 226
+SHA256 258cc5ba05ec9440240461feb79bbbbc749c385b57a5c4e02435e83815866fa8 files/digest-rpm-4.2-r2 226
 MD5 dd838f7f21d8a9eed6fdf9a18e7ba0e4 files/digest-rpm-4.2.1 62
 RMD160 b37adff31b3fc7ef5dd0c3bf251b160b27c5cedb files/digest-rpm-4.2.1 62
 SHA256 b0a694836d92a8424997d818940539d0de53ca12d57e3476b333d4f8b4297e16 files/digest-rpm-4.2.1 62
@@ -46,16 +46,12 @@ SHA256 55484c90e1cebe26f472f2a7e58d790de3b124f2a181ad3e05b31ca2ac664e5f rpm-4.0.
 MD5 b81122309ad10fa93d573a1f5cfc4c2c rpm-4.2-r1.ebuild 2949
 RMD160 1213d307c59eca29e6aff6d3dabb69c0da65d700 rpm-4.2-r1.ebuild 2949
 SHA256 612bbf4471625058eb19128134847ad86636a6103b3f114cd2e370c9298e71eb rpm-4.2-r1.ebuild 2949
+MD5 e5fd07a8e8cfbc7dfe639ef537677ede rpm-4.2-r2.ebuild 2932
+RMD160 b4170455b3375b2df503e31d41902c66a5297bc5 rpm-4.2-r2.ebuild 2932
+SHA256 166f05fde7b9215e16e5f6921922779d5a320f370b13a9a886ada980f32f9539 rpm-4.2-r2.ebuild 2932
 MD5 f84c35917bf9c3af54586b7f4a9b4706 rpm-4.2.1.ebuild 2548
 RMD160 466af33f76cceff48bb2696c5bd697049a443f3b rpm-4.2.1.ebuild 2548
 SHA256 cf2e9497ce51bf0ae60cd8b74f7734197eaf83522207aa1ac3f4a3bf9a890d0e rpm-4.2.1.ebuild 2548
 MD5 a8f99d032181d0baadf875871dc42f73 rpm-4.2.ebuild 2553
 RMD160 4ffe8e36c34f85afc03c74a9c32bec84901ebbcb rpm-4.2.ebuild 2553
 SHA256 13b9700ce9420e125eaed4b8f6729fe9063b8df926e1c01fdffede3f6d01c82d rpm-4.2.ebuild 2553
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFD9RPnAiZjviIA2XgRAp+FAKDPu1WoaJOp/zDDfSOxBjU4+MEd5QCgqOxH
-jwFIxMo+KpF22LKW6E3dWrE=
-=ipKE
------END PGP SIGNATURE-----
diff --git a/app-arch/rpm/files/digest-rpm-4.2-r2 b/app-arch/rpm/files/digest-rpm-4.2-r2
new file mode 100644
index 000000000000..2f801a10f074
--- /dev/null
+++ b/app-arch/rpm/files/digest-rpm-4.2-r2
@@ -0,0 +1,3 @@
+MD5 b7610e5704dfc3e06ff7e2e84e0eb57c rpm-4.2.tar.gz 9742106
+RMD160 f7d0e8257d4e92bca358a30fa92fe99a62a13bb3 rpm-4.2.tar.gz 9742106
+SHA256 426d07a0aa841c83c7ae12cf3b1076a9153489fe535beef54cb0b21a02ac7e34 rpm-4.2.tar.gz 9742106
diff --git a/app-arch/rpm/rpm-4.2-r2.ebuild b/app-arch/rpm/rpm-4.2-r2.ebuild
new file mode 100644
index 000000000000..92b80831993d
--- /dev/null
+++ b/app-arch/rpm/rpm-4.2-r2.ebuild
@@ -0,0 +1,106 @@
+# 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.2-r2.ebuild,v 1.1 2006/03/03 20:01:52 cretin 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 ~ppc64 ~s390 ~sparc ~x86"
+IUSE="nls python doc"
+
+RDEPEND=">=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
+	python? ( >=dev-lang/python-2.2 )
+	nls? ( virtual/libintl )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/rpm-4.2-python2.3.diff
+	epatch "${FILESDIR}"/rpm-4.2-pic.patch
+	epatch "${FILESDIR}"/${P}-gcc4.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
+}