New portage! Hopefully the last before stable!

6 files changed, 5 insertions, 368 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 93628aaf7fcd..6682ee96af8b 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 472bccd11db2098bf3dff72d50b6e7bf portage-2.0.51_rc1.ebuild 11893
+MD5 e700011e1e0b4433882d50e13d2d4cb3 portage-2.0.51_rc5.ebuild 11913
 MD5 0ea980904ecc333daf7f702ceddc1349 portage-2.0.50-r11.ebuild 11697
 MD5 ba4ae80e5e6cf58aac9c5aa1cc5f777e ChangeLog 411
-MD5 a1b1f13491c29b02e133b0bf8a517fe2 portage-2.0.51_rc4.ebuild 11906
 MD5 4ec0f0ae9676b9d2d227d737d508306b metadata.xml 165
 MD5 5375f0805d4d56dc961ad81162854790 files/digest-portage-2.0.50-r11 71
-MD5 ed8dbb706c68468d6fa4c91a237e8b6f files/digest-portage-2.0.51_rc1 71
-MD5 93e23b052ff4023ccd692cf591d18260 files/digest-portage-2.0.51_rc4 71
+MD5 1b257ffbf1366ae052e79691ea571bff files/digest-portage-2.0.51_rc5 71
 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBVyDSBDOEqLMd+jQRAvhGAJ0akJs+rGio13TcDJyRYbjQ1TyN9QCdHQlv
