gentoo resync : 28.04.2021

5 files changed, 2 insertions, 125 deletions

diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 9257bfa1fbbb..ef9a8c131c4b 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,9 +1,5 @@
 AUX pycryptodome-3.10.1-parallel-make.patch 837 BLAKE2B 9d7b3088d547d294dab498dbdcdef7f5eeec0ef8c264fd62a49e2e64a9adfc785f8becae91a6f889184e53af04aabe638d503f523daa62edaa3bf91596a268bd SHA512 2b2f310a3ab332f9d1c2f7742fdd902cfbecf49360df3412839cb67bf69e8eb1f9e051461d4264ff7d732d1bbad285b5a635aea085945d543c2b58e880f0b807
 AUX pycryptodome-3.10.1-system-libtomcrypt.patch 1729 BLAKE2B 57a2022ef17e0b86e98b085336f5ce815304e326a5a2bd5cc8ff5d33b6efba440505767517b79c2f0bba39ab33f04d7434a3f0ee529b880ff7552aee2805dab5 SHA512 d53677c0ad96f161f9aed14b8f353a8cc12c92f31de9733789f9c4151710376d33e974fd611b763de94c631796d7a57cd8787656e3c1e985696e20537b34760e
-AUX pycryptodome-3.9.4-parallel-make.patch 756 BLAKE2B 06a79eff056ecb983131838287563d4d60896f27e28d5c2534f4ab008e50017694ac9355b43f8f387cc29abfd21ffd648233c3dbae33a06fcedb12a6c7e11e80 SHA512 06b42ea780bd374cf5cb5d6cef3fade5d695c1ee0d765e2659408da7645ad311eef2028f17d8ec0289d49c3a5851b4c63503d7c922de15873dbbf16d0db58b08
-AUX pycryptodome-3.9.9-system-libtomcrypt.patch 1538 BLAKE2B 7928e5a3c2edee7f58d7b7f5876416d3b397e29cfb63e063f904f7a1deb46300113d165aaeddc57e5e0e0b4b1f0ab548fb9151e1d43f16483491948c2d722d2f SHA512 74b0ec6e521e0d51c3e777a8cb6f374e2e3853e163cbe66e50a16b9eb72b004386cb6296a0f3950ccac9a3fece26221c0363e4b05df4608a6c5e7cf408fce6c8
 DIST pycryptodome-3.10.1.tar.gz 15545471 BLAKE2B ef1922efd0b6bef6beaee76fe03a4201a6f1cf2a203abcb12b96a5ea7c8de59a34ac704fe7508a3728a214efc0755f289d66dc14a0adb3f2eac882bc8db691bf SHA512 4c7e7e989d5363064e7e184f6b00a174045e03916cdf1199626afd7fe75eb5efcd13888ecdee607b974e96faad465694b384eb6d91edb8de1d0277ad71888c52
-DIST pycryptodome-3.9.9.tar.gz 15551299 BLAKE2B ac89bcc2bbe707cb2a9cf2496a2eb74ff5685f11017d60d67558de7ac6cad5c24c43b4074bff01e99378d7c88462e88e88f363c5329fb800e1a7872ad8a34dab SHA512 a1aad4d52256220fe3d5d7f399c2c5e7338d6eb88058da0571fe1c686d74d33ff4bc1c275d4b9373e0ff22f4ddcded75a25387e76fc65047f8612f8856c1bd4d
-EBUILD pycryptodome-3.10.1.ebuild 1433 BLAKE2B e4a5484f0fc13a4013cb6305449094579b5dec2689131b8664d5c8450c717cb229f8d83168c62e6aa7d563b130936ce3e6e365f03dae94344fe4dc8dfc9a4937 SHA512 c6e9bf504176bb74fa557df34d631e2950c3ef2d323f544fd95a54c0748df683e0c24e359e6a57a745f356d60a2343e940de22abfd7482d78156ae6c85a157db
-EBUILD pycryptodome-3.9.9-r1.ebuild 1418 BLAKE2B c5600edbcee40731b005b54b3a87325b7b1f9cc52a0ed1a1c2437f47904e42a2d8054e708737a4b579b520ffa3b51647010cb9d1a48ffaf2a32f744865864b94 SHA512 83d98d4e857553f45082bd28c2d80ad0921910097892c7aa34d8b4536db007684c5714820b7fc7458bf387b949646526aa9528a81b6849e9392999b72857bae0
+EBUILD pycryptodome-3.10.1.ebuild 1432 BLAKE2B 1f1fe62790c14041b655564eb295ebc0d1e7eaa3b3fc24cdc7e8de3a01608782af8de4a366e56ac75fa8dc4c1d12f2b1c4c668e3b3a70fdc9c427d1831a4e018 SHA512 9bb2793baf768211777bccd7ba4b68f11269aaad979cea0f5fe7d88f4236dc0710fd29ca2326fdc2f261c6dfd3d064fdfabf6d539645b63dfef69af3b0165cc2
 MISC metadata.xml 385 BLAKE2B 8ee308521948e0f6bbc9c70e25c231a02424c9d4bdbf2c6ddda10767d4bf77bbda74607f4dce97ff42bfe6fef8a5ac2ee25e0b91bbc491e977c5cc46b3486699 SHA512 073885df3e0742b6088a537d54bfe9fcfb646ed9a5d3d19940d02fb05d453601b71db583567a4810a8d739c935488291624bc06948c4cb21b28a5500fbea4e97
