gentoo auto-resync : 22:12:2023 - 07:49:59

2 files changed, 23 insertions, 12 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index f8d660c4273a..4502c16283e0 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -7,16 +7,16 @@ AUX chromium-cross-compile.patch 323 BLAKE2B 8d5091ce5287422c9688ede2563360a96b8
 AUX chromium-launcher-r7.sh 1631 BLAKE2B ae28d758264446511fd2b64ba69fe920144b351e8833e0e98f43d00633e850094c288b5d97d1a84801ea13aceb294623692c86c1b9be5811b7b97fa8a07a1ecd SHA512 1e97f8394bd8bb4b29570b1b85176efe6258314a596f079bee1c4018113e0023aa54a93690ba8de2a00d127af10dbe2cc3fb3127b72b841c6f28f9e7bed820e0
 AUX chromium-use-oauth2-client-switches-as-default.patch 1085 BLAKE2B baf3c463305934c126af4f7c5be305863edc7eec3add5b5ada30565b49b5944021eb40f1a9643e7eec3f973c502d9b02426f00b760570fcea5f1509219e41c6f SHA512 fe2878ee45778bac894ea17a668511d27ad2ca40988d5f11439790b700bfefd6560f3931415b4e6c543fcbbfc7cfef55cc757ed4ace1d111039ae78c46b81945
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
-DIST chromium-119.0.6045.199.tar.xz 3324886804 BLAKE2B 49ca40a8c7d3ebe685f3784de48df2f04caa424615af41b3f7ec3eee446a0b8ae5c1e3b54f983017a1d7a923e4d86a80425e404898e051eda75c93988c2a6ef9 SHA512 4f7607e1c2d1f1aa3095a56ed18aff118db1ecfdbb2fd18ad097877f2fe58415bd2f6f528a1039d63297f676c4ff53287632181fa882a44012304d3abee0937d
 DIST chromium-120.0.6099.109.tar.xz 3284819132 BLAKE2B b339d8879909f8f06320dd99b45c57e2ad1f74f7260a4bdc6385359cb2a82e6685dcbff2d21a9c829bc1ba5c7f51576f2276ec4a353b14e1053bda432af6f6fd SHA512 874e05294535b588a450110f52a69e973f9a3b2e0980330f4dcd94c10a3f637d877dd89f4d453b018afd86d3b59162c5671d784be802c18dbcf78bec63b9f344
+DIST chromium-120.0.6099.129.tar.xz 3283749920 BLAKE2B 889b91eec84fc12d42d0bfe04f41c779b84aab704b47f05a276fa9725696740fc0308764602e87161b1ad73a5bb260cc75e88a8133791dd1b074780363670e51 SHA512 2b12d2af7b469d2896000c785f0252eb260bffb523d8e1b82f1d8ab4098de8e297dd6fe901de58a1f57672c9699523d88342637fc69b5260fe5cf296183e3edf
 DIST chromium-120.0.6099.71.tar.xz 3283091280 BLAKE2B 1e5096b8d03f1ee65b5c1ea98cdc2230bb3f789bcf87750891d47c5c79e79997602997b72c3c5f4f8f10a5f7bb754ccf1065e789ff5949c2ce084b1759e7280b SHA512 a46a7e92615e35433959db5e3dbd7f829fc8ddda61cb88f46d99091de0c8ab65c847c8cdc881e34abdabaf1b638416e5a70eaee9c7e3a489e53ee55d09b8a790
