gentoo resync : 25.11.2020

3 files changed, 45 insertions, 55 deletions

diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index ae7be95fce36..4d8bd41b8d99 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,7 +1,7 @@
-DIST cryptography-3.0.tar.gz 534725 BLAKE2B f6f4d5cfcf42a9ca2288bdc7c61bd0ae2f98999868951798f358d6ec9dbbcddb31102b0954f983bb9c118df53a8483e74aa2395ce366a9a97b6b9164b0044bd2 SHA512 4fca5d0e59f02f23c7e2d5c80f86e4cf36eeeb9a128e7b3332a91aa0b9dcdd3282a882a88ea34ffba1e91687eb6d1fc1042774f1e30970e9bf56ee701c32ac15
-DIST cryptography-3.1.tar.gz 534747 BLAKE2B 3225625a69ef3279ae7f763e04b884c0d46a0524624685bba1836e8076d13a7a360ed75f69e62427e191eff86fd9882bd09a5352492ea8bd558842ca67bf3b70 SHA512 c015df3a71e4c274b2fb8fd954d264c8b56443644048139113f548c69cf83798b73c9f0993609f338044df92b609723b0281ce61ed2751309a122de22060037e
-DIST cryptography_vectors-3.0.tar.gz 35156155 BLAKE2B 987fa88873bb3ec9745a150906e868c1aea14bb9e618c5c65348deb4e8618f89b15a8d70ea6ed0760649505f5649dd2fbf1e40fadad193faf3a92922ed234025 SHA512 a24c6f25c0acf79cea534fc86d61d9697c004a18204043457cf1a955751e8313893c63258f82ada523a9608b7ec0e5a7a7047ddcbd20e0c55d7c6392bc61c24f
-DIST cryptography_vectors-3.1.tar.gz 35163687 BLAKE2B c381781950bf5399c15fe329fc28cf35933936a2130bbf18909f31f1bbd764a69a8816327e968d3810790b8404e3ae5af25b3d390da3015533f5c52f8a0cd0cf SHA512 094076a26ba4cae1bf0408844abbb9b3a5634f97657e4627e10b8a7c7424b69574fd9d719d5c258aa02244bee8b395f09c51af79350971072b2f9719446743c1
-EBUILD cryptography-3.0-r1.ebuild 1950 BLAKE2B 9cdf47c2649c22a137c52c6d06a6698b48b481e9bc3a002c2bec5aa14cc3f28291304fe8ca092bd949363c492077e0d8280ce508a54d4b04c023014051bfa28d SHA512 a80a21904955eec6d898ab1dcfdf3d1643507c639d4d632dfa0537e141c19ab9d9ef498adac896d70121b323f6796b3e1c831b623d033bdc0d4b20a799f4f4bd
-EBUILD cryptography-3.1-r1.ebuild 1854 BLAKE2B 1e79b4dc78d997096323c15f778a503ee206c91472c24d39360497d0e3a32931284a2f9fad2fd7a8779a8cf5e2d1e9b3dd3d0b07adaa46655fce7901942b6bfb SHA512 6450a55b3ecd7d8af3de586f8a5b69e676a1870b1ac14dbab4835f8c3c4297d5ed2b8258a1e3fc3c38e6fb7d021a3bbd112a7feab4709af0c7feeaa5dff384aa
+DIST cryptography-3.2.1.tar.gz 540994 BLAKE2B 667f09ac81423ecdc84c8646f0d02ee3a2955f55d35623e59c07696810a93c47332f7f8d877918eeeb6581d8e02bde3b70aae8e9d32be7ffbc8011e5e7e382a9 SHA512 e3f1806693c24aadc3ef0df374ce1845760e87ad7c243226b75e80820b50bdc0760e4bb5f6ce26d62a6d23736b3109f72cd30b52ae2a36b26ec5656ec96c6175
+DIST cryptography-3.2.tar.gz 540815 BLAKE2B be4edd5d4cd9564e8622284ff9b1d3a7cc7d6e46cfa790d8e1cfa1ce389c5d628e39b056dc5cba3b94ab3fa45603df73a7b4ebd9d1c70fc88c457780f6616311 SHA512 0096e6408b5868cc0b5e6f67945e4200bb943a00ac803546048fa4d332f81af4a224b2d67b911ee8da1ad086120935d7d557fc70a739ecffb22f408ee9b8d09e
+DIST cryptography_vectors-3.2.1.tar.gz 35168164 BLAKE2B 77af3be0dbd7393da7cd59600086041b78fe20339018a637fc1cf3600c7cd08cf2e565c79ccb47f4719a4b0f01cf2ab2db00c025805443b333dd7fdf3aa835a7 SHA512 44ff756a6ece9700f7657f8ba92417e95bf273cf500f1dab2141de5b2af6e61840d65c37b766abd752c76025ead1550bfc7b7340ce5774c75fd0bb8ac768cdd8
+DIST cryptography_vectors-3.2.tar.gz 35168065 BLAKE2B ebd915eee9b91bd61445bcb442d3052972b1463132b8e63343832baa27c25566e22ca9f50c9d4ea73cb12185f9228144eaac4bf5cc68a3bd79f347fe2d021adc SHA512 bb0d00c8a66fd328ef38b0008519856a14d35b6fd634a6f67ea5530775d36538fbd326326c3f0cd962b1a008c21f2aded4d733f97bc12577679ed8be67b858bc
+EBUILD cryptography-3.2.1.ebuild 1605 BLAKE2B 9d22469b0be63f6c0b3d613be76f595132ca1580f7d96ac66586b690cf1eba2e7e1c9b415aa0ccb279156b31657ab34992d05ae4d2dbeefde98e104b4c161084 SHA512 b339960a16d44f5a3c38107d88976490a2d124bcd6073ba4b1486c3e354fa77386b05f7b212df35aedeb5461354e34b500ee8fd9cc908adeffedbe316c9a02b6
+EBUILD cryptography-3.2.ebuild 1597 BLAKE2B ce9b411af9b2e2fcad65d7f017e8b36cbb6a032451fd8c75b036af869ef1342d5fd3bf7b36faf16a4070dc2f5a3177212322c6ef32111785db4bb8103f39b8b3 SHA512 37ede133d250d4c7eb0d0044a3943d2a963f9ed2b173bb2e4bafec10f88e8dd0ef20086628fdd526af90128d08888a035876e83464686b125d0282f2ebf549bf
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-3.1-r1.ebuild b/dev-python/cryptography/cryptography-3.2.1.ebuild
index 8f9c9970f027..c0d4715e4df5 100644
--- a/dev-python/cryptography/cryptography-3.1-r1.ebuild
+++ b/dev-python/cryptography/cryptography-3.2.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6..9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
-inherit distutils-r1 flag-o-matic
+inherit distutils-r1 multiprocessing
 
 VEC_P=cryptography_vectors-${PV}
 DESCRIPTION="Library providing cryptographic recipes and primitives"
