From 5b57d156ffab1f35f6da66084aa37a39cfd10c08 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Sun, 2 Aug 2009 20:24:50 +0000 Subject: Fix test killing wrong process, bug #268142. (Portage version: 2.2_rc33/cvs/Linux x86_64) --- gnome-base/orbit/ChangeLog | 5 ++++- gnome-base/orbit/orbit-2.14.17.ebuild | 11 ++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'gnome-base/orbit') diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog index 0f4bd1fa3ab9..cf8e27e93731 100644 --- a/gnome-base/orbit/ChangeLog +++ b/gnome-base/orbit/ChangeLog @@ -1,6 +1,9 @@ # 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.148 2009/03/17 15:17:37 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.149 2009/08/02 20:24:50 eva Exp $ + + 02 Aug 2009; Gilles Dartiguelongue orbit-2.14.17.ebuild: + Fix test killing wrong process, bug #268142. 17 Mar 2009; Mart Raudsepp orbit-2.14.17.ebuild: Fix cross-compilation, bug 262741. Thanks to Maksim Melnikau. diff --git a/gnome-base/orbit/orbit-2.14.17.ebuild b/gnome-base/orbit/orbit-2.14.17.ebuild index ac0c2387fbab..e5e1eb905aaa 100644 --- a/gnome-base/orbit/orbit-2.14.17.ebuild +++ b/gnome-base/orbit/orbit-2.14.17.ebuild @@ -1,7 +1,8 @@ # 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.17.ebuild,v 1.3 2009/03/17 15:48:59 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.17.ebuild,v 1.4 2009/08/02 20:24:50 eva Exp $ +EAPI="2" GCONF_DEBUG="no" inherit gnome2 toolchain-funcs @@ -28,6 +29,14 @@ DEPEND="${RDEPEND} 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 -- cgit v1.2.3-65-gdbad