9 files changed, 157 insertions, 254 deletions
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index e41e34504d4c..decd4c343328 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,3 +1,4 @@
 DIST glib-2.82.5.tar.xz 5554704 BLAKE2B e7853034be1137f8b793483df9e9ce1465dd10a990eb9b3cb9ac76c9f8f86ccc6fda85645b04b35963b28c33e0f6c02df4f3d03e06cc278b8515e588d6bd05f6 SHA512 a6b035c32a42b9d6f4c031a29da405848002619654b58c9205f2f78dbb9698cd5866f31ab213adc04aa214d2c48840a9592c0a1e9201e6851ebd435635f393ae
 DIST glib-2.84.3.tar.xz 5615704 BLAKE2B 48444b91be68530de05667e2e009dcdc63af2f95cc978a461d930b943772e52b6c9d0e797aea3a9a5713758f22ee60a190c7d601b170c6c853fce624e5c327d7 SHA512 73f2d67d2ef5b4dc8cd2f6df9ce7903853ec619924e2927adbc73d706974a7d660afea55be18e12ccb0dee1145cf4149b743278d2b128fd466e3df2bbf90ef57
 DIST glib-2.84.4.tar.xz 5618200 BLAKE2B 5faee382433085cd598545a99e2e95ce430be4ac5ca10106b70f2404ddacf328f4223bc092a23025f9bf8b936619a88a9dfb220674a07e9250cf4213c6213be9 SHA512 2de9b2f7376c0e5f6ee585087090675d597c474199a10d04aad18df688b6ca77d17e93a86ec07482898663f51c82121992272496318138f77ca5ad2c340a4bd3
+DIST glib-2.86.0.tar.xz 5679348 BLAKE2B 089fa2d34dacb360943cb18ce95ad880769300540e9f8ce56045cd19d0285526b8058fa79f9f0fede1ae6b4a6d9a73f3aa0f0e0ebfa18e728dbadbee3bd30d0a SHA512 6ccf5fba13e06012135ec4b5e65c9ad61460f32fc00457081ca799a0518e872589c589b01e1846a23499fa7d4425727b95774851d7a89b15cd71260e0d13bfdd
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.86.0.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.86.0.ebuild
new file mode 100644
index 000000000000..bb3d561f1bd1
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.86.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_REQ_USE="xml(+)"
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-${PV}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	>=dev-python/docutils-0.21.1
+"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	local MAJOR_VERSION=$(ver_cut 1)
+	local MINOR_VERSION=$(ver_cut 2)
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	sed -e "s:@VERSION@:${PV}:" \
+		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
+		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	rst2man \
+		"${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.rst" \
+		"${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index e41e34504d4c..decd4c343328 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,3 +1,4 @@
 DIST glib-2.82.5.tar.xz 5554704 BLAKE2B e7853034be1137f8b793483df9e9ce1465dd10a990eb9b3cb9ac76c9f8f86ccc6fda85645b04b35963b28c33e0f6c02df4f3d03e06cc278b8515e588d6bd05f6 SHA512 a6b035c32a42b9d6f4c031a29da405848002619654b58c9205f2f78dbb9698cd5866f31ab213adc04aa214d2c48840a9592c0a1e9201e6851ebd435635f393ae
 DIST glib-2.84.3.tar.xz 5615704 BLAKE2B 48444b91be68530de05667e2e009dcdc63af2f95cc978a461d930b943772e52b6c9d0e797aea3a9a5713758f22ee60a190c7d601b170c6c853fce624e5c327d7 SHA512 73f2d67d2ef5b4dc8cd2f6df9ce7903853ec619924e2927adbc73d706974a7d660afea55be18e12ccb0dee1145cf4149b743278d2b128fd466e3df2bbf90ef57
 DIST glib-2.84.4.tar.xz 5618200 BLAKE2B 5faee382433085cd598545a99e2e95ce430be4ac5ca10106b70f2404ddacf328f4223bc092a23025f9bf8b936619a88a9dfb220674a07e9250cf4213c6213be9 SHA512 2de9b2f7376c0e5f6ee585087090675d597c474199a10d04aad18df688b6ca77d17e93a86ec07482898663f51c82121992272496318138f77ca5ad2c340a4bd3
