summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-08-24 22:52:09 +0000
committerMike Frysinger <vapier@gentoo.org>2010-08-24 22:52:09 +0000
commit187270958e60cd294bdbf9b2693990ffb91c0bdf (patch)
treeef85d63da3cb38fdcab3b2d6c69f80da763ee835 /sys-boot
parentStable on amd64 wrt bug #334121 (diff)
downloadgentoo-2-187270958e60cd294bdbf9b2693990ffb91c0bdf.tar.gz
gentoo-2-187270958e60cd294bdbf9b2693990ffb91c0bdf.tar.bz2
gentoo-2-187270958e60cd294bdbf9b2693990ffb91c0bdf.zip
Redo autotool generation now that upstream uses python/autogen #334333.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/ChangeLog5
-rw-r--r--sys-boot/grub/grub-9999.ebuild10
2 files changed, 8 insertions, 7 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index ca9249ff5810..a1a5713633e2 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.142 2010/08/22 19:58:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.143 2010/08/24 22:52:09 vapier Exp $
+
+ 24 Aug 2010; Mike Frysinger <vapier@gentoo.org> grub-9999.ebuild:
+ Redo autotool generation now that upstream uses python/autogen #334333.
22 Aug 2010; Mike Frysinger <vapier@gentoo.org> grub-9999.ebuild:
Force recent unifont version #333343 by tormen.
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 05de1490426d..d77266efff02 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
# 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.24 2010/08/22 19:58:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.25 2010/08/24 22:52:09 vapier Exp $
# XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
@@ -27,7 +27,8 @@ RDEPEND=">=sys-libs/ncurses-5.2-r5
dev-libs/lzo
truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
DEPEND="${RDEPEND}
- dev-lang/ruby"
+ >=sys-devel/autogen-5.10
+ >=dev-lang/python-2.5.2"
PROVIDE="virtual/bootloader"
export STRIP_MASK="*/grub/*/*.mod"
@@ -46,10 +47,7 @@ src_unpack() {
# autogen.sh does more than just run autotools
# need to eautomake due to weirdness #296013
if [[ ${PV} == "9999" ]] ; then
- sed -i \
- -e '/^\(auto\|ac\)/s:^:e:' \
- -e "s:^eautomake:`which automake`:" \
- autogen.sh
+ sed -i -e '/^autoreconf/s:^:e:' autogen.sh || die
(. ./autogen.sh) || die
fi
}