From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 12 Mar 2006 14:02:53 +0000 (+0000)
Subject: 2.1_pre6-r1 bug fix release
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=19cc6984a411a73e377b3615eee8a5ff1d596c69;p=gentoo.git

2.1_pre6-r1 bug fix release
Package-Manager: portage-2.1_pre6-r1
---

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 3853278a6ec7..fbf43b0c20ea 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.89 2006/03/11 20:34:24 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.90 2006/03/12 14:02:53 zmedico Exp $
+
+*portage-2.1_pre6-r1 (12 Mar 2006)
+
+  12 Mar 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_pre6-r1.ebuild,
+  +files/2.1_pre6/1010_r2854_obey_keeptemp.patch,
+  +files/2.1_pre6/1020_r2857_bug_54040_resume_tree.patch,
+  +files/2.1_pre6/1030_r2860_exec_stack_no_ppc64.patch,
+  +files/2.1_pre6/1040_r2861_cache_cleanse.patch,
+  +files/2.1_pre6/1050_r2862_ebuild_unmerge.patch,
+  +files/2.1_pre6/1060_r2863_bug_125919_find_compat.patch:
+  Revision bump for small bug fixes, including #54040 and #125919.  Also fixes
+  bugs reported in #gentoo-portage by kosmikus and phreak.
 
 *portage-2.1_pre6 (11 Mar 2006)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ea021362983e..445252004df7 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 148a408edf2f13c7a8273ed8face6622 ChangeLog 7363
-RMD160 6999a1d1f9c2464b5279b7763b5ac2f3264fbb88 ChangeLog 7363
-SHA256 f3446434e9ebc351dd25677508a2926938d579cc078172c7dfb57731c70ba82c ChangeLog 7363
+MD5 6de6430b92354d891ae259daaf4e22ff ChangeLog 7938
+RMD160 7ab24642554fb93c7c4526221103eec26e8ae021 ChangeLog 7938
+SHA256 f7f5e9ee76562c1c363dfc69c626cc44d8b7c18bf800e774042a2d41356b764e ChangeLog 7938
 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34
 RMD160 014194a1786a0983a8ba91c3924b798f353c330d files/05portage.envd 34
 SHA256 dbe8db19d03b39ad2b7f9f6dfcd24c615a14886b3fe6d5ce4dd88bac27c0e225 files/05portage.envd 34
@@ -37,6 +37,27 @@ SHA256 5619c164def7cd20db802ca878714669fe258ac285a219e24068f378f8e70d98 files/2.
 MD5 43e6f0038bd9660c6df8c3b6019b33d8 files/2.1_pre6/1000-r2849-quiet-spinner.patch 553
 RMD160 9f83e5d105348dcab20d37212e83422be4b4b86d files/2.1_pre6/1000-r2849-quiet-spinner.patch 553
 SHA256 7277668d65bb47fa5d82f7b9e098378872ff6c8b67b3caa2298324d242952d17 files/2.1_pre6/1000-r2849-quiet-spinner.patch 553
