Adding in the multilib patch for amd64

3 files changed, 38 insertions, 16 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 09019218cdaf..20e6a4b90dde 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,5 +1,5 @@
-MD5 ca6d73d54ee70c695499e228617ca199 portage-2.0.50-r6.ebuild 10868
-MD5 77d3fa74d701757896dc3d64af7a7139 portage-2.0.51_pre7.ebuild 13299
+MD5 4823119e15ab8f162967cf866ace68f5 portage-2.0.50-r6.ebuild 11090
+MD5 c57aa31952f0605e038460035666707f portage-2.0.51_pre7.ebuild 13678
 MD5 fd748b32b18be51f43edcb15e49b65af ChangeLog 581
 MD5 4ec0f0ae9676b9d2d227d737d508306b metadata.xml 165
 MD5 b6989b04bc0ab44de75cf82ab47698fa files/portage-rescue-2.0.48-r1-sparc.tbz2 227629
diff --git a/sys-apps/portage/portage-2.0.50-r6.ebuild b/sys-apps/portage/portage-2.0.50-r6.ebuild
index e2da53ed5a00..f1f3a0831c52 100644
--- a/sys-apps/portage/portage-2.0.50-r6.ebuild
+++ b/sys-apps/portage/portage-2.0.50-r6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 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.50-r6.ebuild,v 1.3 2004/04/26 17:24:41 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.50-r6.ebuild,v 1.4 2004/05/20 16:29:53 carpaski Exp $
 
-IUSE="build"
+IUSE="build multilib"
 
 # If the old /lib/sandbox.so is in /etc/ld.so.preload, it can
 # cause everything to segfault !!
@@ -39,11 +39,18 @@ src_unpack() {
 src_compile() {
 	cd ${S}/src; ${CC:-gcc} ${CFLAGS} tbz2tool.c -o tbz2tool
 	cd ${S}/src/sandbox-1.1
-	if [ "${ARCH}" = "x86" ]; then
+	case ${ARCH} in
+		"x86")
 		make CFLAGS="-march=i386 -O1 -pipe" || die
-	else
+			;;
+		"amd64") 
+			use multilib && einfo "Building with multilib support on amd64"
+			make CFLAGS="-O2 -pipe" HAVE_64BIT_ARCH="`use multilib`" || die
+			;;
+		*)
 		make || die
-	fi
+			;;
+	esac
 	cd ${S}/bin
 }
 
@@ -112,7 +119,9 @@ src_install() {
 	#install sandbox
 	cd ${S}/src/sandbox-1.1
 	make clean
-	make DESTDIR=${D} install || die "Failed to compile sandbox"
+	make DESTDIR=${D} \
+		HAVE_64BIT_ARCH="`use amd64 && use multilib`" \
+		install || die "Failed to compile sandbox"
 
 	#symlinks
 	dodir /usr/bin /usr/sbin
diff --git a/sys-apps/portage/portage-2.0.51_pre7.ebuild b/sys-apps/portage/portage-2.0.51_pre7.ebuild
index 1d1058990083..1e918dce49ee 100644
--- a/sys-apps/portage/portage-2.0.51_pre7.ebuild
+++ b/sys-apps/portage/portage-2.0.51_pre7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 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.51_pre7.ebuild,v 1.1 2004/04/26 17:24:41 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51_pre7.ebuild,v 1.2 2004/05/20 16:29:53 carpaski Exp $
 
-IUSE="build"
+IUSE="build multilib"
 
 # If the old /lib/sandbox.so is in /etc/ld.so.preload, it can
 # cause everything to segfault !!
@@ -40,11 +40,18 @@ src_unpack() {
 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
+	case ${ARCH} in
+		"x86")
+			make CFLAGS="-march=i386 -O1 -pipe" || die
+			;;
+		"amd64") 
+			use multilib && einfo "Building with multilib support on amd64"
+			make CFLAGS="-O2 -pipe" HAVE_64BIT_ARCH="`use multilib`" || die
+			;;
+		*)
 		make || die
-	fi
+			;;
+	esac
 	cd ${S}/bin
 }
 
@@ -92,7 +99,11 @@ src_install() {
 	if [ -x "$(type -p python2.2)" ] || [ -x /usr/bin/python2.2 ]; then
 		cd ${S}/src/python-missingos
 		chmod +x setup.py
-		./setup.py install --root ${D} || die "Failed to install missingos module"
+		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
 
 
@@ -113,7 +124,9 @@ src_install() {
 	#install sandbox
 	cd ${S}/src/sandbox-1.1
 	make clean
-	make DESTDIR=${D} install || die "Failed to compile sandbox"
+	make DESTDIR=${D} \
+		HAVE_64BIT_ARCH="`use amd64 && use multilib`" \
+		install || die "Failed to compile sandbox"
 
 	#symlinks
 	dodir /usr/bin /usr/sbin