diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-04-14 10:19:37 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-04-14 10:19:37 +0000 |
| commit | 73df314918f08968a43b0251069d9d45b5a5bd6b (patch) | |
| tree | 6c3fa04185869876d7f5b19007a98cb42871ff02 /gnome-base | |
| parent | Fixed dependency bug #362797. (diff) | |
| download | historical-73df314918f08968a43b0251069d9d45b5a5bd6b.tar.gz historical-73df314918f08968a43b0251069d9d45b5a5bd6b.tar.bz2 historical-73df314918f08968a43b0251069d9d45b5a5bd6b.zip | |
QA: fix cross-compile workaround. When moving to EAPI=2, cross-compilation was broken as G2CONF is set too late.
Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/orbit/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-base/orbit/Manifest | 14 | ||||
| -rw-r--r-- | gnome-base/orbit/orbit-2.14.19-r1.ebuild | 7 |
3 files changed, 23 insertions, 5 deletions
diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog index 59b4bb5e3eeb..b71e86d030f2 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.173 2011/03/22 19:21:03 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.174 2011/04/14 10:19:37 flameeyes Exp $ + + 14 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> + orbit-2.14.19-r1.ebuild: + QA: fix cross-compile workaround. When moving to EAPI=2, cross-compilation + was broken as G2CONF is set too late. 22 Mar 2011; Brent Baude <ranger@gentoo.org> orbit-2.14.19.ebuild: Marking orbit-2.14.19 ppc stable for bug 353436 diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest index a627e4f9c198..d95f2bbe7602 100644 --- a/gnome-base/orbit/Manifest +++ b/gnome-base/orbit/Manifest @@ -1,7 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +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 2233 RMD160 d0ba2243e5d6f21353cd22930faa8c93a0ffa1ff SHA1 d1a15529fa950774c82f4566d41c3542deb47599 SHA256 f47777e7ad3aaba73a4ed6d5d26c5d56ebcafc6b683668d463787882471b1555 +EBUILD orbit-2.14.19-r1.ebuild 2279 RMD160 85eb9e3b3c62b45eafae6a4cb0b9f7fa30ea7952 SHA1 c822b90dcb81128cc6a86bc362545c40140ee5eb SHA256 32e72a1765ad3d057c96d6f03f2e975ea76b5006383be8529e8e6678c08db5c5 EBUILD orbit-2.14.19.ebuild 2023 RMD160 7f87026c6a1e9300dda0633ef51f9927eeaea943 SHA1 df4e266eedda1e61df91066e3180ab514c9a59ff SHA256 0064b50558c1ffe537cc3ccf5319d8af55fc08bf18674fe2a33548b0cbe814a9 -MISC ChangeLog 21490 RMD160 77f99b5ca54077039f9dd384f8729c80d021195e SHA1 35f0c024e8af946c6439cd2e8ded4106bec739c3 SHA256 fa9fd5edf8bfe4410775b0b72e81a9d749bfc675570a93482dcdc2b3bb2fc6e0 +MISC ChangeLog 21694 RMD160 1115fd0e39bfff7782a759c4a47293bf869076e7 SHA1 49443193376b4d79af6a4b80c1a3bb6d1f5ddf0d SHA256 583c0382a3f74462c2fb35bd25e74766a1aed5ab1285b71718ba729a4781e461 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk2myisACgkQAiZjviIA2XiI1QCfevTcJ47Egzfk06qdAZSYzO6w ++qYAoIz0IqhMp/2cTBFf+6DHOqrn7b2h +=zPHp +-----END PGP SIGNATURE----- diff --git a/gnome-base/orbit/orbit-2.14.19-r1.ebuild b/gnome-base/orbit/orbit-2.14.19-r1.ebuild index 1197fb54e559..b3212d775a74 100644 --- a/gnome-base/orbit/orbit-2.14.19-r1.ebuild +++ b/gnome-base/orbit/orbit-2.14.19-r1.ebuild @@ -1,6 +1,6 @@ # 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.1 2011/03/12 18:59:48 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.19-r1.ebuild,v 1.2 2011/04/14 10:19:37 flameeyes Exp $ EAPI="3" GCONF_DEBUG="yes" @@ -57,7 +57,7 @@ src_prepare() { eautoreconf } -src_compile() { +src_configure() { # 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 @@ -69,7 +69,10 @@ src_compile() { [ -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 + gnome2_src_configure +} +src_compile() { # Parallel build fails from time to time, bug #273031 MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile |