diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2009-08-02 20:24:50 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2009-08-02 20:24:50 +0000 |
| commit | 6034c4ddab8d11ebe30f57eee52ea51731b8ac22 (patch) | |
| tree | a6a9b53c89582d6d4fc42e3b53a573d8cd80be78 /gnome-base | |
| parent | Minor typo in USE doc installation. (diff) | |
| download | historical-6034c4ddab8d11ebe30f57eee52ea51731b8ac22.tar.gz historical-6034c4ddab8d11ebe30f57eee52ea51731b8ac22.tar.bz2 historical-6034c4ddab8d11ebe30f57eee52ea51731b8ac22.zip | |
Fix test killing wrong process, bug #268142.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/orbit/ChangeLog | 5 | ||||
| -rw-r--r-- | gnome-base/orbit/Manifest | 14 | ||||
| -rw-r--r-- | gnome-base/orbit/orbit-2.14.17.ebuild | 11 |
3 files changed, 26 insertions, 4 deletions
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 <eva@gentoo.org> orbit-2.14.17.ebuild: + Fix test killing wrong process, bug #268142. 17 Mar 2009; Mart Raudsepp <leio@gentoo.org> orbit-2.14.17.ebuild: Fix cross-compilation, bug 262741. Thanks to Maksim Melnikau. diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest index 0aba4a985ca7..0c82b1c8c077 100644 --- a/gnome-base/orbit/Manifest +++ b/gnome-base/orbit/Manifest @@ -1,6 +1,16 @@ +-----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 EBUILD orbit-2.14.16.ebuild 1444 RMD160 feaf671157adbbcd5d554dc57995c7cd949e7929 SHA1 f48876ac6dbc297af00799bc237188de68df97df SHA256 a7dcd397b5bde3a4422b40fa23aa7e6b86ed2ea78253c1f41a925e98894e866c -EBUILD orbit-2.14.17.ebuild 1505 RMD160 3a6d074e964dfb141193420814b0d2b5786efef7 SHA1 bdce1e05268753b9e4e2080ab0190a61fa1caedb SHA256 3390f13be854e2aae49ebbd0043961c2c46621ae26adcd77c355dfdd15cc703b -MISC ChangeLog 18361 RMD160 0732bd88e9f04ee9203b65c91dbfa725308aee93 SHA1 758bc246d976aab6413a5d478f4642afebf04986 SHA256 bd564b621653306a5ed128979f7d6150de019a122d7430bbbece28b198a37730 +EBUILD orbit-2.14.17.ebuild 1695 RMD160 55b9013e1fe3d5ac27df3b7cabba03cf03d07da6 SHA1 83549ddfade5b57cd3c86e9c162a88c269d070d2 SHA256 7f9d3cb34aa3815fba0036070b66183b9ac191f261493033dc134b6c85a6f37e +MISC ChangeLog 18484 RMD160 3b73dec50a01ba607a67f3c70bfea5286fa3859f SHA1 7462fb4c2d50aa28f3db1116ab2ffbccef33ee70 SHA256 d2cdccfc660dcad314dd9a889d890ccfd9a2e673cefc77ca5be40cab91f9cd91 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkp19hgACgkQ1fmVwcYIWAYOwwCgqH/T8ZTeHtAJhxPtU1ualJFm +QiAAoIyrs6Yet6yH9KixnnKm12DJuhOo +=p9fk +-----END PGP SIGNATURE----- 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 |