summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-boot/grub/ChangeLog6
-rw-r--r--sys-boot/grub/grub-9999.ebuild8
2 files changed, 10 insertions, 4 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 7422cd04012a..588b0aec66e7 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.117 2009/05/14 12:14:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.118 2009/05/15 03:42:21 vapier Exp $
+
+ 15 May 2009; Mike Frysinger <vapier@gentoo.org> grub-9999.ebuild:
+ Do not put ruby into RDEPEND and do not build with -Werror #269887 by
+ James Erickson.
14 May 2009; Christian Faulhammer <fauli@gentoo.org> grub-0.97-r9.ebuild:
x86 stable, bug 269201
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index bebf6a983618..7bf453c18c0c 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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.8 2009/05/01 21:36:27 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.9 2009/05/15 03:42:21 vapier Exp $
inherit autotools mount-boot eutils flag-o-matic toolchain-funcs
@@ -21,8 +21,9 @@ use multislot && SLOT="2" || SLOT="0"
KEYWORDS=""
IUSE="custom-cflags multislot static"
-DEPEND=">=sys-libs/ncurses-5.2-r5
- dev-libs/lzo
+RDEPEND=">=sys-libs/ncurses-5.2-r5
+ dev-libs/lzo"
+DEPEND="${RDEPEND}
dev-lang/ruby"
PROVIDE="virtual/bootloader"
@@ -37,6 +38,7 @@ src_unpack() {
fi
cd "${S}"
epatch "${FILESDIR}"/${PN}-1.96-genkernel.patch #256335
+ sed -i 's:-Werror::' conf/*.rmk || die #269887
# autogen.sh does more than just run autotools
sed -i -e 's:^auto:eauto:' autogen.sh