gentoo resync : 20.03.2022

3 files changed, 2 insertions, 43 deletions

diff --git a/dev-python/argon2-cffi/Manifest b/dev-python/argon2-cffi/Manifest
index 82636c3c2429..9682c80bc3ad 100644
--- a/dev-python/argon2-cffi/Manifest
+++ b/dev-python/argon2-cffi/Manifest
@@ -1,4 +1,3 @@
 DIST argon2-cffi-21.3.0.tar.gz 38446 BLAKE2B e0464f501efcdfbf33d93e0c1c6dbc519ad6aee06c0b8692417156de608f6c6acf947f86b866c064601fe994087677e51d954ae2c1225cbbbba3534cf70c6296 SHA512 6cb2a075f3bb7040ee7f552d082bfa2f3df0854649d9c84fdfdb42bb4bee2133b8a35a20be2b3c887931efda12fbbb00815d8d88170b7e20b3ca19c86f97057e
-EBUILD argon2-cffi-21.3.0-r1.ebuild 1176 BLAKE2B 97b09203c17fa17030d4eeb4780d0f2b957cbb1417c91d4adba76058d53c260f926e8f4c5a4e78b6eecdd6cb55601c8e2b59567e7127b46a32036b207d4fa91e SHA512 c38e34fa4c8c9973da3039a1be22381a773288cca548b9ca4a24ce20c92968d255160c62c607e093a659978f642b7dc41a485dd48124dd1422e1b6f5a4dac563
-EBUILD argon2-cffi-21.3.0-r2.ebuild 768 BLAKE2B c489a1778d1fcc45d51e90e8890d8da1875f24310940ea3144852f2a7825d26acc2876bc30f9a1085045afb725c782472212119e40ce7899e883da14e1994381 SHA512 57d0af3507481f9c671e440c18d99b59306d238eb79543418b3f82d940dc4016fdd4cd52798ef789e61eba57e9dff3c82cfdf37e1747bac560a4029a27b1e94f
+EBUILD argon2-cffi-21.3.0-r2.ebuild 767 BLAKE2B 5ef95a7e86b62abce8607946ffea355bd5dd565ed875643e3b99a40e07f0af803a3a2ba106d16f88461a6077ece9bf53f33b89c6208ddecb23361c64a5d6a717 SHA512 6681209ee48b9621659767c9e2614305e6e939a9dd5e191726a0b032766414c97c07efc94e83d3d8e331ca996a65550a95aa618dd703b0e5c009a210e5890c61
 MISC metadata.xml 666 BLAKE2B 831fde25c0b52ed8610f39ab589f339783bace8dc2cc60ffa4736257c352bc82b89e110bf44181790e4a16db967e4c516f21fbc3cd1526a9975cc86b21f723f7 SHA512 543bb0e37fdf96b8c2fa4ec26eae837317dda4688b4293e82268100ce69e3f9987e91b2f141cac1be4becba9698f9806d22242801523bec825271b8fa4f14bc8
diff --git a/dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild
deleted file mode 100644
index b3f986e7389c..000000000000
--- a/dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="CFFI bindings to the Argon2 password hashing library"
-HOMEPAGE="https://github.com/hynek/argon2-cffi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND=">=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	>=dev-python/pyproject2setuppy-22[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( AUTHORS.rst FAQ.rst README.rst )
-
-src_prepare() {
-	# Sphinx's conf.py uses importlib.metadata to determine the package
-	# version. However, argon2-cffi is not installed when we try to build
-	# the docs. Therefore, we patch the release version in conf.py.
-	sed -i -e "/^release/s:= .*:= \"${PV}\":" \
-		"docs/conf.py" || die "Unable to patch version in docs"
-	distutils-r1_src_prepare
-}
-
-distutils_enable_sphinx docs \
-	dev-python/furo \
-	dev-python/sphinx-notfound-page
-distutils_enable_tests pytest
diff --git a/dev-python/argon2-cffi/argon2-cffi-21.3.0-r2.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r2.ebuild
index e52ba5f9cf7b..f263b7608a3e 100644
--- a/dev-python/argon2-cffi/argon2-cffi-21.3.0-r2.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND=">=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]"
 BDEPEND="