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

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 15 insertions, 86 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/Manifest b/gnome-base/orbit/Manifest
index 14925e7f5be6..bfab8771ef66 100644
--- a/gnome-base/orbit/Manifest
+++ b/gnome-base/orbit/Manifest
@@ -1,27 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-DIST ORBit2-2.14.18.tar.bz2 747701 RMD160 8105c7323869be38a21de562878150f25da17f17 SHA1 76074570d3fc08d4e62d37f02023fe1af3b7be3f SHA256 c6148edd8044255aeed9ab1d1eeb3c39edd0aa1ace5d33cf6831b80d11f1ab7c
 DIST ORBit2-2.14.19.tar.bz2 764820 RMD160 e16c1697efc4ad3dafca47828954f39438b4a8d4 SHA1 e7c26aa4b82c146b3ec08d490e3469b4913e4e2f SHA256 55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550
-EBUILD orbit-2.14.18.ebuild 1721 RMD160 5b448863db172b87e06169867e104de9f0443a92 SHA1 4c61ff3dfb1c09aa44505c62aeba1f5cd9d0d425 SHA256 b0632159f8466e2f9226882f48aa091cdaaefa3b13bf73cd522d07259d2c2db3
-EBUILD orbit-2.14.19-r1.ebuild 2277 RMD160 bf4d5da44b8df29c21c180927240f558e3b975e4 SHA1 8adc450195af50fc70a8fcddf4043c8d8bd0fe86 SHA256 e2051202c59ab3eb0ae350f6c2b824e9ba50cf154adf46843fe52d8bdad47e64
+EBUILD orbit-2.14.19-r1.ebuild 2175 RMD160 2dd848a26d3f26448f8b3eb13a13b007679917c4 SHA1 b498e4810585eaecaa6085221fc671855e46c2bd SHA256 9e62779b65c14d86111e3fa8ad725d3ecb0316a3a00cb50df07612d07b3f0549
 EBUILD orbit-2.14.19.ebuild 2023 RMD160 7f87026c6a1e9300dda0633ef51f9927eeaea943 SHA1 df4e266eedda1e61df91066e3180ab514c9a59ff SHA256 0064b50558c1ffe537cc3ccf5319d8af55fc08bf18674fe2a33548b0cbe814a9
-MISC ChangeLog 21806 RMD160 25a579aa8a65f04639c3c3bf73963f57d3590ebe SHA1 6b4421a4e087dd81d5943c3df48fb97ab51a44b3 SHA256 1fe3af72cea6d2b5705dcd0f48fe15f35136f222491e5bd5ba839f2045bfe09c
+MISC ChangeLog 22009 RMD160 740e8b574d5515fa65a5a72a60ce8f25cc73c438 SHA1 601ca5cfcf753a4d17e206bf4569862b286909ea SHA256 05fb1be676bd17433cedeac830aaee6966a03cec2d6230393e6f9780fe1d70eb
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJODjhPAAoJEPqDWhW0r/LChiAP/jmrXPMp1WN5A7Najqm4oXiZ
-BxezKX4O0Eoe5mXi9jc72gU8xFKd1zu/w3lRkG6OrLZlGU5cKOpdNi4xlnHOQKLa
-sdRbyzeuaUwhKqCgUJ1Yi9WXR80uvhTvFjcSomf7lxk16Qoz2BI3IfU/wHCB9Edu
-7EEzZA46sSx5TkR8Y1/wCdwRqcL/wJ6j83/F7D/taI32VPZsFETVSe6r6GDmVWOa
-tcd63KwyDur3s9i10Btns6YsXrMvp9JweL/OFQHolzhfwTwFWd8Jz0Xhl7u1Hadi
-APyl+F3yDJcUQKs4MfaBKtFSUWFEy6qorx6FehYQisadUcWopi9bnCpxuE/jusD4
-msz+R2/rb8wPJw9SM1cMKKg2RRnmMF38y8Alkt+GV9s4Zj2q2+1qnEu//V0n2YLh
-I14Dt6Rt3PuzLs8xg4bt7tp1bKzQrlWuUdmXnfbR5ZMRAzx8q9QlTVGQBfyhZUU4
-ZAFRm44iDt7I/YSL8FlbVVU4wGL978AIuFUDdz/8S9gyyMUDvCVinDbGzC14tu5I
-OKvOYv5lds8W1k+MiKvONOiQ0+4qBWHRUyRchsLgNjbMRMDlLNV7cnuqOCVCCmv3
-/w58ppkIKNoRP3HLN9iBYzyudgwKTZiphUdgwOaw7Zt5OOTirQ6tRjSzIpkajvOI
-+dh9S70rCMcb+aT3rVKR
-=Ng4I
+iEYEARECAAYFAk4Ta0wACgkQCaWpQKGI+9RxNwCfbnKh2LuYF2Hvpl3knBnPQg9x
+KMkAnRZv6xV+hOQE7CF5DWB0wTZO8JDh
+=sduO
 -----END PGP SIGNATURE-----
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"