Depend on virtual/yacc, not bison.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

5 files changed, 19 insertions, 15 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 0fd2fcdd23a7..6abce5825926 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.157 2011/08/21 03:18:11 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.158 2011/08/21 04:33:07 vapier Exp $
+
+  21 Aug 2011; Mike Frysinger <vapier@gentoo.org> grub-1.98.ebuild,
+  grub-1.99_rc1.ebuild, grub-9999.ebuild:
+  Depend on virtual/yacc, not bison.
 
   21 Aug 2011; Matt Turner <mattst88@gentoo.org> grub-1.98.ebuild,
   grub-1.99_rc1.ebuild, grub-9999.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 3272a55589b3..3968842cb460 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX defaults 1020 RMD160 48ce6914d693bef9db7f41afecb92c18715ffb7f SHA1 af556abd7deb0d0939f4766df265aa6882707cbe SHA256 302a0cfa6e1f6acf52f5d558cd03f3631313a4b95de038f10f740439ea0a921f
 AUX grub-0.97-gpt.patch 10682 RMD160 53dd38d52f2b38fb28dfb670d6fd27e47a562bbb SHA1 6057a076110d469fb63e56e57711d281221f9b42 SHA256 5e38046cfb727420e5b4b19d71c7fb4ddff22cbcc356c9f888763b0c1963d389
@@ -39,15 +39,15 @@ EBUILD grub-0.97-r6.ebuild 8801 RMD160 3da0ba7ea62758c9fd352f7290b441c3e9f08fb6
 EBUILD grub-0.97-r8.ebuild 8941 RMD160 4caee80e02de14e6a88a3ab016df32f90c258f09 SHA1 be1f73938f4763cf6413afee97062abb8666ffbb SHA256 5876009e82e6556be90d2355defd3039d244f5a53313ba29ce937e9c14e169ff
 EBUILD grub-0.97-r9.ebuild 9045 RMD160 5db30743506d7ae274695a94bd1c7c5fea8003e2 SHA1 4796cd56c8e77239719bd31a0542b11129e7922f SHA256 153939f732549503f08dd2acff27325b3e398ffc065e16c1749281c6c66a97d5
 EBUILD grub-0.97.ebuild 4494 RMD160 f798b7101af90add6d45725e34aeb7f219e0b748 SHA1 fbb215b293127635ba41e7fa952518e5e07f118a SHA256 d08c03989b1cd6ad91fa2e1a098e0230994570472d0f11a6d926e21e06071c58
-EBUILD grub-1.98.ebuild 3078 RMD160 501a58877bfc1b5f5ad0bab03152fc8dff4b72f3 SHA1 1cebed4bc80c9a3f80d78dcddf0b3cee4b564d08 SHA256 47ead71c40fc80e5db802b952f348c30ca99a7b085b88a130ea1dcd64c092817
-EBUILD grub-1.99_rc1.ebuild 3382 RMD160 8a3fe756e6a93505b658ecdf31d9495227969be7 SHA1 71764563b06fa65dab6d06b62804c9121598ca6d SHA256 1f039d3171c56f4fa50599e9a60e883cad3a196bb9436e3c8956c0208446bb96
-EBUILD grub-9999.ebuild 3381 RMD160 092e62be9fb1f2c50520c5aef08664bc78c64e68 SHA1 ceb87b55386565194f7f7f81517e5805826a2004 SHA256 c91edaafe200731f2ac86cd3c58981c67728e3fd78e62661ea92be782dc875ae
-MISC ChangeLog 32244 RMD160 be02c77eecf5a17beb96dfb80ee268fc33f045d6 SHA1 754b4b9fc4608b1ae400feee41226854fc0ad90d SHA256 277c3734c21144dad8986b40163bd4eb21c5a7902b0698ff905783c2339b6fe0
+EBUILD grub-1.98.ebuild 3073 RMD160 ea0c8d62713baded9db91a75fec0d34f822d41ce SHA1 96c95137270f3d3cea7f211b9d04e8a2071da819 SHA256 d2dfe70ff02dad8f6aaa2e4b3b5ebf26b50b1640f58039152dd75b4d1367ca54
+EBUILD grub-1.99_rc1.ebuild 3377 RMD160 4c51d17ad567a08c93c2221030af70b9e7b6bc1c SHA1 2aa61c092e2c5de62830ac198c644cb6c6756dcf SHA256 383254f4275ec678cf90c0e871704c6d11e457274f4191aba981193a4cbc8541
+EBUILD grub-9999.ebuild 3376 RMD160 ac7b48ee7a4dff4632700c9c574858ace83357b9 SHA1 ab3380dd25924d00de5c719208177b636a3dbd1c SHA256 c46cf1f70658e4a2d27f2a9906d3840a858ba5f8d72fbbbdf45afc2e31bc9ad5
+MISC ChangeLog 32390 RMD160 7c4a10bba5801d08fc25e844f17781a69af3f458 SHA1 838b28cd7e101d0ce5fa5aa195d47a25e9b458c4 SHA256 dbfd534a4f9c25477e33ac3386acc8f60c5a1e300751bb355a00f3290a3ae745
 MISC metadata.xml 349 RMD160 8e5ecd3c757f94fbccafc8120f4c8a04567135b4 SHA1 3ff0251dbb2863c4fbf0913b901bc27ed73a1acd SHA256 fcb983296ee1568339772668bcf236db0a24aabba6c328343d7bdb790978cbb9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5QePcACgkQTVUdg23rv51EkwCfX8aGFcJgrIgHOBszeCj5QFMf
