7 files changed, 36 insertions, 65 deletions
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index dcdab8c1a7fc..c6d311ee34b7 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index 0d227e8ec989..206c2fbcff2b 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -1,6 +1,3 @@
-DIST portpeek-3.2.2.tar.gz 13550 BLAKE2B 4d0ba85d270699ebb7ca770d1fb3959d3f82135f3d75a65ec35f154ab6d46a9a51b9a2603940d16ed0f7f789f6ab628ef0a1536c2a2cf877b8e19e758e55568e SHA512 9362419f41ccc437ca8d90c0196044b2b17c683f3f2474c6f0bf484209a20fa8af1f17d69a0553038691190bdd410df0bbde51c016e2da944c6772651e99d7a5
 DIST portpeek-3.2.3.tar.gz 13583 BLAKE2B 23aa397b3f8a1d5d0e4a0ec2a3e1eac86fe4c73fc8675d3799056e70ed3807da26ffa0ab1ea7682a442d1a851c15c5bba1e66cd212390980975e8070abadc98e SHA512 32a8ad4411452a29d57e042e37014ab8b84edb15ee9df2d250171f4c14923f0e881b6e131cd5163fdcbbdc9915b82e0580bca382011861569984ca61e3d3d608
-EBUILD portpeek-3.2.2-r1.ebuild 725 BLAKE2B a71586679ec5b36f1109d06e0a49e77974dce75fce7179370b7854451265349f051ebae807a8d9246f770fb1043cd70afd4bf8e5560b709c6d24f08513a15c21 SHA512 93e3edd3c0523dc4e0d7f10ef9767c90a4a67ef1bf715ae3f91aa75ac822a0d134e4f7e19354aa430a96fc1126fe20bd9c7500df4a56baa11f8d8c387b7170ca
-EBUILD portpeek-3.2.2.ebuild 713 BLAKE2B 2b828901d833471ae3cf9c960ae8696e8130f03985359a612fa284a185eb726ab81f560c54ad578d1ad8cfe6c2e8deaa44906d188fce979298fe74ec896f49c4 SHA512 ffcaa643a8a9bb0ad84e90697bc1d8d9d143949387e834784e922cf041c8cce38e804785c771c3fa0410595ac6eda3f00307226c8f4c07c881235748d688890f
-EBUILD portpeek-3.2.3.ebuild 731 BLAKE2B 2404374856d0e3a99a8542296a5bdc66af5ce28ae81562a8fdb1bf47ca164275864271d9fda6733d57d4180b5203072d92c6fe68e45a6814166da87d8f214c45 SHA512 4da8ee3140596393c1b4a4be4d14d1f188de12c3fb5f49c22e838573e3045f4a37f212a6b09f5ebcb676bbeaee2b05c5fe80aa86dd7dbb86c1253d30258f1ab5
+EBUILD portpeek-3.2.3.ebuild 725 BLAKE2B b06680eb00fa763802a0462374c7416edc12bd5b828a02183cacfb0731b54c2512404719b81c04edbfbed19b3b429c50853c38192b1317fae67144e7b8643b10 SHA512 a1bac5358e0120848942b195417433ca3c83a3b4a5471248fdfdf18edf8f365ebe8c1f10dcce97d19f05bca42b8f32ef698862fe0566d0ead0387a3c0d32c8a9
 MISC metadata.xml 333 BLAKE2B 8f862f87d0f6cb53dcbcda433a03202c648723f7b965798173fa1caaf8cb2d9d6801283b65c8a1184685e47c7cddd76e927facb3f9b014325bd5c88a2d69664f SHA512 1e16d124fe120663bb0ecb7995b6be4dc65f5d164bff681029fc6f82113926aaa875a97dcdb6f9231e170b416c6bd3e19a935aa5dfebb01969b169e7b9c89f10
