gentoo resync : 05.12.2021

15 files changed, 163 insertions, 116 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 5a3689a29e7c..cffb9322b60f 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/cfg-update/Manifest b/app-portage/cfg-update/Manifest
index 39fea8373035..c6e63fead533 100644
--- a/app-portage/cfg-update/Manifest
+++ b/app-portage/cfg-update/Manifest
@@ -1,4 +1,3 @@
 DIST cfg-update-1.8.9.tgz 162356 BLAKE2B 2194b485ae17ee09fe212fb88fee0d3974bb7877b9bee6a243475f689e033e950d9d331108f9360a5bb65b40f2a83916fc9bd208b153d4eb2a6fac0bfb3f4c64 SHA512 2c2d4d5cddaf1c5c8233bfde29b488d682e723da3e267756e203b4ea3c97f2f88615530002975ff07fb466eebed603e4ce227591a1b1e09ef3aca8c2eb17fcb9
-EBUILD cfg-update-1.8.9-r1.ebuild 2973 BLAKE2B 6672d21199b7da09f2ca8e36c2bf7096821c0b8248502b7f8eccfda6a97b3d77e2d87cc3640c92f790206908273273f936bcfe595dc33f7f348be4d0cf7d5666 SHA512 33b319537c10306bf7e42e91a6d7ae7933eaf39efdfda98329f5535add98fac522c7f966052b2d2a58b9a9f810a7da77a97b51ed547742d3e15745da28237e5e
-EBUILD cfg-update-1.8.9.ebuild 2979 BLAKE2B 4adf5840f2ee36aab0a60123c735366666a9406268baeed48d8c20f16e97028974d12578475bbe3cb5427bafa277d445028b4541dad6b69a84a0e04385fbef7c SHA512 89543556fa464f6d79d93fb435cf96126d6ac1d2d9a87780b481cd2bf2a497c54d2031198a348d4f184c0a8d8a5a20af99929f7e857b037096a4dc9a8f73e916
+EBUILD cfg-update-1.8.9-r1.ebuild 2970 BLAKE2B 217b67f8dfedb6aee0d86aa6fa68e37de6ac1f3c9ef86b44b8e238c051d5b5580a2b93d80f50a312b054bbaf28803a67335ba258c7aef61bb687bba1915a9d7f SHA512 5e4be9140b283f6dd0861e65263430fbb339080bd5a17f3071e6fdd6dd411d8378cb00dc0e56f8fbf5556cdb9771a39b33214dbee3628d15bee7f3920afb0f6b
 MISC metadata.xml 331 BLAKE2B dfc62ba6ae96f87c8293d99204ded02444ba1517e4bb189e62459388ac067ef754bccf8e8e9bbec9643614dbeafca3e0deebded689b2f65d590bc32d614cf5d8 SHA512 1c3e7adf10d5482ed3126db2d6c4e4c9ce5b4f89305174ebd19d391b5027c8680a2051677444f4d5fe09d6b03111ea3dc61e036590e0771137ccd8b9c32a2924
