Version bump to 2.00. Depend also on dejavu (otherwise starfield is not distributed). Add info about themes to default config file. Remove older betas/rcs apart from latest beta to ensure fallback if 2.00 has regressions.

(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)

11 files changed, 61 insertions, 1880 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index c7f66f5ccbab..8f51765632b8 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,17 @@
 # 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.213 2012/06/25 03:53:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.214 2012/06/28 10:10:04 scarabeus Exp $
+
+*grub-2.00 (28 Jun 2012)
+
+  28 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> +files/grub.default-2,
+  -grub-2.00_beta0.ebuild, -grub-2.00_beta1.ebuild, -grub-2.00_beta2.ebuild,
+  -grub-2.00_beta2-r1.ebuild, -grub-2.00_beta3.ebuild,
+  -grub-2.00_beta3-r2.ebuild, -grub-2.00_beta5.ebuild, -grub-2.00_rc1.ebuild,
+  +grub-2.00.ebuild, grub-9999.ebuild:
+  Version bump to 2.00. Depend also on dejavu (otherwise starfield is not
+  distributed). Add info about themes to default config file. Remove older
+  betas/rcs apart from latest beta to ensure fallback if 2.00 has regressions.
 
 *grub-2.00_rc1 (25 Jun 2012)
 
diff --git a/sys-boot/grub/files/grub.default-2 b/sys-boot/grub/files/grub.default-2
new file mode 100644
index 000000000000..d69535e83d28
--- /dev/null
+++ b/sys-boot/grub/files/grub.default-2
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-2,v 1.1 2012/06/28 10:10:04 scarabeus Exp $
+#
+# To populate all changes in this file you need to regenerate your
+# grub configuration file afterwards:
+#     'grub2-mkconfig -o /boot/grub2/grub.cfg'
+#
+# See the grub info page for documentation on possible variables and
+# their associated values. 
+
+GRUB_DISTRIBUTOR="Gentoo"
+
+GRUB_DEFAULT=0
+GRUB_HIDDEN_TIMEOUT=0
+GRUB_HIDDEN_TIMEOUT_QUIET=true
+GRUB_TIMEOUT=10
+
+GRUB_CMDLINE_LINUX_DEFAULT=""
+GRUB_CMDLINE_LINUX=""
+
+# Uncomment to disable graphical terminal (grub-pc only)
+#GRUB_TERMINAL=console
+
+# The resolution used on graphical terminal.
+# Note that you can use only modes which your graphic card supports via VBE.
+# You can see them in real GRUB with the command `vbeinfo'.
+#GRUB_GFXMODE=640x480
+
+# Path to theme spec txt file.
+# The starfiled is by default provided with use truetype.
+# NOTE: when enabling custom theme, ensure you have required font/etc.
+#GRUB_THEME="/boot/grub/themes/starfield/theme.txt"
+
+# Background image used on graphical terminal.
+# Can be in various bitmap formats.
+#GRUB_BACKGROUND="/boot/grub2/mybackground.png"
+
+# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel
+#GRUB_DISABLE_LINUX_UUID=true
+
+# Uncomment to disable generation of recovery mode menu entries
+#GRUB_DISABLE_RECOVERY=true
diff --git a/sys-boot/grub/grub-2.00_rc1.ebuild b/sys-boot/grub/grub-2.00.ebuild
index 451ff843672c..e5bb6454d083 100644
--- a/sys-boot/grub/grub-2.00_rc1.ebuild
+++ b/sys-boot/grub/grub-2.00.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_rc1.ebuild,v 1.1 2012/06/25 03:53:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.1 2012/06/28 10:10:04 scarabeus Exp $
 
 EAPI=4
 
@@ -60,6 +60,7 @@ RDEPEND="
 	mount? ( sys-fs/fuse )
 	truetype? (
 		media-libs/freetype
+		media-fonts/dejavu
 		>=media-fonts/unifont-5
 	)
 	ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
