gentoo auto-resync : 29:05:2024 - 00:07:15

24 files changed, 211 insertions, 133 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 59dc2bdab305..7c5fc9911537 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 9648c5b3307b..a1be05176c70 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,5 +1,5 @@
 DIST cppcheck-2.13.0.tar.gz 3643744 BLAKE2B 942391bdc2ad009e1bf9f691835c268b33ae0a7c84ff68a1ea7985abbc65fc7ea6e319111ed6a968f4f93f3b682ce46447ba1e3b1fccd96535497f3fd190b913 SHA512 35f266cd247860aa0a0d84862faf4561f4efea096e641a01ebc3b1e4cea14c91c75773344da5bd3d48101c11ee7841b46f24419a9583e65bd242d0219a1ca418
 DIST cppcheck-2.9.tar.gz 3916529 BLAKE2B 5d75328e1fcd389376630502ad7427d3473392a9467e8731e6cd7c2c6349efccc05eddd7eca4cb361930661d2383a8d316e33bd3609b9333a710153d199e326d SHA512 69204a7ceac087470201482894e6422b99d0849f08641e80b2e341c9d164a1d2095e3a08a1fba2e9fa681783d07fe7277b30ea0cc0bf582431b5d13ab2f58c1f
-EBUILD cppcheck-2.13.0.ebuild 3119 BLAKE2B ad03c294e91bf4aff0d089401beb11cdaf8e90aa669bce868d20a5917f2454ab4d4740e48add9873dacf709b00e9944f37f5c9659e1c138df22406d052a14f55 SHA512 b76f6e93d312833f5f6d6cae27ba550c30f7e457dd67231d49ede366465701f3b2dcd7e01f3c4f7916ccd816600b569834d0cd9d31b5be0a2ad387f8a38f455b
-EBUILD cppcheck-2.9.ebuild 2380 BLAKE2B cc7c03d3ce356b915dfd51c2db4a60b58bc527b42de98216e8d1e0ef9dfd2baac697d4f6375c7f55f4bbf0fd2759ca0ff7f396294a5597de032ae5955da46d8f SHA512 89433207c2fae3f869d0594bc5c96a23245acb1dc4e8574b3299fa329af0286f5c6c5aa9beb9e988190ce2590226dfb7a955546effe0e9019abeaff70409fb60
+EBUILD cppcheck-2.13.0.ebuild 3117 BLAKE2B ee434a36fe54db164f39a46c0db74ab3be8fe1ac0619e7c1164cae8095a2a88fa42cfa4a136b48a717ce0f52253c9ffa06555ad3eaa0daaaad81e648ee31b728 SHA512 25b698c0f27198f44f8dfdf5861d24ec7ed1613594ab067d9246ff3728aa93b74bcfeca436ef26bac34f0ebc0eeebad6bbea4405fca6245501b6e68e218d3ec4
+EBUILD cppcheck-2.9.ebuild 2369 BLAKE2B 909101f8491d35342282c8334e7a3e31fc8a13dd30ad8a46acbe469b2735842c7856c444bfb47950f15f62e353be9e724ba08eeec039ab58713d3832d161c83d SHA512 71152b0282b8628b4ba25110c90072b09d75c9828408688af0d025ebe111de0a28e29659bb6d95e5982badff5de5501bab1d4263635ccee9763e11a1c73889f0
 MISC metadata.xml 519 BLAKE2B 8f520238cfead1bbf8f534fcfb733805de6c657379d6eb02e5e823d5cdb4716fa5fd2b3aae63009601d06e79f82519c159c86d234e59f0966568ceb3ad58f5fb SHA512 d4472b2285c72f3fb891678374c73f0204556d247ac56489484739b4cfaece956974189653feb81d58d8418cb9563378ce3f040d093238f1a2dd27216c8a361c
diff --git a/dev-util/cppcheck/cppcheck-2.13.0.ebuild b/dev-util/cppcheck/cppcheck-2.13.0.ebuild
index 2499d53d7a92..c8ff44651195 100644
--- a/dev-util/cppcheck/cppcheck-2.13.0.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="charts gui qt6 htmlreport pcre test threads"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/dev-util/cppcheck/cppcheck-2.9.ebuild b/dev-util/cppcheck/cppcheck-2.9.ebuild
index d70808c01352..c6d68f1cc701 100644
--- a/dev-util/cppcheck/cppcheck-2.9.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.9.ebuild
@@ -8,7 +8,7 @@ EAPI=8
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit distutils-r1 cmake
 
 DESCRIPTION="Static analyzer of C/C++ code"
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="htmlreport pcre qt5 test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 65b80cfc30a0..e5d497bfa39a 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,8 @@
+AUX diffoscope-268-7zip.patch 1571 BLAKE2B 5eb0f7459d165ae0b9e6288c4aaf561ca7280d52cb15c038af7d04027a7f1f6e66d8bdb30536d3139b8edc18b05e461c7b099c0214af8ce4eb851204c42c10a2 SHA512 b0e2dd9400cdff70adee61d17c11ca6e001dc553ee16fad9d9c3f77558f79013314509bc3d2264c986816198fca665742b4e87ec565af5002b62138291361e37
 DIST diffoscope-263.tar.bz2 3139927 BLAKE2B 6d13b9a657c4a7618d24487096a0fb94034f4ea2b84384b388dc8441ebe68f8de12dd7a34ec0075bd03ca3d437e65a23fc086184ba7c3764682390f6290a17e4 SHA512 41c5495bd4d4f4a0c340bac444f3cbc4a9b6180227efc02d593590a50b47acd06dc755875419da3a52d8aa831733d76450388c29e856d428b159d3c2c793de1b
 DIST diffoscope-266.tar.bz2 3148610 BLAKE2B 28090b8a1e2315f9df43d254d3dbd4ed8f6d4ba4d259c764f53b84137ac0b3dc97b51df56ba595eee950c54974e9b6109c423392d198e277d520f11559ecd78e SHA512 2eb7cbd333b6559ba0f66647184f1747cac52cca6304a27eefe914329797469d5fb9519abe92386d3785f4f2c779f8f5dd95ecc8f54f8b08fd4fc94746bf273d
