Adding the patch separately to ensure I don't kill it in the process.

1 files changed, 170 insertions, 0 deletions

diff --git a/sys-apps/portage/files/2.0.51.22-fixes.patch b/sys-apps/portage/files/2.0.51.22-fixes.patch
new file mode 100644
index 000000000000..8eb32288b5ec
--- /dev/null
+++ b/sys-apps/portage/files/2.0.51.22-fixes.patch
@@ -0,0 +1,170 @@
+diff -uNr portage-2.0.51.22/ChangeLog portage-2.0.51.22-r1/ChangeLog
+--- portage-2.0.51.22/ChangeLog	2005-05-15 19:20:58.000000000 +0900
++++ portage-2.0.51.22-r1/ChangeLog	2005-05-19 00:37:12.000000000 +0900
+@@ -1,12 +1,40 @@
+ # ChangeLog for Portage; the Gentoo Linux ports system 
+ # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+-# $Id: ChangeLog,v 1.796.2.125 2005/05/15 09:37:49 jstubbs Exp $
++# $Id: ChangeLog,v 1.796.2.129 2005/05/18 15:33:49 jstubbs Exp $
+ 
+   MAJOR CHANGES in 2.0.51:
+     1. /var/cache/edb/virtuals is no longer used at all. It's calculated now.
+     2. /var/cache/edb/world is now /var/lib/portage/world.
+     3. /etc/portage/profile/virtuals is _USER_ configs only.
+ 
++  19 May 2005; Jason Stubbs <jstubbs@gentoo.org> pym/portage.py: Disabled
++  userpriv as a user globally instead of only in fetch.
++
++  19 May 2005; Jason Stubbs <jstubbs@gentoo.org> bin/emake: Made the
++  make command configurable but defaulted to "make".
++
++  19 May 2005; Jason Stubbs <jstubbs@gentoo.org> bin/emerge: Fixed an
++  issue that would cause binary package reinstalls when IUSE disagreed.
++
++  19 May 2005; Jason Stubbs <jstubbs@gentoo.org> bin/repoman: Fixed an
++  issue where the portage version wasn't appended to the commit message
++  when specified on the command line. Fixed the detection of files above
++  the package level during Manifest generation.
++
++  19 May 2005; Jason Stubbs <jstubbs@gentoo.org> pym/portage.py: Renamed
++  the userpriv FEATURE to userfetch for the fetch() phase and fixed a bug
++  where privileges would try to be dropped even as non-root. Fixed a bug
++  where files were attempted to be fetched when only a manifest recreation
++  is requested.
++
++  17 May 2005; Jason Stubbs <jstubbs@gentoo.org> pym/portage.py: Stopped
++  attempting to fetch files when only the manifest is being generated.
++
++*portage-2.0.51.22 (15 May 2005): Maintainence Release
++
++  15 May 2005; Jason Stubbs <jstubbs@gentoo.org> bin/dodoc: Removed the dodoc
++  new testing features from head's version of dodoc.
++
+   15 May 2005; Jason Stubbs <jstubbs@gentoo.org> bin/emerge: Made --newuse
+   take priority over --usepkg.
+ 
+diff -uNr portage-2.0.51.22/bin/emake portage-2.0.51.22-r1/bin/emake
+--- portage-2.0.51.22/bin/emake	2005-05-15 19:20:58.000000000 +0900
++++ portage-2.0.51.22-r1/bin/emake	2005-05-19 00:19:52.000000000 +0900
+@@ -1,7 +1,7 @@
+ #!/bin/bash
+ # Copyright 1999-2004 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License v2
+-# $Header: /var/cvsroot/gentoo-src/portage/bin/emake,v 1.9 2004/10/04 13:56:50 vapier Exp $
++# $Header: /var/cvsroot/gentoo-src/portage/bin/emake,v 1.9.2.1 2005/05/18 15:19:52 jstubbs Exp $
+ #
+ # emake: Supplies some default parameters to GNU make. At the moment the
+ #        only parameter supplied is -jN, where N is a number of
+@@ -11,4 +11,4 @@
+ #        /etc/make.globals here because emake is only called from an
+ #        ebuild.
+ 
+-make ${MAKEOPTS} ${EXTRA_EMAKE} "$@"
++${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE} "$@"
+diff -uNr portage-2.0.51.22/bin/emerge portage-2.0.51.22-r1/bin/emerge
+--- portage-2.0.51.22/bin/emerge	2005-05-15 19:20:58.000000000 +0900
++++ portage-2.0.51.22-r1/bin/emerge	2005-05-19 00:19:52.000000000 +0900
+@@ -1,7 +1,7 @@
+ #!/usr/bin/python -O
+ # Copyright 1999-2004 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License v2
+-# $Header: /var/cvsroot/gentoo-src/portage/bin/emerge,v 1.345.2.30 2005/05/15 09:37:49 jstubbs Exp $
++# $Header: /var/cvsroot/gentoo-src/portage/bin/emerge,v 1.345.2.31 2005/05/18 15:19:52 jstubbs Exp $
+ 
+ import os,sys
+ os.environ["PORTAGE_CALLER"]="emerge"
+@@ -949,7 +949,7 @@
+ 			elif ("selective" in myparams) and vardbapi.cpv_exists(mykey):
+ 				merging=0
+ 
+-			if (merging==0 and "--newuse" in myopts and vardbapi.cpv_exists(mykey)):
++			if (merging==0 and mytype=="ebuild" and "--newuse" in myopts and vardbapi.cpv_exists(mykey)):
+ 				iuses=string.split(portage.portdb.aux_get(mykey, ["IUSE"])[0])
+ 				old_use=string.split(vardbapi.aux_get(mykey, ["USE"])[0])
+ 				now_use=string.split(self.pkgsettings["USE"])
+diff -uNr portage-2.0.51.22/bin/repoman portage-2.0.51.22-r1/bin/repoman
+--- portage-2.0.51.22/bin/repoman	2005-05-15 19:20:58.000000000 +0900
++++ portage-2.0.51.22-r1/bin/repoman	2005-05-19 00:19:52.000000000 +0900
+@@ -1,7 +1,7 @@
+ #!/usr/bin/python -O
+ # Copyright 1999-2005 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License v2
+-# $Header: /var/cvsroot/gentoo-src/portage/bin/repoman,v 1.98.2.21 2005/05/15 09:37:49 jstubbs Exp $
++# $Header: /var/cvsroot/gentoo-src/portage/bin/repoman,v 1.98.2.22 2005/05/18 15:19:52 jstubbs Exp $
+ 
+ # Next to do: dep syntax checking in mask files
+ # Then, check to make sure deps are satisfiable (to avoid "can't find match for" problems)
+@@ -1373,11 +1373,11 @@
+ 				commitmessage=raw_input(green("> "))
+ 			except KeyboardInterrupt: 
+ 				exithandler()
+-		try:
+-			commitmessage+="\n(Portage version: "+str(portage.VERSION)+")"
+-		except:
+-			print "Failed to insert portage version in message!"
+-			commitmessage+="\n(Portage version: Unknown)"
++	try:
++		commitmessage+="\n(Portage version: "+str(portage.VERSION)+")"
++	except:
++		print "Failed to insert portage version in message!"
++		commitmessage+="\n(Portage version: Unknown)"
+ 	if not commitmessagefile:
+ 		unlinkfile=1
+ 		commitmessagefile=tempfile.mktemp(".repoman.msg")
+@@ -1417,7 +1417,7 @@
+ 	if myheaders or myupdates or myremoved or mynew:
+ 		myfiles=myheaders+myupdates+myremoved+mynew
+ 		for x in range(len(myfiles)-1, -1, -1):
+-			if not os.path.exists(myfiles[x]) or not os.path.isdir(myfiles[x]):
++			if myfiles[x].count("/") < 4-repolevel:
+ 				del myfiles[x]
+ 		mydone=[]
+ 		if repolevel==3:   # In a package dir
+diff -uNr portage-2.0.51.22/pym/portage.py portage-2.0.51.22-r1/pym/portage.py
+--- portage-2.0.51.22/pym/portage.py	2005-05-15 19:20:58.000000000 +0900
++++ portage-2.0.51.22-r1/pym/portage.py	2005-05-19 00:38:25.000000000 +0900
+@@ -1,10 +1,10 @@
+ # portage.py -- core Portage functionality
+ # Copyright 1998-2004 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License v2
+-# $Header: /var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.524.2.72 2005/05/15 09:37:50 jstubbs Exp $
+-cvs_id_string="$Id: portage.py,v 1.524.2.72 2005/05/15 09:37:50 jstubbs Exp $"[5:-2]
++# $Header: /var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.524.2.75 2005/05/18 15:33:49 jstubbs Exp $
++cvs_id_string="$Id: portage.py,v 1.524.2.75 2005/05/18 15:33:49 jstubbs Exp $"[5:-2]
+ 
+-VERSION="2.0.51.22"
++VERSION="2.0.51.22-r1"
+ 
+ # ===========================================================================
+ # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT
+@@ -1588,7 +1588,7 @@
+ 		(("nouserpriv" in string.split(mysettings["RESTRICT"])) or \
+ 		 ("userpriv" in string.split(mysettings["RESTRICT"]))))
+ 
+-	if droppriv and portage_gid and portage_uid:
++	if droppriv and not uid and portage_gid and portage_uid:
+ 		keywords.update({"uid":portage_uid,"gid":portage_gid,"groups":[portage_gid],"umask":002})
+ 
+ 	if not free:
+@@ -1902,10 +1902,10 @@
+ 							con=selinux.getcontext()
+ 							con=string.replace(con,mysettings["PORTAGE_T"],mysettings["PORTAGE_FETCH_T"])
+ 							selinux.setexec(con)
+-							myret=spawn(myfetch,mysettings,free=1, droppriv=("userpriv" in mysettings.features))
++							myret=spawn(myfetch,mysettings,free=1, droppriv=("userfetch" in mysettings.features))
+ 							selinux.setexec(None)
+ 						else:
+-							myret=spawn(myfetch,mysettings,free=1, droppriv=("userpriv" in mysettings.features))
++							myret=spawn(myfetch,mysettings,free=1, droppriv=("userfetch" in mysettings.features))
+ 					finally:
+ 						#if root, -always- set the perms.
+ 						if os.path.exists(mysettings["DISTDIR"]+"/"+myfile) and (fetched != 1 or os.getuid() == 0) \
+@@ -2661,7 +2661,7 @@
+ 	except:
+ 		pass
+ 
+-	if not fetch(fetchme, mysettings, listonly=listonly, fetchonly=fetchonly):
++	if mydo!="manifest" and not fetch(fetchme, mysettings, listonly=listonly, fetchonly=fetchonly):
+ 		return 1
+ 
+ 	if mydo=="fetch" and listonly: