Updated dependency of rpm-4.4.7 to >=sys-libs/db-4

Package-Manager: portage-2.1.8.3/cvs/Linux i686

3 files changed, 113 insertions, 2 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 2b5efb77d3b5..b90f3ef43fa6 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/rpm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.111 2010/05/05 23:08:10 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.112 2010/05/12 18:49:00 sochotnicky Exp $
+
+*rpm-4.4.7-r5 (12 May 2010)
+
+  12 May 2010; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  +rpm-4.4.7-r5.ebuild:
+  Updated dependency on db to >=sys-libs/db-4
 
   05 May 2010; Stanislav Ochotnicky <sochotnicky@gentoo.org>
   files/rpm-4.8.0-autotools.patch:
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index f5def408cdca..4d85e3f070c3 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -17,7 +17,8 @@ DIST rpm-5.1.6.tar.gz 8305612 RMD160 88645f4a7c2e25fffaa5628d267e86eaac137b35 SH
 EBUILD rpm-4.4.6-r6.ebuild 3171 RMD160 44fbdb341ab87a74fc13c2eef87d9070338bb1c9 SHA1 31106589361bf7991986eac88c598e51b1fce6ff SHA256 95a2af02a614aa8abd1c50f2674576f2e81e3bf2b5962104a6e717b8403d0dd5
 EBUILD rpm-4.4.6-r7.ebuild 3165 RMD160 0cdc36998e3929662e978ffe71dfa44ed5da3ee4 SHA1 57274f71bc40d755797d4f9e10be59ab6eb8be7f SHA256 07c6bfd5f211f06ef5e1a53ae2fcf6a5ffa81430995e4ebfc947c0f320e79e13
 EBUILD rpm-4.4.7-r4.ebuild 3083 RMD160 c5c835de374335f3cd2847aaf1a72d07e1fba37a SHA1 b183ebe5f6ffa6979045b2f406772a76de13cc43 SHA256 f0204575b60ef2e97963d1951f43869e4c7814a99b64ac1980453ead7e737022
+EBUILD rpm-4.4.7-r5.ebuild 3082 RMD160 f05add32c5b848354516c084f71426f41d5ac02f SHA1 e997d2d3a5eb19e932d34d8a9b05ca2d7a9165b1 SHA256 ebd1ccf5fa6dc24a8cd7d184bb91169c20626439a69ef28f6b07122144ba6a38
 EBUILD rpm-4.8.0.ebuild 2113 RMD160 cee88118ad9a9e8c73b104e596f74a30445719eb SHA1 ccb43ffb916072e4e456e29614e0d59f35a2916e SHA256 9a2fcb086a7ad6a2b9d54f34224e176d7f1aa69851abce2c88fb51e10617460e
 EBUILD rpm-5.1.6.ebuild 2946 RMD160 ceba21a3805e60ac63e12046eeaa58d4961f21a6 SHA1 e9d8c000729f4fca443904a9859864a13546acfe SHA256 c5dfd0023beffbedd16248aa27a439bc53ff22abc9f89d804480a0fe6b5a372f
-MISC ChangeLog 17150 RMD160 b857d9626d46fca4a95c857511c033afc6d1931e SHA1 97b16e53edb9632797c2b1d26bad275867d7e316 SHA256 5a41c29dbb94dcbac105ece425b50588342d3400ee9c8abcce14b015eb9def8a
+MISC ChangeLog 17311 RMD160 c118dd4be138631d1c090657486f5ba667319b94 SHA1 b36c781cd897f36fdf14183965d90a2273a5b997 SHA256 da1b1d86cac0f720ba77d29029b6beecfc9509fcc26ca01a5a1cf32a4eaf1a56
 MISC metadata.xml 426 RMD160 4a2ba17676985343eb58428d850a789b5dd68e88 SHA1 63ed9659d9cafb9d3b88d64d923546f1ee535033 SHA256 48b9482bf3276901e869348f451ef75129291db60be308fb66e18dce8a74a7a6
diff --git a/app-arch/rpm/rpm-4.4.7-r5.ebuild b/app-arch/rpm/rpm-4.4.7-r5.ebuild
new file mode 100644
index 000000000000..9a3a8049f002
--- /dev/null
+++ b/app-arch/rpm/rpm-4.4.7-r5.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2010 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-r5.ebuild,v 1.1 2010/05/12 18:49:00 sochotnicky Exp $
+
+inherit eutils autotools distutils perl-module flag-o-matic
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="http://www.rpm.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 ~mips ~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-misc/neon-0.28"
+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.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
+	# 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_compile() {
+	# 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) \
+		|| die "econf failed"
+	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
+}
+
+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
+}