gentoo resync : 12.05.2022

3 files changed, 74 insertions, 2 deletions

diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index ab0e756fbe4c..33854b70ffe3 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,3 +1,5 @@
 DIST pyOpenSSL-20.0.1.tar.gz 173736 BLAKE2B 37e1741425a296142d38c20c70f9950eec2bd043fc58e50c9955b98dc6825111328af852d247b154aa120ab42ea9dc2ae8186d350dd0c664cd5920b9a902963e SHA512 e81e0870398b882d77453b02e972559c0be82dbfe87bd8a48a65e8943acc3ea07dc8c3150b88e299c237496043443d1a5832219c337e4436f99ef419b36dd23f
-EBUILD pyopenssl-20.0.1.ebuild 1805 BLAKE2B 8db1eeda72887360aef19cc4282137abc08f14741699c0dbf36e1d3473449990932a3a6e9cfe8d5e2f2457bb7e57208de34e0177530b9b97ac665ecf33f4aa9d SHA512 2d1943b6534708acc5644972b187574d6cc675db10531d48977103613d5ed22621e8c9032f8d237047a099cc5e8b72b1ffec9202be0bdb67fa0f4321a5f4a313
+DIST pyOpenSSL-22.0.0.tar.gz 178438 BLAKE2B d34c91a54aaf6b28d92ba83c26900fb308835512275267e11a5482ede4ab45177434559a53c64a116aa19c84d65dcdb459aecd3fc5587cb13e21cd2f196a0078 SHA512 3d7695f27b7909eb82f05527ab7551fe90a85a70f20ea980293b59672a62f9b015966180407fa0786e94b01ad1d1acfaa7d40426bb63410efd24a144e559e2f0
+EBUILD pyopenssl-20.0.1.ebuild 1812 BLAKE2B 2a2cc8e08f97fea2586d96521c2a47d6464ea0bac973ae49505c05f9c3436369b3867c6a353f7a83f993bccd2eeb11b999fc33c93dcf6d7c3e0448ad6c408318 SHA512 194f7d3330d4f66b4144a7aa520f817a9fb4dd273dbc833dedba6c8cf16fc03c3d0331b2adfbd5b9c55aa029eae613884382b64604816c2c2b26f45b1c773d55
+EBUILD pyopenssl-22.0.0.ebuild 1624 BLAKE2B ef6deeabe15a07739f4765b4220ffbfed85e7dc37cad202c342965d67f8214d2d6443e3ac4e4602da4498495ad4dfff121726e7164001e54207930f18d39d46a SHA512 2ccfaba1e5918ae89903d8dd8ec8a3f8051c166d9690256b07a2c9a4a4cf5d208fca24fee9475246a7145fa7e1ae04aacbc00499f9087a99fb2271adc822e4f4
 MISC metadata.xml 536 BLAKE2B 86db822042b6fb3e965ece87b6b15dcabf76cdfbfa76ba285a491208ad5c6a2a196ca7144a1a73b152decc4df1641ad4c57a1cbde9f90d09d25eef1f6f4da39a SHA512 996d0e20291e744c6c20b38fd750d242920541aca7d92de63ca5b1dcc2f1c10308545797ccf499f38e50dfd04db2bb031e93b02c7c1705908f2363c813294ff1
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
index c03abc041b06..eadda66ac57d 100644
--- a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
new file mode 100644
index 000000000000..c2f361933d05
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs
+
+MY_PN=pyOpenSSL
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="
+	https://www.pyopenssl.org/
+	https://pypi.org/project/pyOpenSSL/
+	https://github.com/pyca/pyopenssl/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-35.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/cffi[${PYTHON_USEDEP}]
+		' 'python*')
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_configure() {
+	# test for 32-bit time_t
+	"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null <<-EOF &>/dev/null
+		#include <sys/types.h>
+		int test[sizeof(time_t) >= 8 ? 1 : -1];
+	EOF
+
+	if [[ ${?} -eq 0 ]]; then
+		PYOPENSSL_SKIP_LARGE_TIME=
+		einfo "time_t is at least 64-bit long"
+	else
+		PYOPENSSL_SKIP_LARGE_TIME=1
+		einfo "time_t is smaller than 64 bits, will skip broken tests"
+	fi
+}
+
+python_test() {
+	local -x TZ=UTC
+	local EPYTEST_DESELECT=(
+		tests/test_ssl.py::TestContext::test_set_default_verify_paths
+	)
+	[[ ${PYOPENSSL_SKIP_LARGE_TIME} ]] && EPYTEST_DESELECT+=(
+		tests/test_crypto.py::TestX509StoreContext::test_verify_with_time
+	)
+
+	epytest
+}