Clean up the at-spi2-atk compatible revision and update it to python-r1.eclass.

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

4 files changed, 99 insertions, 11 deletions

diff --git a/gnome-extra/at-spi/ChangeLog b/gnome-extra/at-spi/ChangeLog
index 31b37add7745..f7048dafb3d0 100644
--- a/gnome-extra/at-spi/ChangeLog
+++ b/gnome-extra/at-spi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/at-spi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.236 2013/07/28 18:05:24 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.237 2013/10/04 15:45:13 tetromino Exp $
+
+*at-spi-1.32.0-r2 (04 Oct 2013)
+
+  04 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  at-spi-1.32.0.ebuild, +at-spi-1.32.0-r2.ebuild:
+  Clean up the at-spi2-atk compatible revision and update it to
+  python-r1.eclass.
 
 *at-spi-2.8.0 (28 Jul 2013)
 
diff --git a/gnome-extra/at-spi/Manifest b/gnome-extra/at-spi/Manifest
index 02d6e556381a..9ac21fcda9d3 100644
--- a/gnome-extra/at-spi/Manifest
+++ b/gnome-extra/at-spi/Manifest
@@ -3,17 +3,22 @@ Hash: SHA256
 
 AUX at-spi-1.22.0-tests.patch 3541 SHA256 23ed4f7026969eba5df992cb7290740c8eb62fa701cdf50f9f06eec83b559f3d SHA512 245e68ba072a4f58c1aaaf5a488e0fab61efef8e4a9853165bc8d68672a0b940c9b6623e069236114e93cf14dba0aba7a98a8addda5c354e39b797fbda313105 WHIRLPOOL 1b2feda062ae9fcfef3294974ef83cf304960ce441660429f4eae1ad04067f68debf4c8631dfedb97009597fd83b54f22db2702c727624cb879d6307b119531a
 AUX at-spi-1.30.1-make-382.patch 679 SHA256 a04b3315ea9e9cc2d4ec3a33ee582126d88d4439c21bef4a67eae4fde011264c SHA512 db9270ead05be7d473fbd2c31f2ea5020d8ff8a80442ba24f45eaf7f098f7daa959067bad4ec12ff21832791ef19fda7e1d836f4f2932b25b550202583809a26 WHIRLPOOL 0b63b6d04b1219c784c288a0ddfaea36eeea1b031c9ed5aa1caf8e13f7b0eaeb8dfe27f1b52bdd6f7eb26d8098c5049ea2f0054db8b324333e55e9aed1ca5289
-DIST at-spi-1.32.0.tar.bz2 845788 SHA256 cc841dea746413eebadf0710dabec741450b37a06821c34526f505fe9d027039
+DIST at-spi-1.32.0.tar.bz2 845788 SHA256 cc841dea746413eebadf0710dabec741450b37a06821c34526f505fe9d027039 SHA512 2cfff99940b23341bdf5da3ef0a0611e243c4e41079c492250e39405064bd524e151bd491a8d5f0cd12c9bf68278fd276119923e0beda142bc1d7a315ef57c25 WHIRLPOOL 8adb19e7e1051eb2f91bc0bfaf56ba1a2ecde8ad29cc20d6e876f9f4850f7538e08d4d8a2cb178771cd1f334cf45877b1c123b769b3123bf72ca04fcfbb79f61
 EBUILD at-spi-1.32.0-r1.ebuild 1648 SHA256 786ff1bc1ba647b3c241e6450f984f91e4a33cebdeb2f0a16efaab91512d03fe SHA512 b018fc5293f96b59412a445db7ca7f5a81c8f48d4843933cb74eeaf77f9d30c2c28e413e0139257e3c4761dbf891dd2c28c1fe6339f804ea18ce0ec69add22be WHIRLPOOL 3463e7e07c1c04912169adefe276b33be648b85532281411eb217126761bb312456bdbe8f302c542d5ff74a286181913fcb25f11ab4b2dbed57778383fb56839
