gentoo auto-resync : 14:03:2023 - 00:16:42

16 files changed, 227 insertions, 419 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f3b9f929a967..b6a842a6a84a 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/blueprint-compiler/Manifest b/dev-util/blueprint-compiler/Manifest
new file mode 100644
index 000000000000..489fe5c7c8d7
--- /dev/null
+++ b/dev-util/blueprint-compiler/Manifest
@@ -0,0 +1,3 @@
+DIST blueprint-compiler-v0.6.0.tar.bz2 56896 BLAKE2B 318ffa52b2fbf3b07058e5b4d2f9bb0ef1f6614586b79968889921964b454e5c26d44e58a18185263797f7569135662d14471bafd8e501d7c6386e88972193d0 SHA512 458016f4eabef15026cb3ee675111984b19af8a9139bc412dfb48dfef56b0d0ff028316001d0ce04a90b50d6785c92d799f17ed42ca53fc7582345729ae02207
+EBUILD blueprint-compiler-0.6.0.ebuild 1316 BLAKE2B cda7da45a84d7fce71fe5841b8310d350e129b6dc4fa09070e28bd2b601fe3b0f8e15b41202940a9304e8d767a2c1fed8b0c27335d552004a8c518a6f7a48331 SHA512 a81de37e626a0791e43a1594f393265e9b902d58470dd71e9076e46217a7b3a246e00f14b4c7da67feef5e018b23d874da06331fee41bdf197aac0abee21f63c
+MISC metadata.xml 906 BLAKE2B 8426e8a64268f0c3310028be81cc727a63ddd67df842d59eae80c55b12c41f446107cc61ed11c115da8b4cc9a67bb16b1d5c9dc09e541f41901eac29611f3e9d SHA512 3af397704e2717cbba16c890af04066cd67f40c1cc477429d3c53b713c079101036a17e788c0f5e316799cbfc8329356686ad129bfbed409002d96df3159d480
diff --git a/dev-util/blueprint-compiler/blueprint-compiler-0.6.0.ebuild b/dev-util/blueprint-compiler/blueprint-compiler-0.6.0.ebuild
new file mode 100644
index 000000000000..b54ac7882f03
--- /dev/null
+++ b/dev-util/blueprint-compiler/blueprint-compiler-0.6.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit meson python-single-r1
+
+DESCRIPTION="Compiler for Blueprint, a markup language for GTK user interfaces"
+HOMEPAGE="https://jwestman.pages.gitlab.gnome.org/blueprint-compiler/
+	https://gitlab.gnome.org/jwestman/blueprint-compiler/"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/jwestman/${PN}.git"
+else
+	SRC_URI="https://gitlab.gnome.org/jwestman/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+	S="${WORKDIR}"/${PN}-v${PV}
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-3+"
+SLOT="0"
+IUSE="doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}"
+BDEPEND="
+	${RDEPEND}
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/furo[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		gui-libs/gtk:4[introspection]
+		$(python_gen_cond_dep '
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+DOCS=( CONTRIBUTING.md MAINTENANCE.md NEWS.md README.md )
+
+src_configure() {
+	local -a emesonargs=(
+		$(meson_use doc docs)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	use doc && build_sphinx docs
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+}
diff --git a/dev-util/blueprint-compiler/metadata.xml b/dev-util/blueprint-compiler/metadata.xml
new file mode 100644
index 000000000000..c28d6bd1544b
--- /dev/null
+++ b/dev-util/blueprint-compiler/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <longdescription>
+    Blueprint helps you build user interfaces in GTK quickly and declaratively.
+    It has modern IDE features like code completion and hover documentation,
+    and the compiler points out mistakes early on so you can focus on making
+    your app look amazing.
+  </longdescription>
+  <upstream>
+    <changelog>https://gitlab.gnome.org/jwestman/blueprint-compiler/-/raw/main/NEWS.md</changelog>
+    <doc>https://jwestman.pages.gitlab.gnome.org/blueprint-compiler/</doc>
+    <bugs-to>https://github.com/jwestman/blueprint-compiler/issues</bugs-to>
+    <remote-id type="gnome-gitlab">jwestman/blueprint-compiler</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 59e2c3e5c60a..c3aa2c466b75 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -8,7 +8,11 @@ DIST ccache-4.6.3.tar.xz 531184 BLAKE2B b23c22876cd3f31bcd67b9120fd5e60544150847
 DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e SHA512 ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89
 DIST ccache-4.7.4.tar.xz 547820 BLAKE2B 03e03223f0fd6eb001c7d93bcd03a0ef6656ebd3ffcc920b9e772fb68275ddf1e8a941f8f7de68358cbc7a9b9d5aa65e35b91554ff24684f29ff1953aefae75f SHA512 48c663b51e874cfbd8daf0ef9759d025c2605c36da47ebbc77b52ceb941b810436600429f74204f13e2e2e601af6186a4bdb992f8da239f88cb9df4c6c95d58f
 DIST ccache-4.7.4.tar.xz.asc 833 BLAKE2B e155f9cb695794a28771a928d50e18705441b9fb9a8ec425aabc78dabcd68caca68ba15f74ba176a73abf414c4ba98b1832da3536fcd87d7c32f2689fe7e1908 SHA512 567a051e7c93cd62c8ad7631fea98a6846e2f548aaa201acefbe44d1027f8048cae5ef462488da7ce90864b23a426d524f576472428f93ecbc5cea3ae224b860
+DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9 SHA512 e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb
+DIST ccache-4.8.tar.xz 556804 BLAKE2B 5cca7d49088c5391abf93a2a493ba8e120575ae834abae86f3669e8c883a93ec29d48ab934aa086a87feb6a08d0c0053b3ce7174cec2f342c2d695a93fa3ef9a SHA512 561424d448a049971742b846429c2fa5f1df43c05f201610dab0a3fab7e4806589c14ca20875cb5733763603c0813fe9350a244b63dda03e9def95d547738d0b
+DIST ccache-4.8.tar.xz.asc 833 BLAKE2B 4a646db5b7a220a21ad93a02ea4bad23a666ad116af70211ea4a9a546ba7aeaf0c1c88c79d264f614a2ca5387dc91bf655a1632f53889dd74f49e085e2f6bd01 SHA512 22b6aeb54248576a1199e173db7b58b985bdc4e6a298e9fbd32992ab6dbadcd4496ffcadc24241215bd43166b68faf77aa3e492e44ffeac53e1e5e4c46015836
 EBUILD ccache-4.5.1.ebuild 2295 BLAKE2B 8b89808a850d5bb512a9672d719a800c9f17fd23dddc3bb5b1c0626b4160910bead0ca27137d734340ca9a60783349b97730376d5cb35473698b843203758d7c SHA512 96c0b4dbe479a0383fb28fda5f262e4490625e0ba137e5435ba8ee9702d14fe68c42a04a462792ff96aa176e3676a819602e2e50cb989d5061842c188d8fc5ba
 EBUILD ccache-4.6.3.ebuild 2575 BLAKE2B c8b4113239bf1ea5d2b394f68e0f2dc623a602bf082c72cb4e5c38640b83e9909e69324a894a9a79bd88610a36451cee2ea35ddfce7060794b52fb8923b8fa95 SHA512 37fb4a65048e332d928279eccb5bcebeb20ab61379898aa548eb5ced5a858b680cd844f2f679d4ea528af54f21ca663614112dc45b937b8da38b1718fa919f2e
 EBUILD ccache-4.7.4.ebuild 2489 BLAKE2B c96ba952f7f90c54812fcc1ead1bc4adf7b036937b2d80a05c0bebc54cdf3cdaac456e8918b6f4905cb38c19aa98d9c912624d22bfd76c0ae35d32e8c7cea6dd SHA512 90802b6ff902bb7cced6947824d38ea90bf8da66b48dec9cc7f1584193f4fb3f4d50217685306e1504118a55a46c6680f27b6a59368c835058171ef33f772e4b
+EBUILD ccache-4.8.ebuild 3568 BLAKE2B b7cbcfd12398afdc1921155a19dea92506f1eb3388ff919cea9f154c9ccb369f3088769586d531c8911f7e615c3d2416edefcca77fc4fcb8d697e7710b3e1bb9 SHA512 d33365bdcdc749bd0548355b9299b6b00092b3d24f85e274e392aa9a356b3af03669e3f0e8d02eabfe7bf03c3741997ae0705f7f477e1e1bea689a9d6334acfb
 MISC metadata.xml 710 BLAKE2B 0a93cf3dd4222eb2fd500c3cafdff3c01eacecc489a471270922fc5dd1daf58cd1398ddfb7ab4d271a6e84d5a3da5c3e7a341b1e7994af7b10fd432318de7c5e SHA512 dbfa6b8d8f435e25887b25ce25df65184a7f315986ee60a1c723d0e6592ca73bc7414b6650014812eb882e7e39bed953eaa21139a414043c50c018a7b780e6f1
diff --git a/dev-util/ccache/ccache-4.8.ebuild b/dev-util/ccache/ccache-4.8.ebuild
new file mode 100644
index 000000000000..f839a350fcda
--- /dev/null
+++ b/dev-util/ccache/ccache-4.8.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+CCACHE_DOCS_PREBUILT=${CCACHE_DOCS_PREBUILT:-1}
+CCACHE_DOCS_PREBUILT_DEV=sam
+CCACHE_DOCS_VERSION="${PV}"
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+CCACHE_DOC_USEFLAG="+doc"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+if [[ ${CCACHE_DOCS_PREBUILT} == 1 ]] ; then
+	SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CCACHE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CCACHE_DOCS_VERSION}-docs.tar.xz )"
+fi
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+[[ ${CCACHE_DOCS_PREBUILT} == 1 ]] && CCACHE_DOC_USEFLAG="doc"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="${CCACHE_DOC_USEFLAG} redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	app-arch/zstd:=
+	redis? ( dev-libs/hiredis:= )
+"
+RDEPEND="
+	${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions
+"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND="
+	doc? ( dev-ruby/asciidoctor )
+	verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )
+"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+	"${FILESDIR}"/${PN}-4.0-objdump.patch
+)
+
+src_unpack() {
+	# Avoid aborting on the doc tarball
+	if use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+	# Mainly used in tests
+	tc-export CC OBJDUMP
+
+	# Avoid dependency on libstdc++.so. Useful for cases when
+	# we would like to use ccache to build older gcc which injects
+	# into ccache locally built (possibly outdated) libstdc++
+	# See bug #761220 for examples.
+	#
+	# Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
+	use static-c++ && append-ldflags -static-libstdc++
+
+	local mycmakeargs=(
+		-DENABLE_DOCUMENTATION=$(usex doc)
+		-DENABLE_TESTING=$(usex test)
+		-DZSTD_FROM_INTERNET=OFF
+		-DHIREDIS_FROM_INTERNET=OFF
+		-DREDIS_STORAGE_BACKEND=$(usex redis)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${CCACHE_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${CCACHE_DOCS_VERSION}-docs/docs/*.[0-8]
+	fi
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} ]] ; then
+		eselect compiler-shadow update ccache
+	fi
+}
diff --git a/dev-util/pahole/Manifest b/dev-util/pahole/Manifest
index 5e4ac88c2d57..363c0f1bd2d1 100644
--- a/dev-util/pahole/Manifest
+++ b/dev-util/pahole/Manifest
@@ -4,6 +4,6 @@ DIST dwarves-1.24.tar.xz 875744 BLAKE2B 6766b5a5ecbf64013227e7cd459af662fc213f23
 DIST pahole-1.24_p20221024-patches.tar.xz 22088 BLAKE2B b39458400411dd7da0f568257f42164952e170b952e4893a92d769e17ce4cf0de88b727808a38195438fe10e5537f245bf101f647f383b6df7642c5446fa5d45 SHA512 93f160f01023c5402535a34d59005f0a3e056662a2764722480d71b6e522f3bfef0d642084467d1fbea96e23386b4cbb708243713d59eb84f4f767c1ac5ab3f5
 EBUILD pahole-1.23.ebuild 1093 BLAKE2B fb7f97012a131093123ecd97e5800a0de8c653a6c8095906781b44da88d4412d888704c5e924ebce1a9ee888db356cd5cf23a2c7da159ca9db3c0298ecd19193 SHA512 0bc03b41b3edab165a7bd25a2660310bf75548ee56f404808df5ed1002b200f21a6741110669930decd93ea8554cbe9243330dc4cdd4a8d04d34413e0a7aebed
 EBUILD pahole-1.24.ebuild 1089 BLAKE2B fc944b60897285106af282a7fb54a5b21cd027ce41f63b3dec854178447bec28360af4d4a396618c7820c9b5e76e033f920236ea1141668532638589e64ee229 SHA512 16af24361e6dbbf19a38bc09baeb8b899056687d72d4ab6257c838f40b471bc318c2b7eaa12f91aaa05ed54924bc1d0b273722e52be41fe02bd9bdd743e7d92c
-EBUILD pahole-1.24_p20221024.ebuild 1698 BLAKE2B ae7281d783be25d0d5cf060986e75cd7d1df973ddea10be0173306f36e258edb79e5d441f5b9262b51bd758a20217294411d3b7b3f67f8d039f9f2eb8d134439 SHA512 0afbe223fa78b2c40e8cc253582768338fa23ce76cf307157696e7cf0239cf305755f8e525c051e15ac117ea04fdd279948d6dbf9f0b9163173bcf2ab895fb5e
+EBUILD pahole-1.24_p20221024.ebuild 1693 BLAKE2B d7e4545a961c61fc928e4e553ef79c335f8fc7948dddc51610a30d9cc423617ceb84006b34f9401010ddf0e50cc3754188cde6f1026eab0f93aa4f8d6746791a SHA512 a81a323b7061aeb227e48ad1eb33dd0f8417cc2921a8cdd48ad70d6d2bf56018ddf31e2695b0771fb6af4c9c8c8a1605c9bd9858f73418810bf6c8962d5cebd5
 EBUILD pahole-9999.ebuild 1698 BLAKE2B ae7281d783be25d0d5cf060986e75cd7d1df973ddea10be0173306f36e258edb79e5d441f5b9262b51bd758a20217294411d3b7b3f67f8d039f9f2eb8d134439 SHA512 0afbe223fa78b2c40e8cc253582768338fa23ce76cf307157696e7cf0239cf305755f8e525c051e15ac117ea04fdd279948d6dbf9f0b9163173bcf2ab895fb5e
 MISC metadata.xml 672 BLAKE2B 2178381434a5293df5a6a07a8c84c20a4f98d011c90ed2db911085639689224509445e16197ff88e0ab6fb7e6357bc96291feff21a44f350f51b1031e1882477 SHA512 2cd1f865e42bd845bb3831a1f6c8060e469e0afb3acbaaec2989018481a6f93e0fdae9afb74413c00db6967069cc6d0447548c3b4c238a70db07ee8786fe1e99
diff --git a/dev-util/pahole/pahole-1.24_p20221024.ebuild b/dev-util/pahole/pahole-1.24_p20221024.ebuild
index 5d98a672167d..aec3a504a192 100644
--- a/dev-util/pahole/pahole-1.24_p20221024.ebuild
+++ b/dev-util/pahole/pahole-1.24_p20221024.ebuild
@@ -37,7 +37,7 @@ LICENSE="GPL-2" # only
 SLOT="0"
 IUSE="debug"
 if [[ ${PV} != 9999 ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 fi
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index a82b557be23f..d89e45dd487f 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -3,16 +3,9 @@ AUX pkgcheck-0.10.19-fix-pkgcore-0.12.18.patch 2435 BLAKE2B 3e41b3ca1666aa8f8847
 AUX pkgcheck-0.10.19-fix-setup.patch 733 BLAKE2B 39033cf4509d7a46f0a638109cf1b7b8cb8b978f6b50ab4a331ee0b73745d3706b22f8e331990a2daf7138a9d0a37f42dcccb03285ea705ef96e2ae4d3a79f6d SHA512 6f1e2644989d2843fa9358e3bb440306fa4b6f52bece07dd2bec36b2597b41c03d54784d3ea505539ab5463030703d4b76d62ea476fb31d0f5719a6af662affa
 AUX pkgcheck-0.10.20-fix-replay-bin.patch 4506 BLAKE2B 68262310538abb220ef3f3109f65656e11716160895491f00f438bd686fe6a904238b1dd29cd92db7bbbb83f2a0282e455e843b7cc8f17c9f4c47a42f8dc4a82 SHA512 42a45d64f4bcd31b510124e8091bb3aae93c906bdb90ea2332405a5b17baee43edffc45563774fbdb2a7efae795065b67f81aeef1c5b9bde7df0bdcdeab3aa48
 AUX pkgcheck-0.10.21-fix-scm.patch 1470 BLAKE2B 2ca07fd6f5736df1bc8ce374842bc5d8090e7e705bf0c98630ab94e9c12ca2f0cd0be6b9bd57d59e67f2b25f971865ff3583d66f2815762e68943083636656f7 SHA512 360091ce895ded5abec23cfe7b9d268d22ae59a237c2f9f85e5463488d94dd8fa86eb8e7b148d0d92066d69854d263dd08645620bc43aedabdd8a283adbbd8d2
-DIST pkgcheck-0.10.19.tar.gz 548636 BLAKE2B cc1626c1d5ad9ba6b43f99bcdb668092805eaf9797c9839812d8716ea9f454f631d2e6da4579bbf702da5aadc61adc8064a6b7d32f001aaed9a2e42f8392f24c SHA512 c3af623b5c38325f9afabaa217e29d23dce4355a0aebbed77a5efa469ac135238d0aa04b4973d84c52e68ada0cb3b391a82d58317e75a279f083470c7e69cdf6
-DIST pkgcheck-0.10.20.tar.gz 549746 BLAKE2B 72ed97d93674ffd311978d03ad3738494a752bf1b02bea5eaaaf1b066c48e8c9ec5f82b79baeeabf3e56e618c76614ee6179b7115d1d875364ac6e3fbc3c6028 SHA512 6a8c135ca44ccbfe15548bd396aba9448c29f60147920b18b8be5aa5fcd1200e0b75bc5de50fc7892ad5460ddad1e7d28a7e44025bdc581a518d136eda8b0df2
-DIST pkgcheck-0.10.21.tar.gz 559386 BLAKE2B be30dcfb0021459026059befdd9cbe661b9b2448e6997e23ce6cc28b56793acc72cd490cf07f42ad6e13a48beca52eba5ffc0b40ef981fbc7235dd9ce29bdb27 SHA512 148567658d949e4737da5bcd2329b4647296877b747a216c64a4d0839dd0b869a8ae32644784ff124f7f94e54a58acc5fc349a28c8a096a99b9488ebc04b374e
 DIST pkgcheck-0.10.22.tar.gz 566826 BLAKE2B 714eb92bd43b4c3f2319aecb343fe6580f754ba50ed6fa986faaedcba71d34f2834ca85d17c961d327c90081dc305febccfbe08dbc13a706d972e289271214e3 SHA512 45532faa169d42f3d5a94a17e83089d4789e7c3e26226f2e5441ba8816cd3610a9025cc392bb32d6d78f202354ab11117fbd07ec2550d7e3255c02c6cb96d98e
 DIST pkgcheck-0.10.23.tar.gz 568903 BLAKE2B 8b00dc93d0c3f597f7397d2e7b3686d11b12da715d6e8071f1b02a8085061cbb2d7cb24bde6a73ef6e5d1459637cb78e536ce80a162f188a42739a434c62c397 SHA512 3bcdb91bf73cde60fd9fc2f5e470c5ccdfd7b3564e83192201b0fa1dc38265e1e0c7f7052039accbb62c55d816a6e89317d7d388c0cc3da3b4836475cb82bd03
-EBUILD pkgcheck-0.10.19-r1.ebuild 2362 BLAKE2B d653ee448a74bbf5debee553a67e1e387fc0ac0f3083540b32b014991eeb27dd0b02f33697b95669ebe26fd0c84d528324b2cb5b7b51750e4e6d45309233cc6a SHA512 2da2dcd658b828c907380fb4af4d2fcd2fc7aa007615a8fa1fd36dee9cfe71b6d21ea80fcc25eddce69b54b64046a5ff5c86acd64d8dfb8f0f97d3f72a2da5dc
-EBUILD pkgcheck-0.10.19-r2.ebuild 2417 BLAKE2B 8846153b57eb01b03fdcd0d9b70f303aafc9ebe40dc2a139be4b480153d734da67ff94a42b5a7d3accf2a9cfbb73664668717c56b635d9d88bcb001b5d93b787 SHA512 5529cca4233e5c350209baae3838949954a076fe074b3dc93bab8e34c5716f0d701cb43fc443ccfb1e225ed06f3d61e21b34f566b64e0cf08167d91066016bec
-EBUILD pkgcheck-0.10.20.ebuild 2299 BLAKE2B da8d2f3c4003dece22395a782538718fb5511048dd8a0f193504875b42fbe1c330583e4491b12cc4ef0c4d85caedb7777d3b00bb562a6e5974ebfd35f93fdeb1 SHA512 d97b28760c66445cf6a466a928dd1458ebdec5bec82742609545899e6a451bd46b5ec02913ec56228da44ddba728e0fb9bf76f8e96043d91042015587ed6c419
-EBUILD pkgcheck-0.10.21-r1.ebuild 2264 BLAKE2B 51a2ddc89739a22f65f4519be6af1ae7b6e3c7b6553e40c040d6bca4960fd59592f3fbf5443b7e0df14b9dc1a9a6ccf76cb428375df9d92aa7437ebac9ec15d6 SHA512 15e5914fa42016c49a7f0a4c059fc5a3760368e2b91dd638e050d4491880b4c0d62ff878e76d8ae2a9033c171c20c7b7552a2d7a24641a719327a4d28b3fcb67
-EBUILD pkgcheck-0.10.22-r1.ebuild 2256 BLAKE2B 0dc30f4da63ae017ec64878d963e77701afb5b29ad8e472ce705b5c3e211ca0cf45a1fc8df736820db90076896488439cad20dc1f1152e79ccc7317a75f45843 SHA512 4a60f4cd83f176a25666532b65a2dc89aa00e741339437e5c44b4bb8872ef41819857f8f51a4ec70b3eb70e63b023f4050a5b24f4410ddfe449282e6f0b838fe
-EBUILD pkgcheck-0.10.23.ebuild 2208 BLAKE2B 611f4a9bc2958e16e58867934ca50f62784217144e207875e30d3844ecb240361e6d20e5b0a216445e9d13b7f5bb0e9293a5e6682a9e5549a83dd14040aeb2f3 SHA512 6197ca12a10db8ef8a8b1c160952fb63751fb771f08c656512a2c11393bb8e241dd6c209bb5a718c66edf0d4448511e426827e40155601b834fea0da5953a3c5
-EBUILD pkgcheck-9999.ebuild 2208 BLAKE2B 9df86718b0572e354aecf6b68f251be51538dca36e4a42e79fdb0ab7a48911b5b79ebe033cbf7814f1c5a1105a4065d5790e3ba388c1d8f77c42e735a4d179ac SHA512 d63bf1d5c01fbd1e8d6a93e7176c0b6aceba20dfda43eff12ad12a91eca4f6f52aeb1d1d0a65c521205bb05244789b1fef563fbc5cff6a7c639d7b0221dec52c
+EBUILD pkgcheck-0.10.22-r1.ebuild 2217 BLAKE2B af41a235df61258a02f411cba4da7ecdd3e3019713a5cdeacfab6ea1ea95d36b13fd50a321dbd2699c26fb099a902a4fe5845b81e65e55f9d9808a19e1762fc9 SHA512 42edb05e05c4d6a2d94d88d767749224a705b94c6d6cbc3ef633b2e2dd657df980d9597e67f7bfd49c31430fa624f22021748d5425d82a63c7561b097176566b
+EBUILD pkgcheck-0.10.23.ebuild 2161 BLAKE2B 205f7a20d466ec9d3300d373e9aefea4420489b251b077543375fcf40636820fe2d258f8c10421434f167f4654e1da69d4b21c36b493236c241ff10929c2462e SHA512 3ac329f184a5708c80e3d1096c964054126f5d1f367598d881c526861160f0dab970ef9c2ee49db43fbbfd1f0af13a9c1edcca5d72a5ca7ff566ced3e82825ea
+EBUILD pkgcheck-9999.ebuild 2169 BLAKE2B e94f98e25963292d6581d4e167816da3b62ecc26c93bb7810365b3c1d6978ed803a4c8176065035202c2184e8b54abfdf0b443e18d0e7d619a3762086a0a96f8 SHA512 57aeb9a89927976fd235f0ff5f6fc625dba260ef81a937f85a9e72380e30f091287ad32d4781b9971222640f17855b99f4fb17018e59f74ea1dac2f877997023
 MISC metadata.xml 455 BLAKE2B b544db3532ef1da966833d5edbc79988cc1fd85b6d6276476684b49d4485814d6e2d969e742d3633c8176e7f37cae6614dae1654fd1424d71475f022166f6e6a SHA512 5abd1584f486e88992bab8c51c191b4915a5854752130f8a591147ff4b2af2102fdc8ab182e7358c3e4bbb3fdc8400563a250e2dba1793d365f0edc7c5f7c33a
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild
deleted file mode 100644
index 0ead2a88c1b6..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild
+++ /dev/null
@@ -1,102 +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_{9..11} )
-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"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-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.3[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-0.12.17[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-libs/tree-sitter
-	dev-libs/tree-sitter-bash
-	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
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.10.19-fix-setup.patch"
-)
-
-SITEFILE="50${PN}-gentoo.el"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/scripts/test_pkgcheck_replay.py::TestPkgcheckReplay::test_replay_pipe_stdin
-)
-
-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.19-r2.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.19-r2.ebuild
deleted file mode 100644
index 7bdb06bfcbfd..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.19-r2.ebuild
+++ /dev/null
@@ -1,103 +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_{9..11} )
-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"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-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
-	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
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-pkgcore-0.12.18.patch"
-	"${FILESDIR}/${PN}-0.10.19-fix-setup.patch"
-)
-
-SITEFILE="50${PN}-gentoo.el"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/scripts/test_pkgcheck_replay.py::TestPkgcheckReplay::test_replay_pipe_stdin
-)
-
-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.20.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild
deleted file mode 100644
index ca8e001c8437..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild
+++ /dev/null
@@ -1,99 +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_{9..11} )
-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"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-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
-	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
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-replay-bin.patch"
-	"${FILESDIR}/${PN}-0.10.19-fix-setup.patch"
-)
-
-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.21-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.21-r1.ebuild
deleted file mode 100644
index 6c5f4ff38cef..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.21-r1.ebuild
+++ /dev/null
@@ -1,98 +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_{9..11} )
-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"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-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.5[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.19[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-libs/tree-sitter
-	dev-libs/tree-sitter-bash
-	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
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.10.21-fix-scm.patch"
-)
-
-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.22-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.22-r1.ebuild
index 720d751b9336..4e4cb79a4a27 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.22-r1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.22-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	inherit pypi
 fi
 
 DESCRIPTION="pkgcore-based QA utility for ebuild repos"
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.23.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.23.ebuild
index 582d6f268d39..60b9b8d6e828 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.23.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.23.ebuild
@@ -12,8 +12,8 @@ if [[ ${PV} == *9999 ]] ; then
 		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"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	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"
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 45516db85496..95b29b01a08f 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	inherit pypi
 fi
 
 DESCRIPTION="pkgcore-based QA utility for ebuild repos"