2.1_pre7-r5 bug fix revbump

Package-Manager: portage-2.1_pre7-r5

11 files changed, 210 insertions, 15 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 1b7398c190cf..29ac347506e9 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.106 2006/04/09 05:48:21 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.107 2006/04/09 06:56:52 zmedico Exp $
+
+*portage-2.1_pre7-r5 (09 Apr 2006)
+
+  09 Apr 2006; <zmedico@gentoo.org> +portage-2.1_pre7-r5.ebuild,
+  +files/2.1_pre7/1110_r3096_emerge_args_validation.patch,
+  +files/2.1_pre7/1120_r3094_bug_129193.patch,
+  +files/2.1_pre7/1130_r3087_bug_129098.patch,
+  +files/2.1_pre7/1140_r3077_noclean.patch,
+  +files/2.1_pre7/1150_r3082_bug_117713.patch,
+  +files/2.1_pre7/1160_r3083_bug_126801.patch,
+  +files/2.1_pre7/1170_r3084_bug_128362.patch:
+  Bug fixes for #129098, #117713, #129193, #126801, #128362 and more.
 
   08 Apr 2006; <zmedico@gentoo.org> -portage-2.1_pre8.ebuild:
   Withdrawing 2.1_pre8 due to bug #128946.
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 1c79fbc3b419..0cfc670b1a43 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6e3881a18f8b704228cd8ab53de46a57 ChangeLog 12009
-RMD160 16540effab239d987e525e53fa21a8f817ba6246 ChangeLog 12009
-SHA256 884efcafd25c35eae33e9ea483a400e9e84f23c013b24eadda9b573bbd0a48a4 ChangeLog 12009
+MD5 1589a3887d0129afcdc5acc20ce2e7ed ChangeLog 12519
+RMD160 ac0ca51f7deec5fb19f1301d5c948a1053d7345b ChangeLog 12519
+SHA256 717fe46084977c38de89855decdf03ce65447e212ed079b6dcf4f5e236fe39a4 ChangeLog 12519
 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34
 RMD160 014194a1786a0983a8ba91c3924b798f353c330d files/05portage.envd 34
 SHA256 dbe8db19d03b39ad2b7f9f6dfcd24c615a14886b3fe6d5ce4dd88bac27c0e225 files/05portage.envd 34
@@ -43,6 +43,27 @@ SHA256 4abf846ba1bd8c3f5da3fc7d7febc2b8b3da8cdccad7a518925d44bc4a8bd696 files/2.
 MD5 120a029d48d352782e62d6e6522e8243 files/2.1_pre7/1100_r3063_bug_128506_distdir_error.patch 4123
 RMD160 2db6a407371c931b3bb9f3e216d3f4f3810a06d7 files/2.1_pre7/1100_r3063_bug_128506_distdir_error.patch 4123
 SHA256 e63fd61e5e52662d96a387d322a0b95f33f144c731beafbb0b9d9cae7b3e9357 files/2.1_pre7/1100_r3063_bug_128506_distdir_error.patch 4123
