Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/
Date: Thu, 22 Dec 2011 08:40:58
Message-Id: 589fe5a2074a05a39459b3d8ab58247865a627be.polynomial-c@gentoo
1 commit: 589fe5a2074a05a39459b3d8ab58247865a627be
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 22 08:40:19 2011 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 22 08:40:19 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=589fe5a2
7
8 Fixed check-reqs calls.
9
10 ---
11 www-client/firefox/Manifest | 2 +-
12 www-client/firefox/firefox-9.0.ebuild | 7 +++----
13 2 files changed, 4 insertions(+), 5 deletions(-)
14
15 diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
16 index 4a46c0e..77191fa 100644
17 --- a/www-client/firefox/Manifest
18 +++ b/www-client/firefox/Manifest
19 @@ -84,4 +84,4 @@ DIST firefox-9.0-zh-CN.xpi 246728 RMD160 96aef0ad9287f41589f59246eba1d2445d18a0c
20 DIST firefox-9.0-zh-TW.xpi 247498 RMD160 163fa9dde9caa2e209eff47a1bdfee6cfd807aaf SHA1 f6c14facb1556002fcfb414533c171c2b9e08582 SHA256 6b50bd60567a46fd7af62160271ab9e0d5a40666c6a812fb9adcd7bce474a936
21 DIST firefox-9.0-zu.xpi 238395 RMD160 67afb3fd7bd9006830747a75b5175facf8615f86 SHA1 1b7c947e15d5fb2f75503e1cad9940283edc87d5 SHA256 aedf4ab70c7cf603210e4ece1c21faf0c031f7b488dddc074c3f00e9d9a2feb5
22 DIST firefox-9.0.source.tar.bz2 74197197 RMD160 4631b103aa80ae2ae22b61453f4e02c89962f1c1 SHA1 f79324ec6205e4c23d51d8ab2e790de1b2541657 SHA256 9e876498da6c2eb2a49b57b461d5b969b11810f6af9eaa858d8e4cb514a9bd05
23 -EBUILD firefox-9.0.ebuild 11324 RMD160 66b581cc3e0049f9d7e984c002f234662e4e51d4 SHA1 ae4edcee4a3753c8785bb22c15edda171b2509a9 SHA256 7e723d2d1eeb4c63032950bea9f560720e5becbd7ee3efc322d4a448dae78a04
24 +EBUILD firefox-9.0.ebuild 11336 RMD160 60134fb51ae87ec41548cce8d63130fe93912716 SHA1 5fdb512fdc06b9d885bf8d96ac860215bf6699e2 SHA256 cf8782ddac928c05cefc91a2669268ddd6c2228ce34936d169ac693d34b07608
25
26 diff --git a/www-client/firefox/firefox-9.0.ebuild b/www-client/firefox/firefox-9.0.ebuild
27 index cd504b4..966ac30 100644
28 --- a/www-client/firefox/firefox-9.0.ebuild
29 +++ b/www-client/firefox/firefox-9.0.ebuild
30 @@ -6,7 +6,7 @@ EAPI="3"
31 VIRTUALX_REQUIRED="pgo"
32 WANT_AUTOCONF="2.1"
33
34 -inherit flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python virtualx nsplugins
35 +inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python virtualx nsplugins
36
37 MAJ_FF_PV="$(get_version_component_range 1-2)" # 3.5, 3.6, 4.0, etc.
38 FF_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
39 @@ -149,13 +149,12 @@ pkg_setup() {
40 fi
41
42 # Ensure we have enough disk space to compile
43 - if use pgo ; then
44 + if use pgo || use debug || use test ; then
45 CHECKREQS_DISK_BUILD="8G"
46 - check-reqs_pkg_setup
47 else
48 CHECKREQS_DISK_BUILD="4G"
49 - check-reqs_pkg_setup
50 fi
51 + check-reqs_pkg_setup
52 }
53
54 src_unpack() {