New portages.

6 files changed, 271 insertions, 5 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7c503164bdc3..fb0692334568 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,8 +1,8 @@
 MD5 74418f353cc4bfaf1703fa59f0f772b0 portage-2.0.48-r5.ebuild 8777
-MD5 42034db7d6c05ae278e1896f8b0fd941 portage-2.0.49-r16.ebuild 10111
+MD5 59121d90793c8dbd45e1845c95c7f239 portage-2.0.49-r16.ebuild 10111
 MD5 762ed52392ca515af647ded5838ffe2c portage-2.0.49-r13.ebuild 9743
 MD5 d30ba0090f191de5923f6e46d2d6fa63 ChangeLog 417
-MD5 c28b1d0d70ab5f806e6bd8728d452dfb portage-2.0.49-r15.ebuild 9665
+MD5 ba5305d817e8995fb8eb35b20bcbb8f0 portage-2.0.49-r15.ebuild 9665
 MD5 b6989b04bc0ab44de75cf82ab47698fa files/portage-rescue-2.0.48-r1-sparc.tbz2 227629
 MD5 35519288ced0c9c3a2893d16e666a5cf files/portage-rescue-2.0.49-r3-alpha.tbz2 284986
 MD5 6589ac20a00a2250e125d8bf8492c425 files/digest-portage-2.0.49-r13 71
