gentoo auto-resync : 10:02:2024 - 17:34:25

12 files changed, 37 insertions, 288 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e16fbf1dd504..ef4458471747 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index fafc3efee037..73025e04fbad 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -2,6 +2,6 @@ DIST gtk-update-icon-cache-3.24.31.tar.bz2 92491 BLAKE2B 4388e7dfbb89e80bc686d5d
 DIST gtk-update-icon-cache-3.24.39.tar.bz2 92389 BLAKE2B 74bbbb7d0e4528a1179400a8c14090ec72f1103306a2819b60d643543de070b445fd837ca85ca97493bbcbce999a009b3dd03ca044bed089177fb5fa4974db4c SHA512 127858788bfa9c3715114c54bc52a2a52c4bebe1423c77227ce5b7165f19f39f794be33df06d9994baaf3b0dc6224fc98b5c1ee8c63554d5c3e2361b96b161da
 DIST gtk-update-icon-cache-3.24.40.tar.bz2 92308 BLAKE2B 5ea926db785728bb52d68d4b804d61297239ae2da7fb089b5a76485aa3f690bc6d958e74bb3ac8115e9ae2beb272785c75dc3f39317d5b928a3eb67e929dbc77 SHA512 7eea7b49f4a53b0c04819c7d79885df0b476400e01adb5d704dcba907d8cfaa9f089012e651da7426963eb096b2f58914f95a5067188464b5f92a9d12a0dbc28
 EBUILD gtk-update-icon-cache-3.24.31.ebuild 856 BLAKE2B 362f34449273fc9d8ea4ef46fd842a28a80da2c68f9e21459337ba0b931a3a8c368e3398667f38e564eb61d7bc6f1878997dcaf917b1a149e04d1656accb440d SHA512 558ff7a57c3d7b7a60a4c7763aaeb3d75374a2ea48961659afa800138df3e00fb931597ce4e0b7d30ff13475a61c2f246daeebe8e80bf7bbf7387106f397c76f
-EBUILD gtk-update-icon-cache-3.24.39.ebuild 830 BLAKE2B 62045bd8a4b022b03af60c1b53e2ec443849c32dd4437c50c5c309ccc23b0aa70d2d13702f282d963a027b95992718b4e9663728e574276957054980e4acee55 SHA512 f52042d78d461237e7f6fe157bfbfc83b2ed10d98ad8eb2293962bf17c11cfc467163c72c4eccef635f4eca08034df0866f17df92215b7e1c27b2bc9d2fc9232
+EBUILD gtk-update-icon-cache-3.24.39.ebuild 826 BLAKE2B a5c2d8b72b811a91e81caa754242472a89e7b0521c16a24c82b521622886a72cdbb7d820461ea6d04c778a42a05aeb760679fa63d3255904ef41630492981dc2 SHA512 700d58fcc558d8bf264305e81474b452c51d971101c2541fd1370c896c8444b8065dd7a069f25231014286700c04a46818e798716080f75f75d74967df65e65d
 EBUILD gtk-update-icon-cache-3.24.40.ebuild 834 BLAKE2B 2d34b538df178d72e6473e28858b07837ad26a9fe58d641c4bb01da0f367f9076b80455796a15d91e64714cdf16792e8137e38964e61b41a9abca2c1550f3f74 SHA512 a972400f60abbbe4509852da88b2d30220b7615a70dfe10939dc408bf59bc21aea9147d847d78429d80c4707f4c00fa856b37176f93254247735ef99de36ca6d
 MISC metadata.xml 664 BLAKE2B f281b9e20e66222f658bbf7d919fb1de6f95c3582b9c5193e82cecebda5083250ea9677b09d1f30d01a024027780d9d4fac803c6caab6e65c0f1783ee541be44 SHA512 a78afb049c25f2ccf70150d0c8160041c20cee3dc8fcc62e436d951d23c5e0b1a365082b7284d3b0fff95efac2521af1bd9cd81fcc4429b5791cbe8238b1165e
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.39.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.39.ebuild
index 3f35d4f759e8..3f9b34fabfc9 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.39.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.39.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.gnome.org/Community/gentoo/${PN}/-/archive/${PV}/${P}.ta
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/intel_clc/Manifest b/dev-util/intel_clc/Manifest
index aab5b3e058a1..1e0b7463431c 100644
--- a/dev-util/intel_clc/Manifest
+++ b/dev-util/intel_clc/Manifest
@@ -7,6 +7,6 @@ EBUILD intel_clc-23.3.1-r1.ebuild 2517 BLAKE2B 8cac945e2d7eef64a323e23370929f840
 EBUILD intel_clc-23.3.3.ebuild 2518 BLAKE2B e743dd64646d7ff479af1b9c71694e74a40eddcfc3f83400149e49d73c8af3cfba3dc67197b8bc2fb6c98b0f3604ce91ae7515c04d84ca8072bee9e5f1f5af5d SHA512 4ca6ab59227402ab4e2fc13cb340770efbfc77e66e22cea143b619370a473317cf73a59c298c9cd1d935de4c5f93bf55382418fcc51fb573c1e3de6c760c1f90
 EBUILD intel_clc-23.3.4.ebuild 2518 BLAKE2B e743dd64646d7ff479af1b9c71694e74a40eddcfc3f83400149e49d73c8af3cfba3dc67197b8bc2fb6c98b0f3604ce91ae7515c04d84ca8072bee9e5f1f5af5d SHA512 4ca6ab59227402ab4e2fc13cb340770efbfc77e66e22cea143b619370a473317cf73a59c298c9cd1d935de4c5f93bf55382418fcc51fb573c1e3de6c760c1f90
 EBUILD intel_clc-23.3.5.ebuild 2518 BLAKE2B e743dd64646d7ff479af1b9c71694e74a40eddcfc3f83400149e49d73c8af3cfba3dc67197b8bc2fb6c98b0f3604ce91ae7515c04d84ca8072bee9e5f1f5af5d SHA512 4ca6ab59227402ab4e2fc13cb340770efbfc77e66e22cea143b619370a473317cf73a59c298c9cd1d935de4c5f93bf55382418fcc51fb573c1e3de6c760c1f90
