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

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

6 files changed, 32 insertions, 53 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/Manifest b/sys-boot/grub/Manifest
index d25c9119492a..15bdf0963357 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -28,10 +28,10 @@ DIST grub-0.97.tar.gz 971783 RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 SHA
 DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b
 DIST splash.xpm.gz 33856 RMD160 2fead61f91c368429e80936248bb02af2bdf15ff SHA1 98e679f9698be43426f971f89a088c053e8c804a SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf
 EBUILD grub-0.92-r1.ebuild 2606 RMD160 89f0287e32655136b91156084b56fe6df582c7ff SHA1 e0f0a79f4cf159cb9aa3ef3ce4e471042a003e40 SHA256 7e523b16eda16ef887a74d51ff0820492b8cf17a2b7dc42181eee8006c080488
-EBUILD grub-0.94-r1.ebuild 3500 RMD160 0847c2f47e5144bf33e7d5e21157dd3bcffe6385 SHA1 31b2176750a78a40ab62294b72a6f9cbba04941e SHA256 7d4670b1305af61027bee24a1ea8c2ced1797789f7a0592fe91ba60c047c002c
-EBUILD grub-0.96-r1.ebuild 4714 RMD160 2577214aaa908eccec06968bf7d4364a1e3d85a6 SHA1 e62cde850ff44026b54e7e87b4d48a8941cc9e8e SHA256 0844dde0888894523e460175f4db0b0460eb09bb8e8d838889d279c429ba916c
+EBUILD grub-0.94-r1.ebuild 3344 RMD160 ad8adeda7d3da0bec327de95ca6af74ba5d9bfb3 SHA1 cd392ee540c944a55d2a7b519dca64bcd9f616bc SHA256 ac10bab29fc22b230c2a2e0e7fea5788fb0131bd61a5285c0f007db1a60acf0f
+EBUILD grub-0.96-r1.ebuild 4463 RMD160 4d656aca84ad202dc913a76d458dbd989c52c924 SHA1 3db0c6d59b56711b6aa168b3aafb14b69c283079 SHA256 4eac549453faa45beee98ebb0b18ceb850dddf7aa157aa6edd68a4febf9ac889
 EBUILD grub-0.96-r2.ebuild 4316 RMD160 7a1cfa74e0bb5849ce8392d63d90f727084252ec SHA1 c1db97404fb162bbf2039e729ac4f8c3877bf174 SHA256 e39d3a05b3202751b1b2cb8bc81e001f2cb7658ff93be664bdcaefb8636a3e9c
-EBUILD grub-0.96-r3.ebuild 4547 RMD160 54d8783620b547e2e99832782cb5ec390b95246f SHA1 7442044cd471933c43d6a294293107b0f6835590 SHA256 8337ccc0d4d86904901a4d05b168b328769d83c66ab307fa612a31b9722fc36e
+EBUILD grub-0.96-r3.ebuild 4295 RMD160 781344a1c33ec9f8d8a79894457deaadc55a7044 SHA1 3baab6b63a6a9973c9dd4da2627e72f316be9354 SHA256 00b84a6a0d6b633c504070437fac63d86e79fd27f0da1f56ef992a4ee1e4409e
 EBUILD grub-0.97-r10.ebuild 9455 RMD160 e384d2d5449d12085eccaea6c3ab9fc2693b00cf SHA1 7cb1acde638a2224ace5dbc72ef8b7fa649f8e2c SHA256 f878cb15a657297c6d40828f58d20d95513fdbadd371a5ac306b74b887e7f2b4
 EBUILD grub-0.97-r2.ebuild 4821 RMD160 91c7ed297f8aa283b25cbacf3cb04b5212120362 SHA1 c620bfaa7d4fd81a394a6045613de6b775d01b43 SHA256 1cb1cdfc0d3425925dd5ca79e8e9709ece26d71a819f6e19a5bcf2167fa2f61a
 EBUILD grub-0.97-r3.ebuild 4690 RMD160 ab2b91ad9550276e79587c6f8de4a6f55c2ef275 SHA1 62d3f237d80bfcfdcbdccc8be1e9d42bbf4ecccc SHA256 66cb357d9d49119e28fc04c9d64edc034ecc4e82675923e88da965a2ac6ad28f
@@ -40,25 +40,25 @@ EBUILD grub-0.97-r5.ebuild 6848 RMD160 725eeca41a79e7703ad9d1e0af5af88ee8ea3220
 EBUILD grub-0.97-r6.ebuild 8801 RMD160 3da0ba7ea62758c9fd352f7290b441c3e9f08fb6 SHA1 14d1273cd43b7842b7eaadb07b8bd4725b2ca908 SHA256 6f9b1673cef088195c60a134916ba7a12f55d45490cb8a01a335e28693b2a887
 EBUILD grub-0.97-r8.ebuild 8941 RMD160 4caee80e02de14e6a88a3ab016df32f90c258f09 SHA1 be1f73938f4763cf6413afee97062abb8666ffbb SHA256 5876009e82e6556be90d2355defd3039d244f5a53313ba29ce937e9c14e169ff
 EBUILD grub-0.97-r9.ebuild 9045 RMD160 5db30743506d7ae274695a94bd1c7c5fea8003e2 SHA1 4796cd56c8e77239719bd31a0542b11129e7922f SHA256 153939f732549503f08dd2acff27325b3e398ffc065e16c1749281c6c66a97d5
