commit: f7a6a18eaf91ef20a841417e1c7eddfb569810c2
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 27 16:40:47 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 16 17:11:28 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a6a18e
www-client/chromium: Use eninja from ninja-utils
www-client/chromium/chromium-59.0.3071.47.ebuild | 19 +------------------
www-client/chromium/chromium-60.0.3095.5.ebuild | 19 +------------------
2 files changed, 2 insertions(+), 36 deletions(-)
diff --git a/www-client/chromium/chromium-59.0.3071.47.ebuild
b/www-client/chromium/chromium-59.0.3071.47.ebuild
index 909ae41ab28..cb5041167a2 100644
--- a/www-client/chromium/chromium-59.0.3071.47.ebuild
+++ b/www-client/chromium/chromium-59.0.3071.47.ebuild
@@ -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
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
sv sw ta te th tr uk vi zh-CN zh-TW"
-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
+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
DESCRIPTION="Open-source version of Google Chrome web browser"
HOMEPAGE="http://chromium.org/";
@@ -504,23 +504,6 @@ src_configure() {
out/Release/gn gen --args="${myconf_gn}" out/Release || die
}
-eninja() {
- if [[ -z ${NINJAOPTS+set} ]]; then
- local jobs=$(makeopts_jobs)
- local loadavg=$(makeopts_loadavg)
-
- if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
- NINJAOPTS+=" -j ${jobs}"
- fi
- if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
- NINJAOPTS+=" -l ${loadavg}"
- fi
- fi
- set -- ninja -v ${NINJAOPTS} "$@"
- echo "$@"
- "$@"
-}
-
src_compile() {
local ninja_targets="chrome chromedriver"
if use suid; then
diff --git a/www-client/chromium/chromium-60.0.3095.5.ebuild
b/www-client/chromium/chromium-60.0.3095.5.ebuild
index 1a29ba35961..210fb31567b 100644
--- a/www-client/chromium/chromium-60.0.3095.5.ebuild
+++ b/www-client/chromium/chromium-60.0.3095.5.ebuild
@@ -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
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
sv sw ta te th tr uk vi zh-CN zh-TW"
-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
+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
DESCRIPTION="Open-source version of Google Chrome web browser"
HOMEPAGE="http://chromium.org/";
@@ -510,23 +510,6 @@ src_configure() {
out/Release/gn gen --args="${myconf_gn}" out/Release || die
}
-eninja() {
- if [[ -z ${NINJAOPTS+set} ]]; then
- local jobs=$(makeopts_jobs)
- local loadavg=$(makeopts_loadavg)
-
- if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
- NINJAOPTS+=" -j ${jobs}"
- fi
- if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
- NINJAOPTS+=" -l ${loadavg}"
- fi
- fi
- set -- ninja -v ${NINJAOPTS} "$@"
- echo "$@"
- "$@"
-}
-
src_compile() {
local ninja_targets="chrome chromedriver"
if use suid; then
