Drop multilib stuff as the binaries that run on the host system.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 15 insertions, 13 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 390ba4df7a2e..b9d246d739c4 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.108 2008/12/30 11:35:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.109 2008/12/31 09:09:06 vapier Exp $
+
+  31 Dec 2008; Mike Frysinger <vapier@gentoo.org> grub-1.96.ebuild,
+  grub-9999.ebuild:
+  Drop multilib stuff as the binaries that run on the host system.
 
   30 Dec 2008; Mike Frysinger <vapier@gentoo.org> metadata.xml,
   grub-1.96.ebuild, grub-9999.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 9360d824c65a..51fc6999158c 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -32,14 +32,14 @@ EBUILD grub-0.97-r5.ebuild 6880 RMD160 942a63d78c6c1f58f7139b5df863c89466484828
 EBUILD grub-0.97-r6.ebuild 8833 RMD160 d49c9ecff3d451a318fdcf4d5367549b4ae946c6 SHA1 ebf3222a1eaac1c272de84617a64e2e3da80a315 SHA256 c7fb9191776c0bacf6b9160f1e78cb1fa6ccefbed03b85a219a1ab355bc5f36b
 EBUILD grub-0.97-r8.ebuild 8871 RMD160 c6255b0e4de7b0c03611e7227d5fb3ce48db5cce SHA1 9557b2edc8ba61766cd35a2a4d37e26434aaeff7 SHA256 34a4d4ffb38e0bf0ba2647933b7aa341c72537add518bc4ec217419619c1f960
 EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a
-EBUILD grub-1.96.ebuild 1975 RMD160 3662ce1cef0bafa6ecb3f052db0f168c93731587 SHA1 335cfb29f288cd31c3bde4bf9946bea9229d6200 SHA256 6a397833c67ac64664f5016f1da244769883d64ed00de263962c9dfd9f87c454
-EBUILD grub-9999.ebuild 1975 RMD160 c8c32858e2939ded6e0fe8fcecc2c7788d47089d SHA1 1049c6db01691a7e3bbeb8fd15a36380e7b0126f SHA256 d116b8c2578b52f7b3ae9e9e22777b9a94928e375dc36d43d980f77e82a3a5b6
-MISC ChangeLog 24465 RMD160 a5b272a150b052d1d50872d9389157f1eacd7115 SHA1 d65d276bbb61242cf26aecc82bc6a87c8b5d8b68 SHA256 3272403a7ac31bb2db7440517eb2160c694b74a7bd60920996f04082a6c80e12
+EBUILD grub-1.96.ebuild 1932 RMD160 c99d77ebd74b957a36ebc2af079aaf509478e168 SHA1 903aef3468a8a44c07f12451c90e4e6cd12acab9 SHA256 fc9de751fee68b4751bebd4ab377c2d98c78937a4bc9ca48b6df302bdf1951c8
+EBUILD grub-9999.ebuild 1932 RMD160 c5da0edb1519236a7b5a2aedbff304596f88045e SHA1 34f6959f2df73b29fea605d0ee820aa305c1a5ed SHA256 77aa3757cbc3f4a15a8e30cd739defcda883281edc7002628d6876bfa7ba668b
+MISC ChangeLog 24621 RMD160 047e7cf56c21c47bd1db057c66a186cfe137708f SHA1 bc1fbf6f784e826ba32641cf801ae3e5ca666328 SHA256 7c02a20fa14621d777c691f2dc6e6d527f965cecd36f5f375ff4e2235450323d
 MISC metadata.xml 335 RMD160 0b3dc4adad396efff41ba497f8b1f2181592885f SHA1 84ef61b0ab9dff3cdb0ac4697643156c019d0318 SHA256 ee3c63b09962a2686c0d32def9ca19ecfcd602cebbf0679cb57cfc02a9661c75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklaB6IACgkQn/5bYzqsSmHVWwCbBRiy/2DrpOiDziSEvBwXW8Ru
-2tcAnijhy/yN87AbS5IEKB7ygiKow9fr
-=JWMB
+iEYEARECAAYFAklbNroACgkQn/5bYzqsSmFgMQCfdywTAfrmJ5MdkfhR9pFDOgQb
+6kwAoMuXnWg2K6xUiWlXB/xO6J6m5MMg
+=tkgC
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-1.96.ebuild b/sys-boot/grub/grub-1.96.ebuild
index 1ccfb8e38ddd..7b82ed5d0e4c 100644
--- a/sys-boot/grub/grub-1.96.ebuild
+++ b/sys-boot/grub/grub-1.96.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.96.ebuild,v 1.8 2008/12/30 11:35:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.96.ebuild,v 1.9 2008/12/31 09:09:06 vapier Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
@@ -16,7 +16,7 @@ fi
 DESCRIPTION="GNU GRUB 2 boot loader"
 HOMEPAGE="http://www.gnu.org/software/grub/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 use multislot && SLOT="2" || SLOT="0"
 KEYWORDS=""
 IUSE="custom-cflags multislot static"
@@ -29,7 +29,6 @@ STRIP_MASK="/lib*/grub/*/*.mod"
 QA_EXECSTACK="sbin/grub-probe sbin/grub-setup"
 
 src_compile() {
-	use amd64 && multilib_toolchain_setup x86
 	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
 	use static && append-ldflags -static
 
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 51b9a4a11d75..3fa80ec8b16b 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.3 2008/12/30 11:35:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.4 2008/12/31 09:09:06 vapier Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
@@ -16,7 +16,7 @@ fi
 DESCRIPTION="GNU GRUB 2 boot loader"
 HOMEPAGE="http://www.gnu.org/software/grub/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 use multislot && SLOT="2" || SLOT="0"
 KEYWORDS=""
 IUSE="custom-cflags multislot static"
@@ -29,7 +29,6 @@ STRIP_MASK="/lib*/grub/*/*.mod"
 QA_EXECSTACK="sbin/grub-probe sbin/grub-setup"
 
 src_compile() {
-	use amd64 && multilib_toolchain_setup x86
 	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
 	use static && append-ldflags -static