gentoo auto-resync : 18:11:2024 - 03:03:03

5 files changed, 35 insertions, 15 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 703fa7ce4ab2..8da289189fa8 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 236c73091645..3ee779cff3bb 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -29,7 +29,7 @@ DIST chromium-patches-129.tar.bz2 5071 BLAKE2B 080e1af8b0560a3c5365674e7c8d59231
 DIST chromium-patches-130-2.tar.bz2 10151 BLAKE2B b46515a3e01153d8c4e5c3ee1f6e9f905265bf88b698d46c8ceed0f90d36a057b8bb30a860e8d934bf0b85f9c0a671bef2c9a00349228fa076b7aec37ff62ca0 SHA512 e1ecca666c3998ee285426751be3220a5b67a057f2c92b1f45c7b786efb8d0b0e1d49ba70471fa74155f79f22811d240af636f61007191756c9981b53d3b23de
 DIST chromium-patches-131-1.tar.bz2 4932 BLAKE2B 72006a6d751ae1207352547cdeef87f8cc9f9639283238da201d879c6fcd0f8bc499669cb030d8b4c2216fcd2730de46b0a071007b3d69a2bbdd22ba38bcd279 SHA512 11d7f861c007e9e28e5192fb354940180aea0e01e6e8ae77547e2dffd7b541b11f1acfe0fd0c8b6b4cbfc6c39ddfa79c8c08db42c1292ad329d49027d1406fc3
 DIST chromium-patches-132.tar.bz2 5040 BLAKE2B d5bd84dd90b395c6a15135637f51f931c72a2f301b1c24e9b938c744f2767fa36857b8edfdf5c44cf085a1efcb40475401fec226ce43446442f32fb174b55355 SHA512 29833b306a34ab6562ee58eb03669818da7235cd36666b27d829bcbd3c4d0035a530fb6be1c33cf88c1c11d43e68e3781f9b9602c0c004e7a37ffa69f9ee17c7
-DIST chromium-patches-133.tar.bz2 5043 BLAKE2B 93f2ff92adab21afcb229005c77b47083754adce5c8a0a1c73f711b77b8139e4e149562675f44dce7abc5df7f0c808c6a53fad437e0395f36385a16406ee7e53 SHA512 e52a374e6c8f89c2c9f4e30bb76e83af1e47e0e2c4f0c1f8d80bb4d4fe6b0e8906f3debbb8f41b4c4bb13aee262b7c12dc92836a318b161e35d5c60bb43c13cc
+DIST chromium-patches-133-1.tar.bz2 10661 BLAKE2B c8a141bd10e628533e373b08969f95443eb6ae7f4497359db02f370147ac6132fbc31db28915ebdd9f150c13be78f06af938bd7dffdf2c23d90e1b9e07bd92ab SHA512 48a356872acc41c96c92366bd09de5a1c4af87fe4c480dccc7bd7a2aae5c3be8e6411151ed36303a127022001248bd25ef8305e83bd0d533660e3f11943af686
 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-testfonts-f26f29c9d3.tar.gz 32750602 BLAKE2B 498f8b2e0811c98dc3d4aaa75559e69c782afb4bd12328cfdb7244ddba5cae7ee47becd27b2549d7b36bed417601f70f4c192934b0f08496cef1547d0502d93c SHA512 96b090446862997c8134e2971f0e38793ecc1208d547e554c9b651ccfb4127c4de86754903fea57a7292a2823c45117bae0ec13ed87aed20c248fb779579fbde
@@ -39,5 +39,5 @@ EBUILD chromium-130.0.6723.116-r1.ebuild 47364 BLAKE2B 5cb6c97251f2b4924353501cd
 EBUILD chromium-131.0.6778.33.ebuild 48182 BLAKE2B 5998826d65927ed29a34327f79aa64aaca3d7a16ceda8fd1a0dfe8fa0718cb967cb5f700ace73e602d1099868baaa9d0412e30e376d225ec8b0a1efb58a37372 SHA512 768dfde65abb76efb195041da9e260de0a4ba7c4d1a56383175351ee6dd29657579997cd30128c87dc33649d9102f5ee93fa1c891fa6fbe4ae6aaddd2b27c86b
 EBUILD chromium-131.0.6778.69.ebuild 48185 BLAKE2B aa6e9c7a9cfc9bbafc13fd4804a47d6f6f40024847e3a50706da9b2eccb4bcb888eaaa0c9a4419255965671dfe8d10326dbf70bddde9b623c99cd32a9aa3f2e6 SHA512 d5e42d573746de28c89620df8347647a7ecd97468a735eae540cc332a3996787c8ea35e855de4ef91e052ca2c58110a8c58cb856a72dce549d0a72f99331746d
 EBUILD chromium-132.0.6834.6.ebuild 48674 BLAKE2B c9a4b1865b8f583ea91105ede3e6e7fcd391b1d980ef9df02396dab0558e3453324e08717dc40dc50fa6168fa9b7867fc81d6a506a6dbb5fe03fb40b6f4133f0 SHA512 72eddf135225fbbb8bdfe52fb43aeb75ebdfa4f30c8e846e04ccf02ddcbd83d9b4b0aa3b9f01de9bdbbd47b8eda4ef5434778f5d766a81e2861addea01b61c5d
