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

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

6 files changed, 62 insertions, 26 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/Manifest b/app-accessibility/at-spi2-atk/Manifest
index 158105b1c52d..2b5e119aa438 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -3,17 +3,20 @@ Hash: SHA256
 
 AUX at-spi2-atk-2.0.2-disable-teamspaces-test.patch 302 SHA256 e006bc41cc7def33d249621c2d78d0ff13f561317ec20adf4637ec9fb54f1289 SHA512 a7b90b937cc189d94af3e861b825f84342a9edbcb4d0432270797c8adb9b1805d99fef34ab86c0795135103e961f6289edc5536ca57d798e2a28dbb511d97170 WHIRLPOOL 5b96d52c10d2bed6feadd9b6a4bade8ea6d7cef1055ff81b008b7307daa95924892104ef8c040b3c78cac9a71e378a114f5658dc707d632ba741660161ffbd2d
 DIST at-spi2-atk-2.6.2.tar.xz 274748 SHA256 496c8432e8ab82735145f9af5d45209e9b708bf3c94e527ee091d08641a9bcfa SHA512 1ccfb0be6ebcd2a128b4ede45061cd4742ed861bd3167f60cbc52ce5daf043e30d10811726bb4918dfb8acd48fedcffdb78d416dee0af98955e8759a8d3cee90 WHIRLPOOL d9e9e20dcbfd3b56cff3db203c02ce047c3ff3989b4e24bb860ccf36d7d362c93ec1db14209dfb45e1824ceacb7d767fb8b8f0084e2e00f801a1db41a92928e0
-DIST at-spi2-atk-2.8.0.tar.xz 267368 SHA256 4688acbc1474cda0aa49341f109ad0726603ce3e872cc6521c74931338c7ba20 SHA512 dfcfd42ad3f84ba4959a1107bdb405f9b593c4b2b73ddf88b8a461cc3e7f8f04537a3bd08b406a30ae0ac364f6da481c6cfaae3444861b143e61547295973e2d WHIRLPOOL 4b27cbf05c92f7de0767abe3e835a8b39f42b40cfb79320bf36adccd874136d790ea44cf79b8542e98e5e51cd3b0b447e25b44e1405d40a32a236d6c83acc889
 DIST at-spi2-atk-2.8.1.tar.xz 266336 SHA256 eb659b94fde6dc0a2f584c9121a5e6d39a4c8aa297d21d8f9032f7a8a775fd06 SHA512 cb11e972681083c3434e2cd3049bf4c0664a56ee63f39789f29fbe5a2eb98ac4c43dc0a165ce2be516f2b7d430cff25199295beff56f99ae7c395e4e93b02752 WHIRLPOOL 8aabc2913d795a5a5096b45cd2574a7305789184ac4408f87f1f9c6b04513e0343748e77be8ed59756d3fc694ba71acbccca3032ab53e7e890fc9c31393c91df
