summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2016-08-18 08:51:30 -0400
committerMike Gilbert <floppym@gentoo.org>2016-08-18 09:00:18 -0400
commit4f1af4cdfe09f6e2296a30bb1f0e90ba08da1970 (patch)
tree6cd83de49f78ff211879358fc6e6310bf4d4a40c /sys-boot
parentsys-boot/grub: block sys-boot/grub-static when multislot is disabled (diff)
downloadgentoo-4f1af4cdfe09f6e2296a30bb1f0e90ba08da1970.tar.gz
gentoo-4f1af4cdfe09f6e2296a30bb1f0e90ba08da1970.tar.bz2
gentoo-4f1af4cdfe09f6e2296a30bb1f0e90ba08da1970.zip
sys-boot/grub: block sys-boot/grub:2[-multislot]
Bug: https://bugs.gentoo.org/591574 Package-Manager: portage-2.3.0_p16
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/grub-0.97-r16.ebuild3
-rw-r--r--sys-boot/grub/grub-0.97-r17.ebuild3
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 9da0d0e384ff..761da22bce2f 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 790e6b256bed..6e27cbe36ecb 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