Version bump. Re-add debug USE flag, needed for test suite.

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

4 files changed, 85 insertions, 59 deletions

diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog
index 369fa43b6bcc..0bd5888a6255 100644
--- a/gnome-base/orbit/ChangeLog
+++ b/gnome-base/orbit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/orbit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.165 2010/09/11 18:41:14 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.166 2010/10/01 22:20:01 eva Exp $
+
+*orbit-2.14.19 (01 Oct 2010)
+
+  01 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org> -orbit-2.14.16.ebuild,
+  +orbit-2.14.19.ebuild:
+  Version bump. Re-add debug USE flag, needed for test suite.
 
   11 Sep 2010; Joseph Jezak <josejx@gentoo.org> orbit-2.14.18.ebuild:
   Marked ppc for bug #324077.
diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest
index e6c943008fc2..f7938adb57e1 100644
--- a/gnome-base/orbit/Manifest
+++ b/gnome-base/orbit/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST ORBit2-2.14.16.tar.bz2 739458 RMD160 69a76a246d06f10708cfda9c420be173e0746b39 SHA1 d366a92f8ce1989caf21cc6884f90cbcad42ea59 SHA256 e7bc69a316e6e2a263987a0aec5c6249dc152361e9559b4818a680681409aac1
 DIST ORBit2-2.14.17.tar.bz2 747503 RMD160 7e76fe543163fe9763e4a7e293640c7c87a160e8 SHA1 d1f38e9df5efc219f3a5cfb4d0a0cbc1b381fe1c SHA256 62bfce3f678f9347a19c766944e8aef7b89bc32b25ac23eb3e4c25929ce8974c
 DIST ORBit2-2.14.18.tar.bz2 747701 RMD160 8105c7323869be38a21de562878150f25da17f17 SHA1 76074570d3fc08d4e62d37f02023fe1af3b7be3f SHA256 c6148edd8044255aeed9ab1d1eeb3c39edd0aa1ace5d33cf6831b80d11f1ab7c
-EBUILD orbit-2.14.16.ebuild 1436 RMD160 0a7515cf381fe161700c6486957b2af136d72026 SHA1 3a94616ae7dae1ae1b29f5355d6d624cd7395260 SHA256 34b7ed5f70327e5fff0efe404f948885c51fc5c95086e7243084e050106a94bc
+DIST ORBit2-2.14.19.tar.bz2 764820 RMD160 e16c1697efc4ad3dafca47828954f39438b4a8d4 SHA1 e7c26aa4b82c146b3ec08d490e3469b4913e4e2f SHA256 55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550
 EBUILD orbit-2.14.17.ebuild 1681 RMD160 cfd85a536f2fca3db3b8a52e28c9a2890740ea50 SHA1 0c31bec286b1b71943c300d87392509ea1932b56 SHA256 fdbca11d506251035640064e5419715110d930d7d0298b9967e8f78914a5a566
 EBUILD orbit-2.14.18.ebuild 1767 RMD160 922bbe3a10166e7c3ece3cf7da8c489d940ea8b4 SHA1 7c4f3625eabfc26ed8af8b7f506f9717cd3c9467 SHA256 921ddea4ca3eaeb80a3090dfd0d58eda21e2cf5a025cea25a5ae5988d7051d52
-MISC ChangeLog 20375 RMD160 fef6ea0a8b905a870d4b64c2fceb5e3876f16773 SHA1 35e4c123c1c5ebf07c0a41175ac4087b0aceaecc SHA256 d367cab70d98e6af2d1e31f9f50a3d8f8430055fd523b9917a0f7aab0b62f5c9
+EBUILD orbit-2.14.19.ebuild 2029 RMD160 f2523bc65eaa86ffbbf843185e95707b653e0fe6 SHA1 b019ee58d4d00f070bb2f9f361647676e052d5d2 SHA256 cade38dd326da89d7ee74f75cc6ff0b0b21be0aa6673e9be60230f00c1260ab6
+MISC ChangeLog 20567 RMD160 fca9fa61e682108d0a1ca14ad62eeebdffa657d6 SHA1 7869829c2b622f78acf9f1aeb7589d9f040b51c0 SHA256 c5de0bd727fce370ee6dc9009ae9a7991f17e242d4b30b41f1da4a478ffa7d30
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyLzF0ACgkQcsIHjyDViGQpugCdHH4RiNmUpoM/scxf4IAsr2bF
-/CMAn1UXncpBTDukhdDDzR8BCONzPpfa
-=f0O0
+iEYEARECAAYFAkymXp0ACgkQ1fmVwcYIWAauVACfaWXGoyACRjZOQgQx78DzfKHU
+tngAoNArVqYSsoYIeeKXHK2MkjeWjVb5
+=cAU0
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/orbit/orbit-2.14.16.ebuild b/gnome-base/orbit/orbit-2.14.16.ebuild
deleted file mode 100644
index 5b8113d16e18..000000000000
--- a/gnome-base/orbit/orbit-2.14.16.ebuild
+++ /dev/null
@@ -1,52 +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.16.ebuild,v 1.9 2010/07/20 02:13:46 jer 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 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_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
-}
-
-src_test() {
-	# can fail in parallel, see bug #235994
-	emake -j1 check || die "tests failed"
-}
diff --git a/gnome-base/orbit/orbit-2.14.19.ebuild b/gnome-base/orbit/orbit-2.14.19.ebuild
new file mode 100644
index 000000000000..1330ceb7d403
--- /dev/null
+++ b/gnome-base/orbit/orbit-2.14.19.ebuild
@@ -0,0 +1,72 @@
+# 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.19.ebuild,v 1.1 2010/10/01 22:20:01 eva Exp $
+
+EAPI="3"
+
+inherit gnome2 toolchain-funcs
+
+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"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc test"
+
+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"
+
+pkg_setup() {
+	if use test; then
+		if ! use debug; then
+			elog "USE=debug is required for the test feature. Auto-enabling."
+		fi
+		G2CONF="${G2CONF} --enable-debug"
+	fi
+}
+
+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 1 failed"
+
+	# Do not mess with CFLAGS
+	sed 's/-ggdb -O0//' -i configure.in configure || die "sed 2 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() {
+	# can fail in parallel, see bug #235994
+	emake -j1 check || die "tests failed"
+}