Portage 2.0.16 and cleanups

5 files changed, 30 insertions, 208 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 1c36551687f7..89b39630b877 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,184 +1,7 @@
 # ChangeLog for sys-apps/portage
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.16 2002/07/06 05:35:41 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.17 2002/07/23 04:36:42 drobbins Exp $
 
-# *************
 # See the gentoo-src Portage ChangeLog for up-to-date release information:
 # http://www.gentoo.org/cgi-bin/viewcvs.cgi/gentoo-src/portage/ChangeLog?rev=HEAD&content-type=text/vnd.viewcvs-markup
-# *************
 
-*portage-1.9.13-r1 (13 June 2002)
-
-  13 June 2002; Bart Verwilst <verwilst@gentoo.org> : 
-
-  Sandbox fixed for gentoo 1.3+ users!!! :o) Uses "-O2 -march=i486 -pipe" 
-  now to compile sandbox, and that fixes it, yay! (bug #2929).
-
-*portage-1.9.5-r1 (2 May 2002)
-
-  2 May 2002; Kain <kain@kain.org> : small fix for portage running on PPC,
-  since sandbox breaks on PPC.  (We disable sandbox there.)
-
-*portage-1.8.9_pre9 (21 Feb 2002)
-
-  21 Feb 2002; Daniel Robbins <drobbins@gentoo.org> : many fixes and
-  improvements too numerous to list here.  See the gentoo-src Portage ChangeLog
-  (rather than this ebuild ChangeLog) for more info.  The major ebuild-related
-  changed was the transition from spython back to python.
-
-*portage-1.8.9_pre8 (12 Feb 2002) 
-
-  12 Feb 2002; G.Bevin <gbevin@gentoo.org> portage-1.8.9_pre8.ebuild,
-  files/digest-portage-1.8.9_pre8, files/portage-1.8.9_pre8.tar.bz2 :
-  
-  bugfixes and code cleanup
-  
-*portage-1.8.9_pre7 (11 Feb 2002) 
-
-  11 Feb 2002; G.Bevin <gbevin@gentoo.org> portage-1.8.9_pre7.ebuild,
-  files/digest-portage-1.8.9_pre7, files/portage-1.8.9_pre7.tar.bz2 :
-  
-  - internal bugfixes
-  - sandbox related security fixes
-  - removed support for --all and world in 'emerge --unmerge', by default now
-    all matching packages are removed since with the new slots functionality
-    old package versions should not exists anymore
-  - colored package name red too when a blocking package is found during
-    pretend operation
-  - changed emerge invocation arguments to be in a new universal interface
-    format this has been decided to be :
-	'emerge --action --option --option [packageset]'
-	some features however don't respect this, but that's since they are not
-	package installation related and are easier to use as straight commands
-	eg: emerge rsync
-  - added UNMERGE_DELAY var to make.globals and support it in emerge to obtain
-    the number of seconds to wait
-  - support for NOCOLOR="yes" as wel as NOCOLOR="true"
-  - major speedups for emerge -search
-  - added formatted package descriptions of the matches from emerge --search
-    that nicely wrap at 80 chars
-  - rewrote retrieval of package descriptions to support descriptions that are
-    specified on multiple lines
-  - added support for 'noslot' to --zap, --update and --rebuild
-  
-*portage-1.8.9_pre6 (10 Feb 2002) 
-
-  10 Feb 2002; G.Bevin <gbevin@gentoo.org> portage-1.8.9_pre6.ebuild,
-  files/digest-portage-1.8.9_pre6, files/portage-1.8.9_pre6.tar.bz2 :
-  
-  - added support for 'emerge --unmerge world' which removes all old package
-    versions from the system
-  - made 'emerge --unmerge' take binary compatibility slots into account, this
-    prevents that packages with different versions but also different slots, are
-    being unmerged
-  - added support for "--verbose" in "emerge rebuild" and "emerge world" to
-    provide details about packages that aren't in the local tree anymore and to
-    notify the user about which packages don't support slots
-  - added support for the "emerge rebuild" mode which rebuilds all the packages
-    on your system for which a corresponding package could be found in to
-	portage tree
-  - bugfixes to binary package merging
-  - code cleanups and speedups
-
-*portage-1.8.9_pre5 (6 Feb 2002)
-
-  6 Feb 2002; G.Bevin <gbevin@gentoo.org> portage-1.8.9_pre5.ebuild,
-  files/digest-portage-1.8.9_pre5, files/portage-1.8.9_pre5.tar.bz2 :
-  
-  - unmerging didn't work right when packages had the same slot, but different
-    versions, this is now fixed
-  - ebuild qmerge wasn't updated for the new slots behaviour
-  - proxy configuration moved from make.globals to make.conf
-
-*portage-1.8.9_pre4 (6 Feb 2002)
-
-  6 Feb 2002; G.Bevin <gbevin@gentoo.org> portage-1.8.9_pre4.ebuild,
-  files/digest-portage-1.8.9_pre4, files/portage-1.8.9_pre4.tar.bz2 :
-
-  fixed more bugs in the binary compatibility slots, more specifically :
-  - when trying to unmerge all instances of a package than was installed both
-    without the slot functionality and with it, before this ended in an error
-	message and failed to unmerge one of them
-  - virtual packages didn't play nice with binary compatibility
-  
-*portage-1.8.9_pre3 (5 Feb 2002)
-
-  5 Feb 2002; G.Bevin <gbevin@gentoo.org> portage-1.8.9_pre3.ebuild,
-  files/digest-portage-1.8.9_pre3, files/portage-1.8.9_pre3.tar.bz2 :
-  
-  Only let the backward compatibility code kick in during unmerge since it's
-  not possible to do the correct detections for general usage.
-
-*portage-1.8.9_pre2 (5 Feb 2002)
-
-  5 Feb 2002; G.Bevin <gbevin@gentoo.org> portage-1.8.9_pre2.ebuild,
-  files/digest-portage-1.8.9_pre2, files/portage-1.8.9_pre2.tar.bz2 :
-  
-  - Fixed installation problem where output.py wasn't copied to the python
-    modules directory.
-  - Fixed bug in the unmerging of packages that were installed with an older
-    portage version.
-
-*portage-1.8.9_pre1 (5 Feb 2002)
-
-  5 Feb 2002; G.Bevin <gbevin@gentoo.org> portage-1.8.9_pre1.ebuild :
-  
-  Install emerge to /usr/bin instead of /usr/sbin.
-
-  4 Feb 2002; G.Bevin <gbevin@gentoo.org> portage-1.8.9_pre1.ebuild,
-  files/digest-portage-1.8.9_pre1, files/portage-1.8.9_pre1.tar.bz2 :
-  
-  - Reinstated support for the "ebuild help" command which seems to have
-    disappeared somewhere along prior updates.
-  - Added description and default entry for the imlib USE variable.
-  - Added flag to prozilla to disable prozilla's waiting for a user's keypress
-    when a failure occurs.
-  - Added alternative short flags for most emerge invocation options.
-  - Emerge now doesn't unmerge the last version of an installed version by
-    default anymore, to really remove all instanced of packages the --all flag
-    has to be used, the --safe flag is deprecated.
-  - Made it possible to run emerge --help and --search as non root.
-  - All emerge output can now be turned to black and white by setting the
-    NOCOLOR variable in make.conf or make.globals to true.
-  - Implemented the ! dependency for ebuild authors which prevents incompatible
-    packages from being installed on the same system at the same time.
-  - Added binary compatibility slots. By default packages now install to their
-    version number without the release number. Ebuild authors of packages that
-	are expected to remain binary compatible across version changes, should
-	add the SLOT variable to their ebuilds. The SLOT variable should contain a
-	number. When a new package version is compatible with an older one, the same
-	number should be used for the SLOT variable, this makes portage
-	automatically unmerge the older package for which the new one is a drop-in
-	replacement.
-
-*portage-1.8.8-r1 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> portage-1.8.8-r1.ebuild,
-  files/digest-portage-1.8.8-r1, files/portage-1.8.8-r1.tar.bz2 :
-  
-  - Made env-update disregard backup files.
-  - Added --pretend support to emerge --unmerge instead of interactively asking
-    to proceed.
-  - Implemented to noauto maintainer flag for all relevant ebuild commands.
-  - Added a pkg_setup() function for ebuild authors which is executed before
-    anything else and can be typically used for package configuration actions or
-    required system checks
-  
-*portage-1.8.8 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> portage-1.8.8.ebuild,
-  files/digest-portage-1.8.8, files/portage-1.8.8.tar.bz2 :
-  
-  - Added emerge --unmerge support with an optional --safe option.
-  - Cleaned up the handling of package names without categories to make it a
-    drop-in replacement anywhere in portage.
-  
-*portage-1.8.7 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/sys-apps/portage/files/digest-portage-2.0.15 b/sys-apps/portage/files/digest-portage-2.0.16
index e69de29bb2d1..e69de29bb2d1 100644
--- a/sys-apps/portage/files/digest-portage-2.0.15
+++ b/sys-apps/portage/files/digest-portage-2.0.16
diff --git a/sys-apps/portage/files/portage-2.0.15.tar.bz2 b/sys-apps/portage/files/portage-2.0.15.tar.bz2
deleted file mode 100644
index e036f90c6f83..000000000000
--- a/sys-apps/portage/files/portage-2.0.15.tar.bz2
+++ /dev/null
diff --git a/sys-apps/portage/files/portage-2.0.16.tar.bz2 b/sys-apps/portage/files/portage-2.0.16.tar.bz2
new file mode 100644
index 000000000000..3a30b48de339
--- /dev/null
+++ b/sys-apps/portage/files/portage-2.0.16.tar.bz2
diff --git a/sys-apps/portage/portage-2.0.15.ebuild b/sys-apps/portage/portage-2.0.16.ebuild
index 48969e25c2b0..bc74d07a3094 100644
--- a/sys-apps/portage/portage-2.0.15.ebuild
+++ b/sys-apps/portage/portage-2.0.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc. Distributed under the terms
-# of the GNU General Public License, v2 or later 
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.15.ebuild,v 1.2 2002/07/17 05:33:55 jtegart Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc. 
+# Distributed under the terms of the GNU General Public License v2 
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.16.ebuild,v 1.1 2002/07/23 04:36:42 drobbins Exp $
  
 S=${WORKDIR}/${P}
 SLOT="0"
@@ -35,7 +35,6 @@ src_compile() {
 
 }
 
-
 src_install() {
 	#config files
 	cd ${S}/cnf
@@ -137,41 +136,41 @@ pkg_postinst() {
 		rm -rf ${ROOT}/usr/lib/sandbox
 	fi
 
-	#upgrade /var/db/pkg library; conditional required for build image creation
-	if [ -d ${ROOT}var/db/pkg ]
-	then
-		echo ">>> Database upgrade..."
-		cd ${ROOT}var/db/pkg
-		for x in *
-		do
-			[ ! -d "$x" ] && continue
-			#go into each category directory so we don't overload the python2.2 command-line
-			cd $x
-			#fix silly output from this command (hack)
-			python2.2 ${ROOT}usr/lib/portage/bin/db-update.py `find -name VIRTUAL` > /dev/null
-			cd ..
-		done
-		echo ">>> Database upgrade complete."
-		#remove old virtual directory to prevent virtual deps from getting messed-up
-		[ -d ${ROOT}var/db/pkg/virtual ] && rm -rf ${ROOT}var/db/pkg/virtual
-	fi
-
 	#fix cache (could contain staleness)
 	if [ ! -d ${ROOT}var/cache/edb/dep/sys-apps ]
 	then
-		if [ -d ${ROOT}var/cache/edb/dep ]
+		if [ ! -d ${ROOT}var/cache/edb/dep ]
 		then
-			#avoid using "*" below as it can overwhelm rm
-			rm -rf ${ROOT}var/cache/edb/dep
-		fi	
-		#ok, set setgid wheel on the cache directory so that "wheel" users can cache stuff too.
-		install -m2775 -o root -g wheel -d ${ROOT}var/cache/edb/dep
-	
+			#upgrade /var/db/pkg library; conditional required for build image creation
+			if [ -d ${ROOT}var/db/pkg ]
+			then
+				echo ">>> Database upgrade..."
+				cd ${ROOT}var/db/pkg
+				for x in *
+				do
+					[ ! -d "$x" ] && continue
+					#go into each category directory so we don't overload the python2.2 command-line
+					cd $x
+					#fix silly output from this command (hack)
+					python2.2 ${ROOT}usr/lib/portage/bin/db-update.py `find -name VIRTUAL` > /dev/null
+				cd ..
+				done
+				echo ">>> Database upgrade complete."
+				#remove old virtual directory to prevent virtual deps from getting messed-up
+				[ -d ${ROOT}var/db/pkg/virtual ] && rm -rf ${ROOT}var/db/pkg/virtual
+			fi
+		fi
+		install -d -m0755 ${ROOT}var/cache/edb
+		install -d -m4755 -o root -g wheel ${ROOT}var/cache/edb/dep
 	else
 		chown -R root.wheel ${ROOT}var/cache/edb/dep/*
 		chmod g+sw ${ROOT}var/cache/edb/dep/*
 	fi
 	rm -f ${ROOT}usr/lib/python2.2/site-packages/portage.py[co]
+	chmod 4755 ${ROOT}var/cache/edb/dep
+	chown root.wheel ${ROOT}var/cache/edb/dep
+	[ -e ${ROOT}var/cache/edb/xcache.p ] && chmod 0664 ${ROOT}var/cache/edb/xcache.p && chown root.wheel ${ROOT}var/cache/edb/dep/xcache.p
+	
 	# we gotta re-compile these modules and deal with systems with clock skew (stale compiled files)
 	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/portage.py')" || die
 	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/portage.py')" || die