@@ -287,7 +288,7 @@ src_install() {
 	# can't be in docs array as we use default_src_install in different builddir
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 	insinto /etc/default
-	newins "${FILESDIR}"/grub.default grub
+	newins "${FILESDIR}"/grub.default-2 grub
 }
 
 pkg_postinst() {
diff --git a/sys-boot/grub/grub-2.00_beta0.ebuild b/sys-boot/grub/grub-2.00_beta0.ebuild
deleted file mode 100644
index 0563dd5a480d..000000000000
--- a/sys-boot/grub/grub-2.00_beta0.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# 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_beta0.ebuild,v 1.6 2012/03/06 01:35:58 floppym Exp $
-
-EAPI=4
-
-if [[ ${PV} == "9999" ]] ; then
-	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
-	LIVE_ECLASS="bzr"
-	SRC_URI=""
-	DO_AUTORECONF="true"
-else
-	MY_P=${P/_/\~}
-	if [[ ${PV} == *_alpha* || ${PV} == *_beta* ]]; then
-		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
-	else
-		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-		mirror://gentoo/${MY_P}.tar.xz"
-	fi
-	# Masked until documentation guys consolidate the guide and approve
-	# it for usage.
-	#KEYWORDS="~amd64 ~mips ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
-unset LIVE_ECLASS
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-
-LICENSE="GPL-3"
-SLOT="2"
-IUSE="custom-cflags debug device-mapper efiemu mount nls static sdl truetype libzfs"
-
-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
-RDEPEND="
-	dev-libs/libisoburn
-	dev-libs/lzo
-	sys-boot/os-prober
-	>=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 >=media-fonts/unifont-5 )"
-DEPEND="${RDEPEND}
-	>=dev-lang/python-2.5.2
-	sys-devel/flex
-	virtual/yacc
-	sys-apps/texinfo
-"
-RDEPEND+="
-	grub_platforms_efi-32? ( sys-boot/efibootmgr )
-	grub_platforms_efi-64? ( sys-boot/efibootmgr )
-"
-if [[ -n ${DO_AUTORECONF} ]] ; then
-	DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
-else
-	DEPEND+=" app-arch/xz-utils"
-fi
-
-export STRIP_MASK="*/grub/*/*.{mod,img}"
-
-QA_EXECSTACK="
-	usr/bin/grub*
-	usr/sbin/grub*
-	usr/lib*/grub/*/*.mod
-	usr/lib*/grub/*/kernel.exec
-	usr/lib*/grub/*/kernel.img
-	usr/lib*/grub/*/setjmp.module
-"
-
-QA_WX_LOAD="
-	usr/lib*/grub/*/kernel.exec
-	usr/lib*/grub/*/kernel.img
-	usr/lib*/grub/*/*.image
-"
-
-QA_PRESTRIPPED="
-	usr/lib.*/grub/.*/kernel.img
-"
-
-grub_run_phase() {
-	local phase=$1
-	local platform=$2
-	[[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]"
-
-	[[ -d "${WORKDIR}/build-${platform}" ]] || \
-		{ mkdir "${WORKDIR}/build-${platform}" || die ; }
-	pushd "${WORKDIR}/build-${platform}" > /dev/null || die
-
-	echo ">>> Running ${phase} for platform \"${platform}\""
-	echo ">>> Working in: \"${WORKDIR}/build-${platform}\""
-
-	grub_${phase} ${platform}
-
-	popd > /dev/null || die
-}
-
-grub_src_configure() {
-	local platform=$1
-	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}"
-	fi
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-werror \
-		--program-transform-name="s,grub,grub2," \
-		--with-grubdir=grub2 \
-		$(use_enable debug mm-debug) \
-		$(use_enable debug grub-emu-usb) \
-		$(use_enable device-mapper) \
-		$(use_enable efiemu) \
-		$(use_enable mount grub-mount) \
-		$(use_enable nls) \
-		$(use_enable truetype grub-mkfont) \
-		$(use_enable libzfs) \
-		$(use sdl && use_enable debug grub-emu-sdl) \
-		${with_platform}
-}
-
-grub_src_compile() {
-	default_src_compile
-	pax-mark -mpes "${grub_binaries[@]}"
-}
-
-grub_src_install() {
-	default_src_install
-}
-
-src_prepare() {
-	local i j
-
-	epatch_user
-
-	# autogen.sh does more than just run autotools
-	if [[ -n ${DO_AUTORECONF} ]] ; then
-		sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
-		(. ./autogen.sh) || die
-	fi
-
-	# install into the right dir for eselect #372735
-	sed -i \
-		-e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \
-		util/bash-completion.d/Makefile.in || die
-
-	# get enabled platforms
-	GRUB_ENABLED_PLATFORMS=""
-	for i in ${GRUB_PLATFORMS[@]}; do
-		use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
-	done
-	[[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
-	elog "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
-}
-
-src_configure() {
-	local i
-
-	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
-	use libzfs && addpredict /etc/dfs
-	use static && append-ldflags -static
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-}
-
-src_compile() {
-	# Used for pax marking in grub_src_compile
-	local grub_binaries=(
-		grub-editenv
-		grub-fstest
-		grub-menulst2cfg
-		grub-mkimage
-		grub-mklayout
-		grub-mkpasswd-pbkdf2
-		grub-mkrelpath
-		grub-script-check
-		grub-bios-setup
-		grub-ofpathname
-		grub-probe
-		grub-sparc64-setup
-	)
-	use mount && grub_binaries+=( grub-mount )
-	use truetype && grub_binaries+=( grub-mkfont )
-
-	local i
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-}
-
-src_install() {
-	local i
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-
-	mv "${ED}"usr/share/info/grub{,2}.info || die
-
-	# can't be in docs array as we use default_src_install in different builddir
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	insinto /etc/default
-	newins "${FILESDIR}"/grub.default grub
-}
-
-pkg_postinst() {
-	# display the link to guide
-	elog "For information on how to configure grub-2 please refer to the guide:"
-	elog "    http://wiki.gentoo.org/wiki/GRUB2"
-}
diff --git a/sys-boot/grub/grub-2.00_beta1.ebuild b/sys-boot/grub/grub-2.00_beta1.ebuild
deleted file mode 100644
index a96013fa8281..000000000000
--- a/sys-boot/grub/grub-2.00_beta1.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# 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.3 2012/03/08 10:23:34 mr_bones_ Exp $
-
-EAPI=4
-
-if [[ ${PV} == "9999" ]] ; then
-	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
-	LIVE_ECLASS="bzr"
-	SRC_URI=""
-	DO_AUTORECONF="true"
-else
-	MY_P=${P/_/\~}
-	if [[ ${PV} == *_alpha* || ${PV} == *_beta* ]]; then
-		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
-	else
-		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-		mirror://gentoo/${MY_P}.tar.xz"
-	fi
-	# Masked until documentation guys consolidate the guide and approve
-	# it for usage.
-	#KEYWORDS="~amd64 ~mips ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
-unset LIVE_ECLASS
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-
-LICENSE="GPL-3"
-SLOT="2"
-IUSE="custom-cflags debug device-mapper efiemu mount nls static sdl truetype libzfs"
-
-GRUB_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_PLATFORMS[@]/#/grub_platforms_}"
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
-	dev-libs/libisoburn
-	dev-libs/lzo
-	sys-boot/os-prober
-	>=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 >=media-fonts/unifont-5 )"
-DEPEND="${RDEPEND}
-	>=dev-lang/python-2.5.2
-	sys-devel/flex
-	virtual/yacc
-	sys-apps/texinfo
-"
-RDEPEND+="
-	grub_platforms_efi-32? ( sys-boot/efibootmgr )
-	grub_platforms_efi-64? ( sys-boot/efibootmgr )
-"
-if [[ -n ${DO_AUTORECONF} ]] ; then
-	DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
-else
-	DEPEND+=" app-arch/xz-utils"
-fi
-
-export STRIP_MASK="*/grub/*/*.{mod,img}"
-
-QA_EXECSTACK="
-	usr/bin/grub*
-	usr/sbin/grub*
-	usr/lib*/grub/*/*.mod
-	usr/lib*/grub/*/kernel.exec
-	usr/lib*/grub/*/kernel.img
-	usr/lib*/grub/*/setjmp.module
-"
-
-QA_WX_LOAD="
-	usr/lib*/grub/*/kernel.exec
-	usr/lib*/grub/*/kernel.img
-	usr/lib*/grub/*/*.image
-"
-
-QA_PRESTRIPPED="
-	usr/lib.*/grub/.*/kernel.img
-"
-
-grub_run_phase() {
-	local phase=$1
-	local platform=$2
-	[[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]"
-
-	[[ -d "${WORKDIR}/build-${platform}" ]] || \
-		{ mkdir "${WORKDIR}/build-${platform}" || die ; }
-	pushd "${WORKDIR}/build-${platform}" > /dev/null || die
-
-	echo ">>> Running ${phase} for platform \"${platform}\""
-	echo ">>> Working in: \"${WORKDIR}/build-${platform}\""
-
-	grub_${phase} ${platform}
-
-	popd > /dev/null || die
-}
-
-grub_src_configure() {
-	local platform=$1
-	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-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) \
-		$(use_enable efiemu) \
-		$(use_enable mount grub-mount) \
-		$(use_enable nls) \
-		$(use_enable truetype grub-mkfont) \
-		$(use_enable libzfs) \
-		$(use sdl && use_enable debug grub-emu-sdl)
-}
-
-grub_src_compile() {
-	default_src_compile
-	pax-mark -mpes "${grub_binaries[@]}"
-}
-
-grub_src_install() {
-	default_src_install
-}
-
-src_prepare() {
-	local i j
-
-	epatch_user
-
-	# autogen.sh does more than just run autotools
-	if [[ -n ${DO_AUTORECONF} ]] ; then
-		sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
-		(. ./autogen.sh) || die
-	fi
-
-	# install into the right dir for eselect #372735
-	sed -i \
-		-e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \
-		util/bash-completion.d/Makefile.in || die
-
-	# get enabled platforms
-	GRUB_ENABLED_PLATFORMS=""
-	for i in ${GRUB_PLATFORMS[@]}; do
-		use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
-	done
-	[[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
-	elog "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
-}
-
-src_configure() {
-	local i
-
-	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
-	use libzfs && addpredict /etc/dfs
-	use static && append-ldflags -static
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-}
-
-src_compile() {
-	# Used for pax marking in grub_src_compile
-	local grub_binaries=(
-		grub-editenv
-		grub-fstest
-		grub-menulst2cfg
-		grub-mkimage
-		grub-mklayout
-		grub-mkpasswd-pbkdf2
-		grub-mkrelpath
-		grub-script-check
-		grub-bios-setup
-		grub-ofpathname
-		grub-probe
-		grub-sparc64-setup
-	)
-	use mount && grub_binaries+=( grub-mount )
-	use truetype && grub_binaries+=( grub-mkfont )
-
-	local i
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-}
-
-src_install() {
-	local i
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-
-	mv "${ED}"usr/share/info/grub{,2}.info || die
-
-	# can't be in docs array as we use default_src_install in different builddir
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	insinto /etc/default
-	newins "${FILESDIR}"/grub.default grub
-}
-
-pkg_postinst() {
-	# display the link to guide
-	elog "For information on how to configure grub-2 please refer to the guide:"
-	elog "    http://wiki.gentoo.org/wiki/GRUB2"
-}
diff --git a/sys-boot/grub/grub-2.00_beta2-r1.ebuild b/sys-boot/grub/grub-2.00_beta2-r1.ebuild
deleted file mode 100644
index 1e4080fd817e..000000000000
--- a/sys-boot/grub/grub-2.00_beta2-r1.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# 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_beta2-r1.ebuild,v 1.2 2012/03/24 04:22:46 floppym Exp $
-
-EAPI=4
-
-if [[ ${PV} == "9999" ]] ; then
-	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
-	LIVE_ECLASS="bzr"
-	SRC_URI=""
-	DO_AUTORECONF="true"
-else
-	MY_P=${P/_/\~}
-	if [[ ${PV} == *_alpha* || ${PV} == *_beta* ]]; then
-		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
-	else
-		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-		mirror://gentoo/${MY_P}.tar.xz"
-	fi
-	# Masked until documentation guys consolidate the guide and approve
-	# it for usage.
-	#KEYWORDS="~amd64 ~mips ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
-unset LIVE_ECLASS
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-
-LICENSE="GPL-3"
-SLOT="2"
-IUSE="custom-cflags debug device-mapper efiemu mount nls static sdl truetype libzfs"
-
-GRUB_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_PLATFORMS[@]/#/grub_platforms_}"
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
-	dev-libs/libisoburn
-	dev-libs/lzo
-	sys-boot/os-prober
-	>=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 >=media-fonts/unifont-5 )"
-DEPEND="${RDEPEND}
-	>=dev-lang/python-2.5.2
-	sys-devel/flex
-	virtual/yacc
-	sys-apps/texinfo
-"
-RDEPEND+="
-	grub_platforms_efi-32? ( sys-boot/efibootmgr )
-	grub_platforms_efi-64? ( sys-boot/efibootmgr )
-"
-if [[ -n ${DO_AUTORECONF} ]] ; then
-	DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
-else
-	DEPEND+=" app-arch/xz-utils"
-fi
-
-export STRIP_MASK="*/grub/*/*.{mod,img}"
-
-QA_EXECSTACK="
-	usr/bin/grub*
-	usr/sbin/grub*
-	usr/lib*/grub/*/*.mod
-	usr/lib*/grub/*/kernel.exec
-	usr/lib*/grub/*/kernel.img
-	usr/lib*/grub/*/setjmp.module
-"
-
-QA_WX_LOAD="
-	usr/lib*/grub/*/kernel.exec
-	usr/lib*/grub/*/kernel.img
-	usr/lib*/grub/*/*.image
-"
-
-QA_PRESTRIPPED="
-	usr/lib.*/grub/.*/kernel.img
-"
-
-grub_run_phase() {
-	local phase=$1
-	local platform=$2
-	[[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]"
-
-	[[ -d "${WORKDIR}/build-${platform}" ]] || \
-		{ mkdir "${WORKDIR}/build-${platform}" || die ; }
-	pushd "${WORKDIR}/build-${platform}" > /dev/null || die
-
-	echo ">>> Running ${phase} for platform \"${platform}\""
-	echo ">>> Working in: \"${WORKDIR}/build-${platform}\""
-
-	grub_${phase} ${platform}
-
-	popd > /dev/null || die
-}
-
-grub_src_configure() {
-	local platform=$1
-	local with_platform=
-
-	[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
-
-	# Used below for efi cross-building
-	tc-export CC NM OBJCOPY STRIP
-
-	estack_push CTARGET "${CTARGET}"
-	estack_push TARGET_CC "${TARGET_CC}"
-	estack_push TARGET_CFLAGS "${TARGET_CFLAGS}"
-	estack_push TARGET_CPPFLAGS "${TARGET_CPPFLAGS}"
-
-	case ${platform} in
-		efi-32)
-			if [[ ${CHOST} == x86_64* ]]; then
-				CTARGET="${CTARGET:-i386}"
-				TARGET_CC="${TARGET_CC:-${CC}}"
-				export TARGET_CC
-			fi
-			with_platform="--with-platform=efi"
-			;;
-		efi-64)
-			if [[ ${CHOST} == i?86* ]]; then
-				CTARGET="${CTARGET:-x86_64}"
-				TARGET_CC="${TARGET_CC:-${CC}}"
-				TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
-				TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
-				export TARGET_CC TARGET_CFLAGS TARGET_CPPFLAGS
-			fi
-			with_platform="--with-platform=efi"
-			;;
-		guessed) ;;
-		*) with_platform="--with-platform=${platform}" ;;
-	esac
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-werror \
-		--program-prefix= \
-		--program-transform-name="s,grub,grub2," \
-		--with-grubdir=grub2 \
-		${with_platform} \
-		$(use_enable debug mm-debug) \
-		$(use_enable debug grub-emu-usb) \
-		$(use_enable device-mapper) \
-		$(use_enable efiemu) \
-		$(use_enable mount grub-mount) \
-		$(use_enable nls) \
-		$(use_enable truetype grub-mkfont) \
-		$(use_enable libzfs) \
-		$(use sdl && use_enable debug grub-emu-sdl)
-
-	estack_pop CTARGET CTARGET || die
-	estack_pop TARGET_CC TARGET_CC || die
-	estack_pop TARGET_CFLAGS TARGET_CFLAGS || die
-	estack_pop TARGET_CPPFLAGS TARGET_CPPFLAGS || die
-}
-
-grub_src_compile() {
-	default_src_compile
-	pax-mark -mpes "${grub_binaries[@]}"
-}
-
-grub_src_install() {
-	default_src_install
-}
-
-src_prepare() {
-	local i j
-
-	epatch_user
-
-	# autogen.sh does more than just run autotools
-	if [[ -n ${DO_AUTORECONF} ]] ; then
-		sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
-		(. ./autogen.sh) || die
-	fi
-
-	# install into the right dir for eselect #372735
-	sed -i \
-		-e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \
-		util/bash-completion.d/Makefile.in || die
-
-	# Bug 408195.
-	sed -i -e "s/sort -v/sort -V/" util/grub-mkconfig_lib.in || die
-
-	# get enabled platforms
-	GRUB_ENABLED_PLATFORMS=""
-	for i in ${GRUB_PLATFORMS[@]}; do
-		use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
-	done
-	[[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
-	elog "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
-}
-
-src_configure() {
-	local i
-
-	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
-	use libzfs && addpredict /etc/dfs
-	use static && append-ldflags -static
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-}
-
-src_compile() {
-	# Used for pax marking in grub_src_compile
-	local grub_binaries=(
-		grub-editenv
-		grub-fstest
-		grub-menulst2cfg
-		grub-mkimage
-		grub-mklayout
-		grub-mkpasswd-pbkdf2
-		grub-mkrelpath
-		grub-script-check
-		grub-bios-setup
-		grub-ofpathname
-		grub-probe
-		grub-sparc64-setup
-	)
-	use mount && grub_binaries+=( grub-mount )
-	use truetype && grub_binaries+=( grub-mkfont )
-
-	local i
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-}
-
-src_install() {
-	local i
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-
-	mv "${ED}"usr/share/info/grub{,2}.info || die
-
-	# can't be in docs array as we use default_src_install in different builddir
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	insinto /etc/default
-	newins "${FILESDIR}"/grub.default grub
-}
-
-pkg_postinst() {
-	# display the link to guide
-	elog "For information on how to configure grub-2 please refer to the guide:"
-	elog "    http://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
-}
diff --git a/sys-boot/grub/grub-2.00_beta2.ebuild b/sys-boot/grub/grub-2.00_beta2.ebuild
deleted file mode 100644
index 9818c2cb2685..000000000000
--- a/sys-boot/grub/grub-2.00_beta2.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# 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_beta2.ebuild,v 1.3 2012/03/18 06:41:10 floppym Exp $
-
-EAPI=4
-
-if [[ ${PV} == "9999" ]] ; then
-	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
-	LIVE_ECLASS="bzr"
-	SRC_URI=""
-	DO_AUTORECONF="true"
-else
-	MY_P=${P/_/\~}
-	if [[ ${PV} == *_alpha* || ${PV} == *_beta* ]]; then
-		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
-	else
-		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-		mirror://gentoo/${MY_P}.tar.xz"
-	fi
-	# Masked until documentation guys consolidate the guide and approve
-	# it for usage.
-	#KEYWORDS="~amd64 ~mips ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
-unset LIVE_ECLASS
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-
-LICENSE="GPL-3"
-SLOT="2"
-IUSE="custom-cflags debug device-mapper efiemu mount nls static sdl truetype libzfs"
-
-GRUB_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_PLATFORMS[@]/#/grub_platforms_}"
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
-	dev-libs/libisoburn
-	dev-libs/lzo
-	sys-boot/os-prober
-	>=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 >=media-fonts/unifont-5 )"
-DEPEND="${RDEPEND}
-	>=dev-lang/python-2.5.2
-	sys-devel/flex
-	virtual/yacc
-	sys-apps/texinfo
-"
-RDEPEND+="
-	grub_platforms_efi-32? ( sys-boot/efibootmgr )
-	grub_platforms_efi-64? ( sys-boot/efibootmgr )
-"
-if [[ -n ${DO_AUTORECONF} ]] ; then
-	DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
-else
-	DEPEND+=" app-arch/xz-utils"
-fi
-
-export STRIP_MASK="*/grub/*/*.{mod,img}"
-
-QA_EXECSTACK="
-	usr/bin/grub*
-	usr/sbin/grub*
-	usr/lib*/grub/*/*.mod
-	usr/lib*/grub/*/kernel.exec
-	usr/lib*/grub/*/kernel.img
-	usr/lib*/grub/*/setjmp.module
-"
-
-QA_WX_LOAD="
-	usr/lib*/grub/*/kernel.exec
-	usr/lib*/grub/*/kernel.img
-	usr/lib*/grub/*/*.image
-"
-
-QA_PRESTRIPPED="
-	usr/lib.*/grub/.*/kernel.img
-"
-
-grub_run_phase() {
-	local phase=$1
-	local platform=$2
-	[[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]"
-
-	[[ -d "${WORKDIR}/build-${platform}" ]] || \
-		{ mkdir "${WORKDIR}/build-${platform}" || die ; }
-	pushd "${WORKDIR}/build-${platform}" > /dev/null || die
-
-	echo ">>> Running ${phase} for platform \"${platform}\""
-	echo ">>> Working in: \"${WORKDIR}/build-${platform}\""
-
-	grub_${phase} ${platform}
-
-	popd > /dev/null || die
-}
-
-grub_src_configure() {
-	local platform=$1
-	local with_platform=
-
-	[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
-
-	# Used below for efi cross-building
-	tc-export CC NM OBJCOPY STRIP
-
-	estack_push CTARGET "${CTARGET}"
-	estack_push TARGET_CC "${TARGET_CC}"
-	estack_push TARGET_CFLAGS "${TARGET_CFLAGS}"
-	estack_push TARGET_CPPFLAGS "${TARGET_CPPFLAGS}"
-
-	case ${platform} in
-		efi-32)
-			if [[ ${CHOST} == x86_64* ]]; then
-				CTARGET="${CTARGET:-i386}"
-				TARGET_CC="${TARGET_CC:-${CC}}"
-				export TARGET_CC
-			fi
-			with_platform="--with-platform=efi"
-			;;
-		efi-64)
-			if [[ ${CHOST} == i?86* ]]; then
-				CTARGET="${CTARGET:-x86_64}"
-				TARGET_CC="${TARGET_CC:-${CC}}"
-				TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
-				TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
-				export TARGET_CC TARGET_CFLAGS TARGET_CPPFLAGS
-			fi
-			with_platform="--with-platform=efi"
-			;;
-		guessed) ;;
-		*) with_platform="--with-platform=${platform}" ;;
-	esac
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-werror \
-		--program-prefix= \
-		--program-transform-name="s,grub,grub2," \
-		--with-grubdir=grub2 \
-		${with_platform} \
-		$(use_enable debug mm-debug) \
-		$(use_enable debug grub-emu-usb) \
-		$(use_enable device-mapper) \
-		$(use_enable efiemu) \
-		$(use_enable mount grub-mount) \
-		$(use_enable nls) \
-		$(use_enable truetype grub-mkfont) \
-		$(use_enable libzfs) \
-		$(use sdl && use_enable debug grub-emu-sdl)
-
-	estack_pop CTARGET CTARGET || die
-	estack_pop TARGET_CC TARGET_CC || die
-	estack_pop TARGET_CFLAGS TARGET_CFLAGS || die
-	estack_pop TARGET_CPPFLAGS TARGET_CPPFLAGS || die
-}
-
-grub_src_compile() {
-	default_src_compile
-	pax-mark -mpes "${grub_binaries[@]}"
-}
-
-grub_src_install() {
-	default_src_install
-}
-
-src_prepare() {
-	local i j
-
-	epatch_user
-
-	# autogen.sh does more than just run autotools
-	if [[ -n ${DO_AUTORECONF} ]] ; then
-		sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
-		(. ./autogen.sh) || die
-	fi
-
-	# install into the right dir for eselect #372735
-	sed -i \
-		-e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \
-		util/bash-completion.d/Makefile.in || die
-
-	# get enabled platforms
-	GRUB_ENABLED_PLATFORMS=""
-	for i in ${GRUB_PLATFORMS[@]}; do
-		use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
-	done
-	[[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
-	elog "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
-}
-
-src_configure() {
-	local i
-
-	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
-	use libzfs && addpredict /etc/dfs
-	use static && append-ldflags -static
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-}
-
-src_compile() {
-	# Used for pax marking in grub_src_compile
-	local grub_binaries=(
-		grub-editenv
-		grub-fstest
-		grub-menulst2cfg
-		grub-mkimage
-		grub-mklayout
-		grub-mkpasswd-pbkdf2
-		grub-mkrelpath
-		grub-script-check
-		grub-bios-setup
-		grub-ofpathname
-		grub-probe
-		grub-sparc64-setup
-	)
-	use mount && grub_binaries+=( grub-mount )
-	use truetype && grub_binaries+=( grub-mkfont )
-
-	local i
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-}
-
-src_install() {
-	local i
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-
-	mv "${ED}"usr/share/info/grub{,2}.info || die
-
-	# can't be in docs array as we use default_src_install in different builddir
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	insinto /etc/default
-	newins "${FILESDIR}"/grub.default grub
-}
-
-pkg_postinst() {
-	# display the link to guide
-	elog "For information on how to configure grub-2 please refer to the guide:"
-	elog "    http://wiki.gentoo.org/wiki/GRUB2"
-}
diff --git a/sys-boot/grub/grub-2.00_beta3-r2.ebuild b/sys-boot/grub/grub-2.00_beta3-r2.ebuild
deleted file mode 100644
index 1283d35531b0..000000000000
--- a/sys-boot/grub/grub-2.00_beta3-r2.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# 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_beta3-r2.ebuild,v 1.2 2012/04/28 03:23:03 floppym Exp $
-
-EAPI=4
-
-if [[ ${PV} == "9999" ]] ; then
-	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
-	LIVE_ECLASS="bzr"
-	SRC_URI=""
-	DO_AUTORECONF="true"
-else
-	MY_P=${P/_/\~}
-	if [[ ${PV} == *_alpha* || ${PV} == *_beta* ]]; then
-		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
-	else
-		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-		mirror://gentoo/${MY_P}.tar.xz"
-	fi
-	# Masked until documentation guys consolidate the guide and approve
-	# it for usage.
-	#KEYWORDS="~amd64 ~mips ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
-unset LIVE_ECLASS
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-
-LICENSE="GPL-3"
-SLOT="2"
-IUSE="custom-cflags debug device-mapper efiemu mount nls static sdl truetype libzfs"
-
-GRUB_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_PLATFORMS[@]/#/grub_platforms_}"
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
-	dev-libs/libisoburn
-	dev-libs/lzo
-	sys-boot/os-prober
-	>=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
-		>=media-fonts/unifont-5
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/python-2.5.2
-	sys-devel/flex
-	virtual/yacc
-	sys-apps/texinfo
-	static? (
-		truetype? (
-			app-arch/bzip2[static-libs(+)]
-			media-libs/freetype[static-libs(+)]
-			sys-libs/zlib[static-libs(+)]
-		)
-	)
-"
-RDEPEND+="
-	grub_platforms_efi-32? ( sys-boot/efibootmgr )
-	grub_platforms_efi-64? ( sys-boot/efibootmgr )
-"
-if [[ -n ${DO_AUTORECONF} ]] ; then
-	DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
-else
-	DEPEND+=" app-arch/xz-utils"
-fi
-
-export STRIP_MASK="*/grub/*/*.{mod,img}"
-
-QA_EXECSTACK="
-	usr/bin/grub*
-	usr/sbin/grub*
-	usr/lib*/grub/*/*.mod
-	usr/lib*/grub/*/kernel.exec
-	usr/lib*/grub/*/kernel.img
-	usr/lib*/grub/*/setjmp.module
-"
-
-QA_WX_LOAD="
-	usr/lib*/grub/*/kernel.exec
-	usr/lib*/grub/*/kernel.img
-	usr/lib*/grub/*/*.image
-"
-
-QA_PRESTRIPPED="
-	usr/lib.*/grub/.*/kernel.img
-"
-
-grub_run_phase() {
-	local phase=$1
-	local platform=$2
-	[[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]"
-
-	[[ -d "${WORKDIR}/build-${platform}" ]] || \
-		{ mkdir "${WORKDIR}/build-${platform}" || die ; }
-	pushd "${WORKDIR}/build-${platform}" > /dev/null || die
-
-	echo ">>> Running ${phase} for platform \"${platform}\""
-	echo ">>> Working in: \"${WORKDIR}/build-${platform}\""
-
-	grub_${phase} ${platform}
-
-	popd > /dev/null || die
-}
-
-grub_src_configure() {
-	local platform=$1
-	local with_platform=
-
-	[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
-
-	# Used below for efi cross-building
-	tc-export CC NM OBJCOPY STRIP
-
-	estack_push CTARGET "${CTARGET}"
-	estack_push TARGET_CC "${TARGET_CC}"
-	estack_push TARGET_CFLAGS "${TARGET_CFLAGS}"
-	estack_push TARGET_CPPFLAGS "${TARGET_CPPFLAGS}"
-
-	case ${platform} in
-		efi-32)
-			if [[ ${CHOST} == x86_64* ]]; then
-				CTARGET="${CTARGET:-i386}"
-				TARGET_CC="${TARGET_CC:-${CC}}"
-				export TARGET_CC
-			fi
-			with_platform="--with-platform=efi"
-			;;
-		efi-64)
-			if [[ ${CHOST} == i?86* ]]; then
-				CTARGET="${CTARGET:-x86_64}"
-				TARGET_CC="${TARGET_CC:-${CC}}"
-				TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
-				TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
-				export TARGET_CC TARGET_CFLAGS TARGET_CPPFLAGS
-			fi
-			with_platform="--with-platform=efi"
-			;;
-		guessed) ;;
-		*) with_platform="--with-platform=${platform}" ;;
-	esac
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-werror \
-		--program-prefix= \
-		--program-transform-name="s,grub,grub2," \
-		--with-grubdir=grub2 \
-		${with_platform} \
-		$(use_enable debug mm-debug) \
-		$(use_enable debug grub-emu-usb) \
-		$(use_enable device-mapper) \
-		$(use_enable efiemu) \
-		$(use_enable mount grub-mount) \
-		$(use_enable nls) \
-		$(use_enable truetype grub-mkfont) \
-		$(use_enable libzfs) \
-		$(use sdl && use_enable debug grub-emu-sdl)
-
-	estack_pop CTARGET CTARGET || die
-	estack_pop TARGET_CC TARGET_CC || die
-	estack_pop TARGET_CFLAGS TARGET_CFLAGS || die
-	estack_pop TARGET_CPPFLAGS TARGET_CPPFLAGS || die
-}
-
-grub_src_compile() {
-	default_src_compile
-	pax-mark -mpes "${grub_binaries[@]}"
-}
-
-grub_src_install() {
-	default_src_install
-}
-
-src_prepare() {
-	local i j
-
-	epatch "${FILESDIR}/grub-2.00-10_linux-genkernel.patch"
-	epatch_user
-
-	# autogen.sh does more than just run autotools
-	if [[ -n ${DO_AUTORECONF} ]] ; then
-		sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
-		(. ./autogen.sh) || die
-	fi
-
-	# install into the right dir for eselect #372735
-	sed -i \
-		-e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \
-		util/bash-completion.d/Makefile.in || die
-
-	# get enabled platforms
-	GRUB_ENABLED_PLATFORMS=""
-	for i in ${GRUB_PLATFORMS[@]}; do
-		use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
-	done
-	[[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
-	elog "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
-}
-
-src_configure() {
-	local i
-
-	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
-	use libzfs && addpredict /etc/dfs
-	use static && append-ldflags -static
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-}
-
-src_compile() {
-	# Used for pax marking in grub_src_compile
-	local grub_binaries=(
-		grub-editenv
-		grub-fstest
-		grub-menulst2cfg
-		grub-mkimage
-		grub-mklayout
-		grub-mkpasswd-pbkdf2
-		grub-mkrelpath
-		grub-script-check
-		grub-bios-setup
-		grub-ofpathname
-		grub-probe
-		grub-sparc64-setup
-	)
-	use mount && grub_binaries+=( grub-mount )
-	use truetype && grub_binaries+=( grub-mkfont )
-
-	local i
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-}
-
-src_install() {
-	local i
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-
-	mv "${ED}"usr/share/info/grub{,2}.info || die
-
-	# can't be in docs array as we use default_src_install in different builddir
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	insinto /etc/default
-	newins "${FILESDIR}"/grub.default grub
-}
-
-pkg_postinst() {
-	# display the link to guide
-	elog "For information on how to configure grub-2 please refer to the guide:"
-	elog "    http://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
-}
diff --git a/sys-boot/grub/grub-2.00_beta3.ebuild b/sys-boot/grub/grub-2.00_beta3.ebuild
deleted file mode 100644
index 4f66682c78f0..000000000000
--- a/sys-boot/grub/grub-2.00_beta3.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# 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_beta3.ebuild,v 1.1 2012/04/01 21:28:06 floppym Exp $
-
-EAPI=4
-
-if [[ ${PV} == "9999" ]] ; then
-	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
-	LIVE_ECLASS="bzr"
-	SRC_URI=""
-	DO_AUTORECONF="true"
-else
-	MY_P=${P/_/\~}
-	if [[ ${PV} == *_alpha* || ${PV} == *_beta* ]]; then
-		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
-	else
-		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-		mirror://gentoo/${MY_P}.tar.xz"
-	fi
-	# Masked until documentation guys consolidate the guide and approve
-	# it for usage.
-	#KEYWORDS="~amd64 ~mips ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
-unset LIVE_ECLASS
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-
-LICENSE="GPL-3"
-SLOT="2"
-IUSE="custom-cflags debug device-mapper efiemu mount nls static sdl truetype libzfs"
-
-GRUB_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_PLATFORMS[@]/#/grub_platforms_}"
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
-	dev-libs/libisoburn
-	dev-libs/lzo
-	sys-boot/os-prober
-	>=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 >=media-fonts/unifont-5 )"
-DEPEND="${RDEPEND}
-	>=dev-lang/python-2.5.2
-	sys-devel/flex
-	virtual/yacc
-	sys-apps/texinfo
-"
-RDEPEND+="
-	grub_platforms_efi-32? ( sys-boot/efibootmgr )
-	grub_platforms_efi-64? ( sys-boot/efibootmgr )
-"
-if [[ -n ${DO_AUTORECONF} ]] ; then
-	DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
-else
-	DEPEND+=" app-arch/xz-utils"
-fi
-
-export STRIP_MASK="*/grub/*/*.{mod,img}"
-
-QA_EXECSTACK="
-	usr/bin/grub*
-	usr/sbin/grub*
-	usr/lib*/grub/*/*.mod
-	usr/lib*/grub/*/kernel.exec
-	usr/lib*/grub/*/kernel.img
-	usr/lib*/grub/*/setjmp.module
-"
-
-QA_WX_LOAD="
-	usr/lib*/grub/*/kernel.exec
-	usr/lib*/grub/*/kernel.img
-	usr/lib*/grub/*/*.image
-"
-
-QA_PRESTRIPPED="
-	usr/lib.*/grub/.*/kernel.img
-"
-
-grub_run_phase() {
-	local phase=$1
-	local platform=$2
-	[[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]"
-
-	[[ -d "${WORKDIR}/build-${platform}" ]] || \
-		{ mkdir "${WORKDIR}/build-${platform}" || die ; }
-	pushd "${WORKDIR}/build-${platform}" > /dev/null || die
-
-	echo ">>> Running ${phase} for platform \"${platform}\""
-	echo ">>> Working in: \"${WORKDIR}/build-${platform}\""
-
-	grub_${phase} ${platform}
-
-	popd > /dev/null || die
-}
-
-grub_src_configure() {
-	local platform=$1
-	local with_platform=
-
-	[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
-
-	# Used below for efi cross-building
-	tc-export CC NM OBJCOPY STRIP
-
-	estack_push CTARGET "${CTARGET}"
-	estack_push TARGET_CC "${TARGET_CC}"
-	estack_push TARGET_CFLAGS "${TARGET_CFLAGS}"
-	estack_push TARGET_CPPFLAGS "${TARGET_CPPFLAGS}"
-
-	case ${platform} in
-		efi-32)
-			if [[ ${CHOST} == x86_64* ]]; then
-				CTARGET="${CTARGET:-i386}"
-				TARGET_CC="${TARGET_CC:-${CC}}"
-				export TARGET_CC
-			fi
-			with_platform="--with-platform=efi"
-			;;
-		efi-64)
-			if [[ ${CHOST} == i?86* ]]; then
-				CTARGET="${CTARGET:-x86_64}"
-				TARGET_CC="${TARGET_CC:-${CC}}"
-				TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
-				TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
-				export TARGET_CC TARGET_CFLAGS TARGET_CPPFLAGS
-			fi
-			with_platform="--with-platform=efi"
-			;;
-		guessed) ;;
-		*) with_platform="--with-platform=${platform}" ;;
-	esac
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-werror \
-		--program-prefix= \
-		--program-transform-name="s,grub,grub2," \
-		--with-grubdir=grub2 \
-		${with_platform} \
-		$(use_enable debug mm-debug) \
-		$(use_enable debug grub-emu-usb) \
-		$(use_enable device-mapper) \
-		$(use_enable efiemu) \
-		$(use_enable mount grub-mount) \
-		$(use_enable nls) \
-		$(use_enable truetype grub-mkfont) \
-		$(use_enable libzfs) \
-		$(use sdl && use_enable debug grub-emu-sdl)
-
-	estack_pop CTARGET CTARGET || die
-	estack_pop TARGET_CC TARGET_CC || die
-	estack_pop TARGET_CFLAGS TARGET_CFLAGS || die
-	estack_pop TARGET_CPPFLAGS TARGET_CPPFLAGS || die
-}
-
-grub_src_compile() {
-	default_src_compile
-	pax-mark -mpes "${grub_binaries[@]}"
-}
-
-grub_src_install() {
-	default_src_install
-}
-
-src_prepare() {
-	local i j
-
-	epatch_user
-
-	# autogen.sh does more than just run autotools
-	if [[ -n ${DO_AUTORECONF} ]] ; then
-		sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
-		(. ./autogen.sh) || die
-	fi
-
-	# install into the right dir for eselect #372735
-	sed -i \
-		-e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \
-		util/bash-completion.d/Makefile.in || die
-
-	# get enabled platforms
-	GRUB_ENABLED_PLATFORMS=""
-	for i in ${GRUB_PLATFORMS[@]}; do
-		use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
-	done
-	[[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
-	elog "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
-}
-
-src_configure() {
-	local i
-
-	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
-	use libzfs && addpredict /etc/dfs
-	use static && append-ldflags -static
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-}
-
-src_compile() {
-	# Used for pax marking in grub_src_compile
-	local grub_binaries=(
-		grub-editenv
-		grub-fstest
-		grub-menulst2cfg
-		grub-mkimage
-		grub-mklayout
-		grub-mkpasswd-pbkdf2
-		grub-mkrelpath
-		grub-script-check
-		grub-bios-setup
-		grub-ofpathname
-		grub-probe
-		grub-sparc64-setup
-	)
-	use mount && grub_binaries+=( grub-mount )
-	use truetype && grub_binaries+=( grub-mkfont )
-
-	local i
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-}
-
-src_install() {
-	local i
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-
-	mv "${ED}"usr/share/info/grub{,2}.info || die
-
-	# can't be in docs array as we use default_src_install in different builddir
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	insinto /etc/default
-	newins "${FILESDIR}"/grub.default grub
-}
-
-pkg_postinst() {
-	# display the link to guide
-	elog "For information on how to configure grub-2 please refer to the guide:"
-	elog "    http://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
-}
diff --git a/sys-boot/grub/grub-2.00_beta5.ebuild b/sys-boot/grub/grub-2.00_beta5.ebuild
deleted file mode 100644
index f3aee478864b..000000000000
--- a/sys-boot/grub/grub-2.00_beta5.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# 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_beta5.ebuild,v 1.2 2012/05/18 15:01:23 josejx Exp $
-
-EAPI=4
-
-if [[ ${PV} == "9999" ]] ; then
-	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
-	LIVE_ECLASS="bzr"
-	SRC_URI=""
-	DO_AUTORECONF="true"
-else
-	MY_P=${P/_/\~}
-	if [[ ${PV} == *_alpha* || ${PV} == *_beta* ]]; then
-		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
-	else
-		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-		mirror://gentoo/${MY_P}.tar.xz"
-	fi
-	# Masked until documentation guys consolidate the guide and approve
-	# it for usage.
-	#KEYWORDS="~amd64 ~mips ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
-unset LIVE_ECLASS
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-
-LICENSE="GPL-3"
-SLOT="2"
-IUSE="custom-cflags debug device-mapper efiemu mount nls static sdl truetype libzfs"
-
-GRUB_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_PLATFORMS[@]/#/grub_platforms_}"
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
-	dev-libs/lzo
-	>=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
-		>=media-fonts/unifont-5
-	)
-	ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
-	ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/python-2.5.2
-	sys-devel/flex
-	virtual/yacc
-	sys-apps/texinfo
-	static? (
-		truetype? (
-			app-arch/bzip2[static-libs(+)]
-			media-libs/freetype[static-libs(+)]
-			sys-libs/zlib[static-libs(+)]
-		)
-	)
-"
-RDEPEND+="
-	grub_platforms_efi-32? ( sys-boot/efibootmgr )
-	grub_platforms_efi-64? ( sys-boot/efibootmgr )
-"
-if [[ -n ${DO_AUTORECONF} ]] ; then
-	DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
-else
-	DEPEND+=" app-arch/xz-utils"
-fi
-
-export STRIP_MASK="*/grub/*/*.{mod,img}"
-
-QA_EXECSTACK="
-	usr/bin/grub*
-	usr/sbin/grub*
-	usr/lib*/grub/*/*.mod
-	usr/lib*/grub/*/kernel.exec
-	usr/lib*/grub/*/kernel.img
-	usr/lib*/grub/*/setjmp.module
-"
-
-QA_WX_LOAD="
-	usr/lib*/grub/*/kernel.exec
-	usr/lib*/grub/*/kernel.img
-	usr/lib*/grub/*/*.image
-"
-
-QA_PRESTRIPPED="
-	usr/lib.*/grub/.*/kernel.img
-"
-
-grub_run_phase() {
-	local phase=$1
-	local platform=$2
-	[[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]"
-
-	[[ -d "${WORKDIR}/build-${platform}" ]] || \
-		{ mkdir "${WORKDIR}/build-${platform}" || die ; }
-	pushd "${WORKDIR}/build-${platform}" > /dev/null || die
-
-	echo ">>> Running ${phase} for platform \"${platform}\""
-	echo ">>> Working in: \"${WORKDIR}/build-${platform}\""
-
-	grub_${phase} ${platform}
-
-	popd > /dev/null || die
-}
-
-grub_src_configure() {
-	local platform=$1
-	local with_platform=
-
-	[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
-
-	# Used below for efi cross-building
-	tc-export CC NM OBJCOPY STRIP
-
-	estack_push CTARGET "${CTARGET}"
-	estack_push TARGET_CC "${TARGET_CC}"
-	estack_push TARGET_CFLAGS "${TARGET_CFLAGS}"
-	estack_push TARGET_CPPFLAGS "${TARGET_CPPFLAGS}"
-
-	case ${platform} in
-		efi-32)
-			if [[ ${CHOST} == x86_64* ]]; then
-				CTARGET="${CTARGET:-i386}"
-				TARGET_CC="${TARGET_CC:-${CC}}"
-				export TARGET_CC
-			fi
-			with_platform="--with-platform=efi"
-			;;
-		efi-64)
-			if [[ ${CHOST} == i?86* ]]; then
-				CTARGET="${CTARGET:-x86_64}"
-				TARGET_CC="${TARGET_CC:-${CC}}"
-				TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
-				TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
-				export TARGET_CC TARGET_CFLAGS TARGET_CPPFLAGS
-			fi
-			with_platform="--with-platform=efi"
-			;;
-		guessed) ;;
-		*) with_platform="--with-platform=${platform}" ;;
-	esac
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-werror \
-		--program-prefix= \
-		--program-transform-name="s,grub,grub2," \
-		--with-grubdir=grub2 \
-		${with_platform} \
-		$(use_enable debug mm-debug) \
-		$(use_enable debug grub-emu-usb) \
-		$(use_enable device-mapper) \
-		$(use_enable efiemu) \
-		$(use_enable mount grub-mount) \
-		$(use_enable nls) \
-		$(use_enable truetype grub-mkfont) \
-		$(use_enable libzfs) \
-		$(use sdl && use_enable debug grub-emu-sdl)
-
-	estack_pop CTARGET CTARGET || die
-	estack_pop TARGET_CC TARGET_CC || die
-	estack_pop TARGET_CFLAGS TARGET_CFLAGS || die
-	estack_pop TARGET_CPPFLAGS TARGET_CPPFLAGS || die
-}
-
-grub_src_compile() {
-	default_src_compile
-	pax-mark -mpes "${grub_binaries[@]}"
-}
-
-grub_src_install() {
-	default_src_install
-}
-
-src_prepare() {
-	local i j
-
-	epatch_user
-
-	# autogen.sh does more than just run autotools
-	if [[ -n ${DO_AUTORECONF} ]] ; then
-		sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
-		(. ./autogen.sh) || die
-	fi
-
-	# install into the right dir for eselect #372735
-	sed -i \
-		-e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \
-		util/bash-completion.d/Makefile.in || die
-
-	# get enabled platforms
-	GRUB_ENABLED_PLATFORMS=""
-	for i in ${GRUB_PLATFORMS[@]}; do
-		use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
-	done
-	[[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
-	elog "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
-}
-
-src_configure() {
-	local i
-
-	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
-	use libzfs && addpredict /etc/dfs
-	use static && append-ldflags -static
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-}
-
-src_compile() {
-	# Used for pax marking in grub_src_compile
-	local grub_binaries=(
-		grub-editenv
-		grub-fstest
-		grub-menulst2cfg
-		grub-mkimage
-		grub-mklayout
-		grub-mkpasswd-pbkdf2
-		grub-mkrelpath
-		grub-script-check
-		grub-bios-setup
-		grub-ofpathname
-		grub-probe
-		grub-sparc64-setup
-	)
-	use mount && grub_binaries+=( grub-mount )
-	use truetype && grub_binaries+=( grub-mkfont )
-
-	local i
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-}
-
-src_install() {
-	local i
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-
-	mv "${ED}"usr/share/info/grub{,2}.info || die
-
-	# can't be in docs array as we use default_src_install in different builddir
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	insinto /etc/default
-	newins "${FILESDIR}"/grub.default grub
-}
-
-pkg_postinst() {
-	# display the link to guide
-	elog "For information on how to configure grub-2 please refer to the guide:"
-	elog "    http://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
-	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
-}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 33ce15d5dc3b..bbf63a57710a 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.68 2012/06/25 03:53:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.69 2012/06/28 10:10:04 scarabeus Exp $
 
 EAPI=4
 
@@ -60,6 +60,7 @@ RDEPEND="
 	mount? ( sys-fs/fuse )
 	truetype? (
 		media-libs/freetype
+		media-fonts/dejavu
 		>=media-fonts/unifont-5
 	)
 	ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
@@ -287,7 +288,7 @@ src_install() {
 	# can't be in docs array as we use default_src_install in different builddir
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 	insinto /etc/default
-	newins "${FILESDIR}"/grub.default grub
+	newins "${FILESDIR}"/grub.default-2 grub
 }
 
 pkg_postinst() {