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

[Mike Gilbert]

commit:     2d802144d674286b08349c8a00c9c5ce78e93943
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 20 15:40:29 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Aug 20 15:40:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d802144

www-client/chromium: check MERGE_TYPE before gcc version

 www-client/chromium/chromium-54.0.2832.2.ebuild | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/www-client/chromium/chromium-54.0.2832.2.ebuild 
b/www-client/chromium/chromium-54.0.2832.2.ebuild
index 27c458a..b1895b9 100644
--- a/www-client/chromium/chromium-54.0.2832.2.ebuild
+++ b/www-client/chromium/chromium-54.0.2832.2.ebuild
@@ -165,8 +165,10 @@ PATCHES=(
 )
 
 pkg_pretend() {
-       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 [[ ${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.'
+               fi
        fi
 
        # Check build requirements, bug #541816 and bug #471810 .
@@ -181,7 +183,6 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-
        # Make sure the build system will use the right python, bug #344367.
        python-any-r1_pkg_setup