From 3003897133b1bcfe9a241c2708e938903879aee3 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 21 Mar 2023 18:40:29 +0000
Subject: gentoo auto-resync : 21:03:2023 - 18:40:29

---
 www-client/chromium/Manifest                      |  2 +-
 www-client/chromium/chromium-111.0.5563.64.ebuild | 43 +++++++++++++----------
 2 files changed, 25 insertions(+), 20 deletions(-)

(limited to 'www-client/chromium')

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index da0824679240..099ac69ab692 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -32,5 +32,5 @@ EBUILD chromium-109.0.5414.74-r1.ebuild 38906 BLAKE2B 2ed6420f5535b27d9951b12924
 EBUILD chromium-110.0.5481.177-r1.ebuild 38753 BLAKE2B 7c5560e2d5c4ede3b4a8d4810c58c181ef14498fe4e4817f3b448a74e1076659d0b0f7c638679a5ec638837d2883c2d167d0aed41cc42fdb0ed0ed5397365e4c SHA512 ae8f158dabbeb3a6e4933b5ae0bb70f955407a0bd251b01f0f44df27dd631a45730cf3d7f26894fa464d0f10ade1a20459bd6cb1fcad0e43f92643faf33696cd
 EBUILD chromium-110.0.5481.38.ebuild 38751 BLAKE2B ca5f7c87f5acae8be4d8db1298aea9a50f660ee0af113ee43387f325ab1a3379be8700f0bc496e4ee6e9f92541d3009344f82ba9f477f6e56bccc57bb2111d54 SHA512 664940edd7f710f9acab5491547ca5a355d935562f71ec79aa7b3b7d059cfd396a5f1b0ce338f362cc770d30e0efd73358a861fc76d034bd8ddc750a44cc004c
 EBUILD chromium-111.0.5545.6.ebuild 38410 BLAKE2B 22e2ed4c9335b026e95c0f6cee60c525c3cec10f6b5e7a0da60bdae6468c5dca8cf1476c762893ed027d50d9f0803a5c763b91fdb278c879383de7fa41830352 SHA512 ed3d33a23b4e1343dcdf3e5e46f34c3c071b254971a3b14d6a1fd2a332281a02ab0012b07d0751c6dd662c7ec7cabcd7a58a2e03351e56070b2b2ef57efece95
-EBUILD chromium-111.0.5563.64.ebuild 39007 BLAKE2B 1817c8ba79d0d0fbf131776d95952a63106e007b98f7a44746928eb14daa6438b8efe150221a35127dd8e45e904697fadc0d3412884af23409df570a501ddcd7 SHA512 be21ea3367a11cfcf3ce03d8966d02af646dd9efa23b6b716ae2fd930ad5b2b04d73f236cabc7da980dda16bd25e6d55391eaac2e9390b465e0d53eaf5dbee4a
+EBUILD chromium-111.0.5563.64.ebuild 38994 BLAKE2B 808dcb739d4a9f8b046b690f3beee5d481c139ec5c4b9485a4ce164b8b00e5f70c8b59cff67877e68be6ae23bb24c9dbe560be8023934aa4df38cc4d72cbc005 SHA512 8e75986eaef9e2a824ad0ef2762f9f5d35da898cf3bbc5fe4f94d8d93552fcbd2a7b1e4c82a7b4af566150c44072fd63f7d5c0cbd07b038d94289a22e9b7444b
 MISC metadata.xml 2288 BLAKE2B 03dbb351d028d2546bcfd2461401923b72ada6ef60d47beb03368d157aefcbe3dffc4128e5fac30003ceaab2ee87792e0f4d7abbfeca973560b29dbab2667a79 SHA512 11a244f440fbae9ac89ec759ea2598d568e70d7e4bba7a4eeb8da0d1f8a4c86e797db49c9b29d8c8f1691f18693ff8173f997de521a808fcda6d16ff3d79bba1
diff --git a/www-client/chromium/chromium-111.0.5563.64.ebuild b/www-client/chromium/chromium-111.0.5563.64.ebuild
index 11504b3f6f65..d41b4c6b4d15 100644
--- a/www-client/chromium/chromium-111.0.5563.64.ebuild
+++ b/www-client/chromium/chromium-111.0.5563.64.ebuild
@@ -254,25 +254,6 @@ llvm_check_deps() {
 }
 
 pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && ( use lto || use pgo ) && llvm_pkg_setup
-
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 10.4; then
-			die "At least gcc 10.4 is required"
-		fi
-		if use pgo && tc-is-cross-compiler; then
-			die "The pgo USE flag cannot be used when cross-compiling"
-		fi
-		if needs_clang || tc-is-clang; then
-			tc-is-cross-compiler && CPP=${CBUILD}-clang++ || CPP=${CHOST}-clang++
-			CPP+=" -E"
-			if ! ver_test "$(clang-major-version)" -ge 13; then
-				die "At least clang 13 is required"
-			fi
-		fi
-	fi
-
 	# Check build requirements, bug #541816 and bug #471810 .
 	CHECKREQS_MEMORY="4G"
 	CHECKREQS_DISK_BUILD="12G"
@@ -306,8 +287,32 @@ pkg_pretend() {
 }
 
 pkg_setup() {
+	if use lto || use pgo; then
+		llvm_pkg_setup
+	fi
+
 	pre_build_checks
 
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 10.4; then
+			die "At least gcc 10.4 is required"
+		fi
+		if use pgo && tc-is-cross-compiler; then
+			die "The pgo USE flag cannot be used when cross-compiling"
+		fi
+		if needs_clang && ! tc-is-clang; then
+			if tc-is-cross-compiler; then
+				CPP="${CBUILD}-clang++ -E"
+			else
+				CPP="${CHOST}-clang++ -E"
+			fi
+			if ! ver_test "$(clang-major-version)" -ge 13; then
+				die "At least clang 13 is required"
+			fi
+		fi
+	fi
+
 	chromium_suid_sandbox_check_kernel_config
 
 	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
-- 
cgit v1.2.3