+MD5 43e6f0038bd9660c6df8c3b6019b33d8 files/2.1_pre6/1000_r2849_quiet_spinner.patch 553
+RMD160 9f83e5d105348dcab20d37212e83422be4b4b86d files/2.1_pre6/1000_r2849_quiet_spinner.patch 553
+SHA256 7277668d65bb47fa5d82f7b9e098378872ff6c8b67b3caa2298324d242952d17 files/2.1_pre6/1000_r2849_quiet_spinner.patch 553
+MD5 e990138e8ca469a441c0ea0693fccfe2 files/2.1_pre6/1010_r2854_obey_keeptemp.patch 975
+RMD160 959796b906d202d6e7ca11211386a5e0302a1430 files/2.1_pre6/1010_r2854_obey_keeptemp.patch 975
+SHA256 1d3c7477d6105e80d40a624e17c3f630e80ea3a01fca985c4c18d2cb9d90f5a4 files/2.1_pre6/1010_r2854_obey_keeptemp.patch 975
+MD5 bef2a7a54db731268aba5a0ef1959a0e files/2.1_pre6/1020_r2857_bug_54040_resume_tree.patch 476
+RMD160 2578b632d3ddc38207ec0b8b8de8b3687159e5fc files/2.1_pre6/1020_r2857_bug_54040_resume_tree.patch 476
+SHA256 a17e67831bf8bbce970c773623a1d4c53f98b259cc8590c003c16791f5d67ae2 files/2.1_pre6/1020_r2857_bug_54040_resume_tree.patch 476
+MD5 a2b20536039f4fe286a8794e202d3125 files/2.1_pre6/1030_r2860_exec_stack_no_ppc64.patch 675
+RMD160 65b7a6d32a5c4d64d0f57a08b907b4f6f953b66a files/2.1_pre6/1030_r2860_exec_stack_no_ppc64.patch 675
+SHA256 47c86162094c323ab314f2368e91c6f03b77db51ae02504fa234dbd8f38b117f files/2.1_pre6/1030_r2860_exec_stack_no_ppc64.patch 675
+MD5 54e40c18edd73da5fa19387867684e8c files/2.1_pre6/1040_r2861_cache_cleanse.patch 405
+RMD160 30078c0fc4fcd611860fa9cbae7d56d1879239f0 files/2.1_pre6/1040_r2861_cache_cleanse.patch 405
+SHA256 4ebc34ed10541c979395441cc7d6e86a44919dd17134c6779a36452b263de4f6 files/2.1_pre6/1040_r2861_cache_cleanse.patch 405
+MD5 b97c52fbbe1068782961c0011ab73be0 files/2.1_pre6/1050_r2862_ebuild_unmerge.patch 488
+RMD160 81c6513f6df50cafb6edc20319e75af16129f8a1 files/2.1_pre6/1050_r2862_ebuild_unmerge.patch 488
+SHA256 817ad4117790fce398cdc3ff783a8fa2c3b47ff9a9b189f21548388290b3aae8 files/2.1_pre6/1050_r2862_ebuild_unmerge.patch 488
+MD5 e5d7c1f5d42a669221637111fcb9f85b files/2.1_pre6/1060_r2863_bug_125919_find_compat.patch 490
+RMD160 9521a7d094a3f825e1873f8004655afb8bee4b53 files/2.1_pre6/1060_r2863_bug_125919_find_compat.patch 490
+SHA256 33e1093537871d6c69f788fced2d2c423e628e0cac03ffbf2bb212891932b469 files/2.1_pre6/1060_r2863_bug_125919_find_compat.patch 490
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
@@ -55,9 +76,9 @@ SHA256 31fbf92704c8c3836a781144c1fe6c1a5d7a81e14fa79973821df688baf3f63d files/di
 MD5 0ad32101e0f506d39355653da01063db files/digest-portage-2.1_pre5-r4 253
 RMD160 0fda55221331fa51f8a16e2dc1dbe917d6029f08 files/digest-portage-2.1_pre5-r4 253
 SHA256 d35accf261e03854d47f27e0b03e01bbad0768a0d0fcc8e1a7f0934af6e4b3a0 files/digest-portage-2.1_pre5-r4 253
-MD5 3fb2faffeb73793f7928e07619991317 files/digest-portage-2.1_pre6 253
-RMD160 db4da0bfd99ef42a13051e4089009e9ad3c316c2 files/digest-portage-2.1_pre6 253
-SHA256 bf94181b86808452bb19e43fe4d58aeeb6736924e7bd453f38c0f166b227957c files/digest-portage-2.1_pre6 253
+MD5 3fb2faffeb73793f7928e07619991317 files/digest-portage-2.1_pre6-r1 253
+RMD160 db4da0bfd99ef42a13051e4089009e9ad3c316c2 files/digest-portage-2.1_pre6-r1 253
+SHA256 bf94181b86808452bb19e43fe4d58aeeb6736924e7bd453f38c0f166b227957c files/digest-portage-2.1_pre6-r1 253
 MD5 9e669b11a86a57aa8d2a452531085bb6 files/xterm-titles.patch 1115
 RMD160 60cea5a3cfd37b6a3a15ced00a778defaca09212 files/xterm-titles.patch 1115
 SHA256 0e23efd78cff2d7702a4e3ddcf6b53cd7de417f03234397321281066ea8c026c files/xterm-titles.patch 1115
