gentoo auto-resync : 12:03:2025 - 01:49:51next

author: V3n3RiX <venerix@koprulu.sector> 2025-03-12 01:49:51 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2025-03-12 01:49:51 +0000
commit: ef0fedb39c21a343a3f316726f272bad9005b22c (patch)
tree: 0d64e58453e117f61a9e1641532926278f51b72e /www-client
parent: cf7807d7aea23a99a144afceaba961cfed652b5f (diff)
20 files changed, 1691 insertions, 19 deletions
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 2916a3d17d27..84ca4937f071 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 6443de26f177..3c7686cf46fd 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -20,6 +20,8 @@ DIST chromium-133.0.6943.141-linux-testdata.tar.xz 650974680 BLAKE2B 00028e5b942
 DIST chromium-133.0.6943.141-linux.tar.xz 1454239916 BLAKE2B 28379a87137d8162d1981d3a318da5cad1bfd2dd6461a29a049f20babf3a64fe7518057f7af5f33424d0ae4a655fb4b892ba6a82f0a39440e3487570767ae50d SHA512 04ca888078ab3ce4775d0dff9c9d46b342be5bda2fe41493dcf8695fa9b52ed749455275cfc4bba234a10fbe6df0eeac3d8bb2f8d73ca1250a142c58944ff6d9
 DIST chromium-134.0.6998.35-linux-testdata.tar.xz 653357556 BLAKE2B 0e34c31210e1bfc6aa2cc6d79d9cf1e9fcdb9d1693be867438cfc639a8461203d96cdf159624d81020611eb9dc3a51958af4d7ab8d30c46f2b98a9eb2a1a303b SHA512 ab36342b045ff796f4b200d25e2a259b2a65e93d6bc32dc30f001e0c5709047bc937023abcfbe748f9a567d0df18bc188c7bbfd24d142d9f6e63c26b350647f6
 DIST chromium-134.0.6998.35-linux.tar.xz 1463053644 BLAKE2B 28af05a5b650495174b2240a42b5f0073a30da7094170b80a8ea1d000b306d408e0b58772e8928b6dd110f815430a6725fddf7e1e7ee8073c6b343bee189e556 SHA512 f9da9256ef4518e53c139c6c074b6b4fe10f028e37ebee488a95ed84d6ed47acf802a9316eb215d9f2b3ebb8f1bc70ef837334256272e9f13fc3674ec36f1336
+DIST chromium-134.0.6998.88-linux-testdata.tar.xz 653390260 BLAKE2B ca33304974d328fa02c986147ef61d154d3441868efb0110abec50e60c8c76b22866cc44fea522ca2d564de28322176da41f5e162842dc244865c24b275e5c87 SHA512 abcedfa405fcbdb9e432dc628982f39d61476c3b879cda8502546d37d5452ba94f25a05826ff1fee1f2514efc292b7ae40036cea4402d7ab7d0b023dd30fc870
+DIST chromium-134.0.6998.88-linux.tar.xz 1464062572 BLAKE2B 823d74ad0b93ce8f21c1d71099863324d9b6d8bbdc476568bd42f204935882ec7e83c42532f1b7a06654e8e4b62c7c4b6550b3ab12cf98c246576bf8ea5abc63 SHA512 298e5d87e0ac8bf9fb861c73e4cfd7f2dec7d3007a1d5c14afeba2770f1e219b602a2490013f21c5015f56e9cf5e8e8901fe3cc503059e235b4cb06b329885dd
 DIST chromium-135.0.7049.3-linux-testdata.tar.xz 645835868 BLAKE2B 67312979594545668b1af259ef9905210a96d0573c34eb15d548796560f8bad4c95a4333508cebc996f0e43010c37fdc269c429a581532dcfdbac7ae0a336608 SHA512 6988e5afd79eed4a21fe914930acef6a74a10ab036f1d5c5246de1c848dc494c8a429641dd7dc4b2fd8a1944b628edb2cf75cf537c2fa8edc4ed1be46b63c594
 DIST chromium-135.0.7049.3-linux.tar.xz 1438705408 BLAKE2B ca82fc324c04053f669e2397444034e5959bd12e785abc60cfdbc41633282124f0357dab702b9a80c33903a51121065299efd58fcfe7b8a6bab48b3bbebaebdf SHA512 115931ceebbf42e0200108fb128f69cb65cc16bb4d46878190275937590080d10fb73931827054b07e21a459cd78fbb9fd21b3c17f8436ab7d4ca34cb67bef21
 DIST chromium-136.0.7052.2-linux-testdata.tar.xz 645824272 BLAKE2B 348b77b2cb014a75149916fb9a95a5f328112782f3f0655e971a7187826928d4bf4828e8a06072ced5174daf8f85ee31a7e41f5835d51215ab02fd97a31a3a00 SHA512 10131e405c19adcc3d710c2e1b1e86acf41f1d7eb61cec8dcec57f3ddb6371bbddf942f10628010ac31d55701f8ac609ba82ff543369c6040313825b87e420b8
@@ -37,6 +39,7 @@ DIST chromium-testfonts-f26f29c9d3.tar.gz 32750602 BLAKE2B 498f8b2e0811c98dc3d4a
 EBUILD chromium-133.0.6943.126.ebuild 49290 BLAKE2B 6dfe1bdba4736032cce2d183ffe1193ef9de8cf3246608b74d0e003f9aa34243748e5b3a3ef283af7aed2241b93623375fc3741ad3109637fceda0363a72dce8 SHA512 2185d8d910a294cb5a1f6cdadb1eafb6ec35ff1b648f3431bf34966100fd6df72782162d263c0d6b20b73098ed95b0afc19390db1a3eddb1b3e18b9deda443d3
 EBUILD chromium-133.0.6943.141.ebuild 49648 BLAKE2B c7bcccd4c8f71dcb8c34ba7ea00081ab3d7b304eea03db9fda5cb0fd6bb4df538f42c4d8fc71659a3c519b30ac764dd1383baca6ea41e556625d1eb9751f5a16 SHA512 6e7fc054060753d6aa1fd4ab01e946af73edee86f53368e923753eea862bea9a43f92a617fa3519c819ad7e74a1fb85e2aa8c30e7abbb258ac6021d427ca3497
 EBUILD chromium-134.0.6998.35.ebuild 54441 BLAKE2B b26231892ab28c51bf37523e60863947225dba2a95320df31ee121cf96cd845f83675ebaa178308aa2d89ce4569e9cb775849cfef09e590727e8165f67ab1003 SHA512 3a983b3e6f40a420827d61aecc3641b4043794e05414212af463eea45675180d951d244c6d2ec49b7a6ef4352077010d943c77f1115b2085a60a396720652b9a
+EBUILD chromium-134.0.6998.88.ebuild 54441 BLAKE2B b26231892ab28c51bf37523e60863947225dba2a95320df31ee121cf96cd845f83675ebaa178308aa2d89ce4569e9cb775849cfef09e590727e8165f67ab1003 SHA512 3a983b3e6f40a420827d61aecc3641b4043794e05414212af463eea45675180d951d244c6d2ec49b7a6ef4352077010d943c77f1115b2085a60a396720652b9a
 EBUILD chromium-135.0.7049.3.ebuild 54404 BLAKE2B dce7a3f93963d2b1a69285182dc2e1aa651a161c3867a1d241940cd1659a02d0d7db35ac9d1a94ad013f5eeba2306f530c58a03e2084e12ccc050fbd76c074a9 SHA512 e38829cb97f8ee673287d4347431179145124b5e1f78b6abc695621f7b811882efea27648bc7a76fc1c9e4b961c0b970570c8b612159c6e7c760fa5ad19145ce
 EBUILD chromium-136.0.7052.2.ebuild 54403 BLAKE2B a014f24db5d67d8237bd2d37d4958f67e18657a2185e4a2aab8e131617efee34941924dede7a1c54fad413d387ebf3c04b9dc93a87d608a49efcd117246370ae SHA512 c7ece867da91380c4c498e831bd986027f363478ae1a3ee8a702171f4f229f863d19811236e2ec2d4b8607169adefdd74c0b458201d647acf27eac11f58eca65
 MISC metadata.xml 2090 BLAKE2B 1dc2cb3c8aad13022f4ec8ccae5f87635a5a7846f5a06c797e816322ab33d9ef2629a3409612020e42f981391d41bb501297360d9f777afc81c9fe65078ef059 SHA512 d543d25b779ea63edc5f94e564c2e2c40760b76b933e6e090a6c8c70f71720cf2f764a1fdba3c75efabff8cb0119348665c06657fc38fae615bd20882a06e2e9