diff --git a/sys-apps/portage/files/digest-portage-2.0.49-r14 b/sys-apps/portage/files/digest-portage-2.0.49-r14
deleted file mode 100644
index 0a4a63ceb736..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.49-r14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 22b6571495d089731f6a1eae96654482 portage-2.0.49-r14.tar.bz2 235344
diff --git a/sys-apps/portage/files/digest-portage-2.0.49-r15 b/sys-apps/portage/files/digest-portage-2.0.49-r15
new file mode 100644
index 000000000000..7d5bbae2e09b
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.0.49-r15
@@ -0,0 +1 @@
+MD5 f5f67b34312918842efa323548e6589d portage-2.0.49-r15.tar.bz2 236011
diff --git a/sys-apps/portage/files/digest-portage-2.0.49-r16 b/sys-apps/portage/files/digest-portage-2.0.49-r16
new file mode 100644
index 000000000000..3274b7284b81
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.0.49-r16
@@ -0,0 +1 @@
+MD5 9b58da8db2d7e76c829d25f8313eab4c portage-2.0.49-r16.tar.bz2 236012
diff --git a/sys-apps/portage/portage-2.0.49-r15.ebuild b/sys-apps/portage/portage-2.0.49-r15.ebuild
new file mode 100644
index 000000000000..b2c51d078093
--- /dev/null
+++ b/sys-apps/portage/portage-2.0.49-r15.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2003 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.49-r15.ebuild,v 1.1 2003/10/22 02:15:05 carpaski Exp $
+
+IUSE="build"
+
+# If the old /lib/sandbox.so is in /etc/ld.so.preload, it can
+# cause everything to segfault !!
+export SANDBOX_DISABLED="1"
+
+S=${WORKDIR}/${PF}
+SLOT="0"
+DESCRIPTION="Portage ports system"
+SRC_URI="http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.tar.bz2"
+HOMEPAGE="http://www.gentoo.org"
+
+KEYWORDS="alpha ~amd64 arm hppa ia64 mips ppc sparc x86"
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+
+LICENSE="GPL-2"
+RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a ) selinux? ( dev-python/python-selinux )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/pym
+}
+
+src_compile() {
+	cd ${S}/src; ${CC:-gcc} ${CFLAGS} tbz2tool.c -o tbz2tool
+	cd ${S}/src/sandbox-1.1
+	if [ "${ARCH}" = "x86" ]; then
+		make CFLAGS="-march=i386 -O1 -pipe" || die
+	else
+		make || die
+	fi
+	cd ${S}/bin
+}
+
+src_install() {
+	#config files
+	cd ${S}/cnf
+	insinto /etc
+	case "$ARCH" in
+		alpha )
+		newins make.globals.alpha make.globals
+		newins make.conf.alpha make.conf
+		;;
+		arm )
+		newins make.globals.arm make.globals
+		newins make.conf.arm make.conf
+		;;
+		hppa )
+		newins make.globals.hppa make.globals
+		newins make.conf.hppa make.conf
+		;;
+		mips )
+		newins make.globals.mips make.globals
+		newins make.conf.mips make.conf
+		;;
+		ppc )
+		newins make.globals.ppc make.globals
+		newins make.conf.ppc make.conf
+		;;
+		sparc )
+		newins make.globals.sparc make.globals
+		newins make.conf.sparc make.conf
+		;;
+		* )
+		doins make.globals make.conf
+		;;
+	esac
+	use build && [ -f /etc/make.conf ] && rm -f ${D}/etc/make.conf
+
+	doins etc-update.conf dispatch-conf.conf
+	#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 cvstree.py getbinpkg.py dispatch_conf.py
+
+
+	#binaries, libraries and scripts
+	dodir /usr/lib/portage/bin
+	cd ${S}/bin
+	doins emergehelp.py               # XXX: Needs to get cleaned up.
+	                                  #      Goes into site-packages.
+	exeinto /usr/lib/portage/bin
+	doexe *
+	dosym emake /usr/lib/portage/bin/pmake
+	doexe ${S}/src/tbz2tool
+
+	#install sandbox
+	cd ${S}/src/sandbox-1.1
+	make DESTDIR=${D} install || die
+
+	#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 ../lib/portage/bin/etc-update /usr/sbin/etc-update
+	dosym ../lib/portage/bin/dispatch-conf /usr/sbin/dispatch-conf
+	dosym ../lib/portage/bin/archive-conf /usr/sbin/archive-conf
+	dosym ../lib/portage/bin/fixpackages /usr/sbin/fixpackages
+
+	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 ../lib/portage/bin/portageq /usr/bin/portageq
+
+	dosym ../lib/portage/bin/g-cpan.pl /usr/bin/g-cpan.pl
+	dosym ../lib/portage/bin/quickpkg /usr/bin/quickpkg
+	dosym ../lib/portage/bin/regenworld /usr/sbin/regenworld
+	dosym ../lib/portage/bin/emerge-webrsync /usr/sbin/emerge-webrsync
+
+	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() {
+	local x
+
+	#disable global sandbox if it's active (it's been deprecated)
+	if [ -f /etc/ld.so.preload ] ; then
+		cp /etc/ld.so.preload ${T}
+		grep -v libsandbox ${T}/ld.so.preload > /etc/ld.so.preload
+	fi
+
+	#remove possible previous sandbox files that could cause conflicts
+	if [ -d /usr/lib/sandbox ]; then
+		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
+
+	#yank old cache files
+	if [ -d /var/cache/edb ]
+	then
+		rm -f /var/cache/edb/xcache.p
+		rm -f /var/cache/edb/mtimes
+	fi
+
+	if [ ! -f "/etc/portage/package.mask" ]; then
+	  if [ -f "/etc/portage/profiles/package.mask" ]; then
+			ln /etc/portage/profiles/package.mask /etc/portage/package.mask
+			einfo "/etc/portage/profiles/package.mask is now /etc/portage/package.mask"
+			einfo "a hardlink has been created to the new location if it exists in profiles"
+			einfo "already."
+			echo
+		fi
+	fi
+	echo
+	eerror "NOTICE: PLEASE *REPLACE* your make.globals. All user changes to variables"
+	eerror "in make.globals should be placed in make.conf. DO NOT MODIFY make.globals."
+	echo
+	einfo "Feature additions are noted in help and make.conf descriptions. Update"
+	einfo "them using 'etc-update' please. Maintaining current configs for portage"
+	einfo "and other system packages is fairly important for the continued health"
+	einfo "of your system."
+	echo
+	if [ -z "$PORTAGE_TEST" ]; then
+		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+		echo -ne "\a" ; sleep 1
+		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+		echo -ne "\a" ; sleep 1
+		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+		echo -ne "\a" ; sleep 1
+		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+		echo -ne "\a" ; sleep 1
+		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+		echo -ne "\a" ; sleep 1
+		sleep 8
+
+		# Kill the existing counter and generate a new one.
+		echo -n "Recalculating the counter... "
+		mv /var/cache/edb/counter /var/cache/edb/counter.old
+		python -c 'import portage; portage.db["/"]["vartree"].dbapi.counter_tick("/")' &>/dev/null
+		if [ -f /var/cache/edb/counter ] ; then
+			echo "Counter updated successfully."
+			rm -f /var/cache/edb/counter.old
+		else
+			echo "FAILED to update counter."
+			echo "!!! This is a problem."
+			mv /var/cache/edb/counter.old /var/cache/edb/counter
+		fi
+
+		# Changes in the size of auxdbkeys can cause aux_get() problems.
+		echo -n ">>> Clearing invalid entries in dependency cache..."
+		cd ${ROOT}var/cache/edb/dep
+		# 2>&1 >/dev/null <---- Kills stdout, replaces it with stderr
+		AUXDBKEYLEN="$(python -c 'import portage,sys; sys.stderr.write(str(len(portage.auxdbkeys)))' 2>&1 >/dev/null)"
+		find ${ROOT}var/cache/edb/dep -type f -exec wc -l {} \; | egrep -v "^ *${AUXDBKEYLEN}" | sed 's:^ \+[0-9]\+ \+\([^ ]\+\)$:\1:' 2>/dev/null | xargs -n 50 -r rm -f
+		echo " ...done!"
+	fi # PORTAGE_TESTING
+
+	#fix cache (could contain staleness)
+	if [ ! -d ${ROOT}var/cache/edb/dep ]
+	then
+		#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
+		install -d -m0755 ${ROOT}var/cache/edb
+		install -d -m2775 -o root -g portage ${ROOT}var/cache/edb/dep
+	fi
+
+	rm -f ${ROOT}usr/lib/python2.2/site-packages/portage.py[co]
+	rm -f ${ROOT}usr/lib/python2.2/site-packages/output.py[co]
+	rm -f ${ROOT}usr/lib/python2.2/site-packages/cvstree.py[co]
+	rm -f ${ROOT}usr/lib/python2.2/site-packages/getbinpkg.py[co]
+	rm -f ${ROOT}usr/lib/python2.2/site-packages/emergehelp.py[co]
+	rm -f ${ROOT}usr/lib/python2.2/site-packages/dispatch_conf.py[co]
+	chmod 2775 ${ROOT}var/cache/edb/dep ${ROOT}var/cache/edb/dep/*
+	chown -R root:portage ${ROOT}var/cache/edb/dep
+
+	# 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
+	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/output.py')" || die
+	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/output.py')" || die
+	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/cvstree.py')" || die
+	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/cvstree.py')" || die
+	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/getbinpkg.py')" || die
+	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/getbinpkg.py')" || die
+	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/dispatch_conf.py')" || die
+	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/python2.2/site-packages/dispatch_conf.py')" || die
+	python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/bin/emergehelp.py')" || die
+	python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/bin/emergehelp.py')" || die
+
+	if has ccache $FEATURES && has userpriv $FEATURES; then
+		chown -R portage:portage /var/tmp/ccache &> /dev/null
+		chmod -R g+rws /var/tmp/ccache &>/dev/null
+	fi
+}
+
+
diff --git a/sys-apps/portage/portage-2.0.49-r14.ebuild b/sys-apps/portage/portage-2.0.49-r16.ebuild
index 5194fc3c7eec..8141f498e49d 100644
--- a/sys-apps/portage/portage-2.0.49-r14.ebuild
+++ b/sys-apps/portage/portage-2.0.49-r16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.49-r14.ebuild,v 1.3 2003/10/16 16:19:57 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.49-r16.ebuild,v 1.1 2003/10/22 02:15:05 carpaski Exp $
 
 IUSE="build"
 
@@ -34,7 +34,6 @@ python_version() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}/pym
-	gzip -dc ${FILESDIR}/portage-2.0.49-r13_fixdbmsg.diff.gz | sed 's:49-r13:49-r14:' | patch &> /dev/null
 }
 
 src_compile() {