@@ -79,13 +100,13 @@ SHA256 6f7f1500f7a6ab4a7d651a7dbe44695995fdd2a37e4c6826d5eb9de5749b458a portage-
 MD5 f1758097241d74ff2fbfecea1e831732 portage-2.1_pre5-r4.ebuild 5072
 RMD160 381f37b7fc7c2fd218fff4375f9f7672e4c69d10 portage-2.1_pre5-r4.ebuild 5072
 SHA256 f21564ed3d7f7ac1822464e8bc21d1f69cefe418582fba1ba6f146841899e99c portage-2.1_pre5-r4.ebuild 5072
-MD5 ef15949e4daef2f31f2b3ec059392143 portage-2.1_pre6.ebuild 4889
-RMD160 931c8f065cf3affc0c9d22536f0717051a1e5e71 portage-2.1_pre6.ebuild 4889
-SHA256 b0588e6f3aa96228e7c1e8f5790a8ea6326b41e1351572f6a64d2c25c3d9cce0 portage-2.1_pre6.ebuild 4889
+MD5 6c59acf9c6f676370b4fc812a4d68780 portage-2.1_pre6-r1.ebuild 5261
+RMD160 cf7e94080dc58ee889c414bdce5f2b815c11583e portage-2.1_pre6-r1.ebuild 5261
+SHA256 a67029416b25744d4ea79e74b9f9effd57500c275beaaa22272f76031179d72c portage-2.1_pre6-r1.ebuild 5261
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEE4DQ/ejvha5XGaMRAv8mAJ9JsciIEQQoNI1qkRRcUmMR24TaJQCg0b97
-t2kZ0O2O4O2M26VaPGbuLhk=
-=8pr9
+iD8DBQFEFCob/ejvha5XGaMRAkoJAKCqmWqxzFc/nRTwQJH91fnR6X6XrwCdGU+G
+H5SVuBHDlNpeNSGQgGCaRYU=
+=gjqN
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/2.1_pre6/1000_r2849_quiet_spinner.patch b/sys-apps/portage/files/2.1_pre6/1000_r2849_quiet_spinner.patch
new file mode 100644
index 000000000000..eb2b77c27241
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre6/1000_r2849_quiet_spinner.patch
@@ -0,0 +1,16 @@
+Modified: bin/emerge
+===================================================================
+--- bin/emerge	2006-03-11 09:52:31 UTC (rev 2848)
++++ bin/emerge	2006-03-11 10:33:26 UTC (rev 2849)
+@@ -411,8 +411,9 @@
+ if ("--nocolor" in myopts) and (sys.stdout.isatty()):
+ 	nocolor()
+ 
+-if not sys.stdout.isatty() or ("--nospinner" in myopts):
+-	update_spinner = update_basic_spinner
++if not ("--quiet" in myopts):
++	if not sys.stdout.isatty() or ("--nospinner" in myopts):
++		update_spinner = update_basic_spinner
+ 
+ CLEAN_DELAY = 5
+ EMERGE_WARNING_DELAY = 10
diff --git a/sys-apps/portage/files/2.1_pre6/1010_r2854_obey_keeptemp.patch b/sys-apps/portage/files/2.1_pre6/1010_r2854_obey_keeptemp.patch
new file mode 100644
index 000000000000..337768cccf6a
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre6/1010_r2854_obey_keeptemp.patch
@@ -0,0 +1,22 @@
+Modified: pym/portage.py
+===================================================================
+--- pym/portage.py	2006-03-11 19:16:46 UTC (rev 2853)
++++ pym/portage.py	2006-03-11 19:24:32 UTC (rev 2854)
+@@ -2556,7 +2556,7 @@
+ 		# Should be ok again to set $T, as sandbox does not depend on it
+ 		# XXX Bug.  no way in hell this is valid for clean handling.
+ 		mysettings["T"]=mysettings["PORTAGE_BUILDDIR"]+"/temp"
+-		if cleanup or mydo=="clean":
++		if cleanup:
+ 			if os.path.exists(mysettings["T"]):
+ 				shutil.rmtree(mysettings["T"])
+ 		if not os.path.exists(mysettings["T"]):
+@@ -6099,7 +6099,7 @@
+ 		# Process ebuild logfiles
+ 		elog_process(self.mycpv, self.settings)
+ 		if "noclean" not in features:
+-			doebuild(myebuild, "clean", root, self.settings, cleanup=cleanup, tree=self.treetype)
++			doebuild(myebuild, "clean", root, self.settings, tree=self.treetype)
+ 		return 0
+ 
+ 	def mergeme(self,srcroot,destroot,outfile,secondhand,stufftomerge,cfgfiledict,thismtime):
diff --git a/sys-apps/portage/files/2.1_pre6/1020_r2857_bug_54040_resume_tree.patch b/sys-apps/portage/files/2.1_pre6/1020_r2857_bug_54040_resume_tree.patch
new file mode 100644
index 000000000000..9b72a8031486
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre6/1020_r2857_bug_54040_resume_tree.patch
@@ -0,0 +1,13 @@
+Modified: bin/emerge
+===================================================================
+--- bin/emerge	2006-03-11 20:52:17 UTC (rev 2856)
++++ bin/emerge	2006-03-12 04:11:33 UTC (rev 2857)
+@@ -3156,7 +3156,7 @@
+ 			portage.commit_mtimedb()
+ 		myresumeopts=portage.mtimedb["resume"]["myopts"][:]
+ 
+-		for opt in ("--skipfirst", "--ask", "--verbose"):
++		for opt in ("--skipfirst", "--ask", "--verbose", "--tree"):
+ 			while opt in myresumeopts:
+ 				myresumeopts.remove(opt)
+ 
diff --git a/sys-apps/portage/files/2.1_pre6/1030_r2860_exec_stack_no_ppc64.patch b/sys-apps/portage/files/2.1_pre6/1030_r2860_exec_stack_no_ppc64.patch
new file mode 100644
index 000000000000..400eaf8c6c72
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre6/1030_r2860_exec_stack_no_ppc64.patch
@@ -0,0 +1,13 @@
+Modified: bin/misc-functions.sh
+===================================================================
+--- bin/misc-functions.sh	2006-03-12 08:37:30 UTC (rev 2859)
++++ bin/misc-functions.sh	2006-03-12 09:31:53 UTC (rev 2860)
+@@ -120,7 +120,7 @@
+ 			# are supported at the moment.  Keep this list in sync with
+ 			# http://hardened.gentoo.org/gnu-stack.xml (Arch Status)
+ 			case ${CTARGET:-${CHOST}} in
+-				i?86*|ia64*|m68k*|powerpc64*|s390*|x86_64*)
++				i?86*|ia64*|m68k*|s390*|x86_64*)
+ 					# Allow devs to mark things as ignorable ... e.g. things
+ 					# that are binary-only and upstream isn't cooperating ...
+ 					# we allow ebuild authors to set QA_EXECSTACK_arch and
diff --git a/sys-apps/portage/files/2.1_pre6/1040_r2861_cache_cleanse.patch b/sys-apps/portage/files/2.1_pre6/1040_r2861_cache_cleanse.patch
new file mode 100644
index 000000000000..68ccbf4bcbfe
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre6/1040_r2861_cache_cleanse.patch
@@ -0,0 +1,13 @@
+Modified: pym/cache/util.py
+===================================================================
+--- pym/cache/util.py	2006-03-12 09:31:53 UTC (rev 2860)
++++ pym/cache/util.py	2006-03-12 09:39:32 UTC (rev 2861)
+@@ -16,7 +16,7 @@
+ 		noise=verbose_instance
+ 
+ 	dead_nodes = {}
+-	dead_nodes.fromkeys(trg_cache.keys())
++	dead_nodes = dict.fromkeys(trg_cache.keys())
+ 	count=0
+ 
+ 	if not trg_cache.autocommits:
diff --git a/sys-apps/portage/files/2.1_pre6/1050_r2862_ebuild_unmerge.patch b/sys-apps/portage/files/2.1_pre6/1050_r2862_ebuild_unmerge.patch
new file mode 100644
index 000000000000..23b5c045f0f6
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre6/1050_r2862_ebuild_unmerge.patch
@@ -0,0 +1,15 @@
+Modified: pym/portage.py
+===================================================================
+--- pym/portage.py	2006-03-12 09:39:32 UTC (rev 2861)
++++ pym/portage.py	2006-03-12 11:22:14 UTC (rev 2862)
+@@ -3092,7 +3092,9 @@
+ 	mylink=dblink(cat,pkg,myroot,mysettings,treetype="vartree")
+ 	if mylink.exists():
+ 		mylink.unmerge(trimworld=mytrimworld,cleanup=1)
+-	mylink.delete()
++		mylink.delete()
++		return 0
++	return 1
+ 
+ def isvalidatom(atom):
+ 	mycpv_cps = catpkgsplit(dep_getcpv(atom))
diff --git a/sys-apps/portage/files/2.1_pre6/1060_r2863_bug_125919_find_compat.patch b/sys-apps/portage/files/2.1_pre6/1060_r2863_bug_125919_find_compat.patch
new file mode 100644
index 000000000000..b17491a902e3
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre6/1060_r2863_bug_125919_find_compat.patch
@@ -0,0 +1,13 @@
+Index: bin/misc-functions.sh
+===================================================================
+--- bin/misc-functions.sh	(revision 2862)
++++ bin/misc-functions.sh	(working copy)
+@@ -290,7 +290,7 @@
+ 		rm -Rf ${root}/${no_inst} >&/dev/null
+ 
+ 		# we also need to handle globs (*.a, *.h, etc)
+-		find "${root}" -name ${no_inst} -exec rm -fR {} \; >/dev/null
++		find "${root}" -path ${no_inst} -exec rm -fR {} \; >/dev/null
+ 	done
+ 	# set everything back the way we found it
+ 	set +o noglob
diff --git a/sys-apps/portage/files/digest-portage-2.1_pre6 b/sys-apps/portage/files/digest-portage-2.1_pre6-r1
similarity index 100%
rename from sys-apps/portage/files/digest-portage-2.1_pre6
rename to sys-apps/portage/files/digest-portage-2.1_pre6-r1
diff --git a/sys-apps/portage/portage-2.1_pre6.ebuild b/sys-apps/portage/portage-2.1_pre6-r1.ebuild
similarity index 90%
rename from sys-apps/portage/portage-2.1_pre6.ebuild
rename to sys-apps/portage/portage-2.1_pre6-r1.ebuild
index a1e629fef7eb..026990b303ff 100644
--- a/sys-apps/portage/portage-2.1_pre6.ebuild
+++ b/sys-apps/portage/portage-2.1_pre6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_pre6.ebuild,v 1.3 2006/03/11 20:48:42 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_pre6-r1.ebuild,v 1.1 2006/03/12 14:02:53 zmedico Exp $
 
 inherit toolchain-funcs
 
@@ -31,11 +31,19 @@ S=${WORKDIR}/${PN}-${PV}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	local my_patches="1000-r2849-quiet-spinner.patch"
+	local my_patches="1000_r2849_quiet_spinner.patch
+		1010_r2854_obey_keeptemp.patch
+		1020_r2857_bug_54040_resume_tree.patch
+		1030_r2860_exec_stack_no_ppc64.patch
+		1040_r2861_cache_cleanse.patch
+		1050_r2862_ebuild_unmerge.patch
+		1060_r2863_bug_125919_find_compat.patch"
 	for patch_name in ${my_patches}; do
 		einfo "Applying ${patch_name} ..."
 		patch -p0 --no-backup-if-mismatch < "${FILESDIR}"/${PV}/${patch_name} >/dev/null || die "Failed to apply patch"
 	done
+	einfo "Setting portage.VERSION to ${PVR} ..."
+	sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || die "Failed to patch portage.VERSION"
 }
 
 src_compile() {