gentoo resync : 25.08.2020

3 files changed, 14 insertions, 13 deletions

diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 3f0d0e9bcb12..60903265d7cc 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,7 +1,7 @@
 AUX m2crypto-crossdev-0.31.0.patch 505 BLAKE2B 09adce189073dab0cf7e49ed2291ab2f140cd3b26ad771e9c6819315388dc5ef6be26fb730018c1869bcc8d68c54a1e0c54b3ffa422c981597c7a3518a174c9a SHA512 bc13bda02e42937e1793c46dbcbdd0ba887d49360899cbecfc53f5580bbdb070cf76d6f986e146aac0cf6733edadec855cb64b1e25ec74212f82f90a425bfb7b
 AUX m2crypto-libressl-0.31.0.patch 8211 BLAKE2B dc36c1e77f6fa9f260d465c0e61168a9ddd82f382c46f31c06a3ef5972cbbe225f665eac17999f7c8a0b74e1702f82451fed5a39691577b050f477bbf7a2ee2e SHA512 ea100feabae82cf1c1237f55354847935a9c49e05c780e01d8fef959d2a10abc4b9f14c56ea50cba68ff59eb67c3cf5136ff92e9dc456960327e0c582b55720d
-DIST M2Crypto-0.31.0.tar.gz 1292016 BLAKE2B 3f1e0e8f686719ff87fa3a51cdc287be989fa1554866582deb1968fd04605270e14cbfd280f64211c043c5d8cb77a09e6a8cec6824ab15416ab94366aa73d2a3 SHA512 9f3e2afda4b8ac14aa64a1534e446eb6895ec7182ce5b7ded8008178e01139d383561a87f8c9fb5fe4b9c257ba5c6b93339955eb9e2f7417cd3f4832c35c4598
 DIST M2Crypto-0.35.2.tar.gz 1117706 BLAKE2B efa15e023be7755b94c642bb23eade912edcbbb76bcdfed3414d27937cd705ec4c83069ca620fe20e58e126549ba7f98e84f6f8330b78133a8a8b953d18f467b SHA512 3608b29a8e7d0732a2359e35fcaae191447aa7c0211ca3d057eed6cee7f0819f5c1121e7d41caca8cdea3c7911f8c447ee475b1b3d125e8dc3adde2718a59f36
-EBUILD m2crypto-0.31.0-r2.ebuild 1546 BLAKE2B 537defe2b77238728e33fafae8d8193f77438f9a1c670049367c8a81ea181a6d79591be3a0ad8c760f9c8f2d1913eb7f72a76e08d7527900559da3f0c0924a36 SHA512 eeea893fff1ce693a6d1bbfe753d9a01fe251c84f23f0e124475c9a969b821daff371fcacb7d30e2e9798ee3a93b98a4bbda05e92d6f01835a5fbf4abdfbe98a
-EBUILD m2crypto-0.35.2.ebuild 1442 BLAKE2B 50b59640d4d8dce2204df4a1d3ee41b064d7e0f85f01b04edbc64f40a871a969e1c55ab7b309d1de278c8aa86f7cd9bf794865ad0c006302857dad34d6333795 SHA512 d830c4d5e867f8eaeefd7d2cd7ed18ebc99fa35f48b7aa93b1242f10c4b25f9c682aeadfd6284f868851a9fa5fa308c299aae13fbef7fd62ca9b4fc5230af660
+DIST M2Crypto-0.36.0.tar.gz 1127584 BLAKE2B 5cdbbb11ff67d4ddffb2853a72383f3c7f1e1aa53ab84166aeda4fbea1b0d7f506761bb07bf8cb5b36f94bdbeb2ea2b46e0693da8355f81b4bf5c4c1c1cc18b1 SHA512 5b7d6d10c943ff0e09e0e9748d5578e7e0f7659a73de4ba49481152bca05871aef2bfbb869e1636a7cebcf2dd8b9f67fb0d299a833d1d4ebd538031c35d7bca1
+EBUILD m2crypto-0.35.2.ebuild 1433 BLAKE2B 36599cd736a015dcd9a4b574fa127bc77e103c030830f19005135eb433f49bd57e0f7fbcbee5ea9a872415528415e1d3b81116de7dda18cf126036d0549a8491 SHA512 1138c7bad9f33994cea5f22d298f12c5f9f551f63851228e43137a85df125616421348cac4f375cbe7715e0e177c28fb34149f02df649d55f4c003a3174d6aa8
+EBUILD m2crypto-0.36.0.ebuild 1566 BLAKE2B 5e84731a51589c1bd70f6a40dbc75da2d6fc1c1937047db41477cda045f36abe19a1f5ee2e9a3d7445979a1a89f8bf7addc49960efc4a4b1136fa0c44a9dec24 SHA512 f1c7884557007c32ae2ab929565be7349a438725288dd2e33a2c4d6b59ce59e2a7957aec0d725a6b88e6d12eda2777a681fcb2823bedb7a450d4be394968a2af
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/m2crypto-0.35.2.ebuild b/dev-python/m2crypto/m2crypto-0.35.2.ebuild
index de0dfcb82c44..cdf94b348b4f 100644
--- a/dev-python/m2crypto/m2crypto-0.35.2.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.35.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild b/dev-python/m2crypto/m2crypto-0.36.0.ebuild
index fe82518cfdd5..243fa4672aed 100644
--- a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.36.0.ebuild
@@ -3,21 +3,19 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..7})
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs
 
 MY_PN="M2Crypto"
-
 DESCRIPTION="A Python crypto and SSL toolkit"
 HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libressl"
 
 RDEPEND="
@@ -35,12 +33,8 @@ BDEPEND="
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-# Tests access network, and fail randomly. Bug #431458.
-RESTRICT=test
-
 PATCHES=(
-	"${FILESDIR}/${PN}-libressl-${PV}.patch"
-	"${FILESDIR}/${PN}-crossdev-${PV}.patch"
+	"${FILESDIR}/${PN}-libressl-0.31.0.patch"
 )
 
 swig_define() {
@@ -52,6 +46,13 @@ swig_define() {
 	done
 }
 
+src_prepare() {
+	# TODO
+	sed -e 's:test_server_simple_timeouts:_&:' \
+		-i tests/test_ssl.py || die
+	distutils-r1_src_prepare
+}
+
 python_compile() {
 	# setup.py looks at platform.machine() to determine swig options.
 	# For exotic ABIs, we need to give swig a hint.