Enable FEATURES=force-prefix in make.globals for prefix installs.

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

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 336d9870c2bc6484f490bffadc3702ba36b2cb49..9ab7f94f4d52de95153384c37c130e07eddd02f4 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.921 2011/12/08 22:44:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.922 2011/12/09 17:59:29 zmedico Exp $
+
+  09 Dec 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+  Enable FEATURES=force-prefix in make.globals for prefix installs.
 
   08 Dec 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
   Add support for prefix installs.

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 767210cfe13305a403161e20381e76dd1d8ace35..fff06d4e09cfd88a7ec28616edc093fbf71725eb 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 12357 RMD160 a23bc1acbedad9dc6ec7aad776b7c4c3cfd31252 SHA1 a7f8802053687a7cc8120d5ed55b66377f3e59e4 SHA256 41c2415a06f638a47c8b1b86028eb1f69ef90d571c27fc692c49a0cf222276f7
-MISC ChangeLog 68391 RMD160 3914b56255639277b862e6e0e8e14df3e585cac5 SHA1 2c27c2b371a733dfba3c6184bb22a377b60f1a5c SHA256 cdf9f6e3500dfe08c01561d34d66217e45418f81d00c70dc93fa63aa668c03c8
+EBUILD portage-9999.ebuild 12534 RMD160 136e9d91606e4ed8d7daaf27d7bfbac98404bcfa SHA1 72c3ddd14ed8af8ea3889b45976844d5278c7f17 SHA256 d1f79f7335f4e7da1d11f14595104f3c655ca024e47057bbc9b35ec3e7bcfe92
+MISC ChangeLog 68528 RMD160 1a470caacdf695205cb16f8e3a8365f1ef1076bb SHA1 fe7705158058ccb79dd6848e82bfb4b50e090601 SHA256 77dd3f6212e05e075ce791aa1e269c22853a05e579eb66035765f37cb91a1dff
 MISC metadata.xml 859 RMD160 e1a193ff07810cbcb5c7b3678164d3339187dc1c SHA1 b3edbe35c41d34ada1a2284e47d4e7019546486a SHA256 da1fb9571919aa3b23bea0879a4fb6fee69c97a77a7097d5fbbd2fb04169f57f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7hPbcACgkQ/ejvha5XGaOGpwCgrOKijPPT3hpzcOrJMuD66rVa
-ahYAnjn5Hj6thz2kqWs3Bng8CDuFNOkd
-=ka1r
+iEYEARECAAYFAk7iTIoACgkQ/ejvha5XGaOVZACgvhiaboZCh5CRR3PSaG9vMWbw
+7mQAnR3VZDaB//rcqTGnxBiPoZQn690d
+=XIN/
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index f930a1cff99df69aaa65ee3451b3f370b6796b12..81fa9c1fd6381ed3f846f685e72fca3813833107 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.35 2011/12/08 22:44:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.36 2011/12/09 17:59:29 zmedico Exp $
 
 EAPI=3
 inherit git-2 eutils multilib python
@@ -140,6 +140,10 @@ src_prepare() {
                                        die "sed failed"
                        fi
                done
+
+               einfo "Adding FEATURES=force-prefix to make.globals ..."
+               echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+                       || die "failed to append to make.globals"
        fi
 }