gentoo resync : 25.10.2021

5 files changed, 25 insertions, 68 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ae9e50ea84d3..23f3a5c900f4 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -7,18 +7,17 @@ AUX chromium-95-harfbuzz-3.patch 1540 BLAKE2B f40fa435623da8bdf1075e27ada445cf1c
 AUX chromium-95-maldoca-zlib.patch 445 BLAKE2B 2793d344ff3083cfadc572bd1ce6932643cf00f11d1cd596f8aaff68363a12a79c4b42a389b1a1843fbe6d760de8960cafc5d3b2f7769f4ea04ff4ef74703839 SHA512 962834cdc6a32be31d61ac526067c7e73fe322c3e3cb72c234735e08d6cd15830ed461493c41febe35d40de60120fa85d2da7b3a62dafbe180b1e213e3d8940c
 AUX chromium-96-EnumTable-crash.patch 2850 BLAKE2B 196f5f739e96cab32d9ac7585ad4a04505f71e2e147b03e5f6e618ceed5cb37591240fdea48e388c0aefc567ecf6b369026a1d9c250112e4c0b2bf7952fcd21d SHA512 c968cc19160a4d91e0000a7ff2efdaaf97a1cd43ec68dbb335493f1bb1ff3798a6b5f33baa836ddc601c7017863655b00cf4d32cd9c9c94dbfcea7187dbec937
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
-AUX chromium-launcher-r6.sh 1593 BLAKE2B a871bd572239552390b216c89269dfe132474e1f57bfd0429f605af8285634659725c550b701e537f56adf20cba2dcb27dd9dadd390366dedc147f1ee987f462 SHA512 c01cb376eae2871dfa7a488d96ac8cc3445230eeb0fbd865948c5b3b601820468e85f2f0b9b30fff940c736aded050b7802759b8562e6378747af93c1d4f08a3
 AUX chromium-launcher-r7.sh 1631 BLAKE2B ae28d758264446511fd2b64ba69fe920144b351e8833e0e98f43d00633e850094c288b5d97d1a84801ea13aceb294623692c86c1b9be5811b7b97fa8a07a1ecd SHA512 1e97f8394bd8bb4b29570b1b85176efe6258314a596f079bee1c4018113e0023aa54a93690ba8de2a00d127af10dbe2cc3fb3127b72b841c6f28f9e7bed820e0
 AUX chromium-shim_headers.patch 1510 BLAKE2B 9716cd250b249c6255aca01a385ef8a2a6f1df9ea3cf7499715543c14f8be62fd323b6048b890aa2be45891e7a765d92de3f41c3b3a88c08dae4b806c048e20f SHA512 c74bcf690a41b4f9b364477d23408d493aa674e3bd014940098a594471297c2a425241f908510061b5f11c9cfe009c4a803370edd757d3c0ab8d9c0cc128135c
 AUX chromium-use-oauth2-client-switches-as-default.patch 1085 BLAKE2B baf3c463305934c126af4f7c5be305863edc7eec3add5b5ada30565b49b5944021eb40f1a9643e7eec3f973c502d9b02426f00b760570fcea5f1509219e41c6f SHA512 fe2878ee45778bac894ea17a668511d27ad2ca40988d5f11439790b700bfefd6560f3931415b4e6c543fcbbfc7cfef55cc757ed4ace1d111039ae78c46b81945
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
-DIST chromium-94-patchset-3.tar.xz 5052 BLAKE2B 3946b555d22792023696e85dbdb02a5fc43e39819c3a1a25c782d12771a608b068a7d11f757fa6390e7d295fe9c2b3b8085c31bd79d35edcd882a3f9f66df8dd SHA512 42f7beb412a7e691f35603625cbb316223706891f2a289301e4786ab92cfd4414d2f4a365f7637ba49a28508e18523670e59ae88512bc56afdd79d22f62f407e
-DIST chromium-94.0.4606.81.tar.xz 1039841108 BLAKE2B ff7cead6f4d12e31d48458f5307d2d6055041493f95bee38e1481aa3f16360dbcee6484fc4441dc0bec26313139786c04735cff8f29e410ad23586da10626f8c SHA512 59bde106e41da1daa1e806f790cbeea8623e5b5a191222981981f2722da97a26c7f70cbe3a9108e5d84e411712627657a86b3931ec940121c7e61bdb09b5bee8
 DIST chromium-95-patchset-4.tar.xz 4308 BLAKE2B e91cb78d2357af8c0dfc66e4d148c5e6ef20cf9a811bcebf411e07cc5af73f30760d889842923afb2945e57b0f67330deac3f9068b6ce7c487482a6434e5c672 SHA512 152657e13afab3caca6a9ff6c0b51203f5bc8b0a4075a4396794d7a85caddce1b26f989c7dede5fa9a54316334099d21889e6767885fbf974260a6e9bd90df9d
 DIST chromium-95.0.4638.54.tar.xz 1213374932 BLAKE2B 75e1017a50eb0f42c714863969414308df7ee69160271d3bcd5ba7af79c96c5eb53edd9d892f33db6c2455d0b2dfa12dadfa8cb01d4baf1f89d57fde5291783e SHA512 159c8d37e8cfb5bb0e55d3d1329295dab585164b84b8c514ea80f0f68ce0b491f4c40a186a2bc108baae2341cf320dee78c654c0a038d5aeb17b5a19c7f043d9
 DIST chromium-96-patchset-4.tar.xz 4812 BLAKE2B 5d82d212b8ec1689be6f4a7a0646256311d06c17e74ee0e5b2035c32125a5235e4b6b7605cefffa367cc53e651be17b75f5e339149b4c80dca50cd959b1623f1 SHA512 a72c1bb2c58e9e2912a641093c153f01ad7239dc971c7c96481ba4164204afe41741f3253e8af03070dab8276179784dc6a11761b39ad7902ed2553016778282
