Added Prefix changes, bug #395827. Added Prefix keywords.

Package-Manager: portage-2.2.01.20043-prefix/cvs/Darwin i386

diff --git a/app-portage/portage-utils/ChangeLog b/app-portage/portage-utils/ChangeLog
index a7042fc45355cf048eb2eb72a994b4df586050e7..19d9a93d39692c89c68545c1f012d3619b9193c3 100644 (file)
--- a/app-portage/portage-utils/ChangeLog
+++ b/app-portage/portage-utils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-portage/portage-utils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/ChangeLog,v 1.120 2011/12/22 20:46:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/ChangeLog,v 1.121 2011/12/31 11:39:07 grobian Exp $
+
+  31 Dec 2011; Fabian Groffen <grobian@gentoo.org> portage-utils-0.9.ebuild:
+  Added Prefix changes, bug #395827.  Added Prefix keywords.
 
 *portage-utils-0.9 (22 Dec 2011)
 

diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 8de23bffd0b4832ca735d3cf2fc37fa731f791da..c08eb0fcd8ded27115e7b17ddcc4d05f3623c613 100644 (file)
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX post_sync 190 RMD160 55e9a5e81b49a60e78fbb8a6cba94f6ebd6a5953 SHA1 03c5409e6f45e3187d8cdd0fe00ed1d327f37d98 SHA256 73560378a5ef2bc39ced8f954f3d371f89d04fa45301f6e6471262caff03d5bf
 AUX q-reinitialize 68 RMD160 50de7e31f2e092fa1cf2495b150f34fb827ba74b SHA1 2b0fafc040a5f34c0c06c2b11253b8e5a7a4d5e4 SHA256 e7aa83822c78d89d128d10e61ff30f529ea5af3c3b9b4395db6c213675b11e3b
@@ -14,13 +14,13 @@ EBUILD portage-utils-0.4.ebuild 1576 RMD160 d04935f5d18c42edbfbcdf0a8a54af9d091f
 EBUILD portage-utils-0.5.ebuild 1485 RMD160 cf4b857b8b6fd720771d89a07654667f13093012 SHA1 90107e3ef15af825cf957841d1eee4625c401433 SHA256 8246fe9df68c97cc0e42bf928de14766604377430e6e4b98bcd3a8bfeb785aab
 EBUILD portage-utils-0.6.ebuild 1486 RMD160 a61a5e0db982c626ab5c02fb4d38c34fb8580dd6 SHA1 4bad769f653971826d3919de6594352c634e1d37 SHA256 fe23b1ad44d0ac7051c235fa12bf58bd79396152ab204772eed53e9f554978fe
 EBUILD portage-utils-0.8.ebuild 1626 RMD160 e55e4f33bf05a134b5894e7b568f2ab996950271 SHA1 fc1915a32aacef919455b70a9a40943dc37cee54 SHA256 4009d5a1d9e6153229be205c580ea8f56388b5ed915e230c0e8c71e1f7233a69
