Simplify efi-32/64 logic a bit.

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

4 files changed, 45 insertions, 45 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index bcb25d1bf0c7..a73f60a4291a 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # 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.185 2012/03/07 04:01:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.186 2012/03/08 05:28:57 floppym Exp $
+
+  08 Mar 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00_beta1.ebuild,
+  grub-9999.ebuild:
+  Simplify efi-32/64 logic a bit.
 
 *grub-2.00_beta1 (07 Mar 2012)
 
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index a9764da2db45..066b73f84e82 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -45,14 +45,14 @@ EBUILD grub-0.97-r9.ebuild 9044 RMD160 4c4de37d7e995920f065eb2952226401a90af015
 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 5993 RMD160 88832dcfd48236a47039c12c89c0099f2033b1de SHA1 9453ac5ec45265ddf5be0003e4e858757f00f6de SHA256 ff8d30de025e10e061f47097d502501e628c146ea2ce8d91b2b1bbf04ffb52ef
-EBUILD grub-2.00_beta1.ebuild 5993 RMD160 e5029160b4467e3fccc793aa69fbec54c7987bb4 SHA1 b6e2b452414fc05e52dd6c1ffcb3470f10ba4b9a SHA256 364c29dcff037120656b006652dfaa648dfa865e935a6f346c5f80b82f86d0f2
-EBUILD grub-9999.ebuild 5988 RMD160 203185fdf7c8494f3147d215dcb0079159ebf9cb SHA1 c64718374b9ea92e9bf572c95289bac0d7bc2596 SHA256 cbfa5d7e76e8b223339e0d2c1e80da0fa315ea7cac7de9c8422972519c506bf1
-MISC ChangeLog 37798 RMD160 82059f03c6f2ade89d6223d247b368abc8297150 SHA1 eaf4f82c55e34a4c29355be42c219efb381cfc0c SHA256 82047afe8c0f9e559910137d15393a8976bb5a97641fe39e4b0a34527bf15cea
+EBUILD grub-2.00_beta1.ebuild 5838 RMD160 9733992bdcf058fd79d3ae9ddf56401b819645b3 SHA1 6129f11c5bda3eb164fa1ba907d122f8986c717f SHA256 a4d8f7f9771b5316afcb46a43c62352fb9a1561997ce4ffb51af7769a25e9e9a
+EBUILD grub-9999.ebuild 5833 RMD160 f18fc7601f66e24a2c7182a2bc301335bfd5a853 SHA1 263a51f2568d167ed84d565468e10ab8567f53e9 SHA256 b5515f5f132d0f7c0a0c04cf873f3ade91d1519b7a30af5172f232a0df3b6531
+MISC ChangeLog 37926 RMD160 4cbdd3df4ff84e28c8d543946d5fd760c48ce8fb SHA1 bd0243a19cfdb7d37dbc181c590361fcb6ca92ea SHA256 18f6c8bf4f0edc1665f65388871f2496d95d1d3325279fd125abcc0a55753395
 MISC metadata.xml 673 RMD160 2181a768c776eed3e76c3604a2a0c03be360aa06 SHA1 0434ff5fb3b8702ca4a4661240ed08cfb06c529c SHA256 e14e5e46b726a3645b85217a2afbd5b04adb54990c7db837e01a50a8322d81b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9W3agACgkQC77qH+pIQ6SQwAEAnawXkwE4J/ymdCXVHDJKN09w
-ZvIQmNCRBtNYvgeaehoBAMeWdkLxFozxNWYZyXYYSGrHJvjPH/4sFCmIrZUjhSQZ
-=KxfD
+iF4EAREIAAYFAk9YQ6AACgkQC77qH+pIQ6TNSAEAvHzE95iMirIzoX3ufF3t85S/
+16MTM5TTW1s5bgM+eCQA/3X3zwMNSWhU71JRQmtV56lb0zrPfru9nTgNoULlcIIv
+=4O3r
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-2.00_beta1.ebuild b/sys-boot/grub/grub-2.00_beta1.ebuild
index bc467f9297a4..556c885e6213 100644
--- a/sys-boot/grub/grub-2.00_beta1.ebuild
+++ b/sys-boot/grub/grub-2.00_beta1.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_beta1.ebuild,v 1.1 2012/03/07 04:01:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_beta1.ebuild,v 1.2 2012/03/08 05:28:57 floppym Exp $
 
 EAPI=4
 
@@ -42,7 +42,7 @@ GRUB_PLATFORMS=(
 	ieee1275
 	# amd64, x86:
 	coreboot multiboot efi-32 pc qemu
-	# amd64:
+	# amd64, ia64:
 	efi-64
 )
 IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}"
