Move dev-libs/libdbusmenu to slot 0, and replace USE=gtk with USE=gtk3 per the QA decision.

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

11 files changed, 100 insertions, 49 deletions

diff --git a/dev-libs/libappindicator/ChangeLog b/dev-libs/libappindicator/ChangeLog
index 88611aa4c404..a62159b822b0 100644
--- a/dev-libs/libappindicator/ChangeLog
+++ b/dev-libs/libappindicator/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libappindicator
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/ChangeLog,v 1.13 2015/01/27 12:17:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/ChangeLog,v 1.14 2015/04/05 16:09:44 mgorny Exp $
+
+*libappindicator-12.10.0-r1 (05 Apr 2015)
+
+  05 Apr 2015; Michał Górny <mgorny@gentoo.org>
+  +libappindicator-12.10.0-r1.ebuild, -libappindicator-12.10.0.ebuild:
+  Move dev-libs/libdbusmenu to slot 0, and replace USE=gtk with USE=gtk3 per the
+  QA decision.
 
   27 Jan 2015; Pacho Ramos <pacho@gentoo.org> libappindicator-12.10.0.ebuild,
   metadata.xml:
diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest
index 5231154a026d..f29df34b2c5d 100644
--- a/dev-libs/libappindicator/Manifest
+++ b/dev-libs/libappindicator/Manifest
@@ -2,13 +2,25 @@
 Hash: SHA256
 
 DIST libappindicator-12.10.0.tar.gz 535562 SHA256 d5907c1f98084acf28fd19593cb70672caa0ca1cf82d747ba6f4830d4cc3b49f SHA512 317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a WHIRLPOOL fdf1d3afbe82d287da688295e6f999656a4dd8e0a1c75aeffa9fd83c69b97cfd37e682f0ca4aff42d30e99b0add8a9e75f870d8a6a72e5337e1afd67ffe618eb
-EBUILD libappindicator-12.10.0.ebuild 1522 SHA256 6ece59917ced3c08b73de2f869b9733c1a1e2a79fe95c34b80547e75aa4951bf SHA512 c454fdc494af32b6502f2173b125151742bc317b3b8b7369507f7b1267d192a063dc444d81fa642861cca2016f57ba0a7f026d9fde6c757f172edd349a8dc9fb WHIRLPOOL 4ad4989ef5f43f7ca08a6a83dbb853e47a4525ce2a530e98c2c4a5c9f771d82957da7bcede09da016da456d107f66f3e78a674aac4ca1eb265230c3c4a9a52b7
-MISC ChangeLog 2408 SHA256 9a23f8b9d144935c708e45f165fa870eb2de70784f53c20ed145049b636d9989 SHA512 0651da32e518814f940eaa69098aa1fb59fc10384496ed304e37266cac71d72a907e0e10c3df4f1d93a5788e4df1d19cef60e794c5a372ee3fa58496e69c339e WHIRLPOOL 41c43797c08a793065da7df02dd1475492cb96c4f46ecee3e75b9a58850629a9e96f4436f5ee69fd62f5eab57da9d1ae5fba59fca7934ec0873f2a4bc989b7b8
+EBUILD libappindicator-12.10.0-r1.ebuild 1525 SHA256 6b711ae455ca55c8c1af62a155025675014858f694a08b4f0dcba26b5f7e252a SHA512 f178e9a8015a0851eedfa4f7109f820ce2e62e211ca96043651090f7d47a5de50d7bd1e30e118ebddbc77dddefd87e81cfd4ee1038c5c0e219f9f0b4d9647bbd WHIRLPOOL db7984fddcc9da14d752c1d5ba70ee251b44c91edf95e0ee2906835da8a3d657f4b49f54a878d118449ea762c608b3abbfd342e6b99b550c308ffcacf5d8702e
+MISC ChangeLog 2670 SHA256 382698eb968c4cdd1290629579de42dd3dd4a73377cc130761d30fc2904082a3 SHA512 a6060f45e9a75a2456478ede10ddca68661bb21fab9502195ceafbc278e3033100df14132fd7c0acb6c525fdb9552e2714e06e4fecdfbca2e197be70467ea7ce WHIRLPOOL cc3d2ad87e7f0c1a6babccaec938ba348f5b1d7c530c2d1c0239d60da59aa38c48038a2b3ac44147a495905d0c82bdccab45fd782ea956a93cd9f282ad05b6c1
 MISC metadata.xml 236 SHA256 841c7a751616fb3cc745c4e54baac7f0b57ab7214bd9b29fee2dcb9d563d68db SHA512 e5350552b5cf14c15a068ae18dfb9755ca547f27cc52ce507b78929cdaf51113a8cedeea0ea68eb7b518052105d572adb9f6d655922586234b3ed7204f48a49a WHIRLPOOL 88638c1accf1b9e8f50f638f67399baadeff5cc0646acfab1f76d894605f4102533391769f604ddd7cceab1bf3b01044265be9c1df252cc922c00e4bf0fc2d4a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTHge0ACgkQCaWpQKGI+9SuYwCgiKZGNZmJYw90MgLWPtO4qZr0
