www-client/chromium: add memory check based on MAKEOPTS

Package-Manager: Portage-2.3.19_p1, Repoman-2.3.6_p35

diff --git a/www-client/chromium/chromium-63.0.3239.108.ebuild b/www-client/chromium/chromium-63.0.3239.108.ebuild
index c5e75dfa71e9ce0abe4a2fb4a4e82e59b8fb65f1..992afee3e79264a104b958400408c2d4164fff2d 100644 (file)
--- a/www-client/chromium/chromium-63.0.3239.108.ebuild
+++ b/www-client/chromium/chromium-63.0.3239.108.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 ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib multiprocessing ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -164,16 +164,24 @@ pre_build_checks() {
        fi
 
        # Check build requirements, bug #541816 and bug #471810 .
-       CHECKREQS_MEMORY="3G"
+       local reqmem=3
        CHECKREQS_DISK_BUILD="5G"
        eshopts_push -s extglob
        if is-flagq '-g?(gdb)?([1-9])'; then
                CHECKREQS_DISK_BUILD="25G"
                if ! use component-build; then
-                       CHECKREQS_MEMORY="16G"
+                       reqmem=16
                fi
        fi
        eshopts_pop
+
+       local jobs=$(makeopts_jobs)
+       if (( jobs > reqmem )); then
+               CHECKREQS_MEMORY="${jobs}G"
+       else
+               CHECKREQS_MEMORY="${reqmem}G"
+       fi
+
        check-reqs_pkg_setup
 }
 

diff --git a/www-client/chromium/chromium-64.0.3282.24.ebuild b/www-client/chromium/chromium-64.0.3282.24.ebuild
index 7737358b3393ebbb54fed99601dee72fab133c41..766965c0476586a092bf5b225f1e87b9e07d2d14 100644 (file)
--- a/www-client/chromium/chromium-64.0.3282.24.ebuild
+++ b/www-client/chromium/chromium-64.0.3282.24.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 ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib multiprocessing ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -164,16 +164,24 @@ pre_build_checks() {
        fi
 
        # Check build requirements, bug #541816 and bug #471810 .
-       CHECKREQS_MEMORY="3G"
+       local reqmem=3
        CHECKREQS_DISK_BUILD="5G"
        eshopts_push -s extglob
        if is-flagq '-g?(gdb)?([1-9])'; then
                CHECKREQS_DISK_BUILD="25G"
                if ! use component-build; then
-                       CHECKREQS_MEMORY="16G"
+                       reqmem=16
                fi
        fi
        eshopts_pop
+
+       local jobs=$(makeopts_jobs)
+       if (( jobs > reqmem )); then
+               CHECKREQS_MEMORY="${jobs}G"
+       else
+               CHECKREQS_MEMORY="${reqmem}G"
+       fi
+
        check-reqs_pkg_setup
 }
 

diff --git a/www-client/chromium/chromium-65.0.3294.5.ebuild b/www-client/chromium/chromium-65.0.3294.5.ebuild
index cd5fc3c1b0fd598335c43773231e77ae90f33f12..5bd06fad5513f1b582eba86cc4a2e02d50924a55 100644 (file)
--- a/www-client/chromium/chromium-65.0.3294.5.ebuild
+++ b/www-client/chromium/chromium-65.0.3294.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 ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib multiprocessing ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -164,16 +164,24 @@ pre_build_checks() {
        fi
 
        # Check build requirements, bug #541816 and bug #471810 .
-       CHECKREQS_MEMORY="3G"
+       local reqmem=3
        CHECKREQS_DISK_BUILD="5G"
        eshopts_push -s extglob
        if is-flagq '-g?(gdb)?([1-9])'; then
                CHECKREQS_DISK_BUILD="25G"
                if ! use component-build; then
-                       CHECKREQS_MEMORY="16G"
+                       reqmem=16
                fi
        fi
        eshopts_pop
+
+       local jobs=$(makeopts_jobs)
+       if (( jobs > reqmem )); then
+               CHECKREQS_MEMORY="${jobs}G"
+       else
+               CHECKREQS_MEMORY="${reqmem}G"
+       fi
+
        check-reqs_pkg_setup
 }