mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 06:48:18 -07:00
Revert "Revert dev-python/pyzmq py2 and net-wireless/urh update"
This reverts commit 2294f62841.
Signed-off-by: Rick Farina <zerochaos@gentoo.org>
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_6 )
|
||||
inherit distutils-r1 eutils
|
||||
@@ -26,7 +26,7 @@ DEPEND="${PYTHON_DEPS}
|
||||
net-wireless/gnuradio[zeromq]
|
||||
dev-python/numpy[${PYTHON_USEDEP}]
|
||||
dev-python/psutil[${PYTHON_USEDEP}]
|
||||
dev-python/pyzmq[${PYTHON_USEDEP}]
|
||||
dev-python/pyzmq[python_targets_python2_7]
|
||||
dev-python/cython[${PYTHON_USEDEP}]
|
||||
bladerf? ( net-wireless/bladerf:= )
|
||||
hackrf? ( net-libs/libhackrf:= )
|
||||
@@ -1,7 +1,7 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_6 )
|
||||
inherit distutils-r1 eutils
|
||||
@@ -26,7 +26,7 @@ DEPEND="${PYTHON_DEPS}
|
||||
net-wireless/gnuradio[zeromq]
|
||||
dev-python/numpy[${PYTHON_USEDEP}]
|
||||
dev-python/psutil[${PYTHON_USEDEP}]
|
||||
dev-python/pyzmq[${PYTHON_USEDEP}]
|
||||
dev-python/pyzmq[python_targets_python2_7]
|
||||
dev-python/cython[${PYTHON_USEDEP}]
|
||||
bladerf? ( net-wireless/bladerf:= )
|
||||
hackrf? ( net-libs/libhackrf:= )
|
||||
|
||||
Reference in New Issue
Block a user