gentoo resync : 03.03.2021

5 files changed, 17 insertions, 43 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index e0a2ffb45226..63beca9aa499 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,19 +2,18 @@ AUX chromium-87-webcodecs-deps.patch 1011 BLAKE2B 45caba9cb8c65c0f72844f441ee0f0
 AUX chromium-88-ozone-deps.patch 1548 BLAKE2B 6a9b2b19b1563503d749394921a43c53c33be7e9b88572c7e2e95affccc5e79737c28b9c1c6ae7c4a139e05a802052b4375d51264492f78dde5717f760368d8a SHA512 e2e8304efa772c2cdc2a891335f9d2e914885d563967fef71d7e2f443eadbfc502480cbd1fdbc1b32a59cd17684d3044d2ee0c4ad5dac5a4402c1667e13d66e5
 AUX chromium-89-EnumTable-crash.patch 2712 BLAKE2B 6715f98a5cd2c9886050f9d360938e261308a3def252e25642a473e86626594fa6c06cb3231dd57dc5428db8ee118848a0a085abf741c9555778f3ae3d9d374f SHA512 07ecb68d5ca2d732c9ca58b4dc007eb2f4b842bdf6ba46cca9050bf1c582439ebb23db1149c76d5a27f4d8de548de946e80eff0c5b1759e4b6714e0c6a7b26c9
 AUX chromium-89-webcodecs-deps.patch 976 BLAKE2B 5a5a397c4cbc5c6e16cd95364ceadfea342ea2d1acabd7640c0bb6e65218dc4e5783a743912c352b3f9422b2f9e067db9109c64e117f82673659c2c5338b1353 SHA512 1585d2d9258bcfd5d78956ff3b7c8d61997a65133e86a2878c9e7bdf68ad9c3a6c24f20f02f10388b7dae02f7ad82c7533687ff13918f75e5ceeb112926fc4e0
-AUX chromium-90-unbundle-zlib.patch 1055 BLAKE2B 4b1be3246801cbca244649c42d512148d4023990e53d8b3504d155a4088a9ae8738d0010fd2dda0c6d40c9fc8cfc696a013aa6b88fc34518a5cfa89dc11ece5b SHA512 893b8e37bec131713d93500263f175714532caa2572e18faafec142058fa417b0824e6acfd6de13f645f6c3dd29d8d4758f9b1b39e355eb04aac55e5d92d1bb9
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
 AUX chromium-launcher-r6.sh 1593 BLAKE2B a871bd572239552390b216c89269dfe132474e1f57bfd0429f605af8285634659725c550b701e537f56adf20cba2dcb27dd9dadd390366dedc147f1ee987f462 SHA512 c01cb376eae2871dfa7a488d96ac8cc3445230eeb0fbd865948c5b3b601820468e85f2f0b9b30fff940c736aded050b7802759b8562e6378747af93c1d4f08a3
 AUX chromium-shim_headers.patch 1510 BLAKE2B 9716cd250b249c6255aca01a385ef8a2a6f1df9ea3cf7499715543c14f8be62fd323b6048b890aa2be45891e7a765d92de3f41c3b3a88c08dae4b806c048e20f SHA512 c74bcf690a41b4f9b364477d23408d493aa674e3bd014940098a594471297c2a425241f908510061b5f11c9cfe009c4a803370edd757d3c0ab8d9c0cc128135c
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-88-patchset-3.tar.xz 8396 BLAKE2B 4c978f1a6efef3f71e3dd6340c392b74bc6a734b49a9ca43343d03903159dafc66159939f9a6c4b55665ddbe7bd97a26d8d86c285ec02cf76cad5f5cc7410570 SHA512 c39afa26f5b0b9930f6f67ce0c42eefd74c09d528b26bc0db57129b150f75ff83c8b1cb97bd9c5d75f288fb4767cc68c9c5ce89231b4a59f8ca02493e4dd281a
-DIST chromium-88.0.4324.150.tar.xz 857377456 BLAKE2B 65f3d4a0f930743d04786a21c10561a93a2eb27c2c06d260495ead6ebf9344b2938f28c083a4077c9d2413f47cb083a83633b571ab1f54b25823fc8db18f504b SHA512 5e0419ce26e58b6ba30586c806fa3001f6c3c094e09c82fb08ed828a199c582308ce9bc0ea445aa0214d29710a586bf5a972553fbef5eab574fb0dc3ebe6280b
+DIST chromium-88.0.4324.182.tar.xz 857221352 BLAKE2B 7263294154232533f18d0bc8eeaa7097c3578f8e585ce953c9e6990ec7c9ffbfbd0e69f89c4852c09197aab592877350f54590cf4f0bbec9481886f3fc34548a SHA512 ce8d507645e937107847199b55287ec5522e778851367a19c4cfa4ff5fae18e7c7ea999aa7b0ad0758fab68a003f201bf38ae51e3642388705de2ada9be87730
 DIST chromium-89-patchset-6.tar.xz 4308 BLAKE2B 22e2db8b5e287925f8b550075e48ad381ccf7ef54e23d8f4e4aedff7fd6cfee8f9e70eff1edb8c867c256ee5ec881ef9379e18278b84b47ff08dcc00f5801667 SHA512 aa5d902c1959f50eb9a0d773a77bf12e5a955d796ee8b18f6e2143573dd73beec62109940e55a858fd9927753dba1d3bf9c1bd940b18a616e7b70b801e93f041
