Portage 2.0.1: fixes a virtuals bug

6 files changed, 148 insertions, 4 deletions

diff --git a/sys-apps/portage/files/digest-portage-2.0 b/sys-apps/portage/files/digest-portage-2.0.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/sys-apps/portage/files/digest-portage-2.0
+++ b/sys-apps/portage/files/digest-portage-2.0.1
diff --git a/sys-apps/portage/files/portage-2.0.1.tar.bz2 b/sys-apps/portage/files/portage-2.0.1.tar.bz2
new file mode 100644
index 000000000000..0fd7cf5bb633
--- /dev/null
+++ b/sys-apps/portage/files/portage-2.0.1.tar.bz2
diff --git a/sys-apps/portage/files/portage-2.0.tar.bz2 b/sys-apps/portage/files/portage-2.0.tar.bz2
deleted file mode 100644
index c4240bf79cbe..000000000000
--- a/sys-apps/portage/files/portage-2.0.tar.bz2
+++ /dev/null
diff --git a/sys-apps/portage/files/ppc-2.0.1/make.conf b/sys-apps/portage/files/ppc-2.0.1/make.conf
new file mode 100644
index 000000000000..caf32242908f
--- /dev/null
+++ b/sys-apps/portage/files/ppc-2.0.1/make.conf
@@ -0,0 +1,73 @@
+# 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/pub/Linux/distributions/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-2.0.1/make.globals b/sys-apps/portage/files/ppc-2.0.1/make.globals
new file mode 100644
index 000000000000..533439b57945
--- /dev/null
+++ b/sys-apps/portage/files/ppc-2.0.1/make.globals
@@ -0,0 +1,65 @@
+# 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/pub/Linux/distributions/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-2.0.ebuild b/sys-apps/portage/portage-2.0.1.ebuild
index 5e5b66939578..14770623c70f 100644
--- a/sys-apps/portage/portage-2.0.ebuild
+++ b/sys-apps/portage/portage-2.0.1.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.ebuild,v 1.1 2002/06/17 01:00:43 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.1.ebuild,v 1.1 2002/06/17 05:10:08 drobbins Exp $
  
 S=${WORKDIR}/${P}
 SLOT="0"
@@ -25,9 +25,15 @@ src_unpack() {
 src_compile() {                           
 	cd ${S}/src; gcc ${CFLAGS} tbz2tool.c -o tbz2tool
 	cd ${S}/src/sandbox
-	emake || die
+	if [ "${ARCH}" = "x86" ]; then
+		emake CFLAGS="-O2 -march=i486 -pipe" || die
+	else
+		emake || die
+	fi
+
 }
 
+
 src_install() {
 	#config files
 	cd ${S}/cnf
@@ -51,7 +57,7 @@ src_install() {
 
 	# 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
+	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
@@ -82,7 +88,7 @@ src_install() {
 	dosym ../lib/portage/bin/xpak /usr/bin/xpak
 	dosym ../lib/portage/bin/tbz2tool /usr/bin/tbz2tool
 	dosym newins /usr/lib/portage/bin/donewins
-	dosym ../lib/portage/bin/repoman /usr/bin/repoman	
+	
 	# man pages
 	doman ${S}/man/*.[15]