-DIST chromium-96.0.4664.9.tar.xz 1221461124 BLAKE2B 4ab38eb5d3b79f5a59c2f7ca546dcfd375e5dc7580c6de415a097a003d63d6a9d505ed9223d829538ede816ca6ca6a2cbaae9213c99951697ccdb4d880b8d12e SHA512 1dbc23efd8331ac7e31b0a30dff1dda646d81ebd5532a220c7933c6f03362f28406142b92b7ee09f50dbb9bd6c12f5bb4e3a6546dd245b11ecb2f006e40828f1
-EBUILD chromium-94.0.4606.81.ebuild 29924 BLAKE2B 5f09dbd458540310e1a24bd8ba2026f4b4d29a73a5c713062a17f8689dbfd1d126ea1b30bd1b86bc8bef10093a2f564386e91658c57fcc9d1bc26f44392245aa SHA512 b756e99d7522d309c9d4b98fb6fa545b92e49a5161ae6849a5f042577746bced7d0c2b6e5442fda31190ddf8f9b750bfa8ab61799da89ccf5ad1c336fc30175f
-EBUILD chromium-95.0.4638.54.ebuild 30290 BLAKE2B 5254c12e52445676a80fa9ed8712a544a0a8d8fd80f1aab21a4de730605b7ad53e0bfdb7d35709a78844cd1b6fb2239cc03684cf3132b21968805aabecce6d26 SHA512 51cacd5b1eba791d1a6fd9593e5039aa22764e4acfd23dd049b852803e57fe248055df09cdd8109e403f9d01c11c61b2a454eb3864e7b806678c39f17c913f82
-EBUILD chromium-96.0.4664.9.ebuild 30075 BLAKE2B 821daa72d15d4bb04bd89fc04d90f58489181e0069096b202910fc2d7f3b2dd15e146aa9229ec9e662e7652440fd07c52f4ca6f2a21945c6f169e9fe9da3a056 SHA512 e664f0751bd03d37306300c448a497c947ef59a0f97fd16743a57d91d8dc0ddd83e55a548a9cbeeef0af99c64224a8cc5a8528a21f1d99a205c7bab40028dea3
+DIST chromium-96.0.4664.18.tar.xz 1221703620 BLAKE2B b684677298f843733d7aeb28a8c5f4f3c53c16690d578e2fda08f18696e03af485d653e9edca915e5ed9677f46113d2356ae0af3c41405b288608d1e299bf554 SHA512 e115b0727fabac4efca1becdc9ea1c77099a52897f753c57ab37b632e57116574c93f2a4239ee2f0b79d0d4cf674411a898b7c50ab3ecc86fbd6bb24e88312fb
+DIST chromium-97-patchset-1.tar.xz 4508 BLAKE2B a30d60cb4d5f883b3f72e23df1bed8339d144c75de9ab231f5e00ffb80899c87bc6e4a46cf1126c9b163573313ce7342be4dabac1e854bcf24c49f344807feb7 SHA512 651ad56c216b7569df436d13e6f0da13181dc236af8cd4bc177a7d5461eb9ccb0650c122c68231427b6ffd4290d5e7840c5dfa9a1c7ffd8ef7882a3efd053fc4
+DIST chromium-97.0.4676.0.tar.xz 1224908136 BLAKE2B cdb0c94aa364757c0a88fb8c4320164ad96839bef77058d2cc8c10a59882930bd28b20d0bdb324aca785c506e7af24718f62860b714cae5f349d64b9e31234e3 SHA512 1184a56cfcba029f9bd34b5bd422fc01ebbfbc7399223f88d6e9c5f2557e9adfc4332fec26a62e1beb2d7c815163ec9a5f409b0f235e425d93b83677a332c92f
+EBUILD chromium-95.0.4638.54.ebuild 30288 BLAKE2B 3a363aa699af7ec0da446d53a6bd1f7a48dc2156b8559ce763c79829cd745aeb71127a6d98c016dda8f2c951462b6cd5bae77a3b8b80bfc51afb35b09cdf5f79 SHA512 7741abdd5093b28d5c98f3a5cb218b981bf9c1e1121947fe32c3773146436b248f75717baf4ccba958aa354c6439629be9ca093c14e0bd06d224eb2135073093
+EBUILD chromium-96.0.4664.18.ebuild 30075 BLAKE2B 821daa72d15d4bb04bd89fc04d90f58489181e0069096b202910fc2d7f3b2dd15e146aa9229ec9e662e7652440fd07c52f4ca6f2a21945c6f169e9fe9da3a056 SHA512 e664f0751bd03d37306300c448a497c947ef59a0f97fd16743a57d91d8dc0ddd83e55a548a9cbeeef0af99c64224a8cc5a8528a21f1d99a205c7bab40028dea3
+EBUILD chromium-97.0.4676.0.ebuild 30075 BLAKE2B 0ed14e2c53af88b5fa569d48ede0881fe6316cb0de0c56ae690ad9a72be801b3212c010275af9e7d95d28ebbef9b99443428f9ec8fb7c5d26a49c6177a672350 SHA512 baa9cd650e1a5604e5967a9e4088729f16b3fb0acc61ba977cbe6ce364fb9bc28d2dd3b69dbb154c9d2a1f5798b070e0d27a1e4279bf7b0def33da8339eadecf
 MISC metadata.xml 1775 BLAKE2B 2fa038c0f6ebe1d86427cdf0806400dd690e31a9ee2667ea9f4f744478a675b9da89f0f541869bfea4ae5e28af1210d67b2766474d16752322407aad401d2c37 SHA512 0f4430b96a7d4dea4f2f1707cc81b184445c0f9da1d5c35a84c7958a037c13068b1a1073edc4576d7131564fc14c2f3b41a97cb8665f45e5a18eddc428c9ed23
