Remove old. Be compatible with newer glib and in general more future proof in the rest; bug 213434

(Portage version: 2.1.4.4)

7 files changed, 47 insertions, 247 deletions

diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog
index b8b28ae35557..a4f517336a61 100644
--- a/gnome-base/orbit/ChangeLog
+++ b/gnome-base/orbit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/orbit
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.124 2008/03/15 12:52:04 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.125 2008/03/16 21:46:57 leio Exp $
+
+  16 Mar 2008; Mart Raudsepp <leio@gentoo.org>
+  -files/orbit-2.14.8-fix_races.patch, -files/orbit-2.14.8-native-ref.patch,
+  orbit-2.14.7.ebuild, -orbit-2.14.8-r3.ebuild, orbit-2.14.10.ebuild,
+  orbit-2.14.12.ebuild:
+  Remove old. Be compatible with newer glib and in general more future proof
+  in the rest; bug 213434
 
   15 Mar 2008; nixnut <nixnut@gentoo.org> orbit-2.14.12.ebuild:
   Stable on ppc wrt bug 212986
diff --git a/gnome-base/orbit/files/orbit-2.14.8-fix_races.patch b/gnome-base/orbit/files/orbit-2.14.8-fix_races.patch
deleted file mode 100644
index 51ada5c2f7a2..000000000000
--- a/gnome-base/orbit/files/orbit-2.14.8-fix_races.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-from gnome bug #466574
-
-Index: src/orb/GIOP/giop-recv-buffer.c
-===================================================================
---- src/orb/GIOP/giop-recv-buffer.c	(revision 2016)
-+++ src/orb/GIOP/giop-recv-buffer.c	(working copy)
-@@ -736,6 +736,7 @@
- 			link_io_thread_remove_timeout (ent->cnx->parent.timeout_source_id);
- 			ent->cnx->parent.timeout_source_id = 0;
- 			ent->cnx->parent.timeout_status = LINK_TIMEOUT_NO;
-+			g_object_unref (&ent->cnx->parent); // we remove the source so we must unref the connection
- 		} else if (ent->cnx->parent.timeout_status == LINK_TIMEOUT_YES)
- 			*timeout = TRUE;
- 		g_mutex_unlock (ent->cnx->parent.timeout_mutex);
-@@ -1355,17 +1356,12 @@
- 	return TRUE;
- }
- 
--struct timeout_thread_data {
--	GIOPThread *tdata;
--	LinkConnection *lcnx;
--};
--
- static gboolean
--giop_timeout(gpointer data)
-+giop_timeout (gpointer data)
- {
- 	gboolean retv = FALSE;
--	LinkConnection *lcnx = ((struct timeout_thread_data*)data)->lcnx;
--	GIOPThread *tdata =  ((struct timeout_thread_data*)data)->tdata;
-+	LinkConnection *lcnx = (LinkConnection*)data;
-+	GIOPThread *tdata = (GIOPThread *)lcnx->tdata;
- 
- 	g_assert (lcnx->timeout_mutex);
- 
-@@ -1386,27 +1382,29 @@
- 	giop_incoming_signal_T (tdata, GIOP_CLOSECONNECTION);
- 	g_mutex_unlock (tdata->lock); /* ent_lock */
- 	
--out:
--	g_object_unref (lcnx);
--	g_free (data);
-+	g_object_unref (lcnx); // we remove the source so we must unref lcnx
- 
-+out:
- 	return retv;
- }
- 
- void
--giop_timeout_add(GIOPConnection *cnx)
-+giop_timeout_add (GIOPConnection *cnx)
- {
--	struct timeout_thread_data *data = NULL;
-+	static GStaticMutex static_mutex = G_STATIC_MUTEX_INIT;
- 	LinkConnection *lcnx = LINK_CONNECTION (cnx);
--	GSource *timeout_source = NULL;
- 
- 	if (!giop_thread_io ())
- 		return;
- 	if (!lcnx->timeout_msec) 
- 		return;
- 
--	g_object_ref (lcnx);
-+	g_static_mutex_lock (&static_mutex);
-+	if (lcnx->timeout_source_id)
-+		goto out;
- 
-+	g_object_ref (lcnx); // to be unref'ed by the one who removes the timeout source
-+	
- 	if (!lcnx->timeout_mutex)
- 		lcnx->timeout_mutex = g_mutex_new ();
- 
-@@ -1414,11 +1412,12 @@
- 	lcnx->timeout_status = LINK_TIMEOUT_UNKNOWN;
- 	g_mutex_unlock (lcnx->timeout_mutex);
- 
--	data = g_new0 (struct timeout_thread_data, 1);
--	data->tdata = giop_thread_self ();
--	data->lcnx = lcnx;
-+	lcnx->tdata = giop_thread_self ();
- 
--	lcnx->timeout_source_id = link_io_thread_add_timeout (lcnx->timeout_msec, giop_timeout, data);
-+	lcnx->timeout_source_id = link_io_thread_add_timeout (lcnx->timeout_msec, giop_timeout, (gpointer)lcnx);
-+
-+out:
-+	g_static_mutex_unlock (&static_mutex);
- }
- 
- GIOPRecvBuffer *
-Index: src/orb/GIOP/giop-send-buffer.c
-===================================================================
---- src/orb/GIOP/giop-send-buffer.c	(revision 2016)
-+++ src/orb/GIOP/giop-send-buffer.c	(working copy)
-@@ -456,6 +456,7 @@
- 
- 	if (g_thread_supported () 
- 	    && lcnx->timeout_msec 
-+	    && !lcnx->timeout_source_id
- 	    && !giop_send_buffer_is_oneway (buf)) {
- 		giop_timeout_add (cnx);
- 	}
-Index: linc2/include/linc/linc-connection.h
-===================================================================
---- linc2/include/linc/linc-connection.h	(revision 2016)
-+++ linc2/include/linc/linc-connection.h	(working copy)
-@@ -67,6 +67,7 @@
- 	guint                   timeout_msec;
- 	guint                   timeout_source_id; // protected by timeout_mutex
- 	LinkTimeoutStatus       timeout_status;    // protected by timeout_mutex
-+	void                   *tdata;             // "do not pollute the namespace"-hack (it's a GIOPThread*)
- } LinkConnection;
- 
- typedef struct {
-Index: linc2/src/linc-connection.c
-===================================================================
---- linc2/src/linc-connection.c	(revision 2016)
-+++ linc2/src/linc-connection.c	(working copy)
-@@ -1269,11 +1269,9 @@
- 
- 	if (cnx->timeout_mutex)
- 		g_mutex_free (cnx->timeout_mutex);
--
--	if (cnx->timeout_source_id)
-+	if (cnx->timeout_source_id) 
- 		link_io_thread_remove_timeout (cnx->timeout_source_id);
- 
--
- #ifdef G_ENABLE_DEBUG
- 	g_assert (g_list_find(cnx_list, cnx) == NULL);
- #endif
-@@ -1294,6 +1292,7 @@
- 	cnx->timeout_msec = 0;
- 	cnx->timeout_source_id = 0;
- 	cnx->timeout_status = LINK_TIMEOUT_UNKNOWN;
-+	cnx->tdata = NULL; 
- 
- #ifdef CONNECTION_DEBUG
- 	cnx->priv->total_read_bytes = 0;
diff --git a/gnome-base/orbit/files/orbit-2.14.8-native-ref.patch b/gnome-base/orbit/files/orbit-2.14.8-native-ref.patch
deleted file mode 100644
index 72118c498ca7..000000000000
--- a/gnome-base/orbit/files/orbit-2.14.8-native-ref.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN ORBit2-2.14.8.orig/configure.in ORBit2-2.14.8/configure.in
---- ORBit2-2.14.8.orig/configure.in	2007-06-03 07:00:44.000000000 -0400
-+++ ORBit2-2.14.8/configure.in	2007-08-24 17:34:19.000000000 -0400
-@@ -103,8 +103,8 @@ AC_ARG_ENABLE(compile-warnings, [  --ena
- 
- dnl --enable-debug=(yes|minimum|no)
- AC_ARG_ENABLE(debug, [  --enable-debug=[no/yes] turn on debugging [default=no]],,enable_debug=minimum)
--if test "$enable_debug" = "yes"; then
--  ORBIT_DEBUG_CFLAGS="-DG_ENABLE_DEBUG"
-+if test "x$enable_debug" = "xyes"; then
-+  ORBIT_DEBUG_CFLAGS="-ggdb -DG_ENABLE_DEBUG"
- else
-   if test "x$enable_debug" = "xno"; then
-     ORBIT_DEBUG_CFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN ORBit2-2.14.8.orig/linc2/src/Makefile.am ORBit2-2.14.8/linc2/src/Makefile.am
---- ORBit2-2.14.8.orig/linc2/src/Makefile.am	2007-02-24 19:00:43.000000000 -0500
-+++ ORBit2-2.14.8/linc2/src/Makefile.am	2007-08-24 17:34:19.000000000 -0400
-@@ -13,6 +13,7 @@ INCLUDES =                         \
- 	-I$(top_srcdir)/linc2/include    \
- 	$(LINC_CFLAGS)             \
- 	$(WARN_CFLAGS)             \
-+        $(ORBIT_DEBUG_CFLAGS)      \
- 	-DG_DISABLE_DEPRECATED	   \
- 	-D_GNU_SOURCE
- 
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN ORBit2-2.14.8.orig/src/orb/GIOP/giop-recv-buffer.c ORBit2-2.14.8/src/orb/GIOP/giop-recv-buffer.c
---- ORBit2-2.14.8.orig/src/orb/GIOP/giop-recv-buffer.c	2007-08-24 17:34:36.000000000 -0400
-+++ ORBit2-2.14.8/src/orb/GIOP/giop-recv-buffer.c	2007-08-24 17:34:19.000000000 -0400
-@@ -736,7 +736,7 @@ giop_recv_buffer_get (GIOPMessageQueueEn
- 			link_io_thread_remove_timeout (ent->cnx->parent.timeout_source_id);
- 			ent->cnx->parent.timeout_source_id = 0;
- 			ent->cnx->parent.timeout_status = LINK_TIMEOUT_NO;
--			g_object_unref (&ent->cnx->parent); // we remove the source so we must unref the connection
-+			link_connection_unref (&ent->cnx->parent); // we remove the source so we must unref the connection
- 		} else if (ent->cnx->parent.timeout_status == LINK_TIMEOUT_YES)
- 			*timeout = TRUE;
- 		g_mutex_unlock (ent->cnx->parent.timeout_mutex);
-@@ -1382,7 +1382,7 @@ giop_timeout (gpointer data)
- 	giop_incoming_signal_T (tdata, GIOP_CLOSECONNECTION);
- 	g_mutex_unlock (tdata->lock); /* ent_lock */
- 	
--	g_object_unref (lcnx); // we remove the source so we must unref lcnx
-+	link_connection_unref (lcnx); // we remove the source so we must unref lcnx
- 
- out:
- 	return retv;
-@@ -1403,7 +1403,7 @@ giop_timeout_add (GIOPConnection *cnx)
- 	if (lcnx->timeout_source_id)
- 		goto out;
- 
--	g_object_ref (lcnx); // to be unref'ed by the one who removes the timeout source
-+	link_connection_ref (lcnx); // to be unref'ed by the one who removes the timeout source
- 	
- 	if (!lcnx->timeout_mutex)
- 		lcnx->timeout_mutex = g_mutex_new ();
diff --git a/gnome-base/orbit/orbit-2.14.10.ebuild b/gnome-base/orbit/orbit-2.14.10.ebuild
index 748de75cd6de..e2f8ee69cbe9 100644
--- a/gnome-base/orbit/orbit-2.14.10.ebuild
+++ b/gnome-base/orbit/orbit-2.14.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.10.ebuild,v 1.7 2007/11/27 03:52:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.10.ebuild,v 1.8 2008/03/16 21:46:57 leio Exp $
 
 inherit gnome2 eutils
 
@@ -28,6 +28,17 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
 
+src_unpack() {
+	gnome2_src_unpack
+
+	# Filter out G_DISABLE_DEPRECATED to work with glib-2.16 and be future-proof, bug 213434
+	sed -i -e '/DISABLE_DEPRECATED/d' \
+		"${S}/linc2/src/Makefile.am" "${S}/linc2/src/Makefile.in"
+
+	sed -i -e 's:-DG_DISABLE_DEPRECATED::g' \
+		"${S}/configure.in" "${S}/configure"
+}
+
 src_compile() {
 	# We need to unset IDL_DIR, which is set by RSI's IDL.  This causes certain
 	# files to be not found by autotools when compiling ORBit.  See bug #58540
diff --git a/gnome-base/orbit/orbit-2.14.12.ebuild b/gnome-base/orbit/orbit-2.14.12.ebuild
index c8a558d2a5d9..ee90980c6e97 100644
--- a/gnome-base/orbit/orbit-2.14.12.ebuild
+++ b/gnome-base/orbit/orbit-2.14.12.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-base/orbit/orbit-2.14.12.ebuild,v 1.5 2008/03/15 12:52:04 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.12.ebuild,v 1.6 2008/03/16 21:46:57 leio Exp $
 
 inherit gnome2 eutils
 
@@ -28,6 +28,17 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
 
+src_unpack() {
+	gnome2_src_unpack
+
+	# Filter out G_DISABLE_DEPRECATED to be future-proof, related to bug 213434
+	sed -i -e '/DISABLE_DEPRECATED/d' \
+		"${S}/linc2/src/Makefile.am" "${S}/linc2/src/Makefile.in"
+
+	sed -i -e 's:-DG_DISABLE_DEPRECATED::g' \
+		"${S}/configure.in" "${S}/configure"
+}
+
 src_compile() {
 	# We need to unset IDL_DIR, which is set by RSI's IDL.  This causes certain
 	# files to be not found by autotools when compiling ORBit.  See bug #58540
diff --git a/gnome-base/orbit/orbit-2.14.7.ebuild b/gnome-base/orbit/orbit-2.14.7.ebuild
index 328ddccff55d..c05ffa65ab7b 100644
--- a/gnome-base/orbit/orbit-2.14.7.ebuild
+++ b/gnome-base/orbit/orbit-2.14.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.7.ebuild,v 1.10 2007/08/25 14:24:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.7.ebuild,v 1.11 2008/03/16 21:46:57 leio Exp $
 
 inherit gnome2
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnome/sources/ORBit2/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="arm sh"
 IUSE="doc"
 
 RDEPEND=">=dev-libs/glib-2.8
@@ -31,6 +31,17 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
 
+src_unpack() {
+	gnome2_src_unpack
+
+	# Filter out G_DISABLE_DEPRECATED to work with glib-2.16 and be future-proof, bug 213434
+	sed -i -e '/DISABLE_DEPRECATED/d' \
+		"${S}/linc2/src/Makefile.am" "${S}/linc2/src/Makefile.in"
+
+	sed -i -e 's:-DG_DISABLE_DEPRECATED::g' \
+		"${S}/configure.in" "${S}/configure"
+}
+
 src_compile() {
 	# We need to unset IDL_DIR, which is set by RSI's IDL.  This causes certain
 	# files to be not found by autotools when compiling ORBit.  See bug #58540
diff --git a/gnome-base/orbit/orbit-2.14.8-r3.ebuild b/gnome-base/orbit/orbit-2.14.8-r3.ebuild
deleted file mode 100644
index fca4b608f776..000000000000
--- a/gnome-base/orbit/orbit-2.14.8-r3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.8-r3.ebuild,v 1.8 2007/11/06 16:39:18 armin76 Exp $
-
-inherit gnome2 eutils
-
-MY_P="ORBit2-${PV}"
-PVP=(${PV//[-\._]/ })
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="ORBit2 is a high-performance CORBA ORB"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="mirror://gnome/sources/ORBit2/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 mips ppc ~ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2.8
-	>=dev-libs/libIDL-0.8.2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.18
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# fix race condition in 2.14.8 (see bug #188825)
-	epatch "${FILESDIR}"/${PN}-2.14.8-fix_races.patch
-	# Use native ref/unref functions.  Bug #189808
-	epatch "${FILESDIR}"/${P}-native-ref.patch
-}
-
-src_compile() {
-	# We need to unset IDL_DIR, which is set by RSI's IDL.  This causes certain
-	# files to be not found by autotools when compiling ORBit.  See bug #58540
-	# for more information.  Please don't remove -- 8/18/06
-	unset IDL_DIR
-
-	gnome2_src_compile
-}