gentoo resync : 04.01.2022

4 files changed, 40 insertions, 10 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 3bcd229daa5f..a6f102d21ac5 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,7 @@
 AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff
 AUX chromium-96-EnumTable-crash.patch 2850 BLAKE2B 196f5f739e96cab32d9ac7585ad4a04505f71e2e147b03e5f6e618ceed5cb37591240fdea48e388c0aefc567ecf6b369026a1d9c250112e4c0b2bf7952fcd21d SHA512 c968cc19160a4d91e0000a7ff2efdaaf97a1cd43ec68dbb335493f1bb1ff3798a6b5f33baa836ddc601c7017863655b00cf4d32cd9c9c94dbfcea7187dbec937
 AUX chromium-96-freetype-unbundle.patch 361 BLAKE2B 15c7681df3a4142bad4e0aed759d13f48681a19124bd5735037475b8028b1147b55b3fa2457ae9fca2ce7395f0c3b13c28c815b6c9487456a2b2c0bb26caefd1 SHA512 ee477b8799033f53cc3c2a2fd0e588f4091be1c2c9d5c82c7fe9db00167ff2a4de7d99e48fa1b9fe5fed3a03c1b8e0bbb3d192d35895c6a52f585d6bb1c9f84b
+AUX chromium-97-arm64-mte-clang.patch 1076 BLAKE2B 858df7cf213f7742c0a7947e801b90afa9ec164ad48a21d563fa02c121d7015debf1c7bcbb7754ed748a77fa3bb7b70f676aeebc3066e34229cc6dfd33a3dd82 SHA512 70f847dfd912263613de884b8a8db7fbc3551392ccc934adcbd03d3ea49ce0aac1a9aff996265f112b9d4dfdf9709feab6d0dd99ce78d2d43446b04497fa601d
 AUX chromium-98-EnumTable-crash.patch 2854 BLAKE2B 4478e14e7f0c0d251b659546c2e4b83b712b072317c35f63376d7d58e2fa3563f0518b4cc333c5902140cfcd333b5860737d4c7ccbb3680fee1b60de25ad0917 SHA512 a1b55b04da7218cda037a38a543032aa741a589d2f0691d69f28eb173ffeff284d2f4da2cab1708335ecfc0a3c12ecbd57c4c48dee3eca44d659d9a3f9a7dff6
 AUX chromium-98-system-libdrm.patch 1018 BLAKE2B 0d3a3b20846569fc52199cbdb003a015415c0d7fdda65fb159b007063fa817c22ed676b1e5531026a7b450145071d72b249b1ec56e51a757e1bef1e55adaec0c SHA512 22c5fc39859b6a9c000111b8b2a5875b5cdd278ba55cd22f95d3e8baf59e2c92c1a8c9df83f5ae8f83d6a63df7ba397f1253a878e2d11362b3b72ebc5081bdca
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
@@ -13,10 +14,10 @@ DIST chromium-96-patchset-4.tar.xz 4812 BLAKE2B 5d82d212b8ec1689be6f4a7a06462563
 DIST chromium-96-ppc64le-1.tar.xz 29224 BLAKE2B 3369a3b15eb4f42761e01758135995a1f34e40cecbfc0372a4bc17b393d50b276ea5a0813d1c57f73f0dd34cf2a021356d25c2b4dcaa95998ffc082545dc915c SHA512 256d64fbf192e55d77c6580d36766a67dadfbd0f1e34e49bfc6d55114da7f2252d783db0dd09123996a71a01ec4a3d5c70fd1a5c8852db135857b8495f7cfbf1
 DIST chromium-96.0.4664.110.tar.xz 1209944416 BLAKE2B 1cec11b248b9225e47caf6bf8ec243e301bb63df2b0a070fb55b829b712e513b2510944f72306cebde3715704cae5b2c6be83847e91b358cb5135b56d55255b3 SHA512 7db962dc7016f531c33e915408303f06f429b53d1c5a69b281e64f6204d4bdb413fd281c3d891bb696d846f80f6182289c10f4b19b3b4c2c8b7fd72070de3f02
 DIST chromium-97-patchset-4.tar.xz 4240 BLAKE2B 450d013b6fd68f7e0bcb21a2b0828d531eda86965e636fe24fc36c2e7e1f74fe93f27f0d4b1d03e67c605797e28db37de4949ff78d5106e07b0362bec4bc5d8a SHA512 181c706c83bdbe07b2e7f02b654922a860aea761ad267e6545fb7d56b66373b003c1c79fae5cd45eeb3be8917782fa45df1c05bbb00e170f0146e7385f4246c4
