Make gtk2 module optional to provide a way for gnome2 accessibility users to install >=gtk+-3.6

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

5 files changed, 49 insertions, 16 deletions

diff --git a/app-accessibility/at-spi2-atk/ChangeLog b/app-accessibility/at-spi2-atk/ChangeLog
index 84ba8b82927d..cbf15707bfb4 100644
--- a/app-accessibility/at-spi2-atk/ChangeLog
+++ b/app-accessibility/at-spi2-atk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-accessibility/at-spi2-atk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog,v 1.25 2013/04/17 16:57:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog,v 1.26 2013/10/04 01:03:00 tetromino Exp $
+
+*at-spi2-atk-2.6.2-r1 (04 Oct 2013)
+
+  04 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  at-spi2-atk-2.6.2.ebuild, +at-spi2-atk-2.6.2-r1.ebuild,
+  -at-spi2-atk-2.8.0.ebuild, at-spi2-atk-2.8.1.ebuild, metadata.xml:
+  Make gtk2 module optional to provide a way for gnome2 accessibility users to
+  install >=gtk+-3.6
 
 *at-spi2-atk-2.8.1 (17 Apr 2013)
 
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2-r1.ebuild
index 7c4ffc963cb1..dc29f0317a04 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.0.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.0.ebuild,v 1.1 2013/03/28 16:24:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2-r1.ebuild,v 1.1 2013/10/04 01:03:00 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -14,22 +14,34 @@ HOMEPAGE="http://live.gnome.org/Accessibility"
 LICENSE="LGPL-2+"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
+IUSE="+gtk2"
 
 COMMON_DEPEND="
-	>=app-accessibility/at-spi2-core-2.7.5
-	>=dev-libs/atk-2.7.90
-	>=dev-libs/glib-2.32:2
+	>=app-accessibility/at-spi2-core-2.6
+	>=dev-libs/atk-2.1.0
+	dev-libs/glib:2
 	>=sys-apps/dbus-1
 "
 RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/at-spi-1.32.0-r1
+	gtk2? ( !<gnome-extra/at-spi-1.32.0-r1 )
 "
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
-src_configure(){
+src_prepare() {
+	if ! use gtk2; then
+		sed -e '/SUBDIRS/ s/gtk-2.0//' \
+			-i atk-adaptor/Makefile.{am,in} || die "sed failed"
+	fi
+
+	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
+	epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
 	gnome2_src_configure --enable-p2p
 }
 
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2.ebuild
index f6b8571143d0..6210d6ee4cfa 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2.ebuild,v 1.9 2013/02/25 08:47:28 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2.ebuild,v 1.10 2013/10/04 01:03:00 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -22,9 +22,9 @@ COMMON_DEPEND="
 	dev-libs/glib:2
 	>=sys-apps/dbus-1
 "
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/at-spi-1.32.0-r1
-"
+RDEPEND="${COMMON_DEPEND}"
+#	!<gnome-extra/at-spi-1.32.0-r1
+#"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild
index d62caf2af5bb..d13d016b9d64 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild,v 1.1 2013/04/17 16:57:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild,v 1.2 2013/10/04 01:03:00 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://live.gnome.org/Accessibility"
 LICENSE="LGPL-2+"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
+IUSE="+gtk2"
 
 COMMON_DEPEND="
 	>=app-accessibility/at-spi2-core-2.7.5
@@ -23,13 +23,22 @@ COMMON_DEPEND="
 	>=sys-apps/dbus-1
 "
 RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/at-spi-1.32.0-r1
+	gtk2? ( !<gnome-extra/at-spi-1.32.0-r1 )
 "
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
-src_configure(){
+src_prepare() {
+	if ! use gtk2; then
+		sed -e '/SUBDIRS/ s/gtk-2.0//' \
+			-i atk-adaptor/Makefile.{am,in} || die "sed failed"
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
 	gnome2_src_configure --enable-p2p
 }
 
diff --git a/app-accessibility/at-spi2-atk/metadata.xml b/app-accessibility/at-spi2-atk/metadata.xml
index d9f21e6a89de..b4d1b8b49b08 100644
--- a/app-accessibility/at-spi2-atk/metadata.xml
+++ b/app-accessibility/at-spi2-atk/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>gnome-accessibility</herd>
+  <use>
+    <flag name="gtk2">Install bridge module for <pkg>x11-libs/gtk+:2</pkg>. Disable
+        this flag if you want to use <pkg>gnome-extra/at-spi</pkg> instead.</flag>
+  </use>
 </pkgmetadata>