gentoo resync : 25.08.2020

5 files changed, 2 insertions, 142 deletions

diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 71b023a8a6e9..5aaae98b8eb8 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,9 +1,4 @@
 AUX pycryptodome-3.9.4-parallel-make.patch 756 BLAKE2B 06a79eff056ecb983131838287563d4d60896f27e28d5c2534f4ab008e50017694ac9355b43f8f387cc29abfd21ffd648233c3dbae33a06fcedb12a6c7e11e80 SHA512 06b42ea780bd374cf5cb5d6cef3fade5d695c1ee0d765e2659408da7645ad311eef2028f17d8ec0289d49c3a5851b4c63503d7c922de15873dbbf16d0db58b08
-AUX pycryptodome-3.9.4-tests.patch 2201 BLAKE2B 93bad5e716c968c1d1b765c0506f5e46680d3f1b71a89e6b6cc17c73475ca44433f75f03661bb5bb32905a9898c10ab13167e883a5240d08e540c6bf5adcc06a SHA512 8154064bcda7a4d7d9e87be09f1ecfdc1a7553b9fc82d7f9c7c9c12cef216d856d6135925c0cca64708e5f3f8009be27a97405ca7d31945af89248f77a0b8f5f
-DIST pycryptodome-3.9.4.tar.gz 11575825 BLAKE2B c153fe71179d633a5722480c4c42cc133100f524a8ba9d3cd9380b7e172564c276b70b97ef36437fa3a149c418903802f410c9d1807d5d72345dffb0aa568223 SHA512 d99e4e431d77856ce3ae33526984cadf2fa6aa82b1f692a2ad0ae893f6a1e9538e6d71d281578e6bd733a816664d1683364c64441196cbc6ee1278f9d6eac62c
-DIST pycryptodome-3.9.7.tar.gz 15451558 BLAKE2B dca2cf3500d4011b8c37937c3f844db3e8e4afbec2c421552bcdc08df32ae46d8a2dadfaa2d48aac2356374f30154d439cb9e988e1035c570b0adebc58b259e1 SHA512 2ee8ec1094ca2b3813c25b96c71988db479b23ea2e76937275d0fd6421653efd1ce7a1e279c7a20a9de7edcb59e0927121a42112b85afc052edcd6ab2db74c26
 DIST pycryptodome-3.9.8.tar.gz 15633268 BLAKE2B 8c4f8d4839be0fb09556677514ee6c7f832684f20eb4e355cee87eb5b52a5c09e12712c1865ff89fb5dd6c628ca027374c7cab8a2287aafa4eecedf1095f1a12 SHA512 894e763720df284804fd686d5805980853b86773bb3097bf03d929818b9944e5a257e47414275f302966864751e50ae34dea19ad749910f1ceac31833a53ef7c
-EBUILD pycryptodome-3.9.4.ebuild 1476 BLAKE2B 9cab4ddf6853756aa114c6ced6037c135320169548c7605e33c2adfb865bed5d72b8e81345dcfde5817922d037001b98fb181c011c9d2e011f3e6f6e153aaad3 SHA512 a7bf5e4dfd64cb10a5dfebd1695d015c56fcb602f6a5a8ce80ba43f036e4f0df02d8c871fb7766e77dd844c223e734a973cdb8bd5b7c5a35c7d68264188c2f8c
-EBUILD pycryptodome-3.9.7.ebuild 1332 BLAKE2B 919318590a20e2cf4127ac509611c7ad41c8a569341eff817e54f240694aa263ec26b995bff9c2d25a25761e371055a8854f63b0aa24aa90b3a9b31033cb6ebd SHA512 0cae21615849248874f83f36d6bc55354d0c2ecba39d20a30c3488c37ffcf84c11807bbca64faa871b8a5c0bcf6402045f0332d53bcd48d41ea5dd3bd2a7506a
-EBUILD pycryptodome-3.9.8.ebuild 1339 BLAKE2B f179600a7b4cacb2ea5ea1f6f55466b548bb163ef9ca532f9fe67c359ebd3dc8b0d2b94b5f6b5c56e52184b0a2e8c18f28f3c868189e11dd963d7be1679d83b9 SHA512 af9134a206c03537c43ad478b25103e870e81f82fab1a67a36f8f41a37e20aa0df1a44ba195a9a4bd9d1cbf9ca31bce5cf2a54c90ad966e34ebd7696d9bba367
+EBUILD pycryptodome-3.9.8.ebuild 1330 BLAKE2B 97e78373d4e5d2d7065d0ca60fa8374d225c48ccf89b51fd51d8bbd68897d5ed37ba237f346bd9347a6cdb3204b5b7b43a28426fa593e3d039259a4664ac4e60 SHA512 3596bf56db6f47c1e9c0ce9568988566a858541128e2962af886d1260f059a6542ec5588bf651c343db73a42e483b64e44ab8fdafacfdd6aa6f53cd46dc1df4f
 MISC metadata.xml 335 BLAKE2B 7e5036b03371769db2f3a8d0cb5d5cd9078f16d4dccc3bd012f0d4f96ba960388c3025df93bb165f3cdbe05d73da05537a373e01b799aac2dc59dcd44e6206b5 SHA512 a94a7c0c45ae597e5c4ac672a5e9151851448371ddae0fdbd9967651476681440f2d4a6071e2cd0c4a1553038a92f4e6649f0554b636d58a025366c57c80e899
