[gentoo-commits] proj/gnome:master commit in: app-accessibility/at-spi2-atk/files/, app-accessibility/at-spi2-atk/

[Gilles Dartiguelongue]

commit:     63a8af336d5f4051c1d43f904facaf0c83191b8b
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  1 18:46:05 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec  1 19:02:19 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=63a8af33

app-accessibility/at-spi2-atk: 2.8.1 → 2.10.2

---
 .../at-spi2-atk/at-spi2-atk-2.10.2.ebuild          | 38 ++++++++++++++++++++++
 .../at-spi2-atk/at-spi2-atk-9999.ebuild            | 29 +++++------------
 ...at-spi2-atk-2.0.2-disable-teamspaces-test.patch | 13 --------
 app-accessibility/at-spi2-atk/metadata.xml         |  5 +++
 4 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.10.2.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.10.2.ebuild
new file mode 100644
index 0000000..fc583a2
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.10.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+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.9.4
+	>=dev-libs/atk-2.9.4
+	>=dev-libs/glib-2.32:2
+	>=sys-apps/dbus-1
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/at-spi-1.32.0-r1
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure --enable-p2p
+}
+
+src_test() {
+	Xemake check
+}

diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-9999.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-9999.ebuild
index 7431980..2fe6d69 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-9999.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -19,14 +19,14 @@ SLOT="2"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~arm ~hppa ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 IUSE=""
 
 COMMON_DEPEND="
-	>=app-accessibility/at-spi2-core-2.6
-	>=dev-libs/atk-2.1.0
-	dev-libs/glib:2
+	>=app-accessibility/at-spi2-core-2.9.4
+	>=dev-libs/atk-2.9.4
+	>=dev-libs/glib-2.32:2
 	>=sys-apps/dbus-1
 "
 RDEPEND="${COMMON_DEPEND}
@@ -36,21 +36,8 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
-pkg_setup() {
-	DOCS="AUTHORS NEWS README"
-	# xevie is deprecated/broken since xorg-1.6/1.7
-	G2CONF="${G2CONF} --enable-p2p"
-}
-
-src_prepare() {
-	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
-	epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-
-	# FIXME: droute test fails
-#	sed -e 's:TESTS = droute-test\.*:TESTS = :' -i droute/Makefile.* ||
-#		die "sed droute/Makefile.* failed"
-
-	gnome2_src_prepare
+src_configure() {
+	gnome2_src_configure --enable-p2p
 }
 
 src_test() {

diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.0.2-disable-teamspaces-test.patch b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.0.2-disable-teamspaces-test.patch
deleted file mode 100644
index ee6ba32..0000000
--- a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.0.2-disable-teamspaces-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/dbind/dbtest.c b/dbind/dbtest.c
-index d00486a..553dd78 100644
---- a/dbind/dbtest.c
-+++ b/dbind/dbtest.c
-@@ -397,7 +397,7 @@ int main (int argc, char **argv)
- 
-     test_helpers ();
-     test_marshalling ();
--    test_teamspaces (bus);
-+    /* test_teamspaces (bus); */
- 
-     return 0;
- }

diff --git a/app-accessibility/at-spi2-atk/metadata.xml b/app-accessibility/at-spi2-atk/metadata.xml
new file mode 100644
index 0000000..d9f21e6
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome-accessibility</herd>
+</pkgmetadata>