+MD5 c40cd40ae42b30f1f0154dfd495a1d1f files/2.1_pre7/1110_r3096_emerge_args_validation.patch 716
+RMD160 bd77f09bdefaf7ee62b61be7bb54c5906d2e8743 files/2.1_pre7/1110_r3096_emerge_args_validation.patch 716
+SHA256 8df1915703ae16fe4f35ece9f3e8f209dbeb79cc126ffaca4a7bf2fd9356b078 files/2.1_pre7/1110_r3096_emerge_args_validation.patch 716
+MD5 faf87b699766ea40753169397c660313 files/2.1_pre7/1120_r3094_bug_129193.patch 965
+RMD160 9f2d19c7a8c5610a3560b1a75f9c48b7c5dd4db7 files/2.1_pre7/1120_r3094_bug_129193.patch 965
+SHA256 71636f11ef3d08982a0ac843fc0f635a61ad77f279ff5b8832455e83f28d0cfc files/2.1_pre7/1120_r3094_bug_129193.patch 965
+MD5 0181ace45de180697a0fd8196af21b86 files/2.1_pre7/1130_r3087_bug_129098.patch 375
+RMD160 a546380bbf2431f20dd144e35ca4e20cf73f6418 files/2.1_pre7/1130_r3087_bug_129098.patch 375
+SHA256 e7822a02fa4e2eaa0fa87e081d442866b66408520bac4e29e4927ad7439636e9 files/2.1_pre7/1130_r3087_bug_129098.patch 375
+MD5 2c1e907dce4d6034fcf166fd5d024e09 files/2.1_pre7/1140_r3077_noclean.patch 880
+RMD160 d0daf475d69fe279d0393ccc09d46d6da7c34abf files/2.1_pre7/1140_r3077_noclean.patch 880
+SHA256 1f5b13b8e059ed20828c2d7ef08b1ec4dfa81000d4f0427879e766b444eacd4c files/2.1_pre7/1140_r3077_noclean.patch 880
+MD5 84f8ea5fb233fddf4dff78746e708096 files/2.1_pre7/1150_r3082_bug_117713.patch 489
+RMD160 3a42b3236117c79c5b47da7707780cb0d14f54bf files/2.1_pre7/1150_r3082_bug_117713.patch 489
+SHA256 7d74a4aff74c318b10994a0f29f6e96921b08c6a33bace5d385c8fffa7a993a6 files/2.1_pre7/1150_r3082_bug_117713.patch 489
+MD5 dfae7fcea89199d2ab8b76525db73a34 files/2.1_pre7/1160_r3083_bug_126801.patch 527
+RMD160 745749df3e40b4fcfb1aff3922a9da4f32653b00 files/2.1_pre7/1160_r3083_bug_126801.patch 527
+SHA256 bfc2c12c53f2288e1bcc3d6271aa86708fa1f4700794c8ae5b301763b847d95d files/2.1_pre7/1160_r3083_bug_126801.patch 527
+MD5 3de90958e6ca54932e7b821759630ea8 files/2.1_pre7/1170_r3084_bug_128362.patch 560
+RMD160 6fb60a634638158bac6dfd06ed1305f56eca3a3e files/2.1_pre7/1170_r3084_bug_128362.patch 560
+SHA256 616ad00c14b4610748ab4f5d140d57cab3bded792065d647158000a2361d3e1e files/2.1_pre7/1170_r3084_bug_128362.patch 560
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
@@ -58,9 +79,9 @@ SHA256 d12b5844039163fd2cb532560d0e82ef7c4b860ea3ef02e0616b34264be13299 files/di
 MD5 2e597ebca5c4c3f101022a5a35d091c7 files/digest-portage-2.1_pre3-r1 253
 RMD160 c0cf87ab1669aea8b35951f9ded0a477377f0265 files/digest-portage-2.1_pre3-r1 253
 SHA256 31fbf92704c8c3836a781144c1fe6c1a5d7a81e14fa79973821df688baf3f63d files/digest-portage-2.1_pre3-r1 253
-MD5 6aebb952d3a284aa4f52d7e5dc7791de files/digest-portage-2.1_pre7-r4 253
-RMD160 437829798fb49cf829eadb8dd84fd8353eb4fdb1 files/digest-portage-2.1_pre7-r4 253
-SHA256 f96288447c0bb578ae0fb80a0169df536c3421f00df4dd8a83d2e910ca489fb5 files/digest-portage-2.1_pre7-r4 253
+MD5 6aebb952d3a284aa4f52d7e5dc7791de files/digest-portage-2.1_pre7-r5 253
+RMD160 437829798fb49cf829eadb8dd84fd8353eb4fdb1 files/digest-portage-2.1_pre7-r5 253
+SHA256 f96288447c0bb578ae0fb80a0169df536c3421f00df4dd8a83d2e910ca489fb5 files/digest-portage-2.1_pre7-r5 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 12bd64c40cfb73bbf504a314688437b2b94f18b37a3d8944f28e315291ce191c portage-
 MD5 908c5af92ff8ea543ed011aefd0832ea portage-2.1_pre3-r1.ebuild 4715
 RMD160 e73644193a07d9957562ea6442b4e7759d8c35a8 portage-2.1_pre3-r1.ebuild 4715
 SHA256 6f7f1500f7a6ab4a7d651a7dbe44695995fdd2a37e4c6826d5eb9de5749b458a portage-2.1_pre3-r1.ebuild 4715
