commit: b8146ca420e8ffee77c09c616e19e8b4b550f808
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 09:09:27 2022 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 09:12:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8146ca4
net-wireless/nanovna-saver: Cleanup old, update live ebuild
Further add myself to maintainership.
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
net-wireless/nanovna-saver/Manifest | 1 -
net-wireless/nanovna-saver/metadata.xml | 4 +++
.../nanovna-saver/nanovna-saver-0.3.8.ebuild | 35 ----------------------
.../nanovna-saver/nanovna-saver-9999.ebuild | 18 ++++++-----
4 files changed, 15 insertions(+), 43 deletions(-)
diff --git a/net-wireless/nanovna-saver/Manifest
b/net-wireless/nanovna-saver/Manifest
index e60a61e432eb..876e6dc68718 100644
--- a/net-wireless/nanovna-saver/Manifest
+++ b/net-wireless/nanovna-saver/Manifest
@@ -1,2 +1 @@
DIST nanovna-saver-0.3.10.tar.gz 477821 BLAKE2B
c41889c1421642c7df55e470b7a45acdf17483203a133d909ca3323150bdf1b712af42c1c28981c8171535fa13dc3573218a4872139f72a447ce29a1f7921b35
SHA512
47a13673aa5639bb3eabbf55a183a19b611144710041a7a4dac4782b4f022f0a316453169a210123c4f26dab1a19af27be37cddcf641d8aecc266396b8fa6eff
-DIST nanovna-saver-0.3.8.tar.gz 357896 BLAKE2B
bace55c49c55e7389931c9f001e49cf8c0dab895b390e1be94d9f590e8c6352d81ff0ce6029c06211939360c76710c4df919af3e0f41533e1d7d56b75a788d3e
SHA512
f560d076eb2ab06e441b0e1cb73cf20318abacc70dc9092ef9e32bac4198922aead8210997c176c774dffe2325407ad66cfbbb0f120f1fb465b84e46b28beed8
diff --git a/net-wireless/nanovna-saver/metadata.xml
b/net-wireless/nanovna-saver/metadata.xml
index 94ed3ecdb025..e98d29aa3737 100644
--- a/net-wireless/nanovna-saver/metadata.xml
+++ b/net-wireless/nanovna-saver/metadata.xml
@@ -5,6 +5,10 @@
<email>[email protected]</email>
<name>Rick Farina</name>
</maintainer>
+ <maintainer type="person">
+ <email>[email protected]</email>
+ <name>Thomas Beierlein</name>
+ </maintainer>
<maintainer type="project">
<email>[email protected]</email>
<name>Radio</name>
diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.3.8.ebuild
b/net-wireless/nanovna-saver/nanovna-saver-0.3.8.ebuild
deleted file mode 100644
index c56b16504c74..000000000000
--- a/net-wireless/nanovna-saver/nanovna-saver-0.3.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-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 ~x86"
-fi
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/pyserial[${PYTHON_USEDEP}]
- dev-python/PyQt5[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]"
-BDEPEND=""
-
-src_prepare() {
- sed -i "s#find_packages()#find_packages(exclude=['test'])#" setup.py
- distutils-r1_src_prepare
-}
diff --git a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
index c56b16504c74..e2817ae6b9e4 100644
--- a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
+++ b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA"
@@ -24,12 +24,16 @@ DEPEND=""
RDEPEND="${DEPEND}
dev-python/cython[${PYTHON_USEDEP}]
dev-python/pyserial[${PYTHON_USEDEP}]
- dev-python/PyQt5[${PYTHON_USEDEP}]
+ dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/scipy[${PYTHON_USEDEP}]"
BDEPEND=""
-src_prepare() {
- sed -i "s#find_packages()#find_packages(exclude=['test'])#" setup.py
- distutils-r1_src_prepare
+PATCHES=( "${FILESDIR}"/no-newline-in-description.patch )
+
+distutils_enable_tests pytest
+
+python_install() {
+ rm -r "${BUILD_DIR}"/lib/test || die
+ distutils-r1_python_install
}