diff --git a/www-client/chromium/chromium-95.0.4638.54.ebuild b/www-client/chromium/chromium-95.0.4638.54.ebuild
index 377ba36b7e97..8d1013b3446b 100644
--- a/www-client/chromium/chromium-95.0.4638.54.ebuild
+++ b/www-client/chromium/chromium-95.0.4638.54.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine"
 REQUIRED_USE="
 	component-build? ( !suid )
diff --git a/www-client/chromium/chromium-96.0.4664.9.ebuild b/www-client/chromium/chromium-96.0.4664.18.ebuild
index 713a8a577ae7..713a8a577ae7 100644
--- a/www-client/chromium/chromium-96.0.4664.9.ebuild
+++ b/www-client/chromium/chromium-96.0.4664.18.ebuild
diff --git a/www-client/chromium/chromium-94.0.4606.81.ebuild b/www-client/chromium/chromium-97.0.4676.0.ebuild
index 0c9e3bc72aed..84b87e1c066a 100644
--- a/www-client/chromium/chromium-94.0.4606.81.ebuild
+++ b/www-client/chromium/chromium-97.0.4676.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 2009-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
 
 CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
@@ -13,14 +13,14 @@ inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
-PATCHSET="3"
+PATCHSET="1"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine"
 REQUIRED_USE="
 	component-build? ( !suid )
