13 files changed, 196 insertions, 8 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 17ab9178ee45..3c239a02134f 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 0bfd8976ad10..76447bf62728 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -3,5 +3,5 @@ AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a154
 DIST glib-2.72.2.tar.xz 4891264 BLAKE2B 932613e69edc302793c5db9fdff36fb4ec04df3820aaa3dc2ef6cc01b8124bee3fe2f96cabd9c44b49601425ba7af072f8ad6fd331f6247e00ab6fc94f7f2620 SHA512 9a1121be1d5b1de50fb732d55298a8deb6e6e7fe02e06ab18fdfbc51a0f0d77c13c5faf29a227b5746b0f8c1c0502fc79c36cef2b7a62c4701b9deffe5887e69
 DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638
 EBUILD gdbus-codegen-2.72.2.ebuild 2193 BLAKE2B 5bbd1717305885363c6221e48488dd2d3aa23ea8bc49c561f420f5029c63cdf528fb027027d00b42dc54386c1ec3be6958b56289ed71287d28f04224cdf908cd SHA512 54a411c57910e57f033b92a437d44f1af9f4d7fb72b361b86ecb69fc38f39cac44aa45e95dae7fccbbed94f5043e703a2c71ff9464f54cdc3a3c274559ba3684
-EBUILD gdbus-codegen-2.72.3.ebuild 2196 BLAKE2B 23059cb0aefbe58109d72f319df7a677fae725eece0653bc97c7964579fcede8bc817122e1c489e529d86521431b7dc29552a9795cf63f51c5814f9ea2d2df1b SHA512 374748e87bc9d97b995b4cad9be7414476a1866b3785de13f222ec2e14c08f65bbb42bc42316f4352b6a08ad7b3ce87c712d3caff46d7975ea88e07a8f1685fa
+EBUILD gdbus-codegen-2.72.3.ebuild 2194 BLAKE2B ea45db2de87df2575804145ecb0579232d4a1cc16e0f4b6b71778ab8d263e24708982fa7ecc33b3947783d59bcc0d80e260c387ea70c93b37510fbcabc359ff5 SHA512 7fb0f2c5dcfaa7cc6b77bd8b2a48f8a5ce685e8f8acfd10674e818bb56d24ae50efc49a38f3d8a0320c353c345dcc58dde0c482dac5daa356b3521c1e0377e90
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.72.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.72.3.ebuild
index 3c3c89486bde..22f404e2f718 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.72.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.72.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 7e61e7cba5c5..04afcea3fa03 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,5 +1,5 @@
 DIST glib-2.72.2.tar.xz 4891264 BLAKE2B 932613e69edc302793c5db9fdff36fb4ec04df3820aaa3dc2ef6cc01b8124bee3fe2f96cabd9c44b49601425ba7af072f8ad6fd331f6247e00ab6fc94f7f2620 SHA512 9a1121be1d5b1de50fb732d55298a8deb6e6e7fe02e06ab18fdfbc51a0f0d77c13c5faf29a227b5746b0f8c1c0502fc79c36cef2b7a62c4701b9deffe5887e69
 DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638
 EBUILD glib-utils-2.72.2.ebuild 2332 BLAKE2B eae0be3ecd001de535ff7db1483b93bdcc5405ed13935073cec2c4c92755bbe6628f86c9477396b54280384f16487af9b842dd92b7214e8e127e7affbfd68520 SHA512 2095a7aa280bbff2ce40745fc1e349fcc8fd890634b4303ff1b65b7410d0f8f30e6ff05f7f580650b48dbdc2c682a82475d0cf1c6e791da6c20eea2a259f9ea1
-EBUILD glib-utils-2.72.3.ebuild 2335 BLAKE2B 7090182ae8c53ef9950f93e0ea5d56771d1bb16cf495f02059c22f9a084dab7a5b72ffe6605822f9f17f681d39d16d9bea3ce2c86675257bb023d31d720d476f SHA512 51e05fe689ef1229991c2cba4fdee21d33acd241c289ec0ea59e52e73995eeca2ed1476a67fea02b7928764bb20db04fbee1e5a2ffbaa3de2b16a2d4f09cc878
+EBUILD glib-utils-2.72.3.ebuild 2333 BLAKE2B 020e6b8d6c1bc1471d5a5dd3347098d4530972403aa6ecddc92d84c64b0d7d087b6950838f7d1f8223d9581f8e08f5767e33060e5a758c122f4f9df3552730b5 SHA512 1b07c0f78b2c88f37fabf850c15d23edda32ed7eca02ae05a86f5d1b72354df541e0e29d8d31aeb1fb887c1e6737ed628492e11f4a9d67dcea2bf5f873029800
 MISC metadata.xml 333 BLAKE2B 70d0e83f8a0437baadea4b6771019a55d0d6f6a292bcb4263a7d811ec0b63a2ee4838b94371e03d62c4c43678eb7ae542b611166e2aecdea8c5194955ef1cda3 SHA512 0eab24184eba31bfda9752b62211472d6d8607644a2a3c2352a4483bc34975b87252aa5482a76499c5afe30414a75ba5958bd5bbf1bc755850806824e4267031
