New version with small changes. Remove old

(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64)

6 files changed, 14 insertions, 187 deletions

diff --git a/gnome-extra/at-spi/ChangeLog b/gnome-extra/at-spi/ChangeLog
index 9c7d070827b9..1ef9ce7b5c61 100644
--- a/gnome-extra/at-spi/ChangeLog
+++ b/gnome-extra/at-spi/ChangeLog
@@ -1,6 +1,15 @@
 # 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.171 2008/09/25 16:10:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.172 2008/09/30 22:46:43 leio Exp $
+
+*at-spi-1.24.0 (30 Sep 2008)
+
+  30 Sep 2008; Mart Raudsepp <leio@gentoo.org>
+  -files/at-spi-1.18.0-ior-leak.patch,
+  -files/at-spi-1.18.1-focus-tracker-leak.patch,
+  -files/at-spi-1.18.1-tests.patch, -at-spi-1.18.1-r1.ebuild,
+  -at-spi-1.22.0.ebuild, +at-spi-1.24.0.ebuild:
+  New version with small changes. Remove old
 
   25 Sep 2008; Jeroen Roovers <jer@gentoo.org> at-spi-1.22.1.ebuild:
   Stable for HPPA (bug #236971).
diff --git a/gnome-extra/at-spi/at-spi-1.18.1-r1.ebuild b/gnome-extra/at-spi/at-spi-1.18.1-r1.ebuild
deleted file mode 100644
index 52472f82f2c3..000000000000
--- a/gnome-extra/at-spi/at-spi-1.18.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2007 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.18.1-r1.ebuild,v 1.10 2007/09/22 09:34:27 tgall Exp $
-
-WANT_AUTOMAKE="1.9"
-
-inherit virtualx autotools eutils gnome2
-
-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"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	epatch "${FILESDIR}/${P}-tests.patch"
-	epatch "${FILESDIR}/${PN}-1.18.0-ior-leak.patch"
-	epatch "${FILESDIR}/${P}-focus-tracker-leak.patch"
-
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR="." eautoreconf
-}
-
-src_test() {
-	Xmake check || die "Testing phase failed"
-}
diff --git a/gnome-extra/at-spi/at-spi-1.22.0.ebuild b/gnome-extra/at-spi/at-spi-1.24.0.ebuild
index ff4602ec59d7..a62ad4c9a8df 100644
--- a/gnome-extra/at-spi/at-spi-1.22.0.ebuild
+++ b/gnome-extra/at-spi/at-spi-1.24.0.ebuild
@@ -1,8 +1,8 @@
 # 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.3 2008/05/29 17:01:51 hawking Exp $
+# $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 virtualx autotools eutils gnome2 python
+inherit autotools eutils gnome2 python virtualx
 
 DESCRIPTION="The Gnome Accessibility Toolkit"
 HOMEPAGE="http://developer.gnome.org/projects/gap/"
@@ -17,6 +17,7 @@ RDEPEND=">=dev-libs/atk-1.17
 	>=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
@@ -27,7 +28,7 @@ RDEPEND=">=dev-libs/atk-1.17
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
+	>=dev-util/intltool-0.40
 	doc? ( >=dev-util/gtk-doc-1 )
 
 	x11-libs/libXt
