gentoo auto-resync : 23:11:2024 - 03:02:56

2 files changed, 21 insertions, 12 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 2a7e4af41494..8cc5e71e9f89 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -26,8 +26,8 @@ DIST chromium-132.0.6834.15-gentoo.tar.xz 4767843916 BLAKE2B da0e7d1b1c177986b48
 DIST chromium-132.0.6834.15-testdata-gentoo.tar.xz 82768 BLAKE2B 56e1f6cc3e79ca1173b4715384df58bc26d29a0108a21a65676ab1dab6ab92afb1834bf14e101b2466fa0570264fb6da4a964754676fb6e45be08f0616a4b9e9 SHA512 4f4a673147b018d9171a30aeb39027e5a3d3da2b351c35c5e479b83a53aa45b23acc8fdc30ba66001fd934d3bf50c5162047cfc7f49c8f927825ac01cb1186d0
 DIST chromium-132.0.6834.6-gentoo.tar.xz 4767675388 BLAKE2B 1fc21476f230575a819b9ae88afa5bd6e675cabd093f516c7c039bcb7340ab49e65c689c4109c14404133392487cee18956dc441a7501b1e39a1922825eb185e SHA512 bf1465d333a78323f153e0d96408b97833a914108389bac91b504a0d8a3b2230cad0c258d1d70a4414f28d5a8bb3ee179670e04cda77af64ae2932e7f8b8f40a
 DIST chromium-132.0.6834.6-testdata-gentoo.tar.xz 82832 BLAKE2B e96f4808c78fa670da7e5c96d20379a6903e43ae8daf1b07d289f089177a586c0df9b640755e3038ab217fc9cd75234f12ffbae5afe9e510b09e8fb4792d0585 SHA512 77025a1be7fa82a6dcf4ec8bdbf388baa271dde1dfc52c9416d931e3a065bc85dc09d727a970b6b430bbe811eae51dd008c35091eefca76bd47c821241e082a6
-DIST chromium-133.0.6835.3-gentoo.tar.xz 4770847840 BLAKE2B da8032e5aa3d595bdf8b932b5f4cdea74098269ea3929b9fb7c3d2e6803652841625660bd14860720d7746ff84a1375b85a22e6792c689e54de83e194dbbc012 SHA512 e14b76fc64622ab9fa2d28d394ed3945bc67204c574d1889604bad897e51c32872a57c1b8a5bb8bdf69a653259fc3dda9d469db8a1b029f36156d9a662647a91
-DIST chromium-133.0.6835.3-testdata-gentoo.tar.xz 82792 BLAKE2B d0405053d14f7fe18510b56d3ad458c3ec1464ef9fc4f63b10f20568b4236d298afeac0d53695b062dca1c7611b9aecc2a71eeaf85162b471e532484b11a723b SHA512 ba42a207e4331da79dd5d2542f131e53f6acd7fb0761fc204527db32cddb2e77b64468edcdb1c85f02fa51f52ada5292ad737d49568d84b483fef0943680bb96
+DIST chromium-133.0.6847.2-linux-testdata.tar.xz 71252 BLAKE2B dc8cc420f6d5b3aee42634b6a657b401ca8d2ed7ba395e9d224bb91e8f01cf9e26ece6aa80f334cf1b13f07181ce087266b4ccc53783ccfb44e7231dda984abe SHA512 7f0c79c6189b9987211a50220c3cf365f27339ec5cb51e03c5aaa1af871c6a27a58bc4b7ef1e6b1f2ea52ac857b38c115a3eb143b3d26259d83a32431f388f88
+DIST chromium-133.0.6847.2-linux.tar.xz 2332958156 BLAKE2B 04b5a6da07db2e60d7338b8da087973586a5fbe3792c70fdb6dd6cf3372ffaa88e91839d5bf339845d800ac207bab5dcaff9df15d5826dccc0eb4d3d2a6bd9d1 SHA512 479142dc8493b598bfde080f8f79b731d3bdf7b588ff7405dcf2a7f5677187c3b9e96d3289c2b645b5bf1fc95c34b3aabab539386215c794c405dcc360220617
 DIST chromium-openpower-a85b64f07b.tar.bz2 387899 BLAKE2B b01fda2d64ce73068d1536a10cc0896f07a4b714cdb25698b1df8b3252baa0c21c4209b307cf1cb554854f6d0bfe3cd35e06aaa8d02ac5d409a119335084c324 SHA512 05eee81677e8766808441c939bee68e2e6c58ec91f471d88a40181d2eda78614a0a6d27d92ff8f9dda564d12f3451bace4ff2727594748c5c238a3533038019b
 DIST chromium-patches-129.tar.bz2 5071 BLAKE2B 080e1af8b0560a3c5365674e7c8d592310bbd2e273311b775b8112e410d91ccd48f170adbcf77cff566ad32de196217410663ac7b9e7e65544b6730fb1890aca SHA512 0a5bbc07dc9085b07332d5c6dd74940a9d55c4d0677f5603e75763ba54156f43664839d438f350bc86f3efc85aae452476e7f7040e06e60727847b156d1f0ab9
 DIST chromium-patches-130-2.tar.bz2 10151 BLAKE2B b46515a3e01153d8c4e5c3ee1f6e9f905265bf88b698d46c8ceed0f90d36a057b8bb30a860e8d934bf0b85f9c0a671bef2c9a00349228fa076b7aec37ff62ca0 SHA512 e1ecca666c3998ee285426751be3220a5b67a057f2c92b1f45c7b786efb8d0b0e1d49ba70471fa74155f79f22811d240af636f61007191756c9981b53d3b23de