-Vmw8jmJqnEH7CBIJfmOWjqo=
-=PPt0
------END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.0.51_rc1 b/sys-apps/portage/files/digest-portage-2.0.51_rc1
deleted file mode 100644
index 6d5943ac55de..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.51_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0b651dfbb2de5734bdc27f6f601619df portage-2.0.51_rc1.tar.bz2 276578
diff --git a/sys-apps/portage/files/digest-portage-2.0.51_rc4 b/sys-apps/portage/files/digest-portage-2.0.51_rc4
deleted file mode 100644
index bbf67600c0dc..000000000000
--- a/sys-apps/portage/files/digest-portage-2.0.51_rc4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9dff65dd529c466d8bb1a4bcbd3b4bd9 portage-2.0.51_rc4.tar.bz2 271172
diff --git a/sys-apps/portage/files/digest-portage-2.0.51_rc5 b/sys-apps/portage/files/digest-portage-2.0.51_rc5
new file mode 100644
index 000000000000..6203a73ba4ca
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.0.51_rc5
@@ -0,0 +1 @@
+MD5 8fcbbb30e4a5d230f4f7123c861a337e portage-2.0.51_rc5.tar.bz2 272191
diff --git a/sys-apps/portage/portage-2.0.51_rc1.ebuild b/sys-apps/portage/portage-2.0.51_rc1.ebuild
deleted file mode 100644
index 35812da6c2c4..000000000000
--- a/sys-apps/portage/portage-2.0.51_rc1.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51_rc1.ebuild,v 1.7 2004/09/26 02:13:23 carpaski Exp $
-
-IUSE="build multilib selinux"
-
-# 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="The Portage Package Management System (Similar to BSD's ports). The primary package management and distribution system for Gentoo."
-SRC_URI="http://zarquon.twobit.net/gentoo/portage/${PF}.tar.bz2 http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org"
-RESTRICT="nomirror mirror"
-
-# Contact carpaski with a reason before you modify any of these.
-#KEYWORDS="  alpha  amd64  arm  hppa  ia64  macos  mips  ppc  ppc-macos ppc64  s390  sparc  x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~macos ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~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 )"
-
-python_version() {
-	local tmpstr="$(/usr/bin/python -V 2>&1 )"
-	export PYVER_ALL="${tmpstr#Python }"
-
-	export PYVER_MAJOR=$(echo ${PYVER_ALL} | cut -d. -f1)
-	export PYVER_MINOR=$(echo ${PYVER_ALL} | cut -d. -f2)
-	export PYVER_MICRO=$(echo ${PYVER_ALL} | cut -d. -f3-)
-	export PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
-}
-
-check_multilib() {
-	use !multilib && return
-	echo 'main() {}' > ./check-multilib.c
-	/usr/bin/gcc -m32 -o ./check-multilib ./check-multilib.c > /dev/null 2>&1
-	if [ "$?" == 0 ]; then
-		einfo "Found valid multilib environment."
-		einfo "Building with multilib support."
-		export MULTILIB="1"
-	else
-		ewarn "No valid multilib environment found!"
-		ewarn "Building without multilib support. If"
-		ewarn "you want to have multilib support,"
-		ewarn "emerge gcc with \"multilib\" in your"
-		ewarn "useflags."
-		sleep 5
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	cd ${S}/src; ${CC:-gcc} ${CFLAGS} tbz2tool.c -o tbz2tool
-	cd ${S}/src/sandbox-1.1
-	case ${ARCH} in
-		"x86")
-			make CFLAGS="-march=i386 -O1 -pipe" || die
-			;;
-		"amd64")
-			check_multilib
-			make CFLAGS="-O2 -pipe" HAVE_64BIT_ARCH="${MULTILIB}" || die
-			;;
-		*)
-			if useq macos || useq ppc-macos ; then
-				ewarn "NOT BUILDING SANDBOX ON Mac OS X"
-			else
-				make || die
-			fi
-			;;
-	esac
-	cd ${S}/bin
-}
-
-src_install() {
-	#config files
-	cd ${S}/cnf
-	insinto /etc
-	if [ -f "make.globals.${ARCH}" ]; then
-		newins make.globals.${ARCH} make.globals
-		newins make.conf.${ARCH} make.conf.example
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-		sleep 3
-		doins  make.globals
-		newins make.conf make.conf.example
-	fi
-
-	doins etc-update.conf dispatch-conf.conf
-
-	#python modules
-	if [ -x "$(type -p python2.2)" ] || [ -x /usr/bin/python2.2 ]; then
-		cd ${S}/src/python-missingos
-		chmod +x setup.py
-		if [ -x "$(type -p python2.3)" ]; then
-			./setup.py install --root ${D} || eerror "Failed to install missingos module -- python2.2 broken?"
-		else
-			./setup.py install --root ${D} || die "Failed to install missingos module"
-		fi
-	fi
-
-
-	dodir /usr/lib/portage/pym
-	cd ${S}/pym
-	insinto /usr/lib/portage/pym
-	doins *.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
-
-	if use macos || use ppc-macos ; then
-		ewarn "Not installing sandbox on Mac OS X"
-	else
-		#install sandbox
-		cd ${S}/src/sandbox-1.1
-		make DESTDIR=${D} HAVE_64BIT_ARCH="${MULTILIB}" \
-			install || die "Failed to compile sandbox"
-	fi
-
-	#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/*.[0-9]
-
-	# temp dir creation
-	dodir /var/tmp
-	chmod 1777 ${D}/var/tmp
-	touch ${D}/var/tmp/.keep
-
-	#documentation
-	dodoc ${S}/ChangeLog
-}
-
-
-pkg_preinst() {
-	if has livecvsportage $FEATURES; then
-		if [ "$ROOT" == "/" ]; then
-			rm -Rf "${IMAGE}"/usr/lib/portage/pym/*
-
-			mv "${IMAGE}"/usr/lib/portage/bin/{sandbox,tbz2tool} ${T}
-			rm -Rf "${IMAGE}"/usr/lib/portage/bin/*
-			mv "${T}"/{sandbox,tbz2tool} "${IMAGE}"/usr/lib/portage/bin/
-		fi
-	fi
-}
-
-pkg_postinst() {
-	local x
-
-	[ -f "${ROOT}etc/make.conf" ] || touch ${ROOT}etc/make.conf
-
-	#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
-
-	install -o root -g portage -m 0755 -d "${ROOT}/etc/portage"
-	install -o root -g portage -m 2775 -d "${ROOT}/etc/portage/sets"
-	# u+rwx,g+srwx --- This is a secure directory for temp files.
-
-	install -o root -g portage -m 2770 -d "${ROOT}/var/lib/portage"
-	einfo "Checking ${ROOT}/var/lib/portage for bad/illegal files:"
-	find "${ROOT}/var/lib/portage" ! -group portage -o -perm -002 -print0 | ${XARGS} -0n 500 rm -Rvf
-
-	OLDWORLD="${ROOT}/var/cache/edb/world"
-	NEWWORLD="${ROOT}/var/lib/portage/world"
-
-	if [ ! -f "${NEWWORLD}" ]; then
-		cp "${OLDWORLD}" "${NEWWORLD}" && \
-		rm -f "${OLDWORLD}" && \
-		ln ../../lib/portage/world "${NEWWORLD}"
-	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
-
-	einfo "Feature additions are noted in help and make.conf descriptions."
-	echo
-	einfo "Update configs using 'etc-update' please. Maintaining current configs"
-	einfo "for portage and other system packages is fairly important for the"
-	einfo "continued health of your system."
-	echo
-	ewarn "NOTICE: There have been changes in the location of some internal files"
-	ewarn "        to better match the FHS. The changes do not directly affect users"
-	ewarn "        but please be advised that changing between versions of portage"
-	ewarn "        with and without these changes may introduce some inconsistencies"
-	ewarn "        in package data regarding 'world' and 'virtuals' (provides)."
-	echo
-	einfo "        /var/cache/edb/world has moved to /var/lib/portage/world"
-	echo
-	einfo "        /var/cache/edb/virtuals has been deprecated and is now calculated"
-	einfo "        on demand. Strictly _USER_ modifications to virtuals may go into"
-	einfo "        /etc/portage/profile/virtuals and will not be modified by portage."
-	echo
-
-	if [ -z "$PORTAGE_TEST" ]; then
-		for TICKER in 1 2 3 4 5 6 7 8 9 10; do
-			echo -ne "\a" ; sleep 0.$(( $RANDOM % 9 + 1)) &>/dev/null ; sleep 0,$(( $RANDOM % 9 + 1)) &>/dev/null
-		done
-		sleep 5
-
-		# 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 sys; sys.path = ["/usr/lib/portage/pym"]+sys.path; 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."
-			ls -l /var/cache/edb/counter.old
-			echo "!!! This is a problem."
-			mv /var/cache/edb/counter.old /var/cache/edb/counter
-		fi
-	fi # PORTAGE_TESTING
-
-	if [ ! -d "${ROOT}var/cache/edb/dep" ]
-	then
-		install -d -m2755 ${ROOT}var/cache/edb
-		install -d -m2775 -o root -g portage ${ROOT}var/cache/edb/dep
-	fi
-
-	# Old place of install
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/portage.py[co]
-	rm -f ${ROOT}usr/lib/python2.2/site-packages/xpak.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]
-
-	# New old place of install
-	rm -f ${ROOT}usr/lib/portage/pym/*.py[co]
-
-	# we gotta re-compile these modules and deal with systems with clock skew (stale compiled files)
-	einfo "Compiling python modules..."
-	python -c 'import compileall; compile_path()' &> /dev/null
-	python -c "import compileall; compile_dir('${ROOT}usr/lib/portage/pym')" &> /dev/null
-
-	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
-
-	if [ -d "${ROOT}usr/portage/distfiles" ]; then
-		find "${ROOT}usr/portage/distfiles" -type f -maxdepth 1 -print0 | \
-		${XARGS} -0 -n 500 chgrp portage &> /dev/null
-
-		find "${ROOT}usr/portage/distfiles" -type f -maxdepth 1 -print0 | \
-		${XARGS} -0 -n 500 chmod 0644 &> /dev/null
-
-		find "${ROOT}usr/portage/distfiles/cvs-src" -type f -maxdepth 1 -print0 | \
-		${XARGS} -0 -n 500 chown portage &> /dev/null
-
-		find "${ROOT}usr/portage/distfiles/cvs-src" -type f -maxdepth 1 -print0 | \
-		${XARGS} -0 -n 500 chmod u+w &> /dev/null
-
-		chmod 2775 "${ROOT}usr/portage/distfiles"
-		chmod 2775 "${ROOT}usr/portage/distfiles/cvs-src"
-	fi
-	if [ -d "${ROOT}/${PORTDIR}/distfiles" ]; then
-		find "${ROOT}/${PORTDIR}/distfiles" -type f -maxdepth 1 -print0 | \
-		${XARGS} -0 -n 500 chgrp portage &> /dev/null
-
-		find "${ROOT}/${PORTDIR}/distfiles" -type f -maxdepth 1 -print0 | \
-		${XARGS} -0 -n 500 chmod 0644 &> /dev/null
-
-		find "${ROOT}/${PORTDIR}/distfiles/cvs-src" -type f -maxdepth 1 -print0 | \
-		${XARGS} -0 -n 500 chown portage &> /dev/null
-
-		find "${ROOT}/${PORTDIR}/distfiles/cvs-src" -type f -maxdepth 1 -print0 | \
-		${XARGS} -0 -n 500 chmod u+w &> /dev/null
-
-		chmod 2775 "${ROOT}/${PORTDIR}/distfiles"
-		chmod 2775 "${ROOT}/${PORTDIR}/distfiles/cvs-src"
-	fi
-
-	chown -R root:portage ${ROOT}var/cache/edb
-	find ${ROOT}var/cache/edb -type f -print0 | ${XARGS} -0 -n 500 chmod 664
-
-	for X in ${ROOT}etc/._cfg????_make.globals; do
-		# Overwrite the globals file automatically.
-		[ -e "${X}" ] && mv -f "${X}" "${ROOT}etc/make.globals"
-	done
-
-	einfo "You may run 'emerge metadata' to perform cache updates if you have"
-	einfo "changed versions of portage. This will provide a fairly dramatic"
-	einfo "speedup. Alternatively, you may 'emerge sync' if it has been more"
-	einfo "than 30 minutes since your last sync."
-}
diff --git a/sys-apps/portage/portage-2.0.51_rc4.ebuild b/sys-apps/portage/portage-2.0.51_rc5.ebuild
index 038852860db2..0c293959c0ae 100644
--- a/sys-apps/portage/portage-2.0.51_rc4.ebuild
+++ b/sys-apps/portage/portage-2.0.51_rc5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51_rc4.ebuild,v 1.2 2004/09/26 20:04:04 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51_rc5.ebuild,v 1.1 2004/09/27 02:01:59 carpaski Exp $
 
 IUSE="build multilib selinux"
 
@@ -20,7 +20,7 @@ RESTRICT="nomirror mirror"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~macos ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~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 )"
+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-2.15 )"
 
 python_version() {
 	local tmpstr="$(/usr/bin/python -V 2>&1 )"