gentoo resync : 25.04.2020

5 files changed, 17 insertions, 19 deletions

diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index b1b0d0973307..d6b5f508297e 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,11 +1,11 @@
-DIST hypothesis-python-4.47.5.tar.gz 6805022 BLAKE2B 737a558c794f3ac428bef4b38858d47fddba613ce37eb9a9554afa3c189776e9172965dd31f8497747ac13b2ab1d34ee6de8671646972e71b82c5260db489b9a SHA512 9b6920181dca75b9e551ae5e598101f35cfc26e9e3a1b20cab652c151bc6355413d0c9602d3242fb23f808ab00335793009df938d55ee19a6af1ce2a8b085e3c
 DIST hypothesis-python-4.50.8.tar.gz 6814518 BLAKE2B f2c39cae3708fe88d1854cda97633ba420c32fda38093bb852ef45929762cade0f7f0d1ef696ff96f7ebe7460e8bf53f63de9c959bbbd9e8ec162196d307aac0 SHA512 8c77439fd029e2380afbc059d2edf977414997ba81ecdfde14dfe9dbe9515a92e701751d13879c6b879271f817e01926c2dc66945ae76eb141818da1775bc545
 DIST hypothesis-python-4.57.1.tar.gz 9005030 BLAKE2B 3d318896cbe2d24fa6847e764a109791d3acf3821852f8e170991b0be5b069f166e16bdacf7a82fbe49bd9db5188315cdec7cdb4592647571233949ec5732991 SHA512 28622ce8a1d89d09df65f3fbf7e92a1ad98dac140ab646fe11fcb15e6aa9a9672eb51d459f984384d92b819f902de911b06cec2542582d529dd556d2f99ed952
-DIST hypothesis-python-5.7.2.tar.gz 8998488 BLAKE2B a6566ffeea7563c9a1824d9aafbdf54de7bc2a3b8aaad457805702e413101b49fef77a922e14d272cd89e2a9d9cfbcdfdb3cfe22f157ee05d7d8cc8e52044654 SHA512 909bd16055805a77f398f91d651f724a12504868d4d24c5d60c357cf2c332e7fe3cec9f8b4c6ef41a449df117b73638e9be8be5807492290837710d810c0319b
-DIST hypothesis-python-5.8.0.tar.gz 9001523 BLAKE2B a72d86fa22902c33eaee870a67738e251e20036897af086de82917d5f41254886abba60355fefeffda592afd9919a907a6822547ad824ad8a67650a669ac9700 SHA512 60e355e2f3a03264fff852f422fcceec6ca621e28ea63e100f85ab0144a8e291e7fada78e82ad55623c0bfba971008a059bc125eff89c82d5ddfbfca88e4d43c
-EBUILD hypothesis-4.47.5.ebuild 1712 BLAKE2B 61c7724bb4982c1966f45f6f9cb2ad8d8047317ea08bd50b117150f04dd8025c6f0ca6305d25c735cd4aec1b3e936c50fb4b2e4a3f095fc262d2463d5b1e9552 SHA512 cfaa7a57cb1e38525456dd022467ef07a198828469768e0cf37ad1daa1e6be05c7b6e125761524eaa9f274615b030476790e4a248c39f7bfb9dceadcb73ad8fc
+DIST hypothesis-python-5.10.2.tar.gz 9006040 BLAKE2B 7ea925988ba600f59e48fcd18b85aaa2bec5a3f2a279b19be959e03fdf61e5c4ce75a781e70aa9138db86637f16fbb5d82118e7501f1d1c785345ecf7c5d1568 SHA512 a83bb6f368706ad3d31fc7cf4b4b3d27937dc540d6f44f592bfbd7f4380e045b6c71a08c5c977a4a3e16ac9b20f16caabb775cb387ce2576193d133acfa3773e
+DIST hypothesis-python-5.10.3.tar.gz 9006973 BLAKE2B dd7669c159aad1a8228e85b50e6362129a0cdbb6aea3715e8583b4896de18def8de1ec4fda878517fc2dac8694dbbd6106f65cbfda81801469efbc3569ccd491 SHA512 708361d3fb7cdf1cf030711175fd6ea2d936d781967ab3c53c816085099f487c918506b98d724465c7df75df3a07e65a1b59d4ccc73c7730be071ccfc878f7e0
+DIST hypothesis-python-5.10.4.tar.gz 9007617 BLAKE2B 47e82ae1deae77f1d658093ae6578a70371792468185691bb5a6efa12349eb0df4511e19167fa89593a6af63d93ac6cae8bdd21048e87d952f3b351cf44677f0 SHA512 a22613ddb3d5bb9c038765e75269ff2e4b6351d6eac64267ad2f9ec6add0293ef21143ac9a0af20f2d858a0226e977ffca40e0b2929e92876fa702695d94b3fd
 EBUILD hypothesis-4.50.8.ebuild 1712 BLAKE2B 95c6f8df5214b00e6c9be409c708e756024fd76ec0f56da54d92f417a26da4c912c3b20c1af086e26d3db594583bb5c9c6a8ae5ea90077d5f22dcd8c17e2da9a SHA512 0ad845bff356a4746ad94df6ae7f082ff93aa18053228622d282c244a36ffad5f167345e3a880c6611376a427e07d935c3613631b69453cd71fc3c4ae6fe4c83
