Version bump.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 342 insertions, 11 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 8b86b389771d..beb571492f3c 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.296 2013/12/09 23:27:48 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.297 2013/12/19 03:25:54 floppym Exp $
+
+*grub-2.02_beta1 (19 Dec 2013)
+
+  19 Dec 2013; Mike Gilbert <floppym@gentoo.org> +grub-2.02_beta1.ebuild,
+  grub-9999-r1.ebuild:
+  Version bump.
 
   09 Dec 2013; Mike Gilbert <floppym@gentoo.org>
   +files/grub-2.00-freetype-2.5.1.patch, grub-2.00_p5107-r2.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 23ccf3c83d7b..06faf08595ae 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -46,8 +46,10 @@ DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47
 DIST grub-1.99.tar.xz 2639224 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b SHA512 604b931eef3781cdfbd9589ed76c96d6bc9fd9d6429a7a32c94ab1ea5dc2b2e1e26b60c93353763831bddbe071368779bab8564234139cb5eb6cbc3c88395ff4 WHIRLPOOL 68d9de328eb492b9dc1771db6a356de9af5d0bbceb1e187c0aea48f117c94b492c721e773e715664d3e431bda7f0ff5d63774184d2f2c413a08554a91c13dde4
 DIST grub-2.00.tar.xz 5136412 SHA256 784ec38e7edc32239ad75b8e66df04dc8bfb26d88681bc9f627133a6eb85c458 SHA512 f0dbfc90639491e5c671d2df206dec0139171bf096a99ee236f7ebf21cdafc6e6d39a9607e14ad2a6aee7c199ecc63f0a39573d969318e1a0cd32f989aa6b44a WHIRLPOOL b9690c023ab507926b8615ce28bf9de82b793ebd02126a5ecd52a130ab4bc52e2ae650b02ae2d784d4089e2981be944ba8b4800cde742aab793ff0d9029843c8
 DIST grub-2.00_p5107.tar.xz 5836972 SHA256 92fd8f93621e7083f32ba6ef407f2984e5d3caaafdc35fb3d89ed054ca7c4dac SHA512 a70017dfc837e8fa869af7f71ca6191973f3f44f5a93378100cff5da425aa132b3903a3602ab907ef070872bb7a17f0586c8415845645c596d0621a4929ca83d WHIRLPOOL 5d88806fc849d2ff78ca590312110be4505e2801fee7c68faba39a54a44eedc16eb25dad88f1ff0058dea2e98382944c7e7632ccfa6f4a171ff0ef00cf67fd2d
+DIST grub-2.02~beta1.tar.xz 5780376 SHA256 fa2afb686537f498bb6598633e2a6b8f02e2e4affd487ec5567f657d7ab3bad1 SHA512 03c47822902581ce55ff2bb6e8fa9e61ef75770d5a10cfada8b7760caeaf8509df15f7c49b72921edac8326bc73fd408e584066a348801404c239210b98079b3 WHIRLPOOL ac24a2f6b138305c2e5b6e497cb2e98934ffddf91f9c9f2a9ceeb6c01586bf188445cd531c057227535ad4d6e059825bf20a37eb0bb59b3f428d4c1874cc521a
 DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da WHIRLPOOL d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b
 DIST unifont-5.1.20080820.pcf.gz 1379965 SHA256 122b9c470f29b70223b0e07404a6dfa7f339fcfa6ae74c024f478945af7a9a63 SHA512 8939e2bc82ca97b60e6678f3ff079a2be7ba9b702f2e8ee289e853af5823695f7baafbf14b674fc5e41071f2a6de4f2dadd56bf8b4653849dd756d59622f1649 WHIRLPOOL 0f083d66781cc4c3e554ebeda4e21843fa275ecf3e1908b4873fadfe37b7c88e8346a124656704bb1b29f89afee23d6301b4df0f19e788f454c60d47156fe78d
