Set WANT_AUTOMAKE as appropriate per discussion in bug #271059. Clean up old revisions.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

8 files changed, 14 insertions, 330 deletions

diff --git a/gnome-extra/at-spi/ChangeLog b/gnome-extra/at-spi/ChangeLog
index b06afd169076..4c25728bd472 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.186 2009/05/10 07:21:04 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.187 2009/05/25 22:07:35 eva Exp $
+
+  25 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/at-spi-1.19.3-tests.patch, -at-spi-1.20.1.ebuild,
+  -files/at-spi-1.20.1-drop-gtk-doc.patch, -at-spi-1.22.1.ebuild,
+  -at-spi-1.24.0.ebuild, at-spi-1.24.1.ebuild, at-spi-1.26.0.ebuild:
+  Set WANT_AUTOMAKE as appropriate per discussion in bug #271059. Clean up
+  old revisions.
 
 *at-spi-1.26.0 (10 May 2009)
 
diff --git a/gnome-extra/at-spi/at-spi-1.20.1.ebuild b/gnome-extra/at-spi/at-spi-1.20.1.ebuild
deleted file mode 100644
index 758a7e72a02a..000000000000
--- a/gnome-extra/at-spi/at-spi-1.20.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2009 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.20.1.ebuild,v 1.10 2009/03/24 15:55:49 dang Exp $
-
-WANT_AUTOMAKE="1.9"
-
-inherit virtualx autotools eutils gnome2 python
-
-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"
-
-#next bump: check if we should activate Xevie or not
-
-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
-	>=dev-lang/python-2.4
-
-	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 )
-	>=gnome-base/gnome-common-2.20
-
-	x11-libs/libXt
-	x11-proto/xextproto
-	x11-proto/inputproto
-	x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# bug number ?
-	epatch "${FILESDIR}"/${PN}-1.19.3-tests.patch
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	# drop gtk-doc for autoreconf
-	use doc || epatch "${FILESDIR}/${P}-drop-gtk-doc.patch"
-
-	eautoreconf
-}
-
-src_test() {
-	Xemake check || die "Testing phase failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_version
-	python_mod_optimize /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/at-spi-1.22.1.ebuild b/gnome-extra/at-spi/at-spi-1.22.1.ebuild
deleted file mode 100644
index 3a87e5f6a84b..000000000000
--- a/gnome-extra/at-spi/at-spi-1.22.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2009 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.9 2009/03/24 15:55:49 dang 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 )
-	>=gnome-base/gnome-common-2.20
-
-	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 /usr/$(get_libdir)/python${PYVER}/site-packages/pyatspi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/pyatspi
-}
diff --git a/gnome-extra/at-spi/at-spi-1.24.0.ebuild b/gnome-extra/at-spi/at-spi-1.24.0.ebuild
deleted file mode 100644
index a62ad4c9a8df..000000000000
--- a/gnome-extra/at-spi/at-spi-1.24.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.24.0.ebuild,v 1.1 2008/09/30 22:46:43 leio 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
-	>=gnome-base/gconf-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.40
-	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 /usr/$(get_libdir)/python${PYVER}/site-packages/pyatspi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/pyatspi
-}
diff --git a/gnome-extra/at-spi/at-spi-1.24.1.ebuild b/gnome-extra/at-spi/at-spi-1.24.1.ebuild
index 3bdff3a020f5..50d9d55bc8fb 100644
--- a/gnome-extra/at-spi/at-spi-1.24.1.ebuild
+++ b/gnome-extra/at-spi/at-spi-1.24.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 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.24.1.ebuild,v 1.12 2009/04/28 14:38:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.24.1.ebuild,v 1.13 2009/05/25 22:07:35 eva Exp $
+
+WANT_AUTOMAKE="1.10"
 
 inherit autotools eutils gnome2 python virtualx
 
diff --git a/gnome-extra/at-spi/at-spi-1.26.0.ebuild b/gnome-extra/at-spi/at-spi-1.26.0.ebuild
index 6c0084b88b86..dae3539253a7 100644
--- a/gnome-extra/at-spi/at-spi-1.26.0.ebuild
+++ b/gnome-extra/at-spi/at-spi-1.26.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 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.26.0.ebuild,v 1.1 2009/05/10 07:21:05 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.26.0.ebuild,v 1.2 2009/05/25 22:07:35 eva Exp $
+
+WANT_AUTOMAKE="1.9"
 
 inherit autotools eutils gnome2 python virtualx
 