@@ -45,5 +45,5 @@ EBUILD chromium-131.0.6778.69.ebuild 48185 BLAKE2B aa6e9c7a9cfc9bbafc13fd4804a47
 EBUILD chromium-131.0.6778.85.ebuild 48185 BLAKE2B aa6e9c7a9cfc9bbafc13fd4804a47d6f6f40024847e3a50706da9b2eccb4bcb888eaaa0c9a4419255965671dfe8d10326dbf70bddde9b623c99cd32a9aa3f2e6 SHA512 d5e42d573746de28c89620df8347647a7ecd97468a735eae540cc332a3996787c8ea35e855de4ef91e052ca2c58110a8c58cb856a72dce549d0a72f99331746d
 EBUILD chromium-132.0.6834.15.ebuild 48674 BLAKE2B c9a4b1865b8f583ea91105ede3e6e7fcd391b1d980ef9df02396dab0558e3453324e08717dc40dc50fa6168fa9b7867fc81d6a506a6dbb5fe03fb40b6f4133f0 SHA512 72eddf135225fbbb8bdfe52fb43aeb75ebdfa4f30c8e846e04ccf02ddcbd83d9b4b0aa3b9f01de9bdbbd47b8eda4ef5434778f5d766a81e2861addea01b61c5d
 EBUILD chromium-132.0.6834.6.ebuild 48674 BLAKE2B c9a4b1865b8f583ea91105ede3e6e7fcd391b1d980ef9df02396dab0558e3453324e08717dc40dc50fa6168fa9b7867fc81d6a506a6dbb5fe03fb40b6f4133f0 SHA512 72eddf135225fbbb8bdfe52fb43aeb75ebdfa4f30c8e846e04ccf02ddcbd83d9b4b0aa3b9f01de9bdbbd47b8eda4ef5434778f5d766a81e2861addea01b61c5d
-EBUILD chromium-133.0.6835.3.ebuild 49412 BLAKE2B ec176207e86eb19423b99fa8ad102de0d78d3978ad8d6eb6e28f10bd3c586de9c5ba2ca1db698f4d3a0ba7489c78e526febc41a6f3dd3ea86dfb8976e1cfdce6 SHA512 43d94b18127c7acd3841ba8a8d4d65966d91554bd18bf3c0879a16d70d90dd0d85d08d00640c46b10484e90b14aebbbfcfe948e2ffea7144cff628dd7590be77
+EBUILD chromium-133.0.6847.2.ebuild 49909 BLAKE2B 179c9f7de9eb14b05ca30bb4cbe128d3ed68f333fe110515e7ae56496134f21b2caac0a9de146094b0dea15f0c2ea72b0a55eb2273411c3c127430c5b8fb8edb SHA512 0c7dd3c302eec19bc78f341774d40aaa93badbfff6e9e8270db5345600f7a6af369f9ef7f0eb919072d98fc12ec289f702259892b6210563fa0a808df5b26c88
 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.6847.2.ebuild
