Add USE=gtk2 so people can force older GTK versions #545158 by nzqr.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index caa84e1eb1671b2ff53f66ef2e6f329ac17603f1..e3ce04ca14487fa9f9bf0a78931687ed0d6a36cc 100644 (file)
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -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 <vapier@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 <vapier@gentoo.org> qemu-9999.ebuild:
   Put softmmu/user deps behind the respective flags so we do not pull in one set

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 95af364549f2f2a5ecfd2a3d065e022af1509adf..537a975e71fd42569b893813ce4b1a2744d330e4 100644 (file)
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -19,23 +19,23 @@ EBUILD qemu-2.1.2-r2.ebuild 18532 SHA256 d795b0501835ba5e55aefd8bd9f3f5035dd5b6d
 EBUILD qemu-2.1.3.ebuild 18523 SHA256 53842e99bd44dd35a5e5b92d864173b875755494e3e4b4dbf8ac07fd2641572c SHA512 8b5a58b9565d7d2c439750d9ac57e2d28cdb9b0efc7148f3266a52e569cf90668d3f5035a3a13ce7d1c03262f3da075b2037ef7183ada7e4685b4c14e068fdad WHIRLPOOL 89d3e9d420ae3869a963d84fea323cda518f9b74b6a2110ad77fd37987c5e1bd241ec0d81c94bfe573670939f789fff7109d0fff6961c7309b8d367b652231a8
 EBUILD qemu-2.2.0.ebuild 18391 SHA256 f6d9b749908c068dcf76f32d1a4c1fe2621c747249c1d408b4bf0ff64360fd6b SHA512 50c3b17d760acb436fd81ebe07dd9bb968d31cde34cf2c1aa88e0504f5f038389e2edee426f844667485157ba268302d4e5c1adac5307cd79c2c20b7cfc9fb35 WHIRLPOOL 958707a446b7ff6335f02d0150aa5f31aaf0f93f988be4d2a7a5be5f35bf758d14c856df08c5c367255a84539664130833f8712ff65cab98636c80eb8c2a6f95
 EBUILD qemu-2.2.1.ebuild 18342 SHA256 fe5daaaca5b38520fbacadcda2cfd2e66a3c0c84cbfdddf4c96188ca2c1ec35d SHA512 83a046c529979fa1b05aed3a8802709bd987aee6cae955845192e79b29e7d9d1fa874e1e23a170f39d16c11704edd926d08ff613b8d62e6e60085676fe127564 WHIRLPOOL 370e16f00b7c5c78a74afa0d3f8c36bd020835279ccdc339d26684d75802417d0d73fbbb74398b2362657b089629a2ab7bdcca41954bbcafbd329774836e54ef