diff --git a/dev-python/pycryptodome/files/pycryptodome-3.9.4-parallel-make.patch b/dev-python/pycryptodome/files/pycryptodome-3.9.4-parallel-make.patch
deleted file mode 100644
index 331333533f10..000000000000
--- a/dev-python/pycryptodome/files/pycryptodome-3.9.4-parallel-make.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 1d70caad..c72f64ff 100644
---- a/setup.py
-+++ b/setup.py
-@@ -364,7 +364,7 @@ ext_modules = [
-     Extension("Crypto.Cipher._raw_eksblowfish",
-         include_dirs=['src/'],
-         define_macros=[('EKS',None),],
--        sources=["src/blowfish.c"]),
-+        sources=["src/blowfish_eks.c"]),
-     Extension("Crypto.Cipher._raw_cast",
-         include_dirs=['src/'],
-         sources=["src/CAST.c"]),
-@@ -427,7 +427,7 @@ ext_modules = [
-     # Math
-     Extension("Crypto.Math._modexp",
-         include_dirs=['src/'],
--        sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c', 'src/mont.c'],
-+        sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c', 'src/mont_math.c'],
-         ),
- ]
- 
diff --git a/dev-python/pycryptodome/files/pycryptodome-3.9.9-system-libtomcrypt.patch b/dev-python/pycryptodome/files/pycryptodome-3.9.9-system-libtomcrypt.patch
deleted file mode 100644
index 927ad65e7c47..000000000000
--- a/dev-python/pycryptodome/files/pycryptodome-3.9.9-system-libtomcrypt.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/setup.py	2019-01-19 22:52:55.000000000 +0100
-+++ b/setup.py	2019-02-15 15:29:46.960976879 +0100
-@@ -367,11 +367,13 @@ ext_modules = [
-         include_dirs=['src/'],
-         sources=["src/CAST.c"]),
-     Extension("Crypto.Cipher._raw_des",
--        include_dirs=['src/', 'src/libtom/'],
--        sources=["src/DES.c"]),
-+        include_dirs=['src/'],
-+        sources=["src/DES.c"],
-+        extra_link_args=["-ltomcrypt"]),
-     Extension("Crypto.Cipher._raw_des3",
--        include_dirs=['src/', 'src/libtom/'],
--        sources=["src/DES3.c"]),
-+        include_dirs=['src/'],
-+        sources=["src/DES3.c"],
-+        extra_link_args=["-ltomcrypt"]),
-     Extension("Crypto.Util._cpuid_c",
-         include_dirs=['src/'],
-         sources=['src/cpuid.c']),
-@@ -400,8 +402,9 @@ ext_modules = [
-         include_dirs=['src/'],
-         sources=["src/ARC4.c"]),
-     Extension("Crypto.Cipher._Salsa20",
--        include_dirs=['src/', 'src/libtom/'],
--        sources=["src/Salsa20.c"]),
-+        include_dirs=['src/'],
-+        sources=["src/Salsa20.c"],
-+        extra_link_args=["-ltomcrypt"]),
-     Extension("Crypto.Cipher._chacha20",
-         include_dirs=['src/'],
-         sources=["src/chacha20.c"]),
---- a/src/DES.c	2019-01-19 22:52:55.000000000 +0100
-+++ b/src/DES.c	2019-02-15 15:30:27.014967034 +0100
-@@ -39,7 +39,7 @@ FAKE_INIT(raw_des3)
- 
- /* Include the actial DES implementation */
- #define LTC_NO_PROTOTYPES
--#include "libtom/tomcrypt_des.c"
-+#include <tomcrypt.h>
- 
- struct block_state {
-     symmetric_key sk;
diff --git a/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild b/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
index 8d748b40bf9a..ac8b405e215f 100644
--- a/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
deleted file mode 100644
index 50c3a515eb5d..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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="
-	https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-IUSE=""
-
-DEPEND="
-	dev-libs/gmp:0=
-	>=dev-libs/libtomcrypt-1.18.2-r1:="
-BDEPEND="
-	virtual/python-cffi[${PYTHON_USEDEP}]"
-RDEPEND="
-	${DEPEND}
-	${BDEPEND}
-	!dev-python/pycrypto"
-
-PATCHES=(
-	"${FILESDIR}/pycryptodome-3.9.4-parallel-make.patch"
-	"${FILESDIR}/pycryptodome-3.9.9-system-libtomcrypt.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
-
-	# make sure we're unbundling it correctly
-	rm -r src/libtom || die
-
-	distutils-r1_python_prepare_all
-}