-GdAAnR3X5up1BhlxYG+LR39EW2UjmjC/
-=BxWo
+iQJ8BAEBCABmBQJVIV5RXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOJoIQAN4hya3kEKzdiy2M20NHWjc/
+w5oV25sHaARV71QF5SalEIJuXCCj38xAQ/ertabvRKPgTuiFt+R0AWBrMFkijjtU
+bqL/l0eXOb7hzK5GoxaRj/WnEZgJg6n3YxYVogr+/cD9+TKR1GTbUgccA8NXBxYA
+KUBGzdhmxNrm9qFaq5Ayrf3EkA6Qf+l3x4y5nyYV41zjjGiPBn0AOyXqxHj807Yt
+NPa6vHHQsA/EbWwv8j6K9/xRaTvQBXv/VYoPSjoWvqPMKU7c1H5sAuaPYoT0Tp+n
+pePLbIfrOiezA5kEcMf82nQ6yCl8A6KElp7HlOwO0sb39qS2PMKC1aq0DawsLyzy
+uEn2+/l3DWmbKAkTKOzXsHWoRgJwgZyFBQRcd1dxMBS7ChWtD7slahG1Enztve/K
+2/fb0nuj8ZkZx2ZpDW2qV/FJT/2xT5lcZN70Y+1RFlLmoPM1wHFVegI2FlQuSFyS
+tLpJjTxxTuhLa/2PpapLJwFo/nfP6R6qy+8b7XajYMDFwVmZ/CYkxgB/QoHwVNU3
+nBq1cWR9WN7lHiCC22TR6vQxS18JkogVJECWhmcBPqkBZAVIoEszs9ajA/MlpW5/
+vOaCgsGu2C1HlMhauxfvHt7PzztmuLD/F80/N/I3+Ih4qBVrPKu42+EbrWZP28j/
+LcHnwf+tFT3uEw5aootp
+=rLQV
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libappindicator/libappindicator-12.10.0.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r1.ebuild
index ee8f0b71c34e..62df3f3ad37a 100644
--- a/dev-libs/libappindicator/libappindicator-12.10.0.ebuild
+++ b/dev-libs/libappindicator/libappindicator-12.10.0-r1.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/dev-libs/libappindicator/libappindicator-12.10.0.ebuild,v 1.4 2015/01/27 12:17:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0-r1.ebuild,v 1.1 2015/04/05 16:09:44 mgorny Exp $
 
 EAPI=5
 VALA_MIN_API_VERSION="0.16"
@@ -20,7 +20,7 @@ IUSE="+introspection"
 RDEPEND="
 	>=dev-libs/dbus-glib-0.98
 	>=dev-libs/glib-2.26:2
-	>=dev-libs/libdbusmenu-0.6.2:3[gtk]
+	>=dev-libs/libdbusmenu-0.6.2[gtk3]
 	>=dev-libs/libindicator-12.10.0:3
 	>=x11-libs/gtk+-3.2:3
 	introspection? ( >=dev-libs/gobject-introspection-1 )
