From: Mike Gilbert <floppym@gentoo.org>
Date: Wed, 29 Jun 2016 02:26:39 +0000 (-0400)
Subject: Revert "sys-boot/grub: populate MULTIBUILD_VARIANTS in a more PMS-defined way"
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=57c5991e03570071692d111a0f0fe36bd4946b9a;p=gentoo.git

Revert "sys-boot/grub: populate MULTIBUILD_VARIANTS in a more PMS-defined way"

This reverts commit e1374135af76bf31a01ff4ecb6696d8bbe041f31.
---

diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
index 51efcb7db16d..edef1e750f30 100644
--- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild
+++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
@@ -219,19 +219,6 @@ grub_configure() {
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
-grub_get_platforms() {
-	MULTIBUILD_VARIANTS=()
-	local platform
-	for platform in "${GRUB_ALL_PLATFORMS[@]}"; do
-		if use "grub_platforms_${platform}"; then
-			MULTIBUILD_VARIANTS+=( "${platform}" )
-		fi
-	done
-	if (( ${#MULTIBUILD_VARIANTS[@]} == 0 )); then
-		MULTIBUILD_VARIANTS=( guessed )
-	fi
-}
-
 src_configure() {
 	# Bug 508758.
 	replace-flags -O3 -O2
@@ -253,7 +240,7 @@ src_configure() {
 	tc-export BUILD_CC # Bug 485592
 
 	# Portage will take care of cleaning up GRUB_PLATFORMS
-	grub_get_platforms
+	MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
 	grub_do grub_configure
 }
 
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild
index ad5762439cbb..9fe3b54b1ad7 100644
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999-r1.ebuild
@@ -220,19 +220,6 @@ grub_configure() {
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
-grub_get_platforms() {
-	MULTIBUILD_VARIANTS=()
-	local platform
-	for platform in "${GRUB_ALL_PLATFORMS[@]}"; do
-		if use "grub_platforms_${platform}"; then
-			MULTIBUILD_VARIANTS+=( "${platform}" )
-		fi
-	done
-	if (( ${#MULTIBUILD_VARIANTS[@]} == 0 )); then
-		MULTIBUILD_VARIANTS=( guessed )
-	fi
-}
-
 src_configure() {
 	# Bug 508758.
 	replace-flags -O3 -O2
@@ -254,7 +241,7 @@ src_configure() {
 	tc-export BUILD_CC # Bug 485592
 
 	# Portage will take care of cleaning up GRUB_PLATFORMS
-	grub_get_platforms
+	MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
 	grub_do grub_configure
 }