-DIST chromium-89.0.4389.47.tar.xz 890733548 BLAKE2B 55482566fce0d30abed7fe88514314f14860ba2f876af532c7b566c9b32d1caf79ecccd8cc03af7b9cac4457038abf4e5006c8bfb75fd308200f7290f3431d39 SHA512 f6828d3d9a346e508511eee8cef63ad6ae4327adb90a6bcb392e862e8406b50798f0d73306794283aaab84550547b31c2b9e90e2068740b9123115796f9a082f
-DIST chromium-90-patchset-3.tar.xz 5344 BLAKE2B 19b9d69d5d4aecc18e1a3867fd0c53d01dd873fd533b83fbd8c25d435976dd2176975ccf5d4ebb04f84b6c1c0a009315ef4344fbf575b8ae6942ddfb12d1e1e1 SHA512 97d756b4b4270c7631ca42792e869815c22a786ebba36c2668b99298bcd60f24fd89b52d2491ade07341c20f2bdac933b46b299e52bfe9e45cb57bf056ee050c
-DIST chromium-90.0.4412.3.tar.xz 920864492 BLAKE2B a0d5e6ddc552611231c7ba8fd81da4d2e01e59695eccce33c040ffdd37fa360008cf8c8095f10622902a5e25297db4c10b5c463fdca5e5c46d390db4268f3d17 SHA512 bf168dd2a817823bd9ec7b7c925cddd783366460011782884f02ef15952546d6edef6bb2f08813bfd8be2e64c787e80c2cd449032b9eaf19d2ea7a6eb2294da8
+DIST chromium-89.0.4389.69.tar.xz 890779864 BLAKE2B 18f3d744979011cbe2cb50378e18feaf1fe7cb1ba5b2d7ef64dafa8924e0d460c12beaad7dc3145adad70c4de3ab19fae81b49fb03550ee0d3abd2c793a71ddc SHA512 0514648d2a4542b23c27de1a8fc2f46819d527faf4e2fbbde8c98227e8f189bd6fcc9b0bc5b22c67c3f9fa7522006264622118fbbe7fae0bcf39fea162f5daae
+DIST chromium-90-patchset-5.tar.xz 3272 BLAKE2B 58d018d50dc088fe246e5135a7d2cbac949b499ff115a31f9be1fe9fa82e0dc7d16405edc77bb5f80130c12ed62a8bea2f337b9bb587d7a3e93c4b8f21f0a6ac SHA512 b3bf1a47181e0efde67cf1d8103d3e61920b49b685be7334610daf4a459e910310481aed95bf37e3315b6253807baab034e251d45b766a22b2a7b3c3daee4d8b
+DIST chromium-90.0.4427.5.tar.xz 916946504 BLAKE2B 487ac72e59e1c3cdd4b4f7727bf0c723a07d583bf8c97d32e1e45541f74e1e9a1af80205e5a5e2fb36ccb876749ed61da4432419dc12fa944634e7b365858e83 SHA512 7e1bd45dd9303783562f9d4483004e48762917313f3b5cbb19af244ae71926f3487b253ee21e98237dd8f4b8ab244b9b8a2c97305b6e714e98ca24d5487c4b87
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
-EBUILD chromium-88.0.4324.150.ebuild 28537 BLAKE2B 949c867f5c43e121c7f2b66496f6bc41a1c59278551f38194cc61ab4d6982df9813d062075a5bb1b4739bd1312ddd2642ef6c37cf1e01d49774ff437a88d38c7 SHA512 4c44e9f8fca5487550be400b13ac0cdbae6d6265a27ba9199be3d4a63f2adb84d01809feb5b04cd77fab29cc14ee04e96ebc5043a1812c569a2a5688e9b1fc3a
-EBUILD chromium-89.0.4389.47.ebuild 28584 BLAKE2B bf2a5d113077e672d7ea440ebacba66703102f7a6ef1359d9abca93e4e2de6f6c8e9da77a313ee83c4e85d8554a94941d1339d180dbc298fb81afe35895756eb SHA512 39d15678479247adabf29b900ce4f10a11b4adc6366b2958d0aaf9076c527fa2103ba14624f1fc4e7e004fdadb6d5a6947e66fbd3610f426acabd8c0112f0f3d
-EBUILD chromium-90.0.4412.3.ebuild 28721 BLAKE2B 2f491c801c69c5d319c7f8c488201c00257651fb2e7a51bab59ab8f92dc0ae66323d7cd37428e286d16887a5aaa7013bdcc8fe2659b7dd14f296ee038fe93c28 SHA512 1733b169bef9e242db6a0bd0cb4e335120beee7faaf9dc2b6e34012aace1d3411a46ce9d5c021a5b5af9273d175fffc96549f713eeef0d14182bb291032de4ac
+EBUILD chromium-88.0.4324.182.ebuild 28537 BLAKE2B 949c867f5c43e121c7f2b66496f6bc41a1c59278551f38194cc61ab4d6982df9813d062075a5bb1b4739bd1312ddd2642ef6c37cf1e01d49774ff437a88d38c7 SHA512 4c44e9f8fca5487550be400b13ac0cdbae6d6265a27ba9199be3d4a63f2adb84d01809feb5b04cd77fab29cc14ee04e96ebc5043a1812c569a2a5688e9b1fc3a
+EBUILD chromium-89.0.4389.69.ebuild 28584 BLAKE2B bf2a5d113077e672d7ea440ebacba66703102f7a6ef1359d9abca93e4e2de6f6c8e9da77a313ee83c4e85d8554a94941d1339d180dbc298fb81afe35895756eb SHA512 39d15678479247adabf29b900ce4f10a11b4adc6366b2958d0aaf9076c527fa2103ba14624f1fc4e7e004fdadb6d5a6947e66fbd3610f426acabd8c0112f0f3d
+EBUILD chromium-90.0.4427.5.ebuild 28775 BLAKE2B abbb0a98b2b43fc2b155dfadffb7b03869ba13b61d5f73fdfbeaa98a8c0707f8471af90b758feb57ad0e1a0b2dc2201127ef6cdec83de44ecdfdd9ccaecab398 SHA512 40d6bccbc5e66ef71c4d29c024ead0612c1141b925a8d9ea2e66d145cead2d6d5baa0aa6ff5e6f8985ff984cfdcb6f1785425184bf12e2503a09f7bf7333f139
 MISC metadata.xml 1596 BLAKE2B e15a05a13e8200be6a946ba0b2631a014b83a66267a9ce956245d28312403b3229ef6a961830bd69535bc4286912fdf8d5f3a6cb0d0f8aff29936ceaf7113e8f SHA512 204d0b04307b2fc2188c64f290c0e3a0a0b14f3ac0f35deaffdaac1b30addd4df1f2eef2eae19a674f07123dc44a6ba4a0b5e2419a898bfaac61579603ceb0ee
