Adjust make.globals PORTDIR and PORTAGE_TMPDIR for prefix installs.

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

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 35fcefb0019a409a92b54b33d78264f246376de4..ea6706b1865f33c8c45c8df77b8cf6ba3b7c4ff6 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.934 2011/12/21 21:42:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.935 2011/12/22 04:46:55 zmedico Exp $
+
+  22 Dec 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+  Adjust make.globals PORTDIR and PORTAGE_TMPDIR for prefix installs.
 
   21 Dec 2011; Markus Meier <maekke@gentoo.org> portage-2.1.10.41.ebuild:
   arm stable, bug #394695

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c1859c1cbd1ffb30504e75eb2a586dfa4d57a14f..8423fe9e16a489d7273de034b0b98f9319331483 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_alpha81.ebuild 14633 RMD160 bf8c4325d02c88b142e1663a2e58e11684d338dc SHA1 6afe40ef7e47fa17f5836fd9792920d0496bfb6c SHA256 babe03cfd284767dc702d12097eda7b76f2b92d6b1d61a2bda2e13a643000c1c
-EBUILD portage-9999.ebuild 13804 RMD160 f9e1c039ce1e642705185049d2c5c89ee5865dca SHA1 084aac1916f604214bfcd595dd5375f75960b817 SHA256 6c6d1b2f0aab74434ef8142b41e5b46ef5b35010bd89898590125ebdd1e8e6b0
-MISC ChangeLog 71044 RMD160 870d80cb6028eb429cf2588c1f5a157df106d884 SHA1 cd7b57e4a69ef5ebadaaa842e21515c1a5a054e6 SHA256 9b7f3732dd67e0a13f5a8b531e3a79d7bf8c7d4a9f210a403fd8788cb8f0cb49
+EBUILD portage-9999.ebuild 13929 RMD160 f6aad5112e7c55fc08b7115fa9a7a5cce34dfec1 SHA1 b5fc31b1f86a3bdedfb6ecad513bde57d3bd6af5 SHA256 c7c63fe695f6de5056ccccf78bd885c501ee8d010feb2e0411979373654f9d5b
+MISC ChangeLog 71184 RMD160 271df598994fce013ea21f3bb2d3c8c005c4d486 SHA1 bad63f2453e7ac593c6f1237702480f2523adf63 SHA256 3b69813e8365f11c6c104c30daa8916a06e5d8be723f010dfde719478c652ea7
 MISC metadata.xml 859 RMD160 e1a193ff07810cbcb5c7b3678164d3339187dc1c SHA1 b3edbe35c41d34ada1a2284e47d4e7019546486a SHA256 da1fb9571919aa3b23bea0879a4fb6fee69c97a77a7097d5fbbd2fb04169f57f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7yU2gACgkQkKaRLQcq0GIq9ACeLZQSQPfMyOOyryD2LWAhouzS
-JO0AoI03r+grZAuCoZbaQNy0hXQaH25D
-=Th1p
+iEYEARECAAYFAk7ytkUACgkQ/ejvha5XGaNqNwCeN8PScEeYvLb+bROhMvG71FVB
+qtEAn24R42HqVfDspwmukoIJtQ2ZSK/N
+=MSEK
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 310b4a48b628f880c292bac00cc503d93e8cbe7e..5be1ce8c88299934fb25d87b9d084fc96dc1cea9 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.39 2011/12/11 20:18:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.40 2011/12/22 04:46:55 zmedico Exp $
 
 EAPI=3
 inherit git-2 eutils multilib python
@@ -158,8 +158,10 @@ src_prepare() {
                        fi
                done
 
-               einfo "Setting SYNC in make.globals ..."
+               einfo "Adjusting make.globals ..."
                sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \
+                       -e "s|^\(PORTDIR=\)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \
+                       -e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \
                        -i cnf/make.globals || die "sed failed"
 
                einfo "Adding FEATURES=force-prefix to make.globals ..."