-EBUILD at-spi-1.32.0.ebuild 1547 SHA256 7cf0d8c7ceee62d6190c89da449fa51e20df9db174b2776f097bdd4f166ecd75 SHA512 948469186742ab3f826081ccb1705fb5adb351e505a40f19a39f4d5fb483ced5053cd36338f27b384c47627f441a96e8c541392efe0e4db2de64eafd09e806a6 WHIRLPOOL dbce6e008797c8c976e47bed493dfe8466df0a2d00810e25baf510e1d2f5ad09587aeac9176a2a974c16b32789e8a3f2279a398b1c195b8c97351bb5e818c561
+EBUILD at-spi-1.32.0-r2.ebuild 1653 SHA256 6c3d293861c189183067f8520030eeacc28fcb03f7f690af01663b1558e51fea SHA512 5c41fd190d8cf8fb4e0a172d33c654b6400b9b05662b12c085987ebeb2695b25b98c5a57b0f26fc654540f85f5afdf24dad83f1f8268b373d5e043bf6e727900 WHIRLPOOL 72f5451ef6db0efbc9961bc5f22f2c07e4d29a8b0fbb0f42ebafc72067d1668f77f616be69b68b01629a51b7aaa96c296e4aa1a3f59d327b07100b0e8cd7a862
+EBUILD at-spi-1.32.0.ebuild 1584 SHA256 6b114d76d19edeedb9ecd0ccfd10310e19536ec335cbe6c5be651c9f22d2ae96 SHA512 b32bac9a399a10f7d416d02129f78c3820d13f321a369ccb8db5fbc5d4b7ab7b047e835ead2ceadefc12d23e1fbb9f631833e1193ac1e9675cda2ed417b53cc1 WHIRLPOOL 765078a110d3dcd08d50496da16303a48488213d53e0beeaf4bb0d7b9fbbe48013110187159d7408ff5ead6aab88efb0abfb942e1458c1185d0ef3bd4044b068
 EBUILD at-spi-2.6.0.ebuild 577 SHA256 ab9f3807ed20708920f7c68d4328c94b6bfe87780a413eb61059076f8f178dba SHA512 4fd093214eee61749621cb5df86fc271d495f616fe8345f66e76fd95220d728c0aea5ee5d2bcb38e97fc2ac8fd4d7fe397e3c3d22be2f0a338d10c12b4c61a32 WHIRLPOOL 1156e5dc509199b296ee9cd3f4063186bb348c6a3b71a3782bfd4ce230aca06ca5a2d41d34756de44299ac6a7b86aebeeefaea9b2c7b316cf5f0d01993f89ada
 EBUILD at-spi-2.8.0.ebuild 577 SHA256 84866747eb32dd6540a9aa79f02e4a554d954a198186bce3aa56a5d2fb5a25ed SHA512 136261fb42c7e63032fa6e6ef9e2f2f9f601ec5fc39c83b8bb24e8f64de76f8da483146bb4b982a43ea6cc4a960d64c9b42f0e6ef2b4c930a4d95e0d86e07317 WHIRLPOOL 011c890f473354ac7e599bc9934c73b481de724cdcc59cb605ab1ae01e337ff49e46089e5199a75bbc8665ae3bf0c26c2b594dc4e18a09ef7db4932f41c321ee
-MISC ChangeLog 28384 SHA256 19ac753727573cbe44b3de1f6fa98e1ff612fd891347443f18e272f206eb25ff SHA512 58a2e720f8632178f8cad8da1b59ed396703cebeec223945a7b36146af2d1edb5935e86c1425ccccc2c15024068ef92b912314fc573d0a5a39e02087514db032 WHIRLPOOL 513e00912fa5fef276a72e172306d6aec68b30460517be4809bb3324b3faa4350d17cbf73f0e143f36ad0790a9ff11d1ec27c277fa710da09d8f1d252e748880
+MISC ChangeLog 28617 SHA256 f91d4686c72dfa91b3f0de743b15d5c87232669646c4a784e8a7af96d73b2b09 SHA512 50830a13dc6fdeaed4cc07b2fabc3b221d9b0fd54342db76c10a8f49de18bbd5e608fdae3d1e8a52e2e9ac2dfd85d4691641186254c6200cc4c16ad607a051ba WHIRLPOOL 9fe22ca08ac2b4a34a1eab838337ad9bf6496032815b987b8813d257ac0536d03cecebc61372d2b2b52fa541f0ee201a33e2d828f3400979e46f03a9ee64eac9
 MISC metadata.xml 172 SHA256 f14db6f3dc189eb3e4a3478d7c1bead86fe077d0c756b8426b64f7fc0d42d228 SHA512 08900050a4d17b5951615f1989c5585edb9e9f2e56b484fa74ac2d735ebbf6f8a939612101bc988cb30c8f05d2b61033847184479092386718bcc8609c5e1adb WHIRLPOOL fc5ac7457fd7bf5b72d5f1513b1f1f909e3c09c6b880335b77656c82044f1b3f8dac58f6baef5df4557d7e5688e40c80b226aa4ba108a46a33d57204c26314a9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlH1XWUACgkQ1fmVwcYIWAZWQQCdEiXBhhRNZuCdwk5hb9KmGTdd