-EBUILD chromium-133.0.6835.3.ebuild 48673 BLAKE2B a651d8afd5bf00a68e9c6250bacb7d1379f255e40d5dbefe1872c47d94898d0cdb0694f16a46b010844b1b88dc24af213ed70efd57b0bb340460cdf0dc29d319 SHA512 40922e5c7e6c0ec65e33b803b4a72b312233b95f5747acb842a927ac81f9943d5cd4e9b53fdd60f33343f8fc85d30c3c396bd0c8905b93bbbfb33f40b8277aee
+EBUILD chromium-133.0.6835.3.ebuild 49412 BLAKE2B ec176207e86eb19423b99fa8ad102de0d78d3978ad8d6eb6e28f10bd3c586de9c5ba2ca1db698f4d3a0ba7489c78e526febc41a6f3dd3ea86dfb8976e1cfdce6 SHA512 43d94b18127c7acd3841ba8a8d4d65966d91554bd18bf3c0879a16d70d90dd0d85d08d00640c46b10484e90b14aebbbfcfe948e2ffea7144cff628dd7590be77
 MISC metadata.xml 2083 BLAKE2B e556591b48916e2b26d66b8b3a3f67d8f7c17d7cf2d03bfca4c91e0181604d853b16139583a8364646f5c2db55a2e3281a5b6ee623535452dbc8b0755fac89dc SHA512 b64e3140c1237d45aea47748a259b51685e7aa54c2ba259f6feb60df5a98ec434bd0ecde2e5dc2115d6c6409621ec3111e8b6b2a0fc8be2d9634dc465260dbe2
diff --git a/www-client/chromium/chromium-133.0.6835.3.ebuild b/www-client/chromium/chromium-133.0.6835.3.ebuild
index 0ecedf89abe2..94f993471120 100644
--- a/www-client/chromium/chromium-133.0.6835.3.ebuild
+++ b/www-client/chromium/chromium-133.0.6835.3.ebuild
@@ -30,7 +30,7 @@ inherit python-any-r1 qmake-utils readme.gentoo-r1 rust systemd toolchain-funcs
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://www.chromium.org/"
 PPC64_HASH="a85b64f07b489b8c6fdb13ecf79c16c56c560fc6"
-PATCH_V="${PV%%\.*}"
+PATCH_V="${PV%%\.*}-1"
 SRC_URI="https://chromium-tarballs.distfiles.gentoo.org/${P}.tar.xz -> ${P}-gentoo.tar.xz
 		https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
 	test? (
@@ -356,8 +356,7 @@ src_unpack() {
 	fi
 
 	if use ppc64; then
-		unpack chromium_${PATCHSET_PPC64}.debian.tar.xz
-		unpack chromium-ppc64le-gentoo-patches-1.tar.xz
+		unpack chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
 	fi
 }
 
@@ -379,22 +378,42 @@ src_prepare() {
 		"${FILESDIR}/chromium-132-bindgen-custom-toolchain.patch"
 	)
 
-	PATCHES+=( "${WORKDIR}/chromium-patches-${PATCH_V}" )
+	shopt -s globstar nullglob
+	# 130: moved the PPC64 patches into the chromium-patches repo
+	local patch
+	for patch in "${WORKDIR}/chromium-patches-${PATCH_V}"/**/*.patch; do
+		elog "Applying patch: ${patch}"
+		if [[ ${patch} == *"ppc64le"* ]]; then
+			use ppc64 && PATCHES+=( "${patch}" )
+		else
+			PATCHES+=( "${patch}" )
+		fi
+	done
+
+	shopt -u globstar nullglob
+
 	# We can't use the bundled compiler builtins with the system toolchain
 	# `grep` is a development convenience to ensure we fail early when google changes something.
 	local builtins_match="if (is_clang && !is_nacl && !is_cronet_build) {"
 	grep -q "${builtins_match}" build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
 	sed -i -e "/${builtins_match}/,+2d" build/config/compiler/BUILD.gn
 
-	if use ppc64 ; then
-		local p
-		for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series | grep "^ppc64le" || die); do
-			if [[ ! $p =~ "fix-breakpad-compile.patch" ]]; then
-				eapply "${WORKDIR}/debian/patches/${p}"
-			fi
+	if use ppc64; then
+		local patchset_dir="${WORKDIR}/openpower-patches-${PPC64_HASH}/patches"
+		# patch causes build errors on 4K page systems (https://bugs.gentoo.org/show_bug.cgi?id=940304)
+		local page_size_patch="ppc64le/third_party/use-sysconf-page-size-on-ppc64.patch"
+		# Apply the OpenPOWER patches (check for page size)
+		openpower_patches=( $(grep -E "^ppc64le|^upstream" "${patchset_dir}/series" | grep -v "${page_size_patch}" || die) )
+		for patch in "${openpower_patches[@]}"; do
+			PATCHES+=( "${patchset_dir}/${patch}" )
 		done
