sys-boot/grub: drop debug USE flag, fix sdl dependency

Closes: https://bugs.gentoo.org/682830
Package-Manager: Portage-2.3.67_p12, Repoman-2.3.14_p7
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

diff --git a/sys-boot/grub/grub-2.02-r4.ebuild b/sys-boot/grub/grub-2.02-r4.ebuild
index e7fdf86942fe0708bf9cba9c8e0144d4a40d6db0..2215a61ff455b511f8cd998b5741acca8f29e59f 100644 (file)
--- a/sys-boot/grub/grub-2.02-r4.ebuild
+++ b/sys-boot/grub/grub-2.02-r4.ebuild
@@ -58,7 +58,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
 # Includes licenses for dejavu and unifont
 LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
 SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
+IUSE="device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
 
 GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 )
 IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
@@ -75,9 +75,7 @@ REQUIRED_USE="
 COMMON_DEPEND="
        app-arch/xz-utils
        >=sys-libs/ncurses-5.2-r5:0=
-       debug? (
-               sdl? ( media-libs/libsdl )
-       )
+       sdl? ( media-libs/libsdl )
        device-mapper? ( >=sys-fs/lvm2-2.02.45 )
        libzfs? ( sys-fs/zfs )
        mount? ( sys-fs/fuse:0 )
@@ -211,14 +209,13 @@ grub_configure() {
                --program-prefix=
                --libdir="${EPREFIX}"/usr/lib
                --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-               $(use_enable debug mm-debug)
                $(use_enable device-mapper)
                $(use_enable mount grub-mount)
                $(use_enable nls)
                $(use_enable themes grub-themes)
                $(use_enable truetype grub-mkfont)
                $(use_enable libzfs)
-               $(use sdl && use_enable debug grub-emu-sdl)
+               $(use_enable sdl grub-emu-sdl)
                ${platform:+--with-platform=}${platform}
 
                # Let configure detect this where supported

diff --git a/sys-boot/grub/grub-2.04_rc1.ebuild b/sys-boot/grub/grub-2.04_rc1.ebuild
index 38c9444f69aa0663da046011633cf3f0a3b5211e..5970936ad66558ec63aeeef687b5ac137cbec62f 100644 (file)
--- a/sys-boot/grub/grub-2.04_rc1.ebuild
+++ b/sys-boot/grub/grub-2.04_rc1.ebuild
@@ -52,7 +52,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
 # Includes licenses for dejavu and unifont
 LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
 SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs"
+IUSE="device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs"
 
 GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 )
 IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
@@ -95,9 +95,7 @@ BDEPEND="
 COMMON_DEPEND="
        app-arch/xz-utils
        >=sys-libs/ncurses-5.2-r5:0=
-       debug? (
-               sdl? ( media-libs/libsdl )
-       )
+       sdl? ( media-libs/libsdl )
        device-mapper? ( >=sys-fs/lvm2-2.02.45 )
        libzfs? ( sys-fs/zfs )
        mount? ( sys-fs/fuse:0 )
@@ -211,14 +209,13 @@ grub_configure() {
                --program-prefix=
                --libdir="${EPREFIX}"/usr/lib
                --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-               $(use_enable debug mm-debug)
                $(use_enable device-mapper)
                $(use_enable mount grub-mount)
                $(use_enable nls)
                $(use_enable themes grub-themes)
                $(use_enable truetype grub-mkfont)
                $(use_enable libzfs)
-               $(use sdl && use_enable debug grub-emu-sdl)
+               $(use_enable sdl grub-emu-sdl)
                ${platform:+--with-platform=}${platform}
 
                # Let configure detect this where supported

diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 38c9444f69aa0663da046011633cf3f0a3b5211e..5970936ad66558ec63aeeef687b5ac137cbec62f 100644 (file)
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -52,7 +52,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
 # Includes licenses for dejavu and unifont
 LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
 SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs"
+IUSE="device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs"
 
 GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 )
 IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
@@ -95,9 +95,7 @@ BDEPEND="
 COMMON_DEPEND="
        app-arch/xz-utils
        >=sys-libs/ncurses-5.2-r5:0=
-       debug? (
-               sdl? ( media-libs/libsdl )
-       )
+       sdl? ( media-libs/libsdl )
        device-mapper? ( >=sys-fs/lvm2-2.02.45 )
        libzfs? ( sys-fs/zfs )
        mount? ( sys-fs/fuse:0 )
@@ -211,14 +209,13 @@ grub_configure() {
                --program-prefix=
                --libdir="${EPREFIX}"/usr/lib
                --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-               $(use_enable debug mm-debug)
                $(use_enable device-mapper)
                $(use_enable mount grub-mount)
                $(use_enable nls)
                $(use_enable themes grub-themes)
                $(use_enable truetype grub-mkfont)
                $(use_enable libzfs)
-               $(use sdl && use_enable debug grub-emu-sdl)
+               $(use_enable sdl grub-emu-sdl)
                ${platform:+--with-platform=}${platform}
 
                # Let configure detect this where supported