From 7837ed2d7aea4825d6a4bd8367d1c291232038e7 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 21 Aug 2012 03:39:33 +0000 Subject: fix prefix support (bug #427982) (Portage version: 2.2.0_alpha121/cvs/Linux i686) --- app-arch/rpm5/ChangeLog | 6 ++++-- app-arch/rpm5/rpm5-5.3.5.ebuild | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'app-arch/rpm5') diff --git a/app-arch/rpm5/ChangeLog b/app-arch/rpm5/ChangeLog index b51a51595057..272c705ac435 100644 --- a/app-arch/rpm5/ChangeLog +++ b/app-arch/rpm5/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-arch/rpm5 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm5/ChangeLog,v 1.1 2012/07/26 08:02:37 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm5/ChangeLog,v 1.2 2012/08/21 03:39:33 ottxor Exp $ + + 21 Aug 2012; Christoph Junghans rpm5-5.3.5.ebuild: + fix prefix support (bug #427982) *rpm5-5.3.5 (26 Jul 2012) *rpm5-5.1.6 (26 Jul 2012) @@ -8,4 +11,3 @@ 26 Jul 2012; Tomáš Chvátal +rpm5-5.1.6.ebuild, +rpm5-5.3.5.ebuild, +files/remaining-5.3.5.txt, +metadata.xml: Move rpm-5* to this package to indicate completely different upstream. - diff --git a/app-arch/rpm5/rpm5-5.3.5.ebuild b/app-arch/rpm5/rpm5-5.3.5.ebuild index 13fa73e8b2b8..e94b84db6dda 100644 --- a/app-arch/rpm5/rpm5-5.3.5.ebuild +++ b/app-arch/rpm5/rpm5-5.3.5.ebuild @@ -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/rpm5/rpm5-5.3.5.ebuild,v 1.1 2012/07/26 08:02:37 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm5/rpm5-5.3.5.ebuild,v 1.2 2012/08/21 03:39:33 ottxor Exp $ EAPI=4 @@ -197,13 +197,13 @@ pkg_postinst() { 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 [[ ${ROOT} == "/" ]] ; then if [[ -f ${EROOT}/var/lib/rpm/Packages ]] ; then einfo "RPM database found... Rebuilding database (may take a while)..." - "${EROOT}"/usr/bin/rpm --rebuilddb --root="${ROOT}" + "${EROOT}"/usr/bin/rpm --rebuilddb --root="${EROOT}" else einfo "No RPM database found... Creating database..." - "${EROOT}"/usr/bin/rpm --initdb --root="${ROOT}" + "${EROOT}"/usr/bin/rpm --initdb --root="${EROOT}" fi fi chown rpm:rpm "${EROOT}"/var/lib/rpm/* -- cgit v1.2.3-65-gdbad