Don't use the platform to tranform the utility names; it's pointless. Users may need to specify the --target option if grub2-install fails to auto-detect it.

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

4 files changed, 17 insertions, 21 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 7ae493a6051b..0b807a987a5c 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.182 2012/03/04 21:23:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.183 2012/03/06 00:58:38 floppym Exp $
+
+  06 Mar 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00_beta0.ebuild,
+  grub-9999.ebuild:
+  Don't use the platform to tranform the utility names; it's pointless. Users
+  may need to specify the --target option if grub2-install fails to auto-detect
+  it.
 
   04 Mar 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00_beta0.ebuild,
   grub-9999.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 1b4e8d0fc214..cf8fd715c117 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -43,14 +43,14 @@ EBUILD grub-0.97-r8.ebuild 8940 RMD160 d72d0325c6f3ded81f5f2d5aaf7d1146c292cf15
 EBUILD grub-0.97-r9.ebuild 9044 RMD160 4c4de37d7e995920f065eb2952226401a90af015 SHA1 568454f7f89580bcaf4e8554a911c5999db0dd1d SHA256 9defe3f505229e14c91f53debc37175b533bf6816aa7fb3a699256f13ccf45f1
 EBUILD grub-0.97.ebuild 4238 RMD160 498e38af891b8e1a147356f4e1c97ca12c2a6429 SHA1 1bd9a4792eaca92500c0c40e9dedda8fead92c27 SHA256 d93dd5dca80c822e0659007b827966fb69c7f702b13ba672b4c3f486af54cee1
 EBUILD grub-1.99-r2.ebuild 8285 RMD160 2b6ae9f59dda41f0893438c9c03e7ad9b0c2e7d9 SHA1 8aaae86ab3ae0092e3c343e7fd1fd58d0d19dac3 SHA256 783fad22b5cae394862725d5eaeed80ad7a26dcce833f65fed0b3135858ae171
-EBUILD grub-2.00_beta0.ebuild 5994 RMD160 eb5e17bb6d9173a099ac79c71b60ff632862d122 SHA1 515966f07f3138720e318606c628af046e7e5081 SHA256 99d36e0711343bd34760f1814f5fa0427329e08836db011891a3048fc2c8b321
-EBUILD grub-9999.ebuild 5989 RMD160 e3bcdf69588112cc3d479e2de9fbd246d12460f3 SHA1 721b04e2b924142f247342590b91395bdb0e24cd SHA256 241631a49022ac884298682f0104daf8c8ad4d3f9aaeb291710fe45ba88e599f
-MISC ChangeLog 37272 RMD160 eccbe9a8240beac6e0ab6cf7ea8321ffd5b5fab8 SHA1 85978e9b887c36b3da08b52215e60329cd0cef16 SHA256 38bcad3c54d51b35f5954e02868fe63d061fe53051cc5f9ba8deaefdbed951ae
+EBUILD grub-2.00_beta0.ebuild 5884 RMD160 9fa3cf0aff50e9481db264ab863717f1dbc7c505 SHA1 69db999b658909667f0e44e834ac682d53a5310a SHA256 944684f16a6e7417053de2f79325e819b9ccd4d41118fa20e5e4ce5b3fb7ad66
+EBUILD grub-9999.ebuild 5879 RMD160 ec3f36fb4cba0d03f49d0000a05c6ec635e5f70f SHA1 3c478d9491a4d3f350529c7f927b247e48b52bfe SHA256 3597ad59cb32016cf97068f7c319f12ea9bee77ff7be30df52528c9029806ebd
+MISC ChangeLog 37530 RMD160 4995a19405726720b4ef56ea7fa1a8dcd8ab99da SHA1 39705d6f6670b4f3529de72e7dac3b205ebbcec9 SHA256 2c9b8a0240ee0c0c991c0196c329c358fca5b1585b4e4225e11a8a79aa20732d
 MISC metadata.xml 673 RMD160 2181a768c776eed3e76c3604a2a0c03be360aa06 SHA1 0434ff5fb3b8702ca4a4661240ed08cfb06c529c SHA256 e14e5e46b726a3645b85217a2afbd5b04adb54990c7db837e01a50a8322d81b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9T3WAACgkQC77qH+pIQ6RgKAD/RWIcCwBBrt84WHs4ZCRDT3JU
-fnQX7ywKTh07+f/lOyUA/A5cMe17XgMPvicHlhEq8I+XxFniFYuf6/XlDT5w+VB7
-=BS8X
+iF4EAREIAAYFAk9VYUUACgkQC77qH+pIQ6SyvwD/R8OSkrv8Sg3UjV4Ju8Hf4y7m
+Af97f240ol9pM+j244sBALD+Y1qZgs7OxQcgYUpVplkj/P3z3F2m9PjAW+V05rdi
+=As3e
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-2.00_beta0.ebuild b/sys-boot/grub/grub-2.00_beta0.ebuild
index 832646c7752b..d5a0fe21449c 100644
--- a/sys-boot/grub/grub-2.00_beta0.ebuild
+++ b/sys-boot/grub/grub-2.00_beta0.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_beta0.ebuild,v 1.4 2012/03/04 21:23:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_beta0.ebuild,v 1.5 2012/03/06 00:58:38 floppym Exp $
 
 EAPI=4
 
@@ -114,15 +114,10 @@ grub_run_phase() {
 grub_src_configure() {
 	local platform=$1
 	local target
-	local transform="grub2"
 	local with_platform
 
 	[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
 
-	if [[ ${platform} != "guessed" ]]; then
-		transform="grub2-${platform}"
-	fi
-
 	# check if we have to specify the target (EFI)
 	# or just append correct --with-platform
 	if [[ ${platform} == efi* ]]; then
@@ -143,7 +138,7 @@ grub_src_configure() {
 	ECONF_SOURCE="${S}" \
 	econf \
 		--disable-werror \
-		--program-transform-name="s,grub,${transform}," \
+		--program-transform-name="s,grub,grub2," \
 		--with-grubdir=grub2 \
 		$(use_enable debug mm-debug) \
 		$(use_enable debug grub-emu-usb) \
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 1bd100c5b5e2..05dbd3209313 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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-9999.ebuild,v 1.53 2012/03/04 21:23:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.54 2012/03/06 00:58:38 floppym Exp $
 
 EAPI=4
 
@@ -114,15 +114,10 @@ grub_run_phase() {
 grub_src_configure() {
 	local platform=$1
 	local target
-	local transform="grub2"
 	local with_platform
 
 	[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
 
-	if [[ ${platform} != "guessed" ]]; then
-		transform="grub2-${platform}"
-	fi
-
 	# check if we have to specify the target (EFI)
 	# or just append correct --with-platform
 	if [[ ${platform} == efi* ]]; then
@@ -143,7 +138,7 @@ grub_src_configure() {
 	ECONF_SOURCE="${S}" \
 	econf \
 		--disable-werror \
-		--program-transform-name="s,grub,${transform}," \
+		--program-transform-name="s,grub,grub2," \
 		--with-grubdir=grub2 \
 		$(use_enable debug mm-debug) \
 		$(use_enable debug grub-emu-usb) \