From 855f2ab2714a36dd2d3b757890b2449d3e9155f2 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 21 Aug 2023 03:42:55 +0100
Subject: gentoo auto-resync : 21:08:2023 - 03:42:55

---
 net-wireless/urh/Manifest                             |  5 +++--
 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 ++++--
 4 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 net-wireless/urh/files/urh-2.9.4-no-numpy-setup.patch

(limited to 'net-wireless/urh')

diff --git a/net-wireless/urh/Manifest b/net-wireless/urh/Manifest
index 6dee893210ab..d3aaf03a34dd 100644
--- a/net-wireless/urh/Manifest
+++ b/net-wireless/urh/Manifest
@@ -1,4 +1,5 @@
+AUX urh-2.9.4-no-numpy-setup.patch 473 BLAKE2B 0ab6a8f42fd5ae3fc1bb042596040f875dfec3765ecc0ba624758b156942dc59e7851d75e6230667692f28eda56f063301a5fbe292c3a88176f8b93899bc1d01 SHA512 f7369b6b6dfff596d46067b615c5271899ab8f2a6b1a67042c169b2f89d777cd3aa2e6d412cb8458c3eaa7f377db5db2a687f6be9249c5dbd696cd2edc763028
 DIST urh-2.9.4.tar.gz 13415656 BLAKE2B 504cb073540f614eea070a7aaa83ac62f81c6a115a01f935cfc39baec37bc1deb5b56035100700825f41b21ec0937d6014f0d0b73debcbf9ca951e238805d64b SHA512 a888c20a4d2f349960e41defdb5cce6590d4523f8a1a655e21e4caaf7dd98a6f51936fa5a038787cb5935bc42e8863d2940059130dc9982caeea4b80e431aeeb
-EBUILD urh-2.9.4.ebuild 2542 BLAKE2B edb86cb28d011030a79c04784861b53ef8698f3cd8f35eb772cc71b1fcebc75e6bb490914022a74875a49e39654598ea5a5a913f9cfbcad571fbae0ad0f388a0 SHA512 6d2c8772e6b60b736900a5c2dbd2f12d5bde1a3ab6ce7f39a2d63679c5b3c52628da44bcebbe6ba7306a7d889db6d05a5f04d767b0242b3a3661853c4654d016
-EBUILD urh-9999.ebuild 2542 BLAKE2B edb86cb28d011030a79c04784861b53ef8698f3cd8f35eb772cc71b1fcebc75e6bb490914022a74875a49e39654598ea5a5a913f9cfbcad571fbae0ad0f388a0 SHA512 6d2c8772e6b60b736900a5c2dbd2f12d5bde1a3ab6ce7f39a2d63679c5b3c52628da44bcebbe6ba7306a7d889db6d05a5f04d767b0242b3a3661853c4654d016
+EBUILD urh-2.9.4.ebuild 2591 BLAKE2B edd953cd1557981d87037df9aac707cd5acf0d47794d38d23704f0073bee2d21b154a442302688d7b8e463bcea59543855df7fe6d493e8f1a26470e0940cc1ad SHA512 38bf2256ef04cfe184c99655174dd135cdd8becad51b3bb1adad8ebf6475b6c30c180c1956de028266b4448d25b435e0b8c6e09d66d466f43881f54220e8e468
+EBUILD urh-9999.ebuild 2638 BLAKE2B 914eb114d22d0279b8faab509b333b1b0593f2150901418ac1a53e8f61bf4b5aa8dbd00d5dd67bfd772af2eba697ad429bb1abb84f2e0b3715d7bc15f623afeb SHA512 af3f20a2efd9c80efc6121d2c101dcd6be8ed539ba772f1529f5bed22e05825d7c3b613c02e8d853b8dba0d067aec2afdb6b6c54063d722381a4195da69b56f7
 MISC metadata.xml 1291 BLAKE2B ac1d540ddc87f3331c498b62d35204ce179cb3e329602e50f440d9bb0511a9096b7a1a40ac06a182716d32ede54cbcd2137e17ab76553cf58991623e343ec9dd SHA512 879febeeae3cef3a1ffd9e84fb65a70042c6a95fc0524d57a7fb5ad7d5a041371f041e2d804ed24d835911d41fcff5d42ac4a30a4b903ffddcefbb770123336b
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)
-- 
cgit v1.2.3