From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C2DA715800A for ; Sun, 20 Aug 2023 20:09:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 132462BC013; Sun, 20 Aug 2023 20:09:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ED4CF2BC013 for ; Sun, 20 Aug 2023 20:08:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1253934100E for ; Sun, 20 Aug 2023 20:08:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3621CB4C for ; Sun, 20 Aug 2023 20:08:57 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1692562127.bb7cfd5667374eda61fdca708d2af12cff4774ef.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/nanovna-saver/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/nanovna-saver/Manifest net-wireless/nanovna-saver/nanovna-saver-0.6.2.ebuild net-wireless/nanovna-saver/nanovna-saver-9999.ebuild X-VCS-Directories: net-wireless/nanovna-saver/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: bb7cfd5667374eda61fdca708d2af12cff4774ef X-VCS-Branch: master Date: Sun, 20 Aug 2023 20:08:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2f35219e-82b6-4b1d-98a8-ba9f2e116ed3 X-Archives-Hash: c7ab49a36f113f19be928009b4cdae9d commit: bb7cfd5667374eda61fdca708d2af12cff4774ef Author: Rick Farina gentoo org> AuthorDate: Sun Aug 20 20:08:09 2023 +0000 Commit: Rick Farina gentoo org> CommitDate: Sun Aug 20 20:08:47 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb7cfd56 net-wireless/nanovna-saver: add 0.6.2 Sync live Uses QtPy6 now Signed-off-by: Rick Farina gentoo.org> net-wireless/nanovna-saver/Manifest | 1 + ...novna-saver-9999.ebuild => nanovna-saver-0.6.2.ebuild} | 15 ++++----------- net-wireless/nanovna-saver/nanovna-saver-9999.ebuild | 15 ++++----------- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/net-wireless/nanovna-saver/Manifest b/net-wireless/nanovna-saver/Manifest index 61f1b5450a1c..48237f742dc9 100644 --- a/net-wireless/nanovna-saver/Manifest +++ b/net-wireless/nanovna-saver/Manifest @@ -1 +1,2 @@ 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 diff --git a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.6.2.ebuild similarity index 77% copy from net-wireless/nanovna-saver/nanovna-saver-9999.ebuild copy to net-wireless/nanovna-saver/nanovna-saver-0.6.2.ebuild index b34fe28b25d0..f9bae222d086 100644 --- a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild +++ b/net-wireless/nanovna-saver/nanovna-saver-0.6.2.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/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 }