www-client/chromium: require >=gcc-5

Package-Manager: Portage-2.3.3_p7, Repoman-2.3.1

diff --git a/www-client/chromium/chromium-56.0.2924.21.ebuild b/www-client/chromium/chromium-56.0.2924.21.ebuild
index 97b727f363eef60d4adc714068880d16f8b0c3f2..a7260e6be5f246e4c3a130262eee2f71c1cb2a4b 100644 (file)
--- a/www-client/chromium/chromium-56.0.2924.21.ebuild
+++ b/www-client/chromium/chromium-56.0.2924.21.ebuild
@@ -165,10 +165,11 @@ PATCHES=(
        "${FILESDIR}/${PN}-widevine-r1.patch"
 )
 
-pkg_pretend() {
+pre_build_checks() {
        if [[ ${MERGE_TYPE} != binary ]]; then
-               if tc-is-gcc && ! version_is_at_least 4.8 "$(gcc-version)"; then
-                       die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
+               if tc-is-gcc && ! version_is_at_least 5 "$(gcc-major-version)"; then
+                       # bugs: #535730, #525374, #518668
+                       die "At least gcc 5 is required"
                fi
        fi
 
@@ -180,10 +181,16 @@ pkg_pretend() {
                CHECKREQS_DISK_BUILD="25G"
        fi
        eshopts_pop
-       check-reqs_pkg_pretend
+       check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+       pre_build_checks
 }
 
 pkg_setup() {
+       pre_build_checks
+
        # Make sure the build system will use the right python, bug #344367.
        python-any-r1_pkg_setup
 

diff --git a/www-client/chromium/chromium-57.0.2946.0.ebuild b/www-client/chromium/chromium-57.0.2946.0.ebuild
index 1da3f4fff6667edf8bea65d485bb3fd8bf3e1cf2..aac3d5b13426972a2e16df049899eaafb2f048ea 100644 (file)
--- a/www-client/chromium/chromium-57.0.2946.0.ebuild
+++ b/www-client/chromium/chromium-57.0.2946.0.ebuild
@@ -167,10 +167,11 @@ PATCHES=(
        "${FILESDIR}/${PN}-gn-r10.patch"
 )
 
-pkg_pretend() {
+pre_build_checks() {
        if [[ ${MERGE_TYPE} != binary ]]; then
-               if tc-is-gcc && ! version_is_at_least 4.8 "$(gcc-version)"; then
-                       die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
+               if tc-is-gcc && ! version_is_at_least 5 "$(gcc-major-version)"; then
+                       # bugs: #535730, #525374, #518668
+                       die "At least gcc 5 is required"
                fi
        fi
 
@@ -182,10 +183,16 @@ pkg_pretend() {
                CHECKREQS_DISK_BUILD="25G"
        fi
        eshopts_pop
-       check-reqs_pkg_pretend
+       check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+       pre_build_checks
 }
 
 pkg_setup() {
+       pre_build_checks
+
        # Make sure the build system will use the right python, bug #344367.
        python-any-r1_pkg_setup