gentoo resync : 04.05.2021

4 files changed, 3 insertions, 36 deletions

diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index dcb33da38972..7d8df66cf17e 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,8 +1,7 @@
-AUX pyopenssl-20.0.0-libressl.patch 1021 BLAKE2B b2158cc4bcde97221d0c18204020f1cb5331a3c38826ebda16bdf8018b038a87bdf1ab4aa81cd2c690b868411663d4a6303eecdeb6743afb60e956512e1dee34 SHA512 aa2ea27211fc06bbca62ff78305d69b9fd9f0cf5d5318f956fd9b386f378b33cf99f7596f35c37343404940d9fe7f9734efcbebadff7a98e5f0f650a71bc84a1
 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 1394 BLAKE2B 4984732d92add2817d671af037bba4c81ae5310626ef3d6f97906e6bea686a25cfb6f626784e32823e8a1db994a44d51ea5fdcdf78b1f727c35e1234e991d64e SHA512 1abde17a2921dd8a9862abdc25b5b317d712df2e1d8e5401c6873ca0b926c264d81442eb9df8f6ff4f3cacca8cfceb469ebfc1c8a56f0b5f279f8e46b022ef40
-EBUILD pyopenssl-20.0.0-r1.ebuild 1444 BLAKE2B 5a12c135e374a5043f0aed3a7f1b11caeda30266125d8b09c447668fa2d198641b5930a9d61c4723b43dba7be387063afb52c3159dec6a5bed5ce6128923ef5d SHA512 3d6045413a891a758dbb7536094baf5eeffd696a67981aa85994f30bb58a9cd5feafaf84e48ef485ef861af7060d6c1fbe0dfd981f5275598a7a2d979ded5005
-EBUILD pyopenssl-20.0.1.ebuild 1818 BLAKE2B fd5d7ef22919be8608f40afde4c4dd907ce060d929b3f4a961b6c0a386235919b8cb4892bb11fbad6e7953302777bf0525febb2f3c06cfaeb6fd2e76d2663a31 SHA512 832f4cc873f607cc9f13d19de195caaf7fdb86ebb6a124d13c5e81e320b7dedcc2aceeef1f0adb03fe58d726f28661724cf16785da3a7c6ea00a5e6a9b60cf6a
+EBUILD pyopenssl-20.0.0-r1.ebuild 1397 BLAKE2B fe16692349c2f737177524189856d39000d82880f8105f9afcb4d23ee3e2184680596359604f0c641521980f79999152455de7da0b3c7a4fa22ed193d9eb2584 SHA512 3fb1da86880a51c4c1d0fb185caaac45c179f47ddc3e3435a14b610717a5c135320d540c929763e31059bd29629c8e58b1945897a9f4d07c253e983a321f10ae
+EBUILD pyopenssl-20.0.1.ebuild 1817 BLAKE2B fb7497afdd7195befd50e48398b5732a6a229d876c7a2c5cb6dc27f3955bd5d51b6016b6ebfbf0f8cd3f8f64f94b04b5c92ea5b648a2283e77813a9d567171f9 SHA512 411c9474925ba32caa401b460664a2ac119abbb7e7ef646fc0cc36ecda62470a8c8c2b33669cc4fb1467a09d299a748d98c21c8879228bd3df1e1b0f346f8820
 MISC metadata.xml 535 BLAKE2B bf6dde29d0d101534792aab82e884425a32a6d96385e21e46d760902684b32d0560c57eb8be37db82365f5332906540d145f88bcd76626f00a11e12428664ced SHA512 64f374479e80652f5803b3c6ef3fbeb94c3dc23c5805b11390979be02c312c631ad8ddca0056f439f41da7ebf245119c7da1110cad637efb0e4290be9fadd4f3
diff --git a/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch b/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch
deleted file mode 100644
index 6e9c7847fcea..000000000000
--- a/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ecbd275386e5608f0f90d3536506d7f50026ffe6 Mon Sep 17 00:00:00 2001
-From: "Nathaniel J. Smith" <njs@pobox.com>
-Date: Thu, 1 Aug 2019 21:23:51 -0700
-Subject: [PATCH] Support openssl <1.1.1
-
-Upstream-Status: Inappropriate
-[https://github.com/pyca/pyopenssl/pull/861/commits/ecbd275386e5608f0f90d3536506d7f50026ffe6
-was accepted in 19.1.0 but later removed since the upstream dropped
-support of OpenSSL <1.1.1]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/OpenSSL/SSL.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
-index 6f785fc4..55211511 100644
---- a/src/OpenSSL/SSL.py
-+++ b/src/OpenSSL/SSL.py
-@@ -140,7 +140,10 @@ class _buffer(object):
- OP_NO_TLSv1 = _lib.SSL_OP_NO_TLSv1
- OP_NO_TLSv1_1 = _lib.SSL_OP_NO_TLSv1_1
- OP_NO_TLSv1_2 = _lib.SSL_OP_NO_TLSv1_2
--OP_NO_TLSv1_3 = _lib.SSL_OP_NO_TLSv1_3
-+try:
-+    OP_NO_TLSv1_3 = _lib.SSL_OP_NO_TLSv1_3
-+except AttributeError:
-+    pass
- 
- MODE_RELEASE_BUFFERS = _lib.SSL_MODE_RELEASE_BUFFERS
- 
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
index c74c616363e9..24caf321b365 100644
--- a/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
@@ -37,8 +37,6 @@ DEPEND="${RDEPEND}
 		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}]
 	)"
 
-PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
-
 distutils_enable_sphinx doc \
 	dev-python/sphinx_rtd_theme
 
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
index 84950bbdcc08..94d6c89412f8 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 ~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}]