From c3bb20728e45505d9b4a48164f37bb3288577d67 Mon Sep 17 00:00:00 2001 From: Rick Farina Date: Tue, 25 Feb 2020 13:39:45 -0500 Subject: [PATCH] Revert "dev-python/pyzmq: Remove py2" This reverts commit 3635fb57325467c27cf380249690345080c0b082. Needed by net-wireless/urh and probably net-wireless/gnuradio Signed-off-by: Rick Farina --- dev-python/pyzmq/pyzmq-16.0.2.ebuild | 5 ++++- dev-python/pyzmq/pyzmq-17.1.0.ebuild | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dev-python/pyzmq/pyzmq-16.0.2.ebuild b/dev-python/pyzmq/pyzmq-16.0.2.ebuild index c6f982a73c26..914737e0cb2b 100644 --- a/dev-python/pyzmq/pyzmq-16.0.2.ebuild +++ b/dev-python/pyzmq/pyzmq-16.0.2.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python2_7 python3_{6,7} ) PYTHON_REQ_USE="threads(+)" inherit flag-o-matic distutils-r1 toolchain-funcs @@ -22,11 +22,13 @@ RDEPEND=" >=net-libs/zeromq-4.1.2:= dev-python/py[${PYTHON_USEDEP}] dev-python/cffi:=[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7) " DEPEND="${RDEPEND} dev-python/cython[${PYTHON_USEDEP}] test? ( dev-python/pytest[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2) www-servers/tornado[${PYTHON_USEDEP}] ) doc? ( @@ -51,6 +53,7 @@ python_compile_all() { python_compile() { esetup.py cython --force + python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" distutils-r1_python_compile } diff --git a/dev-python/pyzmq/pyzmq-17.1.0.ebuild b/dev-python/pyzmq/pyzmq-17.1.0.ebuild index e7d8b211d806..90216948f4ff 100644 --- a/dev-python/pyzmq/pyzmq-17.1.0.ebuild +++ b/dev-python/pyzmq/pyzmq-17.1.0.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python2_7 python3_{6,7} ) PYTHON_REQ_USE="threads(+)" inherit flag-o-matic distutils-r1 toolchain-funcs @@ -22,11 +22,13 @@ RDEPEND=" >=net-libs/zeromq-4.2.2-r2:=[drafts] dev-python/py[${PYTHON_USEDEP}] dev-python/cffi:=[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7) " DEPEND="${RDEPEND} dev-python/cython[${PYTHON_USEDEP}] test? ( dev-python/pytest[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2) >=www-servers/tornado-5.0.2[${PYTHON_USEDEP}] ) doc? ( @@ -53,6 +55,7 @@ python_compile_all() { python_compile() { esetup.py cython --force + python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" distutils-r1_python_compile } -- 2.26.2