diff --git a/dev-libs/libdbusmenu/ChangeLog b/dev-libs/libdbusmenu/ChangeLog
index ffd799f57db7..1753d73a5e99 100644
--- a/dev-libs/libdbusmenu/ChangeLog
+++ b/dev-libs/libdbusmenu/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/libdbusmenu
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/ChangeLog,v 1.33 2015/04/05 12:58:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/ChangeLog,v 1.34 2015/04/05 16:09:44 mgorny Exp $
+
+*libdbusmenu-12.10.2-r1 (05 Apr 2015)
+*libdbusmenu-0.6.2-r1 (05 Apr 2015)
+
+  05 Apr 2015; Michał Górny <mgorny@gentoo.org> +libdbusmenu-0.6.2-r1.ebuild,
+  +libdbusmenu-12.10.2-r1.ebuild, -libdbusmenu-0.6.2.ebuild,
+  -libdbusmenu-12.10.2.ebuild, metadata.xml:
+  Move dev-libs/libdbusmenu to slot 0, and replace USE=gtk with USE=gtk3 per the
+  QA decision.
 
   05 Apr 2015; Michał Górny <mgorny@gentoo.org> libdbusmenu-12.10.2.ebuild:
   Pass -j1 to emake rather than overriding MAKEOPTS, patch by karolherbst.
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index 38190f7543eb..a405e25fbe81 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -3,26 +3,26 @@ Hash: SHA256
 
 DIST libdbusmenu-0.6.2.tar.gz 730624 SHA256 c2077069ae36c207f0c86cb52a0066691d155e45629d1361eee14fc7a2552649 SHA512 575276fc7e1288ab276c106627791bd472349f6c49dc86ff7bbfa0c8ed11118cc622c181299f9df4f6031b12961b9bea8c79126a3bc6a8d208811784f40d2e31 WHIRLPOOL 6cb3ce67a41cfb8e5fd57b8f73412ad292f1bed612fcd04852565b9238bb74be16af820aade28d2705a57091b9f1610cc63b1a457f5afaf89e62b76f3b8fff9a
 DIST libdbusmenu-12.10.2.tar.gz 735730 SHA256 9d6ad4a0b918b342ad2ee9230cce8a095eb601cb0cee6ddc1122d0481f9d04c9 SHA512 cf2e50dc3adbf35d0a4ccdd62a3efd9fae2d079b8d06e6522b70f077f89ac2cf72188e380f476e38d184b69549e90b801bf1e32174fa94bbe612dd52aec94496 WHIRLPOOL 3e75fd0bcbadcff8f4e4cd3a2be33a3aa7cf715413b1a67c5430b9420a965d64db2d988fa5c21fc42c6458ad4ed479c400b28b8a94074cb7223ab0a03ad985eb
