Replace 10_linux patch with the changeset from upstream.

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

4 files changed, 23 insertions, 19 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 9a83845e894d..f6be54f29f8a 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,12 @@
 # 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.198 2012/04/11 19:49:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.199 2012/04/26 00:08:27 floppym Exp $
+
+*grub-2.00_beta3-r2 (26 Apr 2012)
+
+  26 Apr 2012; Mike Gilbert <floppym@gentoo.org> +grub-2.00_beta3-r2.ebuild,
+  -grub-2.00_beta3-r1.ebuild, files/grub-2.00-10_linux-genkernel.patch:
+  Replace 10_linux patch with the changeset from upstream.
 
   11 Apr 2012; Mike Gilbert <floppym@gentoo.org>
   files/grub-2.00-10_linux-genkernel.patch:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index f186262323fa..048cb6c76968 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -7,7 +7,7 @@ AUX 1.99-improve_devmapper.patch 7134 RMD160 a8dbf91626c607f5fec85235a2042b7e82f
 AUX 1.99-stat_root_device_properly-p1.patch 698 RMD160 f28b945c2342a2a95e67357c5387cadf16d8e34f SHA1 3872ccd325e8f4f4693984f0abf26b935c475dae SHA256 1facf84e5195eb98b390e43e0a0d6f791e9500ef678b025e95f96d5a2769da5a
 AUX 1.99-stat_root_device_properly-p2.patch 621 RMD160 2b52c8cbddf95def3fcc77ec8a2cb3524891fd1e SHA1 280dafa0d0c93905a850b17e9a9f09cea1357a05 SHA256 431876459562c0aae6e854a97eeaf0cacdad8ceb5477788a4d691e4e6fa613eb
 AUX grub-0.97-gpt.patch 10682 RMD160 53dd38d52f2b38fb28dfb670d6fd27e47a562bbb SHA1 6057a076110d469fb63e56e57711d281221f9b42 SHA256 5e38046cfb727420e5b4b19d71c7fb4ddff22cbcc356c9f888763b0c1963d389
-AUX grub-2.00-10_linux-genkernel.patch 1230 RMD160 aec271655fdd6b8301509b0d905017953aa72746 SHA1 c941de241cb9a5de05872a24eacae495281951a2 SHA256 40925a74ab63de6d58404eec27d40f06ad0be2de9803bafbf68427bf3185bf5f
+AUX grub-2.00-10_linux-genkernel.patch 1114 RMD160 0c0ea6a911ff014786245e30a7c0210d0738db4d SHA1 04d97223bcdba4baf0e5f5c1dce6f1db8c8dbdbb SHA256 32d72554b90c07dae8331392e9d665c5b2ab9ae19f303abbd852e38189eb35cb
 AUX grub.conf.gentoo 627 RMD160 d90fb4373bad476f98ec9c5065d6cdfd9e3b706f SHA1 004f2fc04605ec9190de0a87e7df8bbc33daff89 SHA256 914b15af252210a32776196437cd8013e10e57d5780e66877ef3fe9a2b4b9776
 AUX grub.default 1254 RMD160 06e05de60133cc1e31769c6106031fe59de46053 SHA1 4fc3138fe313707bfdd307d4538bfc98c14c4cbc SHA256 181bdb7433ebcbde635e7058a1febaf0100e4e9c83ea4fd222d7010c375882d8
 DIST grub-0.92-gentoo-0.2.tar.bz2 21727 RMD160 f420e3352d46fdfb77a1121879382265805bc3ef SHA1 1bb1463067679aab909d1bd96996cfa72556de81 SHA256 f579b49b2d24702905c333ce2b6170a554ce26d0232c65478a21a1fd2eb8b8fe
@@ -51,15 +51,15 @@ EBUILD grub-2.00_beta0.ebuild 5993 RMD160 88832dcfd48236a47039c12c89c0099f2033b1
 EBUILD grub-2.00_beta1.ebuild 5837 RMD160 7269e69d2c57d79f3299dded2b9ac26c9c625e10 SHA1 d3b629db5ae54b3f8e9e168bcca51949e54a6136 SHA256 9b159e68d77c414e5b8e131ab3b18fe009e116ec78a7721a267f1ddd0bf91db9
 EBUILD grub-2.00_beta2-r1.ebuild 6572 RMD160 358eced67e79b91738abfb362b3920cd3b17d38e SHA1 7d51a484673ea6028c8a36b3048c82b379f4f9ba SHA256 9711a3d05e4f0e0a6bf5a83aef3995b356ac5ffc5d4a0d47f1c0eddbe6f919a9
 EBUILD grub-2.00_beta2.ebuild 6476 RMD160 43557ca6eb3e61f66fe4d8c2977d9ac1e4db2d96 SHA1 0d7d68e9869b646275d28e1acd3badbe80b33559 SHA256 d60330fd91721d586fe4254bbaa02add8accc2ea729fff1c376aa544ed4f96ca