-DIST chromium-97.0.4692.56.tar.xz 1213710744 BLAKE2B 566e0d937b50b3636e3520069f7f7d62f310e98d9cb333b13c2565abe57d4adc0ffd060ae10bc98629d9a3ff012487e9d8e2ff569221943f6e7515c6949cc029 SHA512 f2ee447ffa35b98618154466e913cbaeef87485614848aaa78b8f89828664f039d2d76f73a5c3bddd772a596138c6b871d0c85a3d44264663fe4b2bea9d8df17
+DIST chromium-97.0.4692.71.tar.xz 1213607776 BLAKE2B 203cea4fbc2dabda7e8f85c1caf0c98207c2e22b27a39720a7155b32a72eb61ae9f8551d67b5ba93f5fcb17cc41ccc6d5492ad8defb60c6f3aa48b13a2884021 SHA512 4087950d5353b6fa824de5aeb43a578b0b2361d5a2f32977814f13c75ff0c5ab5f9bd5f70f6331c1e16654733ac2c1d0b5023d856171ea658658336ff3424af4
 DIST chromium-98-patchset-4.tar.xz 5332 BLAKE2B a3c7e1774e421c4937b39c984e2f39ff13ebc68a8d9f658ffe4ffe8ea381efb99250516bd5f7286f384fd2e0187a8d3410e57223555c9400db4a0cf63c23944e SHA512 7c92787f79a0cc41806bca9277de7bff41da9bc5d713bfeb22214d7103a7833fe000b46cd18b21d621f9baec6d70a58c3158a4903ad9121f999b13f1af9ca1b7
 DIST chromium-98.0.4758.9.tar.xz 1234078444 BLAKE2B ac214ae340f53ea55d1e1a7d0484d3696a5781b98247e3c2e3e909e8a25dad9d1bfb135693ba58900c66eb5f8fcf5462fb96ccef65ebbba3ddd65708463932dd SHA512 82cde4c157dc1029c54e15b332eb78e3da5fce1a26f449c45afa99502e84407732593f53211fdca4301ecbb4e9860dff43cd48611ab4490df295f404c71d7abb
 EBUILD chromium-96.0.4664.110.ebuild 30858 BLAKE2B 9643a3bdf640de973f320517fb2dfc3afc2ad019af3d6bad1248f2b12ccc47242c4a18483cbaa1ac26c05d4ca89b06008fd2e16f54f4851ecc67e86ee1d925e3 SHA512 423a3a4be00f0f92ec474b13dbbfe725444f0de85c9ba98491bdba27099b4e4925806aa82c24af120a5f9d8489b4a1b9157b04e44b35c85cb35641d89d49637c
-EBUILD chromium-97.0.4692.56-r1.ebuild 30552 BLAKE2B 5540786745d9fd2d0079b4c1d0d19597c2ed550b5850ac76d4b97d63f75d05ee122c13421e10dca70e2765bb42c6872097f8590f2e8404965788c7bcaf9c2b4f SHA512 56bcfe03d395ebfd03ff4736923afce244f42863364fcab6d212b3add2517cf4c1aeb1d4cdb8ec7918a6e9a105d5766deba9c9daebc2b638cc4c9e9ed9bdbbdb
-EBUILD chromium-98.0.4758.9.ebuild 30567 BLAKE2B 52942b1cbdea308375f43bbb642eefa00a08052948a80d04843f6adf471cfdf3ccc798e881d7726cb9efad70b2202887560c10a0820fdcfe8bdb08c51f8aa245 SHA512 902b99846e0518d8fef5bf4f3183efce5da88b4f872a77922440eb119f8dc715d703a70656535ae034359c95829147adf6953ab9a668c3c192d0c2b0192bb7d9
+EBUILD chromium-97.0.4692.71.ebuild 30459 BLAKE2B a15adad53264f986938db81cf00030968c715eb49a13f9435c56011a113671508168c5c9f769c5018d1fcaeee7c6bb630d0ce55631d28b6ffa5caa354c085b1c SHA512 1ae0c318fc175b549e44eb782fee575553db72696b3cef3958bd5031ff7ebae875e844ad1dfbeef7054970a151565b12d372e26e697a03cf26b687bcf804e123
+EBUILD chromium-98.0.4758.9.ebuild 30424 BLAKE2B 1a4ee6a029d14f9b47a004215c45ae8a691dc9034b5b2f093f9a6926437ea9e7d89e3db1f0d99af1a7854248d00b2bc631c722aadd132c630b6cfbc1c13d87ce SHA512 8397dfc4e0253d7c3429ce7f4857760ed7b5c45066358044804c3284b132a7d39d8c80cf446785bec1d614083423649cf26a2466d76bc2572c1370f63d531a78
 MISC metadata.xml 1854 BLAKE2B ecb1c85380dcf8f3b76159eee3aeb27746b35c4f9b6cedc56a011d1cff4524f5ea8fcfd7530c1b627f54b6612f9934cb49119c7e22640e6232812f8c846c5cd7 SHA512 3ff27b3eb1568590c1e5ff90d9444a4ce573ca57502be51c3e11496580152883ea43a7ecc4f56fb5b23299d4be58dc068e74a1375720f97222e019eac354425a