-DIST chromium-patches-119-3.tar.bz2 8345 BLAKE2B 70b10a231a71ce8ffc5e4f52450113c46f921a9f08eb95d4adbea0738cfab33fba763c54997a7ef6f36e35df850409062a330eeb8535679b800672de5697ca21 SHA512 a1897ea92a9a686bdf93c4ec379ed1c4c5febe1bdaba908ddb2ec0169d8e08b076d2a6ea1e88dd2d0a22dc4972dbfcbab2d3166e95e55ed9c566235e301a6050
 DIST chromium-patches-120.tar.bz2 8630 BLAKE2B aa815521d027036757e5316478c2974e107185662d4c6a200bc7f448558730a3cb11e0a6e28d6a48ff60379813eed10d91c04917002228cf97c8448423cc0994 SHA512 1af05a17c54ea2f23b6f18b40c21304a94076eda4f9dcdf34ff93e1a729ae5a6b69816d32b5855b1cbb412eefaefb3d343fce05afd99347dcf9302a1d47ad3e6
 DIST chromium-ppc64le-gentoo-patches-1.tar.xz 5636 BLAKE2B 1d898939df023c59285b27bee552470483ea06375d1ee8d6947b89c5927c23cc7bfec6b49f3b376ece931d11a56f8e2a45791e0f92ad61974fc8c34c1082d89c SHA512 8a71cb007e47cda8e5fe5d185729389e65c48bd322c8ee8b3986bee8571427b959628f2666bda646a3f89ae64197c0957d3626845ff03461dbd5dee4c964d07c
 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
 DIST chromium_119.0.6045.159-1raptor0~deb12u1.debian.tar.xz 522464 BLAKE2B 687636b3c8f9b89db64b16643f6832cd2711f54f4be309d7e8dbaf0b8647bb3400ac095fa497f8a887bde628b521724f21f97a1273ab719f16d9f4114c36a6f0 SHA512 a4724ec5df4f3cfac7ede1514d8e886de20580bb812fed3a3e240e4ad91522b047a7bb065ab9e4402cffb9e8608c5cdc71d10c8b132f27d294ebb44db12294e4
+DIST chromium_120.0.6099.109-1raptor0~deb12u1.debian.tar.xz 534108 BLAKE2B ebfe063c5a141e3cd0f861c753c366297f868a5b475a6d4cfe136baec9b979f909e24f9d6eceeb215b9084a9c087c5fb5eb49e8d26921028b943c119a440356a SHA512 62d4d492f579d1bffeaec9778f275df5ee615f434c1ea5764f7feecec6004bc9862c114caf6b86737a433d97e822f14df5a5871b9cbc7bc891bf48d706d5bccf
 DIST chromium_120.0.6099.71-1raptor0~deb12u1.debian.tar.xz 534000 BLAKE2B e366c798018d7ca1eceb0d2ee01894a0da355c0ae9754b82b35cf552feeeef7c4746208701cd73f72061660543cc9fc0ee305c8d9ad8aa2591354c026aca5965 SHA512 f0c95f9b504c71904c3a27f3bbae47b6aacaf1c21986008c3a474fdf4110144c052dc5520718a3f77536a008719698d79068ae95b703c9350fc853b96b5fc6bf
-EBUILD chromium-119.0.6045.199.ebuild 39027 BLAKE2B c61a680da89358588d81b74ec11ec9b75f72dd6b2ce273650e7f425958dfd834f9653ab515ee7a29830e70757ea727632cfc31f0ccff9968eb34e9ca73891b6a SHA512 37d0a35b7dd37cf6f95a414cc27aa59880fcbce2df23e5415b3d31b13c21c1a6eee55291efa25780c865892f80a006c0492d3b2b35d620abce9c3c90e13351d0
 EBUILD chromium-120.0.6099.109.ebuild 39594 BLAKE2B a9ec496b8d24a3a3572d46ae4233c9ec1fbc25b356edca444ee2df4538d7fdeb65f211bc7ea058a520e584fa9a993d9fcee5342d49e0f03fa9de177d2c538621 SHA512 d8937cd1c2dbbc0bee9561c56fa450b57bc037a27a60b4e29ec372ace54ba735e1b1b15f02811d1508205a24ff569f10743a9159f7e7059f4ece72d282b00c65
+EBUILD chromium-120.0.6099.129.ebuild 39597 BLAKE2B 4c84b2d657d1d365416d768582314eb5bfe7ce4d9ca116d709034af14ac9785081e0edada5e0cb99afbef6cd41a9a31ae643f830a0101c745bbe438eacaa2677 SHA512 ad0e025a896032fcba21a63b22e8fcae06509afa12869576c8c0579390fddeb79a132192e7cd2297c71a454f7817af0c4f5b502b856bd575b3fd9c876f5272ae
 EBUILD chromium-120.0.6099.71.ebuild 39590 BLAKE2B 3f1c0564d3fc65a81ebbd5fd8d6621c4f94c7129caa66f8fdb2547f492500f18606007d898add1ff290b5e0460a8853acdb8c0a490b276589d82ebe71936285a SHA512 714e288793c83f8cc9bcbc8d469032035850df9b3bd572564c1f310aa4f50ebaa0871661baccca5ad8b237d2afe2dfb0f254b91f693f3cf5f83f60d7556470f2
 MISC metadata.xml 1992 BLAKE2B ef74dcdbcaf0dd2bdc190775f9ca899f4b519f4195a52e10e295c0159c3ca785428bc85768e6ebf98ffcde63bb58af445b00408533277b959dbd74537a1e340b SHA512 d0a2151e8fb7af824ad9e1b7f81dd776cb345fe0e97b919a654e9091bf98345bfb3e235c4e257bcf53fa3d3a4ee2dc20fc4e5f21116bfdee45baf66271372c44