diff --git a/dev-util/glib-utils/glib-utils-2.72.3.ebuild b/dev-util/glib-utils/glib-utils-2.72.3.ebuild
index c5874570fff4..0d9f432e3189 100644
--- a/dev-util/glib-utils/glib-utils-2.72.3.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.72.3.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 302eb4293d7a..abcc92577496 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,7 +1,9 @@
 AUX 50pkgcheck-gentoo.el 179 BLAKE2B e2f6ee5f7bbb7371076ec8ca029a4c75ca9c943efb4e1a1d449b4377998000667bb3460d6fbb501e0cd9c3759d274869ed4f39553eae10bdcda382cc50951792 SHA512 b82eb973f9fa37228cfbbe687211678bf75017ad6ef632fd5cf1323dc1d17fcd0b8108a3d02c4ebee3027cf0404bc7f2600c42ea3bec14f9666f61a627874627
 DIST pkgcheck-0.10.11.tar.gz 474106 BLAKE2B 2a3e330d54e421a48e5cd89044b9af37334bf461f47487b8dd62e7fd1c766d162766d0a6c1319c50c3fd6965b56377536743903c265782b2fbef050d4f805d3a SHA512 b47814822599417d0f7030ac444fd4b2bab1f1bea21abc2a4fe1dd679185afd7d5f823aefff1b6830036de5c7db6232c0b6fc6d33f9c2535d88a711e6d49132c
 DIST pkgcheck-0.10.12.tar.gz 477880 BLAKE2B 9d71e6d3312f2c11a722f12c854a14523174b91ca1cf8ea89f6da3463e8aeab1744b083a31eca675e40069b57f4b2b24a83efa0d692d90cd00b9e9c4ec452a02 SHA512 e146dd0533b769078102ff27f90120c459ceb614aed4365a43a36e1a24d1230890c9da7a756b3fcce528806ca1fca10d8d8c283dcc464a7c98368bac0d98a26f
+DIST pkgcheck-0.10.13.tar.gz 490572 BLAKE2B 4ca1bf820e45819fa48173ee7a8a2accefe4701b4b79dddc601b66c9c5d51f90cb5e65b7702f22c6082ec481f5bd69ff9cf6299cd9e0dcca05b82c2a1002ae78 SHA512 3be0f16607b2ed52d985a568058ed2fe3bc2d0d96719245a8b708a69c16d5b9dca12485f9c343909c0c88a13f9ee5b2d7126778222a8477bd17f396d84399fd4
 EBUILD pkgcheck-0.10.11.ebuild 1661 BLAKE2B 7b7f84f3c944a517a3dcc7f18bc12856f97df92a90be68f3b3b59fb574e382ac55f6e52f684e6e49db36a9b40fc7ce7b0d9860a39c13ac48215fef31fa06f733 SHA512 1a88f0f25b4584f3b84c5a04e43695ff8af6ed609e2e85cba141ad2cd43dd7cd40cf0bbec172804e361e4aae21409b424e5aad37e540d1cdef8664c7e0e85463
 EBUILD pkgcheck-0.10.12.ebuild 1669 BLAKE2B a4138f9a6237e810e6d62e0de9a2917dae00ed38ea7c3e28a01cec936efcaf6e289a0933f930cbe33a4de93d9c1339e9b6eb743d91110ed7d067325790a0c78c SHA512 343538d930710fa9f2ac633be577641bfe2424eafb9c8779953dd24d876b006fa460eb415297dd526476ff09f3fe9791abe01d806e03c7c372b0bf56ffc02c7a