+DIST unifont-6.3.20131217.pcf.gz 1357501 SHA256 67e5a2bbbd638fe5c2b7e58d9935163de686225d33c6b5faac48b01c42a2e8e8 SHA512 4f3c1a6a64a39aadd60f019c7113fa2e8034b524d11afaa74e6d21a0ac97eeeebe031285abac04e253c9bef246f162c2087527246d7bb808fb69cd0389075515 WHIRLPOOL 808c660e996b2167161ff64b24312e324998a680049de2a6d0a01773ba234c9a9d0dc198693f0e6d5b5e3d37ceeeb82def2ded2ec7e498afa1e7a6593c363ab8
 EBUILD grub-0.92-r1.ebuild 2605 SHA256 cd42e232b3d1e3ce99fa391907df1019f38a853f574cfb812346d9b1db0c7596 SHA512 8e1f79d34e3398be574d83a3b6a28ba1adad2ff80fdeadf6bb13cf3d77d73224372161a27f3f079e01aa4b564395473fa658eb52a38c3e3fba937557c0c1b41a WHIRLPOOL 090466918d908b36416a48f8b5109b8042bebae5fd5769a8b27ff3cb6f80dd769ee7960e4981da7ef82f9243a945ec6397e3aa70e958423adf530baedb6731c2
 EBUILD grub-0.94-r1.ebuild 3340 SHA256 d9d07a2c87d1d6656e42559244e1c4f06e47aa7dfdbc644f2a3eeefabf3b784e SHA512 ee66f414607b9d2a14cf8b3e7af5b3614836f35417a45e1eebf3ba2e450818dc6704f80e6b62108697f99b84c3052c9b9dd0bd0a45b021de1b614106cf10641f WHIRLPOOL a538c069f51d9a12b24a083f8223907bd4c1a2ca10b1632db94dc795450739d069095f20c59c6d73528d23d22e288c36f0ca38783104b0eba5588fc9cb3aebf0
 EBUILD grub-0.96-r1.ebuild 4459 SHA256 f7fa0fc99b2554897cb1ac437a49c64231cc0d1513b0a89d9fab78e61af08b4b SHA512 35c917af6d71b6f3f9428628b5673f1ee892c2f7c2d8fd6f8c7ba7605d8c674ff46bebaa7fe9c0815d4b6af92118669d01678e197e066c806690510171adab47 WHIRLPOOL a80d3ca9d42c412f5526cb1927d939c33b15230589eae9a79a10a2db87f41eb2921f848ffc9f1ba08ad7a989bf8419fd4af861024c9d6fc13991a0d9fdaa3184
@@ -69,13 +71,14 @@ EBUILD grub-1.99-r2.ebuild 8413 SHA256 13a1281843b801804a5f2dc491cd21d6ac4d068c5
 EBUILD grub-2.00-r4.ebuild 6772 SHA256 567b9c19af55d0687a084eab551197c6bb2b36bc800375f6fc3522b611effb19 SHA512 0a09c35b7e534a772451eb3a3ef8a6333d89abc9b6e3cae4548e4e289fe8104e1282fe7e1ca699a5d2650fb83ae75f06ee732ec13b2d6e509c3311591e654427 WHIRLPOOL ab8e4b5566283f6f07b31022e646863f44b37a8d8bb210bc7db7843220b25cf235599fc458225792afabec5e449e3d72dd005ee75d904b8e62b857e6bf680253
 EBUILD grub-2.00_p5107-r2.ebuild 8080 SHA256 a962749fb4ef3cac0bdbe7faa620380a2d6cb064b37823dc71201dab8356804a SHA512 e29425d7262e5902fd9e87ed6c7e72df15dd670152c6dcd365b5c6e0ee8019599e3314a4cdea867de6acd7d2babcdb66b91535d7ceeb7c58c60ebca9407bb19c WHIRLPOOL 19d522b67db7139193505f93aa5a474e5f88a5d2ee322d7c8283c2c2ad7984bfaf9cbfae6820d125b11b8b0a8b41b049b3ca72e9c60b8f0a4d82653ea791c34e
 EBUILD grub-2.00_p5107.ebuild 6567 SHA256 fecc66f9d1f45a940530ddaf1fc9fcb1c05c2346b1ee8170c3a897d7be5c5fd9 SHA512 7ce9b814878dceb204dbe5a7103517ab451bce414e2075420e234392369b5edd82e499907becdabff456ad3c5ca53ede74dfa7132ed1b33904f44c52fc471cd0 WHIRLPOOL 103d3db1fb21055d69289717bf6acef361cc4fec4e862413f90d047987889d8b248b5c15288977aab2f3df686990dd14f3e6a3cf90da0d3eb0a066f2b773a593