-EBUILD intel_clc-24.0.0.ebuild 2518 BLAKE2B 75b3a0f3cf1d1fdd61a496ae26552098631864492723ef66f880292f9613993f51a2a7e90a8d94a7a26fc22dd646f68b2afb9fd91297dfec8b20ed66e95f31a1 SHA512 00aecd707d4c426dd25a543c36e6061f8f37a990a559ba605c68e37a68cd02a0dc687391a796d5ed8895c247da76bea7915a602cafa23b91927571690e178122
-EBUILD intel_clc-9999.ebuild 2518 BLAKE2B 75b3a0f3cf1d1fdd61a496ae26552098631864492723ef66f880292f9613993f51a2a7e90a8d94a7a26fc22dd646f68b2afb9fd91297dfec8b20ed66e95f31a1 SHA512 00aecd707d4c426dd25a543c36e6061f8f37a990a559ba605c68e37a68cd02a0dc687391a796d5ed8895c247da76bea7915a602cafa23b91927571690e178122
+EBUILD intel_clc-24.0.0.ebuild 1742 BLAKE2B 81f2fcffb6adfcd90b9f0c74f88e4d0d76eb343f6d32cd89bc2eb3e73ae3a858ba464d82c88da761c377630f6746c16ceea7f5a1a915e3d71348706fcd2971f2 SHA512 51d13df9a6f20642f23f0590a6f3814b4b9c8accebe327ff97ac13f47958cebd3096b5566c6016c907e2e060284022dbc926a7bb744a184ffcb42f88d6f0de34
+EBUILD intel_clc-9999.ebuild 1742 BLAKE2B 81f2fcffb6adfcd90b9f0c74f88e4d0d76eb343f6d32cd89bc2eb3e73ae3a858ba464d82c88da761c377630f6746c16ceea7f5a1a915e3d71348706fcd2971f2 SHA512 51d13df9a6f20642f23f0590a6f3814b4b9c8accebe327ff97ac13f47958cebd3096b5566c6016c907e2e060284022dbc926a7bb744a184ffcb42f88d6f0de34
 MISC metadata.xml 388 BLAKE2B 0558cfe706987a93605fb383bc2c30ff4f4cf5837ca19afd3e16d9702ea7dcd3d575579d53aacb531e1d421c8b1692eb4607d713793a89240223c031d7781a31 SHA512 e0375912a94fa92b49ed78d9a88c4eacc8b441d8b2fa117a48df2d8a958f1cf91279299aca109e24f76b27ca04f0067f83e5b8e4141f85ac64d379bca0945d2a
