gentoo resync : 09.07.2022

3 files changed, 138 insertions, 2 deletions

diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 667c92af10b0..85a3b905d109 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -11,9 +11,11 @@ DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5
 DIST cryptography-3.4.7.tar.gz 546893 BLAKE2B 49bc1e098ed1ba0181059b645f6668cda6332d196eaca55270ebce6e07e5bb6ab6724c5050fde20e89b7025773960d74ec782bb875badbbd5dc9a04db0a536f1 SHA512 3c4cf64bc0b067ccdbb71efe04c32ac9d673faea6cc4ccd13d6b1b61920be4785806d19359b7657d032a2ff1c011a8b4f16ec4924d9df8a59d1a875a7f844473
 DIST cryptography-37.0.2.tar.gz 585433 BLAKE2B fe70543d53b1cf5d6986a9d8f18394c1a32bbeb19e39bc9ce185cfb1f21a78a94beb228a078d7d74aa070d5899705a5a0dbf4b4b46ab6f43a4cece1bb6647ddc SHA512 28d8b52ca457dec0c854ffb798c9ecb4316c3f161ece5c304c7a5e0cdc86e8b567f1cea82f96f23b01af611e04f48fa310c0e78b3175f4b06e9175acc6a2de45
 DIST cryptography-37.0.3.tar.gz 585915 BLAKE2B a323ea941f34b6008604770d9a9a23acd78665dc6877e2e60087abf3d1495c0bb7fe8ac7d11d55c64006be62b27859ed0dbd4e1ac43f7784f8b187a91d708516 SHA512 ce5aefd6b855c32b75b566ffdcd38e6ba264f897e11edea865010e7d9f5fa72e517e042416109ab36e8558b5c4340e68b5ed654ec9485a5ab7f7fc11262e40d0
+DIST cryptography-37.0.4.tar.gz 585913 BLAKE2B 3ed76d5cec1dd75ab89e9cae1357eda82b23017406cd84d97ab70d6b598cb3c453e34ea013d35b5a482f032b8513c0245d4273c2201313f42be54e404fa2b598 SHA512 9d39a2ec4facffd6d1c1db9267248846071aca8ac3bccba3da2d1a0664c6ce2a38c5245a9b8f62845a83abe6ba2782c43333aa4260960f37dc2eac3789a73575
 DIST cryptography_vectors-3.4.7.tar.gz 35168102 BLAKE2B fbefd3ff96548dde012fd290aba1c99d57db376023d486910e486cc9c143461ef1ae9b77824cc03307723d35142f0360bc961b548a4edc02357d3f1a0e7e4e9f SHA512 269b50fa4c5300da6758006d12be42f998630d23053ef9af0eb588fc9e6994b044d8822cff105e338f4d0d746ed0e204a4a9c42f54667e355e1ce86e6754bbe9
 DIST cryptography_vectors-37.0.2.tar.gz 35240459 BLAKE2B d490cb95b4f32c508867fda059ddbdb5c1bbf46cad709f0e66148cdb5934fbbadd3078f361f4b5bf2e1e30b277252e3df7337fcd4e4694cd9e878c0b70fd71e0 SHA512 320a4c13f076d6d7bef0437b8b57a76496c51d0266c9958aaeadf73e9d07510e1219f3fa08aee1b30cb6122daf4c0b85538c5be95f1dbd450bacb8cbe464892b
 DIST cryptography_vectors-37.0.3.tar.gz 35242917 BLAKE2B 4eeaa7a3da89e950bc5547beae25d45760578b08246b8cf355a86649650abf23ddcbb0b7b6ac98ee6519044fa4a0cc027b612cc9853362e91b051e4b5ac2fefe SHA512 fc9cca105656fa1088b07379bd7c50af7c707ee13e25cf26c3d58f6c9aa571c7c14e676a237943fe98b47d7f398bc7ddfb8a0289b1dfc523a858f9b2ead796ee
+DIST cryptography_vectors-37.0.4.tar.gz 35242881 BLAKE2B 3b58f12deec978e0d104ee84d2330248fd00291b63ca181a1e4803253e643496ee3cee14ecf84681db60da028543ca50d05968cac4d2c0609ae820b3a02463dd SHA512 33098be46d072bf35f72320d64fd244a8ef890e99ae7baa21f9fbbb8d423d60f2711c3c1293830c860ff9bdd79bff910ce4df0f4dc9f363d712b722dab2de7ab
 DIST indoc-0.3.6.crate 9663 BLAKE2B ca7a1f4d3cbedbee0ba0a3f19c4b3352ff90927eef744b7e4f1d60855d4dc4265202972e81e0fc06d1222d8d5fb322efc4ef669af7396b251248a1e45c91def2 SHA512 e900aa3b001df0fdbf1f543d8b679af317e85a1f95e26fc556213f2826a4f6c82d8c4f3f82de435e3591f8bc14e78eb22668d901dcbe2287f46740e0291afacd
 DIST indoc-impl-0.3.6.crate 7933 BLAKE2B 93e232e360e8f02943ef9a9cabf16bc863d792d8096b8d9a13a07f0b7b396db590abf83b5444f082317059dad7578ffae974dbc8a7e56fbdbab817b7d2534725 SHA512 18406587ee56a09dd2062cee456af697efa903343de42c0ff618a64ddf2bf7efed5da02e7220fed2636c555a6ae18059018f5c3c9b44ba8d3e5a34ea5b53c806
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
@@ -50,7 +52,8 @@ DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d23
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD cryptography-3.4.7-r3.ebuild 2202 BLAKE2B 3f4040d101798edd5c5cac511230db45149a71f22649682454d9a6ee4c7b77691b47890fd25a999e706109a9368594d9536aa4d694c312f4b151cbe93159d932 SHA512 e8e59094657f64585f4c1d3f126da221b542196e89da62891b114fcf4a7ca64680e8e188bd9a123f79892fd9223c86993efa56475f56cbe9e8b2d898f5ee39a1
+EBUILD cryptography-3.4.7-r3.ebuild 2165 BLAKE2B 62aded5c10bc74dd3b9b231cf8d704a361783c113136d117b65193f2d9433d9b6365f84ffd87956919f52000df2fbea7efc7045ef8a467c68b913220d85bf81e SHA512 37d56d46f97b6ff2dd4b30faef32fca1205851555fdee643f2367364591228a7c329aed4e9ac9d077be3b8de93a70651e5fc59a6f566dcadd4427535e9a183f1
 EBUILD cryptography-37.0.2-r1.ebuild 2944 BLAKE2B 9d1342b9bc50e963cfcbdc1d2212b80d7a778c408b0614e49cb417161ef3c5fb9c7e0fd452d47f4f1835ec4c6cd3759799992c812db90dc79021ca65c796c5f5 SHA512 8ab91ceff0dd803379be6f0623cb63dd33b7fe4c147b68c78f716ddacdfc58a4171d5351225dd2199915393ff336e4f2c8afa4779451ca668044ad54d68860b4
 EBUILD cryptography-37.0.3.ebuild 2957 BLAKE2B 8d4886736954913782e0f2e1bdf56cefd23ae1863c1413637f08d05fb5d4fad3c11fdcea4404a3b8c284428c1445382be8b6b34246a2761d2c644314e3d438bb SHA512 c0ac3a44867a489177704180ea53aa60b79083c0e9662388d668906785cc84235a6f2f7c4d61c1357314f77113b1875a23450a4fd8c0e80c850e6905020fab55