+DIST diffoscope-268.tar.bz2 3151657 BLAKE2B 2133611135347a9babfb55972ef5d456cc274634facc07ea8dc2c214147507d223a6fd8cf24541c04fc19c3510c7548bdaa5549f5587c9d99de7b61e64bd2f7d SHA512 9a0f3c81e9beb171fdef8282ac3938a5534f894437f898ab1437cdeb30a12c7fb8a1a494479f46c41d65e78fe014b8c1e510a72d0673f3d0d769d71c4af12a5d
 EBUILD diffoscope-263.ebuild 3681 BLAKE2B c4f1f1661fd97e6b04eff67c1aae1db9893df9b5e91aa54aed8fedd4fa1ef7fa071f799c76377db3687f0c7b073be41eabac629118e38e063d8f29d8493e996c SHA512 0f24c5d7d22c8bbeae42d3cab7f7e25c347ac1f3d80320a92e22b33c3447b439a3794e443f939fa3861c82a2c0170b1ac2a6f98f20312a800147d03ce6a22dba
 EBUILD diffoscope-266.ebuild 3682 BLAKE2B 9416955c1c9414ea2bcfb9ca5138638a3963dc71ec5443d6d993e3d132a566f62e613dd6dea2e38f26b3af6a176d620da2fabbe2159a8f979d2f8d91ae49332f SHA512 6a1cf8404cb306e7ddba0d19e591f62b622e616118f60285612a75991df02270d772eb647d1649f720da5c709312a4c18ad1eb86d9941c7f8512339fba7904d4
+EBUILD diffoscope-268.ebuild 3726 BLAKE2B 0931e6b2ab646362d928d4b04e0beb629bec1970d77bef1c7434a1687b02721e1657292cf03cec66650c02540ea0f6c14fe10efca5524d9ec011e146bb87aa5c SHA512 519020ec6860b6ea6cdecf98f06e75ab8b35a587963944f2d9da8b560a54a9724fceb4bb2dfdfd96d3e09f5a90397acf4ff7dbd97e6ae9dc67d4613453e389a1
 MISC metadata.xml 2086 BLAKE2B b05c2c3c425a990f64aea25e9dda3e1afb410068d90e034d5d9df7c76363613d309f8bc57c70284f2e607a3e2096a0132724dddba8df487bda3046d8ed7aefa1 SHA512 8c86ddad7fda722956931d73a6f5dfa8e43c25623edb3b20bf3e68765b04ed4d20ba31b68315812978a9546b3c678597fd41132a4a6ad4658ba9fa5f79cfc90d
