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 99981138334 for ; Mon, 22 Oct 2018 14:39:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97735E089F; Mon, 22 Oct 2018 14:39:36 +0000 (UTC) Received: from smtp.gentoo.org (unknown [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 6CD02E089F for ; Mon, 22 Oct 2018 14:39:36 +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 3AB4A335CF4 for ; Mon, 22 Oct 2018 14:39:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8046D43E for ; Mon, 22 Oct 2018 14:39:13 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1540219087.5d79df3753917c3f2c7ef22fdb3e2d0bfb2b33f9.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/qemu/qemu-9999.ebuild X-VCS-Directories: app-emulation/qemu/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 5d79df3753917c3f2c7ef22fdb3e2d0bfb2b33f9 X-VCS-Branch: master Date: Mon, 22 Oct 2018 14:39:13 +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-Archives-Salt: a6ea6203-3f25-4f37-9a96-efff1686cc8f X-Archives-Hash: 71b38cc4347647cf3a89b595f17863d2 commit: 5d79df3753917c3f2c7ef22fdb3e2d0bfb2b33f9 Author: Michal Privoznik redhat com> AuthorDate: Mon Oct 22 13:21:08 2018 +0000 Commit: Matthias Maier gentoo org> CommitDate: Mon Oct 22 14:38:07 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d79df37 app-emulation/qemu-9999: Drop sdl-1.2 support QEMU has deprecated sdl-1.2 support nearly a year ago (in upstream commit of e52c6ba3414). It's not removed yet, but it soon will be. Therefore, drop support for it in our ebuild. This is achieved by basically dropping old 'sdl' use flag and then renaming 'sdl2' to 'sdl'. Signed-off-by: Michal Privoznik redhat.com> Signed-off-by: Matthias Maier gentoo.org> app-emulation/qemu/qemu-9999.ebuild | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 555a20f9237..b33e04e5152 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -30,7 +30,7 @@ SLOT="0" IUSE="accessibility +aio alsa bluetooth bzip2 capstone +caps +curl debug +fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png - pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy + pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs" @@ -55,7 +55,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) - sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )" @@ -127,14 +126,8 @@ SOFTMMU_TOOLS_DEPEND=" rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( - !sdl2? ( - media-libs/libsdl[X] - >=media-libs/libsdl-1.2.11[static-libs(+)] - ) - sdl2? ( - media-libs/libsdl2[X] - media-libs/libsdl2[static-libs(+)] - ) + media-libs/libsdl2[X] + media-libs/libsdl2[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) @@ -488,7 +481,7 @@ qemu_src_configure() { conf_opts+=( --audio-drv-list="${audio_opts}" ) - use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) ) + use sdl && conf_opts+=( --with-sdlabi=2.0 ) fi case ${buildtype} in