-EBUILD grub-9999-r1.ebuild 8186 SHA256 2f157600d56098e6fdd36141bda8850c56722da73d8966822398371bbe1daeca SHA512 946f35d6dfed924ad6570d884c8965f69851f73fb8cc155a35b5353296f22b7de86c11c92fd94751f1d52349c93533889d2afaaaf1778bcac687555d0192ede4 WHIRLPOOL 8d55a2ce22831cbaadfd8912434c86d51644b76b2bbaa39f7623f3ce8149df400cf654ef2d1eb26f7789f427c85de57176b8c877b1a413129920104f66fa09ab
-MISC ChangeLog 55448 SHA256 08d697c4074071611266a03cdb27787b37eafdf37b971b8d54bc9788a19bde12 SHA512 c899f2381e8ec22cabce67f635e1c6c3a87b3c7598ab9fc15dc38e93f75bc74071cd0ce4bd88368d15daee30ef9e64e81b96c5727e160ba55c9be79cc8023947 WHIRLPOOL bc1b58c21421d70336f277311de12e0b4a81438bdfe3121b0618dca446a257de4be9e582c3f73fa7456f74b74ff0ce53c83882768a3927284a5259595e29743b
+EBUILD grub-2.02_beta1.ebuild 8210 SHA256 f579296f7d5ad3c3a7219b52409f26837584cd52bf29ebec4f44ae27f0e9e005 SHA512 8185378b884ad08bc6cb74f2f62e171ee24d526802b8649fd45e49864ae1a18b4683ea3af3d1f6eb5a1b1e219b4aefbd7362074eb8a2a4de872c8f0f0e00a03b WHIRLPOOL 5264fd0d5eeb66c0633731dc631de0fdd8ed70d150e54125ecdc7033746e983229a3e6e47d520284c2467773e1ac9b2a1a672022caa2828fff0142d2f9da2b82
+EBUILD grub-9999-r1.ebuild 8207 SHA256 9e7e3322bb0f3a3d9623386d9c70638bcfea75ab4eb872f31734b7097e16950a SHA512 3421620a95f33183a0337d370c9c28675966b7ff97db84d8d95e905563bd15dff7505d36ddca65196649a3ce3bb640cc8f54bf972c8e76819699c022c5c33b6f WHIRLPOOL 99e60f07cbd342f16868b8a9e254e43ca7a8ce143f936c549e45f50260c8b63fa571146f2b51603d2e0149b3e0c82bc27517e8a085446c023509aa6101a09151
+MISC ChangeLog 55594 SHA256 a52cec76204767c4d877a37c060771e58f054e6403cd950c00f21b80e7a92ac9 SHA512 f7a88ec558fcae7f6e37d944d5f52f980558d76b744edb841503eccf97af3faf88b03b462c4111371532ed40ee3ffbe57777f2a4e3fc75129a6502ba0317850e WHIRLPOOL 14d0ace35cbbdf34b026c0ed7891f924ffb5520e1ca80babde528bfcba3a8a846dfb74fab887214790a58b6cde0f938d1936ef4957b039d02729b3a912c4c021
 MISC metadata.xml 838 SHA256 01beea9f20f03e00fdc21576a1311d3c21874980cdd57a9f2ed08a9d7cda1c46 SHA512 f6266f2f77db089d2f9289be079ef5a3637726b0906c5e96a7d8b7e29a8105cb7c48b9739f5607c0fdac2545db0e87f35132769f82b12db11a6f0018cc3c92f2 WHIRLPOOL 528d4f57ca38b0f0d4c34cd6bd60c7aeefc0fabd1e1e7be8efe0fcba04824d047a6e04288f1fbbd8e865c7435b53e84caffe7d4196809b157ee76e0d2be6f8df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlKmUfYACgkQC77qH+pIQ6SlhQD9GaiTx/F4iuJ3bv8EeJz9RzCx
