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

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

6 files changed, 179 insertions, 3 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/Manifest b/app-arch/rpm/Manifest
index 76980480d958..9ee9505dc62f 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -8,12 +8,16 @@ AUX rpm-4.4.6-with-sqlite.patch 517 RMD160 0af724f63b528aabd05f4bcf2d4c4830ebdf9
 AUX rpm-4.4.7-qa-fix-undefined.patch 776 RMD160 895ab185d15c94890ed8f2a34bf4f6b54c8bfb61 SHA1 d16d4a491625d304e96ba85fda982011c9d6d946 SHA256 87a444e00328cd6d78391acdf58ac3ab57fa161241c944df173ac14b2cb025a4
 AUX rpm-4.4.7-qa-implicit-function-to-pointer.patch 604 RMD160 f87086379c28fa878c94dbcd6855af82ee852caf SHA1 61079e3109a41c639015f312603ea43ae49a5bb7 SHA256 a8f12898b8ddba5d7dcc70c1128a2b27dd729c7fe2247450cca068bfa68f1d65
 AUX rpm-4.4.7-stupidness.patch 5268 RMD160 631f1bf3dc4553e27dec4a901fa84e17ffc7c7c9 SHA1 e957a9a549fa1ec52b449b1e8fc3ea14af7b7a09 SHA256 e563657e648e9b5ecfc0a653d7515f93db7785ec6867c81591663213965c0850
+AUX rpm-4.8.0-autotools.patch 1296 RMD160 d099b5ea3eac326bc38355c12eae24c011c41f6e SHA1 450879394e1b101b55853051f355babb900c1faa SHA256 a176b4413242170d02dea0c2a4ba05a642d03aa7329aa43f1c8984ff7e580a4b
+AUX rpm-4.8.0-db-path.patch 628 RMD160 cee347c45bbbebd724dd1346bd74b3344b6a7d06 SHA1 08c3aa65104db74c9851911970711b2f503dfcc8 SHA256 791682c72dd3a24e5e8268bfa967412035aa135c7b8d4673541bed129b89a0f3
 DIST rpm-4.4.6.tar.gz 17157249 RMD160 6b433d20a63fb2542244ae62eff0a8b5fe290439 SHA1 33221f95189671d1a083b4f140bcf9a88ecd4374 SHA256 1e1da50af2b9dfe34c79315eae7520e7e57087671e17ce26107d779ae2b0b595
 DIST rpm-4.4.7.tar.gz 14125623 RMD160 9002eb0fe1d680d8bff447d6918f9726c9a4e34c SHA1 b119fb0f10fd5e2eb330ba547b6a89e40f3c0e68 SHA256 18fde4195e4ac21a4290327336948f8c4fc58a680395edbb5f2f31bae67b18b5
+DIST rpm-4.8.0.tar.bz2 3692408 RMD160 3d3d20a81e6f2f06f9cd6e9a02978070ea665a2d SHA1 84210ab42f36ad6b3d856c86a974a5178d1de864 SHA256 a3b4bb2d78eaf1f5200fdcd51372ca9cedce64e030046372e6a13e361cb82b64
 DIST rpm-5.1.6.tar.gz 8305612 RMD160 88645f4a7c2e25fffaa5628d267e86eaac137b35 SHA1 3ab7d1edf333102c748c22e9144ab90d9719ab0b SHA256 82ee1a737bd77ddd90b0fe1e9a2f478c46033e451fac3881d00ab9e166951799
 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.8.0.ebuild 2142 RMD160 e2f8414d9f8e2bfa8f1adf0b46163b8fd96c8cbf SHA1 e2bc29bbe79957b6edc900035b4d11dabc6457bf SHA256 ce70d2e5ecc751e3f01e51b297c5d2664ba5510053925ad58d87ced7e2cade70
 EBUILD rpm-5.1.6.ebuild 2946 RMD160 ceba21a3805e60ac63e12046eeaa58d4961f21a6 SHA1 e9d8c000729f4fca443904a9859864a13546acfe SHA256 c5dfd0023beffbedd16248aa27a439bc53ff22abc9f89d804480a0fe6b5a372f
-MISC ChangeLog 16768 RMD160 ea683d023904633d30ba278ed6bae948d97e4bd0 SHA1 3bd25700e9fb065f15750d5db51f3ddec31a0714 SHA256 00af63b8dd7fbcf03f08b48bbf41a2a00594e75dbf9e597830016fdfd7554e34
-MISC metadata.xml 426 RMD160 4a2ba17676985343eb58428d850a789b5dd68e88 SHA1 63ed9659d9cafb9d3b88d64d923546f1ee535033 SHA256 48b9482bf3276901e869348f451ef75129291db60be308fb66e18dce8a74a7a6
+MISC ChangeLog 17002 RMD160 1118575a33f060045aea987e9bc77d44224344a4 SHA1 24174c16d9ad63057e8af1907f0a9282ad51665d SHA256 1aa6da99e9d0e52625aca02e39c1da247450df2bd5cf503d2d2ce1088b985353
+MISC metadata.xml 519 RMD160 761d6ea5d6d764173cdef29d7dbc8675691d29ea SHA1 40a64cdad07d5b80a51b08018c2918c9bc1ce5dc SHA256 f53fa593c136c4fddaaf24fc45f4af887eb25708bc3cc0f8f3e0de5ff3b904ed
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
+}