gentoo auto-resync : 21:08:2023 - 03:42:55

8 files changed, 77 insertions, 18 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index a000c035dc49..c612d4bca80a 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/nanovna-saver/Manifest b/net-wireless/nanovna-saver/Manifest
index 3ffa033276d4..2c88c6067862 100644
--- a/net-wireless/nanovna-saver/Manifest
+++ b/net-wireless/nanovna-saver/Manifest
@@ -1,4 +1,6 @@
 DIST nanovna-saver-0.5.4.tar.gz 494010 BLAKE2B 71e4292e33dbb5b055e7ddd3a29222a67e05b1af431eaee64b613e50648b0b91ad5446cc2d3af868ae624826caf871bff9062275239298c29de261d741bad1f4 SHA512 6600b3c83fc1dcaf81a85b1d14087d2067327098c486011c8bfbaba83e06ca1081c6f7045730a58f097bab332072139707ea23c037924624d2f8100a7b61acb7
+DIST nanovna-saver-0.6.2.tar.gz 579583 BLAKE2B aa10f8272a63e42f35f5c395203bc1101f2a166bc29274cf28385fa7aab33d89953fdcf4595fadeed25abb2b6c02948307a1576738bd421cd648f7ef2a953bc9 SHA512 d5c548ffda24d8ca69a30cdda4afc1473afa5f5c3fecf2cee17e65e16fd46bee0dc274d5d597c5bb354c7251870e1f3ba0bd61a43f0af424db5403c5694713b5
 EBUILD nanovna-saver-0.5.4.ebuild 1273 BLAKE2B 0d4fbdfb5f9d43da42816fdb80f7dedda810f3280c40b50705eb086c598e7616227719bdb8a83ed37105a3380557b4b158d64f41e1a48bf06f27f623eabbd89d SHA512 08857031cd10edb52931b5a78d687e62470039228a8d8f02efaf7e98759db9cb0d5bbf2fdb2b3de0c97317205e184d612dd4beafaef31eb6796895a27b52e8f2
-EBUILD nanovna-saver-9999.ebuild 1275 BLAKE2B 941fdc3687f3b37fb2d91c08d068e3fd72adab3deb53b3695ee3dc1a8887558e8a340c35ab98d4dd5706909c7506bbc4d8083dc7138d3c05159f480d764c09ae SHA512 d7c300847a171c883d670846d37274f77f4f8a04631e4580598944a25ebcad9698bcd964b852cd0d70685e14042fd13f144181d0ba605a6b6a6b36aa9cece184
+EBUILD nanovna-saver-0.6.2.ebuild 1160 BLAKE2B 880e3bad18ae1d45eb876847558444c855d946023ce4a50f871beca2e2f2d82f68bfe8099dd152ae38db823159fee24cba9fc8498a1540104638729e9ebf81d4 SHA512 cce07f6718a27fb9b94e913f262020895525ad3283eefbb1a9c7e53dfccdc21fc1bd0970e41a377178e167bff80267f5e82f057bfe0463228ba26489c26d43ef
+EBUILD nanovna-saver-9999.ebuild 1160 BLAKE2B 880e3bad18ae1d45eb876847558444c855d946023ce4a50f871beca2e2f2d82f68bfe8099dd152ae38db823159fee24cba9fc8498a1540104638729e9ebf81d4 SHA512 cce07f6718a27fb9b94e913f262020895525ad3283eefbb1a9c7e53dfccdc21fc1bd0970e41a377178e167bff80267f5e82f057bfe0463228ba26489c26d43ef
 MISC metadata.xml 543 BLAKE2B 04c50e81948a367bbe842cc1471471c482a5f813c90d7f98fb5af27868700496d4edc08aabd9d4a0674c556a467ab03a83f7b356039b1fc92e41e301e682f739 SHA512 e250acfe7bae2e5673270f4af746aca72a3d50b5b248cd70cf2a2f87aa30ce74d505fbf806cf5f7809be1aafad631f4e68a83aa13622dfdbbf498107f888bcab
diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.6.2.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.6.2.ebuild
new file mode 100644
index 000000000000..f9bae222d086
--- /dev/null
+++ b/net-wireless/nanovna-saver/nanovna-saver-0.6.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA"
+HOMEPAGE="https://github.com/mihtjel/nanovna-saver"
+SRC_URI=""
+
+LICENSE="GPL-3+"
+SLOT="0"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
+else
+	SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+fi
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	dev-python/PyQt6[${PYTHON_USEDEP},gui,widgets]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_install() {
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
index b34fe28b25d0..f9bae222d086 100644
--- a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
+++ b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
@@ -17,7 +17,8 @@ if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
 else
 	SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
 fi
 IUSE=""
 
@@ -25,21 +26,13 @@ DEPEND=""
 RDEPEND="${DEPEND}
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+	dev-python/PyQt6[${PYTHON_USEDEP},gui,widgets]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]"
-BDEPEND=""
+BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
 
-src_prepare() {
-	sed -i -e "s/48.png/48/" \
-		-e "s/TerminalOptions=/#TerminalOptions=/" \
-		-e "s/Path=/#Path=/" NanoVNASaver.desktop || die
-	sed -i "/nanovnasaver/d" setup.py || die
-	eapply_user
-}
-
 python_install() {
 	distutils-r1_python_install
 }
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)