Version bump thanks to Sandro <sanchan@gentoo.org> and stan <stan@saticed.me.uk> in bug 121859 and thanks to Rumen Yotov <rumen@qrypto.org>, Nick Devito <nick125@gmail.com>, Ed Catmur <ed@catmur.co.uk> and Martin von Gagern <Martin.vGagern@gmx.net> in bug 139388

(Portage version: 2.1.1_pre2-r6)

4 files changed, 127 insertions, 1 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 076f481d568b..cfb2c41ff508 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,16 @@
 # 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.55 2006/06/10 08:10:48 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.56 2006/07/09 13:10:03 genstef Exp $
+
+*rpm-4.4.6 (09 Jul 2006)
+
+  09 Jul 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/rpm-4.4.6-with-sqlite.patch, +rpm-4.4.6.ebuild:
+  Version bump thanks to Sandro <sanchan@gentoo.org> and stan
+  <stan@saticed.me.uk> in bug 121859 and thanks to Rumen Yotov
+  <rumen@qrypto.org>, Nick Devito <nick125@gmail.com>, Ed Catmur
+  <ed@catmur.co.uk> and Martin von Gagern <Martin.vGagern@gmx.net> in bug
+  139388
 
 *rpm-4.4.1-r1 (10 Jun 2006)
 
diff --git a/app-arch/rpm/files/digest-rpm-4.4.6 b/app-arch/rpm/files/digest-rpm-4.4.6
new file mode 100644
index 000000000000..8dae251f56e0
--- /dev/null
+++ b/app-arch/rpm/files/digest-rpm-4.4.6
@@ -0,0 +1,3 @@
+MD5 baa6f371446c65b4080d1cd1f194a7ae rpm-4.4.6.tar.gz 17157249
+RMD160 6b433d20a63fb2542244ae62eff0a8b5fe290439 rpm-4.4.6.tar.gz 17157249
+SHA256 1e1da50af2b9dfe34c79315eae7520e7e57087671e17ce26107d779ae2b0b595 rpm-4.4.6.tar.gz 17157249
diff --git a/app-arch/rpm/files/rpm-4.4.6-with-sqlite.patch b/app-arch/rpm/files/rpm-4.4.6-with-sqlite.patch
new file mode 100644
index 000000000000..7624ade5efb7
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.4.6-with-sqlite.patch
@@ -0,0 +1,20 @@
+--- configure.ac.orig	2006-07-07 11:28:44.000000000 +0200
++++ configure.ac	2006-07-07 11:29:09.000000000 +0200
+@@ -625,6 +625,9 @@
+ WITH_SQLITE3_INCLUDE=
+ WITH_SQLITE3_LIB=
+ 
++withval=yes
++AC_ARG_WITH(sqlite,   [  --with-sqlite           use sqlite database library ])
++if test "$withval" != no; then
+ AC_CHECK_HEADER([sqlite3.h], [
+   AC_CHECK_LIB(sqlite3, sqlite3_open, [
+     AC_DEFINE(HAVE_SQLITE3_H, 1, [Define if you have the <sqlite3.h> header file])
+@@ -642,6 +645,7 @@
+     DBLIBSRCS="$DBLIBSRCS sqlite.c"
+   fi
+ ])
++fi
+ 
+ AC_SUBST(WITH_SQLITE3_SUBDIR)
+ AC_SUBST(WITH_SQLITE3_INCLUDE)
diff --git a/app-arch/rpm/rpm-4.4.6.ebuild b/app-arch/rpm/rpm-4.4.6.ebuild
new file mode 100644
index 000000000000..71cef5cfbbf3
--- /dev/null
+++ b/app-arch/rpm/rpm-4.4.6.ebuild
@@ -0,0 +1,93 @@
+# 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.6.ebuild,v 1.1 2006/07/09 13:10:03 genstef Exp $
+
+inherit eutils autotools distutils
+
+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 ~mips ~ppc -ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls python perl doc sqlite"
+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
+	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"
+
+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
+
+	# the following are additional libraries that might be packaged with
+	# the rpm sources. grep for "test -d" in configure.ac
+	rm -rf beecrypt elfutils neon popt sqlite zlib intl
+
+	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 file, lua, db and db3
+	# Does not work yet
+	#sed -i -e 's/\(\*-\*-linux\*)\tLDFLAGS_STATIC\)="[^"]*"/\1=""/' \
+	#	-e "s:WITH_DB_SUBDIR=db3:WITH_DB_SUBDIR=:" \
+	#	-e "s:WITH_INTERNAL_DB=1:WITH_INTERNAL_DB=0:" \
+	#	configure
+}
+
+src_compile() {
+	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 staticLDFLAGS="" || 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 /var/lib/rpm
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS/{noarch,i{3,4,5,6}86,athlon},BUILD}
+
+	dodoc CHANGES CREDITS GROUPS README* RPM*
+	use doc && dohtml -r apidocs/html/*
+}
+
+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
+}