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)