@@ -231,8 +231,8 @@ src_prepare() {
 
 	local PATCHES=(
 		"${WORKDIR}/patches"
-		"${FILESDIR}/chromium-93-EnumTable-crash.patch"
 		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
+		"${FILESDIR}/chromium-96-EnumTable-crash.patch"
 		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
 		"${FILESDIR}/chromium-shim_headers.patch"
 	)
@@ -324,6 +324,7 @@ src_prepare() {
 		third_party/devtools-frontend/src/front_end/third_party/wasmparser
 		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
 		third_party/devtools-frontend/src/third_party
+		third_party/distributed_point_functions
 		third_party/dom_distiller_js
 		third_party/eigen3
 		third_party/emoji-segmenter
@@ -378,6 +379,9 @@ src_prepare() {
 		third_party/lss
 		third_party/lzma_sdk
 		third_party/mako
+		third_party/maldoca
+		third_party/maldoca/src/third_party/tensorflow_protos
+		third_party/maldoca/src/third_party/zlibwrapper
 		third_party/markupsafe
 		third_party/mesa
 		third_party/metrics_proto
@@ -438,7 +442,6 @@ src_prepare() {
 		third_party/tflite
 		third_party/tflite/src/third_party/eigen3
 		third_party/tflite/src/third_party/fft2d
-		third_party/tflite-support
 		third_party/ruy
 		third_party/six
 		third_party/ukey2
@@ -579,9 +582,7 @@ src_configure() {
 	# Use system-provided libraries.
 	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
 	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
 	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
 	# TODO: use_system_sqlite (http://crbug.com/22208).
 
 	# libevent: https://bugs.gentoo.org/593458
@@ -627,7 +628,7 @@ src_configure() {
 	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
 	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
 	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false) rtc_pipewire_version=\"0.3\""
+	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
 
 	# TODO: link_pulseaudio=true for GN.
 
@@ -755,6 +756,7 @@ src_configure() {
 	# Enable ozone wayland and/or headless support
 	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
 	myconf_gn+=" ozone_platform_headless=true"
+	myconf_gn+=" ozone_platform_x11=$(usex headless false true)"
 	if use wayland || use headless; then
 		if use headless; then
 			myconf_gn+=" ozone_platform=\"headless\""
@@ -766,6 +768,8 @@ src_configure() {
 			myconf_gn+=" use_xkbcommon=true"
 			myconf_gn+=" ozone_platform=\"wayland\""
 		fi
+	else
+		myconf_gn+=" ozone_platform=\"x11\""
 	fi
 
 	# Enable official builds
@@ -848,12 +852,14 @@ src_install() {
 	doexe out/Release/chromedriver
 	doexe out/Release/chrome_crashpad_handler
 
+	ozone_auto_session () {
+		use wayland && ! use headless && echo true || echo false
+	}
 	local sedargs=( -e
 			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(usex wayland true false):g;
-			s:@@FORCE_OZONE_PLATFORM@@:$(usex headless true false):g"
+			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
 	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r6.sh" > chromium-launcher.sh || die
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
 	doexe chromium-launcher.sh
 
 	# It is important that we name the target "chromium-browser",
diff --git a/www-client/chromium/files/chromium-launcher-r6.sh b/www-client/chromium/files/chromium-launcher-r6.sh
deleted file mode 100644
index 637cfd612aa5..000000000000
--- a/www-client/chromium/files/chromium-launcher-r6.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# Allow the user to override command-line flags, bug #357629.
-# This is based on Debian's chromium-browser package, and is intended
-# to be consistent with Debian.
-for f in /etc/chromium/*; do
-    [[ -f ${f} ]] && source "${f}"
-done
-
-# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
-# default CHROMIUM_FLAGS (from /etc/chromium/default).
-CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
-
-# Let the wrapped binary know that it has been run through the wrapper
-export CHROME_WRAPPER=$(readlink -f "$0")
-
-PROGDIR=${CHROME_WRAPPER%/*}
-
-case ":$PATH:" in
-  *:$PROGDIR:*)
-    # $PATH already contains $PROGDIR
-    ;;
-  *)
-    # Append $PROGDIR to $PATH
-    export PATH="$PATH:$PROGDIR"
-    ;;
-esac
-
-if [[ ${EUID} == 0 && -O ${XDG_CONFIG_HOME:-${HOME}} ]]; then
-	# Running as root with HOME owned by root.
-	# Pass --user-data-dir to work around upstream failsafe.
-	CHROMIUM_FLAGS="--user-data-dir=${XDG_CONFIG_HOME:-${HOME}/.config}/chromium
-		${CHROMIUM_FLAGS}"
-fi
-
-# Select session type and platform
-if @@FORCE_OZONE_PLATFORM@@; then
-	CHROMIUM_FLAGS="--enable-features=UseOzonePlatform ${CHROMIUM_FLAGS}"
-elif @@OZONE_AUTO_SESSION@@ && ! ${DISABLE_OZONE_PLATFORM:-false}; then
-	if [[ ${XDG_SESSION_TYPE} == wayland || -n ${WAYLAND_DISPLAY} && ${XDG_SESSION_TYPE} != x11 ]]; then
-		CHROMIUM_FLAGS="--enable-features=UseOzonePlatform ${CHROMIUM_FLAGS}"
-	fi
-fi
-
-# Set the .desktop file name
-export CHROME_DESKTOP="chromium-browser-chromium.desktop"
-
-exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@"