Adding automake-1.7 dep as per bug 63509

5 files changed, 17 insertions, 10 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 93f6b3e52961..d7a050baefea 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.24 2004/09/05 20:40:39 robmoss Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.25 2004/09/12 16:59:34 robmoss Exp $
+
+  12 Sep 2004; <rmoss@gentoo.org> grub-0.94-r1.ebuild, grub-0.94-r2.ebuild,
+  grub-0.95.20040823.ebuild:
+  Adding >=automake-1.7 dep for grub-0.9{4,5} as per bug 63509.
 
   05 Sep 2004; <rmoss@gentoo.org> grub-0.95.20040823.ebuild:
   The grub binary is in /sbin, not /usr/sbin. Fixing.
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index fe53267c0faf..93609ceed34d 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,10 +1,10 @@
-MD5 b33a30955cdcfd9e2f0fbc11ef8c1945 grub-0.94-r1.ebuild 3388
+MD5 b4dd2742137ce7d65621524a1558bd49 grub-0.94-r1.ebuild 3432
 MD5 d2c5f3ba084defee6f806a4eab5d3e36 grub-0.92-r1.ebuild 2526
-MD5 31d6e6382d1e08bfd4037a99fb29a2d0 grub-0.94-r2.ebuild 3501
+MD5 f1f42e5ead1460b2d0dbedd803402ed1 grub-0.94-r2.ebuild 3545
 MD5 8c0771de7827d524863e4fe3692e8c5d ChangeLog 10139
 MD5 fc967cbfa21d5efadccfe2146dfa03df grub-0.93.20030118.ebuild 2512
 MD5 b0eacbb6edb031d87f33ed0b08f5916d metadata.xml 226
-MD5 ee102937698f054961316cff9c27bfe4 grub-0.95.20040823.ebuild 3514
+MD5 9147ec50f4669645d487e39201a6d838 grub-0.95.20040823.ebuild 3558
 MD5 3a653f86b731c2a17482d25f57b2d041 files/digest-grub-0.95.20040823 149
 MD5 cdd6c89d48982ecd544c0b4774755afd files/splash.xpm.gz 33856
 MD5 e9e73f57d9f9d5c550792980b2635f94 files/grub-0.94-gcc3.4.patch 479
diff --git a/sys-boot/grub/grub-0.94-r1.ebuild b/sys-boot/grub/grub-0.94-r1.ebuild
index 91c08b3acc4b..07edcc7d4e0f 100644
--- a/sys-boot/grub/grub-0.94-r1.ebuild
+++ b/sys-boot/grub/grub-0.94-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r1.ebuild,v 1.11 2004/08/11 19:38:53 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r1.ebuild,v 1.12 2004/09/12 16:59:34 robmoss Exp $
 
 inherit mount-boot eutils flag-o-matic gcc
 
@@ -15,6 +15,7 @@ KEYWORDS="-* x86 ~amd64"
 IUSE="static"
 
 DEPEND=">=sys-libs/ncurses-5.2-r5
+	>=sys-devel/automake-1.7
 	>=sys-devel/autoconf-2.5"
 PROVIDE="virtual/bootloader"
 
@@ -49,7 +50,7 @@ src_compile() {
 
 	autoconf || die
 	aclocal || die
-	automake || die
+	WANT_AUTOMAKE=1.7 automake || die
 
 	# build the net-bootable grub first
 	CFLAGS="" \
diff --git a/sys-boot/grub/grub-0.94-r2.ebuild b/sys-boot/grub/grub-0.94-r2.ebuild
index 8a37c40f8a4f..1c9919cb1eac 100644
--- a/sys-boot/grub/grub-0.94-r2.ebuild
+++ b/sys-boot/grub/grub-0.94-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r2.ebuild,v 1.1 2004/08/22 17:50:22 robmoss Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r2.ebuild,v 1.2 2004/09/12 16:59:34 robmoss Exp $
 
 inherit mount-boot eutils flag-o-matic gcc
 
@@ -15,6 +15,7 @@ KEYWORDS="~x86"
 IUSE="static"
 
 DEPEND=">=sys-libs/ncurses-5.2-r5
+	>=sys-devel/automake-1.7
 	>=sys-devel/autoconf-2.5"
 PROVIDE="virtual/bootloader"
 
@@ -52,7 +53,7 @@ src_compile() {
 
 	autoconf || die
 	aclocal || die
-	automake || die
+	WANT_AUTOMAKE=1.7 automake || die
 
 	# build the net-bootable grub first
 	CFLAGS="" \
diff --git a/sys-boot/grub/grub-0.95.20040823.ebuild b/sys-boot/grub/grub-0.95.20040823.ebuild
index b77fb8d2fa43..de27e6e1ad7b 100644
--- a/sys-boot/grub/grub-0.95.20040823.ebuild
+++ b/sys-boot/grub/grub-0.95.20040823.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.95.20040823.ebuild,v 1.4 2004/09/05 20:40:39 robmoss Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.95.20040823.ebuild,v 1.5 2004/09/12 16:59:34 robmoss Exp $
 
 inherit mount-boot eutils flag-o-matic gcc gnuconfig
 
@@ -15,6 +15,7 @@ KEYWORDS="~x86"
 IUSE="static"
 
 DEPEND=">=sys-libs/ncurses-5.2-r5
+	>=sys-devel/automake-1.7
 	>=sys-devel/autoconf-2.5"
 PROVIDE="virtual/bootloader"
 
@@ -54,7 +55,7 @@ src_compile() {
 
 	autoconf || die
 	aclocal || die
-	automake || die
+	WANT_AUTOMAKE=1.7 automake || die
 
 	# build the net-bootable grub first
 	CFLAGS="" \