Adding app-arch/rpm-4.8.0 (~x86, ~amd64)

(Portage version: 2.1.8.3/cvs/Linux i686)

5 files changed, 173 insertions, 1 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 728e3c208875..18cfad6de128 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,13 @@
 # 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.109 2010/04/22 20:59:35 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.110 2010/05/05 20:54:03 sochotnicky Exp $
+
+*rpm-4.8.0 (05 May 2010)
+
+  05 May 2010; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  +rpm-4.8.0.ebuild, +files/rpm-4.8.0-autotools.patch,
+  +files/rpm-4.8.0-db-path.patch, metadata.xml:
+  Added app-arch/rpm-4.8.0 as a new ebuild
 
   22 Apr 2010; Stanislav Ochotnicky <sochotnicky@gentoo.org>
   rpm-4.4.6-r6.ebuild, rpm-4.4.6-r7.ebuild,
diff --git a/app-arch/rpm/files/rpm-4.8.0-autotools.patch b/app-arch/rpm/files/rpm-4.8.0-autotools.patch
new file mode 100644
index 000000000000..d4016be824ab
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.8.0-autotools.patch
@@ -0,0 +1,48 @@
+diff --git a/Makefile.am b/Makefile.am
+index 587cfa7..498abfb 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -177,7 +177,7 @@ EXTRA_DIST += rpmpopt.in
+ 
+ usrsrcdir = $(prefix)/src
+ 
+-rpmvardir = $(localstatedir)/lib/rpm
++rpmvardir = $(localstatedir)/rpm
+ rpmvar_DATA =
+ 
+ install-exec-hook:
+diff --git a/configure.ac b/configure.ac
+index 8c2ef50..1ec8978 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -305,14 +305,9 @@ AM_CONDITIONAL(LIBDWARF,[test "$WITH_LIBDWARF" = yes])
+ # which we use too and hopefully is slightly more unique to NSS.
+ WITH_NSS_INCLUDE=
+ WITH_NSS_LIB=
+-AC_CHECK_HEADERS([nspr.h nss.h sechash.h], [], [
+-  AC_MSG_ERROR([missing required NSPR / NSS header])
+-])
+-AC_CHECK_LIB(nss3, NSS_NoDB_Init, [
+-  WITH_NSS_LIB=-lnss3
+-], [
+-  AC_MSG_ERROR([missing required NSS library 'nss3'])
+-])
++PKG_CHECK_MODULES(NSS, [ nss >= 3.0.0 ])
++WITH_NSS_INCLUDE=$NSS_CFLAGS
++WITH_NSS_LIB=$NSS_LIBS
+ AC_SUBST(WITH_NSS_INCLUDE)
+ AC_SUBST(WITH_NSS_LIB)
+ 
+diff --git a/macros.in b/macros.in
+index ae46fcb..213b53c 100644
+--- a/macros.in
++++ b/macros.in
+@@ -155,7 +155,7 @@
+ %_bzip2bin		%{__bzip2}
+ 
+ #	The location of the rpm database file(s).
+-%_dbpath		%{_var}/lib/rpm
++%_dbpath		%{_var}/rpm
+ 
+ #	The location of the rpm database file(s) after "rpm --rebuilddb".
+ %_dbpath_rebuild	%{_dbpath}
diff --git a/app-arch/rpm/files/rpm-4.8.0-db-path.patch b/app-arch/rpm/files/rpm-4.8.0-db-path.patch
new file mode 100644
index 000000000000..634dd2373ab8
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.8.0-db-path.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile.am b/Makefile.am
+index 587cfa7..498abfb 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -177,7 +177,7 @@ EXTRA_DIST += rpmpopt.in
+ 
+ usrsrcdir = $(prefix)/src
+ 
+-rpmvardir = $(localstatedir)/lib/rpm
++rpmvardir = $(localstatedir)/rpm
+ rpmvar_DATA =
+ 
+ install-exec-hook:
+diff --git a/macros.in b/macros.in
+index ae46fcb..213b53c 100644
+--- a/macros.in
++++ b/macros.in
+@@ -155,7 +155,7 @@
+ %_bzip2bin		%{__bzip2}
+ 
+ #	The location of the rpm database file(s).
+-%_dbpath		%{_var}/lib/rpm
++%_dbpath		%{_var}/rpm
+ 
+ #	The location of the rpm database file(s) after "rpm --rebuilddb".
+ %_dbpath_rebuild	%{_dbpath}
diff --git a/app-arch/rpm/metadata.xml b/app-arch/rpm/metadata.xml
index b954e97765e0..aa596e917468 100644
--- a/app-arch/rpm/metadata.xml
+++ b/app-arch/rpm/metadata.xml
@@ -9,5 +9,6 @@
 <use>
   <flag name='magic'>Add magic file support (<pkg>sys-apps/file</pkg>)</flag>
   <flag name='neon'>Include support for <pkg>net-misc/neon</pkg></flag>
+  <flag name='capabilities'>Add support for capabilities (<pkg>sys-libs/libcap</pkg>)</flag>
 </use>
 </pkgmetadata>
diff --git a/app-arch/rpm/rpm-4.8.0.ebuild b/app-arch/rpm/rpm-4.8.0.ebuild
new file mode 100644
index 000000000000..447734370237
--- /dev/null
+++ b/app-arch/rpm/rpm-4.8.0.ebuild
@@ -0,0 +1,90 @@
+# 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.8.0.ebuild,v 1.1 2010/05/05 20:54:03 sochotnicky Exp $
+
+EAPI=2
+
+inherit eutils autotools flag-o-matic perl-module distutils
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="http://www.rpm.org"
+SRC_URI="http://rpm.org/releases/rpm-4.8.x/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="nls python doc sqlite capabilities lua acl"
+
+RDEPEND="=sys-libs/db-4.5*
+	>=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-lang/perl-5.8.8
+	python? ( >=dev-lang/python-2.3 )
+	nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	lua? ( >=dev-lang/lua-5.1.0 )
+	acl? ( virtual/acl )
+	capabilities? ( >=sys-libs/libcap-2.0 )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	epatch "${FILESDIR}"/${P}-db-path.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_configure() {
+	econf \
+		--without-selinux \
+		--with-external-db \
+		$(use_enable python) \
+		$(use_with doc hackingdocs) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable nls) \
+		$(use_with lua) \
+		$(use_with capabilities cap)\
+		$(use_with acl)\
+		|| die "econf 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
+	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
+}