diff --git a/www-client/chromium/chromium-134.0.6998.88.ebuild b/www-client/chromium/chromium-134.0.6998.88.ebuild
new file mode 100644
index 000000000000..aa1212c2269e
--- /dev/null
+++ b/www-client/chromium/chromium-134.0.6998.88.ebuild
@@ -0,0 +1,1535 @@
+# Copyright 2009-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# PACKAGING NOTES
+
+# Upstream roll their bundled Clang every two weeks, and the bundled Rust
+# is rolled regularly and depends on that. While we do our best to build
+# with system Clang, we may eventually hit the point where we need to use
+# the bundled Clang due to the use of prerelease features.
+
+# USE=bundled-toolchain is intended for users who want to use the same toolchain
+# as the upstream releases. It's also a good fallback in case we fall behind
+# and need to get a release out quickly (less likely with `dev` in-tree).
+
+# Since m133 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).
+
+GN_MIN_VER=0.2207
+# chromium-tools/get-chromium-toolchain-strings.py
+TEST_FONT=f26f29c9d3bfae588207bbc9762de8d142e58935c62a86f67332819b15203b35
+BUNDLED_CLANG_VER=llvmorg-20-init-17108-g29ed6000-3
+BUNDLED_RUST_VER=ad211ced81509462cdfe4c29ed10f97279a0acae-1
+RUST_SHORT_HASH=${BUNDLED_RUST_VER:0:10}-${BUNDLED_RUST_VER##*-}
+
+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
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk ur vi zh-CN zh-TW"
+
+LLVM_COMPAT=( 19 20 )
+PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_REQ_USE="xml(+)"
+RUST_MIN_VER=1.78.0
+RUST_NEEDS_LLVM="yes please"
+RUST_OPTIONAL="yes" # Not actually optional, but we don't need system Rust (or LLVM) with USE=bundled-toolchain
+
+inherit check-reqs chromium-2 desktop flag-o-matic llvm-r1 multiprocessing ninja-utils pax-utils
+inherit python-any-r1 readme.gentoo-r1 rust systemd toolchain-funcs virtualx xdg-utils
+
+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}-linux.tar.xz
+	!bundled-toolchain? (
+		https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
+	)
+	bundled-toolchain? (
+		https://gsdview.appspot.com/chromium-browser-clang/Linux_x64/clang-${BUNDLED_CLANG_VER}.tar.xz
+			-> chromium-clang-${BUNDLED_CLANG_VER}.tar.xz
+		https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/rust-toolchain-${BUNDLED_RUST_VER}-${BUNDLED_CLANG_VER%-*}.tar.xz
+			-> chromium-rust-toolchain-${RUST_SHORT_HASH}-${BUNDLED_CLANG_VER%-*}.tar.xz
+	)
+	test? (
+		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? (
+		https://gitlab.raptorengineering.com/raptor-engineering-public/chromium/openpower-patches/-/archive/${PPC64_HASH}/openpower-patches-${PPC64_HASH}.tar.bz2 -> chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
+	)
+	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
+
+LICENSE="BSD"
+SLOT="0/stable"
+# Dev exists mostly to give devs some breathing room for beta/stable releases;
+# it shouldn't be keyworded but adventurous users can select it.
+if [[ ${SLOT} != "0/dev" ]]; then
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
+IUSE="+X ${IUSE_SYSTEM_LIBS} bindist bundled-toolchain cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo"
+IUSE+=" +proprietary-codecs pulseaudio qt6 +screencast selinux test +vaapi +wayland +widevine cpu_flags_ppc_vsx3"
+RESTRICT="
+	!bindist? ( bindist )
+	!test? ( test )
+"
+
+REQUIRED_USE="
+	!headless? ( || ( X wayland ) )
+	pgo? ( X !wayland )
+	screencast? ( wayland )
+	ffmpeg-chromium? ( bindist proprietary-codecs )
+"
+
+COMMON_X_DEPEND="
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXtst:=
+	x11-libs/libxshmfence:=
+"
+
+COMMON_SNAPSHOT_DEPEND="
+	system-icu? ( >=dev-libs/icu-73.0:= )
+	>=dev-libs/libxml2-2.12.4:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	dev-libs/libxslt:=
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2.11.0-r1:=
+	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
+	media-libs/libjpeg-turbo:=
+	system-png? ( media-libs/libpng:=[-apng(-)] )
+	system-zstd? ( >=app-arch/zstd-1.5.5:= )
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/mesa:=[gbm(+)]
+	>=media-libs/openh264-1.6.0:=
+	sys-libs/zlib:=
+	!headless? (
+		dev-libs/glib:2
+		>=media-libs/alsa-lib-1.0.19:=
+		pulseaudio? ( media-libs/libpulse:= )
+		sys-apps/pciutils:=
+		kerberos? ( virtual/krb5 )
+		vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
+		X? (
+			x11-base/xorg-proto:=
+			x11-libs/libX11:=
+			x11-libs/libxcb:=
+			x11-libs/libXext:=
+		)
+		x11-libs/libxkbcommon:=
+		wayland? (
+			dev-libs/libffi:=
+			dev-libs/wayland:=
+			screencast? ( media-video/pipewire:= )
+		)
+	)
+"
+
+COMMON_DEPEND="
+	${COMMON_SNAPSHOT_DEPEND}
+	app-arch/bzip2:=
+	dev-libs/expat:=
+	net-misc/curl[ssl]
+	sys-apps/dbus:=
+	media-libs/flac:=
+	sys-libs/zlib:=[minizip]
+	!headless? (
+		>=app-accessibility/at-spi2-core-2.46.0:2
+		media-libs/mesa:=[X?,wayland?]
+		virtual/udev
+		x11-libs/cairo:=
+		x11-libs/gdk-pixbuf:2
+		x11-libs/pango:=
+		cups? ( >=net-print/cups-1.3.11:= )
+		qt6? ( dev-qt/qtbase:6[gui,widgets] )
+		X? ( ${COMMON_X_DEPEND} )
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!headless? (
+		|| (
+			x11-libs/gtk+:3[X?,wayland?]
+			gui-libs/gtk:4[X?,wayland?]
+		)
+		qt6? ( dev-qt/qtbase:6[X?,wayland?] )
+	)
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	bindist? (
+		!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
+		ffmpeg-chromium? ( media-video/ffmpeg-chromium:${PV%%\.*} )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	!headless? (
+		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
+		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
+	)
+"
+
+BDEPEND="
+	${COMMON_SNAPSHOT_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	>=app-arch/gzip-1.7
+	!headless? (
+		qt6? ( dev-qt/qtbase:6 )
+	)
+	!bundled-toolchain? ( $(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+		llvm-core/llvm:${LLVM_SLOT}
+		llvm-core/lld:${LLVM_SLOT}
+		official? (
+			!ppc64? ( llvm-runtimes/compiler-rt-sanitizers:${LLVM_SLOT}[cfi] )
+		) ')
+		${RUST_DEPEND}
+	)
+	pgo? (
+		>=dev-python/selenium-3.141.0
+		>=dev-util/web_page_replay_go-20220314
+	)
+	>=dev-util/bindgen-0.68.0
+	>=dev-build/gn-${GN_MIN_VER}
+	app-alternatives/ninja
+	dev-lang/perl
+	>=dev-util/gperf-3.0.3
+	dev-vcs/git
+	>=net-libs/nodejs-7.6.0[inspector]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+python_check_deps() {
+	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+pre_build_checks() {
+	# Check build requirements: bugs #471810, #541816, #914220
+	# We're going to start doing maths here on the size of an unpacked source tarball,
+	# this should make updates easier as chromium continues to balloon in size.
+	local BASE_DISK=24
+	local EXTRA_DISK=1
+	local CHECKREQS_MEMORY="4G"
+	tc-is-cross-compiler && EXTRA_DISK=2
+	if tc-is-lto || use pgo; then
+		CHECKREQS_MEMORY="9G"
+		tc-is-cross-compiler && EXTRA_DISK=4
+		use pgo && EXTRA_DISK=8
+	fi
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		if use custom-cflags; then
+			EXTRA_DISK=13
+		fi
+		CHECKREQS_MEMORY="16G"
+	fi
+	CHECKREQS_DISK_BUILD="$((BASE_DISK + EXTRA_DISK))G"
+	check-reqs_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
+		pre_build_checks
+	fi
+
+	if use headless; then
+		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt6" "vaapi" "wayland")
+		for myiuse in ${headless_unused_flags[@]}; do
+			use ${myiuse} && ewarn "Ignoring USE=${myiuse}, USE=headless is set."
+		done
+	fi
+
+	if ! use bindist && use ffmpeg-chromium; then
+		ewarn "Ignoring USE=ffmpeg-chromium, USE=bindist is not set."
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
+		pre_build_checks
+
+		# The linux:unbundle toolchain in GN grabs CC, CXX, CPP (etc) from the environment
+		# We'll set these to clang here then use llvm-utils functions to very explicitly set these
+		# to a sane value.
+		# This is effectively the 'force-clang' path if GCC support is re-added.
+		# TODO: check if the user has already selected a specific impl via make.conf and respect that.
+		use_lto="false"
+		if tc-is-lto; then
+			use_lto="true"
+			# We can rely on GN to do this for us; anecdotally without this builds
+			# take significantly longer with LTO enabled and it doesn't hurt anything.
+			filter-lto
+		fi
+
+		if [ "$use_lto" = "false" ] && use official; then
+			einfo "USE=official selected and LTO not detected."
+			einfo "It is _highly_ recommended that LTO be enabled for performance reasons"
+			einfo "and to be consistent with the upstream \"official\" build optimisations."
+		fi
+
+		if [ "$use_lto" = "false" ] && use test; then
+			die "Tests require CFI which requires LTO"
+		fi
+
+		export use_lto
+
+		# 936858
+		if tc-ld-is-mold; then
+			eerror "Your toolchain is using the mold linker."
+			eerror "This is not supported by Chromium."
+			die "Please switch to a different linker."
+		fi
+
+		if use !bundled-toolchain; then
+			llvm-r1_pkg_setup
+			rust_pkg_setup
+		fi
+
+		# Forcing clang; respect llvm_slot_x to enable selection of impl from LLVM_COMPAT
+		AR=llvm-ar
+		CPP="${CHOST}-clang++-${LLVM_SLOT} -E"
+		NM=llvm-nm
+		CC="${CHOST}-clang-${LLVM_SLOT}"
+		CXX="${CHOST}-clang++-${LLVM_SLOT}"
+
+		if tc-is-cross-compiler; then
+			use pgo && die "The pgo USE flag cannot be used when cross-compiling"
+			CPP="${CBUILD}-clang++-${LLVM_SLOT} -E"
+		fi
+
+		# I hate doing this but upstream Rust have yet to come up with a better solution for
+		# us poor packagers. Required for Split LTO units, which are required for CFI.
+		export RUSTC_BOOTSTRAP=1
+
+		# Users should never hit this, it's purely a development convenience
+		if ver_test $(gn --version || die) -lt ${GN_MIN_VER}; then
+			die "dev-build/gn >= ${GN_MIN_VER} is required to build this Chromium"
+		fi
+	fi
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	unpack ${P}-linux.tar.xz
+	# These should only be required when we're not using the official toolchain
+	use !bundled-toolchain && unpack chromium-patches-${PATCH_V}.tar.bz2
+
+	use pgo && unpack chromium-profiler-0.2.tar
+
+	if use test; then
+		# 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}-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"
+		tar xf "${testfonts_tar}" -C "${testfonts_dir}" || die "Failed to unpack testfonts"
+	fi
+
+	# We need to manually unpack this since M126 else we'd unpack one toolchain over the other.
+	# Since we're doing that anyway let's unpack to sensible locations to make symlink creation easier.
+	if use bundled-toolchain; then
+		einfo "Unpacking bundled Clang ..."
+		mkdir -p "${WORKDIR}"/clang || die "Failed to create clang directory"
+		tar xf "${DISTDIR}/chromium-clang-${BUNDLED_CLANG_VER}.tar.xz" -C "${WORKDIR}/clang" || die "Failed to unpack Clang"
+		einfo "Unpacking bundled Rust ..."
+		local rust_dir="${WORKDIR}/rust-toolchain"
+		mkdir -p "${rust_dir}" || die "Failed to create rust toolchain directory"
+		tar xf "${DISTDIR}/chromium-rust-toolchain-${RUST_SHORT_HASH}-${BUNDLED_CLANG_VER%-*}.tar.xz" -C "${rust_dir}" ||
+			die "Failed to unpack Rust"
+	fi
+
+	if use ppc64; then
+		unpack chromium-openpower-${PPC64_HASH:0:10}.tar.bz2
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local PATCHES=(
+		"${FILESDIR}/chromium-cross-compile.patch"
+		"${FILESDIR}/chromium-109-system-zlib.patch"
+		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
+		"${FILESDIR}/chromium-131-unbundle-icu-target.patch"
+		"${FILESDIR}/chromium-134-map_droppable-glibc.patch"
+		"${FILESDIR}/chromium-134-oauth2-client-switches.patch"
+		"${FILESDIR}/chromium-134-bindgen-custom-toolchain.patch"
+		"${FILESDIR}/chromium-135-fix-non-wayland-build.patch"
+	)
+
+	if use bundled-toolchain; then
+		# We need to symlink the toolchain into the expected location
+		einfo "Symlinking Clang toolchain to expected location ..."
+		mkdir -p third_party/llvm-build/ || die "Failed to create llvm-build directory"
+		# the 'Chromium Linux Tarballs' seem to already have 'Release+Asserts/{lib,bin}'; not sure if this is an
+		# upstream change - we're using the same scripts to build, theoretically. We'll still attempt to create
+		# llvm-build, but we'll rm Release+Asserts and symlink directly.
+		if [[ -d third_party/llvm-build/Release+Asserts ]]; then
+			rm -r third_party/llvm-build/Release+Asserts || die "Failed to remove third_party/llvm-build/Release+Asserts"
+		fi
+		ln -s "${WORKDIR}"/clang third_party/llvm-build/Release+Asserts || die "Failed to bundle Clang"
+		einfo "Symlinking Rust toolchain to expected location ..."
+		# As above, so below
+		if [[ -d third_party/rust-toolchain ]]; then
+			rm -r third_party/rust-toolchain || die "Failed to remove third_party/rust-toolchain"
+		fi
+		ln -s "${WORKDIR}"/rust-toolchain third_party/rust-toolchain || die "Failed to bundle rust"
+		cp "${WORKDIR}"/rust-toolchain/VERSION \
+			"${WORKDIR}"/rust-toolchain/INSTALLED_VERSION || die "Failed to set rust version"
+	else
+		# We don't need our toolchain patches if we're using the official toolchain
+		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
+			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
+
+		# Strictly speaking this doesn't need to be gated (no bundled toolchain for ppc64); it keeps the logic together
+		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"
+			local isa_3_patch="ppc64le/core/baseline-isa-3-0.patch"
+			# Apply the OpenPOWER patches (check for page size and isa 3.0)
+			openpower_patches=( $(grep -E "^ppc64le|^upstream" "${patchset_dir}/series" | grep -v "${page_size_patch}" |
+				grep -v "${isa_3_patch}" || die) )
+			for patch in "${openpower_patches[@]}"; do
+				PATCHES+=( "${patchset_dir}/${patch}" )
+			done
+			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}/${isa_3_patch}" )
+			fi
+		fi
+
+		# Oxidised hacks, let's keep 'em all in one place
+		# This is a nightly option that does not exist in older releases
+		# https://github.com/rust-lang/rust/commit/389a399a501a626ebf891ae0bb076c25e325ae64
+		if ver_test ${RUST_SLOT} -lt "1.83.0"; then
+			sed '/rustflags = \[ "-Zdefault-visibility=hidden" \]/d' -i build/config/gcc/BUILD.gn ||
+				die "Failed to remove default visibility nightly option"
+		fi
+
+		# Upstream Rust replaced adler with adler2, for older versions of Rust we still need
+		# to tell GN that we have the older lib when it tries to copy the Rust sysroot
+		# into the bulid directory.
+		if ver_test ${RUST_SLOT} -lt "1.86.0"; then
+			sed -i 's/adler2/adler/' build/rust/std/BUILD.gn ||
+				die "Failed to tell GN that we have adler and not adler2"
+		fi
+	fi
+
+	default
+
+	# Not included in -lite tarballs, but we should check for it anyway.
+	if [[ -f third_party/node/linux/node-linux-x64/bin/node ]]; then
+		rm third_party/node/linux/node-linux-x64/bin/node || die
+	else
+		mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	fi
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	# adjust python interpreter version
+	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
+
+	# remove_bundled_libraries.py walks the source tree and looks for paths containing the substring 'third_party'
+	# whitelist matches use the right-most matching path component, so we need to whitelist from that point down.
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/double_conversion
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/ceval
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/volk
+		third_party/anonymous_tokens
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/bidimapper
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4-4.9.3
+		third_party/catapult/third_party/html5lib-1.1
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/content_analysis_sdk
+		third_party/cpuinfo
+		third_party/crabbyavif
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/d3
+		third_party/dav1d
+		third_party/dawn
+		third_party/dawn/third_party/gn/webgpu-cts
+		third_party/dawn/third_party/khronos
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
+		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
+		third_party/devtools-frontend/src/front_end/third_party/json5
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/parsel-js
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/rxjs
+		third_party/devtools-frontend/src/front_end/third_party/third-party-web
+		third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/front_end/third_party/web-vitals
+		third_party/devtools-frontend/src/third_party
+		third_party/distributed_point_functions
+		third_party/dom_distiller_js
+		third_party/eigen3
+		third_party/emoji-segmenter
+		third_party/farmhash
+		third_party/fast_float
+		third_party/fdlibm
+		third_party/ffmpeg
+		third_party/fft2d
+		third_party/flatbuffers
+		third_party/fp16
+		third_party/freetype
+		third_party/fusejs
+		third_party/fxdiv
+		third_party/gemmlowp
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/highway
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/ink_stroke_modeler/src/ink_stroke_modeler
+		third_party/ink_stroke_modeler/src/ink_stroke_modeler/internal
+		third_party/ink/src/ink/brush
+		third_party/ink/src/ink/color
+		third_party/ink/src/ink/geometry
+		third_party/ink/src/ink/rendering
+		third_party/ink/src/ink/rendering/skia/common_internal
+		third_party/ink/src/ink/rendering/skia/native
+		third_party/ink/src/ink/rendering/skia/native/internal
+		third_party/ink/src/ink/strokes
+		third_party/ink/src/ink/types
+		third_party/inspector_protocol
+		third_party/ipcz
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/khronos
+		third_party/lens_server_proto
+		third_party/leveldatabase
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/fastfeat
+		third_party/libaom/source/libaom/third_party/SVT-AV1
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libc++
+		third_party/libdrm
+		third_party/libgav1
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libtess2/libtess2
+		third_party/libtess2/src/Include
+		third_party/libtess2/src/Source
+		third_party/liburlpattern
+		third_party/libva_protected_content
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libx11
+		third_party/libxcb-keysyms
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/libzip
+		third_party/lit
+		third_party/llvm-libc
+		third_party/llvm-libc/src/shared/
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/markupsafe
+		third_party/material_color_utilities
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/minigbm
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/neon_2_sse
+		third_party/node
+		third_party/omnibox_proto
+		third_party/one_euro_filter
+		third_party/openscreen
+		third_party/openscreen/src/third_party/
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/opus
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg
+		third_party/pdfium/third_party/libtiff
+		third_party/perfetto
+		third_party/perfetto/protos/third_party/chromium
+		third_party/perfetto/protos/third_party/simpleperf
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private_membership
+		third_party/private-join-and-compute
+		third_party/protobuf
+		third_party/pthreadpool
+		third_party/puffin
+		third_party/pyjson5
+		third_party/pyyaml
+		third_party/rapidhash
+		third_party/re2
+		third_party/rnnoise
+		third_party/rust
+		third_party/ruy
+		third_party/s2cellid
+		third_party/search_engines_data
+		third_party/securemessage
+		third_party/selenium-atoms
+		third_party/sentencepiece
+		third_party/sentencepiece/src/third_party/darts_clone
+		third_party/shell-encryption
+		third_party/simdutf
+		third_party/simplejson
+		third_party/six
+		third_party/skia
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/snappy
+		third_party/spirv-headers
+		third_party/spirv-tools
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
+		third_party/swiftshader/third_party/SPIRV-Tools
+		third_party/swiftshader/third_party/subzero
+		third_party/tensorflow_models
+		third_party/tensorflow-text
+		third_party/tflite
+		third_party/tflite/src/third_party/eigen3
+		third_party/tflite/src/third_party/fft2d
+		third_party/tflite/src/third_party/xla/third_party/tsl
+		third_party/tflite/src/third_party/xla/xla/tsl/framework
+		third_party/tflite/src/third_party/xla/xla/tsl/lib/random
+		third_party/tflite/src/third_party/xla/xla/tsl/protobuf
+		third_party/tflite/src/third_party/xla/xla/tsl/util
+		third_party/ukey2
+		third_party/unrar
+		third_party/utf
+		third_party/vulkan
+		third_party/wasm_tts_engine
+		third_party/wayland
+		third_party/webdriver
+		third_party/webgpu-cts
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/x11proto
+		third_party/xcbproto
+		third_party/xnnpack
+		third_party/zlib/google
+		third_party/zxcvbn-cpp
+		url/third_party/mozilla
+		v8/third_party/siphash
+		v8/third_party/utf8-decoder
+		v8/third_party/glibc
+		v8/third_party/inspector_protocol
+		v8/third_party/rapidhash-v8
+		v8/third_party/v8
+		v8/third_party/valgrind
+
+		# gyp -> gn leftovers
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+	)
+
+	if use test; then
+		# tar tvf /var/cache/distfiles/${P}-testdata.tar.xz | grep '^d' | grep 'third_party' | awk '{print $NF}'
+		keeplibs+=(
+			third_party/breakpad/breakpad/src/processor
+			third_party/fuzztest
+			third_party/google_benchmark/src/include/benchmark
+			third_party/google_benchmark/src/src
+			third_party/perfetto/protos/third_party/pprof
+			third_party/test_fonts
+			third_party/test_fonts/fontconfig
+		)
+	fi
+
+	# USE=system-*
+	if ! use system-harfbuzz; then
+		keeplibs+=( third_party/harfbuzz-ng )
+	fi
+
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+
+	if ! use system-png; then
+		keeplibs+=( third_party/libpng )
+	fi
+
+	if ! use system-zstd; then
+		keeplibs+=( third_party/zstd )
+	fi
+
+	# Arch-specific
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		# requires git and clang, bug #832803
+		# Revert https://chromium.googlesource.com/chromium/src/+/b463d0f40b08b4e896e7f458d89ae58ce2a27165%5E%21/third_party/libvpx/generate_gni.sh
+		# and https://chromium.googlesource.com/chromium/src/+/71ebcbce867dd31da5f8b405a28fcb0de0657d91%5E%21/third_party/libvpx/generate_gni.sh
+		# since we're not in a git repo
+		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g; /^git -C/d; /git cl/d; /cd \$BASE_DIR\/\$LIBVPX_SRC_DIR/ign format --in-place \$BASE_DIR\/BUILD.gn\ngn format --in-place \$BASE_DIR\/libvpx_srcs.gni" \
+			generate_gni.sh || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+
+		pushd third_party/ffmpeg >/dev/null || die
+		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
+		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
+		popd >/dev/null || die
+	fi
+
+	# Sanity check keeplibs, on major version bumps it is often necessary to update this list
+	# and this enables us to hit them all at once.
+	# There are some entries that need to be whitelisted (TODO: Why? The file is understandable, the rest seem odd)
+	whitelist_libs=(
+		net/third_party/quic
+		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
+		third_party/libjingle
+		third_party/mesa
+		third_party/skia/third_party/vulkan
+		third_party/vulkan
+	)
+	local not_found_libs=()
+	for lib in "${keeplibs[@]}"; do
+		if [[ ! -d "${lib}" ]] && ! has "${lib}" "${whitelist_libs[@]}"; then
+			not_found_libs+=( "${lib}" )
+		fi
+	done
+
+	if [[ ${#not_found_libs[@]} -gt 0 ]]; then
+		eerror "The following \`keeplibs\` directories were not found in the source tree:"
+		for lib in "${not_found_libs[@]}"; do
+			eerror "  ${lib}"
+		done
+		die "Please update the ebuild."
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	einfo "Unbundling third-party libraries ..."
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+
+	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
+	mkdir -p buildtools/third_party/eu-strip/bin || die
+	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
+}
+
+chromium_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	if use !bundled-toolchain; then
+		# We already forced the "correct" clang via pkg_setup
+
+		if tc-is-cross-compiler; then
+			CC="${CC} -target ${CHOST} --sysroot ${ESYSROOT}"
+			CXX="${CXX} -target ${CHOST} --sysroot ${ESYSROOT}"
+			BUILD_AR=${AR}
+			BUILD_CC=${CC}
+			BUILD_CXX=${CXX}
+			BUILD_NM=${NM}
+		fi
+
+		strip-unsupported-flags
+
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+		# https://bugs.gentoo.org/918897#c32
+		append-ldflags -Wl,--undefined-version
+		myconf_gn+=" use_lld=true"
+
+		# Make sure the build system will use the right tools, bug #340795.
+		tc-export AR CC CXX NM
+
+		myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+		if tc-is-cross-compiler; then
+			tc-export BUILD_{AR,CC,CXX,NM}
+			myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+			myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+			myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
+			myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
+
+			# setup cups-config, build system only uses --libs option
+			if use cups; then
+				mkdir "${T}/cups-config" || die
+				cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
+				export PATH="${PATH}:${T}/cups-config"
+			fi
+
+			# Don't inherit PKG_CONFIG_PATH from environment
+			local -x PKG_CONFIG_PATH=
+		else
+			myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+		fi
+
+		# bindgen settings
+		# From 127, to make bindgen work, we need to provide a location for libclang.
+		# We patch this in for gentoo - see chromium-*-bindgen-custom-toolchain.patch
+		# rust_bindgen_root = directory with `bin/bindgen` beneath it.
+		myconf_gn+=" rust_bindgen_root=\"${EPREFIX}/usr/\""
+
+		myconf_gn+=" bindgen_libclang_path=\"$(get_llvm_prefix)/$(get_libdir)\""
+		# We don't need to set 'clang_base_bath' for anything in our build
+		# and it defaults to the google toolchain location. Instead provide a location
+		# to where system clang lives sot that bindgen can find system headers (e.g. stddef.h)
+		myconf_gn+=" clang_base_path=\"${EPREFIX}/usr/lib/clang/${LLVM_SLOT}/\""
+
+		myconf_gn+=" rust_sysroot_absolute=\"$(get_rust_prefix)\""
+		myconf_gn+=" rustc_version=\"${RUST_SLOT}\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
+	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
+	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
+	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=false"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# 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_protobuf (bug #525560).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libjpeg
+		libwebp
+		libxml
+		libxslt
+		openh264
+		zlib
+	)
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-png; then
+		gn_system_libraries+=( libpng )
+	fi
+	if use system-zstd; then
+		gn_system_libraries+=( zstd )
+	fi
+
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# TODO 131: The above call clobbers `enable_freetype = true` in the freetype gni file
+	# drop the last line, then append the freetype line and a new curly brace to end the block
+	local freetype_gni="build/config/freetype/freetype.gni"
+	sed -i -e '$d' ${freetype_gni} || die
+	echo "  enable_freetype = true" >> ${freetype_gni} || die
+	echo "}" >> ${freetype_gni} || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+
+	if use headless; then
+		myconf_gn+=" use_cups=false"
+		myconf_gn+=" use_kerberos=false"
+		myconf_gn+=" use_pulseaudio=false"
+		myconf_gn+=" use_vaapi=false"
+		myconf_gn+=" rtc_use_pipewire=false"
+	else
+		myconf_gn+=" use_cups=$(usex cups true false)"
+		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)"
+		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
+	fi
+
+	# Allows distributions to link pulseaudio directly (DT_NEEDED) instead of
+	# using dlopen. This helps with automated detection of ABI mismatches and
+	# prevents silent errors.
+	if use pulseaudio; then
+		myconf_gn+=" link_pulseaudio=true"
+	fi
+
+	# Non-developer builds of Chromium (for example, non-Chrome browsers, or
+	# Chromium builds provided by Linux distros) should disable the testing config
+	myconf_gn+=" disable_fieldtrial_testing_config=true"
+
+	# The sysroot is the oldest debian image that chromium supports, we don't need it
+	myconf_gn+=" use_sysroot=false"
+
+	# Use in-tree libc++ (buildtools/third_party/libc++ and buildtools/third_party/libc++abi)
+	# instead of the system C++ library for C++ standard library support.
+	# default: true, but let's be explicit (forced since 120 ; USE removed 127).
+	myconf_gn+=" use_custom_libcxx=true"
+
+	# Disable pseudolocales, only used for testing
+	myconf_gn+=" enable_pseudolocales=false"
+
+	# Disable code formating of generated files
+	myconf_gn+=" blink_enable_generated_code_formatting=false"
+
+	if use bindist ; then
+		# proprietary_codecs just forces Chromium to say that it can use h264/aac,
+		# the work is still done by ffmpeg. If this is set to no Chromium
+		# won't be able to load the codec even if the library can handle it
+		myconf_gn+=" proprietary_codecs=true"
+		myconf_gn+=" ffmpeg_branding=\"Chrome\""
+		# build ffmpeg as an external component (libffmpeg.so) that we can remove / substitute
+		myconf_gn+=" is_component_ffmpeg=true"
+	else
+		ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+		myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+		myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+	fi
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info. The OAuth2 credentials, however, have been left out.
+	# Those OAuth2 credentials have been broken for quite some time anyway.
+	# Instead we apply a patch to use the --oauth2-client-id= and
+	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
+	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
+	# Chromium without baked-in values.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		filter-flags "-g*"
+
+		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
+		if [[ ${myarch} == amd64 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
+		fi
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf_gn+=" treat_warnings_as_errors=false"
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Disable external code space for V8 for ppc64. It is disabled for ppc64
+	# by default, but cross-compiling on amd64 enables it again.
+	if tc-is-cross-compiler; then
+		if ! use amd64 && ! use arm64; then
+			myconf_gn+=" v8_enable_external_code_space=false"
+		fi
+	fi
+
+	# Only enabled for clang, but gcc has endian macros too
+	myconf_gn+=" v8_use_libm_trig_functions=true"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	# We don't use the same clang version as upstream, and with -Werror
+	# we need to make sure that we don't get superfluous warnings.
+	append-flags -Wno-unknown-warning-option
+	if tc-is-cross-compiler; then
+			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
+			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
+	fi
+
+	# Explicitly disable ICU data file support for system-icu/headless builds.
+	if use system-icu || use headless; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Don't need nocompile checks and GN crashes with our config
+	myconf_gn+=" enable_nocompile_tests=false"
+
+	# 131 began laying the groundwork for replacing freetype with
+	# "Rust-based Fontations set of libraries plus Skia path rendering"
+	# We now need to opt-in
+	myconf_gn+=" enable_freetype=true"
+
+	# Enable ozone wayland and/or headless support
+	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+	myconf_gn+=" ozone_platform_headless=true"
+	if use headless; then
+		myconf_gn+=" ozone_platform=\"headless\""
+		myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
+		myconf_gn+=" use_glib=false use_gio=false"
+		myconf_gn+=" use_pangocairo=false use_alsa=false"
+		myconf_gn+=" use_libpci=false use_udev=false"
+		myconf_gn+=" enable_print_preview=false"
+		myconf_gn+=" enable_remoting=false"
+	else
+		myconf_gn+=" use_system_minigbm=true"
+		myconf_gn+=" use_xkbcommon=true"
+		myconf_gn+=" use_qt5=false"
+		if use qt6; then
+			myconf_gn+=" use_qt6=true"
+			local cbuild_libdir=$(get_libdir)
+			if tc-is-cross-compiler; then
+				# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+				local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt)
+				cbuild_libdir=${cbuild_libdir:2}
+				cbuild_libdir=${cbuild_libdir/% }
+			fi
+			myconf_gn+=" moc_qt6_path=\"${EPREFIX}/usr/${cbuild_libdir}/qt6/libexec\""
+		else
+			myconf_gn+=" use_qt6=false"
+		fi
+		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
+		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
+		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
+		use wayland && myconf_gn+=" use_system_libffi=true"
+	fi
+
+	myconf_gn+=" use_thin_lto=${use_lto}"
+	myconf_gn+=" thin_lto_enable_optimizations=${use_lto}"
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		if use ppc64; then
+			myconf_gn+=" is_cfi=false" # requires llvm-runtimes/compiler-rt-sanitizers[cfi]
+		else
+			myconf_gn+=" is_cfi=${use_lto}"
+		fi
+		# Don't add symbols to build
+		myconf_gn+=" symbol_level=0"
+	fi
+
+	if use pgo; then
+		myconf_gn+=" chrome_pgo_phase=${1}"
+		if [[ "$1" == "2" ]]; then
+			myconf_gn+=" pgo_data_path=\"${2}\""
+		fi
+	else
+		# Disable PGO
+		myconf_gn+=" chrome_pgo_phase=0"
+	fi
+
+	# skipping typecheck is only supported on amd64, bug #876157
+	if ! use amd64; then
+		myconf_gn+=" devtools_skip_typecheck=false"
+	fi
+
+	einfo "Configuring Chromium ..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	chromium_configure $(usex pgo 1 0)
+}
+
+chromium_compile() {
+
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
+	local -x PYTHONPATH=
+
+	# Build mksnapshot and pax-mark it.
+	if use pax-kernel; then
+		local x
+		for x in mksnapshot v8_context_snapshot_generator; do
+			if tc-is-cross-compiler; then
+				eninja -C out/Release "host/${x}"
+				pax-mark m "out/Release/host/${x}"
+			else
+				eninja -C out/Release "${x}"
+				pax-mark m "out/Release/${x}"
+			fi
+		done
+	fi
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver chrome_sandbox $(use test && echo "base_unittests")
+
+	pax-mark m out/Release/chrome
+
+	# This codepath does minimal patching, so we're at the mercy of upstream
+	# CFLAGS. This is fine - we're not intending to force this on users
+	# and we do a lot of flag 'management' anyway.
+	if use bundled-toolchain; then
+		QA_FLAGS_IGNORED="
+			usr/lib64/chromium-browser/chrome
+			usr/lib64/chromium-browser/chrome-sandbox
+			usr/lib64/chromium-browser/chromedriver
+			usr/lib64/chromium-browser/chrome_crashpad_handler
+			usr/lib64/chromium-browser/libEGL.so
+			usr/lib64/chromium-browser/libGLESv2.so
+			usr/lib64/chromium-browser/libVkICD_mock_icd.so
+			usr/lib64/chromium-browser/libVkLayer_khronos_validation.so
+			usr/lib64/chromium-browser/libqt6_shim.so
+			usr/lib64/chromium-browser/libvk_swiftshader.so
+			usr/lib64/chromium-browser/libvulkan.so.1
+		"
+	fi
+}
+
+# This function is called from virtx, and must always return so that Xvfb
+# session isn't left running. If we return 1, virtx will call die().
+chromium_profile() {
+	einfo "Profiling for PGO"
+
+	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
+
+	# Remove old profdata in case profiling was interrupted.
+	rm -rf "${1}" || return 1
+
+	if ! "${EPYTHON}" ./chromium_profiler.py \
+		--chrome-executable "${S}/out/Release/chrome" \
+		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
+		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
+		--profile-output "${1}"; then
+		eerror "Profiling failed"
+		return 1
+	fi
+
+	popd >/dev/null || return 1
+}
+
+src_compile() {
+	if use pgo; then
+		local profdata
+
+		profdata="${WORKDIR}/chromium.profdata"
+
+		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
+			chromium_compile
+			virtx chromium_profile "$profdata"
+
+			touch "${WORKDIR}/.pgo-profiled" || die
+		fi
+
+		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
+			# Remove phase 1 output
+			rm -r out/Release || die
+
+			chromium_configure 2 "$profdata"
+
+			touch "${WORKDIR}/.pgo-phase-2-configured" || die
+		fi
+
+		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
+			chromium_compile
+			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
+		fi
+	else
+		chromium_compile
+	fi
+
+	mv out/Release/chromedriver{.unstripped,} || die
+
+	rm -f out/Release/locales/*.pak.info || die
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+
+	# Build vk_swiftshader_icd.json; bug #827861
+	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
+		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
+		out/Release/vk_swiftshader_icd.json || die
+}
+
+src_test() {
+	# Initial list of tests to skip pulled from Alpine. Thanks Lauren!
+	# https://issues.chromium.org/issues/40939315
+	local skip_tests=(
+		'MessagePumpLibeventTest.NestedNotification*'
+		ClampTest.Death
+		OptionalTest.DereferencingNoValueCrashes
+		PlatformThreadTest.SetCurrentThreadTypeTest
+		RawPtrTest.TrivialRelocability
+		SafeNumerics.IntMaxOperations
+		StackTraceTest.TraceStackFramePointersFromBuffer
+		StringPieceTest.InvalidLengthDeath
+		StringPieceTest.OutOfBoundsDeath
+		ThreadPoolEnvironmentConfig.CanUseBackgroundPriorityForWorker
+		ValuesUtilTest.FilePath
+		# Gentoo-specific
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/0
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/1
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/2
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/3
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/0
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/1
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/2
+		AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/3
+		CharacterEncodingTest.GetCanonicalEncodingNameByAliasName
+		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGFPE
+		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGILL
+		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGV
+		CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGVNonCanonicalAddress
+		FilePathTest.FromUTF8Unsafe_And_AsUTF8Unsafe
+		FileTest.GetInfoForCreationTime
+		ICUStringConversionsTest.ConvertToUtf8AndNormalize
+		NumberFormattingTest.FormatPercent
+		PathServiceTest.CheckedGetFailure
+		PlatformThreadTest.CanChangeThreadType
+		RustLogIntegrationTest.CheckAllSeverity
+		StackCanary.ChangingStackCanaryCrashesOnReturn
+		StackTraceDeathTest.StackDumpSignalHandlerIsMallocFree
+		SysStrings.SysNativeMBAndWide
+		SysStrings.SysNativeMBToWide
+		SysStrings.SysWideToNativeMB
+		TestLauncherTools.TruncateSnippetFocusedMatchesFatalMessagesTest
+		ToolsSanityTest.BadVirtualCallNull
+		ToolsSanityTest.BadVirtualCallWrongType
+		CancelableEventTest.BothCancelFailureAndSucceedOccurUnderContention #new m133: TODO investigate
+	)
+	local test_filter="-$(IFS=:; printf '%s' "${skip_tests[*]}")"
+	# test-launcher-bot-mode enables parallelism and plain output
+	./out/Release/base_unittests --test-launcher-bot-mode \
+		--test-launcher-jobs="$(makeopts_jobs)" \
+		--gtest_filter="${test_filter}" || die "Tests failed!"
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	newexe out/Release/chrome_sandbox chrome-sandbox
+	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+
+	doexe out/Release/chromedriver
+	doexe out/Release/chrome_crashpad_handler
+
+	ozone_auto_session () {
+		use X && use wayland && ! use headless && echo true || echo false
+	}
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
+	)
+	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",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+
+	if use bindist; then
+		# We built libffmpeg as a component library, but we can't distribute it
+		# with proprietary codec support. Remove it and make a symlink to the requested
+		# system library.
+		rm -f out/Release/libffmpeg.so \
+			|| die "Failed to remove bundled libffmpeg.so (with proprietary codecs)"
+		# symlink the libffmpeg.so from either ffmpeg-chromium or ffmpeg[chromium].
+		einfo "Creating symlink to libffmpeg.so from $(usex ffmpeg-chromium ffmpeg-chromium ffmpeg[chromium])..."
+		dosym ../chromium/libffmpeg.so$(usex ffmpeg-chromium .${PV%%\.*} "") \
+			/usr/$(get_libdir)/chromium-browser/libffmpeg.so
+	fi
+
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so out/Release/*.so.[0-9])
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	# Install bundled xdg-utils, avoids installing X11 libraries with USE="-X wayland"
+	doins out/Release/xdg-{settings,mime}
+
+	if ! use system-icu && ! use headless; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/MEIPreload
+
+	# Install vk_swiftshader_icd.json; bug #827861
+	doins out/Release/vk_swiftshader_icd.json
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	if ! use headless; then
+		if use vaapi; then
+			elog "VA-API is disabled by default at runtime. You have to enable it"
+			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
+			elog "in /etc/chromium/default."
+		fi
+		if use screencast; then
+			elog "Screencast is disabled by default at runtime. Either enable it"
+			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
+			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+		fi
+		if use gtk4; then
+			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
+			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
+			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+		fi
+	fi
+
+	if systemd_is_booted && ! [[ -f "/etc/machine-id" ]]; then
+		ewarn "The lack of an '/etc/machine-id' file on this system booted with systemd"
+		ewarn "indicates that the Gentoo handbook was not followed to completion."
+		ewarn ""
+		ewarn "Chromium is known to behave unpredictably with this system configuration;"
+		ewarn "please complete the configuration of this system before logging any bugs."
+	fi
+}
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index a7ecd2e761a2..ed4d5b6ad2b5 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_135.0.7039.0-1_amd64.deb 115163136 BLAKE2B 2ee5481438ac141f3899bda5e6acf81172ce30405d57b31f7355f961377d3aa26173d1389e6ff69fd8063d659c4e0c106d0046b2a839542283a3e0ea652e8a3b SHA512 45840c880e2ca4c63b9d0341a7de3c1f035c1bfa6bb3a522f1ea0b529b1b9526e8ed4b9dacf3ccdcbbb73fbc218bb317de966321c7e6ca20509f42b22f2a2dc4
-EBUILD google-chrome-unstable-135.0.7039.0-r1.ebuild 2884 BLAKE2B a63c2caf820e81c4e500728e985f1f13539fa37b68aa6f1a7a608bf338d4494bcc6758e10bf029612a04873c4967f7170067f63c4cec2f800bacb7449945ea48 SHA512 6dc93cef569c81e5acbc9c151e6b319eb796ddc60b7c9377e77be14ea47aad74e072f3e77e1664ae62aa2a5b60d75bd115572f451ca2ba9b38a6b309ec16c0f3
+DIST google-chrome-unstable_136.0.7052.2-1_amd64.deb 115855804 BLAKE2B 484eeebf56dfbba25e24b20f13e56b4edd33ec87a1116c21cfdc93319cbafa65c8c7dc317f8cd6f49b072c0c8a20733752b6008c85f4837f096add611ecd2c7c SHA512 1805ba7f8dcb1b3c54125e2de429b217a77ef2da728a3df4cccd6e45149f8fc5602bd3ce7fd068b88bbf82f2cc4853fd1d7d145428633b9bee27b9e57f2d1661
+EBUILD google-chrome-unstable-136.0.7052.2.ebuild 2884 BLAKE2B a63c2caf820e81c4e500728e985f1f13539fa37b68aa6f1a7a608bf338d4494bcc6758e10bf029612a04873c4967f7170067f63c4cec2f800bacb7449945ea48 SHA512 6dc93cef569c81e5acbc9c151e6b319eb796ddc60b7c9377e77be14ea47aad74e072f3e77e1664ae62aa2a5b60d75bd115572f451ca2ba9b38a6b309ec16c0f3
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-135.0.7039.0-r1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-136.0.7052.2.ebuild
index 0e122f578036..0e122f578036 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-135.0.7039.0-r1.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-136.0.7052.2.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index a87325fc50f0..c0961a5b9adb 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_134.0.6998.35-1_amd64.deb 114757600 BLAKE2B 4d36cfe530b7df9394f6e15cd128b02cb20306141ce0f15b774bf83af56f1a51f436231c7f719d31293c3cecc0c7b1203a0a4a20a80810f948b2a0b992f8b718 SHA512 acb6ce4a2c02e5c3db6ef067d2aab62b8097f05370c96897c9b2605e344afba6dc3f35e8def5e7370eeb9d866139c25bdd6e541256aa9b1cf679e46d58033cb6
-EBUILD google-chrome-134.0.6998.35-r1.ebuild 2883 BLAKE2B b215231a79272464c56f42cbcc0cd9f0afced6f0a1d36a2849d09b1cd2dfe0d9336ed1e2f37f3330ab8f8366a6c0dbd0057d1f07152a2cbd5afaf421d05299b0 SHA512 b414273ad9ffacefed3b87d34411518315566f775cf79c05eea219849254a2286c826039a916cac445637ea407724d29929b56dad7fb482b731f970ed5691efb
+DIST google-chrome-stable_134.0.6998.88-1_amd64.deb 114745904 BLAKE2B a8c1e986f83474261b9af0e1e8a3f2c1803f3a6b82219c2f84c27272ac7a9c9f74dc7b0321af33e7d85fc77792c6b39036ea40d6880f341d523d47946a25025a SHA512 b6d01fb90b89b06398afa19a28e39b42646169da217859af7b281ddb1f9335dc5650a5edd2b9facdea003559835fd43a5f8df11c94975d739a7e754c87919606
+EBUILD google-chrome-134.0.6998.88.ebuild 2883 BLAKE2B b215231a79272464c56f42cbcc0cd9f0afced6f0a1d36a2849d09b1cd2dfe0d9336ed1e2f37f3330ab8f8366a6c0dbd0057d1f07152a2cbd5afaf421d05299b0 SHA512 b414273ad9ffacefed3b87d34411518315566f775cf79c05eea219849254a2286c826039a916cac445637ea407724d29929b56dad7fb482b731f970ed5691efb
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome/google-chrome-134.0.6998.35-r1.ebuild b/www-client/google-chrome/google-chrome-134.0.6998.88.ebuild
index d187af0f99bc..d187af0f99bc 100644
--- a/www-client/google-chrome/google-chrome-134.0.6998.35-r1.ebuild
+++ b/www-client/google-chrome/google-chrome-134.0.6998.88.ebuild
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index abc8e4237b59..0b1f7682c999 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-beta_134.0.3124.31-1_amd64.deb 170867030 BLAKE2B bcfbd71dfb1b79150bbb7205a5b9e40a9b8bab3d1561d4f5d7466d6d6668fa2303b137976b15d42539f959266cd763c8c4dfe22102b05b51f9bd2020f1e509e2 SHA512 257b9cb38224c778f985f6ad5c88e0e24d98469879d3588c4ae3b38a2a6e456a72e9b81be17c2fa41b59c4279e07c5c60aa8e4d6868f7903415c58062adf2d6d
 DIST microsoft-edge-beta_134.0.3124.39-1_amd64.deb 170970242 BLAKE2B aab5fba6ddfca07685cc91ff4a6318dc46e34798768aaa674b370e50919bf9647140ac871cce6c8679a6a80d8bf68653d5cd8aaf8ba2cb20a6a39b9f1e279ed5 SHA512 a69137b52aa6903e84b909a003805078dc294c6a4cf84995790a51b313fe9e0e6a02864740513566be989f1e2148305a34cb31f575570b102bc1aae1c6ab848b
 DIST microsoft-edge-beta_134.0.3124.49-1_amd64.deb 170911858 BLAKE2B 6be5bd4acc3e950537246fcd672fd6111a50ff7f71fc9e83691b3f8c0fbba9e80dd782d693627fba35e8d54d278a370b433d8cd01767fd9608369db378e9d242 SHA512 8acb0a896fa06d8f601012fcc2bcd2a9acbd7bdae69fbfeca069e7c93879b15bb0253ba006b8a2e22e6ae54ae39137cd120c9b1cf94f9702ff6ade2ef7e0d0ff
-EBUILD microsoft-edge-beta-134.0.3124.31-r1.ebuild 2613 BLAKE2B f76a8ef804be1c6ce2a02ed4f89a86fe4e93852987e2455d703651b63b2e3a7515d7c453e4696ba416f137016a1e87e9928aa569b5fe8d75863e6bd62648fb9c SHA512 425e0a07f892b9ab4e1acd0513e09d384f919079040ec5ca38608670f9d86e4d9a4f29a6f0bc1b3fb63fcb6e12cb3c8155089d4db8b3b8f49811a55d4f928317
+DIST microsoft-edge-beta_134.0.3124.51-1_amd64.deb 170946250 BLAKE2B 436a2d50d3bb2ec773254ebb02ffa2122ea1842817d04f2132542b8bd9d5a95278ebf3879312abe350478dccb373cb0caf02cd6c7e6941f1472acae629af85e1 SHA512 25f4f05fc49bf2ccb23cad16fe51898d0c82d96a7a099d5e58c7ed4c211e83f5bbd3868d2b5e339dc54d3f5dc060813318b6dae8bfbbf59cb80ac5fb7672e30a
 EBUILD microsoft-edge-beta-134.0.3124.39-r1.ebuild 2613 BLAKE2B f76a8ef804be1c6ce2a02ed4f89a86fe4e93852987e2455d703651b63b2e3a7515d7c453e4696ba416f137016a1e87e9928aa569b5fe8d75863e6bd62648fb9c SHA512 425e0a07f892b9ab4e1acd0513e09d384f919079040ec5ca38608670f9d86e4d9a4f29a6f0bc1b3fb63fcb6e12cb3c8155089d4db8b3b8f49811a55d4f928317
 EBUILD microsoft-edge-beta-134.0.3124.49.ebuild 2613 BLAKE2B f76a8ef804be1c6ce2a02ed4f89a86fe4e93852987e2455d703651b63b2e3a7515d7c453e4696ba416f137016a1e87e9928aa569b5fe8d75863e6bd62648fb9c SHA512 425e0a07f892b9ab4e1acd0513e09d384f919079040ec5ca38608670f9d86e4d9a4f29a6f0bc1b3fb63fcb6e12cb3c8155089d4db8b3b8f49811a55d4f928317
+EBUILD microsoft-edge-beta-134.0.3124.51.ebuild 2613 BLAKE2B f76a8ef804be1c6ce2a02ed4f89a86fe4e93852987e2455d703651b63b2e3a7515d7c453e4696ba416f137016a1e87e9928aa569b5fe8d75863e6bd62648fb9c SHA512 425e0a07f892b9ab4e1acd0513e09d384f919079040ec5ca38608670f9d86e4d9a4f29a6f0bc1b3fb63fcb6e12cb3c8155089d4db8b3b8f49811a55d4f928317
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-134.0.3124.31-r1.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-134.0.3124.51.ebuild
index c97d2da1484c..c97d2da1484c 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-134.0.3124.31-r1.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-134.0.3124.51.ebuild
diff --git a/www-client/microsoft-edge/Manifest b/www-client/microsoft-edge/Manifest
index aca0e1dab958..79b011b4d1d1 100644
--- a/www-client/microsoft-edge/Manifest
+++ b/www-client/microsoft-edge/Manifest
@@ -1,3 +1,3 @@
-DIST microsoft-edge-stable_133.0.3065.92-1_amd64.deb 169802986 BLAKE2B 72ded341b7026bc4e98225c584def73db3072f2db457638eef2086fb25234408b74ed41aef9e5f56d652c17794bf0e4012ce7a8cf1fb15d37c67ee5bcb866e6b SHA512 d4fe71c657d86962f978342de477eadd18ce9be5b6c33e0cd2f909f721b25dca4579ec97d8a3ec3bec117f767bb0378c789c04acb1041250b4250d1761c871e3
-EBUILD microsoft-edge-133.0.3065.92-r1.ebuild 2612 BLAKE2B bc206fe3dfbc9e2da29abdf85e2b69e05b6bfcb782603f6ca1f84b8a09c0f650a199d3d15d00ca9ac77eb98210be66f3bd3b812be38cca6d7b7e06fcd326b903 SHA512 644cdb2869b083b831db7d6880ef7259dff6d3b7676fff833d4b561b9eb9196bede5ffc8f8566d32641c385f25cfd5ee9bda94339577ab52a4660f66d285082e
+DIST microsoft-edge-stable_134.0.3124.51-1_amd64.deb 170835226 BLAKE2B b62387b9bf4164ac7553e9f6d05ebf7da36e3c8ac0c413b8a1dd1794e370a1eea995871822ecdf4a7cb18c6c304fa39a62a9426554cf0419ac8d96e686a75f3d SHA512 e2636535b4747e164148c68d4e6bf30f514bc8648afb95d57611c0c26c8c99a097454d50e1225a23d2c37295834f7258abc6d8b16c0a46416efc8d68d7b5084c
+EBUILD microsoft-edge-134.0.3124.51.ebuild 2612 BLAKE2B bc206fe3dfbc9e2da29abdf85e2b69e05b6bfcb782603f6ca1f84b8a09c0f650a199d3d15d00ca9ac77eb98210be66f3bd3b812be38cca6d7b7e06fcd326b903 SHA512 644cdb2869b083b831db7d6880ef7259dff6d3b7676fff833d4b561b9eb9196bede5ffc8f8566d32641c385f25cfd5ee9bda94339577ab52a4660f66d285082e
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge/microsoft-edge-133.0.3065.92-r1.ebuild b/www-client/microsoft-edge/microsoft-edge-134.0.3124.51.ebuild
index 216070691eb2..216070691eb2 100644
--- a/www-client/microsoft-edge/microsoft-edge-133.0.3065.92-r1.ebuild
+++ b/www-client/microsoft-edge/microsoft-edge-134.0.3124.51.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 6afe30d91a6e..8b26d0b49666 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,7 +1,7 @@
-DIST opera-beta_117.0.5408.22_amd64.deb 126393076 BLAKE2B aa93a3ca8cd17925a46d419cf7561d15dfb9d334e0fb9029cfd8ca17d45d6b2a4f6f2aa6849801ef6be71987914889c08832cd230dcf2bf9bca32ad2be33d057 SHA512 6c98cb226ee850b9b27ceea585cb6da2c20afb2100e9e74cdd7d5f91eec582c41332b9c34d627acf9006cea415e5663bf160ad55ab93be5ae7cbc328535385f2
 DIST opera-beta_117.0.5408.27_amd64.deb 126421012 BLAKE2B 138b436c2b0aab94a1491b947793c52af6297128dce8b18382f756a3011e9532d74e84efb0373dc8ccec7b9308392033c3ab3813eebea2b41ccc8d2697627284 SHA512 bd50946a4414c1e603b6e568dc4819820a9e6a468b65480d5011fc8222ca9911b5efc01d221b72afec77d5ffc96e1d699524ddba82b52a23b06cb0bd5fb67d2b
 DIST opera-beta_117.0.5408.47_amd64.deb 126791460 BLAKE2B 91afc6071510d31ecfb3408c98d5522ec533ea1c57c344598584a82e708c054ff52396f07656adbcb8f956cba568cfef59d94cc6ab7e5e3f9abe049c46650da9 SHA512 4e858c63e110e791968883b49caf947a3f30b9bdd60defd4ce55a9a1ac06bacd652bfbb745c401d81721ca740a4beee633e940a2bef1515d67b97c649461406e
-EBUILD opera-beta-117.0.5408.22-r1.ebuild 4124 BLAKE2B 6a481715601d600561f656f6e3dde12ce16bdbc83857454f2643ca70fd503af858540f1a0bc3d1717f9cffb2e394d18669fc1bfcf6109d06e30bd3fac806d8f2 SHA512 a788134a4376d3967879ed99e536c9a584d978312f385f8a4805c2a9a406eda47928c3e23aa9009a82975f39b883cf9225d0fc72c9020b48fa69445a0f251372
+DIST opera-beta_118.0.5461.4_amd64.deb 128203336 BLAKE2B 3deff2af8ca6233ef2280fad5668c54244ec2c1245c462d4f72aec9174412f80258b4169c3606fda085447a7c5c95e1dc36494744cc4c40473244426c8ff0866 SHA512 b2dbdf62b6a8675ea04df09a98b999283b827bd05ad465656cf0f062855b3d8623948bba8336830a636326a37bc7226778260c8758e1c879f8fb030db6ebe93f
 EBUILD opera-beta-117.0.5408.27-r1.ebuild 4124 BLAKE2B 6a481715601d600561f656f6e3dde12ce16bdbc83857454f2643ca70fd503af858540f1a0bc3d1717f9cffb2e394d18669fc1bfcf6109d06e30bd3fac806d8f2 SHA512 a788134a4376d3967879ed99e536c9a584d978312f385f8a4805c2a9a406eda47928c3e23aa9009a82975f39b883cf9225d0fc72c9020b48fa69445a0f251372
 EBUILD opera-beta-117.0.5408.47-r1.ebuild 4124 BLAKE2B 6a481715601d600561f656f6e3dde12ce16bdbc83857454f2643ca70fd503af858540f1a0bc3d1717f9cffb2e394d18669fc1bfcf6109d06e30bd3fac806d8f2 SHA512 a788134a4376d3967879ed99e536c9a584d978312f385f8a4805c2a9a406eda47928c3e23aa9009a82975f39b883cf9225d0fc72c9020b48fa69445a0f251372
+EBUILD opera-beta-118.0.5461.4.ebuild 4124 BLAKE2B 6a481715601d600561f656f6e3dde12ce16bdbc83857454f2643ca70fd503af858540f1a0bc3d1717f9cffb2e394d18669fc1bfcf6109d06e30bd3fac806d8f2 SHA512 a788134a4376d3967879ed99e536c9a584d978312f385f8a4805c2a9a406eda47928c3e23aa9009a82975f39b883cf9225d0fc72c9020b48fa69445a0f251372
 MISC metadata.xml 544 BLAKE2B e8594a0cb9a73ac5901ece78db220822043dca9faec994810af426f96e2ece7fdb069c5f1d639f66d1236ec83e6c46e50bd21c49f8a075cf0de41c9db9afd8a0 SHA512 2361ebdde2707166e465058b41a893b4c14db7c7ba8f4fe34f7ab34da4275f0af691e55881232a9253f5d793ff76e61d57689f56dd8ab879fc3ecb3294fc8777
diff --git a/www-client/opera-beta/opera-beta-117.0.5408.22-r1.ebuild b/www-client/opera-beta/opera-beta-118.0.5461.4.ebuild
index e0100498bd55..e0100498bd55 100644
--- a/www-client/opera-beta/opera-beta-117.0.5408.22-r1.ebuild
+++ b/www-client/opera-beta/opera-beta-118.0.5461.4.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index f3513dfe1659..814535c0cb05 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,7 +1,7 @@
-DIST opera-developer_118.0.5439.0_amd64.deb 126627676 BLAKE2B e41027bd15ae62f49bfb80c2ce4c1306d4b3b69137301102a61d49c636a4544a99bad4e0b7c86b17708ff2f93853f223df7a9f4fc751f0da460b81bb2c633484 SHA512 424ddf9c910b5c80db3d4bf5e3d3f3b2bf8d57e8551f9e6f0fec1cdfb033b8cea091adecbc7fbde5be188d12f4d210c38f1cdd535f468e532c3c793033ba6826
 DIST opera-developer_118.0.5446.0_amd64.deb 126159672 BLAKE2B 96b04f0d890f588756e669cde6cfe5ac0f519d6a2f7fc35bdcc13fbc540688d34ac44e655b452a37b7cf4cfd49d2bf9f49fdb5f6a5a98bf93ca367736cd893eb SHA512 533079d61a35b483c89d2e6f883a6183323e36e624d7003432d6009770b66ba0b7e04845c31d1a7043c4e28521bb780667b70c41c1ea8b453bea1214c9463913
 DIST opera-developer_118.0.5456.0_amd64.deb 126109816 BLAKE2B 426a97fb7b80c7cd996b0a80625aa4b55466177313108f23f36e0374159f14b354e28b7490c42f336280da887a1289fb16bacc770784759be41e1bc3eb1e536a SHA512 56ebd60619843b834a184e739d77dac03f82ea5d937e31919eda11d49f37882a4c76fd000241928b7a2550f9a7ab031617074f15ec261a48c60000b0c3bb8382
-EBUILD opera-developer-118.0.5439.0-r1.ebuild 4124 BLAKE2B 6a481715601d600561f656f6e3dde12ce16bdbc83857454f2643ca70fd503af858540f1a0bc3d1717f9cffb2e394d18669fc1bfcf6109d06e30bd3fac806d8f2 SHA512 a788134a4376d3967879ed99e536c9a584d978312f385f8a4805c2a9a406eda47928c3e23aa9009a82975f39b883cf9225d0fc72c9020b48fa69445a0f251372
+DIST opera-developer_119.0.5467.0_amd64.deb 128203124 BLAKE2B 5be559a74b960c20ae6d7914ed6dcda1d22018b1a6aef8319f2b0295a9dde9959c3c9e3c86ecbff7860f9883474eac5982a12dea4ca4cc1b5f763b2cfe422352 SHA512 f152b2e4810987183ab116ea3f829beea0c4c72c5296702dd752ecb08d8fbb5fa427332b41290ed1bb71a65c11b89fa97ba42bf1b132eeb52b78c96b01ef008b
 EBUILD opera-developer-118.0.5446.0-r1.ebuild 4124 BLAKE2B 6a481715601d600561f656f6e3dde12ce16bdbc83857454f2643ca70fd503af858540f1a0bc3d1717f9cffb2e394d18669fc1bfcf6109d06e30bd3fac806d8f2 SHA512 a788134a4376d3967879ed99e536c9a584d978312f385f8a4805c2a9a406eda47928c3e23aa9009a82975f39b883cf9225d0fc72c9020b48fa69445a0f251372
 EBUILD opera-developer-118.0.5456.0-r1.ebuild 4124 BLAKE2B 6a481715601d600561f656f6e3dde12ce16bdbc83857454f2643ca70fd503af858540f1a0bc3d1717f9cffb2e394d18669fc1bfcf6109d06e30bd3fac806d8f2 SHA512 a788134a4376d3967879ed99e536c9a584d978312f385f8a4805c2a9a406eda47928c3e23aa9009a82975f39b883cf9225d0fc72c9020b48fa69445a0f251372
+EBUILD opera-developer-119.0.5467.0.ebuild 4124 BLAKE2B 6a481715601d600561f656f6e3dde12ce16bdbc83857454f2643ca70fd503af858540f1a0bc3d1717f9cffb2e394d18669fc1bfcf6109d06e30bd3fac806d8f2 SHA512 a788134a4376d3967879ed99e536c9a584d978312f385f8a4805c2a9a406eda47928c3e23aa9009a82975f39b883cf9225d0fc72c9020b48fa69445a0f251372
 MISC metadata.xml 544 BLAKE2B e8594a0cb9a73ac5901ece78db220822043dca9faec994810af426f96e2ece7fdb069c5f1d639f66d1236ec83e6c46e50bd21c49f8a075cf0de41c9db9afd8a0 SHA512 2361ebdde2707166e465058b41a893b4c14db7c7ba8f4fe34f7ab34da4275f0af691e55881232a9253f5d793ff76e61d57689f56dd8ab879fc3ecb3294fc8777
diff --git a/www-client/opera-developer/opera-developer-118.0.5439.0-r1.ebuild b/www-client/opera-developer/opera-developer-119.0.5467.0.ebuild
index e0100498bd55..e0100498bd55 100644
--- a/www-client/opera-developer/opera-developer-118.0.5439.0-r1.ebuild
+++ b/www-client/opera-developer/opera-developer-119.0.5467.0.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 0727dc6b7018..cda935aee23a 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,3 +1,3 @@
-DIST opera-stable_117.0.5408.53_amd64.deb 126767576 BLAKE2B 3fb1cdc40a52d864bc46f1879d6988f3ea0034f9b0dbe519064d2383c4317e5df2432d9fb50e296bd4e40cc9e062e6d208ec80b9ec23eebe76c2b8c8388eb380 SHA512 cf6513e2cefd5e3a7711dd2349ec992f826d14110ef70cc11717ece2e3c7a89c8b6477b781f5aeaec7088dcf0d3050ba93b05d6f112319aa94a0e86f61288cee
-EBUILD opera-117.0.5408.53-r1.ebuild 4123 BLAKE2B 364dfd913d3306bdfe909f9c3a2fb26479c14f015732e439d569d01d9616946dca4059e5f7ab835186ee27a9aab29c937cb9008f4ed7c738dbb5ed2e3af628a6 SHA512 f877a330f8b0f5951014d1e14b803a70960a1da8190085ebbbb18aaa4aea5309422697db5eb81d27deb0fbd4ec14b42a4a46dbea486b4b99bdf4e90e62de2fca
+DIST opera-stable_117.0.5408.93_amd64.deb 126800584 BLAKE2B 9bad27ffd804eeb16736abf57a39dcfa85dd4dae04b0b39f7d85b26f6653c665c8516febe03afb44c4dca530416318ab42756a51767d271810808ab2db55d6e6 SHA512 cd6b360aa10ea0a00b36b1f0ac89ddf9c95b0741f19401a1a1b8c30ff344be1653044a1e50cb47f4e85c399052227d13bcdc3904fc751ee895c6d1ad6cc43d75
+EBUILD opera-117.0.5408.93.ebuild 4123 BLAKE2B 364dfd913d3306bdfe909f9c3a2fb26479c14f015732e439d569d01d9616946dca4059e5f7ab835186ee27a9aab29c937cb9008f4ed7c738dbb5ed2e3af628a6 SHA512 f877a330f8b0f5951014d1e14b803a70960a1da8190085ebbbb18aaa4aea5309422697db5eb81d27deb0fbd4ec14b42a4a46dbea486b4b99bdf4e90e62de2fca
 MISC metadata.xml 544 BLAKE2B 94b2f6807c021794769fc62b041c69bd08a0d307c51db96109bd45a1fff240d586c51daa91e894055e47291505750f07e9054b6b1b364a691c18f5711acbe9b4 SHA512 691c7b62fa7c8a46e4cc981a2f211a1609b1c57620aca668b001eeaa2cbcd2f38299680c4707a73a8f32ee19b054cd131a2b09600bac30b8530af35142694ff7
diff --git a/www-client/opera/opera-117.0.5408.53-r1.ebuild b/www-client/opera/opera-117.0.5408.93.ebuild
index 795df09e65bf..795df09e65bf 100644
--- a/www-client/opera/opera-117.0.5408.53-r1.ebuild
+++ b/www-client/opera/opera-117.0.5408.93.ebuild
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index 898b45ea25f0..f6126725cb3e 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -2,5 +2,7 @@ AUX w3m-0.5.3_p20210102-fix-configure-gettext.patch 635 BLAKE2B c7bb5fca7188a355
 AUX w3m-0.5.3_p20210102-restore-gettext-macro.patch 1076 BLAKE2B 8ba58bee28e506e20306a98e26af624fecfead21976cb0f0fc06ed443aab339c8c2f4c376b2bdbbe5d3232c7f3f88d1793e5059ec9fb22af8e2f34992ea1e15a SHA512 3c58ad896c711a41ecb915fa32318c69f9326a795d0f071120f5cecb8dfc2e7cc7a9174143b34ae7cd8b854037a5b6506bde4c063213bc9cc4a78a5090e3e83c
 AUX w3m.mailcap 44 BLAKE2B ae8bde48a638a61bcac9c6b3a0e001666e0c17a3e6fff2d2b4da870fde8a5fc0eb8314d9b818399ae502209a2fa4fbdf4bfb07e56e29a275cb2133656da52dfc SHA512 a66ef535a62f593910c1c99865363e7fc8af1815d24f2ccda86a72c0b777ff388100677f0e14e6f57a6786fdbde62cfc3fea554e659d54663f44cfba3e5c67d2
 DIST w3m-0.5.3+git20230121.tar.gz 2322709 BLAKE2B d4ebed126e7b4205c1282ec0dd7c7db34fb69768084142a0df9c4d051ac74642d5c62b4cff2be368a1db391c93ff6394842a52cfe68d1cdfcd9fb9c1a5c386e5 SHA512 f220aabf69cf11ca7560c1519a971bdb1cc0baa443b1b46cd8fca2a4defb614653dd9ba637afbf9315f3b63a349f972436348c2f93d06665573057e4232eab1c
+DIST w3m-0.5.3_p20240916.tar.gz 2322816 BLAKE2B 13c85c4f99eaeb7acd755603e9ce07637fe9869188a775110aa9f8edf910c471da2f1c91e7e25b4f7a2faf6fc5ccf69f2aa72ef27b0959350c0f96fe03968f59 SHA512 976d11f6f2fb9bdc93693d51a2566b2017acbd4afa1f20d86aa838af1ef2c5a3630b88154220248bae5e5c096d5c4356cdd23dea30860773149787e8006c1e6d
 EBUILD w3m-0.5.3_p20230121.ebuild 3186 BLAKE2B a692d017a4038335deb9535a5cc7b86c750dd6f2b6edcafb967c4b609ce0a203c55f22b69a7f81647da67f52e7f6cf3156aa29f709dce293ce4d044c7dc1cf46 SHA512 d1da5ed306c1ff009f9b4ad9e25c672e82fb27c114b4fd13ddc98a241b386e2071f65d519c1b37421c3698614743cde65f744bd1dc14b1af5422e207bd47f090
-MISC metadata.xml 670 BLAKE2B 0a789546faf24063965ea63dd8efd9f7bdb92e926b567b1cd36b10172d5a2b2967adceb13ac498a51b0edec0530a542b240f711bdd501bbc353a46cd0607b5b3 SHA512 6c659d358134a1d19edeadad52d7c51ab92a222c3ae6a93b8d552a3c3a4032e310fefd99ebeb1ac6591969bcc78eebb2a8cccf6f4bdb77771d890f1ca340f09f
+EBUILD w3m-0.5.3_p20240916.ebuild 3226 BLAKE2B 8502fa7ac19068e2555662ec8a18da29ca30ce7ad9299d1597e5254c74b82d9595e2385a9b8e14269faf49ec5f90ddccf2c29d63b1b1b47253d76ed4ff70addb SHA512 01f834c19a07e62aaa51f59e600846d6036447c1852fb88486ff73e1422a477271e0e38ada672c1c43ed221002dd1bedd26652518544b8ec950069b2a5486c77
+MISC metadata.xml 549 BLAKE2B c6d20e1b43fc618f5accd4956a3584ea956529145361affec870cf936addbc3554b9598a6248e6af562b088313d1f22ccd4350f3a2f6fe6c32ffeed67687ec8d SHA512 30623f8e3bf442fbbb9e863e0a042a25b52515b2f782c353edf86ee85e1a858ce35b90bafdef3a7357d6050e11c6c960fefa2382085f284ccc6084c4f1c2961c
diff --git a/www-client/w3m/metadata.xml b/www-client/w3m/metadata.xml
index 5472d90dcdaa..54f8f23c6f20 100644
--- a/www-client/w3m/metadata.xml
+++ b/www-client/w3m/metadata.xml
@@ -13,8 +13,4 @@
 		<flag name="gdk-pixbuf">Enable support for <pkg>x11-libs/gdk-pixbuf</pkg></flag>
 		<flag name="lynxkeymap">If you prefer Lynx-like key binding</flag>
 	</use>
-	<upstream>
-		<remote-id type="sourceforge">w3m</remote-id>
-		<remote-id type="github">tats/w3m</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/www-client/w3m/w3m-0.5.3_p20240916.ebuild b/www-client/w3m/w3m-0.5.3_p20240916.ebuild
new file mode 100644
index 000000000000..6396a086ec03
--- /dev/null
+++ b/www-client/w3m/w3m-0.5.3_p20240916.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools prefix toolchain-funcs flag-o-matic
+
+DESCRIPTION="Text based WWW browser, supports tables and frames"
+HOMEPAGE="https://git.sr.ht/~rkta/w3m"
+# based on oldstable branch
+COMMIT="b951c6ab75efd87810736b37ec053192c38cb80c"
+SRC_URI="https://git.sr.ht/~rkta/w3m/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/w3m-${COMMIT}"
+
+LICENSE="w3m"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="fbcon gdk-pixbuf gpm imlib l10n_ja lynxkeymap nls nntp ssl unicode X xface"
+
+REQUIRED_USE="
+	fbcon? ( ?? ( gdk-pixbuf imlib ) )
+	X? ( ?? ( gdk-pixbuf imlib ) )
+"
+
+RDEPEND="
+	dev-libs/boehm-gc:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	gdk-pixbuf? (
+		x11-libs/gdk-pixbuf
+		X? ( x11-libs/gdk-pixbuf-xlib )
+	)
+	!gdk-pixbuf? (
+		imlib? ( media-libs/imlib2[X?] )
+	)
+	gpm? ( sys-libs/gpm )
+	ssl? ( dev-libs/openssl:0= )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libXdmcp
+		x11-libs/libXext
+	)
+	xface? ( media-libs/compface )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.3_p20210102-restore-gettext-macro.patch
+	"${FILESDIR}"/${PN}-0.5.3_p20210102-fix-configure-gettext.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i "/^AR=/s:ar:$(tc-getAR):" {.,${PN}img,libwc}/Makefile.in || die
+	hprefixify acinclude.m4
+
+	AT_NOEAUTOHEADER="yes" AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+	local image imagelib
+
+	# Bug: https://bugs.gentoo.org/943868
+	append-cflags -std=gnu17
+
+	if use gdk-pixbuf ; then
+		imagelib="gtk3"
+	elif use imlib ; then
+		imagelib="imlib2"
+	fi
+	if [[ -n "${imagelib}" ]] ; then
+		use X     && image="${image}${image:+,}x11"
+		use fbcon && image="${image}${image:+,}fb"
+	fi
+	# emacs-w3m doesn't like "--enable-m17n --disable-unicode,"
+	# so we better enable or disable both. Default to enable
+	# m17n and unicode, see bug #47046.
+	if use l10n_ja ; then
+		myconf+=( --enable-japanese=$(usex unicode U E) )
+	else
+		myconf+=( --with-charset=$(usex unicode UTF-8 US-ASCII) )
+	fi
+	# lynxkeymap IUSE flag. bug #49397
+	myconf+=( --enable-keymap=$(usex lynxkeymap lynx ${PN}) )
+
+	econf \
+		$(use_enable gpm mouse) \
+		$(use_enable nls) \
+		$(use_enable nntp) \
+		$(use_enable ssl digest-auth) \
+		$(use_enable xface) \
+		$(use_with ssl) \
+		--enable-image=${image:-no} \
+		--enable-m17n \
+		--enable-unicode \
+		--with-browser="${EPREFIX}/usr/bin/xdg-open" \
+		--with-editor="${EPREFIX}/usr/bin/vi" \
+		--with-imagelib="${imagelib:-no}" \
+		--with-mailer="${EPREFIX}/bin/mail" \
+		--without-migemo \
+		--with-termlib=yes \
+		"${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc/${PN}
+	newins "${FILESDIR}"/${PN}.mailcap mailcap
+
+	insinto /usr/share/${PN}/Bonus
+	doins Bonus/{*.{cgi,rb},html*,makeref}
+
+	docinto en
+	dodoc doc/{HISTORY,README,keymap,menu}*
+	newdoc Bonus/README.eng README.Bonus
+	docinto html/en
+	dodoc doc/*.html
+
+	docinto de
+	dodoc doc-de/README*
+	docinto html/de
+	dodoc doc-de/*.html
+
+	docinto ja
+	dodoc doc-jp/{HISTORY,README,keymap,menu}*
+	newdoc Bonus/README README.Bonus
+	docinto html/ja
+	dodoc doc-jp/*.html
+}
author	V3n3RiX <venerix@koprulu.sector>	2025-03-12 01:49:51 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2025-03-12 01:49:51 +0000
commit	ef0fedb39c21a343a3f316726f272bad9005b22c (patch)
tree	0d64e58453e117f61a9e1641532926278f51b72e /www-client
parent	cf7807d7aea23a99a144afceaba961cfed652b5f (diff)