From 401101f9c8077911929d3f2b60a37098460a5d89 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Mar 2022 23:59:54 +0000 Subject: gentoo resync : 25.03.2022 --- net-wireless/nanovna-saver/Manifest | 9 ++--- .../files/no-newline-in-description.patch | 17 ++++++++++ net-wireless/nanovna-saver/metadata.xml | 4 +++ .../nanovna-saver/nanovna-saver-0.3.10.ebuild | 39 ++++++++++++++++++++++ .../nanovna-saver/nanovna-saver-0.3.8.ebuild | 35 ------------------- .../nanovna-saver/nanovna-saver-9999.ebuild | 18 ++++++---- 6 files changed, 76 insertions(+), 46 deletions(-) create mode 100644 net-wireless/nanovna-saver/files/no-newline-in-description.patch create mode 100644 net-wireless/nanovna-saver/nanovna-saver-0.3.10.ebuild delete mode 100644 net-wireless/nanovna-saver/nanovna-saver-0.3.8.ebuild (limited to 'net-wireless/nanovna-saver') diff --git a/net-wireless/nanovna-saver/Manifest b/net-wireless/nanovna-saver/Manifest index b13303e7985c..5b70a4d60a6e 100644 --- a/net-wireless/nanovna-saver/Manifest +++ b/net-wireless/nanovna-saver/Manifest @@ -1,4 +1,5 @@ -DIST nanovna-saver-0.3.8.tar.gz 357896 BLAKE2B bace55c49c55e7389931c9f001e49cf8c0dab895b390e1be94d9f590e8c6352d81ff0ce6029c06211939360c76710c4df919af3e0f41533e1d7d56b75a788d3e SHA512 f560d076eb2ab06e441b0e1cb73cf20318abacc70dc9092ef9e32bac4198922aead8210997c176c774dffe2325407ad66cfbbb0f120f1fb465b84e46b28beed8 -EBUILD nanovna-saver-0.3.8.ebuild 912 BLAKE2B 54e451cd3445eb75e09ab5c1fdab29ff10375b71fc92676c1df41aaebcc6964f0e92faabb9067b074e1226c0d8801724a7ce892d2555e70ac95024fedd97fd9a SHA512 b4f5da18d224970108e2035b83b0e43a17c2b0a509aa9155479eb1b6c8d2654b5ac33417851060803fc593f286c5fa053387a2c79a5e2bd0c7b77c2cf54b4e48 -EBUILD nanovna-saver-9999.ebuild 912 BLAKE2B 54e451cd3445eb75e09ab5c1fdab29ff10375b71fc92676c1df41aaebcc6964f0e92faabb9067b074e1226c0d8801724a7ce892d2555e70ac95024fedd97fd9a SHA512 b4f5da18d224970108e2035b83b0e43a17c2b0a509aa9155479eb1b6c8d2654b5ac33417851060803fc593f286c5fa053387a2c79a5e2bd0c7b77c2cf54b4e48 -MISC metadata.xml 433 BLAKE2B 6307440dc90a55b8b3aa377747a470d5fdc468f3900c89ff75ed296be4e23548224bdfb66ac7949952c5cef0adee7fda8dcb54a9af8cc7c64eedf9f54aff25b2 SHA512 93cf615f299aa5c210fb0a97cd6edbfa83cc074dd07c900bcb9832de1c88478ee70ea8c5c8087a7f42b9cd89e767e0422295dd2d21f95cef9f4fe13cfdce638c +AUX no-newline-in-description.patch 747 BLAKE2B bae0c3b6cf3997c98571f404e323a4eb0a2f47b030ade62a775414b061b4f3541701999418b4b81302905e1720ef8711c9b4f2d62fe89281f17ce7d8300d285d SHA512 20555c3bde0bd0a2aabef3c2fee44b453f89eac16820442aecb92f58a3e786821b56aab1730b2669b0500302c4bca4f56200c292cfe86ca282f40d38550646c8 +DIST nanovna-saver-0.3.10.tar.gz 477821 BLAKE2B c41889c1421642c7df55e470b7a45acdf17483203a133d909ca3323150bdf1b712af42c1c28981c8171535fa13dc3573218a4872139f72a447ce29a1f7921b35 SHA512 47a13673aa5639bb3eabbf55a183a19b611144710041a7a4dac4782b4f022f0a316453169a210123c4f26dab1a19af27be37cddcf641d8aecc266396b8fa6eff +EBUILD nanovna-saver-0.3.10.ebuild 988 BLAKE2B ce6f3e8c44d22f328f46a31f32e891012a707259927ee5eb8fc444dc8fe0251b85a9253ae42f7082de9024414eba46f76e8b4aa36408e36dc099f9d120488c09 SHA512 79f0393c182da6e55427043e6154795d64686eaad186bc8760a38f1e7fa12df26e59753ee87af3f9bd00e7e977d94c51fa85c38191c70764aff9bb42252b3cb0 +EBUILD nanovna-saver-9999.ebuild 988 BLAKE2B ce6f3e8c44d22f328f46a31f32e891012a707259927ee5eb8fc444dc8fe0251b85a9253ae42f7082de9024414eba46f76e8b4aa36408e36dc099f9d120488c09 SHA512 79f0393c182da6e55427043e6154795d64686eaad186bc8760a38f1e7fa12df26e59753ee87af3f9bd00e7e977d94c51fa85c38191c70764aff9bb42252b3cb0 +MISC metadata.xml 543 BLAKE2B 04c50e81948a367bbe842cc1471471c482a5f813c90d7f98fb5af27868700496d4edc08aabd9d4a0674c556a467ab03a83f7b356039b1fc92e41e301e682f739 SHA512 e250acfe7bae2e5673270f4af746aca72a3d50b5b248cd70cf2a2f87aa30ce74d505fbf806cf5f7809be1aafad631f4e68a83aa13622dfdbbf498107f888bcab diff --git a/net-wireless/nanovna-saver/files/no-newline-in-description.patch b/net-wireless/nanovna-saver/files/no-newline-in-description.patch new file mode 100644 index 000000000000..ba3fda0e5869 --- /dev/null +++ b/net-wireless/nanovna-saver/files/no-newline-in-description.patch @@ -0,0 +1,17 @@ +diff --git a/setup.cfg b/setup.cfg +index 646e60b..535721f 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -3,11 +3,7 @@ name = NanoVNASaver + author = Rune B. Broberg + license = GNU GPL V3 + license_file = LICENSE +-description = +- A multiplatform tool to save Touchstone files from the +- NanoVNA, sweep frequency spans in segments to gain more +- data points, and generally display and analyze the +- resulting data. ++description = A multiplatform tool to save Touchstone files from the NanoVNA, sweep frequency spans in segments to gain more data points, and generally display and analyze the resulting data. + long_description = file: README.md + url = https://github.com/NanoVNA-Saver/nanovna-saver + version = attr: NanoVNASaver.About.VERSION 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 @@ zerochaos@gentoo.org Rick Farina + + tomjbe@gentoo.org + Thomas Beierlein + radio@gentoo.org Radio diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.3.10.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.3.10.ebuild new file mode 100644 index 000000000000..e2817ae6b9e4 --- /dev/null +++ b/net-wireless/nanovna-saver/nanovna-saver-0.3.10.ebuild @@ -0,0 +1,39 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..10} ) +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},gui,widgets] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}]" +BDEPEND="" + +PATCHES=( "${FILESDIR}"/no-newline-in-description.patch ) + +distutils_enable_tests pytest + +python_install() { + rm -r "${BUILD_DIR}"/lib/test || die + distutils-r1_python_install +} 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 } -- cgit v1.2.3