-7APjEwIGZKePDrVqXicA+weOV+e8jSGou7PzsHwP8Kq4kJrCgXNgtfLeVkedEU87
-=AfL+
+iF4EAREIAAYFAlKyZywACgkQC77qH+pIQ6R/4QD/emllWDeQHU57OhHZyuHGz9MG
+K6velmoxXre+2usT07gA+QF7XMJP/jvSIfQvvBKsq3OIpVTrQks2Mgf+oSDxB7Vt
+=iIOT
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-2.02_beta1.ebuild b/sys-boot/grub/grub-2.02_beta1.ebuild
new file mode 100644
index 000000000000..8ccedb25ee05
--- /dev/null
+++ b/sys-boot/grub/grub-2.02_beta1.ebuild
@@ -0,0 +1,322 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta1.ebuild,v 1.1 2013/12/19 03:25:54 floppym Exp $
+
+EAPI=5
+
+if [[ ${PV} == 9999 ]]; then
+	AUTOTOOLS_AUTORECONF=1
+	GRUB_AUTOGEN=1
+fi
+
+if [[ -n ${GRUB_AUTOGEN} ]]; then
+	PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+	inherit python-any-r1
+fi
+
+inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator
+
+if [[ ${PV} != 9999 ]]; then
+	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
+		MY_P="${P/_/~}"
+		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
+		S=${WORKDIR}/${MY_P}
+	else
+		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+			mirror://gentoo/${P}.tar.xz
+			http://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
+		S=${WORKDIR}/${P%_*}
+	fi
+	KEYWORDS="~amd64 ~x86"
+	PATCHES=()
+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-6.3.20131217
+SRC_URI+=" truetype? (
+	mirror://sourceforge/dejavu/${DEJAVU}.zip
+	http://unifoundry.com/pub/${UNIFONT}/${UNIFONT}.pcf.gz
+)"
+
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+
+# Includes licenses for dejavu and unifont
+LICENSE="GPL-3 truetype? ( BitstreamVera GPL-2-with-font-exception )"
+SLOT="2"
+IUSE="debug device-mapper doc efiemu mount +multislot nls static sdl test truetype libzfs"
+
+GRUB_ALL_PLATFORMS=(
+	# everywhere:
+	emu
+	# mips only:
+	qemu-mips yeeloong
+	# amd64, x86, ppc, ppc64:
+	ieee1275
+	# amd64, x86:
+	coreboot multiboot efi-32 pc qemu
+	# amd64, ia64:
+	efi-64
+)
+IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
+
+REQUIRED_USE="grub_platforms_qemu? ( truetype )
+	grub_platforms_yeeloong? ( truetype )"
+
+# os-prober: Used on runtime to detect other OSes
+# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
+RDEPEND="
+	app-arch/xz-utils
+	>=sys-libs/ncurses-5.2-r5
+	debug? (
+		sdl? ( media-libs/libsdl )
+	)
+	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+	libzfs? ( sys-fs/zfs )
+	mount? ( sys-fs/fuse )
+	truetype? ( media-libs/freetype )
+	ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
+	ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-misc/pax-utils
+	sys-devel/flex
+	sys-devel/bison
+	sys-apps/help2man
+	sys-apps/texinfo
+	static? (
+		app-arch/xz-utils[static-libs(+)]
+		truetype? (
+			app-arch/bzip2[static-libs(+)]
+			media-libs/freetype[static-libs(+)]
+			sys-libs/zlib[static-libs(+)]
+		)
+	)
+	test? (
+		dev-libs/libisoburn
+		app-emulation/qemu
+	)
+	truetype? ( app-arch/unzip )
+"
+RDEPEND+="
+	kernel_linux? (
+		grub_platforms_efi-32? ( sys-boot/efibootmgr )
+		grub_platforms_efi-64? ( sys-boot/efibootmgr )
+	)
+	!multislot? ( !sys-boot/grub:0 )
+"
+
+STRIP_MASK="*/grub/*/*.{mod,img}"
+RESTRICT="test"
+
+QA_EXECSTACK="
+	usr/bin/grub*
+	usr/sbin/grub*
+	usr/lib*/grub/*/*.mod
+	usr/lib*/grub/*/*.module
+	usr/lib*/grub/*/kernel.exec
+	usr/lib*/grub/*/kernel.img
+"
+
+QA_WX_LOAD="
+	usr/lib*/grub/*/kernel.exec
+	usr/lib*/grub/*/kernel.img
+	usr/lib*/grub/*/*.image
+"
+
+QA_PRESTRIPPED="
+	usr/lib.*/grub/.*/kernel.img
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug 439082
+		if ! version_is_at_least 4.8 "$(gcc-version)" &&
+			$(tc-getLD) --version | grep -q "GNU gold"; then
+			eerror "GRUB does not function correctly when built with the gold linker."
+			eerror "Please select the bfd linker with binutils-config."
+			die "GNU gold detected"
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	fi
+	default_src_unpack
+}
+
+src_prepare() {
+	[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
+	sed -i -e /autoreconf/d autogen.sh || die
+	if use multislot; then
+		# fix texinfo file name, bug 416035
+		sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
+	fi
+	epatch_user
+	if [[ -n ${GRUB_AUTOGEN} ]]; then
+		python_setup
+		bash autogen.sh || die
+	fi
+	if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
+		autopoint() { return 0; }
+		eautoreconf
+	fi
+}
+
+setup_fonts() {
+	ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+	ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+}
+
+grub_configure() {
+	local platform
+
+	case ${MULTIBUILD_VARIANT} in
+		efi-32)
+			platform=efi
+			if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+				local CTARGET=${CTARGET:-i386}
+			fi ;;
+		efi-64)
+			platform=efi
+			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
+			fi ;;
+		guessed) ;;
+		*)	platform=${MULTIBUILD_VARIANT} ;;
+	esac
+
+	local myeconfargs=(
+		--disable-werror
+		--program-prefix=
+		--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)
+		$(use_enable truetype grub-mkfont)
+		$(use_enable libzfs)
+		$(use sdl && use_enable debug grub-emu-sdl)
+		${platform:+--with-platform=}${platform}
+
+		# Let configure detect this where supported
+		$(usex efiemu '' '--disable-efiemu')
+	)
+
+	if use multislot; then
+		myeconfargs+=( --program-transform-name="s,grub,grub2," )
+	fi
+
+	if use truetype; then
+		mkdir -p "${BUILD_DIR}" || die
+		run_in_build_dir setup_fonts
+	fi
+
+	autotools-utils_src_configure
+}
+
+src_configure() {
+	# We don't want to leak flags onto boot code.
+	export HOST_CCASFLAGS=${CCASFLAGS}
+	export HOST_CFLAGS=${CFLAGS}
+	export HOST_CPPFLAGS=${CPPFLAGS}
+	export HOST_LDFLAGS=${LDFLAGS}
+	unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+	use static && HOST_LDFLAGS+=" -static"
+
+	if version_is_at_least 4.8 "$(gcc-version)"; then
+		export TARGET_LDFLAGS+=" -fuse-ld=bfd"
+	fi
+
+	tc-export CC NM OBJCOPY STRIP
+	export TARGET_CC=${TARGET_CC:-${CC}}
+	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
+}
+
+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
+}
+
+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
+}
+
+src_install() {
+	multibuild_foreach_variant autotools-utils_src_install \
+		bashcompletiondir="$(get_bashcompdir)"
+
+	use doc && multibuild_for_best_variant run_in_build_dir \
+		emake -C docs DESTDIR="${D}" install-html
+
+	if use multislot; then
+		mv "${ED%/}"/usr/share/info/grub{,2}.info || die
+	fi
+
+	insinto /etc/default
+	newins "${FILESDIR}"/grub.default-2 grub
+
+	cd "${ED}" || die
+	pax-mark mpes $(scanelf -BF %F usr/{bin,sbin})
+}
+
+pkg_postinst() {
+	mount-boot_mount_boot_partition
+
+	if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" && ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then
+		mkdir -p "${ROOT%/}/boot/grub"
+		ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg"
+	fi
+
+	mount-boot_pkg_postinst
+
+	elog "For information on how to configure GRUB2 please refer to the guide:"
+	elog "    http://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
+
+	if has_version 'sys-boot/grub:0'; then
+		elog "A migration guide for GRUB Legacy users is available:"
+		elog "    http://www.gentoo.org/doc/en/grub2-migration.xml"
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if ! has_version sys-boot/os-prober; then
+			elog "Install sys-boot/os-prober to enable detection of other operating systems using grub2-mkconfig."
+		fi
+		if ! has_version dev-libs/libisoburn; then
+			elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue."
+		fi
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if use multislot && ! version_is_at_least 2.00_p5107-r1 ${v}; 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."
+				break
+			fi
+		done
+	fi
+}
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild
index 9f15b60855c6..4f9b615aaa71 100644
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.6 2013/12/09 23:07:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.7 2013/12/19 03:25:54 floppym Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multib
 
 if [[ ${PV} != 9999 ]]; then
 	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
-		MY_P=${P/_/~}
+		MY_P="${P/_/~}"
 		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 	else
@@ -36,10 +36,10 @@ else
 fi
 
 DEJAVU=dejavu-sans-ttf-2.34
-UNIFONT=unifont-5.1.20080820.pcf
+UNIFONT=unifont-6.3.20131217
 SRC_URI+=" truetype? (
 	mirror://sourceforge/dejavu/${DEJAVU}.zip
-	http://unifoundry.com/${UNIFONT}.gz
+	http://unifoundry.com/pub/${UNIFONT}/${UNIFONT}.pcf.gz
 )"
 
 DESCRIPTION="GNU GRUB boot loader"
@@ -172,7 +172,7 @@ src_prepare() {
 
 setup_fonts() {
 	ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
-	ln -s "${WORKDIR}/${UNIFONT}" unifont.pcf || die
+	ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
 }
 
 grub_configure() {