Fix legacy ebuilds and fix pkgcheck issues

8 files changed, 10 insertions, 163 deletions

diff --git a/dev-python/etoolkit/Manifest b/dev-python/etoolkit/Manifest
index b0d06d9..56111da 100644
--- a/dev-python/etoolkit/Manifest
+++ b/dev-python/etoolkit/Manifest
@@ -1,11 +1,4 @@
-DIST etoolkit-1.0.0.tar.gz 37130 BLAKE2B f9b3aeb9f0a34e4f2c6ccd0919314622c3a7a61aacfb8aca692bcb020adb2669be716b6a9f97ebf7b0e84db92203d37d9b8b888168f160396af2824a81a52087 SHA512 90f51a01a1fcf1b9f6a4139c022930c925e6fa2c5b4403110a0e4527f35fa083f47270a769361632689e03fb28f32487623b9e72611f1755e64e299f4c0de1fb
-DIST etoolkit-1.1.0.tar.gz 38325 BLAKE2B 7e21bf5042715899c61f56c660ce15fc429cf274bafea8b1f344a15d57b2eef8f444786547da90b6fe0f27837b0bd763326bbd578b30d92a6957fbf13c8c0af0 SHA512 6912b7c04e53d728eee4f6df50afcc38b44e7d2d646efaae5ab63198088d11e9f136982478e410c7c5d36996e990682be48b681c177106b47f092b1e18075b65
-DIST etoolkit-1.2.0.tar.gz 38641 BLAKE2B 38bf7b9a68a8165d86487950af651470b13874d7db0e1fc3bdb071ea96db50023ff95f8a04a27b982984f08e319a2698cb2ac37026d6f68e3d1ef73481289d75 SHA512 5e0663640a62160639ca810dde549858dd528f0b6df43f4c2f8ced151e02967c51c53e90dcde0ac9cd2fd7315be8e35836900436b8f1cb0b04f2e054eadeeabc
-DIST etoolkit-1.2.0.tar.gz.asc 858 BLAKE2B 217ff5f338693811bffd339d8d44dc1510ee2719e47b53bb8b9d0f7ed8ff1b4fcd584d97eea5598a49ea86edce1a392abddd1271349d57aa85198f7368f36030 SHA512 3503d84b9e911065d2cd8a70428d5d2d0b60ae90c0fc92ac115c698ae44e40e52e180af6ce7bd14ff24084fb3542322f5562c4d63e54f00e7388940eb884a7b5
 DIST etoolkit-2.0.0.tar.gz 45963 BLAKE2B 22f46ba5a0596d90ce4c9e39aebe423028038971b5966a1ae687437f052bcac4f25de3dbca532a3688883e17daed326306f6a93e919bcbd55f6948a70c12dd58 SHA512 77ccd8aaf073f9f5baf3b5f20209cab824b165e8dba5978015cfdf2bc9e8ecab8e8e6864e70016c210d037e8ec3ede27766a9757dbdfe12518b848ca4377e43b
 DIST etoolkit-2.0.0.tar.gz.asc 858 BLAKE2B 49448ef405ebb2c8db052f39cf32ede961993c0c2a0ea0eb52258e2105b4ce2fd760430942880183472d1255be265c833e171c57fc66042db234dff5fdd4789b SHA512 6e872ac393d551198bd61d90a4492d737c54adcf24f97592b8c1877967c8edee0034c21e4abb39cd9a7d6ebbc540bb78a9d1cb5eac0da0b1e6ca1a6a62022c48
