Simplify GRUB_PLATFORMS handling, and move masking here.

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

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index e017e83907e970675f08f457041b7e85e729d5fa..779a557eebe12d94ca62e8afa5cdf4f499cf2076 100644 (file)
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.172 2011/11/11 13:42:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.173 2011/11/18 00:04:29 vapier Exp $
+
+  18 Nov 2011; Mike Frysinger <vapier@gentoo.org> grub-1.99-r2.ebuild,
+  grub-9999.ebuild:
+  Simplify GRUB_PLATFORMS handling, and move masking here.
 
   11 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org> grub-1.99-r2.ebuild,
   grub-9999.ebuild:

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 5d928baf238be9672ddf751709289df8c0f0f465..15cd4e7932ea7db5c15320a33a7cda388ee54f51 100644 (file)
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 1.99-call_proper_grub_probe.patch 536 RMD160 28e914f6ef8e2d9eb73316fa8e5d29b6541d806f SHA1 91237ebbe574baf48d05302c01422c0f0b5c8b49 SHA256 0e27b4ba6a0deedef2f65822e3b76aea4a817cb7219b01c29c8f682c450bd5e8
 AUX 1.99-do_not_stat_so_often.patch 1731 RMD160 ed04af18876c27ca6a85d627d2082a773add19c8 SHA1 ee1936e26f2a3f564195385465752ccee7d29713 SHA256 a33fdbcab7fa4ad66b26598d9a6f1703f419229058c1e9c9c14edb6272783727
@@ -41,14 +41,14 @@ EBUILD grub-0.97-r6.ebuild 8801 RMD160 3da0ba7ea62758c9fd352f7290b441c3e9f08fb6
 EBUILD grub-0.97-r8.ebuild 8941 RMD160 4caee80e02de14e6a88a3ab016df32f90c258f09 SHA1 be1f73938f4763cf6413afee97062abb8666ffbb SHA256 5876009e82e6556be90d2355defd3039d244f5a53313ba29ce937e9c14e169ff
 EBUILD grub-0.97-r9.ebuild 9045 RMD160 5db30743506d7ae274695a94bd1c7c5fea8003e2 SHA1 4796cd56c8e77239719bd31a0542b11129e7922f SHA256 153939f732549503f08dd2acff27325b3e398ffc065e16c1749281c6c66a97d5
 EBUILD grub-0.97.ebuild 4494 RMD160 f798b7101af90add6d45725e34aeb7f219e0b748 SHA1 fbb215b293127635ba41e7fa952518e5e07f118a SHA256 d08c03989b1cd6ad91fa2e1a098e0230994570472d0f11a6d926e21e06071c58
-EBUILD grub-1.99-r2.ebuild 8351 RMD160 66d660d94ec8069ca9e2b87b8a595398e2dc03b5 SHA1 5a6c5d46d0e141bbc0f1d14bf063b66a92926ff9 SHA256 760f69c25452c6aa78f8a15c8fa16e919bb25e853d1153b5ddea26360373b838
-EBUILD grub-9999.ebuild 8136 RMD160 dae76a20776c0e141eadb59b41a1c8957d63ce01 SHA1 0d3435fc39803b847fedbac145f5992f4fcd513c SHA256 91ce3a766baef16330d04b339646df40d9ea29819e622980480f85f8adf749e1
-MISC ChangeLog 35228 RMD160 8c29c385417a34d534cb2ad619ee9557581bcd23 SHA1 322cbba35400f1c4066b02017fc2645649f7277d SHA256 df16bf18631eaa09da427831be7bce8d97b7c0d5ae89e32a91d895c66cb0c7e8
+EBUILD grub-1.99-r2.ebuild 8295 RMD160 40fe549f40388e979d7028b7cdb59a84f6858fd4 SHA1 7f2d2b04f480249432426ed17d7afc8606964d29 SHA256 b26f203af5c7ed37b3a4bb74007f66b520883870d26bdb3859fc721d07e346de
+EBUILD grub-9999.ebuild 8080 RMD160 32d81ab52b8cc94a310e26313ed5b7a01062a27c SHA1 6a24c73c0321cbd39725f572993b943196c60bb2 SHA256 b77cdc20e20a1cc58deab002c795f94325150e3c1ddee2012cb14be59e0765bc
+MISC ChangeLog 35376 RMD160 8f5042cfda4505e49f8e0576ea27ec8e2ee01f83 SHA1 bfc76445427063bbb168d8558c1f3b324955bd66 SHA256 a68218882edd3399fcd11082ade29f3d047bc435a3b394cc8e8317aeaae3e472
 MISC metadata.xml 339 RMD160 755d01714b2122044f91caa8edd71b0ee4436d8e SHA1 4383abb52e4eb0cbe5215f9b0d86f3977eeee674 SHA256 62efb79ff5e2adec3535622af752bbb291b5b6c130094447364c567a5ff2e1ca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk69JiIACgkQAiZjviIA2XgovACg5C29vk/KWfxtYgGr8LP8Tg8k
