Fix building netbot with gcc-4 #112713.

Package-Manager: portage-2.1_pre6-r5

4 files changed, 32 insertions, 13 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index f551470e0995..1dd0a796f009 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.58 2006/02/05 14:46:31 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.59 2006/03/22 03:40:08 vapier Exp $
+
+  22 Mar 2006; Mike Frysinger <vapier@gentoo.org> grub-0.97-r2.ebuild:
+  Fix building netbot with gcc-4 #112713.
 
   05 Feb 2006; Simon Stelling <blubb@gentoo.org> grub-1.92.ebuild:
   remove old 2004.3 multilib checks
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index daf0df73be1c..d1db8733e621 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,6 +1,9 @@
-MD5 2ebc760c92feeef4b52ce367c5dccb9d ChangeLog 16784
-RMD160 f38178a30ef81f8c366868d000e8fa4be9fc322a ChangeLog 16784
-SHA256 cbba4e82aabdad1355795b475c573e13ba0f0119bb549dbe0ea4f0e0296370df ChangeLog 16784
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 44fa5071a8e78dbfe5638daa83628179 ChangeLog 16899
+RMD160 fa76984e500017bdd24488d2b059ae93ff48ec59 ChangeLog 16899
+SHA256 bd553d61f72cecd307bb30db02e79f5294ee1c64b4d4a0c1b2194096d116f4d7 ChangeLog 16899
 MD5 5695c7ea410b6913901208938e05b1ad files/digest-grub-0.92-r1 190
 RMD160 fd772c7ebbddee9fa1b3d3ae1453b787c2b8f536 files/digest-grub-0.92-r1 190
 SHA256 b981fc159397c9b2ce62a6c5d0cb6b6101883a40f03d4918b6aa213fa102a926 files/digest-grub-0.92-r1 190
@@ -19,9 +22,9 @@ SHA256 626a757b70722ff79370e709ed26aa5fe663209382dfafe66f0f6157200d2d8f files/di
 MD5 80b2642d044b2ad2983d3925c4531952 files/digest-grub-0.97 191
 RMD160 2cb5cb4b113740548737411dacb0aabf118db1c6 files/digest-grub-0.97 191
 SHA256 0e9a60d70794333558b7621423f720931a0be3f2357967434c3e2b8b2f852a7f files/digest-grub-0.97 191
-MD5 485041aa6ced0fae7a859d510543f1a5 files/digest-grub-0.97-r2 191
-RMD160 c15036722461fd07555f50a78f5a67332c4f7784 files/digest-grub-0.97-r2 191
-SHA256 6dd514a1e42381cd282f0dbe9b658647a36a193fcdbed5c106e3adbb418687d5 files/digest-grub-0.97-r2 191
+MD5 660ca8ffb71c2a1008754fc599c5dc32 files/digest-grub-0.97-r2 711
+RMD160 17ed023bb1e3e7eb935ae3b5d6f46a1447ae4ae7 files/digest-grub-0.97-r2 711
+SHA256 b0934e5e43d1417abb03e4adc7fbe5b3b6c36bc4db651ceaf832a6eff42bb931 files/digest-grub-0.97-r2 711
 MD5 d1cc117cc8907b5bc913408ce057b858 files/digest-grub-1.92 61
 RMD160 71ed30aabdb81bfd55a4a2a2d2d12951c06f65d1 files/digest-grub-1.92 61
 SHA256 4b256b5ff1e621f866d3f054caf9c89104a20eecaf128d67ed5c395b2c9dd614 files/digest-grub-1.92 61
@@ -40,9 +43,9 @@ SHA256 76368c0b90e303141a46032edadbb251f735e1f98a5113bf7635e47457c52670 grub-0.9
 MD5 80623fad414fd78bb04b0479b94d76df grub-0.96-r3.ebuild 4577
 RMD160 4a1ac26fd3cce98617883b620255761b98cc8deb grub-0.96-r3.ebuild 4577
 SHA256 bbd95b515988ee477725067b1778d0c39665bdce66e61f2e7a9e374a425ac53c grub-0.96-r3.ebuild 4577