-EBUILD etoolkit-1.0.0-r1.ebuild 939 BLAKE2B d9d833fd8d5f786a46c30f44ef3ab35e5a69d6bc758cb9e378270004d7a324d9d74955a9316fefcd55cab2d2f347ed77e8ce6731e0d2421ab41d1d69d7f757b5 SHA512 51e75559aff5207fe327e929512e46bac7cdda8df3cd39da73bba20bc7acb6a08c2861ab27610a63545c1dbb51839cace30cbaca5752a9f2dd709ad115ec779e
-EBUILD etoolkit-1.1.0.ebuild 758 BLAKE2B 5fb34b7e494784c1390963a1423db5e193e0292437c0b5e73ec118bf1d360068cb927d2129209ccd04877989f09acfe2505f223e4ea7a8881fd6234e83109b1b SHA512 f1fbb10318571855bc57ea484056ce5251bc1fc9363e47e526de360382964413a148b7f2dee23a002c2b37254bd811835e720312ac11122e6f951608376ca611
-EBUILD etoolkit-1.2.0.ebuild 1002 BLAKE2B c123ac3f24d4f8812c8d2088e56475a3778ca45733affec40ffadb59ef03ab0f418243440c80a90dba552313020ae8cd6c378ae79bd1893df213454d21f28fb5 SHA512 fbdea781421e7869d5596acbf9e9961579afee380fc65cab25c6447742789f4c4932ce790ee3ae537d64ea6067ee495504f79fcfc5413fa58ac8e33b7fd37464
-EBUILD etoolkit-2.0.0.ebuild 1002 BLAKE2B 7f275f9460dbe2a8dd0ccee43145da3a9baa26afed185210cf6c87913873c069075f58287685b04c32d5b24c1409c838489ce7dcba21be1b990828045c15363e SHA512 30c50ce49c0741b7cd6fe06951ec4db9c2fe89393673e83ab19b15d541b8a972d3e4b08ae5fcd2b0dfb6b2e2bbf5e3f1b31e1982697acc4a5c08e6993cc71d50
+EBUILD etoolkit-2.0.0.ebuild 975 BLAKE2B 8064a87e9beb15755b7180b45e18842eced29f83167ff942cbeab0a4e929f5c2d79f5122ca49981eaa258f25403ef489b4fef7bbdb6564ac912680e8f4669aa0 SHA512 8b99cf4b3362735a5899b172acd6ad43bfea74dabd0067fd9a5dd0c52d9a50c8bdac13bec43e89cf1245a242cfee60d52f07ec361c658829c89f37be088d734f
 MISC metadata.xml 400 BLAKE2B ca972e1b3593dba8814075aea91870d3782c2dc72f52925df71087e1901585f45c5fc5bbdf7e95b62fe1e396e0e9caa7e2282414bbd0434362e1984b0a6fad39 SHA512 9dd16ca280c598a6ce48816bf5e6e1b7a11b71e1915c06df0981e12995726fcaeebbe18b8106f793504963202d841ac7cb8c11f6afea77eed71e4b864147e7a4
