10 files changed, 56 insertions, 276 deletions
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 6e9774fd6b68..036ab44ce968 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,4 +1,3 @@
-DIST diffoscope-272.tar.bz2 3155265 BLAKE2B 76f8475993dc8be7297b50a2dda71b965789f6de04143e22b3b28c25e6646d9744088a49181faeb488921eb192b85072d16fee35f41450ba389c491e6a43c7b5 SHA512 f74d0166526da10604f25ba0425d3acc540cb92780776d108b60b07d00fa1039ea5a3fde4fd260497e0cf6ae387457e6fff989c5795bca6ce14199f0c9a15174
-DIST diffoscope-277.tar.bz2 3143869 BLAKE2B 98f0356060c8430236941ff9ef45c51d34d681a0cb8f8085bf40775aaa98c4c97add603d954b235f8615c539fb591eab3d812261f3b33dbeaee8418fabeeb5af SHA512 7ecc32204ed420ca2547976bd0548f4b9a4dd2cebacbeb2a3faf0fa6ac4015724abb6a764a81f20aea20dafc871b7fb262eeac81b86a1cd9cdfa42353178ea0f
 DIST diffoscope-279.tar.bz2 3146297 BLAKE2B 7dc1c2a8362db6c012be04aa2562a04079707502d6f61e4ee0093fe46042ad122fe73d1faaf81e6b565d369ba3ec83f6056c4ef62a6fe4649ed376d0404b2864 SHA512 564e731847cbc68a6d8612f543d9d40575c4e9240acc7ec405310878c9288566a5c6dd4aa87e2517db5ef1abcc4ab6e29d3002ee5cce281200d9381de103243b
 DIST diffoscope-282.tar.bz2 3149915 BLAKE2B 32378adc17210054f5d8adb0e3396f16bbab214c83a138cc0b732085bdec3d0215e5329bcf8c9044e055556e3d04002253b52130590f1e7dc7cfaaefafcc9296 SHA512 5f049054b03940bb97a95cf60a1f7510ed3fbe1b14494f15edc872ecfc1f76a219f8255a4e7a574d9fecf47b75500c8f794c72bc508137e9051c451ba9bbb346