-MD5 27307f949c41b5571ddc63e15b94b928 portage-2.1_pre7-r4.ebuild 5771
-RMD160 43046fa6d1c9054da123e57b6aa2f710a9c212ba portage-2.1_pre7-r4.ebuild 5771
-SHA256 3600b853e5d1ac4b69b07092ccfb7a632d8622be4fc65d7f31b249209b9bc6e6 portage-2.1_pre7-r4.ebuild 5771
+MD5 6ef8ace6b92df29e8a3f528127f48c06 portage-2.1_pre7-r5.ebuild 5990
+RMD160 2b36bc22a0b19f920e856d3113131ca374d57a85 portage-2.1_pre7-r5.ebuild 5990
+SHA256 bd7a99b01a04e444fd5870628ee4c83e3864ec72c3baa9483e1d7d3ad1f46073 portage-2.1_pre7-r5.ebuild 5990
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEOKAp/ejvha5XGaMRAk0QAKC3C+R8G2Q+4msf7NkFptrzOtFt+QCdFOX9
-zE9YXceh1BBgQZ9vWS94Ccc=
-=WsmL
+iD8DBQFEOLA4/ejvha5XGaMRAr77AJ0ZWxfj4pySgAlQIExbt3Q7gevUsQCgoHCZ
+AtjeZUKYT9OhYb+Tr41JjGc=
+=0gaS
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/2.1_pre7/1110_r3096_emerge_args_validation.patch b/sys-apps/portage/files/2.1_pre7/1110_r3096_emerge_args_validation.patch
new file mode 100644
index 000000000000..19dc5ed27fa5
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre7/1110_r3096_emerge_args_validation.patch
@@ -0,0 +1,27 @@
+=== modified file 'bin/emerge'
+--- bin/emerge	
++++ bin/emerge	
+@@ -614,6 +614,10 @@
+ if "--debug" in myopts:
+ 	print "myaction", myaction
+ 	print "myopts", myopts
++
++if not myaction and not myfiles and "--resume" not in myopts:
++	help()
++	sys.exit(1)
+ 
+ # check if root user is the current user for the actions where emerge needs this
+ if portage.secpass < 2:
+@@ -3285,11 +3289,6 @@
+ 			if not ("--quiet" in myopts):
+ 				print "\b\b... done!"
+ 		else:
+-			if not myfiles:
+-				print "emerge: please tell me what to do."
+-				help()
+-				sys.exit(1)
+-				#we don't have any files to process; skip this step and exit
+ 			if not ("--quiet" in myopts):
+ 				print "Calculating dependencies  ",
+ 				sys.stdout.flush()
+
diff --git a/sys-apps/portage/files/2.1_pre7/1120_r3094_bug_129193.patch b/sys-apps/portage/files/2.1_pre7/1120_r3094_bug_129193.patch
new file mode 100644
index 000000000000..51b20d366657
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre7/1120_r3094_bug_129193.patch
@@ -0,0 +1,45 @@
+=== modified file 'pym/portage.py'
+--- pym/portage.py	
++++ pym/portage.py	
+@@ -3266,19 +3266,17 @@
+ 
+ 
+ def dep_getkey(mydep):
+-	if not len(mydep):
+-		return mydep
+-	if mydep[0]=="*":
++	if mydep and mydep[0]=="*":
+ 		mydep=mydep[1:]
+-	if mydep[-1]=="*":
++	if mydep and mydep[-1]=="*":
+ 		mydep=mydep[:-1]
+-	if mydep[0]=="!":
++	if mydep and mydep[0]=="!":
+ 		mydep=mydep[1:]
+ 	if mydep[:2] in [ ">=", "<=" ]:
+ 		mydep=mydep[2:]
+ 	elif mydep[:1] in "=<>~":
+ 		mydep=mydep[1:]
+-	if isspecific(mydep):
++	if mydep and isspecific(mydep):
+ 		mysplit=catpkgsplit(mydep)
+ 		if not mysplit:
+ 			return mydep
+@@ -3287,13 +3285,11 @@
+ 		return mydep
+ 
+ def dep_getcpv(mydep):
+-	if not len(mydep):
+-		return mydep
+-	if mydep[0]=="*":
++	if mydep and mydep[0]=="*":
+ 		mydep=mydep[1:]
+-	if mydep[-1]=="*":
++	if mydep and mydep[-1]=="*":
+ 		mydep=mydep[:-1]
+-	if mydep[0]=="!":
++	if mydep and mydep[0]=="!":
+ 		mydep=mydep[1:]
+ 	if mydep[:2] in [ ">=", "<=" ]:
+ 		mydep=mydep[2:]
+
diff --git a/sys-apps/portage/files/2.1_pre7/1130_r3087_bug_129098.patch b/sys-apps/portage/files/2.1_pre7/1130_r3087_bug_129098.patch
new file mode 100644
index 000000000000..2df2dcae30a6
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre7/1130_r3087_bug_129098.patch
@@ -0,0 +1,13 @@
+=== modified file 'pym/portage_util.py'
+--- pym/portage_util.py	
++++ pym/portage_util.py	
+@@ -627,6 +627,8 @@
+ 				super(atomic_ofstream, self).__init__(tmp_name, mode=mode, **kargs)
+ 				return
+ 			except (OSError, IOError), e:
++				if canonical_path == filename:
++					raise
+ 				writemsg("!!! Failed to open file: '%s'\n" % tmp_name)
+ 				writemsg("!!! %s\n" % str(e))
+ 
+
diff --git a/sys-apps/portage/files/2.1_pre7/1140_r3077_noclean.patch b/sys-apps/portage/files/2.1_pre7/1140_r3077_noclean.patch
new file mode 100644
index 000000000000..4d006bb67a02
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre7/1140_r3077_noclean.patch
@@ -0,0 +1,23 @@
+=== modified file 'pym/portage.py'
+--- pym/portage.py	
++++ pym/portage.py	
+@@ -2745,8 +2745,6 @@
+ 
+ 	# if any of these are being called, handle them -- running them out of the sandbox -- and stop now.
+ 	if mydo in ["clean","cleanrm"]:
+-		if "noclean" in features:
+-			return 0
+ 		return spawn(EBUILD_SH_BINARY+" clean",mysettings,debug=debug,free=1,logfile=None)
+ 	elif mydo in ["help","setup"]:
+ 		return spawn(EBUILD_SH_BINARY+" "+mydo,mysettings,debug=debug,free=1,logfile=logfile)
+@@ -6089,7 +6087,8 @@
+ 
+ 		# Process ebuild logfiles
+ 		elog_process(self.mycpv, self.settings)
+-		doebuild(myebuild, "clean", root, self.settings, tree=self.treetype)
++		if "noclean" not in self.settings.features:
++			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_pre7/1150_r3082_bug_117713.patch b/sys-apps/portage/files/2.1_pre7/1150_r3082_bug_117713.patch
new file mode 100644
index 000000000000..59a8a92d109c
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre7/1150_r3082_bug_117713.patch
@@ -0,0 +1,13 @@
+=== modified file 'bin/ebuild.sh'
+--- bin/ebuild.sh	
++++ bin/ebuild.sh	
+@@ -55,7 +55,7 @@
+ [ ! -z "$OCC" ] && export CC="$OCC"
+ [ ! -z "$OCXX" ] && export CXX="$OCXX"
+ 
+-export PATH="/sbin:/usr/sbin:/usr/lib/portage/bin:/bin:/usr/bin:${ROOTPATH}"
++export PATH="/usr/local/sbin:/sbin:/usr/sbin:/usr/lib/portage/bin:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}"
+ [ ! -z "$PREROOTPATH" ] && export PATH="${PREROOTPATH%%:}:$PATH"
+ 
+ source /usr/lib/portage/bin/isolated-functions.sh  &>/dev/null
+
diff --git a/sys-apps/portage/files/2.1_pre7/1160_r3083_bug_126801.patch b/sys-apps/portage/files/2.1_pre7/1160_r3083_bug_126801.patch
new file mode 100644
index 000000000000..832a8131e87b
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre7/1160_r3083_bug_126801.patch
@@ -0,0 +1,17 @@
+=== modified file 'bin/ebuild.sh'
+--- bin/ebuild.sh	
++++ bin/ebuild.sh	
+@@ -878,6 +878,12 @@
+ 
+ 	[ "${DISTCC_DIR-unset}"  == "unset" ] && export DISTCC_DIR="${PORTAGE_TMPDIR}/.distcc"
+ 	[ ! -z "${DISTCC_DIR}" ] && addwrite "${DISTCC_DIR}"
++
++	LIBDIR_VAR="LIBDIR_${ABI}"
++	if [ -z "${PKG_CONFIG_PATH}" -a -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then
++		export PKG_CONFIG_PATH="/usr/${!LIBDIR_VAR}/pkgconfig"
++	fi
++	unset LIBDIR_VAR
+ 
+ 	if hasq noauto $FEATURES &>/dev/null && [ ! -f ${PORTAGE_BUILDDIR}/.unpacked ]; then
+ 		echo
+
diff --git a/sys-apps/portage/files/2.1_pre7/1170_r3084_bug_128362.patch b/sys-apps/portage/files/2.1_pre7/1170_r3084_bug_128362.patch
new file mode 100644
index 000000000000..d14310409a2f
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre7/1170_r3084_bug_128362.patch
@@ -0,0 +1,17 @@
+=== modified file 'bin/emerge'
+--- bin/emerge	
++++ bin/emerge	
+@@ -2595,10 +2595,10 @@
+ 		if "--quiet" in myopts:
+ 			rsync_opts.append("--quiet")    # Shut up a lot
+ 		else:
+-			rsync_opts.append("--progress") # Progress meter for each file
++			rsync_opts.append("--verbose")	# Print filelist
+ 
+ 		if "--verbose" in myopts:
+-			rsync_opts.append("--verbose")  # More noise? Not really sure what
++			rsync_opts.append("--progress")  # Progress meter for each file
+ 
+ 		if "--debug" in myopts:
+ 			rsync_opts.append("--checksum") # Force checksum on all files
+
diff --git a/sys-apps/portage/files/digest-portage-2.1_pre7-r4 b/sys-apps/portage/files/digest-portage-2.1_pre7-r5
index 2892d68c8269..2892d68c8269 100644
--- a/sys-apps/portage/files/digest-portage-2.1_pre7-r4
+++ b/sys-apps/portage/files/digest-portage-2.1_pre7-r5
diff --git a/sys-apps/portage/portage-2.1_pre7-r4.ebuild b/sys-apps/portage/portage-2.1_pre7-r5.ebuild
index 9c1cf5671d8c..3412fd05483c 100644
--- a/sys-apps/portage/portage-2.1_pre7-r4.ebuild
+++ b/sys-apps/portage/portage-2.1_pre7-r5.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_pre7-r4.ebuild,v 1.1 2006/04/03 06:49:54 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1_pre7-r5.ebuild,v 1.1 2006/04/09 06:56:52 zmedico Exp $
 
 inherit toolchain-funcs
 
@@ -43,7 +43,14 @@ src_unpack() {
 		1070_r3036_bug_127930_unpack_timestamp.patch
 		1080_ensure_dirs.patch
 		1090_r3055_bug_128284_get_open_fds.patch
-		1100_r3063_bug_128506_distdir_error.patch"
+		1100_r3063_bug_128506_distdir_error.patch
+		1110_r3096_emerge_args_validation.patch
+		1120_r3094_bug_129193.patch
+		1130_r3087_bug_129098.patch
+		1140_r3077_noclean.patch
+		1150_r3082_bug_117713.patch
+		1160_r3083_bug_126801.patch
+		1170_r3084_bug_128362.patch"
 	for patch_name in ${my_patches}; do
 		einfo "Applying ${patch_name} ..."
 		patch -p0 --no-backup-if-mismatch < \