-EBUILD portage-utils-0.9.ebuild 1631 RMD160 0f23e7348483132664421892d2a1582cc6d92e12 SHA1 d0e6720438f74e935f728271f5b2c23ee99bd8e3 SHA256 95d1fa57da98054b143deeb82333793bd9afdcfae937c110e51b2675cc4539d0
-MISC ChangeLog 22058 RMD160 38619ec0ba7dbe4de95a3fdc4785c19057c7e0aa SHA1 99f443f7be0c0ccc4d55831533470784374940f9 SHA256 f71e633e12be4755ce43ef408c5787b38ada5d507a9fa11225eace7973f6649c
+EBUILD portage-utils-0.9.ebuild 2113 RMD160 2ca4fb25f892ad7cbe40dcb26373e18e122a5cbf SHA1 6b9c0271a3a501d4cb279b66a5aa8f2453c4be13 SHA256 ee210cf6d505176344d02322cbb7812584ce7a964e32dbdf047c93e35320d185
+MISC ChangeLog 22198 RMD160 1f1fd6d3f7bd8cfed3430f5d9399ba34b5bad0e2 SHA1 089c7778056294e2db4f0980fd268c5bb566fee5 SHA256 79674b92f2c073c18f761db0de48d49f72a81b45ed868575c9eb4587410b5cd3
 MISC metadata.xml 207 RMD160 cc27c18e9aaa247211b55e9f825ce1313bb9096d SHA1 ca55ca213d5e57927627195883c66636ae224baf SHA256 7e42d8d20b999858f3b4dc74e47877952491faecaa3674f4dd54b5d0c5045867
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iF4EAREIAAYFAk7zlxUACgkQaC/OocHi7Ja/lgD9Gh40rq+bkk92WqNNerq08Fj5
-9KuKfvA0nPgKFzrQb4oBAJ1tDUtJmiZzkXQNnIiHWxOX2FKGqTwezBgg2/58hfzc
-=APmZ
+iEYEARECAAYFAk7+9GEACgkQX3X2B8XHToloRACfVxHBMxZy095XR6GTp2foRhr6
+gW4An0IRA3JUE2u0EO/EDfsllteiFuQb
+=lljT
 -----END PGP SIGNATURE-----

diff --git a/app-portage/portage-utils/portage-utils-0.9.ebuild b/app-portage/portage-utils/portage-utils-0.9.ebuild
index 05825132b860dd60a757b7dd4a28a3ce78796e93..1a5d43a654aea28d8378cf12b2d7b3f7ed33c25b 100644 (file)
--- a/app-portage/portage-utils/portage-utils-0.9.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.9.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/app-portage/portage-utils/portage-utils-0.9.ebuild,v 1.1 2011/12/22 20:46:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portage-utils/portage-utils-0.9.ebuild,v 1.2 2011/12/31 11:39:07 grobian Exp $
 
 EAPI="3"
 
@@ -12,14 +12,14 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static"
 
 src_configure() {
        use static && append-ldflags -static
 
        # Avoid slow configure+gnulib+make if on an up-to-date Linux system
-       if ! use kernel_linux ; then
+       if use prefix || ! use kernel_linux ; then
                econf --with-eprefix="${EPREFIX}"
        else
                tc-export CC
@@ -34,22 +34,28 @@ src_install() {
        doexe "${FILESDIR}"/post_sync || die
        insinto /etc/portage/postsync.d
        doins "${FILESDIR}"/q-reinitialize || die
+
+       # Portage fixes shebangs, we just need to fix the paths in the files
+       sed -i \
+               -e "s:\(/etc/portage/postsync.d\|/usr/bin/q\):${EPREFIX}&:g" \
+               "${ED}"/etc/portage/bin/post_sync \
+               "${ED}"/etc/portage/postsync.d/q-reinitialize || die
 }
 
 pkg_preinst() {
        # preserve +x bit on postsync files #301721
        local x
-       pushd "${D}" >/dev/null
+       pushd "${ED}" >/dev/null
        for x in etc/portage/postsync.d/* ; do
-               [[ -x ${ROOT}/${x} ]] && chmod +x "${x}"
+               [[ -x ${EROOT}/${x} ]] && chmod +x "${x}"
        done
 }
 
 pkg_postinst() {
-       elog "/etc/portage/postsync.d/q-reinitialize has been installed for convenience"
+       elog "${EPREFIX}/etc/portage/postsync.d/q-reinitialize has been installed for convenience"
        elog "If you wish for it to be automatically run at the end of every --sync:"
-       elog "   # chmod +x /etc/portage/postsync.d/q-reinitialize"
+       elog "   # chmod +x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
        elog "Normally this should only take a few seconds to run but file systems"
        elog "such as ext3 can take a lot longer.  To disable, simply do:"
-       elog "   # chmod -x /etc/portage/postsync.d/q-reinitialize"
+       elog "   # chmod -x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
 }