bump to 1.22.1. Bug fix and translation updates.

(Portage version: 2.1.5_rc2)

4 files changed, 82 insertions, 177 deletions

diff --git a/gnome-extra/at-spi/ChangeLog b/gnome-extra/at-spi/ChangeLog
index 33a5405dc2f1..c4cbdda47bd1 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.164 2008/03/23 11:56:48 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.165 2008/04/10 21:51:53 eva Exp $
+
+*at-spi-1.22.1 (10 Apr 2008)
+
+  10 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  files/at-spi-1.22.0-tests.patch, at-spi-1.22.0.ebuild,
+  +at-spi-1.22.1.ebuild:
+  bump to 1.22.1. Bug fix and translation updates.
 
 *at-spi-1.22.0 (23 Mar 2008)
 
diff --git a/gnome-extra/at-spi/at-spi-1.22.0.ebuild b/gnome-extra/at-spi/at-spi-1.22.0.ebuild
index 38417b3837e5..bd2c1c983979 100644
--- a/gnome-extra/at-spi/at-spi-1.22.0.ebuild
+++ b/gnome-extra/at-spi/at-spi-1.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.22.0.ebuild,v 1.1 2008/03/23 11:56:48 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.22.0.ebuild,v 1.2 2008/04/10 21:51:53 eva Exp $
 
 inherit virtualx autotools eutils gnome2 python
 
