[gentoo-commits] repo/gentoo:master commit in: www-client/chromium/

[Mike Gilbert]

commit:     1c5423aab094796b3da7a2905f02cbdcdd6a7742
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 23:17:49 2017 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 23:18:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c5423aa

www-client/chromium: replace host_binary function with a loop

Package-Manager: Portage-2.3.17, Repoman-2.3.6_p24

 www-client/chromium/chromium-63.0.3239.84.ebuild | 10 +++-------
 www-client/chromium/chromium-64.0.3282.14.ebuild | 16 ++++++----------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/www-client/chromium/chromium-63.0.3239.84.ebuild 
b/www-client/chromium/chromium-63.0.3239.84.ebuild
index a23443e9896..be37d445c4f 100644
--- a/www-client/chromium/chromium-63.0.3239.84.ebuild
+++ b/www-client/chromium/chromium-63.0.3239.84.ebuild
@@ -537,9 +537,10 @@ src_configure() {
        "$@" || die
 }
 
-host_binary() {
+src_compile() {
+       # Build mksnapshot and pax-mark it.
        local x
-       for x; do
+       for x in mksnapshot v8_context_snapshot_generator; do
                if tc-is-cross-compiler; then
                        eninja -C out/Release "host/${x}"
                        pax-mark m "out/Release/host/${x}"
@@ -548,11 +549,6 @@ host_binary() {
                        pax-mark m "out/Release/${x}"
                fi
        done
-}
-
-src_compile() {
-       # Build mksnapshot and pax-mark it.
-       host_binary mksnapshot v8_context_snapshot_generator
 
        # Work around circular dep issue
        # https://chromium-review.googlesource.com/c/chromium/src/+/617768

diff --git a/www-client/chromium/chromium-64.0.3282.14.ebuild 
b/www-client/chromium/chromium-64.0.3282.14.ebuild
index e436cbd1b59..c0f32ba37a4 100644
--- a/www-client/chromium/chromium-64.0.3282.14.ebuild
+++ b/www-client/chromium/chromium-64.0.3282.14.ebuild
@@ -539,9 +539,13 @@ src_configure() {
        "$@" || die
 }
 
-host_binary() {
+src_compile() {
+       # Calling this here supports resumption via FEATURES=keepwork
+       python_setup
+
+       # Build mksnapshot and pax-mark it.
        local x
-       for x; do
+       for x in mksnapshot v8_context_snapshot_generator; do
                if tc-is-cross-compiler; then
                        eninja -C out/Release "host/${x}"
                        pax-mark m "out/Release/host/${x}"
@@ -550,14 +554,6 @@ host_binary() {
                        pax-mark m "out/Release/${x}"
                fi
        done
-}
-
-src_compile() {
-       # Calling this here supports resumption via FEATURES=keepwork
-       python_setup
-
-       # Build mksnapshot and pax-mark it.
-       host_binary mksnapshot v8_context_snapshot_generator
 
        # Work around circular dep issue
        # https://chromium-review.googlesource.com/c/chromium/src/+/617768