From 8a2e916215570beb95c893bb4c50aa7e914f0eb2 Mon Sep 17 00:00:00 2001
From: Rick Farina <zerochaos@gentoo.org>
Date: Wed, 26 Feb 2020 12:28:58 -0500
Subject: Revert "Revert dev-python/pyzmq py2 and net-wireless/urh update"

This reverts commit 2294f62841656970a6a9164115df73fc41cd279a.

Signed-off-by: Rick Farina <zerochaos@gentoo.org>
---
 net-wireless/urh/urh-2.8.3-r1.ebuild | 50 ++++++++++++++++++++++++++++++++++++
 net-wireless/urh/urh-2.8.3.ebuild    | 50 ------------------------------------
 net-wireless/urh/urh-9999.ebuild     |  4 +--
 3 files changed, 52 insertions(+), 52 deletions(-)
 create mode 100644 net-wireless/urh/urh-2.8.3-r1.ebuild
 delete mode 100644 net-wireless/urh/urh-2.8.3.ebuild

(limited to 'net-wireless')

diff --git a/net-wireless/urh/urh-2.8.3-r1.ebuild b/net-wireless/urh/urh-2.8.3-r1.ebuild
new file mode 100644
index 000000000000..c5cc8e3ff712
--- /dev/null
+++ b/net-wireless/urh/urh-2.8.3-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+inherit distutils-r1 eutils
+
+DESCRIPTION="Universal Radio Hacker: investigate wireless protocols like a boss"
+HOMEPAGE="https://github.com/jopohl/urh"
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jopohl/urh.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/jopohl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="bladerf hackrf plutosdr rtlsdr uhd"
+
+DEPEND="${PYTHON_DEPS}
+		net-wireless/gnuradio[zeromq]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyzmq[python_targets_python2_7]
+		dev-python/cython[${PYTHON_USEDEP}]
+		bladerf? ( net-wireless/bladerf:= )
+		hackrf? ( net-libs/libhackrf:= )
+		plutosdr? ( net-libs/libiio:= )
+		rtlsdr? ( net-wireless/rtl-sdr:= )
+		uhd?    ( net-wireless/uhd:= )"
+RDEPEND="${DEPEND}
+		dev-python/PyQt5[${PYTHON_USEDEP},testlib]
+		net-wireless/gr-osmosdr"
+
+python_configure_all() {
+	mydistutilsargs=(
+			$(use_with bladerf)
+			$(use_with hackrf)
+			$(use_with plutosdr)
+			$(use_with rtlsdr)
+			$(use_with uhd usrp)
+			--without-airspy
+			--without-limesdr
+			)
+}
diff --git a/net-wireless/urh/urh-2.8.3.ebuild b/net-wireless/urh/urh-2.8.3.ebuild
deleted file mode 100644
index 1c4f6ddf86f1..000000000000
--- a/net-wireless/urh/urh-2.8.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1 eutils
-
-DESCRIPTION="Universal Radio Hacker: investigate wireless protocols like a boss"
-HOMEPAGE="https://github.com/jopohl/urh"
-
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jopohl/urh.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/jopohl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="bladerf hackrf plutosdr rtlsdr uhd"
-
-DEPEND="${PYTHON_DEPS}
-		net-wireless/gnuradio[zeromq]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyzmq[${PYTHON_USEDEP}]
-		dev-python/cython[${PYTHON_USEDEP}]
-		bladerf? ( net-wireless/bladerf:= )
-		hackrf? ( net-libs/libhackrf:= )
-		plutosdr? ( net-libs/libiio:= )
-		rtlsdr? ( net-wireless/rtl-sdr:= )
-		uhd?    ( net-wireless/uhd:= )"
-RDEPEND="${DEPEND}
-		dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-		net-wireless/gr-osmosdr"
-
-python_configure_all() {
-	mydistutilsargs=(
-			$(use_with bladerf)
-			$(use_with hackrf)
-			$(use_with plutosdr)
-			$(use_with rtlsdr)
-			$(use_with uhd usrp)
-			--without-airspy
-			--without-limesdr
-			)
-}
diff --git a/net-wireless/urh/urh-9999.ebuild b/net-wireless/urh/urh-9999.ebuild
index 1c4f6ddf86f1..c5cc8e3ff712 100644
--- a/net-wireless/urh/urh-9999.ebuild
+++ b/net-wireless/urh/urh-9999.ebuild
@@ -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:= )
-- 
cgit v1.2.3-65-gdbad