diff --git a/www-client/chromium/chromium-119.0.6045.199.ebuild b/www-client/chromium/chromium-120.0.6099.129.ebuild
index 88446bf0b185..c20d33368493 100644
--- a/www-client/chromium/chromium-119.0.6045.199.ebuild
+++ b/www-client/chromium/chromium-120.0.6099.129.ebuild
@@ -16,6 +16,14 @@ LLVM_MIN_SLOT=16
 MIN_GCC_VER=12
 GN_MIN_VER=0.2122
 
+# This variable is set to yes when building with GCC is broken.
+# https://bugs.chromium.org/p/v8/issues/detail?id=14449 - V8 used in 120 can't build with GCC
+: ${CHROMIUM_FORCE_CLANG=yes}
+# This variable is set to yes when we need to force libcxx. Since we'll always force clang, too, we can avoid depends.
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101227 - Chromium 120:
+#    webrtc -  no matching member function for call to 'emplace'
+: ${CHROMIUM_FORCE_LIBCXX=yes}
+
 VIRTUALX_REQUIRED="pgo"
 
 CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
@@ -27,8 +35,8 @@ inherit python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://www.chromium.org/"
-PATCHSET_PPC64="119.0.6045.159-1raptor0~deb12u1"
-PATCH_V="${PV%%\.*}-3"
+PATCHSET_PPC64="120.0.6099.109-1raptor0~deb12u1"
+PATCH_V="${PV%%\.*}"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
 	ppc64? (
@@ -39,7 +47,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0/stable"
-KEYWORDS="amd64 arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
 IUSE="+X ${IUSE_SYSTEM_LIBS} cups debug gtk4 +hangouts headless kerberos libcxx lto +official pax-kernel pgo +proprietary-codecs pulseaudio qt5 qt6 screencast selinux vaapi wayland widevine"
 REQUIRED_USE="
@@ -198,9 +206,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-# These are intended for ebuild maintainer use to force clang if GCC is broken.
-: ${CHROMIUM_FORCE_CLANG=no}
-
 if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
 	BDEPEND+=" >=sys-devel/clang-${LLVM_MIN_SLOT}"
 fi
@@ -334,7 +339,7 @@ src_prepare() {
 
 	# disable global media controls, crashes with libstdc++
 	sed -i -e \
-		"/\"GlobalMediaControlsCastStartStop\",/{n;s/ENABLED/DISABLED/;}" \
+		"/\"GlobalMediaControlsCastStartStop\"/,+4{s/ENABLED/DISABLED/;}" \
 		"chrome/browser/media/router/media_router_feature.cc" || die
 
 	local PATCHES=(
@@ -440,6 +445,7 @@ src_prepare() {
 		third_party/devtools-frontend/src/front_end/third_party/axe-core
 		third_party/devtools-frontend/src/front_end/third_party/chromium
 		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/csp_evaluator
 		third_party/devtools-frontend/src/front_end/third_party/diff
 		third_party/devtools-frontend/src/front_end/third_party/i18n
 		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
@@ -635,7 +641,7 @@ src_prepare() {
 		keeplibs+=( third_party/zstd )
 	fi
 
-	if use libcxx; then
+	if use libcxx || [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
 		keeplibs+=( third_party/libc++ )
 	fi
 
@@ -818,7 +824,12 @@ chromium_configure() {
 	# Do not use bundled clang.
 	# Trying to use gold results in linker crash.
 	myconf_gn+=" use_gold=false use_sysroot=false"
-	myconf_gn+=" use_custom_libcxx=$(usex libcxx true false)"
+
+	if use libcxx || [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		myconf_gn+=" use_custom_libcxx=true"
+	else
+		myconf_gn+=" use_custom_libcxx=false"
+	fi
 
 	# Disable pseudolocales, only used for testing
 	myconf_gn+=" enable_pseudolocales=false"