+DIST glib-2.86.0.tar.xz 5679348 BLAKE2B 089fa2d34dacb360943cb18ce95ad880769300540e9f8ce56045cd19d0285526b8058fa79f9f0fede1ae6b4a6d9a73f3aa0f0e0ebfa18e728dbadbee3bd30d0a SHA512 6ccf5fba13e06012135ec4b5e65c9ad61460f32fc00457081ca799a0518e872589c589b01e1846a23499fa7d4425727b95774851d7a89b15cd71260e0d13bfdd
diff --git a/dev-util/glib-utils/glib-utils-2.86.0.ebuild b/dev-util/glib-utils/glib-utils-2.86.0.ebuild
new file mode 100644
index 000000000000..a8beae9e1483
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.86.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{11..14} )
+GNOME_ORG_MODULE="glib"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Build utilities for GLib using projects"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-python/docutils-0.21.1
+"
+
+src_configure() { :; }
+
+do_rst2man_command() {
+	rst2man \
+		--syntax-highlight=none \
+		"${1}" "${2}" || die "manpage generation failed"
+}
+
+src_compile() {
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
+	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
+	do_rst2man_command docs/reference/gobject/glib-genmarshal.rst docs/reference/gobject/glib-genmarshal.1
+	do_rst2man_command docs/reference/gobject/glib-mkenums.rst docs/reference/gobject/glib-mkenums.1
+	do_rst2man_command docs/reference/glib/gtester-report.rst docs/reference/glib/gtester-report.1
+}
+
+src_install() {
+	python_fix_shebang gobject/glib-genmarshal
+	python_fix_shebang gobject/glib-mkenums
+	python_fix_shebang glib/gtester-report
+	exeinto /usr/bin
+	doexe gobject/glib-genmarshal
+	doexe gobject/glib-mkenums
+	doexe glib/gtester-report
+	doman docs/reference/gobject/glib-genmarshal.1
+	doman docs/reference/gobject/glib-mkenums.1
+	doman docs/reference/glib/gtester-report.1
+}
diff --git a/dev-util/patchutils/patchutils-0.4.4.ebuild b/dev-util/patchutils/patchutils-0.4.4-r1.ebuild
index da749ec62987..591624f9794d 100644
--- a/dev-util/patchutils/patchutils-0.4.4.ebuild
+++ b/dev-util/patchutils/patchutils-0.4.4-r1.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit autotools toolchain-funcs
+PYTHON_COMPAT=( python3_{11..14} )
+
+inherit autotools python-single-r1 toolchain-funcs
 
 DESCRIPTION="Collection of tools that operate on patch files"
 HOMEPAGE="https://cyberelk.net/tim/software/patchutils/"
@@ -13,20 +15,27 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="pcre"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="pcre? ( dev-libs/libpcre2:= )"
+RDEPEND="
+	!<app-shells/bash-completion-2.16.0-r3
+	pcre? ( dev-libs/libpcre2:= )
+	${PYTHON_DEPS}
+"
 DEPEND="
 	${RDEPEND}
 	elibc_musl? ( >=sys-libs/error-standalone-2.0 )
 "
 BDEPEND="virtual/pkgconfig"
