[gentoo-commits] gentoo-x86 commit in app-arch/rpm: ChangeLog rpm-5.3.5.ebuild

[gentoo-commits] gentoo-x86 commit in app-arch/rpm: ChangeLog rpm-5.3.5.ebuild

[Stanislav Ochotnicky (sochotnicky)]

sochotnicky    12/07/26 07:38:33

  Modified:             ChangeLog rpm-5.3.5.ebuild
  Log:
  Add prefix support to rpm-5.3.5 (courtesy of ottxor) #427982
  
  (Portage version: 2.1.10.65/cvs/Linux x86_64)

Revision  Changes    Path
1.151                app-arch/rpm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/rpm/ChangeLog?rev=1.151&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/rpm/ChangeLog?rev=1.151&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/rpm/ChangeLog?r1=1.150&r2=1.151

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- ChangeLog	23 Jun 2012 17:09:14 -0000	1.150
+++ ChangeLog	26 Jul 2012 07:38:33 -0000	1.151
@@ -1,6 +1,9 @@
 # ChangeLog for app-arch/rpm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.150 2012/06/23 17:09:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.151 2012/07/26 07:38:33 sochotnicky Exp $
+
+  26 Jul 2012; Stanislav Ochotnicky <sochotnicky@gentoo.org> rpm-5.3.5.ebuild:
+  Add prefix support to rpm-5.3.5 (courtesy of ottxor) #427982
 
   23 Jun 2012; Raúl Porcel <armin76@gentoo.org> rpm-4.9.1.3.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #410949



1.2                  app-arch/rpm/rpm-5.3.5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/rpm/rpm-5.3.5.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/rpm/rpm-5.3.5.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/rpm/rpm-5.3.5.ebuild?r1=1.1&r2=1.2

Index: rpm-5.3.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-5.3.5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpm-5.3.5.ebuild	2 Jun 2012 10:21:28 -0000	1.1
+++ rpm-5.3.5.ebuild	26 Jul 2012 07:38:33 -0000	1.2
@@ -1,6 +1,6 @@
 # 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-5.3.5.ebuild,v 1.1 2012/06/02 10:21:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-5.3.5.ebuild,v 1.2 2012/07/26 07:38:33 sochotnicky Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="acl augeas berkdb +bzip2 crypt debug expat gnutls keyutils lua lzma nls nss openssl pcre perl pkcs11 readline ruby selinux sqlite ssl tcl uuid webdav-neon xar xattr +zlib"
 
 RDEPEND="
@@ -142,8 +142,8 @@
 		--enable-largefile \
 		--with-python \
 		--without-pythonembed \
-		--with-python-lib-dir="$(python_get_libdir)" \
-		--with-python-inc-dir="$(python_get_includedir)" \
+		--with-python-lib-dir="${EPREFIX}$(python_get_libdir)" \
+		--with-python-inc-dir="${EPREFIX}$(python_get_includedir)" \
 		$(use_enable nls) \
 		$(use_enable debug build-debug) \
 		$(use_with acl) \
@@ -189,19 +189,19 @@
 }
 
 pkg_postinst() {
-	chown -R rpm:rpm "${ROOT}"/usr/$(get_libdir)/rpm
-	chown -R rpm:rpm "${ROOT}"/var/lib/rpm
-	chown rpm:rpm "${ROOT}"/usr/bin/rpm{,2cpio,build,constant}
-	if [[ ${ROOT} == "/" ]] ; then
-		if [[ -f ${ROOT}/var/lib/rpm/Packages ]] ; then
+	chown -R rpm:rpm "${EROOT}"/usr/$(get_libdir)/rpm
+	chown -R rpm:rpm "${EROOT}"/var/lib/rpm
+	chown rpm:rpm "${EROOT}"/usr/bin/rpm{,2cpio,build,constant}
+	if [[ ${EROOT} == "/" ]] ; then
+		if [[ -f ${EROOT}/var/lib/rpm/Packages ]] ; then
 			einfo "RPM database found... Rebuilding database (may take a while)..."
-			"${ROOT}"/usr/bin/rpm --rebuilddb --root="${ROOT}"
+			"${EROOT}"/usr/bin/rpm --rebuilddb --root="${ROOT}"
 		else
 			einfo "No RPM database found... Creating database..."
-			"${ROOT}"/usr/bin/rpm --initdb --root="${ROOT}"
+			"${EROOT}"/usr/bin/rpm --initdb --root="${ROOT}"
 		fi
 	fi
-	chown rpm:rpm "${ROOT}"/var/lib/rpm/*
+	chown rpm:rpm "${EROOT}"/var/lib/rpm/*
 
 	python_mod_optimize rpm
 }