Putting ABI stuff inside an 'if use amd64' block.

Package-Manager: portage-2.0.51.19

7 files changed, 70 insertions, 46 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 30f02425205c..c9431b0d11f0 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/grub
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.34 2005/03/11 05:14:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.35 2005/03/15 23:39:52 eradicator Exp $
+
+  15 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  grub-0.94-r1.ebuild, grub-0.94-r2.ebuild, grub-0.95.20040823.ebuild,
+  grub-0.96.ebuild, grub-0.96-r1.ebuild:
+  Putting ABI stuff inside an 'if use amd64' block.
 
 *grub-0.96-r1 (11 Mar 2005)
 
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 49d3f0cf8b5c..b068f0c24eb2 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,25 +1,35 @@
-MD5 cc68fca6fa606a91728386e5af24ba63 ChangeLog 12031
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a0d8109cb6521457d04791b4a5570ad9 ChangeLog 12257
 MD5 3b7a994ffe338fd8de16df033684e924 grub-0.92-r1.ebuild 2519
 MD5 adcde4d1dce3d1e2ef2c466f860c6875 grub-0.93.20030118.ebuild 2539
+MD5 138bf4b71e6daf1c47dd24c453f5faeb grub-0.94-r1.ebuild 3595
 MD5 b0eacbb6edb031d87f33ed0b08f5916d metadata.xml 226
-MD5 809624c41057bbc7d8d6917d1104edf8 grub-0.94-r1.ebuild 3564
-MD5 e1561dae9a23012a8960909af3cffb29 grub-0.94-r2.ebuild 3680
-MD5 548d207b20beedd265fda7bb126c22de grub-0.95.20040823.ebuild 4155
-MD5 9cf2ac1a1d69d1a44917c87aa4dd49a3 grub-0.96.ebuild 4072
-MD5 8caaa3542a1c63171a4e86d540c2f143 grub-0.96-r1.ebuild 4998
+MD5 6f64ad4c1842218eafe2ebdd908fcc85 grub-0.94-r2.ebuild 3711
+MD5 a0f235ac986f99960ed542e2982c3640 grub-0.95.20040823.ebuild 4185
+MD5 840a9c24664c6b7e72741226ff791f8e grub-0.96.ebuild 4109
+MD5 2eadb6c1bd87b8f207d226c00f9e3458 grub-0.96-r1.ebuild 5035
 MD5 16039704cf1e6b6f46b4413532af082c files/digest-grub-0.92-r1 133
 MD5 5d1c8e582496db9d7a9b77e76f09f7d8 files/digest-grub-0.93.20030118 139
-MD5 8d898cd9d1928916596cc3f9883eac67 files/grub-0.93-gcc3.3.diff 639
-MD5 cdd6c89d48982ecd544c0b4774755afd files/splash.xpm.gz 33856
 MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r1 131
-MD5 e9e73f57d9f9d5c550792980b2635f94 files/grub-0.94-gcc3.4.patch 479
 MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r2 131
-MD5 7357395b0d223c0bbf0675a9af31f9c3 files/grub-0.94-grub.conf.patch 7574
 MD5 3a653f86b731c2a17482d25f57b2d041 files/digest-grub-0.95.20040823 149
+MD5 8d898cd9d1928916596cc3f9883eac67 files/grub-0.93-gcc3.3.diff 639
+MD5 e9e73f57d9f9d5c550792980b2635f94 files/grub-0.94-gcc3.4.patch 479
+MD5 7357395b0d223c0bbf0675a9af31f9c3 files/grub-0.94-grub.conf.patch 7574
 MD5 9c1ec8bfdc5f20ce965c2d2167a43162 files/grub-0.95.20040823-warnings.patch 2529
+MD5 cdd6c89d48982ecd544c0b4774755afd files/splash.xpm.gz 33856
 MD5 2170f54e53dea24426369c0154d46fc0 files/digest-grub-0.96 140
