From e92cd9e2361ae0806c439e51f06280893ebb0fc9 Mon Sep 17 00:00:00 2001
From: Nicholas Jones <carpaski@gentoo.org>
Date: Wed, 20 Oct 2004 20:22:25 +0000
Subject: [PATCH] Touchup to ensure that amd64 doesn't freak out.

---
 sys-apps/portage/Manifest              |  8 ++++----
 sys-apps/portage/portage-2.0.51.ebuild | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 5e51740fbb67..1794ceebaf3d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,7 +6,7 @@ MD5 00db015217d8e61934c033d1e27d40b7 portage-2.0.51_rc7.ebuild 11788
 MD5 c2319f5f50294b32c0d1b9cfa1bee9d3 portage-2.0.50-r11.ebuild 11543
 MD5 48e3a06d54b4afb8b3aac23b90e383ea portage-2.0.51_rc9.ebuild 11788
 MD5 ba4ae80e5e6cf58aac9c5aa1cc5f777e ChangeLog 411
-MD5 f0323e6c6037509cdc03a196e25a6f05 portage-2.0.51.ebuild 11784
+MD5 de6b8036b7b3b588f030633f3bd5b515 portage-2.0.51.ebuild 11933
 MD5 c697b628359c7055961817876804f0a6 metadata.xml 221
 MD5 5375f0805d4d56dc961ad81162854790 files/digest-portage-2.0.50-r11 71
 MD5 3da3469e2b40b9a6b37fd54b2e6c7b98 files/digest-portage-2.0.51_rc7 71
@@ -17,7 +17,7 @@ MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBdq9bBDOEqLMd+jQRAgcGAKDaBO7nu0xoP62lK0WRzGHFzHPH6QCcCXIv
-kmtmg4HssuccINFhk3/Q3Gs=
-=tBSH
+iD8DBQFBdskcBDOEqLMd+jQRAhmQAJ9Kr97tezjnJhEqZwOJH0NHRkz+VgCfcaKp
+xcaZONUKdN3CTBnbGlg46z4=
+=ZgBs
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.0.51.ebuild b/sys-apps/portage/portage-2.0.51.ebuild
index 062d4bcd5843..cb8ae5eb5a9b 100644
--- a/sys-apps/portage/portage-2.0.51.ebuild
+++ b/sys-apps/portage/portage-2.0.51.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.ebuild,v 1.1 2004/10/20 18:32:42 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.ebuild,v 1.2 2004/10/20 20:22:25 carpaski Exp $
 
 IUSE="build selinux"
 inherit flag-o-matic
@@ -63,13 +63,13 @@ src_compile() {
 			;;
 		"amd64")
 			check_multilib
-			make CFLAGS="-O2 -pipe" HAVE_64BIT_ARCH="${MULTILIB}" || die
+			make CFLAGS="-O1 -pipe" HAVE_64BIT_ARCH="${MULTILIB}" || die
 			;;
 		*)
 			if useq macos || useq ppc-macos || useq x86-fbsd; then
 				ewarn "NOT BUILDING SANDBOX ON $ARCH"
 			else
-				make || die
+				make CFLAGS="-O1 -pipe" || die
 			fi
 			;;
 	esac
@@ -124,8 +124,14 @@ src_install() {
 	else
 		#install sandbox
 		cd ${S}/src/sandbox-1.1
-		make DESTDIR=${D} HAVE_64BIT_ARCH="${MULTILIB}" \
-			install || die "Failed to compile sandbox"
+		if [ "$ARCH" == "amd64" ]; then
+			check_multilib
+			make DESTDIR="${D}" HAVE_64BIT_ARCH="${MULTILIB}" || \
+			die "Failed to compile sandbox"
+		else
+			make DESTDIR="${D}" install || \
+			die "Failed to compile sandbox"
+		fi
 	fi
 
 	#symlinks
-- 
2.26.2