gentoo auto-resync : 21:05:2024 - 00:05:35

6 files changed, 15 insertions, 95 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index b345607a7f92..d9af98088427 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/urh/Manifest b/net-wireless/urh/Manifest
index 94c0d0de46ca..ad7887001447 100644
--- a/net-wireless/urh/Manifest
+++ b/net-wireless/urh/Manifest
@@ -1,7 +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
-DIST urh-2.9.5.tar.gz 13414599 BLAKE2B efe075e78dd7b289d21d93675be420e8e5e69293eb1f5e61025a9b0a7db60f4e2cae29d94af03fa9e42a6941edda9667a935b201a8838c0204e61008d2883b56 SHA512 7f04f041963103aab4a67fd5fd8f874339cad04da846236b0ec4584553ae6b4a6469c2505cec7c67f72d848d0eb90a4996753802c65535914e70a943d40e6970
-EBUILD urh-2.9.4.ebuild 2591 BLAKE2B edd953cd1557981d87037df9aac707cd5acf0d47794d38d23704f0073bee2d21b154a442302688d7b8e463bcea59543855df7fe6d493e8f1a26470e0940cc1ad SHA512 38bf2256ef04cfe184c99655174dd135cdd8becad51b3bb1adad8ebf6475b6c30c180c1956de028266b4448d25b435e0b8c6e09d66d466f43881f54220e8e468
-EBUILD urh-2.9.5.ebuild 2598 BLAKE2B 001d7c5156b034c616b8c4fa823accf21f4c2335746b2ba713b3543cb26ef22f3cb52a2d3cd5ed3f9c93a371934ae311967ae1373e5eabd083a61de66bdb69c3 SHA512 ebff45df0a7232d37faeda03a1535a5095eda57025517642f8a79eb2b603faa20c58d70400176c94a21da2aca4bfdb9085c5aaca2c8fd7bd27380fb246ce9f6e
-EBUILD urh-9999.ebuild 2638 BLAKE2B 914eb114d22d0279b8faab509b333b1b0593f2150901418ac1a53e8f61bf4b5aa8dbd00d5dd67bfd772af2eba697ad429bb1abb84f2e0b3715d7bc15f623afeb SHA512 af3f20a2efd9c80efc6121d2c101dcd6be8ed539ba772f1529f5bed22e05825d7c3b613c02e8d853b8dba0d067aec2afdb6b6c54063d722381a4195da69b56f7
+AUX urh-2.9.7-no-numpy-setup.patch 473 BLAKE2B c283864f38ae441d141c0e9c59e2f06a66dd6dbbc8e447370b154f5571ca908cf6572f7755833b8330f95be60629da67df158124ca94fbb0dda190d199395f34 SHA512 7f86d138839439a8512b1f1691217406653c49494cb7f55defc70a05e1e97bc5f79b5e0fa8cda4239f2e25584a713684a5af7ab1935947acecb96b2b6b6e8221
+DIST urh-2.9.6_p20240428.gh.tar.gz 13439550 BLAKE2B ad71275f2a3d0c5a680bac361949a70d1eb9a0fe496d720bbc831ef1e34b40ed187106825a295e421bf9e224de5f65cc4ed2791839307bbb75f900ba4f05aa61 SHA512 a278d4b5fcd09cf61cc63341545604882591b6732009ca61b41aa58c71666410175d7b75106c56f43dfd538db287a38f14288cc3d2dbde0260caef370850af03
+EBUILD urh-2.9.6_p20240428.ebuild 2769 BLAKE2B 0d82b7086551e78cafd9e2ffda082a23068c1fdea1bb5697357228f760d6e81186b734a814763fa22bd0439375c609415acd29cc4ce4717052951b6506c5e9bf SHA512 b6011aaa4a48a41adbb422ef32e8023eabbb1ee9ed8ab88619e2f2409f6feef72cf36a10dd346ac564380f414a850d03e95463452be59749628ca0dd30668dfd
+EBUILD urh-9999.ebuild 2638 BLAKE2B b3b03f2d42cc83603151513ad40518443fd5fc9b48b20837cce16d43c12af830abcb2af7216bd3b62f4bd69d827ba47691f7301f871be9ff05d78e1da8fa7198 SHA512 e274b204bd0caf8a8bbaf5467d12db45a2d6b5d84842ab10e63cf63d752a302bb192e3274bb08d7447289fe18df1aef12569b2966aa87e42cf89189a42d84d8f
 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.7-no-numpy-setup.patch
index 4beca0eed64f..c60b2c766197 100644
--- a/net-wireless/urh/files/urh-2.9.4-no-numpy-setup.patch
+++ b/net-wireless/urh/files/urh-2.9.7-no-numpy-setup.patch
@@ -5,7 +5,7 @@ diff -Naur urh-2.9.4-orig/setup.py urh-2.9.4/setup.py
          print("Finalizing options")
          _build_ext.finalize_options(self)
          # Prevent numpy from thinking it is still in its setup process:
--        __builtins__.__NUMPY_SETUP__ = False
+-        set_builtin("__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
-}
diff --git a/net-wireless/urh/urh-2.9.4.ebuild b/net-wireless/urh/urh-2.9.6_p20240428.ebuild
index fbf539dbce42..dc4f6ce3bf49 100644
--- a/net-wireless/urh/urh-2.9.4.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,7 +47,7 @@ RDEPEND="${DEPEND}
 
 distutils_enable_tests pytest
 
-PATCHES=( "${FILESDIR}/${P}-no-numpy-setup.patch" )
+PATCHES=( "${FILESDIR}/${PN}-2.9.7-no-numpy-setup.patch" )
 
 python_configure_all() {
 	DISTUTILS_ARGS=(
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