-EBUILD at-spi2-atk-2.6.2.ebuild 1124 SHA256 f1fbebdc36969bcca2ad04864c79f001394a3f9f3bd0c36dc8821243c89baf73 SHA512 575f5f38735a91a8da0d4f034d01e977c055b75e9b84598c00c1cd191f953cf359ba30f99253bc05d75bc2f58781fe134e11e4da0ad28c8880ecb510c8c18d80 WHIRLPOOL 03efac0b6ef136f1c6d11b3db3c653ee392c9895f1d475a1408be649e2349a4e88dbd1bd84a615908b5b926368363a6e04654804cee07172e7a6914b506d0c25
-EBUILD at-spi2-atk-2.8.0.ebuild 900 SHA256 27ce98cedcec2bd22f036b735c8ad3b82481a344be03c1bf08891c3b8f8414ee SHA512 4089777d590cda927b88885c324a095116131fc928dabf39db565ab3364ac83b36d5ff1c597b013146223e2307a2548e8ff509c9c67d82c55188108851b8c0b9 WHIRLPOOL caf79136bff4ec95f475d8f12cdedc935aab16476bf22b7b24650daad33541712bdb81d27fb83e40273ec36929ba89158b812f44964a5b88786502e8de8132be
-EBUILD at-spi2-atk-2.8.1.ebuild 900 SHA256 1566cf95c7bb87f82ed6b36692c47e15d157a9316f03932b79b6dd423f21e152 SHA512 fe5799d2e5d2e84121fd8e01de2b6f508fd275e75d05ef25fa78c027f6462957fa7902bae5cfa7901bbd772ac22ef1dcb55c16515389574e2389830ed081eeb0 WHIRLPOOL 838ee13f64d3e365f23afb851f2ad60d8a7570a7a21acc58a803ae096a473efe8d3b69326a5e22f9b33828ea6d9780300045fe7acee24043e2cbfff1aa089e54
-MISC ChangeLog 4090 SHA256 697f8434fcc36bd5e846de262aedfa1ba7973aeebf45688bc5e39c52515f86f7 SHA512 d87b984c3dca76cb71876a9bb363eaf03c3e3033ca8130d39078a1cb254d9a2088de1848f14e7985752ebf85b63edf0294ff1e945d71cb75a492da90e8c56991 WHIRLPOOL ed0ac270c8a5176eb4b72bd4dddd311cd3b266a6381359b2be10b686119985d477dcd7437a98f54cb53762ec43db3d5eb453add025040f03c8acea991bd0e261
-MISC metadata.xml 174 SHA256 c0255e6a66375ac0e7f11c3712c6b47b7746432df4cf518e10c230674a6bc4f0 SHA512 b704bc8a6cbe98854b84a2ddedb7a2bc00309e3290e568dffed0bafc0acfcc81d6edb73dfacb95c56eef85982c2131f108e96abf55018ce45eda886f47bba1fb WHIRLPOOL 0e5a13b34c4e1ecf2888082f0c45255a63411981fbecbf4b8766de0f77993c2e6293f2ecb441adf901b20a48a56195a434cbb56c585d7e33693da12733ccb693
+EBUILD at-spi2-atk-2.6.2-r1.ebuild 1205 SHA256 d1685533351ee7f3e1a63baeb6249ce6d050a20d91317c8477ab61f3240a8071 SHA512 79d28d9e604ecc86418000c3f0d736ec523059de46348e1c3624cde29af2841800a50255d4bcfa70db1cedf45fce5733064b651d88dac2c18e3ce9846c88f2d3 WHIRLPOOL 072696931148ce22d3e7740736a6ee39008afd81f74c0e783cea1ea95922f485fe40c2b5c3b9998c7d0e06c62d5873494dc69895cb24ef877def658cf355fce7
+EBUILD at-spi2-atk-2.6.2.ebuild 1130 SHA256 2dab575598273a59ee1ee252c28d24d5b92dcf7ae63680629a56999ae2ad913c SHA512 9058eca47dceb6f1d73a34dd0351268138eb3a64b5e380c7e6a05e4133ebd522d4fb0e2a70d11d205db79ee0faed95e283b150b3bca59716152796f71c5def5d WHIRLPOOL 440371db8c354fc096d2c87956ccbc6a88039241bfba0b5bdc0f324c61a8c0daf170e70dca88b8f00b2855af946022aca11df915e1eeb72832a302949c58dc0c
+EBUILD at-spi2-atk-2.8.1.ebuild 1075 SHA256 cbf752ec54710d5e1847ecb7d92aca1166f2d78261377f7ddf267a84e4a780c7 SHA512 a5566a5b433161c520ab3298746e4a635bb45829ca9ea3b540871cf38e4897ea25743ba893c5382dc864b73ebf9e1180fb6d0c940a709cb519df59fcb5c51df1 WHIRLPOOL d9a89fe277808fe3df0154bbab39d39f6c8113efe2229ba74ceb15744c18d467ec7424818de1aef32142eafb44dd984e3e85f49367d511f66cea67f12d765566
+MISC ChangeLog 4418 SHA256 7035a108f6edf7448b2cbfb0abde50f32cc20503ff828cb16ed697b251ab3af7 SHA512 7e59da7c2a990867348aec0e090f341d8e33f0cc5ef25c3a81e44c21244ed335819484b744a86c6e3dd986afd714f092b90f286fac237b33db4d0357458a753c WHIRLPOOL d805a31e094ef25a089ee4f9ecfd632073df0f129dfe9c1cb983d74b97216716492af7988a5e3743069ae4d8eac71c519a2bc1ac9b38e1d778fb52d9ff4dc95a
+MISC metadata.xml 358 SHA256 4170e7d65d834bee05b0506dbb4964758e5f2b8743d1f69fb84611ae71957883 SHA512 19bbe7bdfda2b586b90bbb9b280bb869f0c1f715ab4ae520687d12fb1bf3b3affabf87471d3fb22f7ea6f0e76826e2b471f524dd816a1a11bab211c832042249 WHIRLPOOL de8dbd7c94daa88b256975f8964d2a974abf7256a350e171374e8516126e1098d5e4300d56c99e86fef7b390d0e3a81f2ce353a196e22c936e478449014ce103
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlFu1JIACgkQCaWpQKGI+9QqWgCfWAEaH3O9H9M9/vY00at0Yt+W
-IQIAn11DzL2YCF8uWWp7qrLUg6OhpxSC
-=OrGI
+iQEcBAEBCAAGBQJSThPjAAoJEJ0WA1zPCt1hH1AH/23G369tc3yvmEs/dpGx8Q07
+LcV7gT4r0r5UKgzZDCUrHHrXXsU5rzmpQgQLY3fWLYmrs08aFeg3vKC813z2rSBt
+n1mJOhKKSv7F1a6R6ECQbzSwXH1Q/6+1y6f5XHNJRAqDxNBe40Bzggubz2PlTrtV
+irip0BUtfTwPHoLFXtzqvUox5tsbHOAGn4HyVk/fQ2sXKlqyAp4LXwdidj5NK7P2
+LcgpIspDHytLG+Fei+VVVpKEGM33IymYnNBDvbCLwGRYL/nVJoG9nOByxKxapQ6D
+LggBZr7Ya6zm4rkdBsxOW7OPEczbNz4OxX218BoBO0s6kqSdZ8SyKxjGiryHyUE=
+=WNYK
 -----END PGP SIGNATURE-----
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>