commit: 4f1af4cdfe09f6e2296a30bb1f0e90ba08da1970 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Thu Aug 18 12:51:30 2016 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Thu Aug 18 13:00:18 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f1af4cd
sys-boot/grub: block sys-boot/grub:2[-multislot] Bug: https://bugs.gentoo.org/591574 Package-Manager: portage-2.3.0_p16 sys-boot/grub/grub-0.97-r16.ebuild | 3 ++- sys-boot/grub/grub-0.97-r17.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys-boot/grub/grub-0.97-r16.ebuild b/sys-boot/grub/grub-0.97-r16.ebuild index 9da0d0e..761da22 100644 --- a/sys-boot/grub/grub-0.97-r16.ebuild +++ b/sys-boot/grub/grub-0.97-r16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -37,6 +37,7 @@ LIB_DEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0[static-libs(+),abi_x86_32(-)] RDEPEND="!static? ( ${LIB_DEPEND//[static-libs(+),/=[} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} )" +RDEPEND+=" !sys-boot/grub:2[-multislot]" pkg_setup() { case $(tc-arch) in diff --git a/sys-boot/grub/grub-0.97-r17.ebuild b/sys-boot/grub/grub-0.97-r17.ebuild index 790e6b2..6e27cbe 100644 --- a/sys-boot/grub/grub-0.97-r17.ebuild +++ b/sys-boot/grub/grub-0.97-r17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -38,6 +38,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//[static-libs(+),/=[} )" DEPEND="${RDEPEND} virtual/pkgconfig static? ( ${LIB_DEPEND} )" +RDEPEND+=" !sys-boot/grub:2[-multislot]" pkg_setup() { case $(tc-arch) in