-MD5 904c3dec402e5c7f0e62ab970dcdf5b2 files/grub-0.96-PIC.patch 1925
 MD5 2170f54e53dea24426369c0154d46fc0 files/digest-grub-0.96-r1 140
+MD5 904c3dec402e5c7f0e62ab970dcdf5b2 files/grub-0.96-PIC.patch 1925
+MD5 e5978f58eb732289c47b1e0093db4e73 files/grub-0.96-bounced-checks.patch 505
 MD5 3f3995353a0995c56d996d2218570160 files/grub-0.96-i2o-raid.patch 1597
 MD5 8082c035a4ba98d0935b6b045827fb2c files/grub-0.96-nxstack.patch 18920
-MD5 e5978f58eb732289c47b1e0093db4e73 files/grub-0.96-bounced-checks.patch 505
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCN3J/ArHZZzCEUG0RAiOJAJwPFAngNMySqVlnCh24gTFwaPFhUQCgiZs2
+6q1GKvg5MOBuNDiEINJbq30=
+=XosZ
+-----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-0.94-r1.ebuild b/sys-boot/grub/grub-0.94-r1.ebuild
index 7bb34b1c0d26..2e9e41bced44 100644
--- a/sys-boot/grub/grub-0.94-r1.ebuild
+++ b/sys-boot/grub/grub-0.94-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r1.ebuild,v 1.17 2005/03/11 04:29:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r1.ebuild,v 1.18 2005/03/15 23:39:52 eradicator Exp $
 
 inherit mount-boot eutils flag-o-matic gcc
 
