import grub stable from gentoo tree, drop our beta one

7 files changed, 87 insertions, 306 deletions

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index c1e73224..20b8b3c6 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,4 +1,3 @@
-DIST dejavu-sans-ttf-2.34.zip 406977 SHA256 242e8c1cb2bdc7458bece02cca898f962c2bc919dcf67d97428149228290184d SHA512 dcd802b9c83cfa749b7542d0855eb1facb665a035af8c05f58830fce3ce37ba8d4a6f0353c07ae924c7fc25460d330b7312cbaffd34a2cb314a8e222de385c1b WHIRLPOOL d8b3289997cc39aca1c909ac1cae79727a19932f07b116a4a0bcc83e4a2f136d05d18c8ef2b05504a2f1f65eba85f93d61d52b0c913be7bb3e23f6a403eb6a82
-DIST grub-2.02_beta2-gentoo-r3.tar.xz 14532 SHA256 78d14f27ed60458601021d13c247387dad324d4141ed46721e2e14f4a4fda990 SHA512 b46390c217e9a1f9fccbefbc5aab062c228919b9b7b6f16effd9d292534c516a28747376d85d5db8b7f883cf7e8c2aa0ca6573e8ed2913aadabbc1cd795fc861 WHIRLPOOL acb6d2e39e1670a4342e21e6d35ab390e36557512784a8ee0b5bda051ec5fb633061a28d2a2deab8c3d1961052db6c3870742ff866e292d8e4c0fd3c7a0acf45
-DIST grub-2.02~beta2.tar.xz 5798740 SHA256 f6c702b2a8ea58f27a2b02928bb77973cb5a827af08f63db38c471c0a01b418d SHA512 359903928febce1df53b3bd38aab701b4ea010dfad0dee434e853c865af4bbc60d115e61eac100c79f18d89aa78b2216ef20123f4ef04cc948ecbe226ea1a58c WHIRLPOOL f92e94f43888648484a972a0c82b0a2ac4dc7fbdd6e35ca8b11a6ee92168ac8cf7ee68987b84697ec46ad18189e5c5c9aee8105b91bb131cd7f6f499f45cd58f
-DIST unifont-7.0.06.pcf.gz 1359006 SHA256 acf516b464928244c25dd1afddd02f6f459686b5135685694d875d7eca8bf4f2 SHA512 a62f21366b51a582d2b5a66710c8a6183bc869407867da78e59ecec9dabcff7a2522a8bc454cf511592d336befea812d36622589ef119160fe3014d927fa11b3 WHIRLPOOL 9f431f9b6af23a87e3291e5c66d6f1e56f8c8ce23222821dbf41aa03edac4d80e8e6c5895c024951cf199d41904e6c9f830103427568a9b0386f68adc0a959d7
+DIST dejavu-sans-ttf-2.37.zip 417746 SHA256 5c6e497a2f36552cb5ffb112c413a6af39c0f3c47653662b90b4fa6499822fd7 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae WHIRLPOOL 6f19280e76ea3efe265db09236e94bdd00268c5d8742c191100b8eb19faa532289fb03d838e33aa3c501d8a3243db248648af8929d5d5dba1bfd2ea2c10358cd
+DIST grub-2.02.tar.xz 6113260 SHA256 810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088 WHIRLPOOL a7f5d786064642f926faa444b9db1555ccfbb460655f81a0ca408bc5ad2acfb89fe596f81d161078944ce1b2dc00e82e8fb056f050bf026fc07f6417af7b9776
+DIST unifont-9.0.06.pcf.gz 1360354 SHA256 6d23e82ea3fd3d79849d675c0c30129b62a3973a83b4cdc05f9994efef773b86 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774 WHIRLPOOL 3153fe2a254cffa5aac6c5915468262bf60f993ce5a2aa47885ccef2a6714e205724b01fd9d26d499b9efbc5213e3cea0037c91f17fb2ae780ee289cab0de69b
diff --git a/sys-boot/grub/files/2.02_beta3-10_linux-UUID.patch b/sys-boot/grub/files/2.02_beta3-10_linux-UUID.patch
deleted file mode 100644
index 1dcf3b5b..00000000
--- a/sys-boot/grub/files/2.02_beta3-10_linux-UUID.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ea8de5d2ee58178381e5809e4d5fe79861e61b04 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 5 Mar 2016 17:21:15 -0500
-Subject: [PATCH] [2.02] 10_linux: Fix grouping of tests for GRUB_DEVICE
-
-Commit 7290bb562 causes GRUB_DISABLE_LINUX_UUID to be ignored due to
-mixing of || and && operators. Add some parens to help with that.
----
- util/grub.d/10_linux.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 5a78513..de9044c 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -47,7 +47,7 @@ esac
- # and mounting btrfs requires user space scanning, so force UUID in this case.
- if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
-     || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
--    || test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm; then
-+    || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then
-   LINUX_ROOT_DEVICE=${GRUB_DEVICE}
- else
-   LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
--- 
-2.7.2
-
diff --git a/sys-boot/grub/files/CVE-2015-8370.patch b/sys-boot/grub/files/CVE-2015-8370.patch
deleted file mode 100644
index 69e419ee..00000000
--- a/sys-boot/grub/files/CVE-2015-8370.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 451d80e52d851432e109771bb8febafca7a5f1f2 Mon Sep 17 00:00:00 2001
-From: Hector Marco-Gisbert <hecmargi@upv.es>
-Date: Wed, 16 Dec 2015 07:57:18 +0300
-Subject: [PATCH] Fix security issue when reading username and password
-
-This patch fixes two integer underflows at:
-  * grub-core/lib/crypto.c
-  * grub-core/normal/auth.c
-
-CVE-2015-8370
-
-Signed-off-by: Hector Marco-Gisbert <hecmargi@upv.es>
-Signed-off-by: Ismael Ripoll-Ripoll <iripoll@disca.upv.es>
-Also-By: Andrey Borzenkov <arvidjaar@gmail.com>
----
- grub-core/lib/crypto.c  | 3 ++-
- grub-core/normal/auth.c | 7 +++++--
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c
-index 010e550..683a8aa 100644
---- a/grub-core/lib/crypto.c
-+++ b/grub-core/lib/crypto.c
-@@ -470,7 +470,8 @@ grub_password_get (char buf[], unsigned buf_size)
- 
-       if (key == '\b')
- 	{
--	  cur_len--;
-+	  if (cur_len)
-+	    cur_len--;
- 	  continue;
- 	}
- 
-diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c
-index c6bd96e..8615c48 100644
---- a/grub-core/normal/auth.c
-+++ b/grub-core/normal/auth.c
-@@ -174,8 +174,11 @@ grub_username_get (char buf[], unsigned buf_size)
- 
-       if (key == '\b')
- 	{
--	  cur_len--;
--	  grub_printf ("\b");
-+	  if (cur_len)
-+	    {
-+	      cur_len--;
-+	      grub_printf ("\b");
-+	    }
- 	  continue;
- 	}
- 
--- 
-2.6.4
-
diff --git a/sys-boot/grub/files/grub-2.00-freetype-2.5.1.patch b/sys-boot/grub/files/grub-2.00-freetype-2.5.1.patch
deleted file mode 100644
index 286830cc..00000000
--- a/sys-boot/grub/files/grub-2.00-freetype-2.5.1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit fd0df6d098b1e6a4f60275c48a3ec88d15ba1fbb
-Author: Colin Watson <cjwatson@ubuntu.com>
-Date:   Fri Nov 29 12:19:36 2013 +0000
-
-    Fix build with FreeType 2.5.1
-    
-    * util/grub-gen-asciih.c: Include FT_SYNTHESIS_H rather than
-    <freetype/ftsynth.h>, fixing build with FreeType 2.5.1.
-    * util/grub-gen-widthspec.c: Likewise.
-    * util/grub-mkfont.c: Likewise.
-
-diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
-index 0d8eb78..242dd01 100644
---- a/util/grub-mkfont.c
-+++ b/util/grub-mkfont.c
-@@ -43,7 +43,7 @@
- #include FT_FREETYPE_H
- #include FT_TRUETYPE_TAGS_H
- #include FT_TRUETYPE_TABLES_H
--#include <freetype/ftsynth.h>
-+#include FT_SYNTHESIS_H
- 
- #undef __FTERRORS_H__
- #define FT_ERROR_START_LIST   const char *ft_errmsgs[] = { 
diff --git a/sys-boot/grub/files/grub-2.02_beta2-libzfs.patch b/sys-boot/grub/files/grub-2.02_beta2-libzfs.patch
deleted file mode 100644
index d76a903c..00000000
--- a/sys-boot/grub/files/grub-2.02_beta2-libzfs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 6ba983559dcffa0fa69c7fc861b5a16b4877a92c
-Author: Mike Gilbert <floppym@gentoo.org>
-Date:   Sat Jan 18 19:41:15 2014 +0100
-
-    	* Makefile.util.def: Link grub-ofpathname with zfs libs.
-
-diff --git a/Makefile.util.def b/Makefile.util.def
-index 83df212..a286a89 100644
---- a/Makefile.util.def
-+++ b/Makefile.util.def
-@@ -384,7 +384,7 @@ program = {
-   ldadd = libgrubgcry.a;
-   ldadd = libgrubkern.a;
-   ldadd = grub-core/gnulib/libgnu.a;
--  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBGEOM)';
-+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
- };
- 
- program = {
diff --git a/sys-boot/grub/files/grub-2.02_beta2-lvm2-raid1.patch b/sys-boot/grub/files/grub-2.02_beta2-lvm2-raid1.patch
deleted file mode 100644
index 76c72a62..00000000
--- a/sys-boot/grub/files/grub-2.02_beta2-lvm2-raid1.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Andrei Borzenkov <arvidjaar@gmail.com>
-Date: Thu, 19 Mar 2015 18:30:27 +0000 (+0300)
-Subject: core: add LVM RAID1 support
-X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=grub.git;a=commitdiff_plain;h=527eeeeee6c8d3d8e3bb1fac408d47bb1dcbec95;hp=7c9309e50a124817e67de38b30c6291acecad560
-
-core: add LVM RAID1 support
-
-Closes 44534.
----
-
-diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
-index 1e7f197..9b97004 100644
---- a/grub-core/disk/lvm.c
-+++ b/grub-core/disk/lvm.c
-@@ -577,13 +577,17 @@ grub_lvm_detect (grub_disk_t disk,
- 		      if (is_pvmove)
- 			seg->node_count = 1;
- 		    }
--		  else if (grub_memcmp (p, "raid", sizeof ("raid") - 1)
--			   == 0 && (p[sizeof ("raid") - 1] >= '4'
--				    && p[sizeof ("raid") - 1] <= '6')
-+		  else if (grub_memcmp (p, "raid", sizeof ("raid") - 1) == 0
-+			   && ((p[sizeof ("raid") - 1] >= '4'
-+				&& p[sizeof ("raid") - 1] <= '6')
-+			       || p[sizeof ("raid") - 1] == '1')
- 			   && p[sizeof ("raidX") - 1] == '"')
- 		    {
- 		      switch (p[sizeof ("raid") - 1])
- 			{
-+			case '1':
-+			  seg->type = GRUB_DISKFILTER_MIRROR;
-+			  break;
- 			case '4':
- 			  seg->type = GRUB_DISKFILTER_RAID4;
- 			  seg->layout = GRUB_RAID_LAYOUT_LEFT_ASYMMETRIC;
-@@ -608,16 +612,18 @@ grub_lvm_detect (grub_disk_t disk,
- 			  goto lvs_segment_fail;
- 			}
- 
--		      seg->stripe_size = grub_lvm_getvalue (&p, "stripe_size = ");
--		      if (p == NULL)
-+		      if (seg->type != GRUB_DISKFILTER_MIRROR)
- 			{
-+			  seg->stripe_size = grub_lvm_getvalue (&p, "stripe_size = ");
-+			  if (p == NULL)
-+			    {
- #ifdef GRUB_UTIL
--			  grub_util_info ("unknown stripe_size\n");
-+			      grub_util_info ("unknown stripe_size\n");
- #endif
--			  goto lvs_segment_fail;
-+			      goto lvs_segment_fail;
-+			    }
- 			}
- 
--
- 		      seg->nodes = grub_zalloc (sizeof (seg->nodes[0])
- 						* seg->node_count);
- 
-@@ -625,7 +631,7 @@ grub_lvm_detect (grub_disk_t disk,
- 		      if (p == NULL)
- 			{
- #ifdef GRUB_UTIL
--			  grub_util_info ("unknown mirrors\n");
-+			  grub_util_info ("unknown raids\n");
- #endif
- 			  goto lvs_segment_fail2;
- 			}
diff --git a/sys-boot/grub/grub-2.02_beta2-r1704.ebuild b/sys-boot/grub/grub-2.02-r1706.ebuild
index 48b6fbfe..44db1517 100644
--- a/sys-boot/grub/grub-2.02_beta2-r1704.ebuild
+++ b/sys-boot/grub/grub-2.02-r1706.ebuild
@@ -1,40 +1,44 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
+EAPI=6
 
-AUTOTOOLS_AUTORECONF=1
-GRUB_AUTOGEN=1
+if [[ ${PV} == 9999  ]]; then
+	GRUB_AUTOGEN=1
+fi
 
 if [[ -n ${GRUB_AUTOGEN} ]]; then
-	PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-	inherit python-any-r1
+	PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+	WANT_LIBTOOL=none
+	inherit autotools python-any-r1
 fi
 
-inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator
+inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
 
 if [[ ${PV} != 9999 ]]; then
 	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
 		# The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
 		MY_P=${P/_/'~'}
-		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz
-			https://dev.gentoo.org/~floppym/dist/${P}-gentoo-r3.tar.xz"
+		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 	else
-		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-			https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
+		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 		S=${WORKDIR}/${P%_*}
 	fi
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~arm64 x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
 		http://git.savannah.gnu.org/r/grub.git"
 fi
 
-DEJAVU=dejavu-sans-ttf-2.34
-UNIFONT=unifont-7.0.06
+PATCHES=(
+	"${FILESDIR}"/gfxpayload.patch
+	"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+)
+
+DEJAVU=dejavu-sans-ttf-2.37
+UNIFONT=unifont-9.0.06
 SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
 	themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
 
@@ -44,9 +48,9 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
 # Includes licenses for dejavu and unifont
 LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
 SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs"
+IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
 
-GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen )
+GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 )
 IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
 
 REQUIRED_USE="
@@ -80,6 +84,7 @@ DEPEND="${RDEPEND}
 	sys-apps/texinfo
 	fonts? ( media-libs/freetype:2 )
 	grub_platforms_xen? ( app-emulation/xen-tools:= )
+	grub_platforms_xen-32? ( app-emulation/xen-tools:= )
 	static? (
 		app-arch/xz-utils[static-libs(+)]
 		truetype? (
@@ -89,8 +94,14 @@ DEPEND="${RDEPEND}
 		)
 	)
 	test? (
-		dev-libs/libisoburn
+		app-admin/genromfs
+		app-arch/cpio
+		app-arch/lzop
 		app-emulation/qemu
+		dev-libs/libisoburn
+		sys-apps/miscfiles
+		sys-block/parted
+		sys-fs/squashfs-tools
 	)
 	themes? (
 		app-arch/unzip
@@ -102,46 +113,27 @@ RDEPEND+="
 		grub_platforms_efi-32? ( sys-boot/efibootmgr )
 		grub_platforms_efi-64? ( sys-boot/efibootmgr )
 	)
-	!multislot? ( !sys-boot/grub:0 )
+	!multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
 	nls? ( sys-devel/gettext )
 "
 
 DEPEND+=" !!=media-libs/freetype-2.5.4"
 
-STRIP_MASK="*/grub/*/*.{mod,img}"
-RESTRICT="test"
-
-QA_EXECSTACK="
-	usr/bin/grub*-emu*
-	usr/lib*/grub/*/*.mod
-	usr/lib*/grub/*/*.module
-	usr/lib*/grub/*/kernel.exec
-	usr/lib*/grub/*/kernel.img
-"
+RESTRICT="strip !test? ( test )"
 
-QA_WX_LOAD="
-	usr/lib*/grub/*/kernel.exec
-	usr/lib*/grub/*/kernel.img
-	usr/lib*/grub/*/*.image
-"
-
-QA_PRESTRIPPED="
-	usr/lib.*/grub/.*/kernel.img
-"
+QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
+QA_WX_LOAD="usr/lib/grub/*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
 
 src_unpack() {
 	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
 	fi
-	default_src_unpack
+	default
 }
 
 src_prepare() {
-	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch
-
-	epatch "${FILESDIR}"/CVE-2015-8370.patch
-	epatch "${FILESDIR}"/${P}-lvm2-raid1.patch
-	epatch "${FILESDIR}"/${P}-KERNEL_GLOBS.patch
+	default
 
 	sed -i -e /autoreconf/d autogen.sh || die
 
@@ -150,45 +142,51 @@ src_prepare() {
 		sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
 	fi
 
-	epatch_user
+	# Nothing in Gentoo packages 'american-english' in the exact path
+	# wanted for the test, but all that is needed is a compressible text
+	# file, and we do have 'words' from miscfiles in the same path.
+	sed -i \
+		-e '/CFILESSRC.*=/s,american-english,words,' \
+		tests/util/grub-fs-tester.in \
+		|| die
 
 	if [[ -n ${GRUB_AUTOGEN} ]]; then
 		python_setup
 		bash autogen.sh || die
-	fi
-
-	if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
-		autopoint() { return 0; }
+		autopoint() { :; }
 		eautoreconf
 	fi
 }
 
-setup_fonts() {
-	ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
-	if use themes; then
-		ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
-	fi
+grub_do() {
+	multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+	multibuild_for_best_variant run_in_build_dir "$@"
 }
 
 grub_configure() {
 	local platform
 
 	case ${MULTIBUILD_VARIANT} in
-		efi-32)
-			platform=efi
+		efi*) platform=efi ;;
+		xen*) platform=xen ;;
+		guessed) ;;
+		*) platform=${MULTIBUILD_VARIANT} ;;
+	esac
+
+	case ${MULTIBUILD_VARIANT} in
+		*-32)
 			if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
-				local CTARGET=${CTARGET:-i386}
+				local CTARGET=i386
 			fi ;;
-		efi-64)
-			platform=efi
+		*-64)
 			if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
