summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-06-29 02:51:54 +0000
committerMike Gilbert <floppym@gentoo.org>2012-06-29 02:51:54 +0000
commit6b629d9914874d4191621486a036d5ac4aadce8c (patch)
treea582ef9c9a04dda953cb75db2199e03828e3c131 /sys-boot
parentclean out older version (diff)
downloadgentoo-2-6b629d9914874d4191621486a036d5ac4aadce8c.tar.gz
gentoo-2-6b629d9914874d4191621486a036d5ac4aadce8c.tar.bz2
gentoo-2-6b629d9914874d4191621486a036d5ac4aadce8c.zip
Depend on bison, bug 380019.
(Portage version: 2.2.0_alpha113/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/ChangeLog6
-rw-r--r--sys-boot/grub/grub-2.00.ebuild4
-rw-r--r--sys-boot/grub/grub-9999.ebuild9
3 files changed, 14 insertions, 5 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index ca0cfbbc3c4e..0db699a8235e 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.216 2012/06/28 22:36:53 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.217 2012/06/29 02:51:54 floppym Exp $
+
+ 29 Jun 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
+ grub-9999.ebuild:
+ Depend on bison, bug 380019.
28 Jun 2012; Mike Gilbert <floppym@gentoo.org> files/grub.default-2:
Fix typos in grub.default, #424005 by Chris Mayo.
diff --git a/sys-boot/grub/grub-2.00.ebuild b/sys-boot/grub/grub-2.00.ebuild
index c99aff071a78..20936196b35a 100644
--- a/sys-boot/grub/grub-2.00.ebuild
+++ b/sys-boot/grub/grub-2.00.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.2 2012/06/28 14:54:59 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.3 2012/06/29 02:51:54 floppym Exp $
EAPI=4
@@ -69,7 +69,7 @@ RDEPEND="
DEPEND="${RDEPEND}
>=dev-lang/python-2.5.2
sys-devel/flex
- virtual/yacc
+ sys-devel/bison
sys-apps/texinfo
static? (
truetype? (
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index bbf63a57710a..b805d2851ef9 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.69 2012/06/28 10:10:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.70 2012/06/29 02:51:54 floppym Exp $
EAPI=4
@@ -69,7 +69,7 @@ RDEPEND="
DEPEND="${RDEPEND}
>=dev-lang/python-2.5.2
sys-devel/flex
- virtual/yacc
+ sys-devel/bison
sys-apps/texinfo
static? (
truetype? (
@@ -301,4 +301,9 @@ pkg_postinst() {
if ! has_version dev-libs/libisoburn; then
elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue."
fi
+ if has_version sys-boot/grub:0; then
+ ewarn "If you want to keep GRUB Legacy (grub-0.97) installed, please run"
+ ewarn "the following to add sys-boot/grub:0 to your world file."
+ ewarn "emerge --noreplace sys-boot/grub:0"
+ fi
}