+DIST diffoscope-283.tar.bz2 3149385 BLAKE2B e50e4c31912c7bb0acaa3152c869937a9f4cbbcb0860775c58bbde13808ffcd0183032f7b444b2fb4d6cea83f943ac15f36a648a0f9fcbaaae5cfde098232d97 SHA512 e0c6ddd7b687b93dafdab81408d285b385efb3e2dd5c78c378943f03054e6ca59a18b6be7879023b54a571b18c5ada2722773626553761f245460abd239faef9
diff --git a/dev-util/diffoscope/diffoscope-272.ebuild b/dev-util/diffoscope/diffoscope-272.ebuild
deleted file mode 100644
index 02dfc9a9e482..000000000000
--- a/dev-util/diffoscope/diffoscope-272.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-# We could use pypi, but upstream provide distribution tarballs, so let's use those.
-# TODO: verify-sig
-SRC_URI="https://diffoscope.org/archive/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar test tcpdump zip zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	|| (
-		dev-python/python-magic[${PYTHON_USEDEP}]
-		sys-apps/file[python,${PYTHON_USEDEP}]
-	)
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/python-tlsh[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-alternatives/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/pypdf[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( virtual/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="
-	test? (
-		app-arch/p7zip
-		app-text/docx2txt
-		app-text/html2text
-		media-libs/libcaca
-		virtual/imagemagick-tools[jpeg]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# Test seems to use different tarball
-	tests/test_presenters.py::test_text_proper_indentation
-
-	# Needs triage
-	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
-	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-	tests/comparators/test_gif.py::test_has_visuals
-
-	# img2txt based failures, bug #797688
-	tests/comparators/test_ico_image.py::test_diff
-	tests/comparators/test_ico_image.py::test_diff_meta
-	tests/comparators/test_ico_image.py::test_diff_meta2
-	tests/comparators/test_ico_image.py::test_has_visuals
-	tests/comparators/test_jpeg_image.py::test_diff
-	tests/comparators/test_jpeg_image.py::test_compare_non_existing
-	tests/comparators/test_jpeg_image.py::test_diff_meta
-	tests/comparators/test_jpeg_image.py::test_has_visuals
-
-	# docx2txt based falures, bug #797688
-	tests/comparators/test_docx.py::test_diff
-
-	# Formatting
-	tests/test_source.py::test_code_is_black_clean
-
-	# Fails on ZFS
-	tests/test_main.py::test_non_unicode_filename
-
-	# Fails on (unreleased) LLVM 16 with minor difference
-	#tests/comparators/test_macho.py::test_llvm_diff
-	#tests/comparators/test_elf.py::test_libmix_differences
-
-	# Fails with perl-5.40
-	# https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/377
-	tests/comparators/test_epub.py::test_differences
-	tests/comparators/test_zip.py::test_metadata
-	tests/comparators/test_zip.py::test_extra_fields
-	tests/comparators/test_zip.py::test_commented
-)
-
-distutils_enable_tests pytest
-
-src_test() {
-	case $(tc-get-ptr-size) in
-		4)
-			EPYTEST_IGNORE+=(
-				# Needs fixing in Perl itself (bug #934443)
-				tests/comparators/test_epub.py
-				tests/comparators/test_zip.py
-			)
-			;;
-		*)
-			;;
-	esac
-
-	distutils-r1_src_test
-}
diff --git a/dev-util/diffoscope/diffoscope-277.ebuild b/dev-util/diffoscope/diffoscope-283.ebuild
index 6bde1d686b69..ec42b35a20e8 100644
--- a/dev-util/diffoscope/diffoscope-277.ebuild
+++ b/dev-util/diffoscope/diffoscope-283.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://diffoscope.org/archive/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
 find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
 mono opendocument pascal pdf postscript R rpm sqlite squashfs
diff --git a/dev-util/intel-graphics-system-controller/Manifest b/dev-util/intel-graphics-system-controller/Manifest
index 8067a443eac0..a857591ffdbc 100644
--- a/dev-util/intel-graphics-system-controller/Manifest
+++ b/dev-util/intel-graphics-system-controller/Manifest
@@ -1 +1,2 @@
 DIST intel-graphics-system-controller-0.9.3.tar.gz 206474 BLAKE2B 3af1caeed8d553b017f333ddacfbccb28e6d0f370ebc93b890686417fa400fb227f46cb83cfd686808a5e308ebbc2b2534b318ea4ba8a94a237b721e0ef5be37 SHA512 758059556efa6b94702291d11ca8267a3e4258299a324388c4a8fcb9efd2a2218ad354447ea32277439fc65d52f9481441d0bd699bfae1c375b7f807e21f9d94
+DIST intel-graphics-system-controller-0.9.5.tar.gz 207675 BLAKE2B 39e0bb6e7a81eadc31f44cad8a168c2077e39344bfe557a3d7417176c58b1cb15c22bebf0411d5b5c6af8e6acc2081f11a18383b5c45de8e7cd48f1aeb75b65e SHA512 6cd698e42cf5aa6b303fa1846b0906cbed16cb194bbdff860a11f9db31a2307a093f28d3caf19037ef9d4d62ef773066d88b9e0c0b7062fc24339ff4bdc9394e
diff --git a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.9.5.ebuild b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.9.5.ebuild
new file mode 100644
index 000000000000..1bcd0dc6cd03
--- /dev/null
+++ b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.9.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="igsc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="Intel graphics system controller firmware update library"
+HOMEPAGE="https://github.com/intel/igsc"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/V${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+cli doc"
+
+RDEPEND=">=dev-libs/metee-3.2.4:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		app-text/doxygen
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+	)
+"
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CLI="$(usex cli)"
+		-DENABLE_DOCS="$(usex doc)"
+		-DENABLE_PERF="OFF"
+		-DENABLE_WERROR="OFF"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DENABLE_TESTS="OFF"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.32.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.32.ebuild
index 7af26b2495c1..cd5b5d378dad 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.32.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.32.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 		https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	inherit pypi
 fi
 
diff --git a/dev-util/selenium-manager/Manifest b/dev-util/selenium-manager/Manifest
index cfad7eec6edf..7e8a5937bae8 100644
--- a/dev-util/selenium-manager/Manifest
+++ b/dev-util/selenium-manager/Manifest
@@ -1,4 +1,2 @@
-DIST selenium-manager-4.24.0-crates.tar.xz 27591764 BLAKE2B 42c120a77df5c48b840200772d3d49aa88c0cbfec67244d13435037631a8f0d67d03249031da44cfc6ecddfb8cd9b90b879df0be896a072141d98f772933aeab SHA512 93943e9cfc54f7e66fc25290c67bb6eee679de5c1a8c1af23c8e79d0ce15aaec4de8a38b8b2346c632ac8e93446cb8c5e37767ba955a3aa5850ad6f4dfdec340
 DIST selenium-manager-4.26.0-crates.tar.xz 25659608 BLAKE2B 35c8c7aab560a16424580a79245bf096112b3eaa2a5a64a08535e5ad523331c905e1391138c5ee9555cb74169c758ffc6a1ef0ec36eba9754b883c66ae313321 SHA512 114c880feeead5cc37d57197b8d9eeefde428d9f8ed1f8c946f86064ec633e6f925c250114f91de8ed5fae6b1a25424754f008210f4f897a972c11a80a03eaf0
-DIST selenium-selenium-4.25.0.gh.tar.gz 77158053 BLAKE2B 9978239a874d32e23d98ec98eb5292153496c42abcdd0f959875b2b460df5a85c0b532b6843e0d13b931078490958ebdc2944a8c21ce2eae24a0ac6a3c830772 SHA512 6d11d1aa22d27dbc07c3d39f5f852080c5089b12b1da0251e7b09c38ac3b8f56f452a24c64a20685eb0aff238698ab4bd18a8b7089c69f261cfbcdc679ceeac8
 DIST selenium-selenium-4.26.0.gh.tar.gz 77107740 BLAKE2B d4e466dbdb9a12126ae8ee9e311d5d997228da3b22620ead3dbf1a553232503fbd8c19470419d6ad5862acfc19f0012c4c48b3a5e1ccecaf0f7c4171f35904fb SHA512 03197215c04e8f6e151631d769975e70b5140d2d7635443c07e43e63b1c0cc3bc99b0694300ca4dbfea6178af9d037d28699a756ef74926a357f7a3030086182
diff --git a/dev-util/selenium-manager/selenium-manager-4.25.0-r1.ebuild b/dev-util/selenium-manager/selenium-manager-4.25.0-r1.ebuild
deleted file mode 100644
index 1e46fdad2294..000000000000
--- a/dev-util/selenium-manager/selenium-manager-4.25.0-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2024 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=${PN}-4.24.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://dev.gentoo.org/~mgorny/dist/${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-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/shadowman/shadowman-4.ebuild b/dev-util/shadowman/shadowman-4.ebuild
index 96ee258c49ff..2cf7df53373d 100644
--- a/dev-util/shadowman/shadowman-4.ebuild
+++ b/dev-util/shadowman/shadowman-4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/projg2/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="app-admin/eselect"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/watchman/watchman-2024.11.04.00.ebuild b/dev-util/watchman/watchman-2024.11.04.00.ebuild
index 78306fb44c6b..e73d7e0d7e29 100644
--- a/dev-util/watchman/watchman-2024.11.04.00.ebuild
+++ b/dev-util/watchman/watchman-2024.11.04.00.ebuild
@@ -244,7 +244,7 @@ LICENSE="MIT"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0 MIT Unicode-DFS-2016 WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="llvm-libunwind python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"