@@ -117,33 +117,32 @@ grub_run_phase() {
 
 grub_src_configure() {
 	local platform=$1
-	local target
-	local with_platform
+	local target=
+	local with_platform=
 
 	[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
 
 	# check if we have to specify the target (EFI)
 	# or just append correct --with-platform
-	if [[ ${platform} == efi* ]]; then
-		# EFI platform hack
-		[[ ${platform/*-} == 32 ]] && target=i386
-		[[ ${platform/*-} == 64 ]] && target=x86_64
-		# program-prefix is required empty because otherwise it is equal to
-		# target variable, which we do not want at all
-		with_platform="
-			--with-platform=${platform/-*}
-			--target=${target}
-			--program-prefix=
-		"
-	elif [[ ${platform} != "guessed" ]]; then
-		with_platform=" --with-platform=${platform}"
+	if [[ ${platform} == efi-32 ]]; then
+		# Build 32-bit EFI on 64-bit system
+		target="--target=i386"
 	fi
 
+	case ${platform} in
+		efi-*) with_platform="--with-platform=${platform%-*}" ;;
+		guessed) ;;
+		*) with_platform="--with-platform=${platform}" ;;
+	esac
+			
 	ECONF_SOURCE="${S}" \
 	econf \
 		--disable-werror \
+		--program-prefix= \
 		--program-transform-name="s,grub,grub2," \
 		--with-grubdir=grub2 \
+		${target} \
+		${with_platform} \
 		$(use_enable debug mm-debug) \
 		$(use_enable debug grub-emu-usb) \
 		$(use_enable device-mapper) \
@@ -152,8 +151,7 @@ grub_src_configure() {
 		$(use_enable nls) \
 		$(use_enable truetype grub-mkfont) \
 		$(use_enable libzfs) \
-		$(use sdl && use_enable debug grub-emu-sdl) \
-		${with_platform}
+		$(use sdl && use_enable debug grub-emu-sdl)
 }
 
 grub_src_compile() {
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index f4a6bceb5af3..bc086a48f59e 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.55 2012/03/06 01:35:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.56 2012/03/08 05:28:57 floppym Exp $
 
 EAPI=4
 
@@ -42,7 +42,7 @@ GRUB_PLATFORMS=(
 	ieee1275
 	# amd64, x86:
 	coreboot multiboot efi-32 pc qemu
-	# amd64:
+	# amd64, ia64:
 	efi-64
 )
 IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}"
@@ -117,33 +117,32 @@ grub_run_phase() {
 
 grub_src_configure() {
 	local platform=$1
-	local target
-	local with_platform
+	local target=
+	local with_platform=
 
 	[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
 
 	# check if we have to specify the target (EFI)
 	# or just append correct --with-platform
-	if [[ ${platform} == efi* ]]; then
-		# EFI platform hack
-		[[ ${platform/*-} == 32 ]] && target=i386
-		[[ ${platform/*-} == 64 ]] && target=x86_64
-		# program-prefix is required empty because otherwise it is equal to
-		# target variable, which we do not want at all
-		with_platform="
-			--with-platform=${platform/-*}
-			--target=${target}
-			--program-prefix=
-		"
-	elif [[ ${platform} != "guessed" ]]; then
-		with_platform=" --with-platform=${platform}"
+	if [[ ${platform} == efi-32 ]]; then
+		# Build 32-bit EFI on 64-bit system
+		target="--target=i386"
 	fi
 
+	case ${platform} in
+		efi-*) with_platform="--with-platform=${platform%-*}" ;;
+		guessed) ;;
+		*) with_platform="--with-platform=${platform}" ;;
+	esac
+			
 	ECONF_SOURCE="${S}" \
 	econf \
 		--disable-werror \
+		--program-prefix= \
 		--program-transform-name="s,grub,grub2," \
 		--with-grubdir=grub2 \
+		${target} \
+		${with_platform} \
 		$(use_enable debug mm-debug) \
 		$(use_enable debug grub-emu-usb) \
 		$(use_enable device-mapper) \
@@ -152,8 +151,7 @@ grub_src_configure() {
 		$(use_enable nls) \
 		$(use_enable truetype grub-mkfont) \
 		$(use_enable libzfs) \
-		$(use sdl && use_enable debug grub-emu-sdl) \
-		${with_platform}
+		$(use sdl && use_enable debug grub-emu-sdl)
 }
 
 grub_src_compile() {