diff --git a/www-client/chromium/chromium-88.0.4324.150.ebuild b/www-client/chromium/chromium-88.0.4324.182.ebuild
index f14450e00326..f14450e00326 100644
--- a/www-client/chromium/chromium-88.0.4324.150.ebuild
+++ b/www-client/chromium/chromium-88.0.4324.182.ebuild
diff --git a/www-client/chromium/chromium-89.0.4389.47.ebuild b/www-client/chromium/chromium-89.0.4389.69.ebuild
index dca398dbb76d..dca398dbb76d 100644
--- a/www-client/chromium/chromium-89.0.4389.47.ebuild
+++ b/www-client/chromium/chromium-89.0.4389.69.ebuild
diff --git a/www-client/chromium/chromium-90.0.4412.3.ebuild b/www-client/chromium/chromium-90.0.4427.5.ebuild
index 613e64db8a5c..35a1e6b929be 100644
--- a/www-client/chromium/chromium-90.0.4412.3.ebuild
+++ b/www-client/chromium/chromium-90.0.4427.5.ebuild
@@ -13,7 +13,7 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
-PATCHSET="3"
+PATCHSET="5"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
@@ -127,12 +127,12 @@ BDEPEND="
 : ${CHROMIUM_FORCE_LIBCXX=no}
 
 if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-10"
