bump to 2.14.13. Clean up old revisions.

(Portage version: 2.1.5.4)

3 files changed, 18 insertions, 56 deletions

diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog
index d53566075d40..b3d4331dcdb2 100644
--- a/gnome-base/orbit/ChangeLog
+++ b/gnome-base/orbit/ChangeLog
@@ -1,6 +1,20 @@
 # 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.127 2008/03/22 03:58:15 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.128 2008/06/08 18:19:40 eva Exp $
+
+*orbit-2.14.13 (08 Jun 2008)
+
+  08 Jun 2008; Gilles Dartiguelongue <eva@gentoo.org> -orbit-2.14.7.ebuild,
+  -orbit-2.14.10.ebuild, +orbit-2.14.13.ebuild:
+  bump to 2.14.13. Clean up old revisions.
+  - porting
+    + Fixes for building with MSVC (Tor Lillqvist and Marcelo Vanzin)
+  - bug fixes
+    + Robustness fixes (Michael)
+    + Fixes for the poa test client (Jules)
+    + Build fixes with single glib includes (Christian)
+    + Locking fixes in linc (Michael, Tor)
+    + Fixes for handling of local requests (Jeff, Li)
 
   22 Mar 2008; Daniel Gryniewicz <dang@gentoo.org> orbit-2.14.12.ebuild:
   Marked stable on amd64 for bug #212986
diff --git a/gnome-base/orbit/orbit-2.14.10.ebuild b/gnome-base/orbit/orbit-2.14.13.ebuild
index 98100e0066a7..5a56ac862e47 100644
--- a/gnome-base/orbit/orbit-2.14.10.ebuild
+++ b/gnome-base/orbit/orbit-2.14.13.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.10.ebuild,v 1.9 2008/04/20 01:36:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.13.ebuild,v 1.1 2008/06/08 18:19:40 eva Exp $
 
 inherit gnome2 eutils
 
@@ -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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc"
 
 RDEPEND=">=dev-libs/glib-2.8
@@ -31,7 +31,7 @@ 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
+	# 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"
 
diff --git a/gnome-base/orbit/orbit-2.14.7.ebuild b/gnome-base/orbit/orbit-2.14.7.ebuild
deleted file mode 100644
index c05ffa65ab7b..000000000000
--- a/gnome-base/orbit/orbit-2.14.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.11 2008/03/16 21:46:57 leio Exp $
-
-inherit gnome2
-
-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="arm sh"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2.8
-	>=dev-libs/libIDL-0.8.2"
-
-# FIXME linc is now integrated, but a block isn't necessary
-# and probably complicated FIXME
-
-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
-
-	# 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
-	# for more information.  Please don't remove -- 8/18/06
-	unset IDL_DIR
-
-	gnome2_src_compile
-}