-PnsAoO30lJA4uwcShM2Ev/YOEMFSilJ5
-=ft//
+iF4EAREIAAYFAk7FoRYACgkQaC/OocHi7JZPGAD+MleFOEWa3A4QEW/IwfpU5/M/
+RB8W92ijU0BpNOLA5CoA/1HYc18O6TXlCNPCXLTljRTCSSqppu+kS7Z7SHvErXjo
+=sYPG
 -----END PGP SIGNATURE-----

diff --git a/sys-boot/grub/grub-1.99-r2.ebuild b/sys-boot/grub/grub-1.99-r2.ebuild
index d897605e25235a338ec8a056f2c2787234ff0de0..9a542a503fc33f0339edd77f9008f8abecb1ba97 100644 (file)
--- a/sys-boot/grub/grub-1.99-r2.ebuild
+++ b/sys-boot/grub/grub-1.99-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.7 2011/11/11 13:42:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.8 2011/11/18 00:04:29 vapier Exp $
 
 EAPI=4
 
@@ -13,6 +13,9 @@ else
        MY_P=${P/_/\~}
        SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
                mirror://gentoo/${MY_P}.tar.xz"
+       # Masked until documentation guys consolidate the guide and approve
+       # it for usage.
+       #KEYWORDS="~amd64 ~mips ~x86"
        S=${WORKDIR}/${MY_P}
 fi
 
@@ -24,24 +27,21 @@ HOMEPAGE="http://www.gnu.org/software/grub/"
 
 LICENSE="GPL-3"
 SLOT="2"
-[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~mips ~x86"
 IUSE="custom-cflags debug device-mapper efiemu nls static sdl truetype"
 
-GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
-# everywhere:
-#     emu
-# mips only:
-#     qemu-mips, yeeloong
-# amd64, x86, ppc, ppc64
-#     ieee1275
-# amd64, x86
-#     coreboot, multiboot, efi-32, pc, qemu
-# amd64
-#     efi-64
-for i in ${GRUB_PLATFORMS}; do
-       IUSE+=" grub_platforms_${i}"
-done
-unset i
+GRUB_PLATFORMS=(
+       # everywhere:
+       emu
+       # mips only:
+       qemu-mips yeeloong
+       # amd64, x86, ppc, ppc64:
+       ieee1275
+       # amd64, x86:
+       coreboot multiboot efi-32 pc qemu
+       # amd64:
+       efi-64
+)
+IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}"
 
 # os-prober: Used on runtime to detect other OSes
 # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
@@ -192,7 +192,7 @@ src_prepare() {
 
        # get enabled platforms
        GRUB_ENABLED_PLATFORMS=""
-       for i in ${GRUB_PLATFORMS}; do
+       for i in ${GRUB_PLATFORMS[@]}; do
                use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
        done
        [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"

diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 4cb523da4a70e2755dab23ecae7fd5b97a290889..4fd344674e6edf5581bfc75bef3de04174b0e1c5 100644 (file)
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.46 2011/11/11 13:42:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.47 2011/11/18 00:04:29 vapier Exp $
 
 EAPI=4
 
@@ -13,6 +13,9 @@ else
        MY_P=${P/_/\~}
        SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
                mirror://gentoo/${MY_P}.tar.xz"
+       # Masked until documentation guys consolidate the guide and approve
+       # it for usage.
+       #KEYWORDS="~amd64 ~mips ~x86"
        S=${WORKDIR}/${MY_P}
 fi
 
@@ -24,24 +27,21 @@ HOMEPAGE="http://www.gnu.org/software/grub/"
 
 LICENSE="GPL-3"
 SLOT="2"
-[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~mips ~x86"
 IUSE="custom-cflags debug device-mapper efiemu nls static sdl truetype"
 
-GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips loongson"
-# everywhere:
-#     emu
-# mips only:
-#     qemu-mips, loongson
-# amd64, x86, ppc, ppc64
-#     ieee1275
-# amd64, x86
-#     coreboot, multiboot, efi-32, pc, qemu
-# amd64
-#     efi-64
-for i in ${GRUB_PLATFORMS}; do
-       IUSE+=" grub_platforms_${i}"
-done
-unset i
+GRUB_PLATFORMS=(
+       # everywhere:
+       emu
+       # mips only:
+       qemu-mips yeeloong
+       # amd64, x86, ppc, ppc64:
+       ieee1275
+       # amd64, x86:
+       coreboot multiboot efi-32 pc qemu
+       # amd64:
+       efi-64
+)
+IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}"
 
 # os-prober: Used on runtime to detect other OSes
 # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
@@ -188,7 +188,7 @@ src_prepare() {
 
        # get enabled platforms
        GRUB_ENABLED_PLATFORMS=""
-       for i in ${GRUB_PLATFORMS}; do
+       for i in ${GRUB_PLATFORMS[@]}; do
                use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
        done
        [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"