5 files changed, 12 insertions, 70 deletions
diff --git a/app-accessibility/at-spi2-atk/ChangeLog b/app-accessibility/at-spi2-atk/ChangeLog
index cbf15707bfb4..a619eb9b0288 100644
--- a/app-accessibility/at-spi2-atk/ChangeLog
+++ b/app-accessibility/at-spi2-atk/ChangeLog
@@ -1,6 +1,11 @@
 # 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.26 2013/10/04 01:03:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog,v 1.27 2013/10/04 15:46:43 tetromino Exp $
+
+  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.1.ebuild, metadata.xml:
+  gtk2 flag is not needed with >=at-spi-1.32.0-r1:1
 
 *at-spi2-atk-2.6.2-r1 (04 Oct 2013)
 
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2-r1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2-r1.ebuild
index dc29f0317a04..591e9b78959d 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2-r1.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.6.2-r1.ebuild,v 1.1 2013/10/04 01:03:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2-r1.ebuild,v 1.2 2013/10/04 15:46:43 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="+gtk2"
+IUSE=""
 
 COMMON_DEPEND="
 	>=app-accessibility/at-spi2-core-2.6
@@ -23,18 +23,13 @@ COMMON_DEPEND="
 	>=sys-apps/dbus-1
 "
 RDEPEND="${COMMON_DEPEND}
-	gtk2? ( !<gnome-extra/at-spi-1.32.0-r1 )
+	!<gnome-extra/at-spi-1.32.0-r1
 "
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
 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"
 
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
deleted file mode 100644
index 6210d6ee4cfa..000000000000
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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.10 2013/10/04 01:03:00 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
-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=""
-
-COMMON_DEPEND="
-	>=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
-#"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	DOCS="AUTHORS NEWS README"
-	# xevie is deprecated/broken since xorg-1.6/1.7
-	G2CONF="${G2CONF} --enable-p2p"
-
-	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
-	epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	Xemake check
-}
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 d13d016b9d64..bf4b20eb0a3f 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.2 2013/10/04 01:03:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild,v 1.3 2013/10/04 15:46:43 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="+gtk2"
+IUSE=""
 
 COMMON_DEPEND="
 	>=app-accessibility/at-spi2-core-2.7.5
@@ -23,21 +23,12 @@ COMMON_DEPEND="
 	>=sys-apps/dbus-1
 "
 RDEPEND="${COMMON_DEPEND}
-	gtk2? ( !<gnome-extra/at-spi-1.32.0-r1 )
+	!<gnome-extra/at-spi-1.32.0-r1
 "
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
-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 b4d1b8b49b08..d9f21e6a89de 100644
--- a/app-accessibility/at-spi2-atk/metadata.xml
+++ b/app-accessibility/at-spi2-atk/metadata.xml
@@ -2,8 +2,4 @@
 <!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>