gentoo Easter resync : 12.04.2020

4 files changed, 33 insertions, 27 deletions

diff --git a/dev-python/pyaes/Manifest b/dev-python/pyaes/Manifest
index 947fc4fc2600..9fd8fa5458af 100644
--- a/dev-python/pyaes/Manifest
+++ b/dev-python/pyaes/Manifest
@@ -1,5 +1,4 @@
-DIST pyaes-1.6.0.tar.gz 28237 BLAKE2B ccce23a58d88582fde56dfe26b774effc00c999c6dd0625e17c5ee7cea7ad1c16c9ab83f452cc4eb47fe88bb7367a37425c1975005249591656bf29ea3af4064 SHA512 32f6bf998b7e200fc73b4852873f60067ac056d646ae87cd8ab55f3ec99c9e26fa2b418b67ba0264a8016311a5f0eb2d40c8e7f917c0715e19f5c3dbf6a8238e
 DIST pyaes-1.6.1.tar.gz 28536 BLAKE2B fa7ca95ae181cd48e21ceaeab42f937c54bc9b90b1a337aaffd6317c8091f813b1fbd2abbc14a600a747829a0e94ac6bdd5624010a27f1c342bfef2390d7c8fb SHA512 00ce3babf72ea18b0de369860cd884058c7c6f3bd8b961c3ff591ef7d3dc0a69fabad5311f61c9f91d2f1a480c8512e34eeced5ec7145ed9f963bf91c5f8838a
-EBUILD pyaes-1.6.0.ebuild 534 BLAKE2B aee9815d8efc3da51919e8430950a8ecd13c82546ff25fbc6074bcf0cb695dcd9a53957833638e5960c44d44d35fa1252f15c6fb70a70862b4394818115d4d71 SHA512 1db5fb0e0c0c6c7c2419a702244a9ae235c5d9fb7918267cbdfec74ed86fc4915a8786af6b5b06eb2bf1d0d906e77704c6e0b46886c81effe73dd2dfd3a5a9fb
-EBUILD pyaes-1.6.1-r1.ebuild 620 BLAKE2B 52e26e577e5aa722f7c80dd75d6d7b58de039b766ae6000cb5eb8a2b53843cbe8c3d13aa72b2ea29c9cf4e8b4c0ee9a62a6e5b54925a87233de1f6b64d9e6c84 SHA512 6a48184e4678a0f6d43a06206ce7294ab2c6cc6ca9eed509b09149d15f33a061cc35218b025a2bba1f1f90eac4f5accb400bcf712a602680e6de098e527f3119
+EBUILD pyaes-1.6.1-r1.ebuild 634 BLAKE2B 8acd0c9f3006ef236c9a6fd919613977d3df457bd578f42c2661e5054bb6218892c64af8d505803a7ac336fae223d0ed0dd5ad298123fac2dbea5b51ce4093c9 SHA512 87ab6faefb09b458a3b7ee21452e2f99132dff66f56ee0d3347df35bafb7c8ab410559fb739c1adebc62ca654f202cbf1525dfe3b594885aed5b862766e4d836
+EBUILD pyaes-1.6.1-r2.ebuild 747 BLAKE2B 60622698c40bf29e1ed529b8f76a34e6f2ec7c9e33ca2145fed95f461711b7e6f630251f88fd5497ce2a7d2abb8d6ea388d4588d206926aade32d7b638592a26 SHA512 bbb5283b3e6329c006518502bf817601be96b67eec51d9feb9733443d32ab3ffaddcd9972a2ebf61547e6cea60e59e80ec6e609f3af93212b1d593351d0ccdba
 MISC metadata.xml 413 BLAKE2B 8f8dd44dbba6ea7f5428112866c3dcec032237c42001522d4e520d2565d378cd9e6e48dfb9eb1205f78b5e85c4f9964c44075774807d35188eeac72cd1e67fc0 SHA512 63a02ec94c96d1183a71a1a4676d54c3aa915666a0080edb472e169769669ca5268706189613a370b754c66df8879742e0705bd378c7ba9aeb9bfc0015e7a2c8
diff --git a/dev-python/pyaes/pyaes-1.6.0.ebuild b/dev-python/pyaes/pyaes-1.6.0.ebuild
deleted file mode 100644
index aa569abf1dfe..000000000000
--- a/dev-python/pyaes/pyaes-1.6.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python Implementation of the AES block-cipher and common modes of operation"
-HOMEPAGE="https://pypi.org/project/pyaes/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	${EPYTHON} tests/test-{aes,blockfeeder,util}.py || die
-}
diff --git a/dev-python/pyaes/pyaes-1.6.1-r1.ebuild b/dev-python/pyaes/pyaes-1.6.1-r1.ebuild
index f918a36c506c..c7f7ffbcb3f8 100644
--- a/dev-python/pyaes/pyaes-1.6.1-r1.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 x86"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
new file mode 100644
index 000000000000..d69eebe72764
--- /dev/null
+++ b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python Implementation of the AES block-cipher and common modes of operation"
+HOMEPAGE="https://pypi.org/project/pyaes/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-python/pycryptodome[${PYTHON_USEDEP}] )"
+
+python_test() {
+	local t fail=
+	for t in tests/test-*.py; do
+		einfo "${t}"
+		"${EPYTHON}" "${t}" || fail=1
+	done
+	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
+}