Bump to 2.14.8-r3

	Make it use native ref/unref functions; bug #189808

(Portage version: 2.1.3.6)

4 files changed, 113 insertions, 1 deletions

diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog
index 783cd4c936bd..1eb146c704cd 100644
--- a/gnome-base/orbit/ChangeLog
+++ b/gnome-base/orbit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/orbit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.102 2007/08/21 23:32:00 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.103 2007/08/24 21:46:10 dang Exp $
+
+*orbit-2.14.8-r3 (24 Aug 2007)
+
+  24 Aug 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/orbit-2.14.8-native-ref.patch, +orbit-2.14.8-r3.ebuild:
+  Bump to 2.14.8-r3
+  	Make it use native ref/unref functions; bug #189808
 
 *orbit-2.14.8-r2 (21 Aug 2007)
 
diff --git a/gnome-base/orbit/files/digest-orbit-2.14.8-r3 b/gnome-base/orbit/files/digest-orbit-2.14.8-r3
new file mode 100644
index 000000000000..0abebba8948c
--- /dev/null
+++ b/gnome-base/orbit/files/digest-orbit-2.14.8-r3
@@ -0,0 +1,3 @@
+MD5 661c7afc457d44c2f9dcf1811dd2150d ORBit2-2.14.8.tar.bz2 742448
+RMD160 512259accfcc939873046d04ae2d482f145e71ec ORBit2-2.14.8.tar.bz2 742448
+SHA256 608bd76fe2adc811612ea3e28579d042c715d5a6dba73f1eca7ff52495b40455 ORBit2-2.14.8.tar.bz2 742448
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
new file mode 100644
index 000000000000..72118c498ca7
--- /dev/null
+++ b/gnome-base/orbit/files/orbit-2.14.8-native-ref.patch
@@ -0,0 +1,55 @@
+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.8-r3.ebuild b/gnome-base/orbit/orbit-2.14.8-r3.ebuild
new file mode 100644
index 000000000000..068ee70cf6d4
--- /dev/null
+++ b/gnome-base/orbit/orbit-2.14.8-r3.ebuild
@@ -0,0 +1,47 @@
+# 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.1 2007/08/24 21:46:10 dang 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
+}