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