9 files changed, 254 insertions, 8 deletions
diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-14.0.0_p1.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-14.0.0_p1.ebuild
index 6b5d7b14c5fe..339e37da1f5c 100644
--- a/dev-util/mingw64-toolchain/mingw64-toolchain-14.0.0_p1.ebuild
+++ b/dev-util/mingw64-toolchain/mingw64-toolchain-14.0.0_p1.ebuild
@@ -40,7 +40,7 @@ LICENSE="
 	ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain
 "
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE="+abi_x86_32 +bin-symlinks custom-cflags +strip"
 
 RDEPEND="
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 3ac0e8db27f0..8cdcc5e5fb71 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1 +1,2 @@
 DIST pkgcheck-0.10.42.tar.gz 422183 BLAKE2B 88afbf4b4a9ea9accb447e17eb4b16ae5960fadef8d14f4c30478e06df43aaa226066e5bf9ea90122f21b0a21caf4908e44069d41254726de8c90b302dacc60b SHA512 a2a30fd2757216a865dce76dd05190706e15ccd2682337e757461184abf3ac5e4ee450d6007820248c55052c1591c534cda94ea06cc29171c876a56ac25de5f8
+DIST pkgcheck-0.10.43.tar.gz 430787 BLAKE2B 4d1d1b2bd5dbd9a05c026796c4053ee3b26b98ac857978cd7820cea2d4b0ad9bbdb001baaed46e8574ebbd9b39497c9448e3381d96d748cad76560e58a094d32 SHA512 73987234d6404dfa61f7019b380e76b729200f92b168ca38de1d7f8e6c968c42d471e4090bee94d4e7abbab6dcae6888db953f075c8345eca03714e521d714d2
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.43.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.43.ebuild
new file mode 100644
index 000000000000..81358100df7e
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.10.43.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{13..14} )
+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 ~loong ~mips ~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.11.6[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.42[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	app-arch/zstd
+	>=dev-libs/tree-sitter-bash-0.25.1[python,${PYTHON_USEDEP}]
+	dev-python/charset-normalizer[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	>=dev-python/tree-sitter-0.25.2[${PYTHON_USEDEP}]
+	emacs? (
+		>=app-editors/emacs-24.1:*
+		app-emacs/ebuild-mode
+		app-emacs/flycheck
+	)
+"
+BDEPEND="${RDEPEND}
+	>=dev-python/flit-core-3.8[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+EPYTEST_PLUGINS=( pkgcore )
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unpin dependencies
+	sed -i -e 's:~=:>=:' pyproject.toml || die
+}
+
+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 build/sphinx/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-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index c3ebdcbc3aa3..81358100df7e 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -29,8 +29,8 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.11.2[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.36[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.11.6[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.42[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	app-arch/zstd
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 497b626e0de9..ea08fcdf9652 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -3,3 +3,4 @@ DIST pkgconf-3.0.3.tar.xz 415512 BLAKE2B 1de3b5f81b1bf291c3861c39244e2020de53330
 DIST pkgconf-3.0.4.tar.xz 418324 BLAKE2B 19dc43450844eb967b0b7a05242603070cc0c2bbc24d7cf29980f20c3e4b9fe6e652d48c0d4afd040dc3fb87b1816bd97d08211fd8a68a217493f74349d282bb SHA512 0ed682acf6bf08d40f1653217ce637f6e30a40f09598ef0b9aebe3f27d46d953897e7ff876feaa6b2d6c583a770ef9625ba7690bb7484dcf40afadceb02c3886
 DIST pkgconf-3.0.5.tar.xz 426972 BLAKE2B c271d6afcc37faebc141156c20fff3305cd1b23e5f0c92f6d7e295d6f1547697e5c17e7bf0a55fc94ad21edab0a1d9f004537397d6d98101282863b62826d4d6 SHA512 5f4559697ec1849771eefaeb77a3fea7caa638b83d381e6e2f913e3f053fa1ae796f18e4360d3a37bc1a17999f043ea244e91cadd5f3c170d50c48088e4c1a55
 DIST pkgconf-3.0.6.tar.xz 428124 BLAKE2B 14c9924a945e8e8a8e2aadee9f7bde307ba90bcb96db60437d641f81e0752214f49ba6d6423f671a2ada2a383e558e8d96ff6820cf641e14cd2f4439892e97b9 SHA512 7fb067de935ed633bf0479a69b8bb689583487e1fb13501d05b787a3b3004d0b4b3c5194252e8924b18b8e35fb38e1388f86541c17db81fd5c1d94584e2e1140
+DIST pkgconf-3.0.7.tar.xz 427648 BLAKE2B 650ba75df56c8c0428ef361428c888b2672c201ae4443e12d126f840ef891430a6390615f48e09eaa534c080bc4fdbc09d25ec72c9999890e6a7aee8f0829ae3 SHA512 4cbd4eba6068f2783a4a6e39f4e4679b90ab8424cef3d51901db5221952ab02152bb79ac8e4801923467d97257202b0722e0a85a7955262fe406a9121a124ac0
diff --git a/dev-util/pkgconf/pkgconf-3.0.7.ebuild b/dev-util/pkgconf/pkgconf-3.0.7.ebuild
new file mode 100644
index 000000000000..d77151edc86d
--- /dev/null
+++ b/dev-util/pkgconf/pkgconf-3.0.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2012-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/pkgconf/pkgconf"
+else
+	SRC_URI="https://distfiles.ariadne.space/${PN}/${P}.tar.xz"
+
+	if [[ $(ver_cut 3) -lt 90 ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+	fi
+fi
+
+DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99"
+HOMEPAGE="https://github.com/pkgconf/pkgconf"
+
+LICENSE="ISC"
+SLOT="0/8"
+IUSE="+native-symlinks"
+
+RDEPEND="!dev-util/pkgconfig"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/pkgconf$(get_exeext)
+		/usr/bin/pkg-config$(get_exeext)
+	)
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-system-includedir="${EPREFIX}/usr/include"
+		--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
+	default
+}
+
+multilib_src_install() {
+	default
+
+	dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
+	dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use native-symlinks; then
+		rm "${ED}"/usr/bin/{pkgconf,pkg-config}$(get_exeext) || die
+	fi
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index 7af4808da6b7..81f77767daef 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,2 +1,3 @@
 DIST pkgdev-0.2.16.tar.gz 97591 BLAKE2B 46ce826ae965713d3d553775fe2e927cd34570008825b7c33352a1462cdddd3db8c624322bca87dae55978bc795cbddc1ea4e3543ab9db39173c5b4e0216ed8c SHA512 64b950645b684ae8bc6f21aad387bfbd887e0e9b29ae64234684fb39bdece6faa3a2e423ce6451e95995c33796158cdf167109de29264423e6bca768f7bc12fb
 DIST pkgdev-0.2.17.tar.gz 104119 BLAKE2B 3a789faf057b173dce899206e6fc9949367ea29b52e28c6867da9db4f3a8c0a842555bee08d802ddad32edd9db8eb459d2876b4c80fe82353a922b9606d7fa5f SHA512 581908452df1fffcc0d78d505e1330e1560f47b26a22e04d47fc9a118b3017f10c969ca1fec7967dddda78103c8d9a9b2c4a2c598acb2832a905cfa0fd1376b4
+DIST pkgdev-0.2.18.tar.gz 93912 BLAKE2B 8ada25501d375b77b307022f8a86f609617a7d549184f8106f54b763182d9f00389a1a054bdd87d38986d5218b7ae8657663dbd69b450a65a1826fe45f2948e0 SHA512 9dcf60adecb1a2e7a4d1f4189f3105abeb89f60e9b22012f8d831d1350b29723401534051522ee2d4d5c19f61bc958b7616e9271a2a47376d47ae2800c3446ea
diff --git a/dev-util/pkgdev/pkgdev-0.2.18.ebuild b/dev-util/pkgdev/pkgdev-0.2.18.ebuild
new file mode 100644
index 000000000000..be07f3c6959f
--- /dev/null
+++ b/dev-util/pkgdev/pkgdev-0.2.18.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{13..14} )
+inherit distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_BRANCH="main"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgdev.git
+		https://github.com/pkgcore/pkgdev.git"
+	inherit git-r3
+else
+	inherit pypi
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Collection of tools for Gentoo development"
+HOMEPAGE="https://github.com/pkgcore/pkgdev"
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="doc"
+
+if [[ ${PV} == *9999 ]] ; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
+	"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.11.6[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.42[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.43[${PYTHON_USEDEP}]
+	"
+fi
+
+RDEPEND+="
+	>=dev-python/tabulate-0.9.0[${PYTHON_USEDEP}]
+	dev-vcs/git
+"
+BDEPEND="
+	>=dev-python/flit-core-3.8[${PYTHON_USEDEP}]
+	>=dev-python/snakeoil-0.11.6[${PYTHON_USEDEP}]
+	test? (
+		x11-misc/xdg-utils
+	)
+"
+
+distutils_enable_sphinx doc
+EPYTEST_PLUGINS=( pkgcore )
+distutils_enable_tests pytest
+
+python_compile_all() {
+	use doc && emake PYTHON="${EPYTHON}" man
+
+	sphinx_compile_all # HTML pages only
+}
+
+python_install_all() {
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if use doc || [[ ${PV} != *9999 ]]; then
+		doman build/sphinx/man/*
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "sending email support" x11-misc/xdg-utils
+	optfeature "tatt subcommand" "app-portage/nattka dev-python/jinja2"
+}
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 3cea1e24cc63..be07f3c6959f 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	inherit pypi
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
@@ -32,18 +32,19 @@ if [[ ${PV} == *9999 ]] ; then
 	"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.11.0[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.30[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.10.36[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.11.6[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.42[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.43[${PYTHON_USEDEP}]
 	"
 fi
 
 RDEPEND+="
+	>=dev-python/tabulate-0.9.0[${PYTHON_USEDEP}]
 	dev-vcs/git
 "
 BDEPEND="
 	>=dev-python/flit-core-3.8[${PYTHON_USEDEP}]
-	>=dev-python/snakeoil-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/snakeoil-0.11.6[${PYTHON_USEDEP}]
 	test? (
 		x11-misc/xdg-utils
 	)