-EBUILD libdbusmenu-0.6.2.ebuild 1824 SHA256 b6d662754e1c74e451430e9cf50a00b1332994a932c0f9c26a2f52ce624b2022 SHA512 0147c1d2aad1816bbff2a7c0bdb8cd7af74e17c30ff3342b0b7cf07bbd379173cc299eb81130c55cdcb0891add25fc036ba6637410ec315b97044df7ec42cf73 WHIRLPOOL f1edee5a342e3a049bc7194ba2b2a147bd65e8adeee8d0314f6e5938bd85ddde328d968691e10ab0b7a65e4882caa5e3c926cf3da2ffb86fee99d3fa29cf2084
-EBUILD libdbusmenu-12.10.2.ebuild 1908 SHA256 a33c40606616df463101b0bdaa373c9ce89cdc280112fe3fe80bcac5565ec0fc SHA512 101f6aabb554e4ff27748f81663d4da3f79fade68621d5202c3c606595112c4ea7fe322272a1759f61df18d8195715014cc8391a1d324e505e33caf7ba9115ea WHIRLPOOL 3e1c1d51a55240898fa61a6d8476a297650156dd2304939838299c5afc2ec7d8ce938032a6d74a92fa17ad577b368c7aeb7af9c55244f5715fd1f1328b0b7ac6
-MISC ChangeLog 6575 SHA256 b3bcb1b82558cb333b7319e161eb2abd925fd2e2865b6c9990c89fc5a9e2c8a7 SHA512 404885df43b2f78bcfa1e3c52272fd0970d74f65ab485d89ebd345eb7dcb59c97c1a241f43a8dac7986e4d7573484fbd52e5e7a21b82e4d2ee9b9d7a9e47f188 WHIRLPOOL bf1b306251927c42f2dd2fb54f76bf599306f8996f5debd050ed23dc9de67c66eed07d210354445c95873374a48231ca4a7a718c670b60415f6edba961f08227
-MISC metadata.xml 374 SHA256 2eb8069bc83b845a6b77bf855df462fa206e07c958ea239d4936b1fb5c3e8554 SHA512 5c7d7938ff479300ec6df6898f99fe6174ae6ea12a2ce27b13d83c8a495e420a5105925066adbde4ee2324968188fd8d9f34869079b62200852af568a5861fc8 WHIRLPOOL a789866fd1b84f3e45834e7bd6b7aaa8a3cfb0e852430224d9bb2d7c05983d2245e05fa149a05a2a1060c210abd242d0d3dd12b3bc3f5332fcb9921e3bb049ac
+EBUILD libdbusmenu-0.6.2-r1.ebuild 1831 SHA256 dc3f2bbfc8e7f33ef45ad6a0b5b7c97f01f8bb1b836e3f46c29d37e45b85fd64 SHA512 c26db721a2f1df69fd8fb7d782e782ac6a0394834bf63167f79ee5bb6b668b5f54c93fad051c7caa8bb9d8eb18984827118b4c215430109def544b98458a16b4 WHIRLPOOL 23115edd16231e5d48e0ade3c3a5ce47708d9c9fbe847024a7956f3b2ce40506608fd9048edcde779998c763d617dd0d6fa79bfb59a7cd25fae5d366ce4629d5
+EBUILD libdbusmenu-12.10.2-r1.ebuild 1918 SHA256 7ec2ed8fb323410fcda3e56917f6eeb6862f550034d9fb9e5e45f606dc3b719c SHA512 4dae0c43c848afa68ab6ad9b8d1f84369bf736b930e4ef6f61fbee808b39db6b57feed1db1bdb191af5d85e73b5ee2c6f81c9cfcba2a1d674cac701b20375c28 WHIRLPOOL ec37c178d64c89543de90b3623a15adff0ad39208415fb89c60dc3a7e08a5f3be23d507f07d870413cc7a227aa8864f389065d7460453292bb4af7ee2614fe96
+MISC ChangeLog 6933 SHA256 d381d60ffb06ccf918bf26481c3afeac9a4df858cbd53b6b449d805773297fb4 SHA512 e31e78a979450e030ad6f478f508317e27ac586b4ee2120e24159a8a409df4d3682777dd8ae64e6adf8895c31471759dc57dd6a63bfc5a0fedfa8e4f06a87359 WHIRLPOOL 607b1dc40286f08ac520ab36eead4f9024b176ab37e50f878b61fdaf7e5155cd0fefd2c416612fb4febf104205bb1ed656ecb7fa2d5afb3b5f86e5a4339ff984
+MISC metadata.xml 428 SHA256 caece924603a8efe0b52388a882f1d6dab911cb37e656324d58599bc19fb4a24 SHA512 d7294143410cb42df34908f1f6b98f23698556f23052638c2764beea19fe829661d35d1e51543a39c9dd22a953d12dcf78e2a906fa22c503c059835e63730118 WHIRLPOOL c4b99f5566f633a076e14da50114a0a51d8171d258cdf53a242897949bae1e8b39d72f4dbee78227b5a9de166e4833e47e912f2acbb12d2720826bb9f5ee41c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVITFgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVIV5RXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOwVUP/RoRvZgiim6U3vofNZNdNpNn
-V4PqQPuDmxOTs3bUeLeChqDzq9OHfYy2UynGuUmK7L6Y7vX6evMneDmFBWPSDAaW
-lTuAHh2Y5NfxucCwgrYWNRQRxApaBdiKuH++lgDfO3ZghlsPK4t/41R859Os3UXF
-Q28juNA5HYJnQw27oWWRzmeqrgb8W+UhfquENWycr8NtoV3CVzpLQdpew1cPPtRw
-cy/x4ma6j2/jsg+HiS8B7nXDLdXShUlgS2tI1vNLSVcia6PMYZEQf8uwTFzPTYoy
-O7QQQEBT1jtNAJNIj8OV/5VoaPu1rT8nbvDSW2j2qBkAS6ck0yJ/tRO64BbqTARp
-Bkej0Js7rwCB7qPEWcrRlzavesNcbAM5u+HhxeJ+rDel3XWnAkhMKlPVQhrM4XG6
-2iug2SfxWV/w9sXe4hdh+Nx1v2Kf6j6i3QBiay5dZrfw7kIq9iqnx0Tjhe8X1/zO
-/6RJUs7YF1V/DChRcqYFMW9m5Hpvrc52DRQFSDptORhCKS1KXc1hxF+5SK3xeCxL
-w8tzUr5BFo3x8lg9mZd0MZVEJzBN2DJD+4Id48k0XOsXq3MGpstbJ2b+P7dJEmU4
-YHJtLHTlKM528ZoOb9H6x+GWbHomc8igc4esurDgmfiuyzAm7z+xGDuBWFHWj8Dv
-Byo6RIaYNgYNraxxWNCi
-=+xET
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOH/EQALsd3Nar52bPVtK8K2cT4lys
+DhoyCU5dbImqTczixo/Vey77992KVE8emz7NueEJb0Bo7beZ0a79d0r/Hx2m+yxi
+BtPzeZnwEmmt5fe6oPuT4jbIiJm0+eh+gmr6EapTF7wUVA/bjIzpHqnL2PlDVA/B
+kLmfjMFM+Px4oEUizk/4aEa7Y+6B1oVp4bTY1jmnTAzCeEEyLN6Tk+P/bwAGClJt
+6YDDfCHXD2ss+Yd/O9+uiizLJfrLGb4kch1AQKrRK/jvoivlXf7ydHkL006nbcsN
+SJdPk36QCM/XEC3FoLwiYH5qUhUEOIEuk6cjywC5InETYHFxPKYjhOFFYkFyPfbA
+Mj4wdCH4IBBXdg3JH7oF1fnJUxQzywslbTY9qPJ3OUimqPL8jXB2oogx7PIgiM42
+nZP/9a/gEbJ+D5qA0wBc+bDIrgSPo2YLi7CNy51AjnpqmgooQ/fgmG4QNTAjTTiB
+RBkBAhA8sHd6sYH1PYy6WjXy6QNIaZlc2jEOY2kw6fW1a9vtxVngLSZgX0MAOfJk
+LrDjMfwTC72XxWiYfDUHwHOvRoR41tHxM5F1I/bMhyte09RGX33IAjRseesgXEbj
+B1OQIwKf5MhzHtlAKisENyoylnMWvvP7xhsDy/b7teEDvLiBIm92yDRW5JVzGhPD
+2mGABE5Nk4X9jCeRKO5G
+=vdxh
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.6.2.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.6.2-r1.ebuild
index 80d81e8284d2..ea160ddd3cbf 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-0.6.2.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-0.6.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-0.6.2.ebuild,v 1.11 2014/08/07 23:47:25 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-0.6.2-r1.ebuild,v 1.1 2015/04/05 16:09:44 mgorny Exp $
 
 EAPI=4
 VALA_MIN_API_VERSION=0.16