diff --git a/dev-util/diffoscope/diffoscope-268.ebuild b/dev-util/diffoscope/diffoscope-268.ebuild
new file mode 100644
index 000000000000..52ae1402efb9
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-268.ebuild
@@ -0,0 +1,128 @@
+# 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_{10..12} )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1
+
+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 ~ia64 ~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/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]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-7zip.patch
+)
+
+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
+)
+
+distutils_enable_tests pytest
diff --git a/dev-util/diffoscope/files/diffoscope-268-7zip.patch b/dev-util/diffoscope/files/diffoscope-268-7zip.patch
new file mode 100644
index 000000000000..4f7464c07a33
--- /dev/null
+++ b/dev-util/diffoscope/files/diffoscope-268-7zip.patch
@@ -0,0 +1,43 @@
+https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/2a361d7dff135d3e832161f587a55a62fcbec9f2
+
+From 2a361d7dff135d3e832161f587a55a62fcbec9f2 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sat, 25 May 2024 22:41:53 +0100
+Subject: [PATCH] Amend 7zip version test for older 7z versions that include
+ "[64]" string. (Closes: #376)
+
+Without the change `7z` test fails with assertion errors:
+
+    FAILED tests/comparators/test_sevenz.py::test_metadata_diff - AssertionError
+
+This happens because version guard did not work for my ancient `7z`:
+
+    $ 7z | head -n2
+
+    7-Zip [64] 17.05 : Copyright (c) 1999-2021 Igor Pavlov : 2017-08-28
+
+THe change attempts to skip `[64]` identifier. Tested on 7z 17.05 only.
+---
+ tests/comparators/test_sevenz.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tests/comparators/test_sevenz.py b/tests/comparators/test_sevenz.py
+index 1582a0f4..91974701 100644
+--- a/tests/comparators/test_sevenz.py
++++ b/tests/comparators/test_sevenz.py
+@@ -38,7 +38,12 @@ def sevenz_version():
+         out = subprocess.check_output(["7z"])
+     except subprocess.CalledProcessError as e:
+         out = e.output
+-    return out.decode("UTF-8").split()[1].strip()
++    words = out.decode("UTF-8").split()
++    # 7zip 17.04 returns version after "[64]" identifier:
++    #   "7-Zip [64] 17.05 : Copyright (c) 1999-2021 Igor Pavlov : 2017-08-28"
++    if words[1].startswith("["):
++        return words[2].strip()
++    return words[1].strip()
+ 
+ 
+ def test_identification(sevenza):
+-- 
+GitLab
diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 3491b701cc93..a36a07564136 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,5 +1,5 @@
 DIST diffuse-0.8.2.tar.gz 1187378 BLAKE2B 466cb2291dcc812a82ade4fb59c3e3faf1f632d741fc3efef886c00b100e8edebdddc1837e980d9bb86c18182172cf9afca3b1abc17a8258669f6aada0763beb SHA512 c2a5c1cac435bc0879fc6e6f10bcf10bd8e58e4a2cb603a4e1435c411b3d66373424680d1a41296d38c249e659aa53e67c8783eb26a3d02a42ef5c7e7fa1e245
 DIST diffuse-0.9.0.tar.gz 1193105 BLAKE2B 934d38722e0bd9f83a915c681521c1699e0a2efefdcbbb3e23c3f9635467fb31d9f364a72b0e7c78ca65bf9fe154e5ebbeecdbfe1a4b412149a3b0f3a511d6e9 SHA512 9a9ed6047531eaf80fed867bc2feba081f183ee7e5e5c940b0cb912af6d17c7c22df48b7aa76c3f17d4fafeff1bade45216d26ef689fef33b3680bdc70ed80ac
 EBUILD diffuse-0.8.2.ebuild 1469 BLAKE2B 89b856a3fa334c8781bad0d9a81baec521d1559ffe45c82aa53420712dcb47f2b1cf60fe399c3e898778d814d50260b7f174f98e9970b4caf91deba56161cb3f SHA512 48b2b6cbb7b6b801836875ffb73821f0cc660661712e68b3daa7927e0d1f1fa6fbb0fb36438b6c84bdc3014916cb956fd2e74c2144313a141092fa0093fd4447
-EBUILD diffuse-0.9.0.ebuild 1444 BLAKE2B ee97d1ed65bf345c24b27fe94e5103a084533f495b5f58979728f023857c09b0954bae13f5555f00ddd29c5255be0ceeaf267e79a8176cc9875145500ec3f479 SHA512 a2728c1b97d4785076a6406cbce2db5c2ffd4fa72bcd94f825856338cbe039e1871a5dcf5fbf721b2d08770c677f310c40c0af37c67853867f8f954ceffcea98
+EBUILD diffuse-0.9.0.ebuild 1442 BLAKE2B d59b7856cc1a3bec8dbe9b22c05f2cece52a49e70603f5264b0cb285b08ff0b47e5e56c4a0d2e872425fbd3d3d5e975c7724c61fbe92dda5f1fb08b5c8031785 SHA512 87deb293cb0ef9832bf71f515cea4fe222fe4d3540439c38143ff25d78d1427e8520a22746c4899388eedf5998302fa9f572a41b4741c4e578679ae44ca3bb1f
 MISC metadata.xml 331 BLAKE2B 0d7237b2c8c4914f4888a983908157e5d9de1190566738fd6dc7e55e9695bbf3438344e617e447f03b7398d0f96605e8abedb73f6c03689c714e004592c268a0 SHA512 29c7e053de0a4dd2350c8e50d3049a7f27f5eb7bf054f947fab9840963a6c0572b07d408faeda415671250e36a3546263d99443f06c61e312c95af9988a194b7
diff --git a/dev-util/diffuse/diffuse-0.9.0.ebuild b/dev-util/diffuse/diffuse-0.9.0.ebuild
index 0c1ca8533aac..c6be148a78fd 100644
--- a/dev-util/diffuse/diffuse-0.9.0.ebuild
+++ b/dev-util/diffuse/diffuse-0.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MightyCreak/diffuse/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gcovr/Manifest b/dev-util/gcovr/Manifest
index e887d91d4d5d..4ec4bffc5f7e 100644
--- a/dev-util/gcovr/Manifest
+++ b/dev-util/gcovr/Manifest
@@ -5,5 +5,5 @@ DIST gcovr-7.2.gh.tar.gz 2800014 BLAKE2B e334688f129868d9affe0fa5c5280eb7dd4c578
 EBUILD gcovr-5.1.ebuild 1010 BLAKE2B 5ab8716f554c9d28731df15f064bf96f6184dfba6f58da14c1fdfb7e98c61d7809085e790c98e65b078716304bb3ec660385b929726123fe7aa993d1dfa2fad7 SHA512 a0e57036967b5b3256c2a77792dbe92c8c5f1a2c1f5258131f2c279bcef6a780be385d3942d3ae95a2f723844099187e4b44b627cd5399ae828fc8d43f02ae3d
 EBUILD gcovr-5.2.ebuild 1056 BLAKE2B 71f8295c2334e921391bb5ec57cfbbaff2f5e8c17f1efce79c308d1ea2e4d85ac740dd243bfa5762b26f7ccec66a01948a60011744dc08bc15cc806dcc247139 SHA512 f88ee9df9e9ae5b448915791aaca18cfb0d3c23e86073922260897080c4dcb27d5634392b61fee0c3f9144d5de2dd6072b6e7f9d0cc11a4825590cf84d188a01
 EBUILD gcovr-6.0.ebuild 975 BLAKE2B 1d7c2fedfdbfa0757f009cf588e68068e9400693d19327af86af41097d490b8e06659782673f8cc2bf6c96d10bd3b497dfbfccc5327a5a40152d142ed8bd3568 SHA512 1cb95bdad3671f38aa06aa3a1a40fdd3542fb01f149df1c9da7bd52a1163f963e6ba05f3b84d91fe50d172f571629e8947819d954e9913ed74aab23001a83630
-EBUILD gcovr-7.2.ebuild 7842 BLAKE2B 5f1bb079ec661a17804aaf602f81117d27456d803b0236e8798aa7c902e64c54b4c1e939b11fd3dabcaa1a2f88bb2dc45c0bdaea7e711903a317d493e372bc09 SHA512 c5cb483fb245ba94e854fe6c4decae86e68fd78f2bad8a80d1f2b2e29b674188cd43475ed4097754a8ed548841ce6dc72b8d46e1ff9f19b41e4932aec785ae07
+EBUILD gcovr-7.2.ebuild 7848 BLAKE2B 46b6dbea5b05553d9dcc38510583eff704f19ef9a04620fe2c9577ebaa40e23c7fc2c95959163c5fb0413048766dba5b192cc7a5ca057a2d81284ce05b306a3f SHA512 4c806ef11538031293653c481ad431b9cdfeace4347a8d57cfde4b2fb09282ad51b8482c3344a8f8a1a536689ba7bd223f204454ce4500bab3bafcb26bd57f6f
 MISC metadata.xml 326 BLAKE2B 0ff392fe3a804fc6d8ea83de983357676a8155dee2fbb5204baf0ead2800210ea30a0171398c71dc60b1d9423a6fd65c0a9032d4511caa459c9b4d4f70ee4132 SHA512 5f5a49bfbbd3d3b77314f7de0c5981a3e700b42733d1c4f6868a7c25d12bb6227ebd254925cbbb6a5d73bf8a0b9f99115d396009d55797e39b53dc43a1a79107
diff --git a/dev-util/gcovr/gcovr-7.2.ebuild b/dev-util/gcovr/gcovr-7.2.ebuild
index cf3116b1bdaf..8368a742ef0b 100644
--- a/dev-util/gcovr/gcovr-7.2.ebuild
+++ b/dev-util/gcovr/gcovr-7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/gcovr/gcovr/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~loong ~x86"
 
 RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-util/mk-configure/Manifest b/dev-util/mk-configure/Manifest
index 9d790ffd49bb..d13f64afc91b 100644
--- a/dev-util/mk-configure/Manifest
+++ b/dev-util/mk-configure/Manifest
@@ -1,5 +1,3 @@
-DIST mk-configure-0.38.2.tar.gz 359518 BLAKE2B 17b28686d8d4d81373d86e4f23f4f9540cb62338b31aabbf21072c6ebe364d12db3fad2da6e7c0a2a5a6af39db099960879794dd7c9cb014e0cedea211c2fa5e SHA512 dd6542c39b24513288e69c0b971aa3c602bc450a812f1758b26c7f6b0cb9864a1a1d8e04153fb79394a53f7be1a5990c4dcf090d56de8edc8a6a7580799cbe76
 DIST mk-configure-0.38.3.tar.gz 362541 BLAKE2B 6c071fbeef508bb35be9983d0c89d573b1f3b2753511361406776f245559f9c419199a90482f4979e20121084f683a6fd5b4dd38db3b3a3a71727a354a3470a0 SHA512 646cfe82f126299824bd1f2412ca66c75acfef9fd115d37dec23cb69072f9ed3801318de15aa957843d2f6a7a124b5bd411f06408f86aeaed1b58949ffb7ff5e
-EBUILD mk-configure-0.38.2-r1.ebuild 1872 BLAKE2B 2569d517dbff0767100125dace4fa958bfde0da70878e6096295e875d071d35619e8bc39eefa326f1b3b8249e40a5f2303a2e48d18a3e78525c6634a802c7fe3 SHA512 f7b547ab95ec8c182a27fa69d9363ecfbe20b106a0d38ff63760db657c852c94f7e30d8df4d93709b1c9cdcf66213eb0bb34f206c7507d1a0d70d1cd7d169a06
-EBUILD mk-configure-0.38.3.ebuild 1918 BLAKE2B 1bb00bf0d0b6cdedd5a9f307ae8e79bd0428010e906fd5e93f9642d8123ce2d0a620205ac009f2cfb12a57fbe329ab557220220c3eb19d26212841f301558d14 SHA512 a7fe432f9f4981a4631961eb4cc751c7f234c43191637d3c55608d82ada8809da8f979524cfba9387adb8082bb596e85f2c8e60c6c52ffccddfab33e3ab9fea8
+EBUILD mk-configure-0.38.3.ebuild 1930 BLAKE2B 98bf6773421399dbe7170ea96e711e2a238a48b504543960144c86112d6150cdd3ed8b30c576e4cd17c0e11ee0ac5db83eb3a02cbaa9b06130619a4396b9a698 SHA512 66a5dc594064f703c636ea61490215e51acd96b1537601e03586c036d69e08b03d8660da2baab684fce890fbadf9d421be03f9e957d2aac38a1987bb73e7f93c
 MISC metadata.xml 382 BLAKE2B da0a75f928295c179866da180acd537f8b964b029f5d5f99aac2f84190fe9e2497b2845f6c5c506b236c650a6e460431183f24e0439b6bb81258567a5338bfc3 SHA512 e83bb04295df653acca72744e9575e8aed59063f5214409a99b32cec79a8fa54537545f8be839d4063831e8605ef52c7aad92491b3066364e1eea1750fdc1f17
diff --git a/dev-util/mk-configure/mk-configure-0.38.2-r1.ebuild b/dev-util/mk-configure/mk-configure-0.38.2-r1.ebuild
deleted file mode 100644
index 5830bafaceac..000000000000
--- a/dev-util/mk-configure/mk-configure-0.38.2-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing toolchain-funcs
-
-DESCRIPTION="Lightweight replacement for GNU autotools"
-HOMEPAGE="https://sourceforge.net/projects/mk-configure/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 GPL-2+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-# TODO: investigate
-RESTRICT="test"
-
-RDEPEND="
-	|| ( x11-misc/makedepend dev-build/pmake )
-	dev-build/bmake
-"
-BDEPEND="${RDEPEND}"
-
-src_configure() {
-	local jobs="$(makeopts_jobs)"
-	unset MAKEOPTS
-
-	export MAKEOPTS="-j${jobs}"
-	export MAKE=bmake
-}
-
-src_compile() {
-	MAKEARGS=(
-		AR="$(tc-getAR)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		NM="$(tc-getNM)"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-		RANLIB="$(tc-getRANLIB)"
-		STRIP="$(tc-getSTRIP)"
-		#SIZE="$(tc-getSIZE)"
-
-		# Don't use LD, use the compiler driver instead
-		LDCOMPILER=yes
-
-		CFLAGS="${CFLAGS}"
-		CXXFLAGS="${CXXFLAGS}"
-		LDFLAGS="${LDFLAGS}"
-
-		# Our toolchain already handles these
-		MKPIE=no
-		USE_SSP=no
-		USE_RELRO=no
-		USE_FORT=no
-
-		# No -Werror
-		WARNERR=no
-
-		INSTALL="${INSTALL:-${BROOT}/usr/bin/install}"
-
-		# Don't calcify compiler settings in installed files
-		MKCOMPILERSETTINGS=yes
-
-		PREFIX="${EPREFIX}/usr"
-		DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		INFODIR="${EPREFIX}/usr/share/info"
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		MANDIR="${EPREFIX}/usr/share/man"
-
-		MKFILESDIR="${BROOT}/usr/share/mk-configure/mk"
-		BUILTINSDIR="${BROOT}/usr/share/mk-configure/builtins"
-		FEATURESDIR="${BROOT}/usr/share/mk-configure/feature"
-	)
-
-	emake cleandir-presentation "${MAKEARGS[@]}"
-	emake "${MAKEARGS[@]}"
-}
-
-src_test() {
-	emake "${MAKEARGS[@]}" test
-}
-
-src_install() {
-	emake "${MAKEARGS[@]}" DESTDIR="${ED}" install
-
-	rm "${ED}"/usr/share/doc/${PF}/LICENSE || die
-}
diff --git a/dev-util/mk-configure/mk-configure-0.38.3.ebuild b/dev-util/mk-configure/mk-configure-0.38.3.ebuild
index da1c0ae6cc30..42668c86201f 100644
--- a/dev-util/mk-configure/mk-configure-0.38.3.ebuild
+++ b/dev-util/mk-configure/mk-configure-0.38.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 GPL-2+ MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 # TODO: investigate
 RESTRICT="test"
diff --git a/dev-util/pahole/Manifest b/dev-util/pahole/Manifest
index b020843a2446..2ac66bf0c826 100644
--- a/dev-util/pahole/Manifest
+++ b/dev-util/pahole/Manifest
@@ -6,5 +6,5 @@ DIST pahole-1.24_p20221024-patches.tar.xz 22088 BLAKE2B b39458400411dd7da0f56825
 EBUILD pahole-1.24_p20221024.ebuild 1693 BLAKE2B 3bafb0ab2e9278c0ff0f1af9f571311983d6545eae411b271e5bde9d5416d4f2c4dd5b671b291fccd0b03f6fbe5c99c92d620b6b91c1ae6edfb6f0b05e3f7b0e SHA512 0f9de7b39b1747e780322cf56e8a646e9980ee2dfcc4eecd2ea1d37dca369dae05c643a7be39898f0ef0264dd5a98890a600b282a7e1d759d0fc7c72fd8c4870
 EBUILD pahole-1.25.ebuild 1700 BLAKE2B 12734f1ae26bed113c61cb05386a0c9e57b3fae8aeeb9c54b117ca8f15456a529e1d2cd5656000662917c4c07e46e32da0f8332c1577ff0c5ebf6bcc98c19b83 SHA512 1c3fc2ef434ee988ad79fca27163fc3fd645faabe45d2229e6bee4d23c38f0ec59ad4255b4604db1b321b871fef83573d70e889af859e58422fd8be8bfe8411c
 EBUILD pahole-1.26.ebuild 1699 BLAKE2B bb9e555b23f0e59ba92d581234db077c8322d683c508363c1d85b485d0579bdf24818ce6d5fc180eb188c79df2acb3cc2dc56398a9d645585384395c8252c66f SHA512 4d0676ddd17feb8b744450b4258a8b39ec0f5d92252e6574cf4afce94b9f6bfd7ff9a7d86509e4cd9579240c4d4c317c686bfb4b2ea312921ede27ea52ce7859
-EBUILD pahole-9999.ebuild 1698 BLAKE2B 3f7a4d42fc08dd230544f946296cceded7e30ceb82bc2829b9bde7a24f87719812510c1d9d9292a03980442feb423c222ad3fa2c3f6713f146d1c9f466562701 SHA512 98e1827d57611960bf6d1e888d69c6f786c1d5280aa4fc683d6cf850f1a7c56254ace4de0118f73ef80f2caadbecf3f36392de91f4b92acdc318fef21af051ab
+EBUILD pahole-9999.ebuild 1519 BLAKE2B eafa78fe33f44043e333f2b554b0c0929c0548195de0f85e4073daeb703aacedd1d03c858fc7f85d870720d0c1d62e1a11fdcd89d98653b6900560a385511b5b SHA512 b0029fb308ba153bae71b96c31605e6ee2e92a49e9f27a6542a9b8ba540b2e79c99675df8703d8a1e1a002e4905eb176f575c0876a853aa7fad51d7a84505a6a
 MISC metadata.xml 672 BLAKE2B 2178381434a5293df5a6a07a8c84c20a4f98d011c90ed2db911085639689224509445e16197ff88e0ab6fb7e6357bc96291feff21a44f350f51b1031e1882477 SHA512 2cd1f865e42bd845bb3831a1f6c8060e469e0afb3acbaaec2989018481a6f93e0fdae9afb74413c00db6967069cc6d0447548c3b4c238a70db07ee8786fe1e99
diff --git a/dev-util/pahole/pahole-9999.ebuild b/dev-util/pahole/pahole-9999.ebuild
index 62a62ec1aa61..aaef5d2f6e6c 100644
--- a/dev-util/pahole/pahole-9999.ebuild
+++ b/dev-util/pahole/pahole-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{9..12} )
 inherit cmake python-single-r1
 
 MY_PN=dwarves
