Drop has_m32 as this is the only package to use it, and we do not really *need* to do so.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

5 files changed, 14 insertions, 35 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index d6487c059b58..9c96b8b797c4 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.174 2012/01/06 04:57:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.175 2012/01/14 08:09:27 vapier Exp $
+
+  14 Jan 2012; Mike Frysinger <vapier@gentoo.org> grub-0.94-r1.ebuild,
+  grub-0.96-r1.ebuild, grub-0.96-r3.ebuild, grub-0.97.ebuild:
+  Drop has_m32 as this is the only package to use it, and we do not really
+  *need* to do so.
 
   06 Jan 2012; Mike Frysinger <vapier@gentoo.org> grub-0.97-r10.ebuild:
   Fix building with newer automakes.
diff --git a/sys-boot/grub/grub-0.94-r1.ebuild b/sys-boot/grub/grub-0.94-r1.ebuild
index 4ed8ef0c2019..5aded48e8d55 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-2011 Gentoo Foundation
+# Copyright 1999-2012 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.26 2011/04/10 14:34:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r1.ebuild,v 1.27 2012/01/14 08:09:27 vapier Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
@@ -27,8 +27,6 @@ PATCHDIR="${WORKDIR}/gentoo"
 
 pkg_setup() {
 	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
diff --git a/sys-boot/grub/grub-0.96-r1.ebuild b/sys-boot/grub/grub-0.96-r1.ebuild
index 69e30b01b47d..85e1b580956c 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-2011 Gentoo Foundation
+# Copyright 1999-2012 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.17 2011/04/10 14:34:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r1.ebuild,v 1.18 2012/01/14 08:09:27 vapier Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
@@ -28,14 +28,6 @@ PATCHDIR="${WORKDIR}/gentoo"
 
 pkg_setup() {
 	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
diff --git a/sys-boot/grub/grub-0.96-r3.ebuild b/sys-boot/grub/grub-0.96-r3.ebuild
index 1c633a79c545..3c81c40ca1db 100644
--- a/sys-boot/grub/grub-0.96-r3.ebuild
+++ b/sys-boot/grub/grub-0.96-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r3.ebuild,v 1.5 2011/04/10 14:34:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r3.ebuild,v 1.6 2012/01/14 08:09:27 vapier Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
@@ -26,14 +26,6 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	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
diff --git a/sys-boot/grub/grub-0.97.ebuild b/sys-boot/grub/grub-0.97.ebuild
index 5c7bbea2699b..7ae5159e252d 100644
--- a/sys-boot/grub/grub-0.97.ebuild
+++ b/sys-boot/grub/grub-0.97.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97.ebuild,v 1.4 2011/04/10 14:34:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97.ebuild,v 1.5 2012/01/14 08:09:27 vapier Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
@@ -24,14 +24,6 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	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