diff --git a/dev-util/intel_clc/intel_clc-24.0.0.ebuild b/dev-util/intel_clc/intel_clc-24.0.0.ebuild
index 10dd7e930b24..adb22e32e30a 100644
--- a/dev-util/intel_clc/intel_clc-24.0.0.ebuild
+++ b/dev-util/intel_clc/intel_clc-24.0.0.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=8
 
+LLVM_COMPAT=( 16 17 )
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit llvm meson python-any-r1
+inherit llvm-r1 meson python-any-r1
 
 MY_PV="${PV/_/-}"
 
@@ -31,6 +32,11 @@ RDEPEND="
 	dev-util/spirv-tools
 	>=sys-libs/zlib-1.2.8:=
 	x11-libs/libdrm
+	$(llvm_gen_dep '
+		dev-util/spirv-llvm-translator:${LLVM_SLOT}
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+	')
 "
 DEPEND="${RDEPEND}
 	dev-libs/expat
@@ -41,53 +47,17 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. Specify LLVM_MAX_SLOT (inclusive), e.g. 17.
-# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 16.
-LLVM_MAX_SLOT="17"
-LLVM_MIN_SLOT="16"
-PER_SLOT_DEPSTR="
-	(
-		dev-util/spirv-llvm-translator:@SLOT@
-		sys-devel/clang:@SLOT@
-		sys-devel/llvm:@SLOT@
-	)
-"
-LLVM_DEPSTR="
-	|| (
-		$(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do
-			echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}"
-		done)
-	)
-	<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=
-"
-RDEPEND="${RDEPEND}
-	${LLVM_DEPSTR}
-"
-unset LLVM_MIN_SLOT {LLVM,PER_SLOT}_DEPSTR
-
-llvm_check_deps() {
-	has_version "dev-util/spirv-llvm-translator:${LLVM_SLOT}" &&
-	has_version "sys-devel/clang:${LLVM_SLOT}" &&
-	has_version "sys-devel/llvm:${LLVM_SLOT}"
-}
-
 python_check_deps() {
 	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
-	llvm_pkg_setup
+	llvm-r1_pkg_setup
 	python-any-r1_pkg_setup
 }
 
 src_configure() {
-	PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig"
+	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
 
 	local emesonargs=(
 		-Dllvm=enabled
diff --git a/dev-util/intel_clc/intel_clc-9999.ebuild b/dev-util/intel_clc/intel_clc-9999.ebuild
index 10dd7e930b24..adb22e32e30a 100644
--- a/dev-util/intel_clc/intel_clc-9999.ebuild
+++ b/dev-util/intel_clc/intel_clc-9999.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=8
 
+LLVM_COMPAT=( 16 17 )
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit llvm meson python-any-r1
+inherit llvm-r1 meson python-any-r1
 
 MY_PV="${PV/_/-}"
 
@@ -31,6 +32,11 @@ RDEPEND="
 	dev-util/spirv-tools
 	>=sys-libs/zlib-1.2.8:=
 	x11-libs/libdrm
+	$(llvm_gen_dep '
+		dev-util/spirv-llvm-translator:${LLVM_SLOT}
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+	')
 "
 DEPEND="${RDEPEND}
 	dev-libs/expat
@@ -41,53 +47,17 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. Specify LLVM_MAX_SLOT (inclusive), e.g. 17.
-# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 16.
-LLVM_MAX_SLOT="17"
-LLVM_MIN_SLOT="16"
-PER_SLOT_DEPSTR="
-	(
-		dev-util/spirv-llvm-translator:@SLOT@
-		sys-devel/clang:@SLOT@
-		sys-devel/llvm:@SLOT@
-	)
-"
-LLVM_DEPSTR="
-	|| (
-		$(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do
-			echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}"
-		done)
-	)
-	<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=
-"
-RDEPEND="${RDEPEND}
-	${LLVM_DEPSTR}
-"
-unset LLVM_MIN_SLOT {LLVM,PER_SLOT}_DEPSTR
-
-llvm_check_deps() {
-	has_version "dev-util/spirv-llvm-translator:${LLVM_SLOT}" &&
-	has_version "sys-devel/clang:${LLVM_SLOT}" &&
-	has_version "sys-devel/llvm:${LLVM_SLOT}"
-}
-
 python_check_deps() {
 	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
-	llvm_pkg_setup
+	llvm-r1_pkg_setup
 	python-any-r1_pkg_setup
 }
 
 src_configure() {
-	PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig"
+	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
 
 	local emesonargs=(
 		-Dllvm=enabled
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 0b69015521e2..93f0b7df3245 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,9 +1,6 @@
 AUX 50pkgcheck-gentoo.el 125 BLAKE2B db546b7f4e1517fb4f3bc46eff6a3294c8d677be031ecb33987daa84c355c3628ab7f24bbab90afb24b0bcec6c0ebebb56339374fa35a345481aa9808bd538be SHA512 31bad085867ebecedf0c9c3ed1223e7512238892d69b5224e850d744c5965bf7a2d7cb90978d9cce6da8dc554dba36803d604b8c6ac2b7cc9f2718ef7d6fc644
-DIST pkgcheck-0.10.25.tar.gz 580383 BLAKE2B 2f32bf413dcb68a59b82ee04147b7844efd7b69d932b5d57182e1c91be12750fe14fdd42bf40c652c69e8ac009b2346cc644a9407cf11f03eea2e74f4ab8edc6 SHA512 8d90b5629236f468b5553ca288dbd4843d83b09adc9b9b20a6ad6228a8bff74bf1c1e473575f85d1fb00bdd416e07cc77ea098fd6a2b29edf39f51da364c4831
 DIST pkgcheck-0.10.26.tar.gz 800332 BLAKE2B 01bfb0168fa7bb27660d4d82dca673834e761913aa4ab12a93a78936da9af3ad9d4330bc276c1c14687d0e0bed1f0748ed72ec871ee1af0c47bbdf724aa02e02 SHA512 8b668db52e1a28a664f06d7d4c590830a3f55c8f400b1dd61f8e721ecc04cd0b8d4e8124d07740d47c40fd9c4f3e9189a2c9a27c371109b76edcdfbad86e52fa
 DIST pkgcheck-0.10.27.tar.gz 806381 BLAKE2B f4acf72e85003f4dfa244c843464ab40a93df64a7bec68682cf39413552a51989a3214cab9c340318cebb39a8cf33c497fd72335cd37772f8e4d6e87838e413b SHA512 581109fdc565852d0407d770634864f809c2860ccfa03675afc8273199bc00af1c632c0fca27904c3262b1e851f3b8939cbda466cb3876ac228cddf74016fb32
-EBUILD pkgcheck-0.10.25-r1.ebuild 2170 BLAKE2B 44938d24e990a0ac15668ca51ec681010912b8073e9628743b0e691bdf0481262d37715338df87428ae474155b58c1bb44290474626a3eb91a26673db6c4fd6c SHA512 91e14530af0f3c084132f12e6c9ba0552835288fcc1ddfc3fa5f5bcf8d1f2e6c91aa051fb9652a2ca193b0ae285ef7810200b78ec05afb617996d7ef96ff3a86
-EBUILD pkgcheck-0.10.25-r2.ebuild 2181 BLAKE2B 808aac9d31a839493d8438718d72317d7c71e4d9674fe2bb16274f5ac4f9fe853fc3e1e3ce550cdc1ab69c10785c7209d215ea3788ca0309439e2bfb66c79be7 SHA512 6192074898536d3c2a4edf3cbe79891a0e24724aa0036e64d9a6391ab2cc72a060bcd7c8fd7c40dec354c6e489071e0a7766670f6cc0f9b10f08b856e9bf9387
 EBUILD pkgcheck-0.10.26.ebuild 2171 BLAKE2B db98882758501d6978686ef42e219a0fabfa65e461b7e68a7dedb9126f2877638291fb23bc1912244d4b86a7255b6228d8f3ae19cdca256da776226f58b4ecd1 SHA512 159ac0b29737f07c1873e3f709bddb79cea7a3168c83e14f1c4b296f8b3d91b9691ae3ab55ae433f2e9fc5e458a289aeb9d260e562c4a5784964ed8b9f1e76a1
 EBUILD pkgcheck-0.10.27.ebuild 2179 BLAKE2B 1ad7c2cc0778f82663afb755d0654012a5b981effd3e8d82f89af3c3fe663829e83cf99e86a1012d1f0f53a40f4cbd9373c32b48153dfc36b45e33c50a45852e SHA512 1eb392d8d6d2261156593214d9169911ed026c9e0df79ac0bd375fbdcdc51606641afd00c676b426d99d5ce53a20fcc305e1c73eeac13dd516dd3ea51d008460
 EBUILD pkgcheck-9999.ebuild 2179 BLAKE2B 9ce0b3efa33fbbb03b4e915a119a0ec5d7e58ca02065438c4afc32c8676fd7bdbc361cf11ef5fdab301cf00821f5564c7b2fd8413bfbf3c727c9984aa13cbfe9 SHA512 61149e34aac2d0db663dbff6da37e7f0d4be87913b1478bfe3650880c941b94690455f9c0c1e54ea51175f5ef8a16c49690e42b65277c82969af278275677eec
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.25-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.25-r1.ebuild
deleted file mode 100644
index 1fab10b785fe..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.25-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-inherit elisp-common distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcheck.git
-		https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-	inherit pypi
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="emacs"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.18[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-libs/tree-sitter
-	<dev-libs/tree-sitter-bash-0.20.0
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-	emacs? (
-		>=app-editors/emacs-24.1:*
-		app-emacs/ebuild-mode
-		app-emacs/flycheck
-	)
-"
-BDEPEND="${RDEPEND}
-	dev-python/wheel
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-distutils_enable_tests pytest
-
-export USE_SYSTEM_TREE_SITTER_BASH=1
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use emacs ; then
-	   pushd "${S}"/contrib/emacs >/dev/null || die
-	   elisp-compile *.el
-	   popd >/dev/null || die
-	fi
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-
-	if use emacs ; then
-		elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.25-r2.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.25-r2.ebuild
deleted file mode 100644
index 0e51158801e1..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.25-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-inherit elisp-common distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcheck.git
-		https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-	inherit pypi
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="emacs"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.18[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-libs/tree-sitter
-	>=dev-libs/tree-sitter-bash-0.20.3_p20230921
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-	emacs? (
-		>=app-editors/emacs-24.1:*
-		app-emacs/ebuild-mode
-		app-emacs/flycheck
-	)
-"
-BDEPEND="${RDEPEND}
-	dev-python/wheel
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-distutils_enable_tests pytest
-
-export USE_SYSTEM_TREE_SITTER_BASH=1
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use emacs ; then
-	   pushd "${S}"/contrib/emacs >/dev/null || die
-	   elisp-compile *.el
-	   popd >/dev/null || die
-	fi
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-
-	if use emacs ; then
-		elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index bfce5139a0fa..d86affda5508 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,6 +1,6 @@
-DIST pkgdev-0.2.7.tar.gz 77938 BLAKE2B 86cd05dad2e2c9fdea4a27cb804224ede75d84c3b7558ee42946ef38fcb2efbe7660951bb83047a9b48354b0d25638c8afcd760226c6a3af9ba61b299a98e3ee SHA512 0103245a4c79af80af9eeaa634cb244c4ca0ddfcc07534821dbc9300a0c406296820a0afd77e837548c6ed5954723d01778ce0d63987642043a79df4a54efb91
 DIST pkgdev-0.2.8.tar.gz 80084 BLAKE2B a0f072d510d2b8c59088be9230f881aef0c1f4a98de42715ffaa4de442263a95f84e997fde84cc5c885b2d15d9d0ca12b8956fd4ba8193662f82a208b525b56a SHA512 61926400ba210282612a695f59606cb0b4035442e79cb48606b2ad8095d7632b26ebc6b3f593d3e7bda52e8da1672d0c98de710a1e231c8b4b37e4bbaa1467b4
-EBUILD pkgdev-0.2.7.ebuild 1721 BLAKE2B 01ac1423134443fc8c9e90642d679c9b08e3cabbc214e624c2681464c91370e346df2a11e58195382ea845a2db40b939ec2520a67f0f72d7aed3bf88b3a65f37 SHA512 5eb4858e66bb6aeeca753a5d3e7922dc487fce0d0f232bc62f8634ce697ef1fd52fe6a68f27d4a682e566da4e85f5fdeaf19435fd4aa8035937d3f42e84091bc
+DIST pkgdev-0.2.9.tar.gz 85237 BLAKE2B db50d7f29313830986443e8e3b3fe6ae202049b1a25b3537de407d13ef7b547a8bc25afe5b520ac29b616e9dba8029d0a50a917f84728473f53a7621b8b7dcc9 SHA512 ff534eaa3ad039998541d7e4bbe39d9bece0a2401652880826c7639829efec3db38bc37352ea1c901121a0092a83518b803e14b484b08ba62462046d51bc81c7
 EBUILD pkgdev-0.2.8-r1.ebuild 1721 BLAKE2B c8a442ec1efa124f5cc48d46d63b8ef4b59fde59f1292690317414fe3db13e34a9d152f82d6c27efef3bd29d4c6ff9c24adcc2fb379d8bb6445125357dd4df70 SHA512 7ce5425b022d9d27980290b43fd5fb4af95c2c5f06246ef9fe9fa2f7e4750cbcc82168c1eb10d897a9bb17ba7f685b4906d2c5ba3e4be4607108c71b14d67e6b
-EBUILD pkgdev-9999.ebuild 1729 BLAKE2B e50d40c35a9d7fa86e51a0c8df4027fcaae9ed1217c61e2ab0fc6affdd4ddd315205b2b27a4b9ec7fb9eb88799faffe3611b983df0a028c23f0b4233ba3e26f2 SHA512 b35bb6a71e18ab883578602a118ff700a3e5b3c25b29e8bfb097b2fb26f93f744ba4f546d736edbac535f66d1ad238b9014fad17c43f0d49a215a34f928bbcfd
+EBUILD pkgdev-0.2.9.ebuild 1729 BLAKE2B a777826f4477b18a5ec90667ef0847707cfea6d5d43b1dafce6672040616e326fda38e7a5153a61484f8f673fefce99c0f761fbbe8628a0a86969c886f2b56e2 SHA512 3480ac0ffbf8bd20b93f440500d4fcd08d2484bc4e30c7d562c50537bff80d1151e4f2937be5b971821f4a8199e530260291c80fc032f4ee35112b939f955246
+EBUILD pkgdev-9999.ebuild 1729 BLAKE2B a777826f4477b18a5ec90667ef0847707cfea6d5d43b1dafce6672040616e326fda38e7a5153a61484f8f673fefce99c0f761fbbe8628a0a86969c886f2b56e2 SHA512 3480ac0ffbf8bd20b93f440500d4fcd08d2484bc4e30c7d562c50537bff80d1151e4f2937be5b971821f4a8199e530260291c80fc032f4ee35112b939f955246
 MISC metadata.xml 449 BLAKE2B f440d395e5453394e7bcc857ccd07b6735bce1b68b3e4ce9d33068c28c5794f6ba65d7394ed6f585dcd3e58ccd3f49ecee4d001ff4e40893db721b5ac869f7ae SHA512 a07c315d071af0ad53ee79f9db3cfd1a8acbdbabfad960cf64025eea1a3759f1ef7d5dcf71bf07b17cbfb6f912513edf118c28d3c24de06223a7a3420cc4438d
diff --git a/dev-util/pkgdev/pkgdev-0.2.7.ebuild b/dev-util/pkgdev/pkgdev-0.2.9.ebuild
index f4073bb87c38..207bcf10ce9c 100644
--- a/dev-util/pkgdev/pkgdev-0.2.7.ebuild
+++ b/dev-util/pkgdev/pkgdev-0.2.9.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
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	inherit pypi
-	KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
@@ -32,9 +32,9 @@ if [[ ${PV} == *9999 ]] ; then
 	"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.16[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.10.16[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.10.5[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.23[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.25[${PYTHON_USEDEP}]
 	"
 fi
 
@@ -43,14 +43,14 @@ RDEPEND+="
 "
 BDEPEND="
 	>=dev-python/flit-core-3.8[${PYTHON_USEDEP}]
-	>=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/snakeoil-0.10.5[${PYTHON_USEDEP}]
 	test? (
 		x11-misc/xdg-utils
 	)
 "
 
 distutils_enable_sphinx doc \
-	">=dev-python/snakeoil-0.10.3" \
+	">=dev-python/snakeoil-0.10.5" \
 	dev-python/tomli
 distutils_enable_tests pytest
 
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 927d5e880e3f..207bcf10ce9c 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-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
@@ -32,9 +32,9 @@ if [[ ${PV} == *9999 ]] ; then
 	"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.10.5[${PYTHON_USEDEP}]
 		>=sys-apps/pkgcore-0.12.23[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.10.16[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.25[${PYTHON_USEDEP}]
 	"
 fi
 
@@ -43,14 +43,14 @@ RDEPEND+="
 "
 BDEPEND="
 	>=dev-python/flit-core-3.8[${PYTHON_USEDEP}]
-	>=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/snakeoil-0.10.5[${PYTHON_USEDEP}]
 	test? (
 		x11-misc/xdg-utils
 	)
 "
 
 distutils_enable_sphinx doc \
-	">=dev-python/snakeoil-0.10.3" \
+	">=dev-python/snakeoil-0.10.5" \
 	dev-python/tomli
 distutils_enable_tests pytest