diff --git a/app-portage/cfg-update/cfg-update-1.8.9-r1.ebuild b/app-portage/cfg-update/cfg-update-1.8.9-r1.ebuild
index 0fae01aee1f3..a84b7363f54a 100644
--- a/app-portage/cfg-update/cfg-update-1.8.9-r1.ebuild
+++ b/app-portage/cfg-update/cfg-update-1.8.9-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/rich0/cfg-update/archive/${PV}.tar.gz -> ${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/app-portage/cfg-update/cfg-update-1.8.9.ebuild b/app-portage/cfg-update/cfg-update-1.8.9.ebuild
deleted file mode 100644
index d899e6016d2b..000000000000
--- a/app-portage/cfg-update/cfg-update-1.8.9.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Easy to use GUI & CLI alternative for etc-update"
-HOMEPAGE="https://github.com/rich0/cfg-update"
-SRC_URI="https://github.com/rich0/cfg-update/tarball/${PV} -> ${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86"
-IUSE="X"
-
-RDEPEND="
-	dev-perl/TermReadKey
-	X? (
-		>=x11-misc/sux-1.0
-		x11-apps/xhost
-		)"
-
-S="${WORKDIR}/rich0-cfg-update-2f10786"
-
-pkg_prerm() {
-	if [[ ${ROOT} == / ]]
-	then
-		ebegin "Disabling portage hook"
-		cfg-update --ebuild --disable-portage-hook
-		eend $?
-		ebegin "Disabling paludis hook"
-		cfg-update --ebuild --disable-paludis-hook
-		eend $?
-	fi
-}
-
-pkg_postrm() {
-	echo
-	ewarn "If you want to permanently remove cfg-update from your system"
-	ewarn "you should remove the index file /var/lib/cfg-update/checksum.index"
-	echo
-}
-
-src_install() {
-	dobin \
-		cfg-update emerge_with_indexing_for_cfg-update \
-		emerge_with_indexing_for_cfg-update_phphelper \
-		cfg-update_phphelper emerge_with_indexing_for_cfg-update_bashhelper
-	insinto /usr/lib/cfg-update
-	doins cfg-update cfg-update_indexing test.tgz
-	dodoc ChangeLog
-	doman *.8
-	insinto /etc
-	doins cfg-update.conf cfg-update.hosts
-	keepdir /var/lib/cfg-update
-}
-
-pkg_postinst() {
-	if [[ ! -e "${ROOT}"/var/lib/cfg-update/checksum.index \
-		&& -e "${ROOT}"/var/lib/cfg-update/checksum.index ]]
-	then
-		ebegin "Moving checksum.index from /usr/lib/cfg-update to /var/lib/cfg-update"
-		mv "${ROOT}"/usr/lib/cfg-update/checksum.index \
-			"${ROOT}"/var/lib/cfg-update/checksum.index
-		eend $?
-	fi
-
-	if [[ -e "${ROOT}"/usr/bin/paludis ]]
-	then
-		echo
-		ewarn "If you have used Paludis version <0.20.0 on your system, chances are"
-		ewarn "that you have some corrupted CONTENTS files on your system..."
-		echo
-		ewarn "Please run: cfg-update --check-packages"
-		echo
-		ewarn "The above command will check all packages installed with Paludis and"
-		ewarn "will output a list of packages that need to be re-installed with"
-		ewarn "Paludis 0.20.0 or higher. If you do not re-install these packages"
-		ewarn "you risk losing your custom settings when updating configuration"
-		ewarn "files, that belong to these packages, with cfg-update!"
-		echo
-	fi
-
-	if [[ ${ROOT} == / ]]
-	then
-		ebegin "Moving backups to /var/lib/cfg-update/backups"
-		/usr/bin/cfg-update --ebuild --move-backups
-		eend $?
-	fi
-
-	echo
-	einfo "If this is a first time install, please check the configuration"
-	einfo "in /etc/cfg-update.conf before using cfg-update:"
-	echo
-	einfo "If your system does not have an X-server installed you need to"
-	einfo "change the MERGE_TOOL to sdiff, imediff2 or vimdiff."
-	einfo "If you have X installed, set MERGE_TOOL to your favorite GUI tool:"
-	einfo "xxdiff, beediff, kdiff3, meld (default), gtkdiff, gvimdiff, tkdiff"
-	echo
-	einfo "TIP: to maximize the chances of future automatic updates, run:"
-	einfo "cfg-update --optimize-backups"
-	echo
-}
diff --git a/app-portage/epkg/Manifest b/app-portage/epkg/Manifest
index eaad2db56db2..9a2e01755c26 100644
--- a/app-portage/epkg/Manifest
+++ b/app-portage/epkg/Manifest
@@ -1,3 +1,4 @@
 DIST epkg-0.4.tar.gz 3696 BLAKE2B c0532ac424159bf9bd66c3afb549f6aacb8dfc47ec25e2bfa0b789aabc0a203d29c51f810e3d27de058c3374caae41e13b22fef0239fcec6ef491cddcf9770ac SHA512 2b9ef0e2d0ec123a1e333403371d0d4d750bc5247a05771dc2f694d225ea5db2702dbc9a126cec1d0ddca38dffa837dd66acaa046ac94d00a28890f3e3cd7879
 EBUILD epkg-0.4-r1.ebuild 507 BLAKE2B e8b8690171597f12e44bc62efc24dc4899ba3808e7887dc1f36a284f0f838c7f9222b01588dfc28358563a2563b9a023130f70f601af10dd960f5ec055998e1e SHA512 37cec54872d5145b947bf4ea44d83e22edd244e72813c74ac5b292ff279e80fffda6f94047f6ab4251fde03efa114219a0d2283a13634858d513ebb45c190b30
+EBUILD epkg-0.4-r2.ebuild 500 BLAKE2B 2261cb0404e4b49ba040c02eee269de83058d106c94130f84f84c4de38a753be9632ed7d6ec986cab45b23f3cc26043f0e827c624f8e241f11a2da207b2078ad SHA512 35632e10e8189967556e91751d194eb1ee8ebcbf31d5bbc4149819c9e86b377baa6d7720679b21518e0f37185da1917e613109533d993f109afd6182a92bd344
 MISC metadata.xml 247 BLAKE2B 069d0d8ac9c3e996f08cca692b772941e3e4776f17bc7a35ceffcd3c41b06cc4f33d30a5adb18f31f059268ac19b2d322daa4e287ad251395ff1ea70689887f5 SHA512 9f27a4436597b7fa2ab05b68ff1ac2a859d9236d5db06f315daf06afb031cacd40079206968c90623cfcdde9d3f35970c7037f26f234b2938bae81c3a787b3d5
diff --git a/app-portage/epkg/epkg-0.4-r2.ebuild b/app-portage/epkg/epkg-0.4-r2.ebuild
new file mode 100644
index 000000000000..489131a2d8f7
--- /dev/null
+++ b/app-portage/epkg/epkg-0.4-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A simple portage wrapper which works like other package managers"
+HOMEPAGE="https://github.com/jdhore/epkg"
+SRC_URI="https://github.com/jdhore/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-portage/eix
+	app-portage/gentoolkit
+	sys-apps/portage"
+
+S="${WORKDIR}"/${PN}-${P}
+
+src_install() {
+	dobin epkg
+	doman doc/epkg.1
+}
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index ba05c8151970..3b8cb52764ff 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,4 +1,6 @@
 DIST iwdevtools-0.8.0.tar.gz 57529 BLAKE2B b8068c7781b8b164b9b5d191f8a33a4a89854edb7c78c56d4f1312dd0d051d0b033f21611066303acb7efdf8403d6869458db98e7b1b2a293c779cca2bdcdd36 SHA512 df39fa02d7f4f72334286305bfa9c2db6d5db90bddc47194e3383a99492366796c7ae2e751bcf8af01d14cfa0bac88ea8d9c8678b7891f85aaa1b20e4a9e91cb
-EBUILD iwdevtools-0.8.0.ebuild 1879 BLAKE2B b2c2bf0f0cc6d1421f4660a9ecb121d2028d247716d988bd00d3e778a771ed3c0669325798ad25eaef444c4e5663f328b151aea3586ef5fc824a36d46d088b27 SHA512 a69df9aac24292a13bdef36be7416ab529d6fbf5a933cfa7568d01bff3aa57a02ec97dc37e4fffee0b3d42935834f30c5afdc93186df3e0f7b4eb5ea3b7d6d99
-EBUILD iwdevtools-9999.ebuild 1826 BLAKE2B d52e86df1f1b6f82c0e9d1de02e007715cb6c39e2b076d22d5316623261637e57a7aef582b55e56472afdaf1bfe48aae57ac9630416285bca0987ac4bf809db6 SHA512 5b32c64fe82629d8dd1ac504f377328ededb5e0c661b3fa3f3fa61bfb356c5b51e64ee3229152d52b27a08cbce51741c7cc30b7b37fd999ed7bf52d465ef9d1a
+DIST iwdevtools-0.8.1.tar.gz 58058 BLAKE2B b9f17f68bb073ecf2d8a94fc8b97d95f7188e7526dd6a32cf33aa3b01fe82bf25c696cc2be9cbdc0aaa3a8279532e506ab287d3e25da5d5fb55789064d47aec6 SHA512 cb365e7010d620f2a255db0244ee1a38fd5714a17093b2e2a71627155764165853f99a4477b281b92061f7fe184297a222a8c79c2c62beb8e0656761feee859b
+EBUILD iwdevtools-0.8.0.ebuild 1886 BLAKE2B 58b7db6dce9bdd9ea1cce3c5ee3889aa1fa3107b57908d2b6d01776ef6037ff45a57568b4174f2cf97c40e010338543c8f1b9d6cbb88f713374b502bbe7ce11b SHA512 4432156adc76ea8a8b2db83548e5ad3c676f63aaecc29c045e8e074dae7bb57dbc1264717ec1c164b8f27a7a40bcf44eb955200915386c7d67ec31ebed24651a
+EBUILD iwdevtools-0.8.1.ebuild 1919 BLAKE2B ae899a1f817add16cfa17e4ab3d8cabf0400caea0b3df5a40fae03908b3bb7dd4f801c6e3ff761d4befb17d11ad096284fc34b3d6efb5be405595d589b83b2b1 SHA512 0fa9c0a926aa54eb66814bb1bcc00209766606710691ed73d345c4fa7574ba4b46984caf99baee7e1e6e9b8c44a73f9748fd14b717b0236093d9f516a523ce86
+EBUILD iwdevtools-9999.ebuild 1859 BLAKE2B 040a0a3481f04bc8c414000b6e6f3afc80fdeb0807f0c92300c86659f58b91bb23de6ec8596f8c5170f2bbeb7a1ca165542c75be91f89688eda87c4e151c05f5 SHA512 2aa5fb6f48366ec6ecc219c6efe0ec8808b91db83d235c22cd3f37729629ea75f35aef138cff73210797d145a65c2d044e695882534835990aa9c0943436d937
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
diff --git a/app-portage/iwdevtools/iwdevtools-0.8.0.ebuild b/app-portage/iwdevtools/iwdevtools-0.8.0.ebuild
index c1c495dcafbf..5d03e033a003 100644
--- a/app-portage/iwdevtools/iwdevtools-0.8.0.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild b/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild
new file mode 100644
index 000000000000..5add38623491
--- /dev/null
+++ b/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature
+
+DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
+HOMEPAGE="https://github.com/ionenwks/iwdevtools"
+SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-misc/pax-utils
+	app-portage/portage-utils
+	sys-apps/diffutils
+	sys-apps/file
+	sys-apps/portage
+	sys-apps/util-linux"
+BDEPEND="
+	sys-apps/help2man
+	test? ( ${RDEPEND} )"
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir=${PF}
+		-Deprefix="${EPREFIX}"
+		-Dshellcheck=false
+		$(meson_use test)
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Optional portage integration relies on using /etc/portage/bashrc."
+		elog "The example bashrc can be used as-is if not already using one:"
+		elog
+		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
+		elog
+		elog "Otherwise, inspect the tools' --help output and the example to integrate"
+		elog "(if not defining the same phase functions, the example can be sourced)."
+		elog
+		elog "Note that \`eqawarn\` is used for portage output by default. QA messages"
+		elog "aren't logged / shown post-emerge unless e.g. in /etc/portage/make.conf:"
+		elog
+		elog '    PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"'
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
+	fi
+
+	if [[ ${REPLACING_VERSIONS} ]] &&
+		ver_test ${REPLACING_VERSIONS} -le 0.7.0; then
+		elog "qa-* bashrcs now use \`eqawarn\` for portage output. If no longer"
+		elog "seeing messages post-emerge, ensure 'qa' is in PORTAGE_ELOG_CLASSES."
+	fi
+}
diff --git a/app-portage/iwdevtools/iwdevtools-9999.ebuild b/app-portage/iwdevtools/iwdevtools-9999.ebuild
index 282831c8b50a..e646ee963668 100644
--- a/app-portage/iwdevtools/iwdevtools-9999.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-9999.ebuild
@@ -57,7 +57,8 @@ pkg_postinst() {
 		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
 	fi
 
-	if ver_test ${REPLACING_VERSIONS} -le 0.7.0; then
+	if [[ ${REPLACING_VERSIONS} ]] &&
+		ver_test ${REPLACING_VERSIONS} -le 0.7.0; then
 		elog "qa-* bashrcs now use \`eqawarn\` for portage output. If no longer"
 		elog "seeing messages post-emerge, ensure 'qa' is in PORTAGE_ELOG_CLASSES."
 	fi
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 4b732976528b..d1255a973625 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,3 +1,7 @@
 DIST mgorny-dev-scripts-11.tar.gz 8045 BLAKE2B 3b2b023b87902c1ee9c5bec7cb1b70bbfbc141383167b497d5dd67fa4b46b4d0882be49d3595db0b699ff0112cf2431653c0cdb72c187589c958f7052aeeb663 SHA512 5b053d2a053e73208cf5ccd4aa00b61733c4ba14f1df9e0cabfc8667e0cce8637c18be09c6366e384cffce3b8954d29619efd9085c21fb72afa0de61a7b833b9
+DIST mgorny-dev-scripts-12.tar.gz 8063 BLAKE2B e31a0b2ffd59ade462cf8686ea4cd6d48c9da2f9d18156509a39138afea0f1ec896871cf83c44ff1f1075848239065335a408b74befab9276f04b2d7b9d0e075 SHA512 a7e2739197a331b9abfd67873f4727fc85f7c38a30630dddc8a76e51e74a91e42ecd748c9e6572da85de48db6bcd144b13654b8e1a7b74ca7fe46779d0e14967
+DIST mgorny-dev-scripts-13.tar.gz 8162 BLAKE2B 0ac4b8d61119b64d3d6420861ac466f975606972e5274be76a3a66210536783077ab4c066167553e11d5f913ea32ce49536f6757e2b806a355f85e2698c858f9 SHA512 53bb2fcc99f9bd048adf14b6b760a1293bb87e5b48ec1959d3037cd2b8a09583150309632451444e6048abfe9296f3a63346720c4a5de6c6103a9807f13874cc
 EBUILD mgorny-dev-scripts-11.ebuild 615 BLAKE2B e388d2b1a15895e18da3b2109c4ea1c22cd3275aa6440766499c26203e2a9783ef1c4190a16c3f9baf2eeae29caab6944043c526799149162408ef2850bb2fe7 SHA512 18ccc0cb3ebf73cbe34b1301d953ff803ac7018202c6557adffd299399689d5b7684f016112bfa617d354412f7f121a522ac7df9d2fa01c81d515b160e4a436e
+EBUILD mgorny-dev-scripts-12.ebuild 615 BLAKE2B e388d2b1a15895e18da3b2109c4ea1c22cd3275aa6440766499c26203e2a9783ef1c4190a16c3f9baf2eeae29caab6944043c526799149162408ef2850bb2fe7 SHA512 18ccc0cb3ebf73cbe34b1301d953ff803ac7018202c6557adffd299399689d5b7684f016112bfa617d354412f7f121a522ac7df9d2fa01c81d515b160e4a436e
+EBUILD mgorny-dev-scripts-13.ebuild 622 BLAKE2B 1ad6c1e97f453eade895ead78e908e790f72e1259bd99a9238f77cbf7ed7937b8f8bedea0bd6e187d08f52af6c8fbb13fa99040765c47e2c01f69c4be0e7078b SHA512 9d6a14ded378dc04e3882c0e9cad9c39286603576a6dfa2d3242f2a06920cd12cdc8f17b1ffe4221fa13af850342729614caa139587972f08d21816771f7200b
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-12.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-12.ebuild
new file mode 100644
index 000000000000..0897d3c3330d
--- /dev/null
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-12.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Handy scripts for ebuild development and more"
+HOMEPAGE="https://github.com/mgorny/mgorny-dev-scripts"
+SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	app-portage/gentoolkit
+	dev-perl/URI
+	dev-util/pkgcheck
+	dev-vcs/git
+	net-misc/wget
+	sys-apps/portage
+	x11-misc/xdg-utils
+	!dev-util/pkgdiff"
+
+src_install() {
+	dodoc README.rst
+	rm -f COPYING README.rst || die
+	dobin *
+}
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-13.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-13.ebuild
new file mode 100644
index 000000000000..013d8f6f9efd
--- /dev/null
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-13.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Handy scripts for ebuild development and more"
+HOMEPAGE="https://github.com/mgorny/mgorny-dev-scripts"
+SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	app-portage/gentoolkit
+	dev-perl/URI
+	dev-util/pkgcheck
+	dev-vcs/git
+	net-misc/wget
+	sys-apps/portage
+	x11-misc/xdg-utils
+	!dev-util/pkgdiff"
+
+src_install() {
+	dodoc README.rst
+	rm -f COPYING README.rst || die
+	dobin *
+}
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index acddf0e787c8..90e9c2bdd7eb 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -1,5 +1,5 @@
-DIST portpeek-3.2.0.tar.gz 13793 BLAKE2B 224ffff46090ee8c6ddc338623a5a1b4323ad2104514f0be8962b5af9070ab8217d76e3b19fdeac148b13cee77531ddb0261b89e563bb9a999b895b2a2475c69 SHA512 2b0592b92ce122c53c687e1897e1a51319527dca70c16ca38564dde870a05ccd0f4a00de88b53194046c9b2a4fef3a3ccf1a5fb84777de8437f66bb6cc25da94
 DIST portpeek-3.2.1.tar.gz 13538 BLAKE2B efd8566b0fd54cc9f76eb05d330a566999c2e301c2e62e38b12d6fa7063d57cf4803db0e1ca5fe3067a31075294e4c4e5f794acc914f2ed2abfc340c6bbf8278 SHA512 f5888f63c5683e48d601c6560800566586c1558541f928aacb0476cb7534e8e6910517d96c083519747d6074e1ee2739780f050fdffa6e5a1913399e2b2d108a
-EBUILD portpeek-3.2.0.ebuild 691 BLAKE2B f2730668fe2335ba7465b9c3751f8e8b0f66ac94f5e0c98bd0235be370c192c91483a724588e4110cd5f29acfc6942d8ae400a69f19e0d6ced6582bfb52e01a3 SHA512 8985ed52eb183c66cb332be83e7f4c010ce96e82b8ea4eb674d38ef6b9986f9f1bf18217bd01ec11bfab6a6c1fee4c8c017dc5446f3c5e84a76fc26d27e4430c
+DIST portpeek-3.2.2.tar.gz 13550 BLAKE2B 4d0ba85d270699ebb7ca770d1fb3959d3f82135f3d75a65ec35f154ab6d46a9a51b9a2603940d16ed0f7f789f6ab628ef0a1536c2a2cf877b8e19e758e55568e SHA512 9362419f41ccc437ca8d90c0196044b2b17c683f3f2474c6f0bf484209a20fa8af1f17d69a0553038691190bdd410df0bbde51c016e2da944c6772651e99d7a5
 EBUILD portpeek-3.2.1.ebuild 691 BLAKE2B 1872abc019d1e843e9b3bca8e9cc54570ed4d8418ed69a5edbe7e25b00ee1ad97cc18d5ef5d701bee88de9bb3ba55b557394a6212b025b93d522b4b38f23cd1b SHA512 4ae8ab3897c034caf3876a55c7fbea0e976d71de6a80c6e56d4abfdad4f3e0768561c987619fcfc0e59f05986e04d13754f58e99dbdae861e11d0712795c6a13
+EBUILD portpeek-3.2.2.ebuild 697 BLAKE2B dcc40440e62d4ffc5cd875a108cbf0350e2d36ffe13947ecf18cc1835d3a5ed359b50d3b472937c2bb8173d355f0800c0d31866680f870c7b134681a32324f9c SHA512 33a85f086f317bc9a9edacf97e56b1275c0bcc363146ab63c3a1918f86f76fa2663bd84d3ddf68bdb60b1c8b9c13829aee681aee1dd53c85e333f563bdd4249a
 MISC metadata.xml 248 BLAKE2B 7f522eaf9289775b9bb4dfb1b10a86d17c43440c6bf02a98eef73591e3ffdbf9605c4daa6f20025ffdfa7e17848fe0ad33f4a88ebbdf746d280a5302ef9e74fd SHA512 a04923b3582e779f1f6f8567d31b61b25c3ddcc8b9e1162ff735bc4ae0bcb7124b078d12f3398ce3266fa50be592fb7ed1a89b99c2587db4d52d8411c8b17315
diff --git a/app-portage/portpeek/portpeek-3.2.0.ebuild b/app-portage/portpeek/portpeek-3.2.2.ebuild
index 7973e221fd7a..c381f3941efe 100644
--- a/app-portage/portpeek/portpeek-3.2.0.ebuild
+++ b/app-portage/portpeek/portpeek-3.2.2.ebuild
@@ -12,16 +12,16 @@ SRC_URI="https://www.mpagano.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
-	>=app-portage/gentoolkit-0.5.0
+	>=app-portage/gentoolkit-0.5.1
 	|| (
-		>=sys-apps/portage-3.0.13[${PYTHON_USEDEP}]
+		>=sys-apps/portage-3.0.20[${PYTHON_USEDEP}]
 	)"
 
 src_install() {