-wmUAoIwxU30rox4+aqVJNXfqf8V/V+ZU
-=PsFl
+iQEcBAEBCAAGBQJSTuKpAAoJEJ0WA1zPCt1hGh8H/2seNWy4poci9Uhz4m42gZfQ
+ajUG85hbR3ZBrlV3MriCpi4SyPLujylNVtmXxNjCbtYIOdkBXlQnDy90ZWCMnVeW
+L9lfj2IYP7qlyqFq0Vrc5a00BPh5EnIyWu7boXrL0ArHCCnvio8Y/PKWbxc25aUt
+LoMeEOMOQSsXLzzzrNLfk/0PxOTB1VwUaLW1cBEPmzG+I/0Y5ZaZM0qOrPxVeDAn
+6IZrnKuxeRf8vbl/gNkjpY67/BjNm7T0JvU52/5DXaFsztfkoXFOa8UjHBsOSRZr
+ss9dc502h/1wbnun7zDVFoWXIM+Y8C0NPh0QvPKoatBRmbo5q6s1NXuSXJa3RwI=
+=LM9r
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/at-spi/at-spi-1.32.0-r2.ebuild b/gnome-extra/at-spi/at-spi-1.32.0-r2.ebuild
new file mode 100644
index 000000000000..7681a0c87d69
--- /dev/null
+++ b/gnome-extra/at-spi/at-spi-1.32.0-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.32.0-r2.ebuild,v 1.1 2013/10/04 15:45:13 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="The Gnome Accessibility Toolkit"
+HOMEPAGE="http://projects.gnome.org/accessibility/"
+
+LICENSE="LGPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/atk-1.29.2
+	>=x11-libs/gtk+-2.19.7:2
+	>=gnome-base/libbonobo-1.107
+	>=gnome-base/orbit-2
+	>=dev-libs/dbus-glib-0.76
+	>=gnome-base/gconf-2
+	dev-libs/popt
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXtst
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+
+	x11-libs/libXt
+	x11-proto/xextproto
+	x11-proto/inputproto
+	x11-proto/xproto
+"
+# eautoreconf needs:
+#	gnome-base/gnome-common
+#	dev-util/gtk-doc-am
+
+# needs a live properly configured environment. Not really suited to
+# an ebuild restricted environment
+RESTRICT="test"
+
+src_prepare() {
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	# relocate must be explicitely set
+	python_foreach_impl run_in_build_dir gnome2_src_configure \
+		--enable-sm \
+		--enable-relocate \
+		--disable-xevie
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install \
+		referencedir="${EPREFIX}/usr/share/doc/${PF}/reference/html"
+}
diff --git a/gnome-extra/at-spi/at-spi-1.32.0.ebuild b/gnome-extra/at-spi/at-spi-1.32.0.ebuild
index bc55bd23557c..bd61a5933c55 100644
--- a/gnome-extra/at-spi/at-spi-1.32.0.ebuild
+++ b/gnome-extra/at-spi/at-spi-1.32.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.32.0.ebuild,v 1.9 2012/05/05 06:25:18 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.32.0.ebuild,v 1.10 2013/10/04 15:45:13 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -28,7 +28,9 @@ RDEPEND=">=dev-libs/atk-1.29.2
 	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libXi
-	x11-libs/libXtst"
+	x11-libs/libXtst
+
+	!app-accessibility/at-spi2-atk"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig