Add split patches for the 2.1_pre5 regression fix releases.

Package-Manager: portage-2.1_pre5-r4

9 files changed, 203 insertions, 3 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index fff23efd4f3a..f5f064381dc5 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -13,6 +13,30 @@ SHA256 a6ae22f6513e9c5160204d9ba2ca8bab00091a88089139ff64bee68aaf63a95c files/2.
 MD5 3bb6035fc0fbd3c6a7114490d4495c59 files/2.1_pre5-r3.patch 4776
 RMD160 5b00af2aab199683c646cc4fda3dc84b92a823f8 files/2.1_pre5-r3.patch 4776
 SHA256 8c9cc99be5adc28bd06c2d787db5e6fd2946dbd790bb3c5fe09ce5d82d53f982 files/2.1_pre5-r3.patch 4776
+MD5 b521971700cd2a96cf1b2d5ccbcb3483 files/2.1_pre5/1000_r2763_fixpackages_features.patch 238
+RMD160 0e1c4807fc7c1cb88d221586e7d5e5b0bd9498a9 files/2.1_pre5/1000_r2763_fixpackages_features.patch 238
+SHA256 aa859a7008d893861b449745a0b37a719dfe6ad7974fafa01608435379d0b864 files/2.1_pre5/1000_r2763_fixpackages_features.patch 238
+MD5 708990e216332c66ab18535802abd98c files/2.1_pre5/1010_r2764_emergelog_genlop.patch 575
+RMD160 9e954dda6c7e1a87b29e6c5695151ea96da5a328 files/2.1_pre5/1010_r2764_emergelog_genlop.patch 575
+SHA256 441c2f40044c4dfc90c6971c9d68ab2ec062ebbe37b935cd6d167a9b4fab51e7 files/2.1_pre5/1010_r2764_emergelog_genlop.patch 575
+MD5 76114c0ae60af1b0ad2fa3b16625dcaa files/2.1_pre5/1020_r2800_bug_124203_clean_phase_sanity.patch 398
+RMD160 d11994c0e501e2591127d7728506039fd48e75ad files/2.1_pre5/1020_r2800_bug_124203_clean_phase_sanity.patch 398
+SHA256 a7245038f9dc0fd0fa48d16f3984389da2a321c773b4e32fcf71fa64f7d242dc files/2.1_pre5/1020_r2800_bug_124203_clean_phase_sanity.patch 398
+MD5 2cb5a3738011c3e76db406d104b26469 files/2.1_pre5/1030_r2790_bug_124140_portage_locks_hardlink.patch 444
+RMD160 7ee7c82c9cba9345892063fb74edaed68e4d6c0c files/2.1_pre5/1030_r2790_bug_124140_portage_locks_hardlink.patch 444
+SHA256 d934f43e3c598494b648624584dd8ae540836fab258ea01c4aea1281ce967887 files/2.1_pre5/1030_r2790_bug_124140_portage_locks_hardlink.patch 444
+MD5 ca228fd976bf237da71e048ffcaef0c7 files/2.1_pre5/1040_r2804_bug_124568_dobin_wheel.patch 924
+RMD160 3aa471e8ac8ad9397b598ab01c05fe1a20246812 files/2.1_pre5/1040_r2804_bug_124568_dobin_wheel.patch 924
+SHA256 15152e70ab862849749f64a54eea8bc3ab45ceb46aba9742f255c0101872dd17 files/2.1_pre5/1040_r2804_bug_124568_dobin_wheel.patch 924
+MD5 8279193615d35ccb8d8496f2fcbb58bb files/2.1_pre5/1050_r2805_bug_124621_webrsync_niceness.patch 875
+RMD160 776c2812dc6536e54d133904a760faa038a65acc files/2.1_pre5/1050_r2805_bug_124621_webrsync_niceness.patch 875
+SHA256 cd12a5e31772411563894bf174cef7e49965dbb2c3dc58321441995e26ea4820 files/2.1_pre5/1050_r2805_bug_124621_webrsync_niceness.patch 875
+MD5 d3f491aba0c765a9f06f473d92262789 files/2.1_pre5/1060_r2812_bug_124471_worldfile_ROOT.patch 1762
+RMD160 a4c7695a5298c819b24f75fe9821d585ff5e5347 files/2.1_pre5/1060_r2812_bug_124471_worldfile_ROOT.patch 1762
+SHA256 3ad39a43bef0fa94b5fd3ffd2173c8b076ffbd3179e9c15c9844fdaddeaa6aed files/2.1_pre5/1060_r2812_bug_124471_worldfile_ROOT.patch 1762
+MD5 b0f0aee3708359245752289af4a8923b files/2.1_pre5/version_bump_2.1_pre5-r4.patch 378
+RMD160 3e96116e5c06994417fc3dfa2fd344676f8f7a53 files/2.1_pre5/version_bump_2.1_pre5-r4.patch 378
+SHA256 5619c164def7cd20db802ca878714669fe258ac285a219e24068f378f8e70d98 files/2.1_pre5/version_bump_2.1_pre5-r4.patch 378
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
@@ -55,7 +79,7 @@ SHA256 05a311bae2195126adc5cc716821ec3bb4f99c2fac455d60e9f680413bc92cd1 portage-
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFECPW//ejvha5XGaMRAo7vAKC1DehDOVOuVqgNPHvds2gFCl6ykACg1gSl
-CNd3rTRHDWZMvCY35rmbLeE=
-=h7nF
+iD8DBQFECkKc/ejvha5XGaMRAs4/AKC6xyqdxraPwNOsKK0dQvtW+gUamACfR+Wz
+Q6MkgYm4Dungh3eqnoMHHgY=
+=Z4jq
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/2.1_pre5/1000_r2763_fixpackages_features.patch b/sys-apps/portage/files/2.1_pre5/1000_r2763_fixpackages_features.patch
new file mode 100644
index 000000000000..7a948ba95d00
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre5/1000_r2763_fixpackages_features.patch
@@ -0,0 +1,13 @@
+=== modified file 'pym/portage.py'
+--- pym/portage.py	
++++ pym/portage.py	
+@@ -5334,6 +5334,8 @@
+ 		return 1
+ 
+ 	def update_ents(self, update_iter):
++		if len(update_iter) == 0:
++			return
+ 		if not self.populated:
+ 			self.populate()
+ 
+
diff --git a/sys-apps/portage/files/2.1_pre5/1010_r2764_emergelog_genlop.patch b/sys-apps/portage/files/2.1_pre5/1010_r2764_emergelog_genlop.patch
new file mode 100644
index 000000000000..45aac5746a9d
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre5/1010_r2764_emergelog_genlop.patch
@@ -0,0 +1,13 @@
+=== modified file 'bin/emerge'
+--- bin/emerge	
++++ bin/emerge	
+@@ -1934,7 +1934,7 @@
+ 			y=portage.portdb.findname(x[pkgindex])
+ 			if not "--pretend" in myopts:
+ 				print ">>> Emerging ("+str(mergecount)+" of "+str(len(mymergelist))+")",x[pkgindex],"to",x[1]
+-				emergelog(" >>> Emerging ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" to "+x[1])
++				emergelog(" >>> emerge ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" to "+x[1])
+ 
+ 			self.pkgsettings["EMERGE_FROM"] = x[0][:]
+ 			self.pkgsettings.backup_changes("EMERGE_FROM")
+
diff --git a/sys-apps/portage/files/2.1_pre5/1020_r2800_bug_124203_clean_phase_sanity.patch b/sys-apps/portage/files/2.1_pre5/1020_r2800_bug_124203_clean_phase_sanity.patch
new file mode 100644
index 000000000000..556f875867f9
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre5/1020_r2800_bug_124203_clean_phase_sanity.patch
@@ -0,0 +1,16 @@
+=== modified file 'bin/ebuild.sh'
+--- bin/ebuild.sh	
++++ bin/ebuild.sh	
+@@ -727,6 +727,11 @@
+ }
+ 
+ dyn_clean() {
++	if [ -z "${PORTAGE_BUILDDIR}" ]; then
++		echo "Aborting clean phase because PORTAGE_BUILDDIR is unset!"
++		return 1
++	fi
++
+ 	if [ "$USERLAND" == "BSD" ] && type -p chflags &>/dev/null; then
+ 		chflags -R noschg,nouchg,nosappnd,nouappnd,nosunlnk,nouunlnk \
+ 			"${PORTAGE_BUILDDIR}"
+
diff --git a/sys-apps/portage/files/2.1_pre5/1030_r2790_bug_124140_portage_locks_hardlink.patch b/sys-apps/portage/files/2.1_pre5/1030_r2790_bug_124140_portage_locks_hardlink.patch
new file mode 100644
index 000000000000..685f365c95be
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre5/1030_r2790_bug_124140_portage_locks_hardlink.patch
@@ -0,0 +1,14 @@
+=== modified file 'pym/portage_locks.py'
+--- pym/portage_locks.py	
++++ pym/portage_locks.py	
+@@ -122,7 +122,8 @@
+ 			raise
+ 
+ 		
+-	if type(lockfilename) == types.StringType and os.fstat(myfd).st_nlink != 1:
++	if type(lockfilename) == types.StringType and \
++		myfd != HARDLINK_FD and os.fstat(myfd).st_nlink != 1:
+ 		# The file was deleted on us... Keep trying to make one...
+ 		os.close(myfd)
+ 		portage_util.writemsg("lockfile recurse\n",1)
+
diff --git a/sys-apps/portage/files/2.1_pre5/1040_r2804_bug_124568_dobin_wheel.patch b/sys-apps/portage/files/2.1_pre5/1040_r2804_bug_124568_dobin_wheel.patch
new file mode 100644
index 000000000000..79850c303f71
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre5/1040_r2804_bug_124568_dobin_wheel.patch
@@ -0,0 +1,44 @@
+=== modified file 'bin/dobin'
+--- bin/dobin	
++++ bin/dobin	
+@@ -12,16 +12,11 @@
+ 	install -d "${D}${DESTTREE}/bin" || exit 2
+ fi
+ 
+-case ${CHOST} in
+-	*-freebsd*) group=wheel ;;
+-	*)          group=root ;;
+-esac
+-
+ ret=0
+ 
+ for x in "$@" ; do
+ 	if [[ -e ${x} ]] ; then
+-		install -m0755 -o root -g ${group} "${x}" "${D}${DESTTREE}/bin"
++		install -m0755 -o 0 -g 0 "${x}" "${D}${DESTTREE}/bin"
+ 	else
+ 		echo "!!! ${0##*/}: ${x} does not exist" 1>&2
+ 		false
+
+=== modified file 'bin/dosbin'
+--- bin/dosbin	
++++ bin/dosbin	
+@@ -12,16 +12,11 @@
+ 	install -d "${D}${DESTTREE}/sbin" || exit 2
+ fi
+ 
+-case ${CHOST} in
+-	*-freebsd*) group=wheel ;;
+-	*)          group=root ;;
+-esac
+-
+ ret=0
+ 
+ for x in "$@" ; do
+ 	if [[ -e ${x} ]] ; then
+-		install -m0755 -o root -g ${group} "${x}" "${D}${DESTTREE}/sbin"
++		install -m0755 -o 0 -g 0 "${x}" "${D}${DESTTREE}/sbin"
+ 	else
+ 		echo "!!! ${0##*/}: ${x} does not exist" 1>&2
+ 		false
+
diff --git a/sys-apps/portage/files/2.1_pre5/1050_r2805_bug_124621_webrsync_niceness.patch b/sys-apps/portage/files/2.1_pre5/1050_r2805_bug_124621_webrsync_niceness.patch
new file mode 100644
index 000000000000..a0b5da9035a6
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre5/1050_r2805_bug_124621_webrsync_niceness.patch
@@ -0,0 +1,23 @@
+=== modified file 'bin/emerge-webrsync'
+--- bin/emerge-webrsync	
++++ bin/emerge-webrsync	
+@@ -5,13 +5,11 @@
+ # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
+ # Rewritten from the old, Perl-based emerge-webrsync script
+ 
+-if [ -z "$PULLED_NICENESS" ]; then
+-	PULLED_NICENESS="$(/usr/lib/portage/bin/portageq envvar PORTAGE_NICENESS)"
+-	if [ -n "$PULLED_NICENESS" ]; then
+-		export PULLED_NICENESS
+-		exec nice -n $PORTAGE_NICENESS "$0" "$@"
+-		echo "failed pulling PORTAGE_NICENESS, disabling"
+-	fi
++# If PORTAGE_NICENESS is overriden via the env then it will
++# still pass through the portageq call and override properly.
++PORTAGE_NICENESS="$(/usr/lib/portage/bin/portageq envvar PORTAGE_NICENESS)"
++if [ -n "${PORTAGE_NICENESS}" ]; then
++	renice $PORTAGE_NICENESS $$ > /dev/null
+ fi
+ 
+ GENTOO_MIRRORS="${GENTOO_MIRRORS} $(/usr/lib/portage/bin/portageq gentoo_mirrors)"
+
diff --git a/sys-apps/portage/files/2.1_pre5/1060_r2812_bug_124471_worldfile_ROOT.patch b/sys-apps/portage/files/2.1_pre5/1060_r2812_bug_124471_worldfile_ROOT.patch
new file mode 100644
index 000000000000..9a311bc82269
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre5/1060_r2812_bug_124471_worldfile_ROOT.patch
@@ -0,0 +1,40 @@
+Index: pym/portage.py
+===================================================================
+--- pym/portage.py	(revision 2811)
++++ pym/portage.py	(working copy)
+@@ -5826,7 +5826,8 @@
+ 				os.chown(pdir, 0, portage_gid)
+ 				os.chmod(pdir, 02770)
+ 
+-			write_atomic(os.path.join(self.myroot,WORLD_FILE),"\n".join(newworldlist))
++			write_atomic(os.path.join(self.myroot, WORLD_FILE.lstrip(os.sep)),
++			"\n".join(newworldlist))
+ 
+ 		#do original postrm
+ 		if myebuildpath and os.path.exists(myebuildpath):
+Index: bin/emerge
+===================================================================
+--- bin/emerge	(revision 2811)
++++ bin/emerge	(working copy)
+@@ -1861,7 +1861,9 @@
+ 							myfavdict[myfavkey]=myfavkey
+ 							print ">>> Recording",myfavkey,"in \"world\" favorites file..."
+ 			if not "--fetchonly" in myopts:
+-				portage.write_atomic(os.path.join(portage.root,portage.WORLD_FILE),"\n".join(myfavdict.values()))
++				portage.write_atomic(
++				os.path.join(portage.root, portage.WORLD_FILE.lstrip(os.sep)),
++				"\n".join(myfavdict.values()))
+ 
+ 			portage.mtimedb["resume"]["mergelist"]=mymergelist[:]
+ 
+@@ -2032,7 +2034,9 @@
+ 						myfavdict[myfavkey]=myfavkey
+ 						print ">>> Recording",myfavkey,"in \"world\" favorites file..."
+ 						emergelog(" === ("+str(mergecount)+" of "+str(len(mymergelist))+") Updating world file ("+x[pkgindex]+")")
+-						portage.write_atomic(os.path.join(myroot,portage.WORLD_FILE),"\n".join(myfavdict.values()))
++						portage.write_atomic(
++						os.path.join(myroot, portage.WORLD_FILE.lstrip(os.sep)),
++						"\n".join(myfavdict.values()))
+ 
+ 				if ("noclean" not in portage.features) and (x[0] != "binary"):
+ 					short_msg = "emerge: ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" Clean Post"
diff --git a/sys-apps/portage/files/2.1_pre5/version_bump_2.1_pre5-r4.patch b/sys-apps/portage/files/2.1_pre5/version_bump_2.1_pre5-r4.patch
new file mode 100644
index 000000000000..770a5a9df203
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre5/version_bump_2.1_pre5-r4.patch
@@ -0,0 +1,13 @@
+=== modified file 'pym/portage.py'
+--- pym/portage.py	
++++ pym/portage.py	
+@@ -4,7 +4,7 @@
+ # $Id: version_bump_2.1_pre5-r4.patch,v 1.1 2006/03/05 01:44:49 zmedico Exp $
+ 
+ 
+-VERSION="2.1_pre5"
++VERSION="2.1_pre5-r4"
+ 
+ # ===========================================================================
+ # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT
+