summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2016-08-18 08:48:31 -0400
committerMike Gilbert <floppym@gentoo.org>2016-08-18 09:00:18 -0400
commit5768514fa55c889722d78cfc64993d31c3c67aac (patch)
tree186f1a63f0ade8fdd1db165e19eb0586eaa01d5f
parentnet-misc/remmina: fix Manifest (diff)
downloadgentoo-5768514fa55c889722d78cfc64993d31c3c67aac.tar.gz
gentoo-5768514fa55c889722d78cfc64993d31c3c67aac.tar.bz2
gentoo-5768514fa55c889722d78cfc64993d31c3c67aac.zip
sys-boot/grub: block sys-boot/grub-static when multislot is disabled
Bug: https://bugs.gentoo.org/591574 Package-Manager: portage-2.3.0_p16
-rw-r--r--sys-boot/grub/grub-2.02_beta2-r9.ebuild2
-rw-r--r--sys-boot/grub/grub-2.02_beta3-r1.ebuild2
-rw-r--r--sys-boot/grub/grub-9999.ebuild2
3 files changed, 3 insertions, 3 deletions
diff --git a/sys-boot/grub/grub-2.02_beta2-r9.ebuild b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
index 1997e4533ce2..75d6dd14254a 100644
--- a/sys-boot/grub/grub-2.02_beta2-r9.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
@@ -102,7 +102,7 @@ RDEPEND+="
grub_platforms_efi-32? ( sys-boot/efibootmgr )
grub_platforms_efi-64? ( sys-boot/efibootmgr )
)
- !multislot? ( !sys-boot/grub:0 )
+ !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
nls? ( sys-devel/gettext )
"
diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
index 1aecead43f73..64dadcfefaae 100644
--- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild
+++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
@@ -108,7 +108,7 @@ RDEPEND+="
grub_platforms_efi-32? ( sys-boot/efibootmgr )
grub_platforms_efi-64? ( sys-boot/efibootmgr )
)
- !multislot? ( !sys-boot/grub:0 )
+ !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
nls? ( sys-devel/gettext )
"
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index d83bd8fdf0c3..faa6cecd607c 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -105,7 +105,7 @@ RDEPEND+="
grub_platforms_efi-32? ( sys-boot/efibootmgr )
grub_platforms_efi-64? ( sys-boot/efibootmgr )
)
- !multislot? ( !sys-boot/grub:0 )
+ !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
nls? ( sys-devel/gettext )
"