[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

[Matt Turner]

commit:     6ee833c002816350b75e1990f248e22829188a54
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  8 20:56:43 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 21:06:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ee833c0

dev-util/catalyst: Remove IUSE=system-bootloader

I'm honestly not sure what the idea was here. The system's grub has
always been needed for producing ISOs on amd64/x86 and catalyst doesn't
produce anything else that uses grub. Just fold this into IUSE=iso.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-util/catalyst/catalyst-9999.ebuild | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 0091eacf302..a8df688e16a 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -45,6 +45,9 @@ RDEPEND="
 	iso? (
 		virtual/cdrtools
 
+		amd64? (
+			sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
+		)
 		alpha? (
 			dev-libs/libisoburn
 		)
@@ -65,14 +68,9 @@ RDEPEND="
 			dev-libs/libisoburn
 			sys-boot/grub:2[grub_platforms_ieee1275]
 		)
-	)
-"
-PDEPEND="
-	system-bootloader? (
-		sys-boot/grub:2
-
-		amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-		x86?   ( sys-boot/grub[grub_platforms_efi-32] )
+		x86?   (
+			sys-boot/grub[grub_platforms_efi-32]
+		)
 	)
 "