gentoo resync : 15.12.2019

4 files changed, 33 insertions, 5 deletions

diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index ba7e7f6979ce..3a4109c35905 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -1,5 +1,6 @@
+AUX hpack-3.0.0-hypothesis-healthcheck.patch 549 BLAKE2B 6177deb0b6a4de5fe5f2c65a82f8cd7eb7ef6140224070c0680b6c4646c111a063ec6a8c7d51ed2e56455eede1696abf6fb82f9d6d14d5aa81d58619b0c802bd SHA512 a1510a688d000b8f45ac48c39ba46336859f952356cf776d5204b512496c523e5dc622d16b17b50d0d6318bd94b817d52683e5f56287f0053ced2508cbf23259
 DIST hpack-2.3.0.tar.gz 41610 BLAKE2B 65fe4f07f64dddff5b24b3a84f7e49de32e358fa59bb1b21e619135ef33d282d4cd24283e93c71bb71c89d7b5b2a3f8ed36f6d406751c54247472a75192bf50b SHA512 a3d13da105482bb258ee3a2314b2629215028777f84127f71359f08819c96af088a3952bb0a74435472035d10ee6e3943cdad689a28f04cbc12cddcc4af9a8a7
 DIST hpack-3.0.0.tar.gz 5305971 BLAKE2B d1df8a1b2a1ce8b91e63cab475d3957f937fb74c0bec343d342971be1bb7cfbc929c53cf041845df2965cef0cfb098345bf0612acabc7ef3e5e23f6f0aa44f2f SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6
-EBUILD hpack-2.3.0-r1.ebuild 1037 BLAKE2B c2991cd6490a465965d1cb00d858a4808089b6e03d5ad7abca3bdde4ab74c9fa39750f67b52d792fd23ebce737b992b6ecb168f3cae75d7415982bfe9a44b1f1 SHA512 710a920578d1f33c504c310719fb5efc63a5f78bf35055878af4b70d4be29917c5e53332b263c31542e8f1d6f720ddc002642fb96b03d996977883f4d16a32fb
-EBUILD hpack-3.0.0.ebuild 1065 BLAKE2B 3f7a1cd145eb61722abc085e7f949d7d7d36db1ce6bae996dcb1b274be442c7387960f8890c986b1db0567ebf61124596c6a46f507b1c1a70927aabc69756334 SHA512 8b6e00e94643979dd0144431255106cd2930f54d4cd5d280fbc640f31e45937167f1d21f1eecec9442d2ce1957474cd01c44de4b426816076a4519ccaf2d5a4f
+EBUILD hpack-2.3.0-r1.ebuild 1064 BLAKE2B de6d1135df9e31e20cb7ca982919bdaba07f828d439ec308badd5d66b820a3da54d9fd8b45a8c71038d6979327756c53670a2c074d61bcf51c3a9f3774ef9671 SHA512 c5a73dea917b82bf713c5562d77703dbe9de7215aa9fcf54bbd7ff3ce83ca6d6dc40417f667a97710c95400d8ddf6cd040b050e8fd40c7d92c1c171d1ab7b2ed
+EBUILD hpack-3.0.0.ebuild 1160 BLAKE2B d9b0eb6231c6599b5a2a413cbbb4d2d2a2ac4bdd2ce985cd8d23649c4cc0713716f79965cc4a7ce68d3b0556009828ffa1c0732dcb593b5e9a714cddee6f4071 SHA512 abcee4af5ffaccd10291636ec176b3e2dd33db3b8dc963e8b89232e1ac8baa696cf194322b062cba2d61d7b3af32d16ccae9bc1e4f8cff815b4d5f74a4e8d5b8
 MISC metadata.xml 677 BLAKE2B 1440fcf100740188ffc8ae85da9bc014004feb2aa04d5f5db73546e62a01ffbe0975b9b588e6d579c45a2b1c803958999dbdd1cad8c1cbee597a3202556b7d4b SHA512 b7d64d3fa13e9e2f7a794aab733b511ec37809294b0c353d9cff55950dca47e57da8b5b5b80ffb0763f509a498816f94586c11dfdb569ecc6fa604f75c7a6132
diff --git a/dev-python/hpack/files/hpack-3.0.0-hypothesis-healthcheck.patch b/dev-python/hpack/files/hpack-3.0.0-hypothesis-healthcheck.patch
new file mode 100644
index 000000000000..aaabac3b3046
--- /dev/null
+++ b/dev-python/hpack/files/hpack-3.0.0-hypothesis-healthcheck.patch
@@ -0,0 +1,21 @@
+diff --git a/test/conftest.py b/test/conftest.py
+index f5801da..c5e3c66 100644
+--- a/test/conftest.py
++++ b/test/conftest.py
+@@ -4,11 +4,16 @@ import os
+ import json
+ import sys
+ 
++from hypothesis import settings, HealthCheck
+ from hypothesis.strategies import text
+ 
+ if sys.version_info[0] == 2:
+     from codecs import open
+ 
++settings.register_profile("gentoo",
++        suppress_health_check=(HealthCheck.too_slow,))
++settings.load_profile("gentoo")
++
+ # We need to grab one text example from hypothesis to prime its cache.
+ text().example()
+ 
diff --git a/dev-python/hpack/hpack-2.3.0-r1.ebuild b/dev-python/hpack/hpack-2.3.0-r1.ebuild
index 15885fcb0354..d6771987760b 100644
--- a/dev-python/hpack/hpack-2.3.0-r1.ebuild
+++ b/dev-python/hpack/hpack-2.3.0-r1.ebuild
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
index 93a872a12ec6..8182bbb647f3 100644
--- a/dev-python/hpack/hpack-3.0.0.ebuild
+++ b/dev-python/hpack/hpack-3.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy)
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy)
 
 inherit distutils-r1
 
@@ -12,8 +12,9 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 # dev-python/pytest-relaxed causes tests to fail
@@ -25,6 +26,10 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/hpack-3.0.0-hypothesis-healthcheck.patch
+)
+
 python_prepare_all() {
 	# Remove a test that is not part of the mainstream tests
 	# Also, it's data directory is not included in the release
@@ -33,5 +38,5 @@ python_prepare_all() {
 }
 
 python_test() {
-	py.test -vv hpack test || die "Tests fail with ${EPYTHON}"
+	pytest -vv hpack test || die "Tests fail with ${EPYTHON}"
 }