gentoo Easter resync : 12.04.2020

5 files changed, 4 insertions, 143 deletions

diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index ac0447359df0..cb5472a911a6 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,9 +1,5 @@
-DIST pyOpenSSL-17.5.0.tar.gz 170870 BLAKE2B e8b8986a7c5475ac3898df4877a8be86db359af79e1718bad85149440cff543c501ee23eb369270d2c539a9e3f4e13165ea87b858ef6916ee79ca6e49f6e5370 SHA512 f194662b5842f1e3a4fcb910b9f2e6482d1dcdf834f306acc3dd6d9723f65038f7bff550248fa6268d90c839c9d9e8248bb6c7d399495fe6aed25291b93ece86
-DIST pyOpenSSL-18.0.0.tar.gz 167296 BLAKE2B 3a9c8db02e92858353389508d9791d2ff0b07b54150d27a513b4c26ef62899167d184702cd8ac3a9fb5be120a92e31259ce265a400513de4622c30b1269ecd9f SHA512 7106d4116243a164c1f458ad495564c2cf3a46b4b0fbb1d452b4174ead4409bc9c783c3a4674231ed3c26ecf588077b01dadbdefe033d5e7251a61531c6f6c15
 DIST pyOpenSSL-19.0.0.tar.gz 168551 BLAKE2B 762d3358b3cc4f1e088e9464ac079e5212c537d25691e51edb3255a192c42276506c758ecf16eff999082bfd05aeb92a37741338d92036d2149b87c95008db05 SHA512 a7e12bf5be725ccebd1223d567a9b9e8bd35f79cbf3a0409108fa6f00e10ab137dd6876369e9dede02b2abc7d700786cc905532ca5c31b6e246f6df8b24e2818
 DIST pyOpenSSL-19.1.0.tar.gz 160510 BLAKE2B e6e39f860221a2696aa3fa32ac89ed48e34b18e4accc366a86264d943a15a1b00ba1a0d8349550d1775d25836aa5d214e1e3fe4ec0a9c0f6d5ab00cd9fede633 SHA512 4acd96f287d72eb11bd812697d28cd6eb6a96a4653248b65f967187830a6b17cc1254775a18a3405469f3d45abdae6f02d165f2f35f035f3174c2826fba82916
-EBUILD pyopenssl-17.5.0.ebuild 1721 BLAKE2B be960de0cf11fc8de18f54e1a9f2d01411913b27ef865c0dbb2994548efb57daa1cf564cc5e07526c7d9613815986e98c2bc7575bf42853b5d7de9a0cc71d6f9 SHA512 1e7933717202f5c5fbf40a0fe197578eac316160a2f2021cbdc0e0e77e64a603c559360ee8299a1231b23d755af754bca5cd578955f1886ebadbdf6aa5c18a75
-EBUILD pyopenssl-18.0.0.ebuild 1734 BLAKE2B 0b2f65a21a71de81957e112ae0ec7b5dca06f3c669cc9f0b7ef773ba97eb15c4e8831ae21bf7f2136cf42f7f1608ada5987c35107dffe97227830bff6eebc445 SHA512 3d020d281ff64b1f33f821aee4395ed25725383764965ef6b765e6c359af8d51b7b0db78e38541d85ed92e1c12d9ea2db8a96c2862209d37cfd2ab4e8b2fd079
-EBUILD pyopenssl-19.0.0.ebuild 1732 BLAKE2B 30ec117d5040c4e7af07120c6a7d3da5eaf3af5056a6330637e710d91037b484b83c06d4210a74a1fb1cab635c52286f3383771c8936c27522f1bd4b5534826a SHA512 a78df3cedfa7b9e26f887989ae7e97e60fdeff402105717437e1a49c00af1370988127a1bc2c4ce19a83297adc33ebe65c757f592f4dd6ba9180e5973545ca31
-EBUILD pyopenssl-19.1.0.ebuild 1409 BLAKE2B eb26308cb3cbd8a812be9c80532ade1f5bdc588237178a7727b6a06db1576021543161d7d1c45748abdce76fd0c89b2a13507d2de533583c08db2a1ea5866b2b SHA512 aed3fb4c129dd1848908838ef206403483813fcf1b382168a7dfbb63787d7bb2ad30a548f6938b38ba7d296449048b8baddab55c08948dcf57dd852745cbaf76
+EBUILD pyopenssl-19.0.0.ebuild 1730 BLAKE2B 888362f63063cc67511c372588e20726e75a0335777b61d50efbaada92f7cefdf059ab829b301ec21f0a1353305ef5415998dd57eb9268c12b3befabd24465ab SHA512 b0ad06edad83d396a15488c4ef601bbdb94bc3e4438db0ffadf003cc7c5092aec5ea15d316fdeef2eaef6522966ea7ade26c83afc7e126a5f8b48f76826bdd66
+EBUILD pyopenssl-19.1.0.ebuild 1396 BLAKE2B 2b441d8c1c57d6fd34387e294edefac97a357605e65f637b248d0e1ae96f7133c8ee3590692eac8d363971e7a49399152eb0a4c7cac3307e9cd1db98402eee75 SHA512 f35471f7b55d3c91a209725b4619aae02cdb398b27b882d18eb6dd3b49409d22111c329a039e85057579ded328bf4d249b4c8b15b573c7b07840c506c2316bf3
 MISC metadata.xml 418 BLAKE2B 69f135bab3b0cffa47cc8e807e1f537f7fa0bd599bf3309ab92ddf41f894c21ab0e3f793ea4caa65d272043d2dc0352fc54c7160b31fccabbeb165775a895d97 SHA512 5cd4b0381e79245626500a2a38b9f7bedcc8e4742445ac16f12a96133f1291ec49592f2259294f153d5f1b27969cd6f7f364d49f32d0793b12b2ad38b824f441
diff --git a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
deleted file mode 100644
index 00425f8df5f1..000000000000
--- a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=pyOpenSSL
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the OpenSSL library"
-HOMEPAGE="
-	http://pyopenssl.sourceforge.net/
-	https://launchpad.net/pyopenssl
-	https://pypi.org/project/pyOpenSSL/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-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
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	TZ=UTC py.test -v || die "Testing failed with ${EPYTHON}" # Fixes bug #627530
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopenssl/pyopenssl-18.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-18.0.0.ebuild
deleted file mode 100644
index d3a31ab8b263..000000000000
--- a/dev-python/pyopenssl/pyopenssl-18.0.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=pyOpenSSL
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the OpenSSL library"
-HOMEPAGE="
-	http://pyopenssl.sourceforge.net/
-	https://launchpad.net/pyopenssl
-	https://pypi.org/project/pyOpenSSL/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.2.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-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
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	TZ=UTC py.test -v || die "Testing failed with ${EPYTHON}" # Fixes bug #627530
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
index 71222827fbe3..73e7cfca8c2f 100644
--- a/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild b/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild
index 039b35107692..dbfc414c656f 100644
--- a/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-19.1.0.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 ~s390 ~sh ~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 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 )"