-1gAAoIPhZXy8+49GzhMUE9gLmTl3yvTa
-=qC2E
+iF4EAREIAAYFAk5QiosACgkQaC/OocHi7JamwAD/WEnIWzQeKJ1Wld3Vuq41Bf/G
+xU14KTxv6XNEkUmOzrMBAIiN+tD6ER8X0qv8G1QbFMV8q5xLV5yKcTi/8dt5rrd+
+=6El4
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-1.98.ebuild b/sys-boot/grub/grub-1.98.ebuild
index 98755fe01ae4..d3258228e1e3 100644
--- a/sys-boot/grub/grub-1.98.ebuild
+++ b/sys-boot/grub/grub-1.98.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.98.ebuild,v 1.10 2011/08/21 03:18:11 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.98.ebuild,v 1.11 2011/08/21 04:33:07 vapier Exp $
 
 # XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
 
@@ -28,7 +28,7 @@ RDEPEND=">=sys-libs/ncurses-5.2-r5
 	truetype? ( media-libs/freetype media-fonts/unifont )"
 DEPEND="${RDEPEND}
 	dev-lang/ruby
-	sys-devel/bison
+	virtual/yacc
 	sys-devel/flex"
 
 export STRIP_MASK="*/grub/*/*.mod"
diff --git a/sys-boot/grub/grub-1.99_rc1.ebuild b/sys-boot/grub/grub-1.99_rc1.ebuild
index 10f15f6b800e..d760b9127470 100644
--- a/sys-boot/grub/grub-1.99_rc1.ebuild
+++ b/sys-boot/grub/grub-1.99_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99_rc1.ebuild,v 1.5 2011/08/21 03:18:11 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99_rc1.ebuild,v 1.6 2011/08/21 04:33:07 vapier Exp $
 
 # XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
 
@@ -31,7 +31,7 @@ RDEPEND=">=sys-libs/ncurses-5.2-r5
 DEPEND="${RDEPEND}
 	>=sys-devel/autogen-5.10
 	>=dev-lang/python-2.5.2
-	sys-devel/bison
+	virtual/yacc
 	sys-devel/flex"
 [[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
 
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 6a72e57b81d8..9fdf88d4f966 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.35 2011/08/21 03:18:11 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.36 2011/08/21 04:33:07 vapier Exp $
 
 # XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
 EAPI="2"
@@ -33,7 +33,7 @@ RDEPEND=">=sys-libs/ncurses-5.2-r5
 	truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
 DEPEND="${RDEPEND}
 	>=dev-lang/python-2.5.2
-	sys-devel/bison
+	virtual/yacc
 	sys-devel/flex"
 [[ ${PV} == "9999" ]] && DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"