@@ -21,10 +21,12 @@ DEPEND="${RDEPEND}
 PROVIDE="virtual/bootloader"
 
 pkg_setup() {
-	has_m32 || die "your compiler seems to be unable to compile 32bit code. if you are on amd64, make sure you compile gcc with USE=multilib FEATURES=-sandbox"
+	if use amd64; then
+		has_m32 || die "your compiler seems to be unable to compile 32bit code. if you are on amd64, make sure you compile gcc with USE=multilib FEATURES=-sandbox"
 
-	ABI_ALLOW="x86"
-	ABI="x86"
+		ABI_ALLOW="x86"
+		ABI="x86"
+	fi
 }
 
 src_unpack() {
diff --git a/sys-boot/grub/grub-0.94-r2.ebuild b/sys-boot/grub/grub-0.94-r2.ebuild
index 8e86eb469d11..4749a87f9a7e 100644
--- a/sys-boot/grub/grub-0.94-r2.ebuild
+++ b/sys-boot/grub/grub-0.94-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r2.ebuild,v 1.6 2005/03/11 04:29:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r2.ebuild,v 1.7 2005/03/15 23:39:52 eradicator Exp $
 
 inherit mount-boot eutils flag-o-matic gcc
 
@@ -21,10 +21,12 @@ DEPEND="${RDEPEND}
 PROVIDE="virtual/bootloader"
 
 pkg_setup() {
-	has_m32 || die "your compiler seems to be unable to compile 32bit code. if you are on amd64, make sure you compile gcc with USE=multilib FEATURES=-sandbox"
+	if use amd64; then
+		has_m32 || die "your compiler seems to be unable to compile 32bit code. if you are on amd64, make sure you compile gcc with USE=multilib FEATURES=-sandbox"
 
-	ABI_ALLOW="x86"
-	ABI="x86"
+		ABI_ALLOW="x86"
+		ABI="x86"
+	fi
 }
 
 src_unpack() {
diff --git a/sys-boot/grub/grub-0.95.20040823.ebuild b/sys-boot/grub/grub-0.95.20040823.ebuild
index 0b5d1cbe9de7..3ce1ba057520 100644
--- a/sys-boot/grub/grub-0.95.20040823.ebuild
+++ b/sys-boot/grub/grub-0.95.20040823.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.95.20040823.ebuild,v 1.14 2005/03/11 04:29:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.95.20040823.ebuild,v 1.15 2005/03/15 23:39:52 eradicator Exp $
 
 inherit mount-boot eutils flag-o-matic gcc gnuconfig toolchain-funcs
 
@@ -21,10 +21,11 @@ DEPEND="${RDEPEND}
 PROVIDE="virtual/bootloader"
 
 pkg_setup() {
-	has_m32 || die "your compiler seems to be unable to compile 32bit code. if you are on amd64, make sure you compile gcc with USE=multilib FEATURES=-sandbox"
-
-	ABI_ALLOW="x86"
-	ABI="x86"
+	if use amd64; then
+		has_m32 || die "your compiler seems to be unable to compile 32bit code. if you are on amd64, make sure you compile gcc with USE=multilib FEATURES=-sandbox"
+		ABI_ALLOW="x86"
+		ABI="x86"
+	fi
 }
 
 src_unpack() {
diff --git a/sys-boot/grub/grub-0.96-r1.ebuild b/sys-boot/grub/grub-0.96-r1.ebuild
index 534b309b75cc..b3f6b48386c5 100644
--- a/sys-boot/grub/grub-0.96-r1.ebuild
+++ b/sys-boot/grub/grub-0.96-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r1.ebuild,v 1.4 2005/03/12 19:17:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r1.ebuild,v 1.5 2005/03/15 23:39:52 eradicator Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
@@ -22,16 +22,18 @@ DEPEND="${RDEPEND}
 PROVIDE="virtual/bootloader"
 
 pkg_setup() {
-	if ! has_m32; then
-		eerror "Your compiler seems to be unable to compile 32bit code."
-		eerror "If you are on amd64, make sure you compile gcc with:"
-		echo
-		eerror "    USE=multilib FEATURES=-sandbox"
-		die "Cannot produce 32bit objects!"
+	if use amd64; then
+		if ! has_m32; then
+			eerror "Your compiler seems to be unable to compile 32bit code."
+			eerror "If you are on amd64, make sure you compile gcc with:"
+			echo
+			eerror "    USE=multilib FEATURES=-sandbox"
+			die "Cannot produce 32bit objects!"
+		fi
+
+		ABI_ALLOW="x86"
+		ABI="x86"
 	fi
-
-	ABI_ALLOW="x86"
-	ABI="x86"
 }
 
 src_unpack() {
diff --git a/sys-boot/grub/grub-0.96.ebuild b/sys-boot/grub/grub-0.96.ebuild
index 1069c93892c2..75f4cae6faee 100644
--- a/sys-boot/grub/grub-0.96.ebuild
+++ b/sys-boot/grub/grub-0.96.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96.ebuild,v 1.3 2005/03/11 04:29:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96.ebuild,v 1.4 2005/03/15 23:39:52 eradicator Exp $
 
 inherit mount-boot eutils flag-o-matic gcc gnuconfig toolchain-funcs
 
@@ -22,16 +22,18 @@ DEPEND="${RDEPEND}
 PROVIDE="virtual/bootloader"
 
 pkg_setup() {
-	if ! has_m32; then
-		eerror "Your compiler seems to be unable to compile 32bit code."
-		eerror "If you are on amd64, make sure you compile gcc with:"
-		echo
-		eerror "    USE=multilib FEATURES=-sandbox"
-		die "Cannot produce 32bit objects!"
+	if use amd64; then
+		if ! has_m32; then
+			eerror "Your compiler seems to be unable to compile 32bit code."
+			eerror "If you are on amd64, make sure you compile gcc with:"
+			echo
+			eerror "    USE=multilib FEATURES=-sandbox"
+			die "Cannot produce 32bit objects!"
+		fi
+
+		ABI_ALLOW="x86"
+		ABI="x86"
 	fi
-
-	ABI_ALLOW="x86"
-	ABI="x86"
 }
 
 src_unpack() {