Bump to EAPI 3 and add prefix support.

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

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index bf41131d3618b8a4448e04fc8d20027610446564..1365191151bb3389d87fa325d7fa9351748af27f 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.897 2011/10/30 08:14:52 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.898 2011/11/02 05:26:03 zmedico Exp $
+
+  02 Nov 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+  Bump to EAPI 3 and add prefix support.
 
 *portage-2.2.0_alpha72 (30 Oct 2011)
 

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 70f5f81a9cfac54b3672667c906fdbd7fc169ca3..48b4e6baf29c8908dd853a4c2e6ebe5b57779425 100644 (file)
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -23,13 +23,13 @@ EBUILD portage-2.1.9.42.ebuild 10283 RMD160 60ac7fd535e83626095d2ef11466da8e8aa9
 EBUILD portage-2.2.0_alpha51.ebuild 12928 RMD160 72acaaa06c2d1c170b17ae9449ed9f9bceeb0735 SHA1 195fc5ef71c91f86ec3329833e56543d482c7b7d SHA256 486a6a78bae63337695a134af3f6ff6462a01613b1f1848663cd2ca79cd59292
 EBUILD portage-2.2.0_alpha71.ebuild 12906 RMD160 62ce33175427d4e893be66fdd2705fe7a9488217 SHA1 9b8b09b2e7b7e1bd86443db63fe1d7d6f78f1538 SHA256 8895395a674ffd06a40dadab91b2bf99b4b850eef98f5e26b36a7be19e26464c
 EBUILD portage-2.2.0_alpha72.ebuild 12906 RMD160 c367bedf3afe792184f9f0ebedd844cb227a805e SHA1 d6eae77a17c34b4e84e4c43375e8d6290373ab29 SHA256 cee4246dc475570466107c40d647b04dad0f0e0574d6b0d23f904813e40b4f77
-EBUILD portage-9999.ebuild 12214 RMD160 497e432fe756c9fda839cd2268a206e80e0ce1ca SHA1 9e9ef38845fa47767919d117c6f9e3c3b7924537 SHA256 ad0d82b6f9b62379595404695abebd73d0158fe257b2eedf117d9e49725ec8e7
-MISC ChangeLog 61725 RMD160 56f20a34230955a5f935fee7deb4d2487210d514 SHA1 dcf28af81cdacc7a72557e4da115991c9e43205b SHA256 a5da452597a2ec02c853631f0fb8458f316402e3c0f22c1b79c6a13311897204
+EBUILD portage-9999.ebuild 12118 RMD160 db216891c223daaa99a2dacb7dd49d7325ff3752 SHA1 47475472bfe9fa7261a445d6126e21843a15a3e5 SHA256 3663cbf53222b4183f7bd2ff870ff107a90f0bfc6d4c03542d8ef5195432817c
+MISC ChangeLog 61835 RMD160 28a4b6d87acf50eb918b56541338b16d3b86abe4 SHA1 b8460cb21d40209238e70f27672c3f089a14d543 SHA256 5ba0dea7a3c0d06809f1471cab055a03175beea948d582340e82efc6d23ca0eb
 MISC metadata.xml 784 RMD160 ed548c07d0a96be62f1854b92abb4ebc0ae2f281 SHA1 338c4eb3cbb626b8830eddb2f0ef23a48b1c9e12 SHA256 3ec8e42f1532859a3697a5870febeb90c635740da85cdf8f913c7529dfc767f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6tB4MACgkQ/ejvha5XGaMHnwCgwWS5y/6nSYKf7xjqw5u4PdKR
-OmQAoMljkDW/cb/GsD/QV5A3WaWVt+H0
-=+o63
+iEYEARECAAYFAk6w1HIACgkQ/ejvha5XGaPWywCeN2soO0FwkrMnbfVZx4+TVrkI
+SeIAniFldkG13UGeFIhDeHmdQ1jDLdzb
+=aVXu
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 9205dfd01005887c09c2362a13a4e2cef77344cf..c2ca9aa02fc5ae8ecd94986fa1678fcac04decea 100644 (file)
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,10 +1,8 @@
 # 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.30 2011/07/26 16:24:30 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.31 2011/11/02 05:26:03 zmedico Exp $
 
-# Require EAPI 2 since we now require at least python-2.6 (for python 3
-# syntax support) which also requires EAPI 2.
-EAPI=2
+EAPI=3
 inherit git-2 eutils multilib python
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
@@ -206,7 +204,7 @@ src_install() {
                fi
                symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
                if [ -n "$symlinks" ] ; then
-                       cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
+                       cp -P $symlinks "${ED}$portage_base/$x" || die "cp failed"
                fi
        done
 
@@ -219,7 +217,7 @@ src_install() {
                doins *.py || die "doins failed"
                symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
                if [ -n "$symlinks" ] ; then
-                       cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
+                       cp -P $symlinks "${ED}$portage_base/$x" || die "cp failed"
                fi
        done
 
@@ -237,7 +235,7 @@ src_install() {
 
        # Symlinks to directories cause up/downgrade issues and the use of these
        # modules outside of portage is probably negligible.
-       for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do
+       for x in "${ED}${portage_base}/pym/"{cache,elog_modules} ; do
                [ ! -L "${x}" ] && continue
                die "symlink to directory will cause upgrade/downgrade issues: '${x}'"
        done
@@ -278,7 +276,7 @@ src_install() {
 pkg_preinst() {
        if [[ $ROOT == / ]] ; then
                # Run some minimal tests as a sanity check.
-               local test_runner=$(find "$D" -name runTests)
+               local test_runner=$(find "${ED}" -name runTests)
                if [[ -n $test_runner && -x $test_runner ]] ; then
                        einfo "Running preinst sanity tests..."
                        "$test_runner" || die "preinst sanity tests failed"
@@ -293,8 +291,8 @@ pkg_preinst() {
                ewarn "to enable RMD160 hash support."
                ewarn "See bug #198398 for more information."
        fi
-       if [ -f "${ROOT}/etc/make.globals" ]; then
-               rm "${ROOT}/etc/make.globals"
+       if [ ! -L "${EROOT}/etc/make.globals" ]; then
+               rm -f "${EROOT}/etc/make.globals"
        fi
 
        has_version "<${CATEGORY}/${PN}-2.2_alpha"
@@ -306,7 +304,7 @@ pkg_preinst() {
        # If portage-2.1.6 is installed and the preserved_libs_registry exists,
        # assume that the NEEDED.ELF.2 files have already been generated.
        has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
-               ! ( [ -e "$ROOT"var/lib/portage/preserved_libs_registry ] && \
+               ! ( [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
                has_version ">=${CATEGORY}/${PN}-2.1.6_rc" )
        NEEDED_REBUILD_UPGRADE=$?
 
@@ -321,14 +319,14 @@ pkg_postinst() {
 
        if [ $WORLD_MIGRATION_UPGRADE = 0 ] ; then
                einfo "moving set references from the worldfile into world_sets"
-               cd "${ROOT}/var/lib/portage/"
+               cd "${EROOT}/var/lib/portage/"
                grep "^@" world >> world_sets
                sed -i -e '/^@/d' world
        fi
 
        if [ $NEEDED_REBUILD_UPGRADE = 0 ] ; then
                einfo "rebuilding NEEDED.ELF.2 files"
-               for cpv in "${ROOT}/var/db/pkg"/*/*; do
+               for cpv in "${EROOT}/var/db/pkg"/*/*; do
                        if [ -f "${cpv}/NEEDED" ]; then
                                rm -f "${cpv}/NEEDED.ELF.2"
                                while read line; do