diff --git a/dev-python/pycryptodome/files/pycryptodome-3.9.4-tests.patch b/dev-python/pycryptodome/files/pycryptodome-3.9.4-tests.patch
deleted file mode 100644
index 2cfcaec127de..000000000000
--- a/dev-python/pycryptodome/files/pycryptodome-3.9.4-tests.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/lib/Crypto/SelfTest/Cipher/test_ChaCha20_Poly1305.py b/lib/Crypto/SelfTest/Cipher/test_ChaCha20_Poly1305.py
-index a2109891..44d2e532 100644
---- a/lib/Crypto/SelfTest/Cipher/test_ChaCha20_Poly1305.py
-+++ b/lib/Crypto/SelfTest/Cipher/test_ChaCha20_Poly1305.py
-@@ -626,6 +626,7 @@ class TestVectorsWycheproof(unittest.TestCase):
-     def __init__(self, wycheproof_warnings):
-         unittest.TestCase.__init__(self)
-         self._wycheproof_warnings = wycheproof_warnings
-+        self._id = "None"
- 
-     def setUp(self):
-         comps = "Crypto.SelfTest.Cipher.test_vectors.wycheproof".split(".")
-diff --git a/lib/Crypto/SelfTest/Cipher/test_EAX.py b/lib/Crypto/SelfTest/Cipher/test_EAX.py
-index cdd0e85a..546186d1 100644
---- a/lib/Crypto/SelfTest/Cipher/test_EAX.py
-+++ b/lib/Crypto/SelfTest/Cipher/test_EAX.py
-@@ -656,6 +656,7 @@ class TestVectorsWycheproof(unittest.TestCase):
-     def __init__(self, wycheproof_warnings):
-         unittest.TestCase.__init__(self)
-         self._wycheproof_warnings = wycheproof_warnings
-+        self._id = "None"
- 
-     def setUp(self):
-         comps = "Crypto.SelfTest.Cipher.test_vectors.wycheproof".split(".")
-diff --git a/lib/Crypto/SelfTest/Cipher/test_GCM.py b/lib/Crypto/SelfTest/Cipher/test_GCM.py
-index e3a7a3da..71ea0d18 100644
---- a/lib/Crypto/SelfTest/Cipher/test_GCM.py
-+++ b/lib/Crypto/SelfTest/Cipher/test_GCM.py
-@@ -828,6 +828,7 @@ class TestVectorsWycheproof(unittest.TestCase):
-         unittest.TestCase.__init__(self)
-         self._wycheproof_warnings = wycheproof_warnings
-         self._extra_params = extra_params
-+        self._id = "None"
- 
-     def setUp(self):
-         comps = "Crypto.SelfTest.Cipher.test_vectors.wycheproof".split(".")
-diff --git a/lib/Crypto/SelfTest/Cipher/test_SIV.py b/lib/Crypto/SelfTest/Cipher/test_SIV.py
-index 38341e14..ab588adc 100644
---- a/lib/Crypto/SelfTest/Cipher/test_SIV.py
-+++ b/lib/Crypto/SelfTest/Cipher/test_SIV.py
-@@ -456,6 +456,7 @@ class TestVectorsWycheproof(unittest.TestCase):
- 
-     def __init__(self):
-         unittest.TestCase.__init__(self)
-+        self._id = "None"
- 
-     def setUp(self):
-         comps = "Crypto.SelfTest.Cipher.test_vectors.wycheproof".split(".")
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.4.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.4.ebuild
deleted file mode 100644
index 9f5c1a64a108..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.9.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-libs/gmp:0
-	virtual/python-cffi[${PYTHON_USEDEP}]
-	!dev-python/pycrypto"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/pycryptodome-3.9.4-parallel-make.patch"
-	# https://github.com/Legrandin/pycryptodome/pull/351
-	"${FILESDIR}/pycryptodome-3.9.4-tests.patch"
-)
-
-python_prepare_all() {
-	# parallel make fixes
-	#  Multiple targets were compiling the same file, setuptools doesn't
-	#  understand this and you get race conditions where a file gets
-	#  overwritten while it's linking. This makes the files look like separate
-	#  files so this race won't happen
-	ln src/blowfish.c src/blowfish_eks.c || die
-	ln src/mont.c src/mont_math.c || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test -vv
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild
deleted file mode 100644
index bf92dd941db7..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-libs/gmp:0
-	virtual/python-cffi[${PYTHON_USEDEP}]
-	!dev-python/pycrypto"
-BDEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/pycryptodome-3.9.4-parallel-make.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	# parallel make fixes
-	#  Multiple targets were compiling the same file, setuptools doesn't
-	#  understand this and you get race conditions where a file gets
-	#  overwritten while it's linking. This makes the files look like separate
-	#  files so this race won't happen
-	ln src/blowfish.c src/blowfish_eks.c || die
-	ln src/mont.c src/mont_math.c || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.8.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.8.ebuild
index 43e92f7ffb38..fc32975c8f9e 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.8.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-libs/gmp:0