Rely on gnome.org.eclass functions to set proper SRC_URI, this solves bug #374159 by pavelo. Remove old.

(Portage version: 2.1.10.3/cvs/Linux x86_64)

3 files changed, 9 insertions, 68 deletions

diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog
index 49d0ea4964e1..6b53d9e3ba1b 100644
--- a/gnome-base/orbit/ChangeLog
+++ b/gnome-base/orbit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/orbit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.175 2011/07/01 21:12:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.176 2011/07/05 19:51:34 pacho Exp $
+
+  05 Jul 2011; Pacho Ramos <pacho@gentoo.org> -orbit-2.14.18.ebuild,
+  orbit-2.14.19-r1.ebuild:
+  Rely on gnome.org.eclass functions to set proper SRC_URI, this solves bug
+  #374159 by pavelo. Remove old.
 
   01 Jul 2011; Markos Chandras <hwoarang@gentoo.org> orbit-2.14.19-r1.ebuild:
   Stable on amd64 wrt bug #278255
diff --git a/gnome-base/orbit/orbit-2.14.18.ebuild b/gnome-base/orbit/orbit-2.14.18.ebuild
deleted file mode 100644
index 3d07e733797f..000000000000
--- a/gnome-base/orbit/orbit-2.14.18.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.18.ebuild,v 1.9 2010/10/07 22:38:57 ssuominen Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2 toolchain-funcs
-
-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 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 )"
-
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix wrong process kill, bug #268142
-	sed "s:killall lt-timeout-server:killall timeout-server:" \
-		-i test/timeout.sh || die "sed failed"
-}
-
-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
-
-	# We need to use the hosts IDL compiler if cross-compiling, bug #262741
-	if tc-is-cross-compiler; then
-		# check that host version is present and executable
-		[ -x /usr/bin/orbit-idl-2 ] || die "Please emerge ~${CATEGORY}/${P} on the host system first"
-		G2CONF="${G2CONF} --with-idl-compiler=/usr/bin/orbit-idl-2"
-	fi
-
-	# Parallel build fails from time to time, bug #273031
-	MAKEOPTS="${MAKEOPTS} -j1"
-	gnome2_src_compile
-}
-
-src_test() {
-	emake -j1 check || die #235994
-}
diff --git a/gnome-base/orbit/orbit-2.14.19-r1.ebuild b/gnome-base/orbit/orbit-2.14.19-r1.ebuild
index 8bd646005902..6af7057d8d0d 100644
--- a/gnome-base/orbit/orbit-2.14.19-r1.ebuild
+++ b/gnome-base/orbit/orbit-2.14.19-r1.ebuild
@@ -1,19 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.19-r1.ebuild,v 1.3 2011/07/01 21:12:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.19-r1.ebuild,v 1.4 2011/07/05 19:51:34 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
+GNOME_ORG_MODULE="ORBit2"
 
 inherit gnome2 toolchain-funcs autotools
 
-MY_PN="ORBit2"
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
-
 DESCRIPTION="ORBit2 is a high-performance CORBA ORB"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
+HOMEPAGE="http://projects.gnome.org/ORBit2/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"