Add support for prefix installs.

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

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index e9e432a9516308b14d125a04db7b501430970b33..336d9870c2bc6484f490bffadc3702ba36b2cb49 100644 (file)
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,9 @@
 # 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.920 2011/11/29 06:53:36 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.921 2011/12/08 22:44:01 zmedico Exp $
+
+  08 Dec 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+  Add support for prefix installs.
 
   29 Nov 2011; Zac Medico <zmedico@gentoo.org> -portage-2.1.10.38.ebuild,
   -portage-2.2.0_alpha78.ebuild:

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f30b2f4255ffd47ba8b58605b0b5bf0cb6d7cec3..767210cfe13305a403161e20381e76dd1d8ace35 100644 (file)
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -19,13 +19,13 @@ 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-9999.ebuild 11849 RMD160 87132d026feba8b701455736a564d9c2f8bdf4d0 SHA1 b1f1246590c049dfbdbe45830911e9eaaff1ad5f SHA256 2f26d44da7ee096dd8cfc277ca01afa0e06158d3040cc581a1cba03e936951b3
-MISC ChangeLog 68287 RMD160 8269a82b5bff3a4af685613b332a9b8674c49492 SHA1 4247d111a70098d4d41492ee5a409f0f7c297bd0 SHA256 ed3d3c234bc3107142ee3e4f19e374c8afd4e49110fd13d9bf7e51df64acb757
+EBUILD portage-9999.ebuild 12357 RMD160 a23bc1acbedad9dc6ec7aad776b7c4c3cfd31252 SHA1 a7f8802053687a7cc8120d5ed55b66377f3e59e4 SHA256 41c2415a06f638a47c8b1b86028eb1f69ef90d571c27fc692c49a0cf222276f7
+MISC ChangeLog 68391 RMD160 3914b56255639277b862e6e0e8e14df3e585cac5 SHA1 2c27c2b371a733dfba3c6184bb22a377b60f1a5c SHA256 cdf9f6e3500dfe08c01561d34d66217e45418f81d00c70dc93fa63aa668c03c8
 MISC metadata.xml 859 RMD160 e1a193ff07810cbcb5c7b3678164d3339187dc1c SHA1 b3edbe35c41d34ada1a2284e47d4e7019546486a SHA256 da1fb9571919aa3b23bea0879a4fb6fee69c97a77a7097d5fbbd2fb04169f57f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7UgXUACgkQ/ejvha5XGaMQfwCgqO/vIfqbeOp6J/waSiFb8LKT
-WfUAn3PA1u58Wx0klGsAiC6+DXatLlvd
-=590b
+iEYEARECAAYFAk7hPbcACgkQ/ejvha5XGaOGpwCgrOKijPPT3hpzcOrJMuD66rVa
+ahYAnjn5Hj6thz2kqWs3Bng8CDuFNOkd
+=ka1r
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index b9a5888d109c99a257029136497b0fdd16d5daef..f930a1cff99df69aaa65ee3451b3f370b6796b12 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.34 2011/11/12 16:16:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.35 2011/12/08 22:44:01 zmedico Exp $
 
 EAPI=3
 inherit git-2 eutils multilib python
@@ -125,6 +125,22 @@ src_prepare() {
                einfo "Converting shebangs for python2..."
                python_convert_shebangs -r 2 .
        fi
+
+       if [[ -n ${EPREFIX} ]] ; then
+               einfo "Setting portage.const.EPREFIX ..."
+               sed -e "s|^EPREFIX=.*|EPREFIX=\"${EPREFIX}\"|" -i pym/portage/const.py || \
+                       die "Failed to patch portage.const.EPREFIX"
+
+               einfo "Prefixing shebangs ..."
+               find . -type f -print0 | \
+               while read -r -d $'\0' ; do
+                       local shebang=$(head -n1 "$REPLY")
+                       if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+                               sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+                                       die "sed failed"
+                       fi
+               done
+       fi
 }
 
 src_compile() {