Merge updates from master

8 files changed, 44 insertions, 15 deletions

diff --git a/dev-python/colorspacious/colorspacious-1.1.2.ebuild b/dev-python/colorspacious/colorspacious-1.1.2.ebuild
index 11822ff871c6..ee8f6811f475 100644
--- a/dev-python/colorspacious/colorspacious-1.1.2.ebuild
+++ b/dev-python/colorspacious/colorspacious-1.1.2.ebuild
@@ -22,5 +22,5 @@ DEPEND="${RDEPEND}
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 python_test() {
-	nosetests --all-modules || die "Tests fail with ${EPYTHON}"
+	nosetests -v --all-modules || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/jsonschema/jsonschema-3.0.1.ebuild b/dev-python/jsonschema/jsonschema-3.0.1.ebuild
index 2831d238932f..f3875be46edf 100644
--- a/dev-python/jsonschema/jsonschema-3.0.1.ebuild
+++ b/dev-python/jsonschema/jsonschema-3.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
@@ -33,7 +33,10 @@ RDEPEND="
 	"
 DEPEND="${RDEPEND}
 	>=dev-python/vcversioner-2.16.0.0[${PYTHON_USEDEP}]
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+	)"
 
 python_test() {
 	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
diff --git a/dev-python/pyopencl/pyopencl-2017.2.ebuild b/dev-python/pyopencl/pyopencl-2017.2.ebuild
index f27666755022..3cd10cba090a 100644
--- a/dev-python/pyopencl/pyopencl-2017.2.ebuild
+++ b/dev-python/pyopencl/pyopencl-2017.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
 IUSE="examples opengl"
 
 RDEPEND="
diff --git a/dev-python/pyopencl/pyopencl-2019.1.2.ebuild b/dev-python/pyopencl/pyopencl-2019.1.2.ebuild
index 436d47db04a2..73b273d25bb7 100644
--- a/dev-python/pyopencl/pyopencl-2019.1.2.ebuild
+++ b/dev-python/pyopencl/pyopencl-2019.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE="examples opengl"
 
 RDEPEND="
diff --git a/dev-python/pytools/pytools-2017.4-r1.ebuild b/dev-python/pytools/pytools-2017.4-r1.ebuild
index fb72f5a49243..dfcbd576f345 100644
--- a/dev-python/pytools/pytools-2017.4-r1.ebuild
+++ b/dev-python/pytools/pytools-2017.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytools/pytools-2020.1.ebuild b/dev-python/pytools/pytools-2020.1.ebuild
index 72c7f0ada2b6..fd8e593b8554 100644
--- a/dev-python/pytools/pytools-2020.1.ebuild
+++ b/dev-python/pytools/pytools-2020.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/zstandard/files/zstandard-0.13.0-compiler.patch b/dev-python/zstandard/files/zstandard-0.13.0-compiler.patch
new file mode 100644
index 000000000000..fdaa4aa03922
--- /dev/null
+++ b/dev-python/zstandard/files/zstandard-0.13.0-compiler.patch
@@ -0,0 +1,26 @@
+diff --git a/make_cffi.py b/make_cffi.py
+index 0db4f71..4fe9cc4 100644
+--- a/make_cffi.py
++++ b/make_cffi.py
+@@ -8,6 +8,7 @@ from __future__ import absolute_import
+ 
+ import cffi
+ import distutils.ccompiler
++import distutils.sysconfig
+ import os
+ import re
+ import subprocess
+@@ -75,10 +76,12 @@ compiler = distutils.ccompiler.new_compiler()
+ if hasattr(compiler, "initialize"):
+     compiler.initialize()
+ 
++distutils.sysconfig.customize_compiler(compiler)
++
+ # Distutils doesn't set compiler.preprocessor, so invoke the preprocessor
+ # manually.
+ if compiler.compiler_type == "unix":
+-    args = list(compiler.executables["compiler"])
++    args = compiler.compiler
+     args.extend(
+         ["-E", "-DZSTD_STATIC_LINKING_ONLY", "-DZDICT_STATIC_LINKING_ONLY",]
+     )
diff --git a/dev-python/zstandard/zstandard-0.13.0.ebuild b/dev-python/zstandard/zstandard-0.13.0.ebuild
index 2b6a5215994b..59d51ed70dcc 100644
--- a/dev-python/zstandard/zstandard-0.13.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.13.0.ebuild
@@ -14,19 +14,19 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/cffi:=[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
 
+distutils_enable_tests setup.py
+
+PATCHES=(
+	# https://github.com/indygreg/python-zstandard/issues/103
+	"${FILESDIR}"/zstandard-0.13.0-compiler.patch
+)
+
 python_compile() {
 	local MAKEOPTS=-j1
 	distutils-r1_python_compile
 }
-
-python_test() {
-	esetup.py test
-}