From 7c94f59bc97c480eb2e6d338f27a97af70126dd6 Mon Sep 17 00:00:00 2001
From: randomdan <randomdan@localhost>
Date: Sun, 14 Nov 2010 15:05:54 +0000
Subject: Use a specific revision.. one that works

---
 sys-boot/grub/grub-9999-r2931.ebuild | 110 +++++++++++++++++++++++++++++++++++
 sys-boot/grub/grub-9999.ebuild       | 109 ----------------------------------
 2 files changed, 110 insertions(+), 109 deletions(-)
 create mode 100644 sys-boot/grub/grub-9999-r2931.ebuild
 delete mode 100644 sys-boot/grub/grub-9999.ebuild

diff --git a/sys-boot/grub/grub-9999-r2931.ebuild b/sys-boot/grub/grub-9999-r2931.ebuild
new file mode 100644
index 0000000..6f34bbf
--- /dev/null
+++ b/sys-boot/grub/grub-9999-r2931.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2010 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.26 2010/10/07 04:22:11 vapier Exp $
+
+# XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
+
+inherit mount-boot eutils flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub"
+	EBZR_REVISION="2931"
+	inherit autotools bzr
+	SRC_URI=""
+else
+	SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
+		mirror://gentoo/${P}.tar.gz"
+fi
+
+DESCRIPTION="GNU GRUB 2 boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+
+LICENSE="GPL-3"
+use multislot && SLOT="2" || SLOT="0"
+KEYWORDS=""
+IUSE="custom-cflags debug truetype multislot static"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5
+	dev-libs/lzo
+	truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autogen-5.10
+	>=dev-lang/python-2.5.2"
+[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
+PROVIDE="virtual/bootloader"
+
+export STRIP_MASK="*/grub/*/*.mod"
+QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check bin/grub-fstest"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		bzr_src_unpack
+	else
+		unpack ${A}
+	fi
+	cd "${S}"
+	epatch_user
+
+	# autogen.sh does more than just run autotools
+	# need to eautomake due to weirdness #296013
+	if [[ ${PV} == "9999" ]] ; then
+		sed -i -e '/^autoreconf/s:^:e:' autogen.sh || die
+		(. ./autogen.sh) || die
+	fi
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
+	use static && append-ldflags -static
+
+	econf \
+		--disable-werror \
+		--sbindir=/sbin \
+		--bindir=/bin \
+		--libdir=/$(get_libdir) \
+		--disable-efiemu \
+		$(use_enable truetype grub-mkfont) \
+		$(use_enable debug mm-debug) \
+		$(use_enable debug grub-emu) \
+		$(use_enable debug grub-emu-usb) \
+		$(use_enable debug grub-fstest)
+	emake -j1 || die "making regular stuff"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
+	GRUB_DISTRIBUTOR="Gentoo"
+	EOF
+	if use multislot ; then
+		sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
+		mv "${D}"/sbin/grub{,2}-install || die
+		mv "${D}"/sbin/grub{,2}-set-default || die
+		mv "${D}"/usr/share/man/man8/grub{,2}-install.8 || die
+		mv "${D}"/usr/share/info/grub{,2}.info || die
+	fi
+}
+
+setup_boot_dir() {
+	local boot_dir=$1
+	local dir=${boot_dir}/grub
+
+	if [[ ! -e ${dir}/grub.cfg ]] ; then
+		einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
+		grub-mkconfig -o "${dir}/grub.cfg"
+	fi
+
+	#local install=grub-install
+	#use multislot && install="grub2-install --grub-setup=/bin/true"
+	#einfo "Running: ${install} "
+	#${install}
+}
+
+pkg_postinst() {
+	if use multislot ; then
+		elog "You have installed grub2 with USE=multislot, so to coexist"
+		elog "with grub1, the grub2 install binary is named grub2-install."
+	fi
+	setup_boot_dir "${ROOT}"boot
+}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
deleted file mode 100644
index 6db2d3d..0000000
--- a/sys-boot/grub/grub-9999.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2010 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.26 2010/10/07 04:22:11 vapier Exp $
-
-# XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
-
-inherit mount-boot eutils flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub"
-	inherit autotools bzr
-	SRC_URI=""
-else
-	SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
-		mirror://gentoo/${P}.tar.gz"
-fi
-
-DESCRIPTION="GNU GRUB 2 boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-
-LICENSE="GPL-3"
-use multislot && SLOT="2" || SLOT="0"
-KEYWORDS=""
-IUSE="custom-cflags debug truetype multislot static"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5
-	dev-libs/lzo
-	truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autogen-5.10
-	>=dev-lang/python-2.5.2"
-[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
-PROVIDE="virtual/bootloader"
-
-export STRIP_MASK="*/grub/*/*.mod"
-QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check bin/grub-fstest"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		bzr_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	epatch_user
-
-	# autogen.sh does more than just run autotools
-	# need to eautomake due to weirdness #296013
-	if [[ ${PV} == "9999" ]] ; then
-		sed -i -e '/^autoreconf/s:^:e:' autogen.sh || die
-		(. ./autogen.sh) || die
-	fi
-}
-
-src_compile() {
-	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
-	use static && append-ldflags -static
-
-	econf \
-		--disable-werror \
-		--sbindir=/sbin \
-		--bindir=/bin \
-		--libdir=/$(get_libdir) \
-		--disable-efiemu \
-		$(use_enable truetype grub-mkfont) \
-		$(use_enable debug mm-debug) \
-		$(use_enable debug grub-emu) \
-		$(use_enable debug grub-emu-usb) \
-		$(use_enable debug grub-fstest)
-	emake -j1 || die "making regular stuff"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
-	GRUB_DISTRIBUTOR="Gentoo"
-	EOF
-	if use multislot ; then
-		sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
-		mv "${D}"/sbin/grub{,2}-install || die
-		mv "${D}"/sbin/grub{,2}-set-default || die
-		mv "${D}"/usr/share/man/man8/grub{,2}-install.8 || die
-		mv "${D}"/usr/share/info/grub{,2}.info || die
-	fi
-}
-
-setup_boot_dir() {
-	local boot_dir=$1
-	local dir=${boot_dir}/grub
-
-	if [[ ! -e ${dir}/grub.cfg ]] ; then
-		einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
-		grub-mkconfig -o "${dir}/grub.cfg"
-	fi
-
-	#local install=grub-install
-	#use multislot && install="grub2-install --grub-setup=/bin/true"
-	#einfo "Running: ${install} "
-	#${install}
-}
-
-pkg_postinst() {
-	if use multislot ; then
-		elog "You have installed grub2 with USE=multislot, so to coexist"
-		elog "with grub1, the grub2 install binary is named grub2-install."
-	fi
-	setup_boot_dir "${ROOT}"boot
-}
-- 
cgit v1.2.3