diff --git a/app-portage/portpeek/portpeek-3.2.2-r1.ebuild b/app-portage/portpeek/portpeek-3.2.2-r1.ebuild
deleted file mode 100644
index 459e51243625..000000000000
--- a/app-portage/portpeek/portpeek-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PYTHON_COMPAT=( python3_{8,9,10,11} )
-
-inherit python-r1
-
-DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
-HOMEPAGE="https://github.com/mpagano/portpeek"
-SRC_URI="https://github.com/mpagano/portpeek/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=app-portage/gentoolkit-0.6.1-r1
-	|| (
-		>=sys-apps/portage-3.0.31[${PYTHON_USEDEP}]
-	)"
-
-src_install() {
-	python_foreach_impl python_doscript ${PN}
-	doman *.[0-9]
-}
diff --git a/app-portage/portpeek/portpeek-3.2.2.ebuild b/app-portage/portpeek/portpeek-3.2.2.ebuild
deleted file mode 100644
index 4a0eb9876d69..000000000000
--- a/app-portage/portpeek/portpeek-3.2.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit python-r1
-
-DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
-HOMEPAGE="https://github.com/mpagano/portpeek"
-SRC_URI="https://github.com/mpagano/portpeek/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc sparc x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=app-portage/gentoolkit-0.5.1
-	|| (
-		>=sys-apps/portage-3.0.20[${PYTHON_USEDEP}]
-	)"
-
-src_install() {
-	python_foreach_impl python_doscript ${PN}
-	doman *.[0-9]
-}
diff --git a/app-portage/portpeek/portpeek-3.2.3.ebuild b/app-portage/portpeek/portpeek-3.2.3.ebuild
index bbf1b82a3946..8218b481d5de 100644
--- a/app-portage/portpeek/portpeek-3.2.3.ebuild
+++ b/app-portage/portpeek/portpeek-3.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mpagano/portpeek/releases/download/v${PV}/${P}.tar.g
 
 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}"
diff --git a/app-portage/pycargoebuild/Manifest b/app-portage/pycargoebuild/Manifest
index 4b1e52ef9052..aabea4d70805 100644
--- a/app-portage/pycargoebuild/Manifest
+++ b/app-portage/pycargoebuild/Manifest
@@ -1,3 +1,5 @@
 DIST pycargoebuild-0.5.1.gh.tar.gz 17587 BLAKE2B f5c35acc43cfcc1a844f9bf0f01b72ca62ff07531dba8911e9a4ec672586760c9fee93ae9b9a9cb4becd4702d2caabc8f1a02a4b702356708ec4cf3f1780b577 SHA512 eb35ddc93a34fd0a857f28166a5e1cdb64f3e9b13f8182fde79292e93f30d6218eec2f0f2933c763c37f398b09952550e208a3914fb47d8d2b6a755ae003a983
+DIST pycargoebuild-0.5.2.gh.tar.gz 18304 BLAKE2B f9150ee2532b9683be9c504397f6c396956aefd285784ff156aaec5d8ab7cb9bb71643271463dd237c357dd6d061fe67cc5dd2470085cf1faf79b4c62d839135 SHA512 56099598a6b97929029e7cb8f3d67c81d187b2a9811e78de384ab37ec28aec8649bfe61ca987ace82fc18925d77ba19c7c6e89d8537f37ea65bb0127566a6c2f
 EBUILD pycargoebuild-0.5.1.ebuild 669 BLAKE2B b3b235c2092de874c3462eed84b0d3caee455480353d75d20981dde7f5437c896e62bd85a7e808f6d0db7a1442bf9327ff176dd5c1bd76637f188174a37bcc36 SHA512 e4708d2ce1672e0b9a62a561df9728e59634c75e10431674b2fcb0e078faf5edb338b5b3a527af4e41800d520d8ce5efc3072d5eedb24914da947fd802c84c65
+EBUILD pycargoebuild-0.5.2.ebuild 669 BLAKE2B b3b235c2092de874c3462eed84b0d3caee455480353d75d20981dde7f5437c896e62bd85a7e808f6d0db7a1442bf9327ff176dd5c1bd76637f188174a37bcc36 SHA512 e4708d2ce1672e0b9a62a561df9728e59634c75e10431674b2fcb0e078faf5edb338b5b3a527af4e41800d520d8ce5efc3072d5eedb24914da947fd802c84c65
 MISC metadata.xml 384 BLAKE2B a5c91cf81989cb7f2ff504cd9931e89cb85a2b17721818efbc436d13e68d673c4f384839c67eeec8fe24c1a78b112c3fe37ee1722d2d28f44c5a075ec8fe18ba SHA512 76ffa916e9630225aadb9a0d2073087fcb848b782f6e44c28c354533c5329ed337e609666ee7eba90ef1191be2a34e968d3bc06556cfafce32a43a22100cc6f0
diff --git a/app-portage/pycargoebuild/pycargoebuild-0.5.2.ebuild b/app-portage/pycargoebuild/pycargoebuild-0.5.2.ebuild
new file mode 100644
index 000000000000..ddee9ac385b4
--- /dev/null
+++ b/app-portage/pycargoebuild/pycargoebuild-0.5.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A generator for Rust/Cargo ebuilds written in Python"
+HOMEPAGE="
+	https://github.com/projg2/pycargoebuild/
+	https://pypi.org/project/pycargoebuild/
+"
+SRC_URI="
+	https://github.com/projg2/pycargoebuild/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/license-expression[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+
+distutils_enable_tests pytest