From 4e7604710d87d31d8836086bf2e1c2ffa4271235 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Wed, 14 Dec 2016 16:00:26 -0500
Subject: [PATCH] www-client/chromium: require >=gcc-5

Package-Manager: Portage-2.3.3_p7, Repoman-2.3.1
---
 www-client/chromium/chromium-56.0.2924.21.ebuild | 15 +++++++++++----
 www-client/chromium/chromium-57.0.2946.0.ebuild  | 15 +++++++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/www-client/chromium/chromium-56.0.2924.21.ebuild b/www-client/chromium/chromium-56.0.2924.21.ebuild
index 97b727f363ee..a7260e6be5f2 100644
--- 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 1da3f4fff666..aac3d5b13426 100644
--- 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
 
-- 
2.26.2