@@ -13,14 +13,14 @@ HOMEPAGE="http://launchpad.net/dbusmenu"
 SRC_URI="http://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
-SLOT="3"
+SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug gtk +introspection"
+IUSE="debug gtk3 +introspection"
 
 RDEPEND=">=dev-libs/glib-2.32
 	>=dev-libs/dbus-glib-0.100
 	dev-libs/libxml2
-	gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] )
+	gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?] )
 	introspection? ( >=dev-libs/gobject-introspection-1 )
 	!<${CATEGORY}/${PN}-0.5.1-r200"
 DEPEND="${RDEPEND}
@@ -45,7 +45,7 @@ src_configure() {
 		--disable-static \
 		--disable-silent-rules \
 		--disable-scrollkeeper \
-		$(use_enable gtk) \
+		$(use_enable gtk3 gtk) \
 		--disable-dumper \
 		--disable-tests \
 		$(use_enable introspection) \
diff --git a/dev-libs/libdbusmenu/libdbusmenu-12.10.2.ebuild b/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r1.ebuild
index 69f8f2a2fd69..cb4081057a4f 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-12.10.2.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r1.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/dev-libs/libdbusmenu/libdbusmenu-12.10.2.ebuild,v 1.6 2015/04/05 12:58:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r1.ebuild,v 1.1 2015/04/05 16:09:44 mgorny Exp $
 
 EAPI=5
 
@@ -15,16 +15,16 @@ HOMEPAGE="http://launchpad.net/dbusmenu"
 SRC_URI="http://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
-SLOT="3"
+SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gtk +introspection"
+IUSE="debug gtk3 +introspection"
 
 RDEPEND="
 	>=dev-libs/dbus-glib-0.100
 	>=dev-libs/json-glib-0.13.4
 	>=dev-libs/glib-2.32
 	dev-libs/libxml2
-	gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] )
+	gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?] )
 	introspection? ( >=dev-libs/gobject-introspection-1 )
 	!<${CATEGORY}/${PN}-0.5.1-r200"
 DEPEND="${RDEPEND}