@@ -50,6 +50,8 @@ src_unpack() {
 
 	# should fix tests
 	epatch "${FILESDIR}"/${PN}-1.22.0-tests.patch
+
+	eautomake
 }
 
 src_test() {
diff --git a/gnome-extra/at-spi/at-spi-1.22.1.ebuild b/gnome-extra/at-spi/at-spi-1.22.1.ebuild
new file mode 100644
index 000000000000..7a576ecf5368
--- /dev/null
+++ b/gnome-extra/at-spi/at-spi-1.22.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2008 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.22.1.ebuild,v 1.1 2008/04/10 21:51:53 eva Exp $
+
+inherit autotools eutils gnome2 python virtualx
+
+DESCRIPTION="The Gnome Accessibility Toolkit"
+HOMEPAGE="http://developer.gnome.org/projects/gap/"
+
+LICENSE="LGPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/atk-1.17
+	>=x11-libs/gtk+-2.10.0
+	>=gnome-base/gail-1.9.0
+	>=gnome-base/libbonobo-1.107
+	>=gnome-base/orbit-2
+	dev-libs/popt
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXtst"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	doc? ( >=dev-util/gtk-doc-1 )
+
+	x11-libs/libXt
+	x11-proto/xextproto
+	x11-proto/inputproto
+	x11-proto/xproto"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+# needs a live properly configured environment. Not really suited to
+# an ebuild restricted environment
+RESTRICT="test"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+
+	# should fix tests
+	epatch "${FILESDIR}"/${PN}-1.22.0-tests.patch
+
+	eautomake
+}
+
+src_test() {
+	Xemake check || die "Testing phase failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_version
+	python_mod_optimize "${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/pyatspi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_version
+	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/pyatspi
+}
diff --git a/gnome-extra/at-spi/files/at-spi-1.22.0-tests.patch b/gnome-extra/at-spi/files/at-spi-1.22.0-tests.patch
index b0f729a74298..4840284f01e7 100644
--- a/gnome-extra/at-spi/files/at-spi-1.22.0-tests.patch
+++ b/gnome-extra/at-spi/files/at-spi-1.22.0-tests.patch
@@ -78,178 +78,3 @@ diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN at-spi-1.19.3.orig/test/
  		while (!(key_release_received))
  			g_main_context_iteration (NULL, TRUE);
  		fprintf (stderr, "r [%s]", stroke.keystring);
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN at-spi-1.19.3.orig/test/Makefile.in at-spi-1.19.3/test/Makefile.in
---- at-spi-1.19.3.orig/test/Makefile.in	2008-03-20 00:21:40.000000000 +0100
-+++ at-spi-1.19.3/test/Makefile.in	2008-03-20 00:27:11.000000000 +0100
-@@ -55,45 +55,50 @@
- app_LDADD = $(LDADD)
- am__DEPENDENCIES_1 =
- app_DEPENDENCIES = ../libspi/libspi.la ../cspi/libcspi.la \
--	../login-helper/libloginhelper.la $(am__DEPENDENCIES_1) \
-+	../login-helper/libloginhelper.la \
-+	../atk-bridge/libatk-bridge.la $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_at_OBJECTS = at.$(OBJEXT)
- at_OBJECTS = $(am_at_OBJECTS)
- at_LDADD = $(LDADD)
- at_DEPENDENCIES = ../libspi/libspi.la ../cspi/libcspi.la \
--	../login-helper/libloginhelper.la $(am__DEPENDENCIES_1) \
-+	../login-helper/libloginhelper.la \
-+	../atk-bridge/libatk-bridge.la $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_event_listener_test_OBJECTS = event-listener-test.$(OBJEXT)
- event_listener_test_OBJECTS = $(am_event_listener_test_OBJECTS)
- event_listener_test_LDADD = $(LDADD)
- event_listener_test_DEPENDENCIES = ../libspi/libspi.la \
- 	../cspi/libcspi.la ../login-helper/libloginhelper.la \
--	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1)
-+	../atk-bridge/libatk-bridge.la $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_key_listener_test_OBJECTS = key-listener-test.$(OBJEXT)
- key_listener_test_OBJECTS = $(am_key_listener_test_OBJECTS)
- key_listener_test_LDADD = $(LDADD)
- key_listener_test_DEPENDENCIES = ../libspi/libspi.la \
- 	../cspi/libcspi.la ../login-helper/libloginhelper.la \
--	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1)
-+	../atk-bridge/libatk-bridge.la $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_keypad_test_OBJECTS = keypad-test.$(OBJEXT)
- keypad_test_OBJECTS = $(am_keypad_test_OBJECTS)
- keypad_test_LDADD = $(LDADD)
- keypad_test_DEPENDENCIES = ../libspi/libspi.la ../cspi/libcspi.la \
--	../login-helper/libloginhelper.la $(am__DEPENDENCIES_1) \
-+	../login-helper/libloginhelper.la \
-+	../atk-bridge/libatk-bridge.la $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_keysynth_demo_OBJECTS = keysynth-demo.$(OBJEXT)
- keysynth_demo_OBJECTS = $(am_keysynth_demo_OBJECTS)
- keysynth_demo_LDADD = $(LDADD)
- keysynth_demo_DEPENDENCIES = ../libspi/libspi.la ../cspi/libcspi.la \
--	../login-helper/libloginhelper.la $(am__DEPENDENCIES_1) \
-+	../login-helper/libloginhelper.la \
-+	../atk-bridge/libatk-bridge.la $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_keysynth_test_OBJECTS = keysynth-test.$(OBJEXT)
- keysynth_test_OBJECTS = $(am_keysynth_test_OBJECTS)
- keysynth_test_LDADD = $(LDADD)
- keysynth_test_DEPENDENCIES = ../libspi/libspi.la ../cspi/libcspi.la \
--	../login-helper/libloginhelper.la $(am__DEPENDENCIES_1) \
-+	../login-helper/libloginhelper.la \
-+	../atk-bridge/libatk-bridge.la $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_login_helper_client_test_OBJECTS =  \
- 	login-helper-client-test.$(OBJEXT)
-@@ -102,8 +107,8 @@
- login_helper_client_test_LDADD = $(LDADD)
- login_helper_client_test_DEPENDENCIES = ../libspi/libspi.la \
- 	../cspi/libcspi.la ../login-helper/libloginhelper.la \
--	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1)
-+	../atk-bridge/libatk-bridge.la $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_login_helper_server_test_OBJECTS =  \
- 	login-helper-server-test.$(OBJEXT)
- login_helper_server_test_OBJECTS =  \
-@@ -111,41 +116,44 @@
- login_helper_server_test_LDADD = $(LDADD)
- login_helper_server_test_DEPENDENCIES = ../libspi/libspi.la \
- 	../cspi/libcspi.la ../login-helper/libloginhelper.la \
--	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1)
-+	../atk-bridge/libatk-bridge.la $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_screen_review_test_OBJECTS = screen-review-test.$(OBJEXT)
- screen_review_test_OBJECTS = $(am_screen_review_test_OBJECTS)
- screen_review_test_LDADD = $(LDADD)
- screen_review_test_DEPENDENCIES = ../libspi/libspi.la \
- 	../cspi/libcspi.la ../login-helper/libloginhelper.la \
--	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1)
-+	../atk-bridge/libatk-bridge.la $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_simple_at_OBJECTS = simple-at.$(OBJEXT)
- simple_at_OBJECTS = $(am_simple_at_OBJECTS)
- simple_at_LDADD = $(LDADD)
- simple_at_DEPENDENCIES = ../libspi/libspi.la ../cspi/libcspi.la \
--	../login-helper/libloginhelper.la $(am__DEPENDENCIES_1) \
-+	../login-helper/libloginhelper.la \
-+	../atk-bridge/libatk-bridge.la $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_stress_test_OBJECTS = stress-test.$(OBJEXT)
- stress_test_OBJECTS = $(am_stress_test_OBJECTS)
- stress_test_LDADD = $(LDADD)
- stress_test_DEPENDENCIES = ../libspi/libspi.la ../cspi/libcspi.la \
--	../login-helper/libloginhelper.la $(am__DEPENDENCIES_1) \
-+	../login-helper/libloginhelper.la \
-+	../atk-bridge/libatk-bridge.la $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_test_simple_OBJECTS = test-simple.$(OBJEXT)
- test_simple_OBJECTS = $(am_test_simple_OBJECTS)
- test_simple_LDADD = $(LDADD)
- test_simple_DEPENDENCIES = ../libspi/libspi.la ../cspi/libcspi.la \
--	../login-helper/libloginhelper.la $(am__DEPENDENCIES_1) \
-+	../login-helper/libloginhelper.la \
-+	../atk-bridge/libatk-bridge.la $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_window_listener_test_OBJECTS = window-listener-test.$(OBJEXT)
- window_listener_test_OBJECTS = $(am_window_listener_test_OBJECTS)
- window_listener_test_LDADD = $(LDADD)
- window_listener_test_DEPENDENCIES = ../libspi/libspi.la \
- 	../cspi/libcspi.la ../login-helper/libloginhelper.la \
--	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+	../atk-bridge/libatk-bridge.la $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -394,12 +405,13 @@
- 	   $(TESTS_CFLAGS)	     \
- 	   $(DEBUG_CFLAGS)
- 
--LDADD = ../libspi/libspi.la ../cspi/libcspi.la ../login-helper/libloginhelper.la $(TESTS_LIBS) $(X_LIBS) $(XINPUT_LIBS)
-+LDADD = ../libspi/libspi.la ../cspi/libcspi.la ../login-helper/libloginhelper.la ../atk-bridge/libatk-bridge.la $(TESTS_LIBS) $(X_LIBS) $(XINPUT_LIBS)
- TESTS_ENVIRONMENT = \
--	LD_LIBRARY_PATH=$(top_builddir)/libspi/.libs/:$(top_builddir)/cspi/.libs/	\
--	PATH=$(top_builddir)/registryd/.libs/:$(PATH)
-+	BONOBO_ACTIVATION_PATH=$(top_builddir)/test
- 
--all: all-am
-+BUILT_SOURCES = Accessibility_Registry.server
-+all: $(BUILT_SOURCES)
-+	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
- .SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
-@@ -679,10 +690,12 @@
- 	done
- check-am: all-am
- 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
--check: check-am
-+check: $(BUILT_SOURCES)
-+	$(MAKE) $(AM_MAKEFLAGS) check-am
- all-am: Makefile $(PROGRAMS)
- installdirs:
--install: install-am
-+install: $(BUILT_SOURCES)
-+	$(MAKE) $(AM_MAKEFLAGS) install-am
- install-exec: install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am
-@@ -781,6 +795,12 @@
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- 	tags uninstall uninstall-am
- 
-+
-+Accessibility_Registry.server:
-+	rm -f Accessibility_Registry.server
-+	sed -e "s,@REGISTRYD_PATH\@,`which libtool` --mode=execute `pwd`/../registryd,g" \
-+		$(top_builddir)/registryd/Accessibility_Registry.server.in.in > \
-+		Accessibility_Registry.server
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT: