Version bumped to latest release, dropped 4.9.0 ebuild (more to come)

Expect more cleanups since this will likely be stabilized soonish

(Portage version: 2.1.10.44/cvs/Linux x86_64)

2 files changed, 23 insertions, 17 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index f36087027704..9f25ce60910e 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/rpm
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.125 2011/05/08 15:13:06 sochotnicky Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.126 2012/02/18 20:14:40 sochotnicky Exp $
+
+*rpm-4.9.1.2 (18 Feb 2012)
+
+  18 Feb 2012; Stanislav Ochotnicky <sochotnicky@gentoo.org> -rpm-4.9.0.ebuild,
+  +rpm-4.9.1.2.ebuild:
+  Version bumped to latest release, dropped 4.9.0 ebuild (more to come)
 
 *rpm-4.9.0 (08 May 2011)
 *rpm-4.8.1-r2 (08 May 2011)
diff --git a/app-arch/rpm/rpm-4.9.0.ebuild b/app-arch/rpm/rpm-4.9.1.2.ebuild
index 198d932e463c..4cb07739bef2 100644
--- a/app-arch/rpm/rpm-4.9.0.ebuild
+++ b/app-arch/rpm/rpm-4.9.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.9.0.ebuild,v 1.3 2011/05/08 15:28:18 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.9.1.2.ebuild,v 1.1 2012/02/18 20:14:40 sochotnicky Exp $
 
-EAPI="3"
+EAPI=4
 
 PYTHON_DEPEND="2"
 
@@ -14,7 +14,7 @@ SRC_URI="http://rpm.org/releases/rpm-4.9.x/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 
 IUSE="nls python doc caps lua acl"
 
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
@@ -63,22 +64,21 @@ src_configure() {
 		$(use_with doc hackingdocs) \
 		$(use_enable nls) \
 		$(use_with lua) \
-		$(use_with caps cap)\
-		$(use_with acl)\
-		|| die "econf failed"
+		$(use_with caps cap) \
+		$(use_with acl)
 }
 
 src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install || die "emake install failed"
+	default
 
-	mv "${D}"/bin/rpm "${D}"/usr/bin
-	rmdir "${D}"/bin
+	mv "${ED}"/bin/rpm "${ED}"/usr/bin
+	rmdir "${ED}"/bin
 	# fix symlinks to /bin/rpm (#349840)
 	for binary in rpmquery rpmverify;do
-		ln -sf rpm "${D}"/usr/bin/$binary
+		ln -sf rpm "${ED}"/usr/bin/${binary}
 	done
 
-	use nls || rm -rf "${D}"/usr/share/man/??
+	use nls || rm -rf "${ED}"/usr/share/man/??
 
 	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
 
@@ -90,12 +90,12 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -f "${ROOT}"/var/lib/rpm/Packages ]] ; then
+	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
 		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${ROOT}"/usr/bin/rpmdb --rebuilddb --root="${ROOT}"
+		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}"
 	else
 		einfo "No RPM database found... Creating database..."
-		"${ROOT}"/usr/bin/rpmdb --initdb --root="${ROOT}"
+		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}"
 	fi
 
 	use python && python_mod_optimize rpm