@@ -50,7 +50,7 @@ src_configure() {
 		--disable-static \
 		--disable-silent-rules \
 		--disable-scrollkeeper \
-		$(use_enable gtk) \
+		$(use_enable gtk3 gtk) \
 		--disable-dumper \
 		$(use_enable introspection) \
 		$(use_enable introspection vala) \
diff --git a/dev-libs/libdbusmenu/metadata.xml b/dev-libs/libdbusmenu/metadata.xml
index 3caf732ad4cd..9c2c8cfc52a2 100644
--- a/dev-libs/libdbusmenu/metadata.xml
+++ b/dev-libs/libdbusmenu/metadata.xml
@@ -7,6 +7,7 @@
     <email>ayatana-bugs@gentoo.org</email>
   </maintainer>
   <use>
+    <flag name="gtk3">Enable support for GTK+3</flag>
     <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-libs/libindicate/ChangeLog b/dev-libs/libindicate/ChangeLog
index 89d5ff2332dd..85546a331e47 100644
--- a/dev-libs/libindicate/ChangeLog
+++ b/dev-libs/libindicate/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libindicate
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/ChangeLog,v 1.41 2014/08/20 11:26:50 armin76 Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/ChangeLog,v 1.42 2015/04/05 16:09:44 mgorny Exp $
+
+*libindicate-12.10.1-r1 (05 Apr 2015)
+
+  05 Apr 2015; Michał Górny <mgorny@gentoo.org> +libindicate-12.10.1-r1.ebuild,
+  -libindicate-12.10.1.ebuild:
+  Move dev-libs/libdbusmenu to slot 0, and replace USE=gtk with USE=gtk3 per the
+  QA decision.
 
   20 Aug 2014; Raúl Porcel <armin76@gentoo.org> libindicate-12.10.1.ebuild:
   Add ~sparc wrt #468984
diff --git a/dev-libs/libindicate/Manifest b/dev-libs/libindicate/Manifest
index 80dc12edefbf..01f9f769d179 100644
--- a/dev-libs/libindicate/Manifest
+++ b/dev-libs/libindicate/Manifest
@@ -3,13 +3,25 @@ Hash: SHA256
 
 AUX libindicate-0.6.1-no-mono.patch 1880 SHA256 9f9dcdd610a012cceded3d6076b745e8c406b9fdd179543b2680567f005615b5 SHA512 da2e8aa7423fd2b74289a9d60e81f6cfc9a10027cf196d9f91507bf3334e993f500e5673549af5608920c571f25ce60a73b85965a7ac631fa8917a51fc23e238 WHIRLPOOL 997c70634206d3bc75725c1310c77ef2b42c602e69bc6e267be040a0fc22a462e24efc6848bf2b216e863d8f0ffbff0614e69719675036a744d76bacd1187222
 DIST libindicate-12.10.1.tar.gz 550378 SHA256 41e0c059e96172975c716aa70dc60f669e21d359c65935c61ac374a9aa075581 SHA512 4dcb5f292153210bc15a05f117101429da77a60b8b05b569baddf0e9043d852c2dccb0d5a6adbdf4d4a1b6f06b33c61e242bb4bcb376e3d96563bda591685c06 WHIRLPOOL f175329bac76581ebc596771794e8e81c4e03b6042cc3508a7743034b7ed1f50b61b9accf78595c3beeed7236801096dfb58d42bd94959b433dfcf92b3114fae
-EBUILD libindicate-12.10.1.ebuild 1935 SHA256 55ee8e9232182a3c86f01b74367581fabf47b64524fb5f9b51f834c298707231 SHA512 d7eb7fa825ef0efde64fe3358391ea7dfa76d5bee8b8097eb37615e223bfc7fe6b5008fbe0cbee293170543e09b251745d18e4ec9870f25850adf9867b8c2332 WHIRLPOOL befdd150ce7c1ad1a9a27f3a862108ac26a933e2f1ddb126441ad2ce3fa0047f39818f94e9c45364cb269d2876e1caff99e6064f66272b1349b1758f1cd705c2
-MISC ChangeLog 8731 SHA256 691fdc03f6660e970ab07a85c531107f261529490972bd8726b37f54b15f3f08 SHA512 aa65bf3aa31b193242fd90d6e9bbec5cbb15baf6fffa419ffc99465537e20ea598f46a57779944a522bd7a2f709954b2f1c0c3115ec32db6fe884cdef5167eb0 WHIRLPOOL 09cbdf5ca665b06f5ccaec97e279f1d5bf07b84fe82126ba7d31907d6d4e0dc3a34675ced6ce07c30a6f0b626a3c82997f4a9c77286c6fe935f36d53dfee0a0a
+EBUILD libindicate-12.10.1-r1.ebuild 1962 SHA256 408369dde94b3c778261397344d112902f231d56877b50a3e6f9903cc29af527 SHA512 8f671ad5b074aeeabcc654bed52f428dad79c51f937de0125ea978b027c1f08e9aa377397177797c2a78297ca248cfb2314ff7a1559c09f3bb6c0a2d1dbb497f WHIRLPOOL 2721ae22955a614215d75b1c9d9d51753167f14b99118e827e7fcefccc61d25d27e27e34e1f6cc8805c40c72ed3dab4725d13c36e37d1992057e6c625f8a9170
+MISC ChangeLog 8979 SHA256 1b9bc0af57af6daf3922262459426d598a1ed74086ddef4cab97b2c1f7b870db SHA512 bbdf63a9f5f55183546cfb9b428b2b7cb58c19fc996a48312153d01c7012ca0c575cd7dff2c39111be8c3febf3379ac7ecbbdca997d3e8dc789abb254b81d74f WHIRLPOOL 0b0849a1058278e12b26e1c1f37245e7e62890f33d9647d7e616bd497fc1700d32f69e5521bc698fb08000f84c46f5dbdf787afcdd953b9d7d5125ded5d31e4f
 MISC metadata.xml 374 SHA256 962b7c529448cbb491147f265e8b06fc88a32b3ae377c43d8dc1dd159d73443c SHA512 e0c76674aabc3059159cf48cb3df7ef2fb313d262ae779d41f6d47644b23ee70d63dd01653d3a9ff954186c3c05907ecf48228587bf2e52451a9ffbf19bf62a3 WHIRLPOOL 415f73d20eb8587c9b50b130d047619f191c2a7330f2bbaa7907ad0add24710ec1356bc5582c0a3e3f39b12093783a141d8bef56312c7947e03aed7150a7cfd2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlP0hfkACgkQuQc30/atMkC7NwCgvEvOmahc+bSyOGzXJ963XUmL
-EEEAnRNgSkOUmUOkNl2enSmAeremXh3R
-=HaxX
+iQJ8BAEBCABmBQJVIV5RXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOjf4P/i+elhhH3pGG+AocKUFoSYnn
+JlR7me8LpTrMMx1yHUNdUcfbV8j6fSD4K5DZCRVRrmOr4v3dH+6VgNBKWChNZMQ+
+C/CMaHrznQNentVwNKnpv8DM8Q6uOCPHPqL31X6NEt8WHCwKkareN8xHhVPfItr4
+Az+Os7f36cia9cdeH5JPIrPXTBcoitmgRi5JKSdhaPQ73Y3l0xEpr9e2YUzClzFG
+MRFjtxsW9eYXelutdA4PcNHs6tkpwyG12ESnqaNMAdpcv3AkNCje/8A6Uy76cOou
+NcxfPihs0NWy03qiNWgrfrsiRQGSb/Yu+3exX/Zkftmpllt+g1/oBZVFNrMHLJoT
+6B430RYFyz/tUhWNWz+lN82DWe63y5HBjgc/zJj59dNuARF5Lhul0rvu6NNotshW
+gvNO677Sc1+h3YJiLzcZDZ0TnLJw9y9+MrINfjRhhw641C+hGlliVN4TGOlGOEGm
+41bZMxI4GsXc73jhP/MNIcQcEdbDPDhg6rif5Ppz7g4KIBxD/IZdhUGmZanAJu08
+HhpceMFAk0tAniSQ4UEnVWavGLITRt3lS5sIQ5R0Txjzmd+vfyzVBgXbLjv9xebw
+DlGDLqEwdtqX4/RQA3M5eaC5O9SXhqLszJy+7Mny19nsX7Rz3sUsrc9+E2iKzPmM
+XV8KMz0rxSc3GXu47rlf
+=gMpz
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libindicate/libindicate-12.10.1.ebuild b/dev-libs/libindicate/libindicate-12.10.1-r1.ebuild
index ccca4ea45aca..0a60ffa08aca 100644
--- a/dev-libs/libindicate/libindicate-12.10.1.ebuild
+++ b/dev-libs/libindicate/libindicate-12.10.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-12.10.1.ebuild,v 1.9 2014/08/20 11:26:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-12.10.1-r1.ebuild,v 1.1 2015/04/05 16:09:44 mgorny Exp $
 
 EAPI=5
 VALA_MIN_API_VERSION="0.16"
@@ -21,9 +21,12 @@ RESTRICT="test" # consequence of the -no-mono.patch
 
 RDEPEND=">=dev-libs/dbus-glib-0.100
 	>=dev-libs/glib-2.30
-	>=dev-libs/libdbusmenu-0.6.2:3[gtk?,introspection?]
+	>=dev-libs/libdbusmenu-0.6.2[introspection?]
 	dev-libs/libxml2
-	gtk? ( >=x11-libs/gtk+-3.2:3 )
+	gtk? (
+		dev-libs/libdbusmenu[gtk3]
+		>=x11-libs/gtk+-3.2:3
+	)
 	introspection? ( >=dev-libs/gobject-introspection-1 )
 	!<${CATEGORY}/${PN}-0.6.1-r201"
 EAUTORECONF_DEPEND="dev-util/gtk-doc-am