Updates to work with amd64's 2005.0.

Package-Manager: portage-2.0.51-r13

7 files changed, 56 insertions, 27 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index a1892489faeb..a680dd444f98 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.30 2004/12/20 18:54:54 blubb Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.31 2005/01/20 18:37:45 eradicator Exp $
+
+  20 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  grub-0.94-r1.ebuild, grub-0.94-r2.ebuild, grub-0.95.20040823.ebuild:
+  Updates to work with amd64's 2005.0.
 
   20 Dec 2004; Simon Stelling <blubb@gentoo.org> grub-0.95.20040823.ebuild:
   changed WANT_AUTOMAKE to 1.8
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index ff0542e2d47a..ef19c3ee2bc3 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,17 +1,27 @@
-MD5 48675b78cc188dcef2ef4653dc49e085 ChangeLog 11185
-MD5 d2c5f3ba084defee6f806a4eab5d3e36 grub-0.92-r1.ebuild 2526
-MD5 fc967cbfa21d5efadccfe2146dfa03df grub-0.93.20030118.ebuild 2512
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8508f95536118f80e92a1ef35ac4cbc1 ChangeLog 11358
+MD5 ab8dffe755fef76f482674e25a29c08a grub-0.92-r1.ebuild 2528
+MD5 cafd80ff67a1bc6b1ecbf32469ee9da8 grub-0.93.20030118.ebuild 2514
+MD5 ef7e47c4eac64f6510f0a90b6fa826fc grub-0.94-r1.ebuild 3484
 MD5 b0eacbb6edb031d87f33ed0b08f5916d metadata.xml 226
-MD5 0dd299714e769591e7e0b6aed01908e6 grub-0.94-r1.ebuild 3431
-MD5 ebff7c57fe55cb10fa55ec38f85c02da grub-0.94-r2.ebuild 3545
-MD5 c541836ee4c16ba4395be138dd07713e grub-0.95.20040823.ebuild 4030
+MD5 bb4f93e519b585262e0710d6cdaf6896 grub-0.94-r2.ebuild 3600
+MD5 b9129e6d1edda49285fdf84f5ed29b7d grub-0.95.20040823.ebuild 4075
 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB7/qGArHZZzCEUG0RArrLAJ4rgsy3olG9Ju3E/CPHQw9A3krTfQCfTAPe
+fFZbBdDHPB4sxXfTOBz+vjA=
+=u4O9
+-----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-0.92-r1.ebuild b/sys-boot/grub/grub-0.92-r1.ebuild
index 0d1d4ffe96da..539f0e99a8f4 100644
--- a/sys-boot/grub/grub-0.92-r1.ebuild
+++ b/sys-boot/grub/grub-0.92-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.92-r1.ebuild,v 1.6 2004/07/15 02:49:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.92-r1.ebuild,v 1.7 2005/01/20 18:37:45 eradicator Exp $
 
 inherit mount-boot eutils flag-o-matic gcc
 
diff --git a/sys-boot/grub/grub-0.93.20030118.ebuild b/sys-boot/grub/grub-0.93.20030118.ebuild
index f1d6de439d1c..f553460fa3e3 100644
--- a/sys-boot/grub/grub-0.93.20030118.ebuild
+++ b/sys-boot/grub/grub-0.93.20030118.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.93.20030118.ebuild,v 1.8 2004/06/24 22:34:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.93.20030118.ebuild,v 1.9 2005/01/20 18:37:45 eradicator Exp $
 
 inherit mount-boot eutils flag-o-matic
 
diff --git a/sys-boot/grub/grub-0.94-r1.ebuild b/sys-boot/grub/grub-0.94-r1.ebuild
index dada5aa966a4..fba883b77590 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-2004 Gentoo Foundation
+# 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.13 2004/10/13 20:56:53 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r1.ebuild,v 1.14 2005/01/20 18:37:45 eradicator Exp $
 
 inherit mount-boot eutils flag-o-matic gcc
 
@@ -19,9 +19,14 @@ DEPEND=">=sys-libs/ncurses-5.2-r5
 	>=sys-devel/autoconf-2.5"
 PROVIDE="virtual/bootloader"
 
-src_unpack() {
+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"
+}
+
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 
diff --git a/sys-boot/grub/grub-0.94-r2.ebuild b/sys-boot/grub/grub-0.94-r2.ebuild
index 1c9919cb1eac..b5c5f0f795c6 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-2004 Gentoo Foundation
+# 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.2 2004/09/12 16:59:34 robmoss Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r2.ebuild,v 1.3 2005/01/20 18:37:45 eradicator Exp $
 
 inherit mount-boot eutils flag-o-matic gcc
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://alpha.gnu.org/gnu/grub/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE="static"
 
 DEPEND=">=sys-libs/ncurses-5.2-r5
@@ -19,9 +19,14 @@ DEPEND=">=sys-libs/ncurses-5.2-r5
 	>=sys-devel/autoconf-2.5"
 PROVIDE="virtual/bootloader"
 
-src_unpack() {
+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"
+}
+
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 
diff --git a/sys-boot/grub/grub-0.95.20040823.ebuild b/sys-boot/grub/grub-0.95.20040823.ebuild
index 92f0183d5bb2..d5164ebe0a95 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-2004 Gentoo Foundation
+# 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.10 2004/12/28 11:32:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.95.20040823.ebuild,v 1.11 2005/01/20 18:37:45 eradicator Exp $
 
 inherit mount-boot eutils flag-o-matic gcc gnuconfig toolchain-funcs
 
@@ -19,9 +19,14 @@ DEPEND=">=sys-libs/ncurses-5.2-r5
 	>=sys-devel/autoconf-2.5"
 PROVIDE="virtual/bootloader"
 
-src_unpack() {
-	has_m32 || die "Your compiler seems to be unable to compile 32-bit code. If you are on amd64, make sure you compile gcc with USE=multilib FEATURES=-sandbox"
+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"
+}
 
+src_unpack() {
 	unpack ${A}
 	cd ${S}