summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-09-21 14:28:53 +0000
committerMike Frysinger <vapier@gentoo.org>2006-09-21 14:28:53 +0000
commit0e63ec7048469a942a815c2038fb15d9b4652a3b (patch)
treedfa5c249fabb726f438fd7e01088e60d3d9a4e00 /sys-boot/grub
parentLDFLAGS='-Wl,-O1' breaks the compile. (diff)
downloadgentoo-2-0e63ec7048469a942a815c2038fb15d9b4652a3b.tar.gz
gentoo-2-0e63ec7048469a942a815c2038fb15d9b4652a3b.tar.bz2
gentoo-2-0e63ec7048469a942a815c2038fb15d9b4652a3b.zip
autotool updates
(Portage version: 2.1.2_pre1)
Diffstat (limited to 'sys-boot/grub')
-rw-r--r--sys-boot/grub/grub-0.97-r2.ebuild4
-rw-r--r--sys-boot/grub/grub-0.97-r3.ebuild17
2 files changed, 8 insertions, 13 deletions
diff --git a/sys-boot/grub/grub-0.97-r2.ebuild b/sys-boot/grub/grub-0.97-r2.ebuild
index 9f73c4bcf9bc..16812e7fff20 100644
--- a/sys-boot/grub/grub-0.97-r2.ebuild
+++ b/sys-boot/grub/grub-0.97-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild,v 1.8 2006/08/30 05:14:08 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild,v 1.9 2006/09/21 14:28:53 vapier Exp $
inherit mount-boot eutils flag-o-matic toolchain-funcs
@@ -19,7 +19,7 @@ IUSE="static netboot custom-cflags"
RDEPEND=">=sys-libs/ncurses-5.2-r5"
DEPEND="${RDEPEND}
- >=sys-devel/automake-1.7
+ =sys-devel/automake-1.9*
>=sys-devel/autoconf-2.5"
PROVIDE="virtual/bootloader"
diff --git a/sys-boot/grub/grub-0.97-r3.ebuild b/sys-boot/grub/grub-0.97-r3.ebuild
index 9ac670133302..070c636fd764 100644
--- a/sys-boot/grub/grub-0.97-r3.ebuild
+++ b/sys-boot/grub/grub-0.97-r3.ebuild
@@ -1,8 +1,10 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r3.ebuild,v 1.2 2006/09/10 04:45:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r3.ebuild,v 1.3 2006/09/21 14:28:53 vapier Exp $
-inherit mount-boot eutils flag-o-matic toolchain-funcs
+WANT_AUTOCONF="2.5"
+WANT_AUTOMAKE="1.9"
+inherit mount-boot eutils flag-o-matic toolchain-funcs autotools
PATCHVER="1.3"
DESCRIPTION="GNU GRUB Legacy boot loader"
@@ -17,10 +19,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="static netboot custom-cflags"
-RDEPEND=">=sys-libs/ncurses-5.2-r5"
-DEPEND="${RDEPEND}
- >=sys-devel/automake-1.7
- >=sys-devel/autoconf-2.5"
+DEPEND=">=sys-libs/ncurses-5.2-r5"
PROVIDE="virtual/bootloader"
src_unpack() {
@@ -33,11 +32,7 @@ src_unpack() {
if [[ -n ${PATCHVER} ]] ; then
EPATCH_SUFFIX="patch"
epatch "${WORKDIR}"/patch
-
- # a bunch of patches apply to raw autotool files
- autoconf || die "autoconf failed"
- aclocal || die "aclocal failed"
- automake || die "automake failed"
+ eautoreconf
fi
}