gentoo (valentine's day) resync : 14.02.2021

5 files changed, 87 insertions, 7 deletions

diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 15c714d70630..04e087b5704c 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,6 +1,9 @@
+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.9.9-r1.ebuild 1419 BLAKE2B 0f0e2745afb6501e7503e27982be506b3c30bfaf38f996cb4fa80e5f07ef1806e1ce506523fc5020bbf9c05b310269f64df68e8eabc1f4dce6d4a9b929f9670e SHA512 6c5173e508033c2bfefeb2674835e2d28160dc9f904e2fc6b1b8a82b02879dd4657e018cb9ee509c1ab88af9b5ad79dcb09fd5a6afb2e6d44963b290c287fcbd
-EBUILD pycryptodome-3.9.9.ebuild 1356 BLAKE2B b47da86db6cef195289c9ae70388e6f724c3864db1d214f69ce9c0b6ced1f6671fe3703f8c28f131697db1f95ba84c8f8afdc73c6d23b50ec2b3aa7ed998cd36 SHA512 25eae1c87c60e0361bec6bf8f81a7a725d8c67b7d38fcce418ad282ad361e6bf909be0956f3bb0f3d544af04bbdeadc60202be3a29664da3696f1fae1302e94b
+EBUILD pycryptodome-3.10.1.ebuild 1427 BLAKE2B 16c7bcbfebe68bde9a7763132e8ea7ac770e3675d7b80f135620b02ae90adb99494e99b2db6850eb16ac6bc02048cb72a02d95174036a109dab6b844f62a57a4 SHA512 02a0cb06bd6e1596029ea0673b4a4902369e2e9fe838aede9cb9f70254ba5eaeb14a09c30dcbb7639f56c9dd77864e5c77a130e0019da9138fc2d2a26f113b9a
+EBUILD pycryptodome-3.9.9-r1.ebuild 1418 BLAKE2B c5600edbcee40731b005b54b3a87325b7b1f9cc52a0ed1a1c2437f47904e42a2d8054e708737a4b579b520ffa3b51647010cb9d1a48ffaf2a32f744865864b94 SHA512 83d98d4e857553f45082bd28c2d80ad0921910097892c7aa34d8b4536db007684c5714820b7fc7458bf387b949646526aa9528a81b6849e9392999b72857bae0
 MISC metadata.xml 385 BLAKE2B 8ee308521948e0f6bbc9c70e25c231a02424c9d4bdbf2c6ddda10767d4bf77bbda74607f4dce97ff42bfe6fef8a5ac2ee25e0b91bbc491e977c5cc46b3486699 SHA512 073885df3e0742b6088a537d54bfe9fcfb646ed9a5d3d19940d02fb05d453601b71db583567a4810a8d739c935488291624bc06948c4cb21b28a5500fbea4e97
diff --git a/dev-python/pycryptodome/files/pycryptodome-3.10.1-parallel-make.patch b/dev-python/pycryptodome/files/pycryptodome-3.10.1-parallel-make.patch
new file mode 100644
index 000000000000..3b8f503bb290
--- /dev/null
+++ b/dev-python/pycryptodome/files/pycryptodome-3.10.1-parallel-make.patch
@@ -0,0 +1,22 @@
+diff -dupr a/setup.py b/setup.py
+--- a/setup.py	2021-02-09 13:46:16.138626317 +0100
++++ b/setup.py	2021-02-09 13:46:51.116065599 +0100
+@@ -360,7 +360,7 @@ ext_modules = [
+     Extension("Crypto.Cipher._raw_eksblowfish",
+         include_dirs=['src/'],
+         define_macros=[('EKS',None),],
+-        sources=["src/blowfish.c"],
++        sources=["src/blowfish_eks.c"],
+         py_limited_api=True),
+     Extension("Crypto.Cipher._raw_cast",
+         include_dirs=['src/'],
+@@ -442,7 +442,8 @@ 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'],
+         py_limited_api=True,
+         ),
+ ]
diff --git a/dev-python/pycryptodome/files/pycryptodome-3.10.1-system-libtomcrypt.patch b/dev-python/pycryptodome/files/pycryptodome-3.10.1-system-libtomcrypt.patch
new file mode 100644
index 000000000000..51a5766c15f3
--- /dev/null
+++ b/dev-python/pycryptodome/files/pycryptodome-3.10.1-system-libtomcrypt.patch
@@ -0,0 +1,50 @@
+diff -dupr a/setup.py b/setup.py
+--- a/setup.py	2021-02-09 13:49:46.356455141 +0100
++++ b/setup.py	2021-02-09 13:50:49.351076275 +0100
+@@ -367,13 +367,15 @@ ext_modules = [
+         sources=["src/CAST.c"],
+         py_limited_api=True),
+     Extension("Crypto.Cipher._raw_des",
+-        include_dirs=['src/', 'src/libtom/'],
++        include_dirs=['src/'],
+         sources=["src/DES.c"],
+-        py_limited_api=True),
++        py_limited_api=True,
++        extra_link_args=["-ltomcrypt"]),
+     Extension("Crypto.Cipher._raw_des3",
+-        include_dirs=['src/', 'src/libtom/'],
++        include_dirs=['src/'],
+         sources=["src/DES3.c"],
+-        py_limited_api=True),
++        py_limited_api=True,
++        extra_link_args=["-ltomcrypt"]),
+     Extension("Crypto.Util._cpuid_c",
+         include_dirs=['src/'],
+         sources=['src/cpuid.c'],
+@@ -410,9 +412,10 @@ ext_modules = [
+         sources=["src/ARC4.c"],
+         py_limited_api=True),
+     Extension("Crypto.Cipher._Salsa20",
+-        include_dirs=['src/', 'src/libtom/'],
++        include_dirs=['src/'],
+         sources=["src/Salsa20.c"],
+-        py_limited_api=True),
++        py_limited_api=True,
++        extra_link_args=["-ltomcrypt"]),
+     Extension("Crypto.Cipher._chacha20",
+         include_dirs=['src/'],
+         sources=["src/chacha20.c"],
+Only in b: setup.py.orig
+Only in b: setup.py.rej
+diff -dupr a/src/DES.c b/src/DES.c
+--- a/src/DES.c	2021-02-09 13:49:46.336454729 +0100
++++ b/src/DES.c	2021-02-09 13:50:02.640123617 +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.9.9.ebuild b/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
index 856c0d07745c..2e000e816eea 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://www.pycryptodome.org
+HOMEPAGE="https://www.pycryptodome.org/
 	https://github.com/Legrandin/pycryptodome/
 	https://pypi.org/project/pycryptodome/"
 SRC_URI="
@@ -18,11 +18,12 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 IUSE=""
 
 DEPEND="
-	dev-libs/gmp:0"
+	dev-libs/gmp:0=
+	>=dev-libs/libtomcrypt-1.18.2-r1:="
 BDEPEND="
 	virtual/python-cffi[${PYTHON_USEDEP}]"
 RDEPEND="
@@ -31,7 +32,8 @@ RDEPEND="
 	!dev-python/pycrypto"
 
 PATCHES=(
-	"${FILESDIR}/pycryptodome-3.9.4-parallel-make.patch"
+	"${FILESDIR}/pycryptodome-3.10.1-parallel-make.patch"
+	"${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
 )
 
 distutils_enable_tests setup.py
@@ -45,5 +47,8 @@ python_prepare_all() {
 	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
 }
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
index d1263ce62f5d..50c3a515eb5d 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE=""
 
 DEPEND="