From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9DE11138334 for ; Wed, 26 Jun 2019 18:37:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC906E0886; Wed, 26 Jun 2019 18:37:54 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9CEE3E0886 for ; Wed, 26 Jun 2019 18:37:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0529E346911 for ; Wed, 26 Jun 2019 18:37:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 69E8455B for ; Wed, 26 Jun 2019 18:37:50 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1561574247.88796cf18e3cf94ca3c23f694eaffd90cf217a19.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/grub/grub-2.02-r4.ebuild sys-boot/grub/grub-2.04_rc1.ebuild sys-boot/grub/grub-9999.ebuild X-VCS-Directories: sys-boot/grub/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 88796cf18e3cf94ca3c23f694eaffd90cf217a19 X-VCS-Branch: master Date: Wed, 26 Jun 2019 18:37:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8f46b158-c18e-4310-81ab-3f9e3bb7feb2 X-Archives-Hash: 46affa5850f1246d4e63dd599a0cc379 commit: 88796cf18e3cf94ca3c23f694eaffd90cf217a19 Author: Mike Gilbert gentoo org> AuthorDate: Wed Jun 26 18:37:27 2019 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Wed Jun 26 18:37:27 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88796cf1 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 gentoo.org> sys-boot/grub/grub-2.02-r4.ebuild | 9 +++------ sys-boot/grub/grub-2.04_rc1.ebuild | 9 +++------ sys-boot/grub/grub-9999.ebuild | 9 +++------ 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/sys-boot/grub/grub-2.02-r4.ebuild b/sys-boot/grub/grub-2.02-r4.ebuild index e7fdf86942f..2215a61ff45 100644 --- 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 38c9444f69a..5970936ad66 100644 --- 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 38c9444f69a..5970936ad66 100644 --- 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