diff --git a/www-client/chromium/chromium-97.0.4692.56-r1.ebuild b/www-client/chromium/chromium-97.0.4692.71.ebuild
index 9f7bc657a268..65119a3ae012 100644
--- a/www-client/chromium/chromium-97.0.4692.56-r1.ebuild
+++ b/www-client/chromium/chromium-97.0.4692.71.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2009-2021 Gentoo Authors
+# Copyright 2009-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -231,6 +231,7 @@ src_prepare() {
 		"${WORKDIR}/patches"
 		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
 		"${FILESDIR}/chromium-96-EnumTable-crash.patch"
+		"${FILESDIR}/chromium-97-arm64-mte-clang.patch"
 		"${FILESDIR}/chromium-glibc-2.34.patch"
 		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
 		"${FILESDIR}/chromium-shim_headers.patch"
@@ -745,9 +746,6 @@ src_configure() {
 		popd > /dev/null || die
 	fi
 
-	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
-	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
-
 	# Disable unknown warning message from clang.
 	tc-is-clang && append-flags -Wno-unknown-warning-option
 
diff --git a/www-client/chromium/chromium-98.0.4758.9.ebuild b/www-client/chromium/chromium-98.0.4758.9.ebuild
index b5052733a30c..324fa8b27b29 100644
--- a/www-client/chromium/chromium-98.0.4758.9.ebuild
+++ b/www-client/chromium/chromium-98.0.4758.9.ebuild
@@ -746,9 +746,6 @@ src_configure() {
 		popd > /dev/null || die
 	fi
 
-	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
-	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
-
 	# Disable unknown warning message from clang.
 	tc-is-clang && append-flags -Wno-unknown-warning-option
 
diff --git a/www-client/chromium/files/chromium-97-arm64-mte-clang.patch b/www-client/chromium/files/chromium-97-arm64-mte-clang.patch
new file mode 100644
index 000000000000..e86110bfb0ea
--- /dev/null
+++ b/www-client/chromium/files/chromium-97-arm64-mte-clang.patch
@@ -0,0 +1,34 @@
+From c04406585217092f85f3188dab4875b7be78af1d Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 02 Dec 2021 16:56:39 +0000
+Subject: [PATCH] base: enable mte via -Xclang instead
+
+-march is fragile as it may get overridden later on by
+e.g. distributors.
+
+Bug: 1137393
+Change-Id: Ia6b98491ef6f955929d0699e9f435844de48e1da
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3310965
+Reviewed-by: Kentaro Hara <haraken@chromium.org>
+Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
+Cr-Commit-Position: refs/heads/main@{#947530}
+---
+
+diff --git a/base/BUILD.gn b/base/BUILD.gn
+index df6293d..eaa02b7 100644
+--- a/base/BUILD.gn
++++ b/base/BUILD.gn
+@@ -104,7 +104,12 @@
+     # but they're not backwards compatible. Use base::CPU::has_mte()
+     # beforehand to confirm or use indirect functions (ifuncs) to select
+     # an MTE-specific implementation at dynamic link-time.
+-    cflags = [ "-march=armv8-a+memtag" ]
++    cflags = [
++      "-Xclang",
++      "-target-feature",
++      "-Xclang",
++      "+mte",
++    ]
+   }
+ }
+