gentoo resync : 28.04.2021

3 files changed, 26 insertions, 11 deletions

diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index e0d7308ba8de..dcb33da38972 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -2,7 +2,7 @@ AUX pyopenssl-20.0.0-libressl.patch 1021 BLAKE2B b2158cc4bcde97221d0c18204020f1c
 DIST pyOpenSSL-19.1.0.tar.gz 160510 BLAKE2B e6e39f860221a2696aa3fa32ac89ed48e34b18e4accc366a86264d943a15a1b00ba1a0d8349550d1775d25836aa5d214e1e3fe4ec0a9c0f6d5ab00cd9fede633 SHA512 4acd96f287d72eb11bd812697d28cd6eb6a96a4653248b65f967187830a6b17cc1254775a18a3405469f3d45abdae6f02d165f2f35f035f3174c2826fba82916
 DIST pyOpenSSL-20.0.0.tar.gz 173786 BLAKE2B 3fb1e90e20b3e083fc93f6dc8a54fb54e15ceb38c4d2e84e2d7d68bb56f9e3828cd264e3554f25465e858687e74a7f20b91216fb7a0b4b2c656ea86423cd3442 SHA512 26e8a64d53a35434ad4bf5ef50ed5c37d7b92b0db971a2103dcafea56a0b377d67333af630a31405a97cf2cffddde320907b4950ed336a8321391854bcd2c50a
 DIST pyOpenSSL-20.0.1.tar.gz 173736 BLAKE2B 37e1741425a296142d38c20c70f9950eec2bd043fc58e50c9955b98dc6825111328af852d247b154aa120ab42ea9dc2ae8186d350dd0c664cd5920b9a902963e SHA512 e81e0870398b882d77453b02e972559c0be82dbfe87bd8a48a65e8943acc3ea07dc8c3150b88e299c237496043443d1a5832219c337e4436f99ef419b36dd23f
-EBUILD pyopenssl-19.1.0-r1.ebuild 1393 BLAKE2B 251dd505b6d33acdaeed65856bab4c43e387da68abc48b996e334992254dde0fc90467ca38d21870e06d976446e0af586ca736488eb7626ac48b9a2efab3c94e SHA512 a4d42baa74499f7b8d4f384ae363bd45968d6f2ba367fe0944ce6f9eeb27a25d368497a55a39346077a69ce728d7f80ea26a9653768ed34402850b82a9c6e081
+EBUILD pyopenssl-19.1.0-r1.ebuild 1394 BLAKE2B 4984732d92add2817d671af037bba4c81ae5310626ef3d6f97906e6bea686a25cfb6f626784e32823e8a1db994a44d51ea5fdcdf78b1f727c35e1234e991d64e SHA512 1abde17a2921dd8a9862abdc25b5b317d712df2e1d8e5401c6873ca0b926c264d81442eb9df8f6ff4f3cacca8cfceb469ebfc1c8a56f0b5f279f8e46b022ef40
 EBUILD pyopenssl-20.0.0-r1.ebuild 1444 BLAKE2B 5a12c135e374a5043f0aed3a7f1b11caeda30266125d8b09c447668fa2d198641b5930a9d61c4723b43dba7be387063afb52c3159dec6a5bed5ce6128923ef5d SHA512 3d6045413a891a758dbb7536094baf5eeffd696a67981aa85994f30bb58a9cd5feafaf84e48ef485ef861af7060d6c1fbe0dfd981f5275598a7a2d979ded5005
-EBUILD pyopenssl-20.0.1.ebuild 1337 BLAKE2B b91807532e24439001c5fa0616d67bc7d6f74edebcbc89ef51f662d2afbcd29fa36c13d56c30c5244015d373c907f8aa2cacbf4b90214d0e4feab6c39214f664 SHA512 b78c41c984171d7778bb23c9293aa8e01dddc29edd9ed9e9bf6bfe42de02b2966f2a2889c1914dac0eb6c4aad713c40ca721104db7e0f28248c0943e5e33b819
+EBUILD pyopenssl-20.0.1.ebuild 1818 BLAKE2B fd5d7ef22919be8608f40afde4c4dd907ce060d929b3f4a961b6c0a386235919b8cb4892bb11fbad6e7953302777bf0525febb2f3c06cfaeb6fd2e76d2663a31 SHA512 832f4cc873f607cc9f13d19de195caaf7fdb86ebb6a124d13c5e81e320b7dedcc2aceeef1f0adb03fe58d726f28661724cf16785da3a7c6ea00a5e6a9b60cf6a
 MISC metadata.xml 535 BLAKE2B bf6dde29d0d101534792aab82e884425a32a6d96385e21e46d760902684b32d0560c57eb8be37db82365f5332906540d145f88bcd76626f00a11e12428664ced SHA512 64f374479e80652f5803b3c6ef3fbeb94c3dc23c5805b11390979be02c312c631ad8ddca0056f439f41da7ebf245119c7da1110cad637efb0e4290be9fadd4f3
diff --git a/dev-python/pyopenssl/pyopenssl-19.1.0-r1.ebuild b/dev-python/pyopenssl/pyopenssl-19.1.0-r1.ebuild
index 1a8ad022ee31..180a40299af2 100644
--- a/dev-python/pyopenssl/pyopenssl-19.1.0-r1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-19.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
index 311b787c1765..84950bbdcc08 100644
--- a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7..9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
-inherit distutils-r1 flag-o-matic
+inherit distutils-r1 flag-o-matic toolchain-funcs
 
 MY_PN=pyOpenSSL
 MY_P=${MY_PN}-${PV}
@@ -39,13 +39,28 @@ distutils_enable_sphinx doc \
 	dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
 
-python_prepare_all() {
-	# Requires network access
-	sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die
-	distutils-r1_python_prepare_all
+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
 }
 
-src_test() {
+python_test() {
 	local -x TZ=UTC
-	distutils-r1_src_test
+	local deselect=(
+		tests/test_ssl.py::TestContext::test_set_default_verify_paths
+	)
+	[[ ${PYOPENSSL_SKIP_LARGE_TIME} ]] && deselect+=(
+		tests/test_crypto.py::TestX509StoreContext::test_verify_with_time
+	)
+	epytest ${deselect[@]/#/--deselect }
 }