vapier 15/04/04 19:59:28 Modified: qemu-9999.ebuild metadata.xml ChangeLog Log: Add USE=gtk2 so people can force older GTK versions #545158 by nzqr. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.96 app-emulation/qemu/qemu-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.96&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.96&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.95&r2=1.96 Index: qemu-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- qemu-9999.ebuild 28 Mar 2015 04:15:37 -0000 1.95 +++ qemu-9999.ebuild 4 Apr 2015 19:59:28 -0000 1.96 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.95 2015/03/28 04:15:37 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.96 2015/04/04 19:59:28 vapier Exp $ EAPI=5 @@ -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 \ +gtk gtk2 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 \ @@ -51,12 +51,13 @@ # Block USE flag configurations known to not work. REQUIRED_USE="|| ( ${use_softmmu_targets} ${use_user_targets} ) ${PYTHON_REQUIRED_USE} + gtk2? ( gtk ) 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 !gtk !gtk2 ) virtfs? ( xattr )" # Yep, you need both libcap and libcap-ng since virtfs only uses libcap. @@ -74,7 +75,7 @@ curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) - infiniband? ( sys-infiniband/librdmacm[static-libs(+)] ) + infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] ) jpeg? ( virtual/jpeg:=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses[static-libs(+)] ) @@ -115,7 +116,8 @@ alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) gtk? ( - x11-libs/gtk+:3 + gtk2? ( x11-libs/gtk+:2 ) + !gtk2? ( x11-libs/gtk+:3 ) x11-libs/vte:2.90 ) iscsi? ( net-libs/libiscsi ) @@ -376,7 +378,7 @@ --with-system-pixman --audio-drv-list="${audio_opts}" ) - use gtk && conf_opts+=( --with-gtkabi=3.0 ) + use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) ) ;; esac 1.36 app-emulation/qemu/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/metadata.xml?rev=1.36&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/metadata.xml?rev=1.36&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/metadata.xml?r1=1.35&r2=1.36 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/metadata.xml,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- metadata.xml 28 Feb 2015 21:49:56 -0000 1.35 +++ metadata.xml 4 Apr 2015 19:59:28 -0000 1.36 @@ -14,6 +14,7 @@ <flag name='fdt'>Enables firmware device tree support</flag> <flag name='glusterfs'>Enables GlusterFS cluster fileystem via <pkg>sys-cluster/glusterfs</pkg></flag> + <flag name='gtk2'>Use gtk-2 instead of gtk-3</flag> <flag name='iscsi'>Enable direct iSCSI support via <pkg>net-libs/libiscsi</pkg> instead of indirectly via the Linux block layer that <pkg>sys-block/open-iscsi</pkg> does.</flag> 1.319 app-emulation/qemu/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.319&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.319&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.318&r2=1.319 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v retrieving revision 1.318 retrieving revision 1.319 diff -u -r1.318 -r1.319 --- ChangeLog 28 Mar 2015 04:15:37 -0000 1.318 +++ ChangeLog 4 Apr 2015 19:59:28 -0000 1.319 @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/qemu # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.318 2015/03/28 04:15:37 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.319 2015/04/04 19:59:28 vapier Exp $ + + 04 Apr 2015; Mike Frysinger <vap...@gentoo.org> metadata.xml, + qemu-9999.ebuild: + Add USE=gtk2 so people can force older GTK versions #545158 by nzqr. 28 Mar 2015; Mike Frysinger <vap...@gentoo.org> qemu-9999.ebuild: Put softmmu/user deps behind the respective flags so we do not pull in one set