diff --git a/gnome-extra/at-spi/files/at-spi-1.19.3-tests.patch b/gnome-extra/at-spi/files/at-spi-1.19.3-tests.patch
deleted file mode 100644
index 4840284f01e7..000000000000
--- a/gnome-extra/at-spi/files/at-spi-1.19.3-tests.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN at-spi-1.19.3.orig/atk-bridge/bridge.c at-spi-1.19.3/atk-bridge/bridge.c
---- at-spi-1.19.3.orig/atk-bridge/bridge.c	2007-04-28 02:56:51.000000000 -0400
-+++ at-spi-1.19.3/atk-bridge/bridge.c	2007-06-04 13:29:46.000000000 -0400
-@@ -435,10 +435,23 @@ spi_atk_bridge_get_registry (void)
- 	  
-       if (ev._major != CORBA_NO_EXCEPTION)
-         {
-+		  gchar *err_desc = NULL;
-+		  const CORBA_char *id = CORBA_exception_id (&ev);
-+
-+		  if (strcmp(id, "IDL:Bonobo/GeneralError:1.0") == 0)
-+		  {
-+			  Bonobo_GeneralError* ge = CORBA_exception_value (&ev);
-+			  err_desc = g_strdup_printf ("bonobo activation problem: %s",
-+				  ge->description);
-+		  }
-+
-           g_error ("Accessibility app error: exception during "
--		   "registry activation from id: %s\n",
--		   CORBA_exception_id (&ev));
-+			   "registry activation from id: %s\n"
-+			   "Error description: %s\n", id, err_desc == NULL ? "-" : err_desc);
-+
-           CORBA_exception_free (&ev);
-+		  if (err_desc != NULL)
-+			  g_free (err_desc);
-         }
- 	  
-       if (registry_died && registry) 
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN at-spi-1.19.3.orig/test/Makefile.am at-spi-1.19.3/test/Makefile.am
---- at-spi-1.19.3.orig/test/Makefile.am	2007-05-22 05:40:43.000000000 -0400
-+++ at-spi-1.19.3/test/Makefile.am	2007-06-04 13:31:11.000000000 -0400
-@@ -37,11 +37,18 @@ INCLUDES = -I$(top_srcdir)           \
- 	   $(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 = test-simple
- 
- 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
-+
-+BUILT_SOURCES = Accessibility_Registry.server
-+
-+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
- 
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN at-spi-1.19.3.orig/test/test-simple.c at-spi-1.19.3/test/test-simple.c
---- at-spi-1.19.3.orig/test/test-simple.c	2007-01-09 22:08:21.000000000 -0500
-+++ at-spi-1.19.3/test/test-simple.c	2007-06-04 13:29:46.000000000 -0400
-@@ -714,7 +714,7 @@ test_keylisteners (void)
- 	key_listener = SPI_createAccessibleKeystrokeListener (
- 		key_listener_cb, &stroke);
- 
--	test_keyset = SPI_createAccessibleKeySet (1, "=", NULL, NULL);
-+	test_keyset = SPI_createAccessibleKeySet (1, "t", NULL, NULL);
- 
- 	g_assert (SPI_registerAccessibleKeystrokeListener (
- 		key_listener,
-@@ -725,11 +725,11 @@ test_keylisteners (void)
- 
- 	for (i = 0; i < 3; i++) {
- 		memset (&stroke, 0, sizeof (AccessibleKeystroke));
--		g_assert (SPI_generateKeyboardEvent ('=', NULL, SPI_KEY_SYM));
-+		g_assert (SPI_generateKeyboardEvent ('t', NULL, SPI_KEY_SYM));
- 		while (!(key_press_received))
- 			g_main_context_iteration (NULL, TRUE);
- 		fprintf (stderr, "p [%s]", stroke.keystring);
--	        g_assert (!strcmp (stroke.keystring, "="));
-+	        g_assert (!strcmp (stroke.keystring, "t"));
- 		while (!(key_release_received))
- 			g_main_context_iteration (NULL, TRUE);
- 		fprintf (stderr, "r [%s]", stroke.keystring);
diff --git a/gnome-extra/at-spi/files/at-spi-1.20.1-drop-gtk-doc.patch b/gnome-extra/at-spi/files/at-spi-1.20.1-drop-gtk-doc.patch
deleted file mode 100644
index a0f5007ed955..000000000000
--- a/gnome-extra/at-spi/files/at-spi-1.20.1-drop-gtk-doc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.in.old	2008-02-18 12:12:11.000000000 +0100
-+++ configure.in	2008-02-18 12:13:02.000000000 +0100
-@@ -66,8 +66,14 @@
- localedir='${prefix}/${DATADIRNAME}/locale'
- AC_SUBST(localedir)
- 
-+dnl Crazy hack for dropping the dep on gtk-doc
-+AC_DEFUN(GTK_DOC_CHECK, [])
- GTK_DOC_CHECK([1.0])
- 
-+dnl Crazy hack for dropping the dep on gtk-doc
-+AM_CONDITIONAL(ENABLE_GTK_DOC, 0, [])
-+AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, 0, [])
-+
- AC_PATH_XTRA
- 
- if test x$no_x = xyes ; then
---- Makefile.am.old	2008-02-18 12:13:08.000000000 +0100
-+++ Makefile.am	2008-02-18 12:13:59.000000000 +0100
-@@ -1,4 +1,8 @@
--SUBDIRS = docs idl libspi login-helper registryd atk-bridge cspi pyatspi test po
-+SUBDIRS = idl libspi login-helper registryd atk-bridge cspi pyatspi test po
-+
-+if ENABLE_GTK_DOC
-+SUBDIRS += docs
-+endif
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libspi-1.0.pc cspi-1.0.pc libloginhelper-1.0.pc