-RDEPEND+="
-	!<app-shells/bash-completion-2.16.0-r3
-"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
 
 src_prepare() {
 	default
 	eautoreconf
+	python_fix_shebang patchview
 }
 
 src_configure() {
diff --git a/dev-util/selenium-manager/Manifest b/dev-util/selenium-manager/Manifest
index 9b416c8aedc0..2e615023594b 100644
--- a/dev-util/selenium-manager/Manifest
+++ b/dev-util/selenium-manager/Manifest
@@ -1,10 +1,8 @@
-DIST selenium-4.30.0-crates.tar.xz 23141460 BLAKE2B 5570eb553df4181b64800ca516fdcc7514c1485533585451ffbfa3ab0b15e2bc906c50bde83a1ade75227744a7e927aa2eb16e3b91bf3c9f1d9c210c704aa16d SHA512 e210bee9cf4280b8607b16a417d591169fba5703ed849e6811004ee14df24a93d335d1019cd00ae004acb189b5a0fa99b55555a858ee394139b82d5612e2dc1d
 DIST selenium-4.33.0-crates.tar.xz 25111112 BLAKE2B 3bdc397ea8f5313d39473ec03b24e560060653dd7b5a29971923662cb3b29cf4531dc194397aae18dadbdedacfe59db04a72a9eefb4328bc120c42f7dd664dd5 SHA512 d281547009bf0006d96f43ad00ffb29f1ddb04d0c28e64470b7ea9db59d91170c136b80e40b2e1f23e1980d2e87c34fc802eea4c545af2a2fcfcfb5173d10dc5
 DIST selenium-4.35.0-crates.tar.xz 23704440 BLAKE2B 8ad56a78817c317c781d9ab4d72b22216ecd2082eee8ef27d43ec89d26eb6ac9d361638fe3535b6da2d34075b62130182b54339c1d967faa5c80f8c48d521c27 SHA512 4d0d2758f9bb81efc23b6f26fca0271c3444eb78f083d34e71d6d161d007d83242762775fa79fa80143d7c19ba801d0956aa4abffdb95b70d44d98443371bc46
+DIST selenium-4.36.0-crates.tar.xz 23351684 BLAKE2B cf345adec9156c1da3ee1a77fb7253363aeff1bc6590fae6a26a32ca87b2a894a64d6bdfbe82fdf42ba0d887dfb930df8d2762694975661896b2fbd8ac592569 SHA512 3d00b200fb8b9aed53968dd495f091f7b873af4075857542318e9c1437cd2ca9c38f64aab1488924c69b8d82f0c5368639ae70cc99e8742349584e3548160fb5
 DIST selenium-manager-4.26.0-crates.tar.xz 25659608 BLAKE2B 35c8c7aab560a16424580a79245bf096112b3eaa2a5a64a08535e5ad523331c905e1391138c5ee9555cb74169c758ffc6a1ef0ec36eba9754b883c66ae313321 SHA512 114c880feeead5cc37d57197b8d9eeefde428d9f8ed1f8c946f86064ec633e6f925c250114f91de8ed5fae6b1a25424754f008210f4f897a972c11a80a03eaf0
 DIST selenium-selenium-4.26.0.gh.tar.gz 77107740 BLAKE2B d4e466dbdb9a12126ae8ee9e311d5d997228da3b22620ead3dbf1a553232503fbd8c19470419d6ad5862acfc19f0012c4c48b3a5e1ccecaf0f7c4171f35904fb SHA512 03197215c04e8f6e151631d769975e70b5140d2d7635443c07e43e63b1c0cc3bc99b0694300ca4dbfea6178af9d037d28699a756ef74926a357f7a3030086182
-DIST selenium-selenium-4.31.0.gh.tar.gz 52458288 BLAKE2B 649d585e116ccd82e68f3b74b50cbbda5b9ac02c6ab8e72473b5775265205dc31ec69c846b1b39c91dceb63234bb02bf4833b321d101227f5873db6ad8897038 SHA512 e440e1b8e15b9e1f592b2466738f3982355a0757458bd7c8ef7eba31548df2bd449e54cea273a47f2b6bd0e68a2d75a1af67a791eff0cf3f601e685c4b8b237a
-DIST selenium-selenium-4.32.0.gh.tar.gz 52479399 BLAKE2B 01a2c0c172d4d25045b7f16d16c23945f4aaf48b422a9c926cdd6dbc728193a94d068c69f0317d3e5b8dd17df655581b3e5fd1e845cb18c1080f7a4aeb88d1dc SHA512 3beac9d23e9b92e54ff53195bb6376f6938019af9fdf9ad42210deb4bcd3b0fafe9e5098d4ba6e974d4d7f6bce6788622c0bd89ccf07117f3f7c7abad4e8831c
-DIST selenium-selenium-4.33.0.gh.tar.gz 52518597 BLAKE2B 126fd55707580ff1e8a1df129680dcfb3f6edd11cacc335bb0163cf0af7b9f713a5c73d70e963089e0bffd14bede21c04dcec8eb99aaa5be6719717411c73088 SHA512 6392f952081cac1c2d9a5d9b1a93da270a6605f370d25fa3e79551b8df648f527b1936448e42d5e75d89613a7306a5d8f351e471b7c783ef35e7b22be9eb2955
 DIST selenium-selenium-4.34.0.gh.tar.gz 52524095 BLAKE2B 1fe7e662697039708ce84ef4941f028369ca54089cd4f5075b3df2aa0d08373a3779ca201daa29ff5c4ad3d139f751a4525e114bfa80e3d0d297901309bf3bda SHA512 6e431e82d1ef4cb5dd47f319a95a43ebf68924b73f5de8e562ba21a0420d58098dcf63578699d36e3da5a6180fe7e433a50389a362357eb7c7f6d0a5770966b6
 DIST selenium-selenium-4.35.0.gh.tar.gz 52550104 BLAKE2B b7ed0fb513cfb2ed24aa8393497b349f930739c3d24a330e5942fbaa5505f31d7086396a430776a3a28a5f65927b92bf27c0a32e8c36d893b5d62ef73151d5ef SHA512 dc73829e3b0fcb7fb7ee1cc04574b95b63d23f67974575dbd66338e14a5cb2b06f983145ce874be0d7124e8828b0a41b99c75d3befb19e04cbf8d027d0bb983a
+DIST selenium-selenium-4.36.0.gh.tar.gz 52567842 BLAKE2B e5e715ce0d4e491f2551ea13c2b9cd6c1021fafd6b0bf0dacba9b0aa4e3f479816cb910c66e286e8cb7b737063705caa2c843db3ccb83f964b4bd64ff174d935 SHA512 b95037df807c827c8f110d112ec0d062c7bb3c71b9faf31f5bfae59b5bfd1c2e20b035c3c3ab180b2319f8ba952042fb77966eb44db5b803a545fa18e0285bb5
diff --git a/dev-util/selenium-manager/selenium-manager-4.32.0.ebuild b/dev-util/selenium-manager/selenium-manager-4.32.0.ebuild
deleted file mode 100644
index 9b6a458a0895..000000000000
--- a/dev-util/selenium-manager/selenium-manager-4.32.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-"
-
-inherit cargo
-
-TAG=selenium-${PV}
-MY_P=selenium-${TAG}
-CRATES_P=selenium-4.30.0
-DESCRIPTION="CLI tool that manages the browser/driver infrastructure required by Selenium"
-HOMEPAGE="
-	https://www.selenium.dev/
-	https://github.com/SeleniumHQ/selenium/
-"
-SRC_URI="
-	https://github.com/SeleniumHQ/selenium/archive/selenium-${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-if [[ ${PKGBUMPING} != ${PVR} ]]; then
-	SRC_URI+="
-		https://github.com/gentoo-crate-dist/selenium/releases/download/${CRATES_P}/${CRATES_P}-crates.tar.xz
-	"
-fi
-S="${WORKDIR}/${MY_P}/rust"
-
-LICENSE="Apache-2.0"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-3.0 Unicode-DFS-2016"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
-IUSE="telemetry test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-arch/zstd:=
-	sys-libs/zlib:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		|| (
-			www-client/firefox
-			www-client/firefox-bin
-		)
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_prepare() {
-	default
-
-	sed -i -e '/strip/d' Cargo.toml || die
-	if ! use telemetry; then
-		sed -i -e '/avoid-stats/s:false:true:' src/config.rs || die
-	fi
-
-	# Avoid tests requiring Internet or specific browsers (or trying
-	# to fetch them, whatever).
-	rm tests/browser_download_tests.rs || die
-	rm tests/cache_tests.rs || die
-	rm tests/exec_driver_tests.rs || die
-	rm tests/grid_tests.rs || die
-	rm tests/browser_tests.rs || die
-	rm tests/config_tests.rs || die
-	rm tests/iexplorer_tests.rs || die
-	rm tests/mirror_tests.rs || die
-	rm tests/output_tests.rs || die
-	rm tests/stable_browser_tests.rs || die
-	rm tests/webview_tests.rs || die
-
-	# enable system libraries where supported
-	export ZSTD_SYS_USE_PKG_CONFIG=1
-	sed -i -e '/features.*static/d' "${ECARGO_VENDOR}"/apple-xar-*/Cargo.toml || die
-
-	# remove unbundled sources, just in case
-	# (smoke.c is actually used to test system -lz, sigh)
-	find "${ECARGO_VENDOR}"/*-sys-*/ \
-		\( -name '*.c' -a -not -name 'smoke.c' \) -delete || die
-
-	# bzip2-sys requires a pkg-config file
-	# https://github.com/alexcrichton/bzip2-rs/issues/104
-	mkdir "${T}/pkg-config" || die
-	export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}
-	cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die
-		Name: bzip2
-		Version: 9999
-		Description:
-		Libs: -lbz2
-	EOF
-}
-
-src_test() {
-	local -x PATH=${T}/bin:${PATH}
-
-	mkdir "${T}/bin" || die
-	if ! has_version "www-client/firefox"; then
-		# upstream expects "firefox" rather than "firefox-bin"
-		ln -s "$(type -P firefox-bin)" "${T}/bin/firefox" || die
-	fi
-
-	cargo_src_test --no-fail-fast
-}
-
-src_install() {
-	cargo_src_install
-	einstalldocs
-	dodoc README.md
-
-	newenvd - 70selenium-manager <<-EOF || die
-		SE_MANAGER_PATH="${EPREFIX}/usr/bin/selenium-manager"
-	EOF
-}
diff --git a/dev-util/selenium-manager/selenium-manager-4.33.0.ebuild b/dev-util/selenium-manager/selenium-manager-4.33.0.ebuild
deleted file mode 100644
index 3beda6504379..000000000000
--- a/dev-util/selenium-manager/selenium-manager-4.33.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-"
-
-inherit cargo
-
-TAG=selenium-${PV}
-MY_P=selenium-${TAG}
-CRATES_P=selenium-4.33.0
-DESCRIPTION="CLI tool that manages the browser/driver infrastructure required by Selenium"
-HOMEPAGE="
-	https://www.selenium.dev/
-	https://github.com/SeleniumHQ/selenium/
-"
-SRC_URI="
-	https://github.com/SeleniumHQ/selenium/archive/selenium-${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-if [[ ${PKGBUMPING} != ${PVR} ]]; then
-	SRC_URI+="
-		https://github.com/gentoo-crate-dist/selenium/releases/download/${CRATES_P}/${CRATES_P}-crates.tar.xz
-	"
-fi
-S="${WORKDIR}/${MY_P}/rust"
-
-LICENSE="Apache-2.0"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-3.0 Unicode-DFS-2016"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
-IUSE="telemetry test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-arch/zstd:=
-	sys-libs/zlib:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		|| (
-			www-client/firefox
-			www-client/firefox-bin
-		)
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_prepare() {
-	default
-
-	sed -i -e '/strip/d' Cargo.toml || die
-	if ! use telemetry; then
-		sed -i -e '/avoid-stats/s:false:true:' src/config.rs || die
-	fi
-
-	# Avoid tests requiring Internet or specific browsers (or trying
-	# to fetch them, whatever).
-	rm tests/browser_download_tests.rs || die
-	rm tests/cache_tests.rs || die
-	rm tests/exec_driver_tests.rs || die
-	rm tests/grid_tests.rs || die
-	rm tests/browser_tests.rs || die
-	rm tests/config_tests.rs || die
-	rm tests/iexplorer_tests.rs || die
-	rm tests/mirror_tests.rs || die
-	rm tests/output_tests.rs || die
-	rm tests/stable_browser_tests.rs || die
-	rm tests/webview_tests.rs || die
-
-	# enable system libraries where supported
-	export ZSTD_SYS_USE_PKG_CONFIG=1
-	sed -i -e '/features.*static/d' "${ECARGO_VENDOR}"/apple-xar-*/Cargo.toml || die
-
-	# remove unbundled sources, just in case
-	# (smoke.c is actually used to test system -lz, sigh)
-	find "${ECARGO_VENDOR}"/*-sys-*/ \
-		\( -name '*.c' -a -not -name 'smoke.c' \) -delete || die
-
-	# bzip2-sys requires a pkg-config file
-	# https://github.com/alexcrichton/bzip2-rs/issues/104
-	mkdir "${T}/pkg-config" || die
-	export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}
-	cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die
-		Name: bzip2
-		Version: 9999
-		Description:
-		Libs: -lbz2
-	EOF
-}
-
-src_test() {
-	local -x PATH=${T}/bin:${PATH}
-
-	mkdir "${T}/bin" || die
-	if ! has_version "www-client/firefox"; then
-		# upstream expects "firefox" rather than "firefox-bin"
-		ln -s "$(type -P firefox-bin)" "${T}/bin/firefox" || die
-	fi
-
-	cargo_src_test --no-fail-fast
-}
-
-src_install() {
-	cargo_src_install
-	einstalldocs
-	dodoc README.md
-
-	newenvd - 70selenium-manager <<-EOF || die
-		SE_MANAGER_PATH="${EPREFIX}/usr/bin/selenium-manager"
-	EOF
-}
diff --git a/dev-util/selenium-manager/selenium-manager-4.31.0.ebuild b/dev-util/selenium-manager/selenium-manager-4.36.0.ebuild
index 9b6a458a0895..06e5fd1fcddd 100644
--- a/dev-util/selenium-manager/selenium-manager-4.31.0.ebuild
+++ b/dev-util/selenium-manager/selenium-manager-4.36.0.ebuild
@@ -5,12 +5,13 @@ EAPI=8
 
 CRATES="
 "
+RUST_MIN_VER="1.85.0"
 
 inherit cargo
 
 TAG=selenium-${PV}
 MY_P=selenium-${TAG}
-CRATES_P=selenium-4.30.0
+CRATES_P=selenium-${PV}
 DESCRIPTION="CLI tool that manages the browser/driver infrastructure required by Selenium"
 HOMEPAGE="
 	https://www.selenium.dev/
@@ -29,9 +30,12 @@ S="${WORKDIR}/${MY_P}/rust"
 
 LICENSE="Apache-2.0"
 # Dependent crate licenses
-LICENSE+=" Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-3.0 Unicode-DFS-2016"
+LICENSE+="
+	Apache-2.0 BSD CDLA-Permissive-2.0 ISC MIT MPL-2.0 Unicode-3.0 ZLIB
+	BZIP2
+"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="telemetry test"
 RESTRICT="!test? ( test )"
 
@@ -67,6 +71,7 @@ src_prepare() {
 	# to fetch them, whatever).
 	rm tests/browser_download_tests.rs || die
 	rm tests/cache_tests.rs || die
+	rm tests/electron_tests.rs || die
 	rm tests/exec_driver_tests.rs || die
 	rm tests/grid_tests.rs || die
 	rm tests/browser_tests.rs || die