Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 3/4] www-client/chromium: Use eninja from ninja-utils
Date: Sun, 30 Apr 2017 20:31:15
Message-Id: 20170430202830.12974-3-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/4] ninja-utils.eclass: Add a new eclass to handle calling ninja by "Michał Górny"
1 ---
2 www-client/chromium/chromium-59.0.3067.0.ebuild | 19 +------------------
3 1 file changed, 1 insertion(+), 18 deletions(-)
4
5 diff --git a/www-client/chromium/chromium-59.0.3067.0.ebuild b/www-client/chromium/chromium-59.0.3067.0.ebuild
6 index fb975c22b0cd..ac00f473bf45 100644
7 --- a/www-client/chromium/chromium-59.0.3067.0.ebuild
8 +++ b/www-client/chromium/chromium-59.0.3067.0.ebuild
9 @@ -8,7 +8,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
10 hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
11 sv sw ta te th tr uk vi zh-CN zh-TW"
12
13 -inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib multiprocessing pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator virtualx xdg-utils
14 +inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator virtualx xdg-utils
15
16 DESCRIPTION="Open-source version of Google Chrome web browser"
17 HOMEPAGE="http://chromium.org/"
18 @@ -503,23 +503,6 @@ src_configure() {
19 out/Release/gn gen --args="${myconf_gn}" out/Release || die
20 }
21
22 -eninja() {
23 - if [[ -z ${NINJAOPTS+set} ]]; then
24 - local jobs=$(makeopts_jobs)
25 - local loadavg=$(makeopts_loadavg)
26 -
27 - if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
28 - NINJAOPTS+=" -j ${jobs}"
29 - fi
30 - if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
31 - NINJAOPTS+=" -l ${loadavg}"
32 - fi
33 - fi
34 - set -- ninja -v ${NINJAOPTS} "$@"
35 - echo "$@"
36 - "$@"
37 -}
38 -
39 src_compile() {
40 local ninja_targets="chrome chromedriver"
41 if use suid; then
42 --
43 2.13.0.rc1

Replies