-EBUILD grub-2.00_beta3-r1.ebuild 6548 RMD160 780668a6a07b2cb7d816285e20121540b2c15bfc SHA1 24ff5a9cfc326119a8b0e5f9aea0ca64ee87a431 SHA256 cb7b903bd1f622a7932c81134bfe5dd22b65ca14df45589ae9f1c46d7386a298
+EBUILD grub-2.00_beta3-r2.ebuild 6548 RMD160 8d5807262ea874de346d7873d288fdb1bb76ea07 SHA1 8e43e30db54a396d969bdcaa08ee4516115a23c3 SHA256 2357a4752d32b52a10166fe8a2020dc59daa2d357de6d0ad2e2cb669c2c3cecd
 EBUILD grub-2.00_beta3.ebuild 6488 RMD160 d0cbccc50d81e7b6e70c27c5309c2faec2ff3b44 SHA1 a2c074dcd6c535fb66a0ffb189dcf00394528772 SHA256 d39abf04dc1d6b4e03511647c3585ab8950b5778ec3a1fe0fe87de615b334477
 EBUILD grub-9999.ebuild 6483 RMD160 e78941b0073f0e6b56a20204f6d0a2a4fe4c2dc7 SHA1 4418bed8d78df76cfef1ae589e8e698ae97ae99f SHA256 628e3a6a3b57fdc776dcc4dd40f4c3352915779070810fd326800c23d6702fd4
-MISC ChangeLog 39583 RMD160 cd3a315c9e5a77452649df7a36b8c358d50e8fbf SHA1 742297866b6b8d38044f5480ed3fd38a76da1e24 SHA256 5296014f2370ec728069bcb5f0c67a67240b36f04525c7dd467733c066360b1d
+MISC ChangeLog 39827 RMD160 72797e464c878e3f9365f62363bc427b138f2816 SHA1 7fd8fb36597ab8654fd0e28e3a1b47ab49d8f680 SHA256 79ab0317d8ef9e31e0be6ef6b371f227320bb3af27569b0b3d47e56fb0289ca2
 MISC metadata.xml 673 RMD160 2181a768c776eed3e76c3604a2a0c03be360aa06 SHA1 0434ff5fb3b8702ca4a4661240ed08cfb06c529c SHA256 e14e5e46b726a3645b85217a2afbd5b04adb54990c7db837e01a50a8322d81b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk+F4EwACgkQC77qH+pIQ6TVqAD/VsS+5qmW4sdE7vUFH/oDocgd
-XZsVmymiZoZt8QAPzqIBALPN5B5mjgeotLP5pqeLRsFY3aEcBwGBLcWakWdQSdK2
-=ZIna
+iF4EAREIAAYFAk+YkgEACgkQC77qH+pIQ6SozQEAi4ohFzYZARg40Oj2huhK6clP
+2WijOtuTEY4UN3FzmLkA/R4mO6a1zPJYia8YFSL/KvuuRZTN+ocMoC1nrRCFS1fo
+=TAGo
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch b/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch
index d2f55761a1b2..590c6958cf2b 100644
--- a/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch
+++ b/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch
@@ -1,6 +1,5 @@
-=== modified file 'util/grub.d/10_linux.in'
---- util/grub.d/10_linux.in	2012-03-10 14:21:25 +0000
-+++ util/grub.d/10_linux.in	2012-04-11 19:26:45 +0000
+--- util/grub.d/10_linux.in
++++ util/grub.d/10_linux.in
 @@ -150,7 +150,8 @@
  EOF
  }
@@ -11,28 +10,27 @@
      xi?86 | xx86_64)
  	list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
                    if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
-@@ -161,6 +162,15 @@
+@@ -161,6 +162,14 @@
  	     done` ;;
  esac
  
-+if test "x${GENKERNEL_ARCH-unset}" = xunset; then
-+  case "$machine" in
++case "$machine" in
 +    i?86) GENKERNEL_ARCH="x86" ;;
 +    mips|mips64) GENKERNEL_ARCH="mips" ;;
++    mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;;
 +    arm*) GENKERNEL_ARCH="arm" ;;
 +    *) GENKERNEL_ARCH="$machine" ;;
-+  esac
-+fi
++esac
 +
  prepare_boot_cache=
  prepare_root_cache=
  boot_device_id=
-@@ -186,8 +196,8 @@
- 	   "initrd-${version}" "initramfs-${version}.img" \
+@@ -187,7 +196,9 @@
  	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
  	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
--	   "initramfs-genkernel-${version}" \
+ 	   "initramfs-genkernel-${version}" \
 -	   "initramfs-genkernel-${alt_version}"; do
++	   "initramfs-genkernel-${alt_version}" \
 +	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
 +	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
      if test -e "${dirname}/${i}" ; then
diff --git a/sys-boot/grub/grub-2.00_beta3-r1.ebuild b/sys-boot/grub/grub-2.00_beta3-r2.ebuild
index cc440f0b832b..b9711ad418f5 100644
--- a/sys-boot/grub/grub-2.00_beta3-r1.ebuild
+++ b/sys-boot/grub/grub-2.00_beta3-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-2.00_beta3-r1.ebuild,v 1.1 2012/04/07 21:33:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_beta3-r2.ebuild,v 1.1 2012/04/26 00:08:27 floppym Exp $
 
 EAPI=4