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 9543F138334 for ; Mon, 22 Oct 2018 13:21:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CF02E08D3; Mon, 22 Oct 2018 13:21:21 +0000 (UTC) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (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 125FAE08CA for ; Mon, 22 Oct 2018 13:21:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ED60C30B8443; Mon, 22 Oct 2018 13:21:19 +0000 (UTC) Received: from burns.redhat.com (ovpn-204-117.brq.redhat.com [10.40.204.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1EB786FECF; Mon, 22 Oct 2018 13:21:17 +0000 (UTC) From: Michal Privoznik To: gentoo-dev@lists.gentoo.org Cc: tamiko@gentoo.org Subject: [gentoo-dev] [PATCH 1/2] app-emulation/qemu-9999: Drop gtk2 use flag Date: Mon, 22 Oct 2018 14:21:07 +0100 Message-Id: <7ee6304dcd0466bf01e14081afbeb108bce3b768.1540214377.git.mprivozn@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 22 Oct 2018 13:21:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Archives-Salt: dfaa06be-0b3d-40f2-8961-f0acc9051236 X-Archives-Hash: a4a1900f26cc223f07b6af00ea643468 QEMU has deprecated gtk2 support nearly a year ago, and recently it dropped the support completely (upstream commit 89d85cde75143). Reflect this change in the live ebuild. Signed-off-by: Michal Privoznik --- app-emulation/qemu/qemu-9999.ebuild | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 833c2349a4c..555a20f9237 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -28,7 +28,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" LICENSE="GPL-2 LGPL-2 BSD-2" SLOT="0" IUSE="accessibility +aio alsa bluetooth bzip2 capstone +caps +curl debug - +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux + +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 spice ssh static static-user systemtap tci test usb usbredir vde @@ -50,14 +50,13 @@ IUSE+=" ${use_softmmu_targets} ${use_user_targets}" # Allow no targets to be built so that people can get a tools-only build. # Block USE flag configurations known to not work. REQUIRED_USE="${PYTHON_REQUIRED_USE} - gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) - static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) + static? ( static-user !alsa !bluetooth !gtk !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )" @@ -100,14 +99,8 @@ SOFTMMU_TOOLS_DEPEND=" >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( - gtk2? ( - x11-libs/gtk+:2 - vte? ( x11-libs/vte:0 ) - ) - !gtk2? ( - x11-libs/gtk+:3 - vte? ( x11-libs/vte:2.91 ) - ) + x11-libs/gtk+:3 + vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] @@ -495,7 +488,6 @@ qemu_src_configure() { conf_opts+=( --audio-drv-list="${audio_opts}" ) - use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) ) use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) ) fi -- 2.18.1