-		PATCHES+=( "${WORKDIR}/ppc64le" )
-		PATCHES+=( "${WORKDIR}/debian/patches/fixes/rust-clanglib.patch" )
+		if [[ $(getconf PAGESIZE) != 65536 ]]; then
+				PATCHES+=( "${patchset_dir}/${page_size_patch}" )
+		fi
+		# We use vsx3 as a proxy for 'want isa3.0' (POWER9)
+		if use cpu_flags_ppc_vsx3 ; then
+			PATCHES+=( "${patchset_dir}/ppc64le/core/baseline-isa-3-0.patch" )
+		fi
 	fi
 
 	# This is a nightly option that does not exist any current release
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index d8eb2bde1b90..45a6b654162c 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -420,5 +420,5 @@ DIST wasi-sdk-24.0-x86_64-linux.tar.gz 118879731 BLAKE2B 385dced143f463427e48839
 EBUILD firefox-115.16.1-r1.ebuild 39187 BLAKE2B 2e708bb20394605304630e3b9e12b4dbfcaf9f300d6b60a182e943f4c7f19fb5a1996cd6c4a6216965b5c04309613b0e9cfc82053642cbdb0c9c25a034aed4c2 SHA512 184aa94944271de9c19a5ed6fa6a9af60ba25c14aabff66bcac9c1025ebd161d1ca060b2c05feabefba1c79e403f26c3817f9372031673f5c266234b922557cb
 EBUILD firefox-128.4.0-r1.ebuild 41094 BLAKE2B a15a88d0feb4c41f53751c30074811e6a9c2a3973d1ac799af1be8348663adc14b384e94ac8aa36ba5a08f19e832932296a8ada6f0acb425ec7e3452febf277b SHA512 80c52bfbd72ac30497c0d2a97191e1dab4ba3e9c4354be0659286c49cbfb35fcf2b144af163c528f68e5d32111b5d630efc377a09ca90efb516f62e9065e36fa
 EBUILD firefox-132.0.1-r1.ebuild 39383 BLAKE2B 2f52e771910992bdbe38ede5448affe7674d20794b05c3fc8002e2b8f3a522d99eb26a977e744067b95232a1b5303e2ee8daa879c74d6631fd6ad2397cf3b2dd SHA512 3124afe75ea942246679488164c66c6eba4517a78cbc32774a48ffe75692a60dfd1cb801f9739d3d1197bbd77f6b089a0fb630b2575ace8e466a82274f55410f
-EBUILD firefox-132.0.2.ebuild 40495 BLAKE2B 2deda0a2356d0c7ece91eefbdb7029ffb3f28f4fb8d506daff1c5c476c9aaf222cf9c697defbd13aab59310314b6b840e7f93772234bacc5d21205fdd078dae8 SHA512 9c8c45a97e7222ef01a407b1f8939561a36ef82919a2d39debc134f91f8bb475ed5383ad640ead7939678c65943961443d9af3b29df7bd658e6484502b794da8
+EBUILD firefox-132.0.2.ebuild 40534 BLAKE2B fa7cae39629d505bcfb0aa589d5c4238808185574211f6bc555aea31bb4c2a3683ca696b053a117c41699d67075f61fae8c9283a70b319b2fce02528461a931c SHA512 c1bc58356ae2639051c0c1102634644a502310bdee066fa2428cf2c3cd0f33d95a4266f5033d54222f529d9992370c496f3f3eacff2503eb5c63c069f85d787f
 MISC metadata.xml 2785 BLAKE2B f598ed0bb1c1b4473a59f171898fb5e4d1872b175705662e8801d936b32ba609c1e2e657d235329b0fce7642ac8eb97612876244a029a5ac5b0a6cd17db153ec SHA512 a47f3e4336381bb388906ca826b09210dd20bf7a19e4395d6cedc1675b30b89b40820fe22a424abcc8e725c412f5bdc18067450198935c2edbd8c276e050d27f
diff --git a/www-client/firefox/firefox-132.0.2.ebuild b/www-client/firefox/firefox-132.0.2.ebuild
index d20c7fd48226..a4cb786aea1e 100644
--- a/www-client/firefox/firefox-132.0.2.ebuild
+++ b/www-client/firefox/firefox-132.0.2.ebuild
@@ -102,6 +102,7 @@ BDEPEND="${PYTHON_DEPS}
 			sys-devel/lld:${LLVM_SLOT}
 			pgo? ( sys-libs/compiler-rt-sanitizers:${LLVM_SLOT}[profile] )
 		)
+		wasm? ( sys-devel/lld:${LLVM_SLOT} )
 	')
 	app-alternatives/awk
 	app-arch/unzip