Bump to 2.14.17. Build fixes and enhancements to linc. Clean up old revisions.

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

4 files changed, 18 insertions, 115 deletions

diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog
index 9b6565911c20..d441ffec909e 100644
--- a/gnome-base/orbit/ChangeLog
+++ b/gnome-base/orbit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/orbit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.146 2009/03/06 15:33:02 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.147 2009/03/08 00:59:36 eva Exp $
+
+*orbit-2.14.17 (08 Mar 2009)
+
+  08 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org> -orbit-2.14.12.ebuild,
+  -orbit-2.14.13.ebuild, -orbit-2.14.14.ebuild, +orbit-2.14.17.ebuild:
+  Bump to 2.14.17. Build fixes and enhancements to linc. Clean up
+  old revisions.
 
   06 Mar 2009; Brent Baude <ranger@gentoo.org> ChangeLog:
   Marking orbit-2.14.16 ppc stable for bug 260063
diff --git a/gnome-base/orbit/orbit-2.14.12.ebuild b/gnome-base/orbit/orbit-2.14.12.ebuild
deleted file mode 100644
index 753872c0e86f..000000000000
--- a/gnome-base/orbit/orbit-2.14.12.ebuild
+++ /dev/null
@@ -1,49 +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.12.ebuild,v 1.9 2008/04/20 01:36:05 vapier 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
-
-	# 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
-	# for more information.  Please don't remove -- 8/18/06
-	unset IDL_DIR
-
-	gnome2_src_compile
-}
diff --git a/gnome-base/orbit/orbit-2.14.13.ebuild b/gnome-base/orbit/orbit-2.14.13.ebuild
deleted file mode 100644
index b6e97802602e..000000000000
--- a/gnome-base/orbit/orbit-2.14.13.ebuild
+++ /dev/null
@@ -1,49 +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.13.ebuild,v 1.7 2008/11/13 19:01:31 ranger 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
-
-	# 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
-	# for more information.  Please don't remove -- 8/18/06
-	unset IDL_DIR
-
-	gnome2_src_compile
-}
diff --git a/gnome-base/orbit/orbit-2.14.14.ebuild b/gnome-base/orbit/orbit-2.14.17.ebuild
index efb59620f71a..c6a32325d7b4 100644
--- a/gnome-base/orbit/orbit-2.14.14.ebuild
+++ b/gnome-base/orbit/orbit-2.14.17.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.14.ebuild,v 1.1 2008/08/25 21:05:14 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.17.ebuild,v 1.1 2009/03/08 00:59:36 eva Exp $
 
-inherit gnome2 eutils
+GCONF_DEBUG="no"
+
+inherit gnome2
 
 MY_P="ORBit2-${PV}"
 PVP=(${PV//[-\._]/ })
@@ -24,21 +26,8 @@ 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 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
@@ -47,3 +36,8 @@ src_compile() {
 
 	gnome2_src_compile
 }
+
+src_test() {
+	# can fail in parallel, see bug #235994
+	emake -j1 check || die "tests failed"
+}