-				local CTARGET=${CTARGET:-x86_64}
-				local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
-				local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
-				export TARGET_CFLAGS TARGET_CPPFLAGS
+				local CTARGET=x86_64
+				local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+				local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
 			fi ;;
-		guessed) ;;
-		*)	platform=${MULTIBUILD_VARIANT} ;;
 	esac
 
 	local myeconfargs=(
@@ -197,7 +195,6 @@ grub_configure() {
 		--libdir="${EPREFIX}"/usr/lib
 		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
 		$(use_enable debug mm-debug)
-		$(use_enable debug grub-emu-usb)
 		$(use_enable device-mapper)
 		$(use_enable mount grub-mount)
 		$(use_enable nls)
@@ -215,10 +212,14 @@ grub_configure() {
 		myeconfargs+=( --program-transform-name="s,grub,grub2," )
 	fi
 
-	mkdir -p "${BUILD_DIR}" || die
-	run_in_build_dir setup_fonts
+	# Set up font symlinks
+	ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+	if use themes; then
+		ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+	fi
 
-	autotools-utils_src_configure
+	local ECONF_SOURCE="${S}"
+	econf "${myeconfargs[@]}"
 }
 
 src_configure() {
@@ -241,62 +242,44 @@ src_configure() {
 	tc-export CC NM OBJCOPY RANLIB STRIP
 	tc-export BUILD_CC # Bug 485592
 
-	# Portage will take care of cleaning up GRUB_PLATFORMS
-	MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
-	multibuild_parallel_foreach_variant grub_configure
+	MULTIBUILD_VARIANTS=()
+	local p
+	for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+		use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+	done
+	[[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
+	grub_do grub_configure
 }
 
 src_compile() {
 	# Sandbox bug 404013.
 	use libzfs && addpredict /etc/dfs:/dev/zfs
 
-	multibuild_foreach_variant autotools-utils_src_compile
-
-	use doc && multibuild_for_best_variant \
-		autotools-utils_src_compile -C docs html
+	grub_do emake
+	use doc && grub_do_once emake -C docs html
 }
 
 src_test() {
 	# The qemu dependency is a bit complex.
 	# You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
-	multibuild_foreach_variant autotools-utils_src_test
+	grub_do emake check
 }
 
 src_install() {
-	multibuild_foreach_variant autotools-utils_src_install \
-		bashcompletiondir="$(get_bashcompdir)"
+	grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+	use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
+
+	einstalldocs
 
-	local grub=grub
 	if use multislot; then
-		grub=grub2
 		mv "${ED%/}"/usr/share/info/grub{,2}.info || die
-		mv "${ED%/}"/$(get_bashcompdir)/grub{,2} || die
 	fi
 
-	bashcomp_alias ${grub} ${grub}-{install,set-default,mkrescue,reboot,script-check,editenv,sparc64-setup,mkfont,mkpasswd-pbkdf2,mkimage,bios-setup,mkconfig,probe}
-
-	use doc && multibuild_for_best_variant run_in_build_dir \
-		emake -C docs DESTDIR="${D}" install-html
-
 	insinto /etc/default
 	newins "${FILESDIR}"/grub.default-3 grub
 }
 
 pkg_postinst() {
-	mount-boot_mount_boot_partition
-
-	if [[ -e "${ROOT%/}/boot/grub2/grub.cfg"  ]]; then
-		ewarn "The grub directory has changed from /boot/grub2 to /boot/grub."
-		ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg."
-
-		if [[ ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then
-			mkdir -p "${ROOT%/}/boot/grub"
-			ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg"
-		fi
-	fi
-
-	mount-boot_pkg_postinst
-
 	elog "For information on how to configure GRUB2 please refer to the guide:"
 	elog "    https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
 
@@ -311,14 +294,5 @@ pkg_postinst() {
 		optfeature "Detect other operating systems (grub-mkconfig)" sys-boot/os-prober
 		optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn
 		optfeature "Enable RAID device detection" sys-fs/mdadm
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! version_is_at_least 2.02_beta2-r8 ${v}; then
-				ewarn "Please re-run grub2-install to address a security flaw when using"
-				ewarn "username/password authentication in grub."
-				ewarn "See bug 568326 for more information."
-			fi
-		done
 	fi
 }