For prefix installs, add EPREFIX to *_BINARY constants.

Package-Manager: portage-2.2.0_alpha80/cvs/Linux i686

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index cb1ba40812ff25c3929697b407470a5f504c784a..7c20749c2bf520c5245b9e2c918cadd4152cce70 100644 (file)
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.926 2011/12/11 08:52:03 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.927 2011/12/11 20:18:53 zmedico Exp $
+
+  11 Dec 2011; Zac Medico <zmedico@gentoo.org> portage-2.2.0_alpha80.ebuild,
+  portage-9999.ebuild:
+  For prefix installs, add EPREFIX to *_BINARY constants.
 
 *portage-2.2.0_alpha80 (11 Dec 2011)
 

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 80e4e9aa61819d8852cce2bfee5161ac01ef0f91..5ce725c60abbe1ece18ad8fc3af47b14fcc4600d 100644 (file)
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -22,14 +22,14 @@ EBUILD portage-2.1.6.7.ebuild 8574 RMD160 b7d3514fa7042b756c3b9d4bb91f5c696abd27
 EBUILD portage-2.1.9.42.ebuild 10122 RMD160 04081079c4b31d0a17fec1baae9707ded83adfd9 SHA1 ad9bcaa30ad2dd93f0b92e61161e9d19fdb5f317 SHA256 29a246ddf895613410c30e9d1f43ee123e852b21b19904dfd053c563648b7cc9
 EBUILD portage-2.2.0_alpha51.ebuild 12569 RMD160 06fd93ba44e0477a2caaead573621adead90db63 SHA1 13c52b8df1b6cb30e8ef8ad1586c16393e515a27 SHA256 58a0b18d8cb971504b34c3666ceb09536ad91bc6f29f6aa02443eaa76f6c0691
 EBUILD portage-2.2.0_alpha79.ebuild 12669 RMD160 09b7a25498b5d366ca147fc2329cb418687e2dc7 SHA1 2fd323dc6f3008f9c50e3883527f249b7e731cbd SHA256 0ef068435e4baf492472415f181071ae4edb3ca1e1f0bcf55e51f7da0cc523fb
-EBUILD portage-2.2.0_alpha80.ebuild 14129 RMD160 2410ec6495210d4e2d305fd957e46af4f572d25e SHA1 5bbd643bbaad05a125d338a4fba257638fc2f9ee SHA256 09696b81d33594147ead6f190ff941da4156334765280dd2a7afc5b02e6436f6
-EBUILD portage-9999.ebuild 13300 RMD160 0bdd88729023a60508f8fc6b9146154ecb698047 SHA1 b2ed9f06ee2c27d3140b9acc529d91eb75890bb9 SHA256 60594df6eb12649f220b02336a61efa6df8d201fefa5c7cb88720085241e1270
-MISC ChangeLog 69596 RMD160 e6ad5c3b82f0f83516a61019cb38e9f666aa804d SHA1 9afc3e4feba989a2c877ac6746b8eb7ab7c899a7 SHA256 8b1139badc6494e9a7b83f439e723a5f3a2ac14d458ab51b265355566af211d2
+EBUILD portage-2.2.0_alpha80.ebuild 14633 RMD160 432e03cde9acbb79e440d2691d0eee70bc974550 SHA1 1f36c81176f4752d5a00c6013f876b3e6d1772c6 SHA256 87283213b646a308ea376833434a75bd11b672e71a0a41a0cd2de9fbb23639ac
+EBUILD portage-9999.ebuild 13804 RMD160 f9e1c039ce1e642705185049d2c5c89ee5865dca SHA1 084aac1916f604214bfcd595dd5375f75960b817 SHA256 6c6d1b2f0aab74434ef8142b41e5b46ef5b35010bd89898590125ebdd1e8e6b0
+MISC ChangeLog 69755 RMD160 249ffa9355a7e576781239420140a72633e0d9ac SHA1 e82bcb33faa221e31dbd3a5f3e3e005bdf0b4bc7 SHA256 8a506c9cd3339fc3c116fa7c1c0aed3b163785ffd548910361ccc927d0898a24
 MISC metadata.xml 859 RMD160 e1a193ff07810cbcb5c7b3678164d3339187dc1c SHA1 b3edbe35c41d34ada1a2284e47d4e7019546486a SHA256 da1fb9571919aa3b23bea0879a4fb6fee69c97a77a7097d5fbbd2fb04169f57f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7kbzgACgkQ/ejvha5XGaMEmACfYx4INEAZIEjt6VB8CUNVexU8
-IBMAoKYRzsIGJ9l09kU4RcwKNa+GwYe1
-=PJcK
+iEYEARECAAYFAk7lEDQACgkQ/ejvha5XGaOpTQCgtgo5vuzcgICVVOtfTpZBYU1a
+Wu4AoO67gbsQ29x/HAA+rMJrLG1tSQhR
+=Y9yV
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-2.2.0_alpha80.ebuild b/sys-apps/portage/portage-2.2.0_alpha80.ebuild
index d127fc05f828e0c064856412b77a9f72c7e1074a..37b21008cd3fbd6acc0018c1100f7734d5dde3ce 100644 (file)
--- a/sys-apps/portage/portage-2.2.0_alpha80.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha80.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/sys-apps/portage/portage-2.2.0_alpha80.ebuild,v 1.1 2011/12/11 08:52:03 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha80.ebuild,v 1.2 2011/12/11 20:18:53 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -161,7 +161,13 @@ src_prepare() {
 
        if [[ -n ${EPREFIX} ]] ; then
                einfo "Setting portage.const.EPREFIX ..."
-               sed -e "s|^EPREFIX=.*|EPREFIX=\"${EPREFIX}\"|" -i pym/portage/const.py || \
+               sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+                       -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+                       -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+                       -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+                       -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+                       -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+                       -i pym/portage/const.py || \
                        die "Failed to patch portage.const.EPREFIX"
 
                einfo "Prefixing shebangs ..."

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 581c5248d41d61b0a1a5f998a8ff4416b9eacdcd..310b4a48b628f880c292bac00cc503d93e8cbe7e 100644 (file)
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.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/sys-apps/portage/portage-9999.ebuild,v 1.38 2011/12/10 00:50:04 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.39 2011/12/11 20:18:53 zmedico Exp $
 
 EAPI=3
 inherit git-2 eutils multilib python
@@ -139,7 +139,13 @@ src_prepare() {
 
        if [[ -n ${EPREFIX} ]] ; then
                einfo "Setting portage.const.EPREFIX ..."
-               sed -e "s|^EPREFIX=.*|EPREFIX=\"${EPREFIX}\"|" -i pym/portage/const.py || \
+               sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+                       -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+                       -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+                       -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+                       -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+                       -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+                       -i pym/portage/const.py || \
                        die "Failed to patch portage.const.EPREFIX"
 
                einfo "Prefixing shebangs ..."