-EBUILD grub-0.97.ebuild 4494 RMD160 f798b7101af90add6d45725e34aeb7f219e0b748 SHA1 fbb215b293127635ba41e7fa952518e5e07f118a SHA256 d08c03989b1cd6ad91fa2e1a098e0230994570472d0f11a6d926e21e06071c58
+EBUILD grub-0.97.ebuild 4242 RMD160 9bb0b20da4d7c66b099cf478f6e0f05be6659085 SHA1 e19eae0a05492981cdb64c5a820d1060580f264a SHA256 3e00e668fd389a3187c8403a609cad1f19e0d93d2e7778791212d1c3a0b57c4d
 EBUILD grub-1.99-r2.ebuild 8295 RMD160 40fe549f40388e979d7028b7cdb59a84f6858fd4 SHA1 7f2d2b04f480249432426ed17d7afc8606964d29 SHA256 b26f203af5c7ed37b3a4bb74007f66b520883870d26bdb3859fc721d07e346de
 EBUILD grub-9999.ebuild 8080 RMD160 32d81ab52b8cc94a310e26313ed5b7a01062a27c SHA1 6a24c73c0321cbd39725f572993b943196c60bb2 SHA256 b77cdc20e20a1cc58deab002c795f94325150e3c1ddee2012cb14be59e0765bc
-MISC ChangeLog 35486 RMD160 92c6823bf5b38b2f84a595f17a0584a08a41db18 SHA1 f8f207e97bab1aeedc43c2a475e884fd4c286952 SHA256 a52517058d7c5ec1efbc7170af6c62c7c772796ecefc9567d143724df8931607
+MISC ChangeLog 35714 RMD160 f84047d296a4021c89c0609ffe775d265ee19c18 SHA1 d843d7bd748376782a6fe2703e08762d39b0c94a SHA256 358877c62d5155e5705067d681d2313377c078fe07ed97e0293854ee80216f31
 MISC metadata.xml 339 RMD160 755d01714b2122044f91caa8edd71b0ee4436d8e SHA1 4383abb52e4eb0cbe5215f9b0d86f3977eeee674 SHA256 62efb79ff5e2adec3535622af752bbb291b5b6c130094447364c567a5ff2e1ca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPBn9RAAoJELEHsLL7fEFWKD8P/14mNXtB0OwfvjDHEar/Zk1Y
-+YS2NaPd3AHBzpH5soeAoDHbEPH7GJNA3JpqBADtqpqAcGdaMKI8PfH1y1Ri021P
-TE7aEx71oFOWqaLSbpGFWhFHME3XJIhXa9AnG0MKCY8B2m+4QeoDPDqCGFIUTRmn
-S1DhEFGCvpUyW/KAtsRQAokpWqAdGoN3mtChMtTAW7kSTNYE3ojEjWozi6vuxYG0
-9LNtw1WlCXJLP6ksuOVMEUmuoMg6XNTMZpkgfhtj8GivIwR+7R4mg8ewDwtIcnYU
-yHkBvKr2d00ulGQzI1lil81GDGsJmFOiIqYky28lNSpgrQyK/JyNYtDwi1oFb7ws
-3DIglfJRiQ6sBQiMwzhp2Kg+59oWx0EC6p8+427vBSlAJnIrDDv3s860P3Cd01vg
-3qpaqPDBRZJyJ7DCrrKLa9tdJaYRHi0lbXnPeCp0x7ZbnBzME53q5ECKRzpBQ3ZD
-aJZi4qnwLtb9eGkzfOVAegzp3nVgRl9O6f5ZXN+327niHNmnE/RsKoe+7H1csVde
-irLXWMmLFxXkPVfWGfDzhjJ2lLa3zTdQqguyiJQcoh9ns/NDagQX0sTrgg2hRmGh
-r34exKw9L631q9PMVyvAZE7eag2QQ1dX/3I3kpvWQn5GNsNDh2S1UZrK7DuAmbfQ
-bW4OWtW2paQKgK6Vvmjk
-=XH2v
+iQIcBAEBAgAGBQJPEThCAAoJELEHsLL7fEFWLGwP/iQMuBL+NUmmUtIPjlL2fXsm
+LJlWVRJ2ZTr/MlJbsSHZUlHt3mIFjOtE2cE2HudVJSJBtm9ch8J1bxBP3CobTAxm
+TYl9DrTZkcqoHql86ql1lKdwADZd7bDrw1Rjo551gO9QaplL5vNGqcV70q59Equ/
+JYtTsRG3Bp8YcI+hCvvbyQ2E7zoPqTvBpaE461TujKCU1J2y9WzQUL/4HltU3Cnb
+n8h53WQ1SK00rycSpciXwR/jZOGximURn/aSmGboPicLgxUSbf5TQLPOvp8B0JBU
+LUFiOXkgscUnnLigYdY1G/l0Nt3H8Lpsj/oV6ULSuiI87C4eKaSg6XdSchSbjZWl
+nO55sLcemGNAKVpIA0vrpm1vnh1DxrCE7viWmRgZRrvTMAliB4ukdHg/Jd5m5wDp
+hMzwOLz7UzohLuAGdwlmdCOqHnEfw6Dg+CAlF9uZTTkjsrO/QJd6cAmmTfaywNTI
+Oo2lM1PFlHYordslFc7t8k+GEE/wTkkwNExyWrryHO+h+VFeiYGcDierc9NpVSTW
+4CMjCyXHwEEN8DB4xXdsN6OKz3G4KKXPAhhlzpleTzAla5gZNkzsUwB88KmK3LvB
+vAkwVFG+ShXuk3LCXm1YFKbycxkyXJgEuJNwfXosI01bvyx2R4xpo7ShYcOuf/TX
+gsNKToAhoDxdMY8FvqaU
+=JXSu
 -----END PGP SIGNATURE-----
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