Punt the grub2 that is now in main tree.

5 files changed, 0 insertions, 573 deletions

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
deleted file mode 100644
index d044211..0000000
--- a/sys-boot/grub/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX grub.default 1130 RMD160 6df056d7bcbaf75783921c5c45bcf3544d284f58 SHA1 c62cb61c4d96ca9780ea559d1d38fce91197c701 SHA256 8e2cc8c02135a13d4401971ce9955039cc0dc7ceb045e3eff8ba673fceef6bb9
-DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b
-EBUILD grub-1.99.ebuild 6825 RMD160 b193fb9a62d7771eab5889536038087774043453 SHA1 ba1b1d8840f54cc24c4e3dd1c3cabcbc00a43cbb SHA256 9f3ef5420e59be7fb315fa1564944e64d0b604bd80c01c6040570eab8d16eef5
-EBUILD grub-9999.ebuild 6825 RMD160 483e67ef34a0e461364f8a7f2c9f6d08a4fa940c SHA1 21969690c51c7b1da3e0d35899d993c701e44f74 SHA256 c5e0fb767a1d968eb0974e7bfaa26c9763baa8122ed70c7d7f31af8cbef0e9dc
-MISC metadata.xml 264 RMD160 3cb995676f964b9637fbfc0027a81b9409802608 SHA1 c4d35e3a71c545cdf1aae525de803126bf54f596 SHA256 9bd1ce830cf1b821978ab90c81b2e369177a8d7c1bfe2dd2868419872c097f64
diff --git a/sys-boot/grub/files/grub.default b/sys-boot/grub/files/grub.default
deleted file mode 100644
index 07972d9..0000000
--- a/sys-boot/grub/files/grub.default
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-#
-# 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_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
-
-# 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 Linux
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entrys
-#GRUB_DISABLE_RECOVERY=true
diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99.ebuild
deleted file mode 100644
index fcd5df1..0000000
--- a/sys-boot/grub/grub-1.99.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-if [[ ${PV} == "9999" ]] ; then
-	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
-	LIVE_ECLASS="autotools bzr"
-	SRC_URI=""
-else
-	MY_P=${P/_/\~}
-	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-		mirror://gentoo/${MY_P}.tar.xz"
-	S=${WORKDIR}/${MY_P}
-fi
-
-inherit mount-boot eutils flag-o-matic toolchain-funcs ${LIVE_ECLASS}
-unset LIVE_ECLASS
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-
-LICENSE="GPL-3"
-SLOT="2"
-[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86 ~mips ~ppc ~ppc64"
-IUSE="custom-cflags debug device-mapper nls static sdl truetype"
-
-GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
-# everywhere:
-#     emu
-# mips only:
-#     qemu-mips, yeeloong
-# amd64, x86, ppc, ppc64
-#     ieee1275
-# amd64, x86
-#     coreboot, multiboot, efi-32, pc, qemu
-# amd64
-#     efi-64
-for i in ${GRUB_PLATFORMS}; do
-	IUSE+=" grub_platforms_${i}"
-done
-unset i
-
-# 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 )
-	truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
-DEPEND="${RDEPEND}
-	>=dev-lang/python-2.5.2
-"
-if [[ ${PV} == "9999" ]]; 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="
-	lib64/grub2/*/setjmp.mod
-	lib64/grub2/*/kernel.img
-	sbin/grub2-probe
-	sbin/grub2-setup
-	sbin/grub2-mkdevicemap
-	bin/grub2-script-check
-	bin/grub2-fstest
-	bin/grub2-mklayout
-	bin/grub2-menulst2cfg
-	bin/grub2-mkrelpath
-	bin/grub2-mkpasswd-pbkdf2
-	bin/grub2-mkfont
-	bin/grub2-editenv
-	bin/grub2-mkimage
-"
-
-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
-
-	[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
-
-	# if we have no platform then --with-platform=guessed does not work
-	[[ ${platform} == "guessed" ]] && platform=""
-
-	# check if we have to specify the target (EFI)
-	# or just append correct --with-platform
-	if [[ -n ${platform} ]]; then
-		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
-			platform="
-				--with-platform=${platform/-*}
-				--target=${target}
-				--program-prefix=
-			"
-		else
-			platform=" --with-platform=${platform}"
-		fi
-	fi
-
-	ECONF_SOURCE="${WORKDIR}/${P}/" \
-	econf \
-		--disable-werror \
-		--sbindir=/sbin \
-		--bindir=/bin \
-		--libdir=/$(get_libdir) \
-		--disable-efiemu \
-		--program-transform-name=s,grub,grub2, \
-		$(use_enable device-mapper) \
-		$(use_enable truetype grub-mkfont) \
-		$(use_enable nls) \
-		$(use_enable debug mm-debug) \
-		$(use sdl && use_enable debug grub-emu-sdl) \
-		$(use_enable debug grub-emu-usb) \
-		${platform}
-}
-
-grub_src_compile() {
-	default_src_compile
-}
-
-grub_src_install() {
-	default_src_install
-}
-
-src_prepare() {
-	local i j archs
-
-	epatch_user
-
-	# autogen.sh does more than just run autotools
-	if [[ ${PV} == "9999" ]] ; 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"
-	einfo "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
-}
-
-src_configure() {
-	local i
-
-	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
-	use static && append-ldflags -static
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-}
-
-src_compile() {
-	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
-
-	# slot all collisions with grub legacy
-	mv "${ED}"/usr/share/info/grub.info \
-		"${ED}"/usr/share/info/grub2.info || die
-
-	# can't be in docs array as we use defualt_src_install in different builddir
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	insinto /etc/default
-	newins "${FILESDIR}"/grub.default grub
-	cat <<EOF >> "${ED}"/lib*/grub2/grub-mkconfig_lib
-	GRUB_DISTRIBUTOR="Gentoo"
-EOF
-}
-
-setup_boot_dir() {
-	local dir=$1
-
-	if [[ ! -e ${dir}/grub.cfg ]]; then
-		# display the link to guide if user didn't set up anything yet.
-		elog "For informations how to configure grub-2 please reffer to the guide:"
-		elog "    http://dev.gentoo.org/~scarabeus/grub-2-guide.xml"
-	fi
-
-	if [[ ! -e ${dir}/grub.cfg && -e ${dir/2/}/menu.lst ]] ; then
-		# This is first grub2 install and we have old configuraton for
-		# grub1 around. Lets try to generate grub.cfg from it so user
-		# does not loose any stuff when rebooting.
-		# NOTE: in long term he still NEEDS to migrate to grub.d stuff.
-		einfo "Running: grub2-menulst2cfg '${dir/2/}/menu.lst' '${dir}/grub.cfg'"
-		grub2-menulst2cfg "${dir/2/}/menu.lst" "${dir}/grub.cfg" || \
-			ewarn "Running grub2-menulst2cfg failed!"
-
-		einfo "Even if we just created configuration for your grub-2 using old"
-		einfo "grub-1 configuration file you should migrate to use new style"
-		einfo "configuration in '${ROOT}/etc/grub.d'."
-		einfo
-
-	else
-		# we need to refresh the grub.cfg everytime just to play it safe
-		einfo "Running: grub2-mkconfig -o '${dir}/grub.cfg'"
-		grub2-mkconfig -o "${dir}/grub.cfg" || \
-			ewarn "Running grub2-mkconfig failed! Check your configuration files!"
-	fi
-
-	elog "Remember to run \"grub2-mkconfig -o '${dir}/grub.cfg'\" every time"
-	elog "you update the configuration files!"
-
-	elog "Remember to run grub2-install to install your grub every time"
-	elog "you update this package!"
-}
-
-pkg_postinst() {
-	mount-boot_mount_boot_partition
-
-	setup_boot_dir "${ROOT}"boot/grub2
-
-	# needs to be called after we call setup_boot_dir
-	mount-boot_pkg_postinst
-}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
deleted file mode 100644
index c841ea8..0000000
--- a/sys-boot/grub/grub-9999.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-if [[ ${PV} == "9999" ]] ; then
-	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
-	LIVE_ECLASS="autotools bzr"
-	SRC_URI=""
-else
-	MY_P=${P/_/\~}
-	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-		mirror://gentoo/${MY_P}.tar.xz"
-	S=${WORKDIR}/${MY_P}
-fi
-
-inherit mount-boot eutils flag-o-matic toolchain-funcs ${LIVE_ECLASS}
-unset LIVE_ECLASS
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-
-LICENSE="GPL-3"
-SLOT="2"
-[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86 ~mips ~ppc ~ppc64"
-IUSE="custom-cflags debug device-mapper nls static sdl truetype"
-
-GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips loongson"
-# everywhere:
-#     emu
-# mips only:
-#     qemu-mips, loongson
-# amd64, x86, ppc, ppc64
-#     ieee1275
-# amd64, x86
-#     coreboot, multiboot, efi-32, pc, qemu
-# amd64
-#     efi-64
-for i in ${GRUB_PLATFORMS}; do
-	IUSE+=" grub_platforms_${i}"
-done
-unset i
-
-# 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 )
-	truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
-DEPEND="${RDEPEND}
-	>=dev-lang/python-2.5.2
-"
-if [[ ${PV} == "9999" ]]; 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="
-	lib64/grub2/*/setjmp.mod
-	lib64/grub2/*/kernel.img
-	sbin/grub2-probe
-	sbin/grub2-setup
-	sbin/grub2-mkdevicemap
-	bin/grub2-script-check
-	bin/grub2-fstest
-	bin/grub2-mklayout
-	bin/grub2-menulst2cfg
-	bin/grub2-mkrelpath
-	bin/grub2-mkpasswd-pbkdf2
-	bin/grub2-mkfont
-	bin/grub2-editenv
-	bin/grub2-mkimage
-"
-
-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
-
-	[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
-
-	# if we have no platform then --with-platform=guessed does not work
-	[[ ${platform} == "guessed" ]] && platform=""
-
-	# check if we have to specify the target (EFI)
-	# or just append correct --with-platform
-	if [[ -n ${platform} ]]; then
-		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
-			platform="
-				--with-platform=${platform/-*}
-				--target=${target}
-				--program-prefix=
-			"
-		else
-			platform=" --with-platform=${platform}"
-		fi
-	fi
-
-	ECONF_SOURCE="${WORKDIR}/${P}/" \
-	econf \
-		--disable-werror \
-		--sbindir=/sbin \
-		--bindir=/bin \
-		--libdir=/$(get_libdir) \
-		--disable-efiemu \
-		--program-transform-name=s,grub,grub2, \
-		$(use_enable device-mapper) \
-		$(use_enable truetype grub-mkfont) \
-		$(use_enable nls) \
-		$(use_enable debug mm-debug) \
-		$(use sdl && use_enable debug grub-emu-sdl) \
-		$(use_enable debug grub-emu-usb) \
-		${platform}
-}
-
-grub_src_compile() {
-	default_src_compile
-}
-
-grub_src_install() {
-	default_src_install
-}
-
-src_prepare() {
-	local i j archs
-
-	epatch_user
-
-	# autogen.sh does more than just run autotools
-	if [[ ${PV} == "9999" ]] ; 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"
-	einfo "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
-}
-
-src_configure() {
-	local i
-
-	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
-	use static && append-ldflags -static
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-}
-
-src_compile() {
-	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
-
-	# slot all collisions with grub legacy
-	mv "${ED}"/usr/share/info/grub.info \
-		"${ED}"/usr/share/info/grub2.info || die
-
-	# can't be in docs array as we use defualt_src_install in different builddir
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	insinto /etc/default
-	newins "${FILESDIR}"/grub.default grub
-	cat <<EOF >> "${ED}"/lib*/grub2/grub-mkconfig_lib
-	GRUB_DISTRIBUTOR="Gentoo"
-EOF
-}
-
-setup_boot_dir() {
-	local dir=$1
-
-	if [[ ! -e ${dir}/grub.cfg ]]; then
-		# display the link to guide if user didn't set up anything yet.
-		elog "For informations how to configure grub-2 please reffer to the guide:"
-		elog "    http://dev.gentoo.org/~scarabeus/grub-2-guide.xml"
-	fi
-
-	if [[ ! -e ${dir}/grub.cfg && -e ${dir/2/}/menu.lst ]] ; then
-		# This is first grub2 install and we have old configuraton for
-		# grub1 around. Lets try to generate grub.cfg from it so user
-		# does not loose any stuff when rebooting.
-		# NOTE: in long term he still NEEDS to migrate to grub.d stuff.
-		einfo "Running: grub2-menulst2cfg '${dir/2/}/menu.lst' '${dir}/grub.cfg'"
-		grub2-menulst2cfg "${dir/2/}/menu.lst" "${dir}/grub.cfg" || \
-			ewarn "Running grub2-menulst2cfg failed!"
-
-		einfo "Even if we just created configuration for your grub-2 using old"
-		einfo "grub-1 configuration file you should migrate to use new style"
-		einfo "configuration in '${ROOT}/etc/grub.d'."
-		einfo
-
-	else
-		# we need to refresh the grub.cfg everytime just to play it safe
-		einfo "Running: grub2-mkconfig -o '${dir}/grub.cfg'"
-		grub2-mkconfig -o "${dir}/grub.cfg" || \
-			ewarn "Running grub2-mkconfig failed! Check your configuration files!"
-	fi
-
-	elog "Remember to run \"grub2-mkconfig -o '${dir}/grub.cfg'\" every time"
-	elog "you update the configuration files!"
-
-	elog "Remember to run grub2-install to install your grub every time"
-	elog "you update this package!"
-}
-
-pkg_postinst() {
-	mount-boot_mount_boot_partition
-
-	setup_boot_dir "${ROOT}"boot/grub2
-
-	# needs to be called after we call setup_boot_dir
-	mount-boot_pkg_postinst
-}
diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
deleted file mode 100644
index c2003e9..0000000
--- a/sys-boot/grub/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-<use>
-  <flag name='device-mapper'>Enable support for <pkg>sys-fs/device-mapper</pkg></flag>
-</use>
-</pkgmetadata>