+	BDEPEND+=" >=sys-devel/clang-12"
 fi
 
 if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-	RDEPEND+=" >=sys-libs/libcxx-10"
-	DEPEND+=" >=sys-libs/libcxx-10"
+	RDEPEND+=" >=sys-libs/libcxx-12"
+	DEPEND+=" >=sys-libs/libcxx-12"
 else
 	COMMON_DEPEND="
 		app-arch/snappy:=
@@ -189,15 +189,16 @@ pre_build_checks() {
 			die "Component build with tcmalloc requires FEATURES=-usersandbox."
 		fi
 		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
-			if use component-build; then
-				die "Component build with clang requires fuzzer headers."
+			CPP="${CHOST}-clang++ -E"
+			if ! ver_test "$(clang-major-version)" -ge 12; then
+				die "At least clang 12 is required"
 			fi
 		fi
 	fi
 
 	# Check build requirements, bug #541816 and bug #471810 .
 	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="7G"
+	CHECKREQS_DISK_BUILD="8G"
 	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
 		if use custom-cflags || use component-build; then
 			CHECKREQS_DISK_BUILD="25G"
@@ -231,7 +232,7 @@ src_prepare() {
 
 	local PATCHES=(
 		"${WORKDIR}/patches"
-		"${FILESDIR}/chromium-90-unbundle-zlib.patch"
+		"${FILESDIR}/chromium-89-EnumTable-crash.patch"
 		"${FILESDIR}/chromium-shim_headers.patch"
 	)
 
@@ -346,6 +347,7 @@ src_prepare() {
 		third_party/libaom/source/libaom/third_party/vector
 		third_party/libaom/source/libaom/third_party/x86inc
 		third_party/libavif
+		third_party/libgav1
 		third_party/libjingle
 		third_party/libphonenumber
 		third_party/libsecret
diff --git a/www-client/chromium/files/chromium-90-unbundle-zlib.patch b/www-client/chromium/files/chromium-90-unbundle-zlib.patch
deleted file mode 100644
index ad3847515adb..000000000000
--- a/www-client/chromium/files/chromium-90-unbundle-zlib.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9b04353f502d3fa371231742817b07cb0c41f80c Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Mon, 8 Feb 2021 11:15:39 +0000
-Subject: [PATCH] profiling_host: depend on zlib instead of headers only
-
-There is no zlib_common_headers target for unbundled zlib
-and in the end code links against zlib static library anyways.
----
- chrome/browser/profiling_host/BUILD.gn | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chrome/browser/profiling_host/BUILD.gn b/chrome/browser/profiling_host/BUILD.gn
-index a68ac82..1ec9d66 100644
---- a/chrome/browser/profiling_host/BUILD.gn
-+++ b/chrome/browser/profiling_host/BUILD.gn
-@@ -24,7 +24,7 @@ static_library("profiling_host") {
-     "//components/version_info",
-     "//content/public/browser",
-     "//content/public/common",
--    "//third_party/zlib:zlib_common_headers",
-+    "//third_party/zlib:zlib",
- 
-     # Added to support the dependency on //chrome/browser/metrics
-     # TODO(darin): We should instead have a way to express that dependency here.
--- 
-2.26.2
-