Version bump for >=sys-libs/db-4 wrt bug 218489

Package-Manager: portage-2.1.5.2

3 files changed, 116 insertions, 2 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index ff60ca1db919..1b45fe6338ac 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/rpm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.90 2008/05/20 07:44:25 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.91 2008/05/31 16:18:57 loki_val Exp $
+
+*rpm-4.4.6-r6 (31 May 2008)
+
+  31 May 2008; Peter Alfredsen <loki_val@gentoo.org> +rpm-4.4.6-r6.ebuild:
+  Version bump for >=sys-libs/db-4 wrt bug 218489
 
 *rpm-4.4.7-r4 (20 May 2008)
 *rpm-4.4.6-r5 (20 May 2008)
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index bfdb36606ae5..6fcc6e9c6b45 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -18,11 +18,12 @@ DIST rpm-5.0.3.tar.gz 9337992 RMD160 d26cdfef5a3bf18442e1825d810afb32bcfa2161 SH
 EBUILD rpm-4.4.6-r3.ebuild 2774 RMD160 78caecc05338a6ac5cd1280d4fcc7a8346da62bf SHA1 85307e4d23ea07fafb8929e31b873086c1b5ace9 SHA256 021f9f32b65781e02991c0d4c4e55024234bd1d2b8193c56b658c8b62cc947c8
 EBUILD rpm-4.4.6-r4.ebuild 3047 RMD160 39328127dcf0bde2792922fcf93e79219a000216 SHA1 2eceb86c44953c02b742bd22f61de0708ca8759f SHA256 87066e1d9594d9a2d3ece3a6f9f23090e89b4b7739acab525f25a4966ac3d558
 EBUILD rpm-4.4.6-r5.ebuild 3099 RMD160 8d0ca6d53973cd1aa1624bd2bc2e5691a96b3190 SHA1 470c8fca1dc3103a255f0b49c78cd3c3b2ea94a1 SHA256 69cae71c0e2441bb54f45fefff84a034f6a8312bb9db0d6f100e609a06092298
+EBUILD rpm-4.4.6-r6.ebuild 3099 RMD160 56523955c2dc7f0d1577876a40f2f977950d4a57 SHA1 ca682ff5b1ccf5a315e9d33734303f4694ac7937 SHA256 e1d6a9389df51137a333760541fd4ec9322a73bb25a8ab0b36de0c3df9d633aa
 EBUILD rpm-4.4.7-r1.ebuild 2794 RMD160 c5afdbf9fe52b9bf4c48eaedd2d9886af90e900d SHA1 e415019dc31032c80e5ab9e127f66dc4f9e413b2 SHA256 7a1bdd8bf0541ad1c58e0c3b19f3c4fed15df017496d977c92c361fb4d8971e3
 EBUILD rpm-4.4.7-r2.ebuild 2989 RMD160 937b40114e5acfd171618b6649619175438e8ac6 SHA1 9da20fb85c32d3a28a9061bf99f86e0e6d02f505 SHA256 c02f8f206b8dfbccca95e31b45cac223cb57bff79ba7160d2a3c757bd728fe57
 EBUILD rpm-4.4.7-r3.ebuild 8214 RMD160 0e71469a760703011281b1ee5e0ad42749eef15a SHA1 9ad8466b1df65eeecd6579d41475065598e45bef SHA256 6caa28c3d917e084074637cfc567ffdbb2386667a9c7880da6c80e2f4e3aaac0
 EBUILD rpm-4.4.7-r4.ebuild 3048 RMD160 e57970a521474ef5009025bc36f60faec001b4fc SHA1 fd1dd85e46df1150b4b9b2e0f09a290793cd20d9 SHA256 28b82da49b98ddb8cc669459bc1ea53194c0943b4054f9cfa44c0b9ad402cc9a
 EBUILD rpm-5.0.0.ebuild 2732 RMD160 bb1da5416a4869216a186e6868f253b8a0d6f7d6 SHA1 736d093a2030df32ad8c1e7ff5fc93f0e6d5f55f SHA256 ed8e918b9d471f0e03f16546f310f9d5742ed84e2d2f6730214531c8f8bacca2
 EBUILD rpm-5.0.3.ebuild 2732 RMD160 b6f3c4235495c738c186b5ca48a0b7b56c74d94f SHA1 87accb4d8065a7d1b8ddd945ef74feadbb06e2f9 SHA256 384c2c0c84ccae427bcb08f2188230ce342d11dabe538252ddc45fa1b29962bf
-MISC ChangeLog 14125 RMD160 3315df5bf8d281c09dde7e83c66e08edd51bc385 SHA1 19becd68038503b96c395d7c4c57dc75cd764c26 SHA256 5219e01f953a432abd0a4876fc82dc007b644e45696b6b01d0a49b295099660e
+MISC ChangeLog 14282 RMD160 582a3ff89841b6664022fefcb5f1a54d67f3ca7e SHA1 4cf88f666574e4871f9878496eaa167f794119da SHA256 38b1981193495489a95253765980bb8132eee98e5cb5426e52bd5055779e4409
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
diff --git a/app-arch/rpm/rpm-4.4.6-r6.ebuild b/app-arch/rpm/rpm-4.4.6-r6.ebuild
new file mode 100644
index 000000000000..dff63e2ca111
--- /dev/null
+++ b/app-arch/rpm/rpm-4.4.6-r6.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2008 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-r6.ebuild,v 1.1 2008/05/31 16:18:57 loki_val Exp $
+
+inherit eutils autotools distutils perl-module flag-o-matic
+
+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 ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls python perl doc sqlite"
+
+RDEPEND=">=sys-libs/db-4
+	>=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-0.28"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-with-sqlite.patch
+	epatch "${FILESDIR}"/${P}-stupidness.patch
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	epatch "${FILESDIR}"/${P}-buffer-overflow.patch
+	epatch "${FILESDIR}"/${P}-qa-fix-undefined.patch
+	# bug 214799
+	epatch "${FILESDIR}"/${P}-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
+	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
+
+	for magic_file in "magic.mime.mgc" "magic.mgc" "magic.mime" "magic"; do
+		dosym /usr/share/misc/file/${magic_file} /usr/lib/rpm/${magic_file}
+	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
+
+	distutils_pkg_postinst
+}