summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-05-15 03:42:21 +0000
committerMike Frysinger <vapier@gentoo.org>2009-05-15 03:42:21 +0000
commit7f5ca31bba5a13660a1a9421b3d23fcaab1b0215 (patch)
treeb5dc2ff13fe70d019ccd94cd0e3be38b7a2a8743 /sys-boot
parent- Don't install useless README file. (diff)
downloadhistorical-7f5ca31bba5a13660a1a9421b3d23fcaab1b0215.tar.gz
historical-7f5ca31bba5a13660a1a9421b3d23fcaab1b0215.tar.bz2
historical-7f5ca31bba5a13660a1a9421b3d23fcaab1b0215.zip
Do not put ruby into RDEPEND and do not build with -Werror #269887 by James Erickson.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/ChangeLog6
-rw-r--r--sys-boot/grub/Manifest10
-rw-r--r--sys-boot/grub/grub-9999.ebuild8
3 files changed, 15 insertions, 9 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/Manifest b/sys-boot/grub/Manifest
index c7b68a1733a5..ef305e2c0eac 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -36,13 +36,13 @@ EBUILD grub-0.97-r8.ebuild 8871 RMD160 c6255b0e4de7b0c03611e7227d5fb3ce48db5cce
EBUILD grub-0.97-r9.ebuild 8836 RMD160 457cee3729d85d8e6dd534caf7f5b913e30c8949 SHA1 e3854b28e5c7fb02c59647690a95a67c1c3b1ca7 SHA256 56d585e232ceef5a07435ef29021de1ed7d9c540b371f6998abca4b361cb17c7
EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a
EBUILD grub-1.96.ebuild 1980 RMD160 b9389115b1490a018a7c47f897884db95856d1e1 SHA1 317379e018b0c5b7310c4a54a7aee36e9cb4a518 SHA256 bf84649fb9543d9ba92774efb68f97a5bc8ae1cb7fc6895d48357eb309fd92f2
-EBUILD grub-9999.ebuild 2324 RMD160 8b7a9ebb4959831e1eb288d955b3b9e914f6bd96 SHA1 051ac8f1d0822a29a204a9c1320ee21a3f399e0b SHA256 fec0e9d87fc7a1a743893c271048b893b193dbdf7ba9f66d5f567a89db481c95
-MISC ChangeLog 25776 RMD160 f3a27a9728fbead94108f2c2569d0812934e794e SHA1 631135c2d37ca2bca8c3c91d3606fa882a826fc1 SHA256 c4a73db2133b27d4c3d62a597934153e70f99f0f1726482f2768e0f8cf6018b2
+EBUILD grub-9999.ebuild 2391 RMD160 84f8229e0ca23059d7fe6b37cac9f6661591a559 SHA1 c12ec9e1eebc2484784d1245ab3a74bbb23a74a9 SHA256 bada7b2fd457431d2758a7a21465f6d1f637aad2b0b94b9fd63131de2d229084
+MISC ChangeLog 25936 RMD160 b25ec180e41a30f0fc046e1c699c77cbc39270df SHA1 ab6bdf39b93623ae0e30a0cf14ad0dc0894dc766 SHA256 adadf9d8435c32d9c512df9bb9d23b37f682f863731370ca8eb0d88948367454
MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkoMCx8ACgkQNQqtfCuFneN2AwCffAvStaGlg5Jz4YUfnvSpjery
-bCkAniGdk9dY9BgBuGzTtWteFTvHGkn+
-=EvO7
+iEYEARECAAYFAkoM5KsACgkQn/5bYzqsSmGqbQCdE6tjXob7Fl15e6u3oi3cX5rU
+uhkAoI6NilMO3Dwa3hF3FW6Bkoo2gcLV
+=AZC9
-----END PGP SIGNATURE-----
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