fixed #90133 for macos lacking lchown. fixed bug with looping during -e system.

Package-Manager: portage-1.524.2.59-cvs

4 files changed, 18 insertions, 9 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e70d85c24619..854bcec7c9ee 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,21 +6,21 @@ MD5 c697b628359c7055961817876804f0a6 metadata.xml 221
 MD5 b169f143c9eb3069924e41f10e8d40ac portage-2.0.51-r15.ebuild 13133
 MD5 f9fd4371c2fb44b47a0a5d3cfd4f118c portage-2.0.51.18.ebuild 13211
 MD5 985b398e1a2d623efa13c1c1fbe18119 portage-2.0.51.19.ebuild 13211
-MD5 73e7c423713b5738a3d7486f4945e0cf portage-2.0.51.20-r3.ebuild 6254
+MD5 f0b7328c994da26708e29d66df5b6670 portage-2.0.51.20-r4.ebuild 6292
 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
 MD5 99e1115b7cb92bf81695feace57456da files/digest-portage-2.0.51-r15 71
 MD5 4458663c2aa36fb828981a89ffcaac97 files/digest-portage-2.0.51.18 70
 MD5 f8627c17a73d8568e94f92ea15c69360 files/digest-portage-2.0.51.19 70
 MD5 8c6ba58bbfddca72824b15dacbed69ec files/gcc-2.95-libsandbox.patch 1163
-MD5 ddcd57a496ee08ec51f06b031d54601e files/portage-fixes.patch 582
+MD5 a144de1dc5bb195a0a71fd2a5fd572fd files/portage-fixes.patch 1012
 MD5 47a7436ab36074e8d1c7db19edb2c65a files/dispatch-conf-fixes.patch 1244
 MD5 502ca546fcf8ca5141435a9edee6a57f files/repoman-fixes.patch 417
-MD5 5f2f342d78aec333f4136420afd6a31f files/digest-portage-2.0.51.20-r3 70
+MD5 5f2f342d78aec333f4136420afd6a31f files/digest-portage-2.0.51.20-r4 70
 MD5 77b9bad3d53c36ce5ef3ecdf16554d5a files/emerge-fixes.patch 685
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCa2XgxvWNPsk/ZP4RAg1PAJ9selrQ1vldg4ccOOavTTiufDwdXACdE0uF
-5JUNKlDeC7smWM8FdZkkHDc=
-=+ax/
+iD8DBQFCa2nAxvWNPsk/ZP4RAhkMAKCgvXWl5pWS5qezoN8B4Paywl1GlQCeKEs6
+UBpcdyd0cJtOrcmg/B6f6Hg=
+=q4oo
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.0.51.20-r3 b/sys-apps/portage/files/digest-portage-2.0.51.20-r4
index 50f1663b40b0..50f1663b40b0 100644
--- a/sys-apps/portage/files/digest-portage-2.0.51.20-r3
+++ b/sys-apps/portage/files/digest-portage-2.0.51.20-r4
diff --git a/sys-apps/portage/files/portage-fixes.patch b/sys-apps/portage/files/portage-fixes.patch
index 801a460733e7..c4bb06db1323 100644
--- a/sys-apps/portage/files/portage-fixes.patch
+++ b/sys-apps/portage/files/portage-fixes.patch
@@ -1,5 +1,14 @@
 --- pym/portage.py	23 Apr 2005 07:26:04 -0000	1.524.2.59
 +++ pym/portage.py	23 Apr 2005 14:48:34 -0000
+@@ -4,7 +4,7 @@
+ # $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/files/portage-fixes.patch,v 1.2 2005/04/24 09:40:59 jstubbs Exp $
+ cvs_id_string="$Id: portage-fixes.patch,v 1.2 2005/04/24 09:40:59 jstubbs Exp $"[5:-2]
+ 
+-VERSION="2.0.51.20"
++VERSION="2.0.51.20-r4"
+ 
+ # ===========================================================================
+ # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT
 @@ -1192,7 +1192,7 @@
  		if "maketest" in self.features and "test" not in self.features:
  			self.features.append("test")
diff --git a/sys-apps/portage/portage-2.0.51.20-r3.ebuild b/sys-apps/portage/portage-2.0.51.20-r4.ebuild
index e40de0ea437a..5a9628d42c9e 100644
--- a/sys-apps/portage/portage-2.0.51.20-r3.ebuild
+++ b/sys-apps/portage/portage-2.0.51.20-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.20-r3.ebuild,v 1.2 2005/04/24 09:24:35 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.20-r4.ebuild,v 1.1 2005/04/24 09:40:59 jstubbs Exp $
 
 inherit toolchain-funcs
 
@@ -43,7 +43,7 @@ src_compile() {
 	cd ${S}/src
 	$(tc-getCC) ${CFLAGS} -o tbz2tool tbz2tool.c
 
-	if ! python_has_lchown; then
+	if ! use ppc-macos && ! python_has_lchown; then
 		cd ${S}/src/python-missingos
 		./setup.py build || die "Failed to build missingos module"
 	fi
@@ -68,7 +68,7 @@ src_install() {
 		newins make.conf make.conf.example
 	fi
 
-	if ! python_has_lchown; then
+	if ! use ppc-macos && ! python_has_lchown; then
 		cd ${S}/src/python-missingos
 		./setup.py install --root ${D} || die "Failed to install missingos module"
 	fi