* [gentoo-commits] repo/gentoo:master commit in: net-wireless/urh/files/, net-wireless/urh/
@ 2023-08-21 0:51 Rick Farina
0 siblings, 0 replies; 3+ messages in thread
From: Rick Farina @ 2023-08-21 0:51 UTC (permalink / raw
To: gentoo-commits
commit: 7f77e7cfc04dfa30f9b1f5a3697a7728a857e377
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 00:50:37 2023 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 00:51:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f77e7cf
net-wireless/urh: fix AttributeError build error
Closes: https://bugs.gentoo.org/909647
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/urh/files/urh-2.9.4-no-numpy-setup.patch | 11 +++++++++++
net-wireless/urh/urh-2.9.4.ebuild | 6 ++++--
net-wireless/urh/urh-9999.ebuild | 6 ++++--
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/net-wireless/urh/files/urh-2.9.4-no-numpy-setup.patch b/net-wireless/urh/files/urh-2.9.4-no-numpy-setup.patch
new file mode 100644
index 000000000000..4beca0eed64f
--- /dev/null
+++ b/net-wireless/urh/files/urh-2.9.4-no-numpy-setup.patch
@@ -0,0 +1,11 @@
+diff -Naur urh-2.9.4-orig/setup.py urh-2.9.4/setup.py
+--- urh-2.9.4-orig/setup.py 2023-08-20 20:31:45.067321480 -0400
++++ urh-2.9.4/setup.py 2023-08-20 20:31:55.088320822 -0400
+@@ -50,7 +50,6 @@
+ print("Finalizing options")
+ _build_ext.finalize_options(self)
+ # Prevent numpy from thinking it is still in its setup process:
+- __builtins__.__NUMPY_SETUP__ = False
+ import numpy
+ self.include_dirs.append(numpy.get_include())
+
diff --git a/net-wireless/urh/urh-2.9.4.ebuild b/net-wireless/urh/urh-2.9.4.ebuild
index 503e4800fdec..fbf539dbce42 100644
--- a/net-wireless/urh/urh-2.9.4.ebuild
+++ b/net-wireless/urh/urh-2.9.4.ebuild
@@ -33,9 +33,9 @@ DEPEND="${PYTHON_DEPS}
audio? ( dev-python/pyaudio[${PYTHON_USEDEP}] )
bladerf? ( net-wireless/bladerf:= )
hackrf? ( net-libs/libhackrf:= )
- limesdr? ( net-wireless/limesuite:= )
+ limesdr? ( net-wireless/limesuite )
plutosdr? ( net-libs/libiio:= )
- rtlsdr? ( net-wireless/rtl-sdr:= )
+ rtlsdr? ( net-wireless/rtl-sdr )
sdrplay? ( <net-wireless/sdrplay-3.0.0:= )
uhd? ( net-wireless/uhd:= )"
RDEPEND="${DEPEND}
@@ -44,6 +44,8 @@ RDEPEND="${DEPEND}
distutils_enable_tests pytest
+PATCHES=( "${FILESDIR}/${P}-no-numpy-setup.patch" )
+
python_configure_all() {
DISTUTILS_ARGS=(
$(use_with airspy)
diff --git a/net-wireless/urh/urh-9999.ebuild b/net-wireless/urh/urh-9999.ebuild
index 503e4800fdec..ed1d620f7de7 100644
--- a/net-wireless/urh/urh-9999.ebuild
+++ b/net-wireless/urh/urh-9999.ebuild
@@ -33,9 +33,9 @@ DEPEND="${PYTHON_DEPS}
audio? ( dev-python/pyaudio[${PYTHON_USEDEP}] )
bladerf? ( net-wireless/bladerf:= )
hackrf? ( net-libs/libhackrf:= )
- limesdr? ( net-wireless/limesuite:= )
+ limesdr? ( net-wireless/limesuite )
plutosdr? ( net-libs/libiio:= )
- rtlsdr? ( net-wireless/rtl-sdr:= )
+ rtlsdr? ( net-wireless/rtl-sdr )
sdrplay? ( <net-wireless/sdrplay-3.0.0:= )
uhd? ( net-wireless/uhd:= )"
RDEPEND="${DEPEND}
@@ -45,6 +45,8 @@ RDEPEND="${DEPEND}
distutils_enable_tests pytest
python_configure_all() {
+ # Using sed in the live ebuild to avoid patch failure
+ sed -i '/__NUMPY_SETUP__/d' setup.py || die
DISTUTILS_ARGS=(
$(use_with airspy)
$(use_with bladerf)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/urh/files/, net-wireless/urh/
@ 2024-05-20 19:50 Rick Farina
0 siblings, 0 replies; 3+ messages in thread
From: Rick Farina @ 2024-05-20 19:50 UTC (permalink / raw
To: gentoo-commits
commit: 8d7f51177546c65aa48617a7a4d499a6b67bb9a6
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon May 20 19:50:00 2024 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon May 20 19:50:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d7f5117
net-wireless/urh: drop 2.9.5
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/urh/Manifest | 1 -
.../urh/files/urh-2.9.4-no-numpy-setup.patch | 11 ---
net-wireless/urh/urh-2.9.5.ebuild | 81 ----------------------
3 files changed, 93 deletions(-)
diff --git a/net-wireless/urh/Manifest b/net-wireless/urh/Manifest
index 36f73818b9a8..53c9535a3d2d 100644
--- a/net-wireless/urh/Manifest
+++ b/net-wireless/urh/Manifest
@@ -1,2 +1 @@
-DIST urh-2.9.5.tar.gz 13414599 BLAKE2B efe075e78dd7b289d21d93675be420e8e5e69293eb1f5e61025a9b0a7db60f4e2cae29d94af03fa9e42a6941edda9667a935b201a8838c0204e61008d2883b56 SHA512 7f04f041963103aab4a67fd5fd8f874339cad04da846236b0ec4584553ae6b4a6469c2505cec7c67f72d848d0eb90a4996753802c65535914e70a943d40e6970
DIST urh-2.9.6_p20240428.gh.tar.gz 13439550 BLAKE2B ad71275f2a3d0c5a680bac361949a70d1eb9a0fe496d720bbc831ef1e34b40ed187106825a295e421bf9e224de5f65cc4ed2791839307bbb75f900ba4f05aa61 SHA512 a278d4b5fcd09cf61cc63341545604882591b6732009ca61b41aa58c71666410175d7b75106c56f43dfd538db287a38f14288cc3d2dbde0260caef370850af03
diff --git a/net-wireless/urh/files/urh-2.9.4-no-numpy-setup.patch b/net-wireless/urh/files/urh-2.9.4-no-numpy-setup.patch
deleted file mode 100644
index 4beca0eed64f..000000000000
--- a/net-wireless/urh/files/urh-2.9.4-no-numpy-setup.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur urh-2.9.4-orig/setup.py urh-2.9.4/setup.py
---- urh-2.9.4-orig/setup.py 2023-08-20 20:31:45.067321480 -0400
-+++ urh-2.9.4/setup.py 2023-08-20 20:31:55.088320822 -0400
-@@ -50,7 +50,6 @@
- print("Finalizing options")
- _build_ext.finalize_options(self)
- # Prevent numpy from thinking it is still in its setup process:
-- __builtins__.__NUMPY_SETUP__ = False
- import numpy
- self.include_dirs.append(numpy.get_include())
-
diff --git a/net-wireless/urh/urh-2.9.5.ebuild b/net-wireless/urh/urh-2.9.5.ebuild
deleted file mode 100644
index 656c0488c09c..000000000000
--- a/net-wireless/urh/urh-2.9.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 virtualx
-
-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"
-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="airspy audio bladerf hackrf limesdr plutosdr rtlsdr sdrplay 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}]
- airspy? ( net-wireless/airspy:= )
- audio? ( dev-python/pyaudio[${PYTHON_USEDEP}] )
- bladerf? ( net-wireless/bladerf:= )
- hackrf? ( net-libs/libhackrf:= )
- limesdr? ( net-wireless/limesuite )
- plutosdr? ( net-libs/libiio:= )
- rtlsdr? ( net-wireless/rtl-sdr )
- sdrplay? ( <net-wireless/sdrplay-3.0.0:= )
- uhd? ( net-wireless/uhd:= )"
-RDEPEND="${DEPEND}
- dev-python/PyQt5[${PYTHON_USEDEP},testlib]
- net-wireless/gr-osmosdr"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/${PN}-2.9.4-no-numpy-setup.patch" )
-
-python_configure_all() {
- DISTUTILS_ARGS=(
- $(use_with airspy)
- $(use_with bladerf)
- $(use_with hackrf)
- $(use_with limesdr)
- $(use_with plutosdr)
- $(use_with rtlsdr)
- $(use_with sdrplay)
- $(use_with uhd usrp)
- )
-}
-
-src_test() {
- virtx distutils-r1_src_test
-}
-
-python_test() {
- # Why are these disabled?
- # import errors AND hangs forever after 'tests/test_spectrogram.py::TestSpectrogram::test_cancel_filtering'
- # import errors 'tests/test_continuous_modulator.py::TestContinuousModulator::test_modulate_continuously'
- # import errors 'tests/test_send_recv_dialog_gui.py::TestSendRecvDialog::test_continuous_send_dialog'
- # import errors 'tests/test_spectrogram.py::TestSpectrogram::test_channel_separation_with_negative_frequency'
- local EPYTEST_DESELECT=(
- 'tests/test_spectrogram.py::TestSpectrogram::test_cancel_filtering'
- 'tests/test_continuous_modulator.py::TestContinuousModulator::test_modulate_continuously'
- 'tests/test_send_recv_dialog_gui.py::TestSendRecvDialog::test_continuous_send_dialog'
- 'tests/test_spectrogram.py::TestSpectrogram::test_channel_separation_with_negative_frequency'
-
- )
- cd "${T}" || die
- epytest -s --pyargs urh.cythonext "${S}/tests" || die
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/urh/files/, net-wireless/urh/
@ 2024-05-20 19:50 Rick Farina
0 siblings, 0 replies; 3+ messages in thread
From: Rick Farina @ 2024-05-20 19:50 UTC (permalink / raw
To: gentoo-commits
commit: bd3493ceb54e81958ec407febf85855ad60c8753
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon May 20 19:48:11 2024 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon May 20 19:50:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd3493ce
net-wireless/urh: add 2.9.6_p20240428
Bumping a little past the last release because this version actually
passes tests :-)
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/urh/Manifest | 1 +
net-wireless/urh/files/urh-2.9.7-no-numpy-setup.patch | 11 +++++++++++
.../urh/{urh-9999.ebuild => urh-2.9.6_p20240428.ebuild} | 13 ++++++++-----
net-wireless/urh/urh-9999.ebuild | 4 ++--
4 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/net-wireless/urh/Manifest b/net-wireless/urh/Manifest
index 95d76c41da5c..debae21374f9 100644
--- a/net-wireless/urh/Manifest
+++ b/net-wireless/urh/Manifest
@@ -1,2 +1,3 @@
DIST urh-2.9.4.tar.gz 13415656 BLAKE2B 504cb073540f614eea070a7aaa83ac62f81c6a115a01f935cfc39baec37bc1deb5b56035100700825f41b21ec0937d6014f0d0b73debcbf9ca951e238805d64b SHA512 a888c20a4d2f349960e41defdb5cce6590d4523f8a1a655e21e4caaf7dd98a6f51936fa5a038787cb5935bc42e8863d2940059130dc9982caeea4b80e431aeeb
DIST urh-2.9.5.tar.gz 13414599 BLAKE2B efe075e78dd7b289d21d93675be420e8e5e69293eb1f5e61025a9b0a7db60f4e2cae29d94af03fa9e42a6941edda9667a935b201a8838c0204e61008d2883b56 SHA512 7f04f041963103aab4a67fd5fd8f874339cad04da846236b0ec4584553ae6b4a6469c2505cec7c67f72d848d0eb90a4996753802c65535914e70a943d40e6970
+DIST urh-2.9.6_p20240428.gh.tar.gz 13439550 BLAKE2B ad71275f2a3d0c5a680bac361949a70d1eb9a0fe496d720bbc831ef1e34b40ed187106825a295e421bf9e224de5f65cc4ed2791839307bbb75f900ba4f05aa61 SHA512 a278d4b5fcd09cf61cc63341545604882591b6732009ca61b41aa58c71666410175d7b75106c56f43dfd538db287a38f14288cc3d2dbde0260caef370850af03
diff --git a/net-wireless/urh/files/urh-2.9.7-no-numpy-setup.patch b/net-wireless/urh/files/urh-2.9.7-no-numpy-setup.patch
new file mode 100644
index 000000000000..c60b2c766197
--- /dev/null
+++ b/net-wireless/urh/files/urh-2.9.7-no-numpy-setup.patch
@@ -0,0 +1,11 @@
+diff -Naur urh-2.9.4-orig/setup.py urh-2.9.4/setup.py
+--- urh-2.9.4-orig/setup.py 2023-08-20 20:31:45.067321480 -0400
++++ urh-2.9.4/setup.py 2023-08-20 20:31:55.088320822 -0400
+@@ -50,7 +50,6 @@
+ print("Finalizing options")
+ _build_ext.finalize_options(self)
+ # Prevent numpy from thinking it is still in its setup process:
+- set_builtin("__NUMPY_SETUP__", False)
+ import numpy
+
+ self.include_dirs.append(numpy.get_include())
diff --git a/net-wireless/urh/urh-9999.ebuild b/net-wireless/urh/urh-2.9.6_p20240428.ebuild
similarity index 86%
copy from net-wireless/urh/urh-9999.ebuild
copy to net-wireless/urh/urh-2.9.6_p20240428.ebuild
index ed1d620f7de7..dc4f6ce3bf49 100644
--- a/net-wireless/urh/urh-9999.ebuild
+++ b/net-wireless/urh/urh-2.9.6_p20240428.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
DISTUTILS_EXT=1
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1 virtualx
@@ -15,7 +15,10 @@ if [ "${PV}" = "9999" ]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/jopohl/urh.git"
else
- SRC_URI="https://github.com/jopohl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ COMMIT="544efd35ac4e0105cb63a31f2dc209c3834bc7bd"
+ SRC_URI="https://github.com/jopohl/urh/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz"
+ S="${WORKDIR}/${PN}-${COMMIT}"
+ #SRC_URI="https://github.com/jopohl/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
@@ -44,9 +47,9 @@ RDEPEND="${DEPEND}
distutils_enable_tests pytest
+PATCHES=( "${FILESDIR}/${PN}-2.9.7-no-numpy-setup.patch" )
+
python_configure_all() {
- # Using sed in the live ebuild to avoid patch failure
- sed -i '/__NUMPY_SETUP__/d' setup.py || die
DISTUTILS_ARGS=(
$(use_with airspy)
$(use_with bladerf)
diff --git a/net-wireless/urh/urh-9999.ebuild b/net-wireless/urh/urh-9999.ebuild
index ed1d620f7de7..ea6072eaa290 100644
--- a/net-wireless/urh/urh-9999.ebuild
+++ b/net-wireless/urh/urh-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
DISTUTILS_EXT=1
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1 virtualx
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-20 19:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-20 19:50 [gentoo-commits] repo/gentoo:master commit in: net-wireless/urh/files/, net-wireless/urh/ Rick Farina
-- strict thread matches above, loose matches on Subject: below --
2024-05-20 19:50 Rick Farina
2023-08-21 0:51 Rick Farina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox