gentoo Easter resync : 12.04.2020

7 files changed, 24 insertions, 99 deletions

diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index a753ab2e4c08..daef5f77a198 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,15 +1,9 @@
 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.4.6.tar.gz 6968560 BLAKE2B f066199a9d05bd046303be62c43835908c90a4545caf7681d2c13db78ce345858b8565daa26ccd4a328eb944de469b943cdd0bb3f58591de4e2a09e130f7381f SHA512 40c9ea4cf7fca06bd7cd3a100e1d602e0130fbdcc75544ff1353ced2fae8925d29286200561832f2524a0f3db155a6924bb653d964408d4486aab694bf275cdc
-DIST pycryptodome-3.4.7.tar.gz 6483140 BLAKE2B 02368e2af0a12686cf2e635cca8e2c279f7c3b147a66f99e97cf04d829aa66eca5629f7cc8e76420970a4fa5ca5f97e7d2a04438b3a2ac5feb980fa96998b3ff SHA512 a328df1f3b2cfeccbb5984aca4c5cbd59e8a352c817e82411d2876b2494476027f63e61200b0cc87e9420e8b47e91fffe71865fb2c23a66da0276814641eaab0
 DIST pycryptodome-3.6.6.tar.gz 7137656 BLAKE2B 72a3dffa22ca4a90a6515ce0bb6939d4c11aab31793ca330523feb08f6529cbfdf3dee01b1caa4577caed1818c0227961e7f25d855b2dcfb09757beb3e0790b4 SHA512 ce03d9940c23ce59e19bcd795c300dbddeddd49756a4bfcc6933da66dfb8b7bedb8d6eaa2b01727c53e72c8e84dfcab2961d1580a188afa9c9451bd2099bdc61
-DIST pycryptodome-3.7.3.tar.gz 9285823 BLAKE2B 6f215a3bb0337f5b7469d92bd2d5b5a19ab4e2c6a8f119411c3a5bcdcf93307752d99113866268b5066cceda6470bd0fbe81b1b2f9e30b5e5e569c77ede087f3 SHA512 b5e09c08cd252cad4d76249be84ce29e16a9bba4f2c5e81594c24d9a39df0f3fc67822698497eb9daa4cb6a43311c5d5a2543f187a5d5f801288596c2941f08f
-DIST pycryptodome-3.8.2.tar.gz 12441359 BLAKE2B 857b77ce23bafe8a296d6fc2402914491818b51142d2a08aa882a0d4e15899bc2b18a6b69ffa904cad406fb3ce8bf029404ea178532cd4580ce118ec03311cd2 SHA512 361909d479b3478b72f2723f2c94cafd4e9d50c2d4156535d217f0566c534dc27435f64e9ba0cdb8215c2c3d3800ad1e0befde95d9999eed481f33f9ed2ba318
 DIST pycryptodome-3.9.4.tar.gz 11575825 BLAKE2B c153fe71179d633a5722480c4c42cc133100f524a8ba9d3cd9380b7e172564c276b70b97ef36437fa3a149c418903802f410c9d1807d5d72345dffb0aa568223 SHA512 d99e4e431d77856ce3ae33526984cadf2fa6aa82b1f692a2ad0ae893f6a1e9538e6d71d281578e6bd733a816664d1683364c64441196cbc6ee1278f9d6eac62c