diff --git a/dev-python/etoolkit/etoolkit-1.0.0-r1.ebuild b/dev-python/etoolkit/etoolkit-1.0.0-r1.ebuild
deleted file mode 100644
index 4ebb343..0000000
--- a/dev-python/etoolkit/etoolkit-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple toolkit for setting environment variables in a flexible way"
-HOMEPAGE="https://github.com/blackm0re/etoolkit"
-MY_PN="etoolkit"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-KEYWORDS="amd64 arm arm64 hppa ia64 ppc ppc64 riscv s390 x86"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-        >=dev-python/cryptography-3.2.0[${PYTHON_USEDEP}]"
-
-BDEPEND="
-        dev-python/setuptools[${PYTHON_USEDEP}]
-        test? (
-                ${RDEPEND}
-                dev-python/pytest[${PYTHON_USEDEP}]
-        )"
-
-python_test() {
-        PYTHONPATH=${S}:${PYTHONPATH} \
-                pytest -vv -p no:httpbin || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-        distutils-r1_python_install_all
-}
diff --git a/dev-python/etoolkit/etoolkit-1.1.0.ebuild b/dev-python/etoolkit/etoolkit-1.1.0.ebuild
deleted file mode 100644
index 0d3de77..0000000
--- a/dev-python/etoolkit/etoolkit-1.1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple toolkit for setting environment variables in a flexible way"
-HOMEPAGE="https://github.com/blackm0re/etoolkit"
-MY_PN="etoolkit"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
-        >=dev-python/cryptography-3.2.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-        epytest -s
-}
-
-python_install_all() {
-        distutils-r1_python_install_all
-}
diff --git a/dev-python/etoolkit/etoolkit-1.2.0.ebuild b/dev-python/etoolkit/etoolkit-1.2.0.ebuild
deleted file mode 100644
index df53f69..0000000
--- a/dev-python/etoolkit/etoolkit-1.2.0.ebuild
+++ /dev/null
@@ -1,44 +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_{8..12} )
-
-inherit distutils-r1 verify-sig
-
-DESCRIPTION="A simple toolkit for setting environment variables in a flexible way"
-HOMEPAGE="https://github.com/blackm0re/etoolkit"
-MY_PN="etoolkit"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="
-        https://github.com/blackm0re/etoolkit/releases/download/${PV}/${MY_P}.tar.gz
-        verify-sig? ( https://github.com/blackm0re/etoolkit/releases/download/${PV}/${MY_P}.tar.gz.asc )
-"
-
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
-        >=dev-python/cryptography-3.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-        verify-sig? ( sec-keys/openpgp-keys-simeonsimeonov )
-"
-
-distutils_enable_tests pytest
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/simeonsimeonov.asc
-
-python_test() {
-        epytest -s
-}
-
-python_install_all() {
-        distutils-r1_python_install_all
-}
diff --git a/dev-python/etoolkit/etoolkit-2.0.0.ebuild b/dev-python/etoolkit/etoolkit-2.0.0.ebuild
index d120e58..2e4b298 100644
--- a/dev-python/etoolkit/etoolkit-2.0.0.ebuild
+++ b/dev-python/etoolkit/etoolkit-2.0.0.ebuild
@@ -18,12 +18,13 @@ SRC_URI="
         verify-sig? ( https://github.com/blackm0re/etoolkit/releases/download/${PV}/${MY_P}.tar.gz.asc )
 "
 
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
 
+KEYWORDS="amd64 arm64 x86"
+
 RDEPEND="
         >=dev-python/cryptography-3.2.0[${PYTHON_USEDEP}]
 "
@@ -33,7 +34,7 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/simeonsimeonov.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/simeonsimeonov.asc
 
 python_test() {
         epytest -s
diff --git a/dev-python/pyotp2289/Manifest b/dev-python/pyotp2289/Manifest
index 066f737..321b3bf 100644
--- a/dev-python/pyotp2289/Manifest
+++ b/dev-python/pyotp2289/Manifest
@@ -1,6 +1,4 @@
-DIST pyotp2289-1.1.1.tar.gz 26118 BLAKE2B b6d197bc24843d4aebc71d1c24f3a714d7c21a1b8002c3112846e7bd891cc39a5396b51e4eedd7a4e0ab5b31930585e0c77321c4dbdae68ebdbb90dc68160402 SHA512 2efa25941d7933851f17a455dd5d5a2f8d94da83d4f159d3fe1967a6b638a2aa2004ac136a21cd8d13098da74864da18b3bd02404ad99b849da83a408470aadc
 DIST pyotp2289-1.2.1.tar.gz 30629 BLAKE2B 4a6d3dd95da20e4c42db3ec6c57a0a5e5b8c470f1b5e0fc4463b48e7724db87a817a0f4aaab7f1dd18b410da82a558ad635b9a197c8fc846114386dced2c149b SHA512 8af43dddf0beb905e5cde92635f6bb6937cab088bba626656671f901934070d941548ed96dd9b965a3db0b58766dc28fab59484aa99986a4072cde681a60dd61
 DIST pyotp2289-1.2.1.tar.gz.asc 858 BLAKE2B 0f5e8cd7cd1c45546866889b8fd27b1c8287f711e01f7e69d1c6508f743f512ddd737062506695e9d71ed59f62fba364bdba739d12387dfda67db6ebfcede782 SHA512 3ef207de88553585cbb2b58c6698ac01d67a780eff5ed6fe8ba0bf23eab842ccbbd2653c2f96079b28056c271701f87671bb4b3ae1551a86380f3ec074121536
-EBUILD pyotp2289-1.1.1.ebuild 643 BLAKE2B 080438c182ac1d3a1dfb5520ee6071e1ce37a467df8db5823940f148cf380334dc847f3f8787d8a63e6bcddd70e3e99d3a3620f3c8d357175248b3134c7e8257 SHA512 f4a72d9e1c61b14e4ecf2a3b63bb654bdb1a913ea895e70fed5166a019dca1c464be33a5c55c9e9d7e1a9b4eb1a85af812698501b5d79b21c347c44ed66e5b40
-EBUILD pyotp2289-1.2.1.ebuild 910 BLAKE2B a890a8a0d36ea81f9a182ea793fbf6d9e2f4723f7560845d495f2839dd2c100adecaaeb7e909e953667d150a8b8fd517663ce6a0359cddac94a7b52ff1fd2df2 SHA512 d69e6c53d0b2dc0b7628980ad82abd328efa6493cf03b6a3320f1f407760b1b28681387d4f8d615fbb620050a4e3008a564a53f22d024085701f5676b1e44894
+EBUILD pyotp2289-1.2.1.ebuild 903 BLAKE2B 0eee2052148198f5232428ac028cf34f6288964388d213bc115879f03ddc9a2b79b5d006d2b63d31b2aee2e7e3e0ae89939252b85200bfbcdb35e3e259998294 SHA512 ffcc7679a7eb30fb4851eb3188f181f97e9a716463d94e065dec4d60f03553961e1b69a270070e128d3f96cdc8819b7580607ad0e8d5cd5194685810be0983be
 MISC metadata.xml 402 BLAKE2B 3169f6b02fb30ba6db5edd85532a4caf08670e44e27a9b690063549b5561a765e8d2a4b3cd129d196827e2d51e97b7e6da04347c07387cd25aec2792516b89a5 SHA512 2268e0dd77a8771835d0cd97ec124fd47d51a5ceec7f5c21baf62979e021c0aa38aa506740147b9fde97f9af3094f8e4635424043fe06d5db2ddf45398912928
diff --git a/dev-python/pyotp2289/pyotp2289-1.1.1.ebuild b/dev-python/pyotp2289/pyotp2289-1.1.1.ebuild
deleted file mode 100644
index 4252090..0000000
--- a/dev-python/pyotp2289/pyotp2289-1.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure Python 3 implementation of RFC-2289 - 'A One-Time Password System'"
-HOMEPAGE="https://github.com/blackm0re/pyotp2289"
-MY_PN="pyotp2289"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-        distutils-r1_python_install_all
-}
diff --git a/dev-python/pyotp2289/pyotp2289-1.2.1.ebuild b/dev-python/pyotp2289/pyotp2289-1.2.1.ebuild
index 2488fba..82f4af9 100644
--- a/dev-python/pyotp2289/pyotp2289-1.2.1.ebuild
+++ b/dev-python/pyotp2289/pyotp2289-1.2.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..12} )
+PYTHON_COMPAT=( python3_{8..13} )
 
 inherit distutils-r1 verify-sig
 
@@ -18,19 +18,20 @@ SRC_URI="
         verify-sig? ( https://github.com/blackm0re/pyotp2289/releases/download/v${PV}/${MY_P}.tar.gz.asc )
 "
 
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
 
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+
 BDEPEND="
         verify-sig? ( sec-keys/openpgp-keys-simeonsimeonov )
 "
 
 distutils_enable_tests pytest
 
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/simeonsimeonov.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/simeonsimeonov.asc
 
 python_install_all() {
         distutils-r1_python_install_all