Fix whitespace handling when installing bin and pym directores.

Package-Manager: portage-2.2_rc67_p93/cvs/Linux i686

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 94bd5b874e94277a6b05790c2d41ba4bbe902e73..1d92e7ceaea8840e05333699e2cc9c4dcd74405f 100644 (file)
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.701 2010/04/14 18:52:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.702 2010/04/28 07:26:51 zmedico Exp $
+
+  28 Apr 2010; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+  Fix whitespace handling when installing bin and pym directores.
 
   14 Apr 2010; Jeroen Roovers <jer@gentoo.org> portage-2.1.8.3.ebuild:
   Stable for HPPA (bug #314247).

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 993ddb74d6686034f5cc228f559e3d2fe8d91b8c..d5440a653e79ca79536f124a404278d8ba6ae298 100644 (file)
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4
 DIST portage-2.1.6.13.patch.bz2 177383 RMD160 ef6388ca4a55a7defb319d54c9d80625cb8e12dc SHA1 5298feb6f881c25abdbde4a353d341fd36fdee51 SHA256 2cc897b6fa43b3329ef51f6304c064237be6bc326f1f0c221a19c0f96b69cd9c
 DIST portage-2.1.6.7.patch.bz2 50118 RMD160 cc0a322570829c8dec9aa4886deb5741f0efb489 SHA1 02021be38b0f829d45b342483834652a1985a952 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0
@@ -17,6 +20,13 @@ EBUILD portage-2.1.7.17.ebuild 10121 RMD160 450a29c406bd178de4396835f0582e043114
 EBUILD portage-2.1.8.3.ebuild 9195 RMD160 a8b3b1d2f629443976961ad295ca94a47be4ca6a SHA1 ef9b7b9b581c08dba3a98784b7429a5c3f084100 SHA256 dbc596027e5891acf1e5c94be28479f8c25e010aa19d79177a8675227403e57b
 EBUILD portage-2.2_rc62.ebuild 11046 RMD160 9f093b14959b0c8f45ba8f0e0478d296a7ffc5a5 SHA1 b68099591f14cf208f3dd14934e7e5514048b898 SHA256 15d2d9980755987ef68ce5d51b2351cdf4a451e58e6720084cd1e10b84ba8265
 EBUILD portage-2.2_rc67.ebuild 10585 RMD160 5b048e89f617091897af67f01376063b3370184b SHA1 e007b51065300dcad3cd389114899ae422a0c01e SHA256 c089377b80103250aeeff43310b264a0310198de79b3fd032f57cbc535332bc2
-EBUILD portage-9999.ebuild 10030 RMD160 4b173d65b635d9fba61047e2e7aa5930956cafb1 SHA1 e00c56920f03957f0976bc11a0b30647a20b7d44 SHA256 c2821b2696ae9c407ea6af45de8d42729341429fea873fcf8a05591ce3b193f6
-MISC ChangeLog 11774 RMD160 f32b37f3dd2c05f349ccd079a5a7834fd23b4aa9 SHA1 4d7d66383ae041a6ceb4c7d2e3e76dfd5317a4c2 SHA256 c314832f5eb3c9ce279719399f396fc8f29ff7cb8942aec643c42839dd598d8c
+EBUILD portage-9999.ebuild 10052 RMD160 33d3629dd83a62782f2b9888180719f955692e2b SHA1 5afd21f449ddacf20a24eca942e422305d85647c SHA256 a0de1d7dd2a1502400a7f83d0774a47debc2e6c54522b21bbaf21d8f6a56e7e1
+MISC ChangeLog 11913 RMD160 da4d49b6b2263128db610d03f49712e6b8857e84 SHA1 13a181f2c17f619ffab875de3091205246d5bfae SHA256 4f8ce3e926da6841e9ff171a952cc8f4fa21b4aa02974ceddcc56fabbc7c19d7
 MISC metadata.xml 618 RMD160 9510c974d4aa9a1383674d331a973140beb44e48 SHA1 0822478deaeb3b22358fff5c695111bfdf3ff2f6 SHA256 00ca0aa3a29ec8f82ddaf2e0f89e0b2e959131a6350f64b3c49b1125cbb32a13
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkvX40EACgkQ/ejvha5XGaNymQCfS/eArvyv1EUgLH7/6aIc1VrZ
+gJ0An3vrAWncTPZjLWovbF8HSQGlOxPJ
+=a/Ru
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 9c3629152556a2582e281859a306e8db393915dc..7aae72028d9e1eed40b37effed59400634c801a2 100644 (file)
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.3 2010/03/28 05:49:39 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.4 2010/04/28 07:26:51 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -163,8 +163,8 @@ src_install() {
 
        local x symlinks
 
-       for x in $(find "$S"/bin -type d) ; do
-               x=${x#$S/}
+       cd "$S" || die "cd failed"
+       for x in $(find bin -type d) ; do
                exeinto $portage_base/$x || die "exeinto failed"
                cd "$S"/$x || die "cd failed"
                doexe $(find . -mindepth 1 -maxdepth 1 -type f ! -type l) || \
@@ -175,8 +175,8 @@ src_install() {
                fi
        done
 
-       for x in $(find "$S"/pym -type d) ; do
-               x=${x#$S/}
+       cd "$S" || die "cd failed"
+       for x in $(find pym/* -type d) ; do
                insinto $portage_base/$x || die "insinto failed"
                cd "$S"/$x || die "cd failed"
                doins *.py || die "doins failed"