gentoo resync : 09.07.2022

5 files changed, 2 insertions, 73 deletions

diff --git a/dev-python/entrypoint2/Manifest b/dev-python/entrypoint2/Manifest
index 2437d1779388..089c443f461f 100644
--- a/dev-python/entrypoint2/Manifest
+++ b/dev-python/entrypoint2/Manifest
@@ -1,7 +1,3 @@
-AUX entrypoint2-1.0-python311.patch 466 BLAKE2B d76fa430c43bae2b9bcdca43fbb2e113aa5b6d98cc49d36d8054f75f60ab9d1b3ffe70c452aa1036aece49a20256d04993fabceaacf7d19d0b2a2091302fa0b6 SHA512 018d609dac2213de22f63dbeff2d4de5d6f30301ab867898cfa4ae1753d51bf56fd005cfb565dd855214dd50117abb83b3beeca86cf24173e8d53cdc16d044de
-DIST entrypoint2-1.0.tar.gz 15424 BLAKE2B 1270a35218cde90922fe8f675917545f4c43e5ec0effd632583cd0bd02200d6a453716787c222722cec633bcb108c1b8c26e284e9659e754d3bc6a77895a6042 SHA512 6580dbf19482af95cbccad61b6f6dc73c068ac78d166e2cea4fae54243921e577316d38e204ad5983f0f52d898d67a10f4c90332d4eeaff1ea713bfc82c70890
 DIST entrypoint2-1.1.gh.tar.gz 15480 BLAKE2B e9a834b863e624971266b78fed75ce2621511f7529f88e4950803c8978a1e27e81585751c25eab82aa1507b6abf8500b11e6ab7ec80052ccd31bec16bf3ed790 SHA512 807b8a53cc5c3e88de971c624dc69b3d526637d84856a0a67fdf2d15c51224cb5c48a7614eaa1942783ce2e954791a86f5ae6eb4dbf1a6e7928161e2cc8f293d
-EBUILD entrypoint2-1.0-r1.ebuild 643 BLAKE2B 348ae58117519fe3527e61658ef1ed01023d6323546bef605d52c4f8c8c42e3e29dda9f5c289f2a5e711c60e2febb535672b05ffbe78587ed05f2830055907e6 SHA512 7d672fb9fb326d943aeed998475dab878b7e6dcc2a1678103f1e557bb7f4d015d37c0281ac1eab41f8c1f926e956c5b4d0b9b7f7999fae678c2e63f2190f53d2
-EBUILD entrypoint2-1.0.ebuild 592 BLAKE2B 56774389749453c8dd3c6e5c9945ba1ead88d847c6109ebd48a279e6dc9376c4024c9de95d11c5cd0f500a0864d173606349da749e6caef374ccc1578dba3cb1 SHA512 247684b92b7fc39fbd875252c288c3d2ad86bc5cf1dfa78f6c7755f47315f38280d1545e2b73d9751c6348c65a37879982bfe185a4f6bce33a31d7a6aebb3eae
-EBUILD entrypoint2-1.1.ebuild 602 BLAKE2B dc295648ca53fee2ded8714c623b9b8c3f3ea136bfa8b8f9daab82f36d2b8637ca0b23e1d112c064ac721591cdf9bc6c8b197db3219ef3b18298a8e0ecd67d77 SHA512 85acc53648a6abf9754dace0d5ca390dc9bce488feca3b7de1595b32aea55bd334a8b4a0c57d3dfa88988486b732402cbfab92812bf2d8b2458925f36a31202f
+EBUILD entrypoint2-1.1.ebuild 600 BLAKE2B fac3de14db450f25c16e442aafcbe46e563601b24904988d2f14907b4cc42b26eedcff005d30b268e8e4d59d8805f0545faec96759fd53cdf84d2bc25a71a939 SHA512 ef77366ac99791b2571c50a32d40ce79299d78d3807ec2d7b4fed6ae58659f6d60f40ec7f03994218b5ec2d1af6962beb6e58a32d6ca6dbfe90a6a30d38e290c
 MISC metadata.xml 515 BLAKE2B 279d972e521c49268b271ad35d6b80044d6c9d6a9c24e9085b324eb68da37d7f5c5b961c13c97faeb2c3ca8d70653ec9047fa6223e5ac00c2c957bd831999dd8 SHA512 9f98b97da54d43c97e892ed3731ac30d1d44007af0bc097c69303a297f55283f7a3d5c92f38161f4c5c9306b7b6dd996856d0fa009559b5f050f3e11009162e9
diff --git a/dev-python/entrypoint2/entrypoint2-1.0-r1.ebuild b/dev-python/entrypoint2/entrypoint2-1.0-r1.ebuild
deleted file mode 100644
index 758a23521d24..000000000000
--- a/dev-python/entrypoint2/entrypoint2-1.0-r1.ebuild
+++ /dev/null
@@ -1,29 +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="Easy to use command-line interface for python modules"
-HOMEPAGE="https://github.com/ponty/entrypoint2"
-SRC_URI="https://github.com/ponty/entrypoint2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/easyprocess[${PYTHON_USEDEP}]
-		dev-python/path-py[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-python311.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/entrypoint2/entrypoint2-1.0.ebuild b/dev-python/entrypoint2/entrypoint2-1.0.ebuild
deleted file mode 100644
index 3547ae9dde3c..000000000000
--- a/dev-python/entrypoint2/entrypoint2-1.0.ebuild
+++ /dev/null
@@ -1,25 +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="Easy to use command-line interface for python modules"
-HOMEPAGE="https://github.com/ponty/entrypoint2"
-SRC_URI="https://github.com/ponty/entrypoint2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/easyprocess[${PYTHON_USEDEP}]
-		dev-python/path-py[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/entrypoint2/entrypoint2-1.1.ebuild b/dev-python/entrypoint2/entrypoint2-1.1.ebuild
index 0ad7d18b4367..4c76a240a025 100644
--- a/dev-python/entrypoint2/entrypoint2-1.1.ebuild
+++ b/dev-python/entrypoint2/entrypoint2-1.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/entrypoint2/files/entrypoint2-1.0-python311.patch b/dev-python/entrypoint2/files/entrypoint2-1.0-python311.patch
deleted file mode 100644
index 95de1d3b689a..000000000000
--- a/dev-python/entrypoint2/files/entrypoint2-1.0-python311.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/entrypoint2/__init__.py b/entrypoint2/__init__.py
-index 63ab78b..a99a298 100644
---- a/entrypoint2/__init__.py
-+++ b/entrypoint2/__init__.py
-@@ -345,7 +345,7 @@ def _correct_args(func, kwargs):
-     Convert a dictionary of arguments including __argv into a list
-     for passing to the function.
-     """
--    args = inspect.getargspec(func)[0]
-+    args = inspect.getfullargspec(func)[0]
-     return [kwargs[arg] for arg in args] + kwargs["__args"]
- 
-