summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Stelling <blubb@gentoo.org>2004-12-20 18:54:54 +0000
committerSimon Stelling <blubb@gentoo.org>2004-12-20 18:54:54 +0000
commit9231056eb6a4bde7483aab5dc3492c1ae6d7565f (patch)
tree67c80db6a97da5a41929ee913691cddbc8e306c1
parentRemoved unused conf.dhcpd file. Move the -q option out of rc6 script into con... (diff)
downloadhistorical-9231056eb6a4bde7483aab5dc3492c1ae6d7565f.tar.gz
historical-9231056eb6a4bde7483aab5dc3492c1ae6d7565f.tar.bz2
historical-9231056eb6a4bde7483aab5dc3492c1ae6d7565f.zip
fixing nasty automake version mismatch bug
-rw-r--r--sys-boot/grub/ChangeLog5
-rw-r--r--sys-boot/grub/Manifest18
-rw-r--r--sys-boot/grub/grub-0.95.20040823.ebuild6
3 files changed, 16 insertions, 13 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index ac38ddef391c..a1892489faeb 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,9 @@
# 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.29 2004/12/08 01:20:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.30 2004/12/20 18:54:54 blubb Exp $
+
+ 20 Dec 2004; Simon Stelling <blubb@gentoo.org> grub-0.95.20040823.ebuild:
+ changed WANT_AUTOMAKE to 1.8
07 Dec 2004; Robin H. Johnson <robbat2@gentoo.org>
grub-0.95.20040823.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 4c1edfd3f88c..37c4e9e8eb69 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,17 +1,17 @@
-MD5 0dd299714e769591e7e0b6aed01908e6 grub-0.94-r1.ebuild 3431
+MD5 48675b78cc188dcef2ef4653dc49e085 ChangeLog 11185
MD5 d2c5f3ba084defee6f806a4eab5d3e36 grub-0.92-r1.ebuild 2526
-MD5 ebff7c57fe55cb10fa55ec38f85c02da grub-0.94-r2.ebuild 3545
-MD5 8c19a8c37f358375d7e1c223096cce17 ChangeLog 11079
MD5 fc967cbfa21d5efadccfe2146dfa03df grub-0.93.20030118.ebuild 2512
+MD5 0dd299714e769591e7e0b6aed01908e6 grub-0.94-r1.ebuild 3431
+MD5 ebff7c57fe55cb10fa55ec38f85c02da grub-0.94-r2.ebuild 3545
MD5 b0eacbb6edb031d87f33ed0b08f5916d metadata.xml 226
-MD5 f21f813ac68522beaa251831f9e03779 grub-0.95.20040823.ebuild 4027
-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
-MD5 7357395b0d223c0bbf0675a9af31f9c3 files/grub-0.94-grub.conf.patch 7574
-MD5 5d1c8e582496db9d7a9b77e76f09f7d8 files/digest-grub-0.93.20030118 139
+MD5 852400620777752ce52773a2f765f03f grub-0.95.20040823.ebuild 4026
MD5 16039704cf1e6b6f46b4413532af082c files/digest-grub-0.92-r1 133
+MD5 5d1c8e582496db9d7a9b77e76f09f7d8 files/digest-grub-0.93.20030118 139
MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r1 131
MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r2 131
+MD5 3a653f86b731c2a17482d25f57b2d041 files/digest-grub-0.95.20040823 149
MD5 8d898cd9d1928916596cc3f9883eac67 files/grub-0.93-gcc3.3.diff 639
+MD5 e9e73f57d9f9d5c550792980b2635f94 files/grub-0.94-gcc3.4.patch 479
+MD5 7357395b0d223c0bbf0675a9af31f9c3 files/grub-0.94-grub.conf.patch 7574
MD5 9c1ec8bfdc5f20ce965c2d2167a43162 files/grub-0.95.20040823-warnings.patch 2529
+MD5 cdd6c89d48982ecd544c0b4774755afd files/splash.xpm.gz 33856
diff --git a/sys-boot/grub/grub-0.95.20040823.ebuild b/sys-boot/grub/grub-0.95.20040823.ebuild
index 243c38385d94..88e349f4d012 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.8 2004/12/08 01:20:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.95.20040823.ebuild,v 1.9 2004/12/20 18:54:54 blubb Exp $
inherit mount-boot eutils flag-o-matic gcc gnuconfig toolchain-funcs
@@ -55,10 +55,10 @@ src_compile() {
has_pie && CC="$(tc-getCC) `test_flag -fno-pic` `test_flag -nopie`"
has_ssp && CC="$(tc-getCC) `test_flag -fno-stack-protector`"
-
+
autoconf || die "autoconf failed"
aclocal || die "aclocal failed"
- WANT_AUTOMAKE=1.7 automake || die "automake failed"
+ WANT_AUTOMAKE=1.8 automake || die "automake failed"
# build the net-bootable grub first, but only if "netboot" is set
if use netboot