[gentoo-commits] repo/gentoo:master commit in: net-wireless/urh/files/, net-wireless/urh/

["Rick Farina" <zerochaos@gentoo.org>]

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