diff --git a/gnome-extra/at-spi/files/at-spi-1.18.0-ior-leak.patch b/gnome-extra/at-spi/files/at-spi-1.18.0-ior-leak.patch
deleted file mode 100644
index 6b62cff48c6e..000000000000
--- a/gnome-extra/at-spi/files/at-spi-1.18.0-ior-leak.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Patch from http://cvs.fedora.redhat.com/viewcvs/rpms/at-spi/F-7/at-spi-1.18.0-ior-leak.patch?rev=1.1&view=auto
-to not have to duplicate efforts on just including the functional patch and leaving out the whitespace changes at
-upstream http://svn.gnome.org/viewcvs/at-spi/trunk/atk-bridge/bridge.c?r1=903&r2=902&pathrev=903
-
---- at-spi-1.18.0/atk-bridge/bridge.c.ior-leak	2007-04-09 13:34:13.000000000 +0200
-+++ at-spi-1.18.0/atk-bridge/bridge.c	2007-04-09 13:35:35.000000000 +0200
-@@ -420,9 +420,11 @@
- 	  /* XXX: This presumes that the registry has successfully restarted itself already...*/
- 	  ior = (char *) spi_atk_bridge_get_registry_ior ();
- 
--	  if (ior != NULL)
-+	  if (ior != NULL) {
- 	       registry = CORBA_ORB_string_to_object (bonobo_activation_orb_get (), 
- 						      ior, &ev);
-+	       XFree (ior);
-+	  }
- 	  else {
- 	       g_warning ("IOR not set.");  
- 	       registry = CORBA_OBJECT_NIL;
diff --git a/gnome-extra/at-spi/files/at-spi-1.18.1-focus-tracker-leak.patch b/gnome-extra/at-spi/files/at-spi-1.18.1-focus-tracker-leak.patch
deleted file mode 100644
index 6e7392d1ca14..000000000000
--- a/gnome-extra/at-spi/files/at-spi-1.18.1-focus-tracker-leak.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Patch from http://svn.gnome.org/viewcvs/at-spi/trunk/atk-bridge/bridge.c?r1=902&r2=901&pathrev=902
-to fix a memory leak in spi_atk_bridge_focus_tracker codepath
-
---- trunk/atk-bridge/bridge.c	2007/04/09 08:34:50	901
-+++ trunk/atk-bridge/bridge.c	2007/04/12 07:06:38	902
-@@ -714,7 +714,10 @@
-     registry_died = TRUE;
- 
-   bonobo_object_unref (source);
--  
-+
-+  if (e.any_data._release)
-+    CORBA_free (e.any_data._value);
-+
-   CORBA_exception_free (&ev);
- }
- 
diff --git a/gnome-extra/at-spi/files/at-spi-1.18.1-tests.patch b/gnome-extra/at-spi/files/at-spi-1.18.1-tests.patch
deleted file mode 100644
index dc7d0fc8adb7..000000000000
--- a/gnome-extra/at-spi/files/at-spi-1.18.1-tests.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -NurdpB at-spi-1.18.1/atk-bridge/bridge.c at-spi-1.18.1-patched/atk-bridge/bridge.c
---- at-spi-1.18.1/atk-bridge/bridge.c	2007-04-09 02:34:37.000000000 -0500
-+++ at-spi-1.18.1-patched/atk-bridge/bridge.c	2007-09-18 05:08:39.000000000 -0500
-@@ -430,10 +430,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 -NurdpB at-spi-1.18.1/test/Makefile.am at-spi-1.18.1-patched/test/Makefile.am
---- at-spi-1.18.1/test/Makefile.am	2007-04-09 01:37:04.000000000 -0500
-+++ at-spi-1.18.1-patched/test/Makefile.am	2007-09-18 04:45:04.000000000 -0500
-@@ -39,9 +39,8 @@ INCLUDES = -I$(top_srcdir)           \
- 
- LDADD = ../libspi/libspi.la ../cspi/libcspi.la ../login-helper/libloginhelper.la $(TESTS_LIBS) $(X_LIBS) $(XINPUT_LIBS)
- 
--TESTS = test-simple
-+TESTS = run-tests
- 
- TESTS_ENVIRONMENT =					\
--	LD_LIBRARY_PATH=$(top_builddir)/libspi/.libs/:$(top_builddir)/cspi/.libs/	\
--	PATH=$(top_builddir)/registryd/.libs
-+	REGISTRYD=$(top_builddir)/registryd/at-spi-registryd /bin/sh
- 
-diff -NurdpB at-spi-1.18.1/test/run-tests at-spi-1.18.1-patched/test/run-tests
---- at-spi-1.18.1/test/run-tests	1969-12-31 19:00:00.000000000 -0500
-+++ at-spi-1.18.1-patched/test/run-tests	2007-09-18 05:56:32.000000000 -0500
-@@ -0,0 +1,18 @@
-+#! /bin/sh
-+
-+../libtool --mode=execute $REGISTRYD &
-+regd_pid=$!
-+
-+while true; do
-+	sleep 1
-+	q=`bonobo-activation-run-query "has(repo_ids, 'IDL:Accessibility/Registry:1.0') && _active"`
-+	echo $q | fgrep -q 'number of results: 0' || break
-+done
-+
-+./test-simple
-+exit_code=$?
-+
-+kill $regd_pid
-+wait $regd_pid
-+
-+exit $exit_code
-diff -NurdpB at-spi-1.18.1/test/test-simple.c at-spi-1.18.1-patched/test/test-simple.c
---- at-spi-1.18.1/test/test-simple.c	2007-04-09 01:37:04.000000000 -0500
-+++ at-spi-1.18.1-patched/test/test-simple.c	2007-09-18 05:08:39.000000000 -0500
-@@ -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);