-MY_P=${MY_PN}-${PV}
+MY_P=${MY_PN}-${PV%%_p*}
 
 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
 HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
@@ -15,30 +15,22 @@ HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
 	inherit git-r3
-elif [[ ${PV} == *_p* ]] ; then
-	# Snapshots
-	#SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-
-	# Patch rollups from git format-patch. Sometimes there are important
-	# fixes in git which haven't been released (and no release in sight).
-	# Patch rollups are a bit better for understanding where changes have
-	# come from for users.
-	SRC_URI="
-		http://fedorapeople.org/~acme/${MY_PN}/${MY_P%%_p*}.tar.xz
-		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz
-	"
-	S="${WORKDIR}"/${MY_P%%_p*}
 else
 	SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz"
+	if [[ ${PV} == *_p* ]] ; then
+		# Patch rollups from git format-patch. Sometimes there are important
+		# fixes in git which haven't been released (and no release in sight).
+		# Patch rollups are a bit better for understanding where changes have
+		# come from for users.
+		SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz"
+	fi
 	S="${WORKDIR}"/${MY_P}
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2" # only
 SLOT="0"
 IUSE="debug"
-if [[ ${PV} != 9999 ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-fi
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index bfa98f905320..3f2918e419e2 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -9,5 +9,5 @@ EBUILD trace-cmd-3.1.5-r2.ebuild 3353 BLAKE2B b686d73cacf84e8d569fe2085146ce99e2
 EBUILD trace-cmd-3.1.6-r1.ebuild 3316 BLAKE2B 57fa192e7f9961e3e5119cbc32b4f9cecbb14c8113889212eeab136d307a689bbb21a6580c5e4eda2ea926cda6cbefce539fa69674af3f5b231d28c593bc3f8d SHA512 59b81bbb1d634c3311747cef83687da0aa20e54bd1f2e312f84e1ad3ce64d4e482fe5b93c9ac2a4ff9de857295cc05f7c110e49c79bc1ff72319fd70cb7f3227
 EBUILD trace-cmd-3.1.7.ebuild 3316 BLAKE2B 57fa192e7f9961e3e5119cbc32b4f9cecbb14c8113889212eeab136d307a689bbb21a6580c5e4eda2ea926cda6cbefce539fa69674af3f5b231d28c593bc3f8d SHA512 59b81bbb1d634c3311747cef83687da0aa20e54bd1f2e312f84e1ad3ce64d4e482fe5b93c9ac2a4ff9de857295cc05f7c110e49c79bc1ff72319fd70cb7f3227
 EBUILD trace-cmd-3.2-r2.ebuild 2434 BLAKE2B 498d4b4224cc24e183c8e756a5d739fbefa8435058ca3f5c08f247cf6c5edfa5809ad669e61e833349a2803edda3c0449e01fea717aeccb8eeb8525ac3611694 SHA512 80d9d0abe66ca01470a952882204248c6409d5d883b915037478244d52f08f53ef3c63872eb9dbe474b42eac58678407b6ec9ab8792b6402f336427b7c70d696
-EBUILD trace-cmd-3.2-r3.ebuild 2434 BLAKE2B 90b87f4562169b37b566b072012cc31d421c39797454934c301bac3f955aecf9a65ba22afece24b06e3bfbc48ffc2e6a4ada71f216c55633ff0711b95341df5b SHA512 7ab2ea2d768e992868e8ea2893378c92d88860e7907fdd555d8565775152522f58a2e810a70972116dc8479e39298306a26eedcabd803dcaaa24f16dfd66b88d
+EBUILD trace-cmd-3.2-r3.ebuild 2433 BLAKE2B 5c25fdfed3c93edf6f9c821347aec2d7d81365370fb7434c1fa00c05270bcc143b5992ce3f05a98cb952fb10fa9f127c2b08d61de64d851f0399338c47b5dc96 SHA512 5878b79f60626a184108af2c1477299e573389c83b6f5b1e87747ba8f5a1e2cb3d6763c9f7470e8a1a63aed2eba79dfb87758ecbb3bd5538563c7c2e06a2a182
 MISC metadata.xml 462 BLAKE2B 60ccc0b91ad64f83db4df7cafd5af9355192c5f60139cc523f2c0d1bd287a75501822773443995b0e6f51986aa504a473a74e87c4db78ed9780e24816128f91e SHA512 9a8f02d6b9b23aa4350d7ce48a6aca9541ec5fcde82437c6c9ff1cfc950c8843994eb31133b67d678a9babaa8a15230c00cfba65c45f5db4d4859db0198cb554
diff --git a/dev-util/trace-cmd/trace-cmd-3.2-r3.ebuild b/dev-util/trace-cmd/trace-cmd-3.2-r3.ebuild
index 08fbf2890aac..d704fae6787a 100644
--- a/dev-util/trace-cmd/trace-cmd-3.2-r3.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-3.2-r3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
diff --git a/dev-util/vint/Manifest b/dev-util/vint/Manifest
index 49a8ea49197b..c1a0bd298601 100644
--- a/dev-util/vint/Manifest
+++ b/dev-util/vint/Manifest
@@ -1,6 +1,6 @@
 AUX vint-0.3.21-fix-py3.8.patch 1428 BLAKE2B f45cf44b458a779a0e6ee27822fcb65c5c5594673c2d59e540c7fbd0fc3b31f3b0f17dacaf932e9a7837d93f47d6c267cd2ce1bb8487d2a0268ea6a3c7fd96fb SHA512 7421bc4dd6de228e60ae0d421912dcaaf1814c4d5216ae09198da65b4f56e90bf1c944fc3aebfe773f7a4abcdfc439481246a611613df302fc914a42cd610668
 DIST vint-0.3.21.gh.tar.gz 96747 BLAKE2B 926b46493030dc0daa477ded3cb70f2b825b4eb8054c14a4b824b97e7df60d0141cf1bcf4c33893afd870f51308b7156fb6e5870f320f8c9449fdca8fe78774f SHA512 47e832d382952cb16bcc233eefa1f06ca74f95eb445d7f96d6804391b91a2c8a8e7b749b7f33f65aed9d3bdc1ff5e5332a62c3935969395f16a854f0f66e383b
 DIST vint-0.3.21.tar.gz 96747 BLAKE2B 926b46493030dc0daa477ded3cb70f2b825b4eb8054c14a4b824b97e7df60d0141cf1bcf4c33893afd870f51308b7156fb6e5870f320f8c9449fdca8fe78774f SHA512 47e832d382952cb16bcc233eefa1f06ca74f95eb445d7f96d6804391b91a2c8a8e7b749b7f33f65aed9d3bdc1ff5e5332a62c3935969395f16a854f0f66e383b
-EBUILD vint-0.3.21-r1.ebuild 682 BLAKE2B d5e271990097057bbf463604fee4c4fc8b2a9eb3a78e71a26678496471356db90f83770429eee45349f2c15a4eb2b75240434ad22389a94552247f9238477a8c SHA512 8624fe2a1bea7aa4ee915979849ed5b6c3cac5b2ae8a9ec3a535e83e69dddbae7995d7373c2fb8552af69b17973bdd84477f3a2e5833d78fc51d31914d94d127
+EBUILD vint-0.3.21-r1.ebuild 684 BLAKE2B c02c9c0a65ec9285816c0a8ea0a9cbc6ff78acf71b01205fb88d5648a071d7f9a1ad4acc267a7b41f7aa20c10d3a624e2772e1ea5473355d1bd5f91a4b3be6d8 SHA512 13cbb9f04cafe89d57ef4674eb777cb47194e019e2e7ff23f255baf23a39050b5bd240a818af49226637767811aa29b8feda9c5ed2b03e48f57ed09f5286d18c
 EBUILD vint-0.3.21.ebuild 646 BLAKE2B 1b66af1cdb26860c5a5a4f7c490fe04c737d37aff8f1a633f580d0a8e681e8a4eaf7fb4c77336ca845100f52355144d75fb60686bbcfd19716b624c1b161fd6f SHA512 c23fe9da82a83d30897718f19765656b1d5e8e2ea4d62849713727577505ded75ee9d7245ec408b00c7e9de780be719fb4a385140663f109e92db57ed561c6b6
 MISC metadata.xml 608 BLAKE2B 2a483186140621bc5e54219df1ca31114f4d410b308883e80c84a35a273e9aeb57968f78e608481e66d7535d137c36a192ed493c385c9b98bd9cf405554dc68e SHA512 5cece77f9c71170d519d3a11d292639c25fba403d4c8c8932c093b04d375433ae9279b23d1ef9c0c6fcb0c477b08d6559f8a3bf9521e7151c2de11b4e1ac6a0a
diff --git a/dev-util/vint/vint-0.3.21-r1.ebuild b/dev-util/vint/vint-0.3.21-r1.ebuild
index ee5847259039..080241382121 100644
--- a/dev-util/vint/vint-0.3.21-r1.ebuild
+++ b/dev-util/vint/vint-0.3.21-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
+
 inherit distutils-r1
 
 DESCRIPTION="Lint tool for Vim script language"
diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest
index 64275a785943..6e3e1834c9e6 100644
--- a/dev-util/watchman/Manifest
+++ b/dev-util/watchman/Manifest
@@ -108,5 +108,5 @@ DIST windows_i686_msvc-0.48.0.crate 730056 BLAKE2B 4e4ad6ed94948145199c2ed50fc65
 DIST windows_x86_64_gnu-0.48.0.crate 703595 BLAKE2B b227efb78a99c43d0538cceadada3fa1840df29adc665787fdcf845b73e77d782da8a9f9aa602e1da61401b550d0107176feb6c397c922a6240b38cc8f04a180 SHA512 38eff1164fb37dbd2bbe53404b20cba92de84cbbd5e4eb9ad60d51fb43d6fdb8b87a1488e2c88ebd4b3ff3b708f93fdc05df4b14a285d3ff11c33ff0d9828602
 DIST windows_x86_64_gnullvm-0.48.0.crate 366536 BLAKE2B 295dc3aef18c604d1579978045f4058b1a315083a8ab842bddf5800ec3460b1530ad88c3464acab712a229290aca235810de8a3b6a253859a354d9fa97277e58 SHA512 8d82fad4c8445030844708aa026a62f1ca43362b8e15f14b0d226c7e9cda04ffa0715087b6a025dbb738e8891de24fcc4a2df071a532917cf03c4a46f934f396
 DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795
-EBUILD watchman-2023.06.19.00.ebuild 5446 BLAKE2B 02cbe5f8c52d23cbc93c18fe345192fa0debac3c36a49db265ef4244167581d0d5fb8bf10a6568bc552759dcccb87a18df0590a95f15ada38d047d046cad1cf9 SHA512 8b8e8a63fa11ef96cdbd21da43fff577ff226b23aba143a1294bdf2ddea474cde95ba81349b992f3434b24629e8ca90dbdbbba3e1c90f6c49a901e5b474dbd53
+EBUILD watchman-2023.06.19.00.ebuild 5463 BLAKE2B f08b0861f87e84451e669f5f9f04d57eba8ab966f68362931a932835740bb581dd1c68a19137da883801c5f07a72c4d6b5113b855013278d31d2d85b4b3470eb SHA512 d924851069f5bac429d9a6a4dd47ad61d67f88777e9b61adf4e33834fd54c9686d521ee5cc357ad81589a414d89caad14e29b6669efdf48c2a9cdd3d07838902
 MISC metadata.xml 429 BLAKE2B e69d0fb854d42a000fdc5609c7c6a12b8928eef97630b9043813a44da1bb24639648cf8a412ae7a2d0c0b7e058e2a2df65d33ee7f5198c1aea3253106d43cc75 SHA512 bf683e13fc81e5bfea3dcd80edf4a10fdae95807074035e0f8a63be4d7137488a92396b7bdcdbff5a539922f6d3fd57b67c5e5720a27b3d471d29c96b3b061ff
diff --git a/dev-util/watchman/watchman-2023.06.19.00.ebuild b/dev-util/watchman/watchman-2023.06.19.00.ebuild
index d67d11bf1daa..55b90312e885 100644
--- a/dev-util/watchman/watchman-2023.06.19.00.ebuild
+++ b/dev-util/watchman/watchman-2023.06.19.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -122,8 +122,10 @@ CRATES="
 	windows_x86_64_msvc@0.48.0
 "
 
+DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
+
 inherit cargo cmake distutils-r1 tmpfiles
 
 DESCRIPTION="A file watching service"
diff --git a/dev-util/ydiff/Manifest b/dev-util/ydiff/Manifest
index a47d738a9576..641072287178 100644
--- a/dev-util/ydiff/Manifest
+++ b/dev-util/ydiff/Manifest
@@ -1,4 +1,4 @@
 DIST ydiff-1.2.tar.gz 42808 BLAKE2B 927482c2ed9a96efc354178679b4ba50497289bc31107e8cdef3062a71d91268fa703620f1f4b0be03aebaf339eba5254f4b43c16403f1d7818b84b0c450defb SHA512 0eb2230b64f43e20f6dc2411296389dc99356ef626152dc7f234583f70678e64a07b764fd89635479e7ac4aa7e2490db6e76c744369eefef8ab6a5386db1a7b5
 EBUILD ydiff-1.2-r1.ebuild 599 BLAKE2B 8e7f6558fdd0db8fb96d2f2caff5d41b142dfd107110cb046e546d8a02d55e5e87c8e371b45f47ba7b0e4f46d2a72b556ea0317bfc12f97b6292b6b7843c4b16 SHA512 07f49ded5e0f84ad69e92ada1e7a86a1585c090dc78fdeb7b47c07abd74b77e80e5fb05b1e83136ec656214039e853fea8932a8383b09cd6860d3ee6c26e17e5
-EBUILD ydiff-1.2-r2.ebuild 601 BLAKE2B 8a1d3e071f3815c124fec38dd41e1e20a61138509a0b09209f356c056b6227b8bd742c393f9b30983eb72587bdd3a38f5e2ba2a1e84d40e7463e6264c74f2528 SHA512 060f5b97f7d6cdbca05582c95e67e21183825c066487e2d9e4503954e344620560e3aaeaabe78ca2c1b77a50e6ee0c65bca7fde5e627a4160f808ba194455b1a
+EBUILD ydiff-1.2-r2.ebuild 599 BLAKE2B 42dd7eac4abb2653d46697039f8218e31e3f3c78354ef6f5321e3d1a7a5473240f9a68d00bc4d39158657e80f887903e89130f6c85224861260444305f6f2c5c SHA512 093f67d1613bc2d99deb5aec71f0a88388d2d3c244b2f04ff26a81cf7c54d732af847f48193ad1a790df288bdd84a9867f56bc596c48239091c9821667d23f0f
 MISC metadata.xml 394 BLAKE2B 7333c46ff0d147ca8dc7eafd8e5f3eae67c7217467d45431585898948671df5e836995e89414fb95a9645f69c4f1d2020168a87b952115ce3b6225d89b46aa01 SHA512 781694fc99405f67446875b9fb40a306cd5223f1f27d1fff5f0bd2fe35aee1d6a518486999d06732e89fdc5759afdf0235615170718fea80ba0d69fc95f97fe7
diff --git a/dev-util/ydiff/ydiff-1.2-r2.ebuild b/dev-util/ydiff/ydiff-1.2-r2.ebuild
index 3f16531fa948..c74fbe07d12c 100644
--- a/dev-util/ydiff/ydiff-1.2-r2.ebuild
+++ b/dev-util/ydiff/ydiff-1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/ymattw/ydiff"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="sys-apps/less"