-EBUILD hypothesis-4.57.1.ebuild 1727 BLAKE2B e264576eb2779751d1aede986b034056b643abaa158c1053eaa42f5230fa18d7b3952eab3d1325f3943a849eec8b7e35705de8364232f676e4f5d8aab7740364 SHA512 91e25609a1f68970fb0372fac83fa770510f2498f173927c7f172ea0a0ef2f96b2e4ea8d4f67fca81875396a1f4a4bc1d13b254399dcbdc4a39acf6a462c570e
-EBUILD hypothesis-5.7.2.ebuild 1580 BLAKE2B 5f6a81f9917710023a0bf72e03755a10c3a6a49cf1d0d2efef49a6654609b84e71e8075ad282d580d298a307f7d156c72ed4383bb39b62f43aeece4639098ba9 SHA512 a286391c85d9233188e90f437c7766bc10d8caed9eda8522f2edfc5c4db46ebb1472c588549db337305e28822002be3a032442a1e0cc1fb39154c8691b2df1b3
-EBUILD hypothesis-5.8.0.ebuild 1580 BLAKE2B 5f6a81f9917710023a0bf72e03755a10c3a6a49cf1d0d2efef49a6654609b84e71e8075ad282d580d298a307f7d156c72ed4383bb39b62f43aeece4639098ba9 SHA512 a286391c85d9233188e90f437c7766bc10d8caed9eda8522f2edfc5c4db46ebb1472c588549db337305e28822002be3a032442a1e0cc1fb39154c8691b2df1b3
+EBUILD hypothesis-4.57.1.ebuild 1733 BLAKE2B cdcb28b6d9d1727a5fd28ba61abeafe2a665316429e4584f7cb4db6767d7cd28554fc80048b610489d5d40c047a978ce76ddba91d7569dcdaf208407cc239575 SHA512 4b9687bc8db580bdb44c2dd24c03eb1c4ed7dbf56c2413b1c98bb72e6f9e5ba4d9c812da71f589d628fb66cefad2f5bc7dd92e2dcae4a1d04534c74f2b7d73d6
+EBUILD hypothesis-5.10.2.ebuild 1586 BLAKE2B a4e4cf374d2432c1715b94be5690069ee808156a7fe0e6c5631068002162753ae7c3da70d875809f80c9b8be43beb586f70715c5c101f7617ad57fda5c663ced SHA512 a0b3faf6e5749ea1f20cc4ef20cc98a30ea916268bca4137707b84ee54e0c0501c32eb5e4f747a85f3fec8e5f50daf593bf0c6fdd803439d5061d84cc065d9c0
+EBUILD hypothesis-5.10.3.ebuild 1586 BLAKE2B a4e4cf374d2432c1715b94be5690069ee808156a7fe0e6c5631068002162753ae7c3da70d875809f80c9b8be43beb586f70715c5c101f7617ad57fda5c663ced SHA512 a0b3faf6e5749ea1f20cc4ef20cc98a30ea916268bca4137707b84ee54e0c0501c32eb5e4f747a85f3fec8e5f50daf593bf0c6fdd803439d5061d84cc065d9c0
+EBUILD hypothesis-5.10.4.ebuild 1586 BLAKE2B a4e4cf374d2432c1715b94be5690069ee808156a7fe0e6c5631068002162753ae7c3da70d875809f80c9b8be43beb586f70715c5c101f7617ad57fda5c663ced SHA512 a0b3faf6e5749ea1f20cc4ef20cc98a30ea916268bca4137707b84ee54e0c0501c32eb5e4f747a85f3fec8e5f50daf593bf0c6fdd803439d5061d84cc065d9c0
 MISC metadata.xml 643 BLAKE2B f8871008e348f0d703ddbee0ce13928f14800f3c10a9f440e9afaa881ee8eb916aed20112469a40d6f7bd899848aa70a36de1d857374fd32fa6b127888be0cb2 SHA512 618ee045f44c096c6402a549ac2ec3abbff25aa76e511c326f8a8ea470bb33a1e5cb1bb1b7b4e149c911ccbd08f69ff72b99edcd92fe9e1237055515b19bd514
diff --git a/dev-python/hypothesis/hypothesis-4.57.1.ebuild b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
index f9b625b8daa4..b35cbaa84735 100644
--- a/dev-python/hypothesis/hypothesis-4.57.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.7.2.ebuild b/dev-python/hypothesis/hypothesis-5.10.2.ebuild
index d58e54d707b8..161feb37e789 100644
--- a/dev-python/hypothesis/hypothesis-5.7.2.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.10.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.8.0.ebuild b/dev-python/hypothesis/hypothesis-5.10.3.ebuild
index d58e54d707b8..161feb37e789 100644
--- a/dev-python/hypothesis/hypothesis-5.8.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.10.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-4.47.5.ebuild b/dev-python/hypothesis/hypothesis-5.10.4.ebuild
index cdf91f0a1bf4..161feb37e789 100644
--- a/dev-python/hypothesis/hypothesis-4.47.5.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.10.4.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1 eutils
@@ -11,30 +12,28 @@ inherit distutils-r1 eutils
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
 SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.3[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
 		!!<dev-python/typing-3.7.4.1
 	)
 "
 
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
 src_prepare() {
 	# avoid pytest-xdist dep for one test
 	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
@@ -43,8 +42,7 @@ src_prepare() {
 }
 
 python_test() {
-	local pyver=$(python_is_python3 && echo 3 || echo 2)
-	pytest -vv tests/cover tests/pytest tests/py${pyver} ||
+	pytest -vv tests/cover tests/pytest tests/quality ||
 		die "Tests fail with ${EPYTHON}"
 }