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

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

4 files changed, 22 insertions, 12 deletions

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/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>