portage-1.8.6-r2 added and masked. As this release fixes _pre bug,

package.mask line ">=sys-apps/portage-1.9" will no longer work for
portage-1.9.0_pre1 as portage-1.9.0_pre1 < portage-1.9.0 now,
as it should be. So mask changed to ">=sys-apps/portage-1.9_pre1"

2 files changed, 128 insertions, 0 deletions

diff --git a/sys-apps/portage/files/portage-1.8.6-r2.tar.bz2 b/sys-apps/portage/files/portage-1.8.6-r2.tar.bz2
new file mode 100644
index 000000000000..e71a532c6bd2
--- /dev/null
+++ b/sys-apps/portage/files/portage-1.8.6-r2.tar.bz2
diff --git a/sys-apps/portage/portage-1.8.6-r2.ebuild b/sys-apps/portage/portage-1.8.6-r2.ebuild
new file mode 100644
index 000000000000..492c83fd524d
--- /dev/null
+++ b/sys-apps/portage/portage-1.8.6-r2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc. Distributed under the terms
+# of the GNU General Public License, v2 or later 
+# Author: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-1.8.6-r2.ebuild,v 1.1 2002/01/27 09:20:08 vitaly Exp $
+ 
+S=${WORKDIR}/${P}-${PR}
+DESCRIPTION="Portage ports system"
+SRC_URI=""
+HOMEPAGE="http://www.gentoo.org"
+#debianutils is for "readlink"
+
+if [ -z "`use build`" ] ; then
+  RDEPEND="sys-devel/spython sys-apps/debianutils"
+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}/${P}-${PR}.tar.bz2
+}
+
+src_compile() {                           
+	cd ${S}/src; gcc ${CFLAGS} tbz2tool.c -o tbz2tool
+	cd ${S}/src/sandbox
+	emake || die
+}
+
+pkg_preinst() {
+	if [ -d /var/db/pkg/sys-apps/bash-2.05a ] && [ ! -d /var/db/pkg/sys-apps/bash-2.05a-r1 ]
+	then
+		eerror "You have to update your bash-2.05a installation."
+		eerror "Please execute 'emerge sys-apps/bash' as root"
+		eerror "before installing this version of portage."
+		die
+	fi
+}
+
+src_install() {
+	#config files
+	cd ${S}/cnf
+	insinto /etc
+	doins make.globals make.conf
+
+	#python modules
+	cd ${S}/pym
+	insinto /usr/lib/portage/pym
+	doins xpak.py portage.py
+	dodir /usr/lib/python2.0/site-packages
+	dosym ../../portage/pym/xpak.py /usr/lib/python2.0/site-packages/xpak.py
+	dosym ../../portage/pym/portage.py /usr/lib/python2.0/site-packages/portage.py
+
+	# we gotta compile these modules
+	# next lines commented out due to "try" issues.  This allows people to upgrade who need to upgrade
+#	try spython -c "import compileall; compileall.compile_dir('${D}/usr/lib/python2.0/site-packages')"
+#	try spython -O -c "import compileall; compileall.compile_dir('${D}/usr/lib/python2.0/site-packages')"
+	
+	#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 /usr/lib/portage/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/sbin/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
+
+	doman ${S}/man/*.[15]
+	dodir /var/tmp
+	chmod 1777 ${D}/var/tmp
+	touch ${D}/var/tmp/.keep
+	if [ "`use build`" ] 
+	then
+		#convenience; overwrite existing symlink
+		ln -sf ../usr/portage/profiles/default-1.0_rc6 ${D}/etc/make.profile
+	fi
+	dodoc ${S}/ChangeLog
+}
+
+pkg_postinst() {
+	if [ ! -e ${ROOT}/etc/make.profile ]
+	then
+		cd ${ROOT}/etc
+		ln -s ../usr/portage/profiles/default-1.0_rc6 make.profile
+	fi
+	local x
+	for x in portage xpak
+	do
+		if [ -e ${ROOT}/usr/lib/python2.0/${x}.py ]
+		then
+			rm ${ROOT}/usr/lib/python2.0/${x}.py
+			rm ${ROOT}/usr/lib/python2.0/${x}.pyc
+		fi
+	done
+	
+	#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
+}