+EBUILD pkgcheck-0.10.13.ebuild 2205 BLAKE2B 7713a52128cbf038209461aac056bffb666f4ee75cbff1d04b9fa1d98d6de38459273a2cac4eca9883b410dd4da8cea69c6e6d41089eda0cbfd5ba993a8c0378 SHA512 4a6ac693f2dab601f503ea175c807dec0039c87b77fa2753cde0578948e62b2dce13bc9853d0cb93ec4d1219ed2e6f676db684f83326e24fe8630525c0d50038
 EBUILD pkgcheck-9999.ebuild 2205 BLAKE2B 7713a52128cbf038209461aac056bffb666f4ee75cbff1d04b9fa1d98d6de38459273a2cac4eca9883b410dd4da8cea69c6e6d41089eda0cbfd5ba993a8c0378 SHA512 4a6ac693f2dab601f503ea175c807dec0039c87b77fa2753cde0578948e62b2dce13bc9853d0cb93ec4d1219ed2e6f676db684f83326e24fe8630525c0d50038
 MISC metadata.xml 486 BLAKE2B 3fbd43c40601e7edccf11e4335b82d90bd42c9144436529dd6a0c2ffaccbf5febf018c55a336d07c2a86271b43e8da4dafa228a6d2afa7dfd8215eeda5e415e8 SHA512 98c0803dd08976c0f1be543c052a49647d3ec3dbb02667053fee22baec3a05723350cc02d3c0090ff128ba795ed4802b8b73161148f2b790519bbcb881b31105
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.13.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.13.ebuild
new file mode 100644
index 000000000000..a8ce557ca15d
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.10.13.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit elisp-common distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="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.9.12[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.13[${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}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+distutils_enable_tests setup.py
+
+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
+}
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+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 f987256a94b6..48649264fad2 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -3,5 +3,6 @@ DIST pkgdev-0.2.1-docs.tar.xz 4156 BLAKE2B d0cae24586dd24d03ae0378205ebf164957a1
 DIST pkgdev-0.2.1.tar.gz 66455 BLAKE2B 6f89b1601813adcb1263a044a096d187d7fa926f116a09dc2b1cec083f8d82da54ae00577c36d64ece5733d8952f8dc5f4dff94aeb695e851f340a30f04b203e SHA512 8277f74f3d9902da295c5436a46302627bdc1cb2a63f29b0603bf9bfa2c8bb812b26f12a54630cbbcba1e2bbac7352146f6ab59fc04cd8b89b46df1fe7c9f8dd
 EBUILD pkgdev-0.2.1-r1.ebuild 1655 BLAKE2B edf95d40cb96f7abc2853578c87ff3e8edfeee86844e2ab942d83d55171706806f64f19cb829458f9a312d73d6e385930ab7f439a363f314ae01684e0bee63c5 SHA512 576098e57216e1639827d25aad586465a9c5fde7391e4c0521474c9e1923371903d30de1b835b5d21fd822c5ef3d6a579f2ff0935d6437e998f095d709f7c225
 EBUILD pkgdev-0.2.1-r2.ebuild 2465 BLAKE2B b7f60fab59f33834b318a515f42a2adcb2b46421131173bfe7833d59e12fcdf925c6f3e4944148f2038904792bfd3a8b05ef128648a5c5bee450d87488f7fb49 SHA512 a657125972cac4f278d21fc484096afb2fadffe73810e1ca66d643d3ea71c8343ccf58ced54c8dd814fd7f5027330e149f3c1a10057b8e5b5523fa6fcd35f181
+EBUILD pkgdev-0.2.1-r3.ebuild 2467 BLAKE2B fb3f3cff23493f905db0d04b2a75debe3c56ee90e97b8c720a1b484280fbcb66845605c72e1ea857e6a37a2da4a7aa4a6d013ec23ab569cbcc8e3f139e7bb751 SHA512 b2e314aa8de2ca3c231a1333f346377507051383acd930b0dfd6de8fb10bf26dd976bc230f1d6f386abf24407a1e4656ac601bf514540430e96516eeb2e47455
 EBUILD pkgdev-9999.ebuild 2408 BLAKE2B 092e676a634b3e2760c68527356513b399d5a442c7c5ddf545a4f55960454601c831c8c06a90d07319a9750ac56c927de77475ccc9e0bd060edae56e0215d31c SHA512 10e34df32e0349b56f4539ca286fd1ebddec13ac9013314e10aa23f05c51b9bd6a6f939d9a311683407bbd1952dde6feae52242b67e94d2ca471f810ed5c6910
 MISC metadata.xml 606 BLAKE2B 9c87b0b058df2a15ad455e54499d6a52e31e5c8f51187d36a42a775f1fa03745c69c99179a21f8c44f64562f78ddade051a2a4568b7984600fc529f35e36811a SHA512 5c7151cd72132faf4d47837a58812aefb919edca3fb613a6751de265994bff327515a07d80dfe175069bde7097581f10cb453dde1545383e300735dfcac09bec
