Added Prefix changes, bug #395827. Added Prefix keywords.

(Portage version: 2.2.01.20043-prefix/cvs/Darwin i386)

2 files changed, 18 insertions, 9 deletions

diff --git a/app-portage/portage-utils/ChangeLog b/app-portage/portage-utils/ChangeLog
index a7042fc45355..19d9a93d3969 100644
--- a/app-portage/portage-utils/ChangeLog
+++ b/app-portage/portage-utils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-portage/portage-utils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/ChangeLog,v 1.120 2011/12/22 20:46:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/ChangeLog,v 1.121 2011/12/31 11:39:07 grobian Exp $
+
+  31 Dec 2011; Fabian Groffen <grobian@gentoo.org> portage-utils-0.9.ebuild:
+  Added Prefix changes, bug #395827.  Added Prefix keywords.
 
 *portage-utils-0.9 (22 Dec 2011)
 
diff --git a/app-portage/portage-utils/portage-utils-0.9.ebuild b/app-portage/portage-utils/portage-utils-0.9.ebuild
index 05825132b860..1a5d43a654ae 100644
--- a/app-portage/portage-utils/portage-utils-0.9.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/portage-utils-0.9.ebuild,v 1.1 2011/12/22 20:46:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/portage-utils-0.9.ebuild,v 1.2 2011/12/31 11:39:07 grobian Exp $
 
 EAPI="3"
 
@@ -12,14 +12,14 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static"
 
 src_configure() {
 	use static && append-ldflags -static
 
 	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if ! use kernel_linux ; then
+	if use prefix || ! use kernel_linux ; then
 		econf --with-eprefix="${EPREFIX}"
 	else
 		tc-export CC
@@ -34,22 +34,28 @@ src_install() {
 	doexe "${FILESDIR}"/post_sync || die
 	insinto /etc/portage/postsync.d
 	doins "${FILESDIR}"/q-reinitialize || die
+
+	# Portage fixes shebangs, we just need to fix the paths in the files
+	sed -i \
+		-e "s:\(/etc/portage/postsync.d\|/usr/bin/q\):${EPREFIX}&:g" \
+		"${ED}"/etc/portage/bin/post_sync \
+		"${ED}"/etc/portage/postsync.d/q-reinitialize || die
 }
 
 pkg_preinst() {
 	# preserve +x bit on postsync files #301721
 	local x
-	pushd "${D}" >/dev/null
+	pushd "${ED}" >/dev/null
 	for x in etc/portage/postsync.d/* ; do
-		[[ -x ${ROOT}/${x} ]] && chmod +x "${x}"
+		[[ -x ${EROOT}/${x} ]] && chmod +x "${x}"
 	done
 }
 
 pkg_postinst() {
-	elog "/etc/portage/postsync.d/q-reinitialize has been installed for convenience"
+	elog "${EPREFIX}/etc/portage/postsync.d/q-reinitialize has been installed for convenience"
 	elog "If you wish for it to be automatically run at the end of every --sync:"
-	elog "   # chmod +x /etc/portage/postsync.d/q-reinitialize"
+	elog "   # chmod +x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
 	elog "Normally this should only take a few seconds to run but file systems"
 	elog "such as ext3 can take a lot longer.  To disable, simply do:"
-	elog "   # chmod -x /etc/portage/postsync.d/q-reinitialize"
+	elog "   # chmod -x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
 }