| 1 |
commit: 884fd0dce4dd73139b50a5ce3a153db14aa7512a |
| 2 |
Author: Michal Privoznik <mprivozn <AT> redhat <DOT> com> |
| 3 |
AuthorDate: Mon Oct 22 13:21:07 2018 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 22 14:37:53 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=884fd0dc |
| 7 |
|
| 8 |
app-emulation/qemu-9999: Drop gtk2 use flag |
| 9 |
|
| 10 |
QEMU has deprecated gtk2 support nearly a year ago, and recently |
| 11 |
it dropped the support completely (upstream commit 89d85cde75143). |
| 12 |
Reflect this change in the live ebuild. |
| 13 |
|
| 14 |
Signed-off-by: Michal Privoznik <mprivozn <AT> redhat.com> |
| 15 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 16 |
|
| 17 |
app-emulation/qemu/qemu-9999.ebuild | 16 ++++------------ |
| 18 |
1 file changed, 4 insertions(+), 12 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
| 21 |
index 833c2349a4c..555a20f9237 100644 |
| 22 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
| 23 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
| 24 |
@@ -28,7 +28,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" |
| 25 |
LICENSE="GPL-2 LGPL-2 BSD-2" |
| 26 |
SLOT="0" |
| 27 |
IUSE="accessibility +aio alsa bluetooth bzip2 capstone +caps +curl debug |
| 28 |
- +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux |
| 29 |
+ +fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux |
| 30 |
kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png |
| 31 |
pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy |
| 32 |
spice ssh static static-user systemtap tci test usb usbredir vde |
| 33 |
@@ -50,14 +50,13 @@ IUSE+=" ${use_softmmu_targets} ${use_user_targets}" |
| 34 |
# Allow no targets to be built so that people can get a tools-only build. |
| 35 |
# Block USE flag configurations known to not work. |
| 36 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 37 |
- gtk2? ( gtk ) |
| 38 |
qemu_softmmu_targets_arm? ( fdt ) |
| 39 |
qemu_softmmu_targets_microblaze? ( fdt ) |
| 40 |
qemu_softmmu_targets_mips64el? ( fdt ) |
| 41 |
qemu_softmmu_targets_ppc? ( fdt ) |
| 42 |
qemu_softmmu_targets_ppc64? ( fdt ) |
| 43 |
sdl2? ( sdl ) |
| 44 |
- static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) |
| 45 |
+ static? ( static-user !alsa !bluetooth !gtk !opengl !pulseaudio !snappy ) |
| 46 |
virtfs? ( xattr ) |
| 47 |
vte? ( gtk )" |
| 48 |
|
| 49 |
@@ -100,14 +99,8 @@ SOFTMMU_TOOLS_DEPEND=" |
| 50 |
>=net-libs/gnutls-3.0:=[static-libs(+)] |
| 51 |
) |
| 52 |
gtk? ( |
| 53 |
- gtk2? ( |
| 54 |
- x11-libs/gtk+:2 |
| 55 |
- vte? ( x11-libs/vte:0 ) |
| 56 |
- ) |
| 57 |
- !gtk2? ( |
| 58 |
- x11-libs/gtk+:3 |
| 59 |
- vte? ( x11-libs/vte:2.91 ) |
| 60 |
- ) |
| 61 |
+ x11-libs/gtk+:3 |
| 62 |
+ vte? ( x11-libs/vte:2.91 ) |
| 63 |
) |
| 64 |
infiniband? ( |
| 65 |
sys-fabric/libibumad:=[static-libs(+)] |
| 66 |
@@ -495,7 +488,6 @@ qemu_src_configure() { |
| 67 |
conf_opts+=( |
| 68 |
--audio-drv-list="${audio_opts}" |
| 69 |
) |
| 70 |
- use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) ) |
| 71 |
use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) ) |
| 72 |
fi |
Archives