diff --git a/dev-util/pkgdev/pkgdev-0.2.1-r3.ebuild b/dev-util/pkgdev/pkgdev-0.2.1-r3.ebuild
new file mode 100644
index 000000000000..5758209ab661
--- /dev/null
+++ b/dev-util/pkgdev/pkgdev-0.2.1-r3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 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-pkgdev-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+PKGDEV_DOCS_PREBUILT=${PKGDEV_DOCS_PREBUILT:-1}
+PKGDEV_DOCS_PREBUILT_DEV=sam
+PKGDEV_DOCS_VERSION=$(ver_cut 1-3)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+PKGDEV_DOCS_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	PKGDEV_DOCS_PREBUILT=0
+
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+	if [[ ${PKGDEV_DOCS_PREBUILT} == 1 ]] ; then
+		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${PKGDEV_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${PKGDEV_DOCS_VERSION}-docs.tar.xz )"
+	fi
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Collection of tools for Gentoo development"
+HOMEPAGE="https://github.com/pkgcore/pkgdev"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+[[ ${PKGDEV_DOCS_PREBUILT} == 1 ]] && PKGDEV_DOCS_USEFLAG="doc"
+
+IUSE="${PKGDEV_DOCS_USEFLAG}"
+
+if [[ ${PV} == *9999 ]] ; then
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
+	"
+else
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.12[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.0[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.13[${PYTHON_USEDEP}]
+	"
+fi
+
+# Uses pytest but we want to use the setup.py runner to get generated modules
+BDEPEND+="test? ( dev-python/pytest )"
+RDEPEND+="dev-vcs/git"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-signoff-example.patch
+)
+
+distutils_enable_sphinx doc
+distutils_enable_tests setup.py
+
+python_compile_all() {
+	use doc && emake -C doc man
+
+	# HTML pages only
+	sphinx_compile_all
+}
+
+python_install_all() {
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if use doc ; then
+		doman doc/_build/man/*
+	elif ! use doc && [[ ${PKGDEV_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${PKGDEV_DOCS_VERSION}-docs/man/*.[0-8]
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
index e6ba81d56edd..63c162166200 100644
--- a/dev-util/wayland-scanner/Manifest
+++ b/dev-util/wayland-scanner/Manifest
@@ -1,6 +1,6 @@
 DIST wayland-1.20.0.tar.xz 225188 BLAKE2B d607610ad8b30b6b3bbfc3945679f698030f271766cfb72425f98f170a96469fb085fb9a746a866b8562d7f452c844e61ad57f634dcf365474c7d050b76022e9 SHA512 e8a1f410994b947f850799bdd0d95a2429d8467f853e62a0ab3915a4e9fe130f8aa977e03715114ab740c6ec546edea63d275ce7f927d4f3029ea126e6a7d215
 DIST wayland-1.21.0.tar.xz 225936 BLAKE2B 2b43eb1517d476bb2b4daed1083373655b57d047968fdb93dbbbbe4235af12e25557627e30b5c3d2575bac4beaf1e0a0b8ef10a3c673538d9097501f33c05836 SHA512 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3
 EBUILD wayland-scanner-1.20.0.ebuild 992 BLAKE2B 47a95fe8fa62d143e48f397e255fcb5ba868c86a8253e58b354b453994718f7c362df9e2858d58ca3772309aa5f101e66508e622806090c84fe370469129d231 SHA512 316c93ac9e9f64e8a38639c905aa6ba622a0730d1e517734e748946750407651808cf4e9636fb0b58910c6fbbd3c2f18dd94cec656322e1582fdb8b8ce361502
-EBUILD wayland-scanner-1.21.0.ebuild 1026 BLAKE2B 8b49dcae38131c5658b81023408eebe4cb3c681713f2410fb7f779695871c50ad789ca47e8245eecfc6f682c38931b81d3b88c6cd95906a6fbee7bd669abbce2 SHA512 4f6e731c7ffa3c3b36bc2eb007bd95c33cb7a637a37083820e36675e863043168273acdfd6904118cc87987f4640dbb21ee5cbb3897772b2554f4a24887c09c2
+EBUILD wayland-scanner-1.21.0.ebuild 1024 BLAKE2B 27e3d1195b458597959a78b3411e31904b6e40ab7a198941d73203296515f64ab66f6573730fc513d93e564753af971253da968e8606c2e454ae500840546792 SHA512 25f6d042a24dbb80a6e3a52e00c87649ca60771cedcb19b432a3570c1627dae8c1e6db5535b7370d6137985b147e7af4576318039d8dbffcc2cc483a88aa4026
 EBUILD wayland-scanner-9999.ebuild 1030 BLAKE2B 69772afc5b2457fb4c2a3aa983a1b84776b94a03b220bc5d37dd76791188fb210d94c5299933737aa9e8d27c3cf7ef679c99bbff2f1daa7e9300241e9ca35041 SHA512 3e38ef866c22d8e8c4d125489577e4a72ef6e658b849714d7e79ef0c6092a86d66a6fda20b0043e83e52b30c96fbfd3eef6bb32a27918357d44f77c9ebda2349
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild
index 725331dbcae2..4f8987b81097 100644
--- a/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild
+++ b/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/wayland-${PV}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	S="${WORKDIR}/wayland-${PV}"
 fi
 inherit meson
diff --git a/dev-util/yamllint/Manifest b/dev-util/yamllint/Manifest
index cd3fd2e07b88..a47fa9160c50 100644
--- a/dev-util/yamllint/Manifest
+++ b/dev-util/yamllint/Manifest
@@ -1,5 +1,5 @@
 DIST yamllint-1.26.3.tar.gz 126746 BLAKE2B 37d4293a90b2ee7192e26c5dbb1448a2c22a47e8dae7113211bb5601f0ef0c01eabd85fe4df44b32b8226b2b805c1da11ef1e118f5e33a2a7bab137141f9853c SHA512 c5ed17ecec102324bec077484dcede6fbf8c01a37a9292929a52163a4a9d9e9989809879c29b69c45b7cce8cbeefc830d4542118f617e846702f216f49d9db5b
 DIST yamllint-1.27.1.tar.gz 129052 BLAKE2B 37021bd577384821b75ddd747f1dd3c4261317582d42179e0731214cb67f79bf9302c34acaa721440edb118ef8900cc2952d1f8e441def9e3143b57e03af87bd SHA512 c00fcb5da35f79b0f877f1b8c3e5f1ff8c5d161dd795d3a2657e44e27d8b943961984bf15c294be263e00bf9dfcaf3dbf16ef8fd7354bedc8ed92e3e24ce4baf
 EBUILD yamllint-1.26.3-r1.ebuild 595 BLAKE2B 3a669b2813aad8bd7fc719a019db4fa5280defeda317d0bc967ff7d9b8c1b5120518748e94d6ad199b4af3022e5e46f86edc654e9315f85fe8178c907ec92770 SHA512 dafafcaa9c358fc9f1f256f968fcd2b3fce0bef452be8c2f68a6ff823416a365463e7d15b80372a9d1f4031657a95f3a67d26f3c023535edfb4cc35c96c79cfe
-EBUILD yamllint-1.27.1.ebuild 596 BLAKE2B 7469661a4cad539c96a01d9ef32ab7be46acf050983ecb61600d960b01acf0df6754ed064b5c958f4ffa03b3fece9bc8e07adf9f84b058f6a748f54ea9463f30 SHA512 85cbc2c06a0e93a0719d56c94b134cd7c67a9dcbace55c2f0cffa3635fd241ab5391e4eee91ad3c14dc3358b1085b80fb50d8486fa2e925ac2aa4616efa2d29b
+EBUILD yamllint-1.27.1.ebuild 595 BLAKE2B d56522ce11dfa86173c8a23cc61d4536ab676e756b6f1697af7de5a9649762b5929e5e593dd40cc03c3b2f4120e4ba60842f04668bafdb27ead01b4213bb97b7 SHA512 9bb925106dc678119aca2e84bddc8afd3500c67712aa10670d4885c8bc97e9a0d7333682afcef13aacf5ab068871b39924cbed70db8e1c0ac5d8840a53f8d82a
 MISC metadata.xml 401 BLAKE2B a521c886cfd44743e875bcb3a5901f555bf13829b1697a4673c99d728559959460a150b717b6568a3fdcf82c73a8425997bafae1f5f8afaa30a0d43862e7a730 SHA512 52b259b62b147104c3150477c41b37697ad55ac5ce074be70568d001c15c1da099a1f2877a193164ccb9871d7fb6275bef12aba110cf83d5f04c4dfb30e156c9
diff --git a/dev-util/yamllint/yamllint-1.27.1.ebuild b/dev-util/yamllint/yamllint-1.27.1.ebuild
index 7ebbb2e782d0..8c9945125f8e 100644
--- a/dev-util/yamllint/yamllint-1.27.1.ebuild
+++ b/dev-util/yamllint/yamllint-1.27.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND=">=dev-python/pathspec-0.5.3[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]