index 94f993471120..455597b1a1c8 100644
--- a/www-client/chromium/chromium-133.0.6835.3.ebuild
+++ b/www-client/chromium/chromium-133.0.6847.2.ebuild
@@ -5,8 +5,17 @@ EAPI=8
 
 # PACKAGING NOTES
 
-# This uses a gentoo-created tarball due to Google CI Failures.
-# Use 133(?) as a base for new official tarballs.
+# Since m133 (and backported a bit...) we are using CI-generated tarballs from
+# https://github.com/chromium-linux-tarballs/chromium-tarballs/ (uploaded to S3
+# and made available via https://chromium-tarballs.distfiles.gentoo.org/).
+
+# We do this because upstream tarballs weigh in at about 3.5x the size of our
+# new "Distro tarballs" and include binaries (etc) that are not useful for
+# downstream consumers (like distributions).
+
+# It is probably still possible to download the google Rust and Clang toolchains
+# and use them to build this package, however we removed this when upstream CI
+# broke for m131 and haven't re-added it.
 
 GN_MIN_VER=0.2165
 # chromium-tools/get-chromium-toolchain-strings.py
@@ -31,10 +40,10 @@ DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://www.chromium.org/"
 PPC64_HASH="a85b64f07b489b8c6fdb13ecf79c16c56c560fc6"
 PATCH_V="${PV%%\.*}-1"
-SRC_URI="https://chromium-tarballs.distfiles.gentoo.org/${P}.tar.xz -> ${P}-gentoo.tar.xz
+SRC_URI="https://chromium-tarballs.distfiles.gentoo.org/${P}-linux.tar.xz
 		https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
 	test? (
-		https://chromium-tarballs.distfiles.gentoo.org/${P}-testdata.tar.xz -> ${P}-testdata-gentoo.tar.xz
+		https://chromium-tarballs.distfiles.gentoo.org/${P}-linux-testdata.tar.xz
 		https://chromium-fonts.storage.googleapis.com/${TEST_FONT} -> chromium-testfonts-${TEST_FONT:0:10}.tar.gz
 	)
 	ppc64? (
@@ -52,7 +61,7 @@ fi
 
 IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
 IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
-IUSE+=" qt5 qt6 +screencast selinux test +vaapi +wayland +widevine"
+IUSE+=" qt5 qt6 +screencast selinux test +vaapi +wayland +widevine cpu_flags_ppc_vsx3"
 RESTRICT="
 	!bindist? ( bindist )
 	!test? ( test )
@@ -339,7 +348,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${P}-gentoo.tar.xz
+	unpack ${P}-linux.tar.xz
 	unpack chromium-patches-${PATCH_V}.tar.bz2
 
 	use pgo && unpack chromium-profiler-0.2.tar
@@ -348,7 +357,7 @@ src_unpack() {
 		# A new testdata tarball is available for each release; but testfonts tend to remain stable
 		# for the duration of a release.
 		# This unpacks directly into/over ${WORKDIR}/${P} so we can just use `unpack`.
-		unpack ${P}-testdata-gentoo.tar.xz
+		unpack ${P}-linux-testdata.tar.xz
 		# This just contains a bunch of font files that need to be unpacked (or moved) to the correct location.
 		local testfonts_dir="${WORKDIR}/${P}/third_party/test_fonts"
 		local testfonts_tar="${DISTDIR}/chromium-testfonts-${TEST_FONT:0:10}.tar.gz"
@@ -407,8 +416,8 @@ src_prepare() {
 		for patch in "${openpower_patches[@]}"; do
 			PATCHES+=( "${patchset_dir}/${patch}" )
 		done
-		if [[ $(getconf PAGESIZE) != 65536 ]]; then
-				PATCHES+=( "${patchset_dir}/${page_size_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