-EBUILD qemu-9999.ebuild 18585 SHA256 22d3bc69a0c768f7d446c9cb7951e9e2beb1a53e7d5a050cbdbfd81b04de7308 SHA512 bd91374aac29db455921d6f0fb018ce55bd6d76ba838e195948a93b76329781b10b53d779088e78d0762f2539cbd86f9d6c80d76ef94bd91b0fbde99ce628ca1 WHIRLPOOL 0758fd6c42aa41b749a9f417b658b2900b99de4e80dbb59bfb972b1a17f66d92ffaf350abe29450594a91f27c173730d51617dc2cb880d01c87c1a4faccb02be
-MISC ChangeLog 52295 SHA256 5f4bea6d8737fdebe51766af0f0807525ac394b896840442a3704f2c234ec818 SHA512 53d8dab011cf5033d361cbcd4bc3dff1f92c7f1bef84e554da4c5aee5fd210bf724c98b802848021e5a3e7287e2eaab031a479627e008dcb4b0a524b1cb22a94 WHIRLPOOL d9ced1f1db7e8c65c47fe3161b1dd081f6387975e0da84ff09511f157b9bdb82b69a9d28767c610f7310a26e5ca00a3200b58aaea6b65c48f138e95a91a0b423
-MISC metadata.xml 3595 SHA256 1f78b84a325125ff473ecb496a951898d139b73c755367fea5489406dd0a3c9c SHA512 d460ac28d0b1fbb0ceb5514a6f4e5c6bf27faa1dbeaa739890fbf4e9e9c28a8ec190b57a818a717baaa6384170f983c62be1b1f5044e8650b5559c80542bb880 WHIRLPOOL 12c616e8c9337382c31fa16464d5d5d880f911784f93f85937957b669387b201a15e421a62fd5c3132ba6166df3aac2656532e2e920932d1f7f19cb8275831f6
+EBUILD qemu-9999.ebuild 18669 SHA256 85fa1cb7f088ea7e3bdabf458eb412a5adced548e19d803bec69afe14d516f79 SHA512 45114c09beb9299c3fc94ebd5c152d730c63070f1d1e85ad4e7a93affc360ddd44e0f4552dc75c606b15d3f36683f3bfefd1621364d352cfe943a5f1d8b938df WHIRLPOOL 500eed367785006a0f83ad80b0cc30c30e2ec5dd1902639d68c85fa8b0f10b345fa7b685c95f5d335542be5e4d1ad3b7dc58035329d47dc7a3cecd93aaa89b33
+MISC ChangeLog 52451 SHA256 7a9cf216d40e39f7dabd5b49b8816d2618392638c5a98bb52ed377f495779a73 SHA512 d517bc09c7784a4fac8cf4cea1fdb7849a3d49f2bab462b9189cbc5e903d3a713b6a9b6368f5a7e14ee54b375ca0b8f31d3cf4701deeb07480cf1104aa682d24 WHIRLPOOL 503e5e0d2c214f81db373bae4e77e127e33badbdf6053e25e1bba901215af372d5b138718df3fccb9155c280d85dfaa14d40c3366cdbd15653be0dbc0f257aba
+MISC metadata.xml 3648 SHA256 d6c0a87cd95bf7e2b66bb4c9bd21bdac780f502e8921aa0bfb93ba301c978562 SHA512 b3aed4e6c67bb23312402b4e6832485e31c1e6e4c38055190603da80b3680262d8f876d6e9af2f1efbfce6072125f3093edeb712f4ad73246c08b1f77a466649 WHIRLPOOL 8d45f196554880858262886575374c109f621f45120e6278ca9c5a4f70f191b909782589b6c65b7aef0294c655bb8fc43dc382197e69b5c68b874c949bd4c286
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVFirrAAoJEPGu1DbS6WIAgboP/3C7ypkDCxZl7IusYcwTjxSn
-qKeNw3QPMSEKr7oITDzB4fHwIj5S5ZgXC+t571nxCyaj/KaFnAAjC1Wd/wedO9jP
-uL5d06V9tip8bDHXET0Pa0wbqEc+NYpEMlOSNjfq7tWUfYYxEsE3i5Tvy2LBkmck
-XLSbDBErXK4nN/4IOaLnxlqQKbPQ242ceTb9pA/ImEwh29M11c55iyDX4tjHFQtK
-l7qLsDgy57WEErbyA8SHDWb0+JrJe9XJptILDc3zTN09BsKt6xrucdO8/OAYdKvV
-WtflVWmkK5sDyQpicrHunEq8ndfiA7JXZRZ8f9pl2s0Ad/CoNza87G/WlD646Z03
-1p5TfH97KiZR/1+jSQfr7NmivfCt3c3YoQldcnm2qNdidy+JWla2DVLCLXtGf/0C
-fs6yfWkrI45OcCSrPra5lE0E+JfrYBTkmoUVLiLsTzJPL0S2BM26w3qamNZ/f7Cn
-sy7gWjQrJlG4NTYZOHV0AiDeLydwUSIkoxfo1D0HMv853BFBUKGsUiGizpo9BZiC
-RdT01rCVB2Kg+LyrRddIMM0Ijq3bib2xatMgsywQ2DYuxnQOzrFQpRq6Ilsc35Dp
-8Ppiy+DmaTs+XCxcTMFDpkX4x2ZJhmjFH4c5OmMn3RpRSWprqWDOMBvUdfvf2M6o
-eKjOXejWYiOgGhUWruhs
-=pSJB
+iQIcBAEBCAAGBQJVIEKhAAoJEPGu1DbS6WIA+SUP/2keFTvXv9kGZd0jmLgwpZ9q
+W+wAhhqRQYCGqv8dE0Zsf1UqqmJKfd4f6YrDW/8bqKof3SgORwwXJ6j7xAjZMejI
+xZLheFkKQsb6S7thQ/3RIUCdBeJ56YlQ8+Zfdi+f0kJ5HTznG7BSgBjL1+J/NU5P
+sWyLjYCnJ3qacfE5BkGJlXAD3NE6AdXcxtr4efeotoq9vO7BGFM4qOOY0Y4qyv9n
+W8Vx5mEIJmnWT6vm8CcjNP5iniZUkfs7ru3ECFxrddaA7PIiJDaeJZy6MmtuiqZa
+t17qgGwZTJwfdT7JCBon9GO2soOIZ9C9Mlig9fQ6zRcO+jS3fd0kGc4hKJipUCnL
+VwXlH46Z8li7TLADdsBEP3atYZy+Si7JynkOM3dL5gTHxRAlzLw2fuRmn+2kujIJ
+NEqAlalDnssAromh28+00f5PyMRf34WkJZgtsMirrvDFSO2OLtVKrNqisYGRNclF
+75HOLpUqhtcsAaBDBd+QjgB7COa1B/L2TvIsUUQ8v5zMw9Da6czmuidIgkN4Rn26
+B7YQ4+Jj++D/Is8KhFhkBF1JMUOT4anLZ18qxMFu4TSRxswjxxPkR3Zx5NS6yEV/
+jolC7XNcVM9J3zvopYy7AfsNz86yvoaAwohCGGEQhoeG3MRyGGE/65L0zmq7jkFI
+MJOvZuaeLEE562ZYivY7
+=upe+
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 1213b2abbcfaa427eb08d03e7622d6740c1c1c1f..c2843962a2695bc46e240b2c62b70e4d7d15ef3d 100644 (file)
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -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>

diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index f2f8bd8172d0e4747f51755d460d835d77415e01..732e39a095e21eb39f4d721f2e287923284ffc81 100644 (file)
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -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 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
 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 @@ IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
 # 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 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
        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 @@ CDEPEND="
        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 @@ qemu_src_configure() {
                        --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