+EBUILD cryptography-37.0.4.ebuild 2957 BLAKE2B 8d4886736954913782e0f2e1bdf56cefd23ae1863c1413637f08d05fb5d4fad3c11fdcea4404a3b8c284428c1445382be8b6b34246a2761d2c644314e3d438bb SHA512 c0ac3a44867a489177704180ea53aa60b79083c0e9662388d668906785cc84235a6f2f7c4d61c1357314f77113b1875a23450a4fd8c0e80c850e6905020fab55
 MISC metadata.xml 385 BLAKE2B 28c12f0c0303afca4d0fb015a1ed123efb559686e71477b3120291164a01f219c0dce373d7f4f7380ced372343945a8ee1ce875c27851d3864a468ba48eb2cc1 SHA512 f80a4794ae57fc9e434679ccdd0ff4cc5e2c4fb48274cca32316f827dd6d4cd3b903cb45f52abdd4893866987d4d1026f7ddb1efaa76cb99e0f55d01e8433b83
diff --git a/dev-python/cryptography/cryptography-3.4.7-r3.ebuild b/dev-python/cryptography/cryptography-3.4.7-r3.ebuild
index d1488abb6878..a9867806b571 100644
--- a/dev-python/cryptography/cryptography-3.4.7-r3.ebuild
+++ b/dev-python/cryptography/cryptography-3.4.7-r3.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cryptography/cryptography-37.0.4.ebuild b/dev-python/cryptography/cryptography-37.0.4.ebuild
new file mode 100644
index 000000000000..0a6fca388dd7
--- /dev/null
+++ b/dev-python/cryptography/cryptography-37.0.4.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=yes
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+CRATES="
+	Inflector-0.11.4
+	aliasable-0.1.3
+	asn1-0.8.7
+	asn1_derive-0.8.7
+	autocfg-1.1.0
+	base64-0.13.0
+	bitflags-1.3.2
+	cfg-if-1.0.0
+	chrono-0.4.19
+	indoc-0.3.6
+	indoc-impl-0.3.6
+	instant-0.1.12
+	lazy_static-1.4.0
+	libc-0.2.124
+	lock_api-0.4.7
+	num-integer-0.1.44
+	num-traits-0.2.14
+	once_cell-1.10.0
+	ouroboros-0.15.0
+	ouroboros_macro-0.15.0
+	parking_lot-0.11.2
+	parking_lot_core-0.8.5
+	paste-0.1.18
+	paste-impl-0.1.18
+	pem-1.0.2
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro-hack-0.5.19
+	proc-macro2-1.0.37
+	pyo3-0.15.2
+	pyo3-build-config-0.15.2
+	pyo3-macros-0.15.2
+	pyo3-macros-backend-0.15.2
+	quote-1.0.18
+	redox_syscall-0.2.13
+	scopeguard-1.1.0
+	smallvec-1.8.0
+	stable_deref_trait-1.2.0
+	syn-1.0.91
+	unicode-xid-0.2.2
+	unindent-0.1.8
+	version_check-0.9.4
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo distutils-r1 multiprocessing
+
+VEC_P=cryptography_vectors-$(ver_cut 1-3)
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="
+	https://github.com/pyca/cryptography/
+	https://pypi.org/project/cryptography/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})
+	test? (
+		mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz
+	)
+"
+
+# extra licenses come from Rust deps
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2o-r6:0=
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
+	' 'python*')
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	test? (
+		>=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-subtests[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	cargo_src_unpack
+}
+
+src_prepare() {
+	sed -i -e 's:--benchmark-disable::' pyproject.toml || die
+
+	default
+
+	# work around availability macros not supported in GCC (yet)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local darwinok=0
+		if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
+			darwinok=1
+		fi
+		sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
+			src/_cffi_src/openssl/src/osrandom_engine.c || die
+	fi
+}
+
+python_test() {
+	local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
+	local EPYTEST_IGNORE=(
+		tests/bench
+	)
+	epytest -n "$(makeopts_jobs)"
+}