@@ -17,40 +17,37 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="libressl idna test"
-RESTRICT="!test? ( test )"
-
-# the openssl 1.0.2l-r1 needs to be updated again :(
-# It'd theb be able to go into the || section again
-#=dev-libs/openssl-1.0.2l-r1:0
-# the following is the original section, disallowing bindist entirely
-#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
+IUSE="libressl idna"
+
 RDEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2o-r6:0= )
-	libressl? ( >=dev-libs/libressl-2.9.1:0= )
-	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
 	$(python_gen_cond_dep '
 		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
 	' 'python*')
 	"
-BDEPEND="${RDEPEND}
+BDEPEND="
 	test? (
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
 		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 	)"
 
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+distutils_enable_tests pytest
 
-python_configure_all() {
-	append-cflags $(test-flags-CC -pthread)
-}
+DEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2o-r6:0= )
+	libressl? ( >=dev-libs/libressl-2.9.1:0= )
+	"
+RDEPEND+=${DEPEND}
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
 
 python_test() {
 	local -x PYTHONPATH=${PYTHONPATH}:${WORKDIR}/${VEC_P}
-	pytest -vv || die "Tests fail with ${EPYTHON}"
+	pytest -vv -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/cryptography/cryptography-3.0-r1.ebuild b/dev-python/cryptography/cryptography-3.2.ebuild
index 5804dfbf3b32..7cb84939e65f 100644
--- a/dev-python/cryptography/cryptography-3.0-r1.ebuild
+++ b/dev-python/cryptography/cryptography-3.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6..9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
-inherit distutils-r1 flag-o-matic
+inherit distutils-r1 multiprocessing
 
 VEC_P=cryptography_vectors-${PV}
 DESCRIPTION="Library providing cryptographic recipes and primitives"
@@ -16,45 +16,38 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="libressl idna test"
-RESTRICT="!test? ( test )"
-
-# the openssl 1.0.2l-r1 needs to be updated again :(
-# It'd theb be able to go into the || section again
-#=dev-libs/openssl-1.0.2l-r1:0
-# the following is the original section, disallowing bindist entirely
-#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="libressl idna"
+
 RDEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2o-r6:0= )
-	libressl? ( >=dev-libs/libressl-2.9.1:0= )
-	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/enum34[${PYTHON_USEDEP}]
-		dev-python/ipaddress[${PYTHON_USEDEP}]
-	' -2)
+	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
 	$(python_gen_cond_dep '
 		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
 	' 'python*')
 	"
-BDEPEND="${RDEPEND}
+BDEPEND="
 	test? (
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
 		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 	)"
 
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+distutils_enable_tests pytest
 
-python_configure_all() {
-	append-cflags $(test-flags-CC -pthread)
-}
+DEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2o-r6:0= )
+	libressl? ( >=dev-libs/libressl-2.9.1:0= )
+	"
+RDEPEND+=${DEPEND}
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
 
 python_test() {
 	local -x PYTHONPATH=${PYTHONPATH}:${WORKDIR}/${VEC_P}
-	pytest -vv || die "Tests fail with ${EPYTHON}"
+	pytest -vv -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
 }