-MD5 92f2ce4770ef511ed34a16bc7e6e543a grub-0.97-r2.ebuild 4385
-RMD160 a1218375cceaf09ba6605054f288314bf1edef93 grub-0.97-r2.ebuild 4385
-SHA256 ad9cd0bed21a225f962c745c5543c426ac40d00db9051efd2047ee4af591da92 grub-0.97-r2.ebuild 4385
+MD5 183868e62715082372b5732094c25bc0 grub-0.97-r2.ebuild 4388
+RMD160 5cae654d28fef5ee64e96b03978bfa75ec24a79d grub-0.97-r2.ebuild 4388
+SHA256 3c45354c91ad357b31db984922b7a3b5252786ff0ee1838c5b92b1f9a54ddef4 grub-0.97-r2.ebuild 4388
 MD5 98aac6dc17a7d909ca1de859ef1394a2 grub-0.97.ebuild 4518
 RMD160 d03dba427b2b040e2b741776a849c4f030793af2 grub-0.97.ebuild 4518
 SHA256 7e8e3cd6a5e43507955850ae5d33aaecfb853d8573e54aca5b75b63de7bf48e6 grub-0.97.ebuild 4518
@@ -52,3 +55,10 @@ SHA256 ef76ea505d1dcafe4c042b937201cd31b01bf4a7572b9644059184976fcf145b grub-1.9
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEIMdM2+ySkm8kpY0RAo3XAJ4ny/Jt0nQkQDKoiTEQfA7mg9Y5IgCgnuyy
+dl61MMfAqhA0SoHD5fxv4Ms=
+=DYFI
+-----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/files/digest-grub-0.97-r2 b/sys-boot/grub/files/digest-grub-0.97-r2
index 98095e9bed82..b53dc9d03d15 100644
--- a/sys-boot/grub/files/digest-grub-0.97-r2
+++ b/sys-boot/grub/files/digest-grub-0.97-r2
@@ -1,3 +1,9 @@
-MD5 5948981cb9b4c0397d03a230af995263 grub-0.97-patches-1.1.tar.bz2 20407
+MD5 6bb56aebcb3add62a725f0137cebc9df grub-0.97-patches-1.2.tar.bz2 20872
+RMD160 7d91e01873f52daad271eda85e67f031e72570c9 grub-0.97-patches-1.2.tar.bz2 20872
+SHA256 0a41e076ce1c1dd92b4eaac2905ebd5624162b5258ed0cb234889fa8beb38049 grub-0.97-patches-1.2.tar.bz2 20872
 MD5 cd3f3eb54446be6003156158d51f4884 grub-0.97.tar.gz 971783
+RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 grub-0.97.tar.gz 971783
+SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b grub-0.97.tar.gz 971783
 MD5 cdd6c89d48982ecd544c0b4774755afd splash.xpm.gz 33856
+RMD160 2fead61f91c368429e80936248bb02af2bdf15ff splash.xpm.gz 33856
+SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf splash.xpm.gz 33856
diff --git a/sys-boot/grub/grub-0.97-r2.ebuild b/sys-boot/grub/grub-0.97-r2.ebuild
index 3d91ba58157e..2c9c23e88895 100644
--- a/sys-boot/grub/grub-0.97-r2.ebuild
+++ b/sys-boot/grub/grub-0.97-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild,v 1.4 2006/02/05 14:44:52 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild,v 1.5 2006/03/22 03:40:08 vapier Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
-PATCHVER=1.1
+PATCHVER="1.2"
 DESCRIPTION="GNU GRUB Legacy boot loader"
 HOMEPAGE="http://www.gnu.org/software/grub/"
 SRC_URI="mirror://gentoo/${P}.tar.gz