--- a/qemu-2.2.1.ebuild 2015-03-30 16:06:31.000000000 +0300 +++ b/qemu-2.2.1.ebuild 2015-03-31 16:37:20.000000000 +0300 @@ -30,7 +30,7 @@ LICENSE="GPL-2 LGPL-2 BSD-2" SLOT="0" IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \ -gtk infiniband iscsi +jpeg \ +gtk2 gtk3 infiniband iscsi +jpeg \ kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python \ rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-softmmu \ @@ -53,12 +53,14 @@ # Block USE flag configurations known to not work. REQUIRED_USE="|| ( ${use_targets} ) ${PYTHON_REQUIRED_USE} + gtk2? ( !gtk3 ) + gtk3? ( !gtk2 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) static? ( static-softmmu static-user ) - static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk ) + static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk2 !gtk3 ) virtfs? ( xattr )" # Yep, you need both libcap and libcap-ng since virtfs only uses libcap. @@ -115,7 +117,11 @@ accessibility? ( app-accessibility/brltty ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) - gtk? ( + gtk2? ( + x11-libs/gtk+:2 + x11-libs/vte:0 + ) + gtk3? ( x11-libs/gtk+:3 x11-libs/vte:2.90 ) @@ -136,7 +142,10 @@ sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) - gtk? ( nls? ( sys-devel/gettext ) ) + nls? ( + gtk2? ( sys-devel/gettext ) + gtk3? ( sys-devel/gettext ) + ) static-softmmu? ( ${SOFTMMU_LIB_DEPEND} ) static-user? ( ${USER_LIB_DEPEND} ) test? ( @@ -325,7 +334,6 @@ $(conf_softmmu curl) $(conf_softmmu fdt) $(conf_softmmu glusterfs) - $(conf_softmmu gtk) $(conf_softmmu infiniband rdma) $(conf_softmmu iscsi libiscsi) $(conf_softmmu jpeg vnc-jpeg) @@ -367,6 +375,7 @@ --target-list="${user_targets}" --disable-blobs --disable-tools + --disable-gtk ) ;; softmmu) @@ -377,7 +386,13 @@ --with-system-pixman --audio-drv-list="${audio_opts}" ) - use gtk && conf_opts+=( --with-gtkabi=3.0 ) + if use gtk2; then + conf_opts+=( --enable-gtk --with-gtkabi=2.0 ) + elif use gtk3; then + conf_opts+=( --enable-gtk --with-gtkabi=3.0 ) + else + conf_opts+=( --disable-gtk ) + fi ;; esac