New Portage 2.0.10 release with amazing new repoman -- and new x86 rescue portage

16 files changed, 15 insertions, 461 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index b6f448df956f..1c36551687f7 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,9 +1,11 @@
 # 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.15 2002/06/13 21:06:33 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.16 2002/07/06 05:35:41 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
+# *************
+# 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)
 
diff --git a/sys-apps/portage/files/digest-portage-1.9.13-r1 b/sys-apps/portage/files/digest-portage-2.0.10
index e69de29bb2d1..e69de29bb2d1 100644
--- a/sys-apps/portage/files/digest-portage-1.9.13-r1
+++ b/sys-apps/portage/files/digest-portage-2.0.10
diff --git a/sys-apps/portage/files/digest-portage-2.0.5 b/sys-apps/portage/files/digest-portage-2.0.5
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.5
+++ /dev/null
diff --git a/sys-apps/portage/files/digest-portage-2.0.8 b/sys-apps/portage/files/digest-portage-2.0.8
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.8
+++ /dev/null
diff --git a/sys-apps/portage/files/portage-1.9.13.tar.bz2 b/sys-apps/portage/files/portage-1.9.13.tar.bz2
deleted file mode 100644
index 4ff5591fb966..000000000000
--- a/sys-apps/portage/files/portage-1.9.13.tar.bz2
+++ /dev/null
diff --git a/sys-apps/portage/files/portage-2.0.10.tar.bz2 b/sys-apps/portage/files/portage-2.0.10.tar.bz2
new file mode 100644
index 000000000000..451800348d5e
--- /dev/null
+++ b/sys-apps/portage/files/portage-2.0.10.tar.bz2
diff --git a/sys-apps/portage/files/portage-2.0.5.tar.bz2 b/sys-apps/portage/files/portage-2.0.5.tar.bz2
deleted file mode 100644
index 62543f4f0732..000000000000
--- a/sys-apps/portage/files/portage-2.0.5.tar.bz2
+++ /dev/null
diff --git a/sys-apps/portage/files/portage-2.0.8.tar.bz2 b/sys-apps/portage/files/portage-2.0.8.tar.bz2
deleted file mode 100644
index 5d94f14ac00c..000000000000
--- a/sys-apps/portage/files/portage-2.0.8.tar.bz2
+++ /dev/null
diff --git a/sys-apps/portage/files/portage-rescue-1.8.19.tbz2 b/sys-apps/portage/files/portage-rescue-1.8.19.tbz2
deleted file mode 100644
index 825140218277..000000000000
--- a/sys-apps/portage/files/portage-rescue-1.8.19.tbz2
+++ /dev/null
diff --git a/sys-apps/portage/files/portage-rescue-2.0.10-x86.tbz2 b/sys-apps/portage/files/portage-rescue-2.0.10-x86.tbz2
new file mode 100644
index 000000000000..8c0b851dec04
--- /dev/null
+++ b/sys-apps/portage/files/portage-rescue-2.0.10-x86.tbz2
diff --git a/sys-apps/portage/files/ppc-1.9.13/make.conf b/sys-apps/portage/files/ppc-1.9.13/make.conf
deleted file mode 100644
index ffe9f5f0e9d0..000000000000
--- a/sys-apps/portage/files/ppc-1.9.13/make.conf
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2000-2002 Daniel Robbins, Gentoo Technologies, Inc.
-# Contains system settings for Portage system
-
-# Download sites
-
-# The main Gentoo Linux source mirror; specify as many space-separated mirrors
-# as you like.
-GENTOO_MIRRORS="http://www.ibiblio.org/gentoo"
-# The main Gentoo Linux Portage server; specify a single Portage server.
-#SYNC="rsync://rsync.gentoo.org/gentoo-portage"
-# An alternate download server if you prefer anoncvs.  emerge dev-util/cvs
-# for cvs support in emerge.  The password for this CVS server is empty --
-# just hit Enter.
-#SYNC="cvs://:pserver:anonymous@gentoo.org:/home/anoncvs"
-
-# Build-time functionality
-
-# USE=""
-# USE options are inherited from /etc/make.profile/make.defaults.  To turn a USE
-# setting off, add a "-setting" to the USE variable here.  To enable a setting,
-# add the setting name to the USE variable here.  Separate USE toggles with 
-# whitespace.
-
-# Host-specific settings
-
-# For optimization, the -mcpu= option will cause binaries to be optimized for a
-# particular x86 CPU, but will continue to work on all CPUs.  The -march=
-# option, on the other hand, will instruct the compiler to use instuctions
-# specific to that particular CPU in order to enhance performance.  Resultant
-# binaries will *not* run on other systems unless they are 100% compatible with
-# your processor's instruction set.  For example, -march=i686 will produce
-# executables that do not execute on Pentium Classic or K6 systems, but will
-# run on Pentium Pro and "above" systems.  -march=x automatically enables
-# -mcpu=x.
-
-# Examples:
-
-#These are all the same CHOST
-CHOST="powerpc-unknown-linux-gnu"
-
-# PowerPC 750 > up: this works on G4s;
-#CFLAGS=" -O2 -pipe -mcpu=750 -mpowerpc-gfxopt -mmultiple -mstring "
-#CXXFLAGS=${CFLAGS}
-
-# This is safer, and thus the default
-CFLAGS=" -O2 -pipe -mmultiple -mstring "
-CXXFLAGS=${CFLAGS}
-
-#proxy settings PROXY(both), or HTTP_PROXY/FTP_PROXY
-#PROXY=freebox.gentoo.org:3128
-#HTTP_PROXY=
-#FTP_PROXY=
-
-# Uncomment to use Lukemftp for download
-# you need to merge lukemftp first!
-#FETCHCOMMAND='/usr/bin/lukemftp -s -a -o ${DISTDIR}/${FILE} ${URI}'
-#RESUMECOMMAND='/usr/bin/lukemftp -s -a -R -o ${DISTDIR}/${FILE} ${URI}'
-
-# Uncomment if you wanna use Prozilla for download
-# you need to merge prozilla first!
-#FETCHCOMMAND='/usr/bin/proz --no-getch -s ${URI} -P ${DISTDIR}'
-
-# Uncomment if you are a package maintainer with cvs access
-# The following fine grained configuration options are now available
-# digest : automatically create a digest for new ebuilds
-# cvs : automatically commit new digests to cvs
-# sandbox : enable the sandbox for path prefix protection
-#	WARNING: sandbox is broken on ppc - don't use!
-# noclean : don't clean the temp dirs when emerge terminates
-# noauto : don't execute prior ebuild steps automatically
-#          (eg. 'ebuild install' does just that and not
-#          'fetch unpack compile install'
-#FEATURES="digest cvs noclean noauto"
diff --git a/sys-apps/portage/files/ppc-1.9.13/make.globals b/sys-apps/portage/files/ppc-1.9.13/make.globals
deleted file mode 100644
index a2f236c5cb4e..000000000000
--- a/sys-apps/portage/files/ppc-1.9.13/make.globals
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2002 Daniel Robbins, Gentoo Technologies, Inc.
-# System-wide defaults for the Portage system
-
-USE_ORDER="env:conf:auto:defaults"
-#proxy settings PROXY(both), or HTTP_PROXY/FTP_PROXY
-#PROXY=freebox.gentoo.org:3128
-#HTTP_PROXY=
-#FTP_PROXY=
-GENTOO_MIRRORS="http://www.ibiblio.org/gentoo"
-SYNC="rsync://rsync.gentoo.org/gentoo-portage"
-# Host-type
-CHOST="powerpc-unknown-linux-gnu"
-
-
-#PORTAGE_TMPDIR=${ROOT}/var/tmp
-PORTAGE_TMPDIR=/var/tmp
-#/var/tmp without ${ROOT} seems more appropriate
-
-# Directory used for the build process 
-BUILD_PREFIX=${PORTAGE_TMPDIR}/portage
-PKG_TMPDIR=${PORTAGE_TMPDIR}/portage-pkg
-
-PORTDIR=/usr/portage
-DISTDIR=${PORTDIR}/distfiles
-PKGDIR=${PORTDIR}/packages
-RPMDIR=${PORTDIR}/rpm
-CURRENTFILE=${PORTDIR}/current-packages
-PLATFORM=$CHOST
-CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
-
-# Options passed to make during the build process
-MAKEOPTS="-j2"
-
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND='/usr/bin/wget -t 5 --passive-ftp ${URI} -P ${DISTDIR}'
-RESUMECOMMAND='/usr/bin/wget -c -t 5 --passive-ftp ${URI} -P ${DISTDIR}'
-
-CFLAGS=" -O2 -pipe -mmultiple -mstring "
-# C++ Compiler flags
-CXXFLAGS=${CFLAGS}
-
-# Debug build -- if defined, binaries won't be stripped
-#DEBUGBUILD=true
-
-# Default locations for KDE 2/3; do not change unless you know what you're doing
-# and have read the docs
-KDE2DIR="/usr/kde/2"
-KDE3DIR="/usr/kde/3"
-
-# Default maintainer options
-#FEATURES="digest sandbox noclean noauto"
-#	WARNING: sanbox is broken on ppc - don't use!
-# Default user options
-#FEATURES=""
-
-# By default output colored text where possible, set to "true" to output only
-#black&white text
-NOCOLOR="false"
-
-# By default wait 5 secs before cleaning a package
-CLEAN_DELAY="5"
-# Set to yes automatically run "emerge clean" after each merge
-AUTOCLEAN="no"
-
-# The CLEANMODE var has been deprecated
diff --git a/sys-apps/portage/portage-1.9.13-r1.ebuild b/sys-apps/portage/portage-1.9.13-r1.ebuild
deleted file mode 100644
index 0d4be0bb6a2c..000000000000
--- a/sys-apps/portage/portage-1.9.13-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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-1.9.13-r1.ebuild,v 1.1 2002/06/13 20:54:04 verwilst Exp $
- 
-S=${WORKDIR}/${P}
-SLOT="0"
-DESCRIPTION="Portage ports system"
-SRC_URI=""
-HOMEPAGE="http://www.gentoo.org"
-#debianutils is for "readlink"
-#We need this if/then/else clause for compatibility with stuff that doesn't know !build?
-if [ "`use build`" ]
-then
-	RDEPEND=""
-else
-	RDEPEND=">=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=sys-apps/bash-2.05a"
-fi
-
-src_unpack() {
-	#We are including the Portage bzipped tarball on CVS now, so that if a person's
-	#emerge gets hosed, they are not completely stuck.
-	cd ${WORKDIR}; tar xjf ${FILESDIR}/portage-${PV}.tar.bz2
-}
-
-src_compile() {                           
-	cd ${S}/src; gcc ${CFLAGS} tbz2tool.c -o tbz2tool
-	cd ${S}/src/sandbox
-	if [ "${ARCH}" = "x86" ]; then
-		emake CFLAGS="-O2 -march=i486 -pipe" || die
-	else
-		emake || die
-	fi
-
-}
-
-
-src_install() {
-	#config files
-	cd ${S}/cnf
-	insinto /etc
-	case "$ARCH" in
-		ppc )
-		doins ${FILESDIR}/ppc-${PV}/*
-		;;
-		* )
-		doins make.globals make.conf
-		;;
-	esac
-
-	#python modules
-	cd ${S}/src/python-missingos
-	chmod +x setup.py
-	./setup.py install --root ${D} || die
-	cd ${S}/pym
-	insinto /usr/lib/python2.2/site-packages
-	doins xpak.py portage.py output.py
-
-	# we gotta compile these modules
-	python -c "import compileall; compileall.compile_dir('${D}/usr/lib/python2.2/site-packages')" || die
-	python -O -c "import compileall; compileall.compile_dir('${D}/usr/lib/python2.2/site-packages')" || die
-	
-	#binaries, libraries and scripts
-	dodir /usr/lib/portage/bin
-	cd ${S}/bin
-	exeinto /usr/lib/portage/bin
-	doexe *
-	dosym emake /usr/lib/portage/bin/pmake
-	doexe ${S}/src/tbz2tool
-	
-	into /usr/lib/portage
-	dobin ${S}/src/sandbox/sandbox
-	dodir /usr/lib/portage/lib
-	exeinto /lib
-	doexe ${S}/src/sandbox/libsandbox.so
-	insinto //usr/lib/portage/lib
-	doins ${S}/src/sandbox/sandbox.bashrc
-	#reset into
-	into /usr
-
-	#symlinks
-	dodir /usr/bin /usr/sbin
-	dosym ../lib/portage/bin/emerge /usr/bin/emerge
-	dosym ../lib/portage/bin/pkgmerge /usr/sbin/pkgmerge
-	dosym ../lib/portage/bin/ebuild /usr/sbin/ebuild
-	dosym ../lib/portage/bin/ebuild.sh /usr/sbin/ebuild.sh
-	#dosym /usr/lib/portage/bin/portage-maintain /usr/sbin/portage-maintain
-	dosym ../lib/portage/bin/env-update /usr/sbin/env-update
-	dosym ../lib/portage/bin/xpak /usr/bin/xpak
-	dosym ../lib/portage/bin/tbz2tool /usr/bin/tbz2tool
-	dosym newins /usr/lib/portage/bin/donewins
-	
-	# man pages
-	doman ${S}/man/*.[15]
-	
-	# temp dir creation
-	dodir /var/tmp
-	chmod 1777 ${D}/var/tmp
-	touch ${D}/var/tmp/.keep
-	
-	#documentation
-	dodoc ${S}/ChangeLog
-}
-
-pkg_postinst() {
-	if [ ! -e ${ROOT}/etc/make.profile ]
-	then
-		cd ${ROOT}/etc
-		case "$ARCH" in
-		ppc )
-			ln -sf ../usr/portage/profiles/default-ppc-1.0 make.profile
-			;;
-		sparc )
-			ln -sf ../usr/portage/profiles/default-sparc-1.0 make.profile
-			;;
-		sparc64 )
-			ln -sf ../usr/portage/profiles/default-sparc64-1.0 make.profile
-			;;
-		x86 )
-			ln -sf ../usr/portage/profiles/default-1.0 make.profile
-			;;
-		esac
-
-	fi
-	local x
-	#remove possible previous sandbox files that could cause conflicts
-	if [ -d /usr/lib/sandbox ]; then
-		if [ -f /etc/ld.so.preload ]; then
-			mv /etc/ld.so.preload /etc/ld.so.preload_orig
-			grep -v libsandbox.so /etc/ld.so.preload_orig > /etc/ld.so.preload
-			rm /etc/ld.so.preload_orig
-		fi
-		
-		rm -f ${ROOT}/usr/lib/portage/bin/ebuild.sh.orig
-		rm -f ${ROOT}/usr/lib/portage/pym/portage.py.orig
-		rm -f ${ROOT}/usr/bin/sandbox
-		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
-		cd ${ROOT}var/db/pkg
-		python2.2 ${ROOT}usr/lib/portage/bin/db-update.py `find -name VIRTUAL`
-	fi
-
-	#fix cache (could contain staleness)
-	if [ -d ${ROOT}var/cache/edb/dep ]
-	then
-		rm -rf ${ROOT}var/cache/edb/dep/*
-	else
-		install -d ${ROOT}var/cache/edb/dep
-	fi	
-}
diff --git a/sys-apps/portage/portage-2.0.8.ebuild b/sys-apps/portage/portage-2.0.10.ebuild
index 32905c78f46b..b22927ae57a2 100644
--- a/sys-apps/portage/portage-2.0.8.ebuild
+++ b/sys-apps/portage/portage-2.0.10.ebuild
@@ -1,12 +1,15 @@
 # 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.8.ebuild,v 1.1 2002/06/27 17:28:15 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.10.ebuild,v 1.1 2002/07/06 05:35:41 drobbins Exp $
  
 S=${WORKDIR}/${P}
 SLOT="0"
 DESCRIPTION="Portage ports system"
 SRC_URI=""
 HOMEPAGE="http://www.gentoo.org"
+KEYWORDS="*"
+LICENSE="GPL-2"
+
 #We need this if/then/else clause for compatibility with stuff that doesn't know !build?
 if [ "`use build`" ]
 then
@@ -149,6 +152,8 @@ pkg_postinst() {
 			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)
diff --git a/sys-apps/portage/portage-2.0.5.ebuild b/sys-apps/portage/portage-2.0.5.ebuild
deleted file mode 100644
index 6fb7d99b38de..000000000000
--- a/sys-apps/portage/portage-2.0.5.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# 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.5.ebuild,v 1.1 2002/06/24 17:11:09 drobbins Exp $
- 
-S=${WORKDIR}/${P}
-SLOT="0"
-DESCRIPTION="Portage ports system"
-SRC_URI=""
-HOMEPAGE="http://www.gentoo.org"
-#We need this if/then/else clause for compatibility with stuff that doesn't know !build?
-if [ "`use build`" ]
-then
-	RDEPEND=""
-else
-	RDEPEND=">=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=sys-apps/bash-2.05a"
-fi
-
-src_unpack() {
-	#We are including the Portage bzipped tarball on CVS now, so that if a person's
-	#emerge gets hosed, they are not completely stuck.
-	cd ${WORKDIR}; tar xjf ${FILESDIR}/portage-${PV}.tar.bz2
-}
-
-src_compile() {                           
-	cd ${S}/src; gcc ${CFLAGS} tbz2tool.c -o tbz2tool
-	cd ${S}/src/sandbox
-	if [ "${ARCH}" = "x86" ]; then
-		emake CFLAGS="-O2 -march=i486 -pipe" || die
-	else
-		emake || die
-	fi
-
-}
-
-
-src_install() {
-	#config files
-	cd ${S}/cnf
-	insinto /etc
-	case "$ARCH" in
-		ppc )
-		newins make.globals.ppc make.globals
-		newins make.conf.ppc make.conf
-		;;
-		* )
-		doins make.globals make.conf
-		;;
-	esac
-
-	#python modules
-	cd ${S}/src/python-missingos
-	chmod +x setup.py
-	./setup.py install --root ${D} || die
-	cd ${S}/pym
-	insinto /usr/lib/python2.2/site-packages
-	doins xpak.py portage.py output.py
-
-
-	#binaries, libraries and scripts
-	dodir /usr/lib/portage/bin
-	cd ${S}/bin
-	exeinto /usr/lib/portage/bin
-	doexe *
-	dosym emake /usr/lib/portage/bin/pmake
-	doexe ${S}/src/tbz2tool
-	
-	into /usr/lib/portage
-	dobin ${S}/src/sandbox/sandbox
-	dodir /usr/lib/portage/lib
-	exeinto /lib
-	doexe ${S}/src/sandbox/libsandbox.so
-	insinto //usr/lib/portage/lib
-	doins ${S}/src/sandbox/sandbox.bashrc
-	#reset into
-	into /usr
-
-	#symlinks
-	dodir /usr/bin /usr/sbin
-	dosym ../lib/portage/bin/emerge /usr/bin/emerge
-	dosym ../lib/portage/bin/pkgmerge /usr/sbin/pkgmerge
-	dosym ../lib/portage/bin/ebuild /usr/sbin/ebuild
-	dosym ../lib/portage/bin/ebuild.sh /usr/sbin/ebuild.sh
-	#dosym /usr/lib/portage/bin/portage-maintain /usr/sbin/portage-maintain
-	dosym ../lib/portage/bin/env-update /usr/sbin/env-update
-	dosym ../lib/portage/bin/xpak /usr/bin/xpak
-	dosym ../lib/portage/bin/repoman /usr/bin/repoman
-	dosym ../lib/portage/bin/tbz2tool /usr/bin/tbz2tool
-	dosym newins /usr/lib/portage/bin/donewins
-	
-	# man pages
-	doman ${S}/man/*.[15]
-	
-	# temp dir creation
-	dodir /var/tmp
-	chmod 1777 ${D}/var/tmp
-	touch ${D}/var/tmp/.keep
-	
-	#documentation
-	dodoc ${S}/ChangeLog
-}
-
-pkg_postinst() {
-	if [ ! -e ${ROOT}/etc/make.profile ]
-	then
-		cd ${ROOT}/etc
-		case "$ARCH" in
-		ppc )
-			ln -sf ../usr/portage/profiles/default-ppc-1.0 make.profile
-			;;
-		sparc )
-			ln -sf ../usr/portage/profiles/default-sparc-1.0 make.profile
-			;;
-		sparc64 )
-			ln -sf ../usr/portage/profiles/default-sparc64-1.0 make.profile
-			;;
-		x86 )
-			ln -sf ../usr/portage/profiles/default-1.0 make.profile
-			;;
-		esac
-
-	fi
-	local x
-	#remove possible previous sandbox files that could cause conflicts
-	if [ -d /usr/lib/sandbox ]; then
-		if [ -f /etc/ld.so.preload ]; then
-			mv /etc/ld.so.preload /etc/ld.so.preload_orig
-			grep -v libsandbox.so /etc/ld.so.preload_orig > /etc/ld.so.preload
-			rm /etc/ld.so.preload_orig
-		fi
-		
-		rm -f ${ROOT}/usr/lib/portage/bin/ebuild.sh.orig
-		rm -f ${ROOT}/usr/lib/portage/pym/portage.py.orig
-		rm -f ${ROOT}/usr/bin/sandbox
-		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."
-	fi
-
-	#fix cache (could contain staleness)
-	if [ -d ${ROOT}var/cache/edb/dep ]
-	then
-		#avoid using "*" below as it can overwhelm rm
-		rm -rf ${ROOT}var/cache/edb/dep
-	fi	
-	install -d ${ROOT}var/cache/edb/dep
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/portage.py[co]
-	# 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
-	}
diff --git a/sys-apps/portage/portage-2.0.9.ebuild b/sys-apps/portage/portage-2.0.9.ebuild
index 29515bdb738c..65ef00be5150 100644
--- a/sys-apps/portage/portage-2.0.9.ebuild
+++ b/sys-apps/portage/portage-2.0.9.ebuild
@@ -1,12 +1,15 @@
 # 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.9.ebuild,v 1.1 2002/07/01 16:04:19 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.9.ebuild,v 1.2 2002/07/06 05:35:41 drobbins Exp $
  
 S=${WORKDIR}/${P}
 SLOT="0"
 DESCRIPTION="Portage ports system"
 SRC_URI=""
 HOMEPAGE="http://www.gentoo.org"
+KEYWORDS="*"
+LICENSE="GPL-2"
+
 #We need this if/then/else clause for compatibility with stuff that doesn't know !build?
 if [ "`use build`" ]
 then