| 1 |
commit: 8a2e916215570beb95c893bb4c50aa7e914f0eb2 |
| 2 |
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 26 17:28:58 2020 +0000 |
| 4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 26 17:28:58 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a2e9162 |
| 7 |
|
| 8 |
Revert "Revert dev-python/pyzmq py2 and net-wireless/urh update" |
| 9 |
|
| 10 |
This reverts commit 2294f62841656970a6a9164115df73fc41cd279a. |
| 11 |
|
| 12 |
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-python/pyzmq/pyzmq-16.0.2.ebuild | 5 ++++- |
| 15 |
dev-python/pyzmq/pyzmq-17.1.0.ebuild | 5 ++++- |
| 16 |
net-wireless/urh/{urh-2.8.3.ebuild => urh-2.8.3-r1.ebuild} | 4 ++-- |
| 17 |
net-wireless/urh/urh-9999.ebuild | 4 ++-- |
| 18 |
4 files changed, 12 insertions(+), 6 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-python/pyzmq/pyzmq-16.0.2.ebuild b/dev-python/pyzmq/pyzmq-16.0.2.ebuild |
| 21 |
index c6f982a73c2..914737e0cb2 100644 |
| 22 |
--- a/dev-python/pyzmq/pyzmq-16.0.2.ebuild |
| 23 |
+++ b/dev-python/pyzmq/pyzmq-16.0.2.ebuild |
| 24 |
@@ -3,7 +3,7 @@ |
| 25 |
|
| 26 |
EAPI=6 |
| 27 |
|
| 28 |
-PYTHON_COMPAT=( python3_{6,7} ) |
| 29 |
+PYTHON_COMPAT=( python2_7 python3_{6,7} ) |
| 30 |
PYTHON_REQ_USE="threads(+)" |
| 31 |
|
| 32 |
inherit flag-o-matic distutils-r1 toolchain-funcs |
| 33 |
@@ -22,11 +22,13 @@ RDEPEND=" |
| 34 |
>=net-libs/zeromq-4.1.2:= |
| 35 |
dev-python/py[${PYTHON_USEDEP}] |
| 36 |
dev-python/cffi:=[${PYTHON_USEDEP}] |
| 37 |
+ $(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7) |
| 38 |
" |
| 39 |
DEPEND="${RDEPEND} |
| 40 |
dev-python/cython[${PYTHON_USEDEP}] |
| 41 |
test? ( |
| 42 |
dev-python/pytest[${PYTHON_USEDEP}] |
| 43 |
+ $(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2) |
| 44 |
www-servers/tornado[${PYTHON_USEDEP}] |
| 45 |
) |
| 46 |
doc? ( |
| 47 |
@@ -51,6 +53,7 @@ python_compile_all() { |
| 48 |
|
| 49 |
python_compile() { |
| 50 |
esetup.py cython --force |
| 51 |
+ python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" |
| 52 |
distutils-r1_python_compile |
| 53 |
} |
| 54 |
|
| 55 |
|
| 56 |
diff --git a/dev-python/pyzmq/pyzmq-17.1.0.ebuild b/dev-python/pyzmq/pyzmq-17.1.0.ebuild |
| 57 |
index e7d8b211d80..90216948f4f 100644 |
| 58 |
--- a/dev-python/pyzmq/pyzmq-17.1.0.ebuild |
| 59 |
+++ b/dev-python/pyzmq/pyzmq-17.1.0.ebuild |
| 60 |
@@ -3,7 +3,7 @@ |
| 61 |
|
| 62 |
EAPI=6 |
| 63 |
|
| 64 |
-PYTHON_COMPAT=( python3_{6,7} ) |
| 65 |
+PYTHON_COMPAT=( python2_7 python3_{6,7} ) |
| 66 |
PYTHON_REQ_USE="threads(+)" |
| 67 |
|
| 68 |
inherit flag-o-matic distutils-r1 toolchain-funcs |
| 69 |
@@ -22,11 +22,13 @@ RDEPEND=" |
| 70 |
>=net-libs/zeromq-4.2.2-r2:=[drafts] |
| 71 |
dev-python/py[${PYTHON_USEDEP}] |
| 72 |
dev-python/cffi:=[${PYTHON_USEDEP}] |
| 73 |
+ $(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7) |
| 74 |
" |
| 75 |
DEPEND="${RDEPEND} |
| 76 |
dev-python/cython[${PYTHON_USEDEP}] |
| 77 |
test? ( |
| 78 |
dev-python/pytest[${PYTHON_USEDEP}] |
| 79 |
+ $(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2) |
| 80 |
>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}] |
| 81 |
) |
| 82 |
doc? ( |
| 83 |
@@ -53,6 +55,7 @@ python_compile_all() { |
| 84 |
|
| 85 |
python_compile() { |
| 86 |
esetup.py cython --force |
| 87 |
+ python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" |
| 88 |
distutils-r1_python_compile |
| 89 |
} |
| 90 |
|
| 91 |
|
| 92 |
diff --git a/net-wireless/urh/urh-2.8.3.ebuild b/net-wireless/urh/urh-2.8.3-r1.ebuild |
| 93 |
similarity index 95% |
| 94 |
rename from net-wireless/urh/urh-2.8.3.ebuild |
| 95 |
rename to net-wireless/urh/urh-2.8.3-r1.ebuild |
| 96 |
index 1c4f6ddf86f..c5cc8e3ff71 100644 |
| 97 |
--- a/net-wireless/urh/urh-2.8.3.ebuild |
| 98 |
+++ b/net-wireless/urh/urh-2.8.3-r1.ebuild |
| 99 |
@@ -1,7 +1,7 @@ |
| 100 |
# Copyright 1999-2020 Gentoo Authors |
| 101 |
# Distributed under the terms of the GNU General Public License v2 |
| 102 |
|
| 103 |
-EAPI=6 |
| 104 |
+EAPI=7 |
| 105 |
|
| 106 |
PYTHON_COMPAT=( python3_6 ) |
| 107 |
inherit distutils-r1 eutils |
| 108 |
@@ -26,7 +26,7 @@ DEPEND="${PYTHON_DEPS} |
| 109 |
net-wireless/gnuradio[zeromq] |
| 110 |
dev-python/numpy[${PYTHON_USEDEP}] |
| 111 |
dev-python/psutil[${PYTHON_USEDEP}] |
| 112 |
- dev-python/pyzmq[${PYTHON_USEDEP}] |
| 113 |
+ dev-python/pyzmq[python_targets_python2_7] |
| 114 |
dev-python/cython[${PYTHON_USEDEP}] |
| 115 |
bladerf? ( net-wireless/bladerf:= ) |
| 116 |
hackrf? ( net-libs/libhackrf:= ) |
| 117 |
|
| 118 |
diff --git a/net-wireless/urh/urh-9999.ebuild b/net-wireless/urh/urh-9999.ebuild |
| 119 |
index 1c4f6ddf86f..c5cc8e3ff71 100644 |
| 120 |
--- a/net-wireless/urh/urh-9999.ebuild |
| 121 |
+++ b/net-wireless/urh/urh-9999.ebuild |
| 122 |
@@ -1,7 +1,7 @@ |
| 123 |
# Copyright 1999-2020 Gentoo Authors |
| 124 |
# Distributed under the terms of the GNU General Public License v2 |
| 125 |
|
| 126 |
-EAPI=6 |
| 127 |
+EAPI=7 |
| 128 |
|
| 129 |
PYTHON_COMPAT=( python3_6 ) |
| 130 |
inherit distutils-r1 eutils |
| 131 |
@@ -26,7 +26,7 @@ DEPEND="${PYTHON_DEPS} |
| 132 |
net-wireless/gnuradio[zeromq] |
| 133 |
dev-python/numpy[${PYTHON_USEDEP}] |
| 134 |
dev-python/psutil[${PYTHON_USEDEP}] |
| 135 |
- dev-python/pyzmq[${PYTHON_USEDEP}] |
| 136 |
+ dev-python/pyzmq[python_targets_python2_7] |
| 137 |
dev-python/cython[${PYTHON_USEDEP}] |
| 138 |
bladerf? ( net-wireless/bladerf:= ) |
| 139 |
hackrf? ( net-libs/libhackrf:= ) |
Archives