-EBUILD pycryptodome-3.4.6.ebuild 801 BLAKE2B 18061cb2cebae82ccd6c695e424d891a46a833abd856473f63e0242531a04a11de20593c44ecd1d13e3021ab315087bb114eaf8db79bf414fdbc9a7eeae7e39e SHA512 28e15901398dcbbf61e669b22c46ef21e544fbb4f46984603d9c1a447f113de6f97440f7b2ee26bd43eabbc266ec5bbe6337793fffd42dcf77cfe01008cc82bd
-EBUILD pycryptodome-3.4.7.ebuild 851 BLAKE2B 05e1584574c422538e6c2832643c93ac8854a2267f9f317147c66dbce677d916fb04a74808136bc64ac332ed562736c6182b23e9c07eb2c663fdba468498ad98 SHA512 84276c577e41325b6ff729a48a2fc8761858c7e34e4816810751904468618aab09727d5ed347862b025739fd97557b8a35e66b111e925d7145dca33e4400595b
-EBUILD pycryptodome-3.6.6.ebuild 887 BLAKE2B a4fafd6dc29ff362d17f2b8de387c33ec5ab3e8ebc327576392a1479843a0707ec3eccfde5cd36d9b2a58dda644c11e8cc546688345101538563989a997ce43f SHA512 f033bc0df6da56b8271fc642854945865d777bad1c40c5e50684d40d556a2b17180e930837286145e6d6388ac79a007639a827f9614175637920124bff82a1ec
-EBUILD pycryptodome-3.7.3.ebuild 896 BLAKE2B 006cbd8af847db6f283315b8c1a7c89837ab5db28dcbd0ee388916204d1a92ae2e32ed5c067f8b6748be98188e4c634527b4831e4d9becc82a3a3d1e9b4959d7 SHA512 57fc674100fe0c569c326125fc5cc53a3119d13d95e9cfbe110590b68a0c0c46b907745e24ae5b7d97e8d9be914c5d742262e11e1597869b543743d6584866b5
-EBUILD pycryptodome-3.8.2.ebuild 896 BLAKE2B 006cbd8af847db6f283315b8c1a7c89837ab5db28dcbd0ee388916204d1a92ae2e32ed5c067f8b6748be98188e4c634527b4831e4d9becc82a3a3d1e9b4959d7 SHA512 57fc674100fe0c569c326125fc5cc53a3119d13d95e9cfbe110590b68a0c0c46b907745e24ae5b7d97e8d9be914c5d742262e11e1597869b543743d6584866b5
-EBUILD pycryptodome-3.9.4.ebuild 1484 BLAKE2B e0923a3a310baa4b5ea404ddd9aaa62bafe5f408f5d96adf491d113ab2a4c427650d0c3cc8e7f2b13c26bd75c176752e83e25f7e0bb77b2d0e5aa2c8d1e1f17c SHA512 4e6fef644d0cba7c57998de5e3e780d460bc0f269aa726e24d3864d5f5d90961ae0267856d1d9fdc621da0529054b6bf1a7a153db1ea047f888c90d9b832c5a6
+DIST pycryptodome-3.9.7.tar.gz 15451558 BLAKE2B dca2cf3500d4011b8c37937c3f844db3e8e4afbec2c421552bcdc08df32ae46d8a2dadfaa2d48aac2356374f30154d439cb9e988e1035c570b0adebc58b259e1 SHA512 2ee8ec1094ca2b3813c25b96c71988db479b23ea2e76937275d0fd6421653efd1ce7a1e279c7a20a9de7edcb59e0927121a42112b85afc052edcd6ab2db74c26
+EBUILD pycryptodome-3.6.6.ebuild 888 BLAKE2B 80c1c4f472202b9c393b7d2b83a4587f0aa054700b05031cde561ccc2b9a6a152b11a161b317547e879c368ca5bebd0b24c11b8429eec63795f2b4189b09e213 SHA512 bde79ad2bf9e0a38ec34c950d1e624fda16919f723a277f189c5300a7942458e0e53ffd7ad9f841585a2c9d66510eb7f769d42dcda9790dac022e828ab65e579
+EBUILD pycryptodome-3.9.4.ebuild 1476 BLAKE2B 9cab4ddf6853756aa114c6ced6037c135320169548c7605e33c2adfb865bed5d72b8e81345dcfde5817922d037001b98fb181c011c9d2e011f3e6f6e153aaad3 SHA512 a7bf5e4dfd64cb10a5dfebd1695d015c56fcb602f6a5a8ce80ba43f036e4f0df02d8c871fb7766e77dd844c223e734a973cdb8bd5b7c5a35c7d68264188c2f8c
+EBUILD pycryptodome-3.9.7.ebuild 1337 BLAKE2B f533eb82a00810ae5d221ad558da936a66c0d2bd8572c89725512c250d895334ce6a6c977259a409cbadf8cc1dd4615deb2b3dfa82ffade8d80d2b203467bb06 SHA512 54fd6d53ee1e82b09f7fdac0f217f5d70996f51437ab96c2c926a621a2761c93e4b6f881bd83af8c96cac1ad68b9decfd2876ccc748f7763a69576ad426fcfdc
 MISC metadata.xml 335 BLAKE2B 7e5036b03371769db2f3a8d0cb5d5cd9078f16d4dccc3bd012f0d4f96ba960388c3025df93bb165f3cdbe05d73da05537a373e01b799aac2dc59dcd44e6206b5 SHA512 a94a7c0c45ae597e5c4ac672a5e9151851448371ddae0fdbd9967651476681440f2d4a6071e2cd0c4a1553038a92f4e6649f0554b636d58a025366c57c80e899
diff --git a/dev-python/pycryptodome/pycryptodome-3.4.6.ebuild b/dev-python/pycryptodome/pycryptodome-3.4.6.ebuild
deleted file mode 100644
index ca2e4bbe3e95..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.4.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://github.com/Legrandin/pycryptodome"
-SRC_URI="https://github.com/Legrandin/${PN}/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 ~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"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild b/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
deleted file mode 100644
index 0f37040bf1c4..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 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"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild b/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild
index 9c71ef6c6c22..d5246d8597c5 100644
--- a/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.6.6.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
diff --git a/dev-python/pycryptodome/pycryptodome-3.8.2.ebuild b/dev-python/pycryptodome/pycryptodome-3.8.2.ebuild
deleted file mode 100644
index e07797edc91d..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.8.2.ebuild
+++ /dev/null
@@ -1,28 +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} 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"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.4.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.4.ebuild
index e572e00ff8a9..9f5c1a64a108 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.4.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.4.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
diff --git a/dev-python/pycryptodome/pycryptodome-3.7.3.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild
index e07797edc91d..0a10fb48bb86 100644
--- a/dev-python/pycryptodome/pycryptodome-3.7.3.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -20,9 +20,22 @@ IUSE=""
 RDEPEND="dev-libs/gmp:0
 	virtual/python-cffi[${PYTHON_USEDEP}]
 	!dev-python/pycrypto"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
 
-python_test() {
-	esetup.py test
+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
 }