From 47daff99c6daf6767de37a191a57fa5fe5d81205 Mon Sep 17 00:00:00 2001
From: Rick Farina <zerochaos@gentoo.org>
Date: Thu, 13 Aug 2020 15:43:16 -0400
Subject: net-wireless/chirp: bump, minor cleanup

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Rick Farina <zerochaos@gentoo.org>
---
 net-wireless/chirp/Manifest              |  2 +-
 net-wireless/chirp/chirp-20200430.ebuild | 53 --------------------------------
 net-wireless/chirp/chirp-20200807.ebuild | 50 ++++++++++++++++++++++++++++++
 net-wireless/chirp/chirp-99999999.ebuild | 13 +++-----
 4 files changed, 56 insertions(+), 62 deletions(-)
 delete mode 100644 net-wireless/chirp/chirp-20200430.ebuild
 create mode 100644 net-wireless/chirp/chirp-20200807.ebuild

(limited to 'net-wireless')

diff --git a/net-wireless/chirp/Manifest b/net-wireless/chirp/Manifest
index edebeb52821e..51bb28f031b9 100644
--- a/net-wireless/chirp/Manifest
+++ b/net-wireless/chirp/Manifest
@@ -1 +1 @@
-DIST chirp-daily-20200430.tar.gz 896763 BLAKE2B a0f318499e76ff9c297c4eeff381650d98ea03d20a0d20d7751485376a9299ba0f59aa88340a0f23cdf4bc70f0038b5376c2c78beb3bc593a09f7a7af22b9021 SHA512 f7b0d6d23df2b85d714c2fabefcc32cf5f30ceb7daca6a5982d47962a1fe4d4b210729d0d78cef28af4f21fcfbc9e4d0e6585b5e841220e9f8b5a7fcad1dd2b0
+DIST chirp-daily-20200807.tar.gz 933776 BLAKE2B 192c36688fed011ba4ea97b0c5569f1681f15841f06c99c81e7711162c457ffd34d13481695b275e2fa0b0040dc21afe6d259ebf4beb7c3ed13a44679e1b67d8 SHA512 28d5ca132930d5525f24e7899fc370fbdbe9ce22b81fdbc7fee58afdd60a099b4ebcbd42963e92569d011c98eaa556225b018ab1d2d862b3a1a22362f0647325
diff --git a/net-wireless/chirp/chirp-20200430.ebuild b/net-wireless/chirp/chirp-20200430.ebuild
deleted file mode 100644
index 461b1ed5328b..000000000000
--- a/net-wireless/chirp/chirp-20200430.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-if [[ ${PV} == "99999999" ]] ; then
-	SCM=mercurial
-	EHG_REPO_URI="http://d-rats.com/hg/chirp.hg"
-fi
-
-inherit distutils-r1 xdg-utils ${SCM}
-
-DESCRIPTION="Free open-source tool for programming your amateur radio"
-HOMEPAGE="https://chirp.danplanet.com"
-
-RESTRICT="test"
-if [[ ${PV} == "99999999" ]] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://trac.${PN}.danplanet.com/${PN}_daily/daily-${PV}/${PN}-daily-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-daily-${PV}"
-fi
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="radioreference"
-
-DEPEND="${PYTHON_DEPS}
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-libs/libxml2[python]"
-RDEPEND="${DEPEND}
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	radioreference? ( dev-python/suds[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	sed -i -e "/share\/doc\/chirp/d" setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pushd tests > /dev/null
-	"${PYTHON}" run_tests || die
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/net-wireless/chirp/chirp-20200807.ebuild b/net-wireless/chirp/chirp-20200807.ebuild
new file mode 100644
index 000000000000..77faba828a0c
--- /dev/null
+++ b/net-wireless/chirp/chirp-20200807.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+if [[ ${PV} == "99999999" ]] ; then
+	SCM=mercurial
+	EHG_REPO_URI="http://d-rats.com/hg/chirp.hg"
+else
+	RESTRICT="test"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://trac.${PN}.danplanet.com/${PN}_daily/daily-${PV}/${PN}-daily-${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-daily-${PV}"
+fi
+
+inherit distutils-r1 xdg-utils ${SCM}
+
+DESCRIPTION="Free open-source tool for programming your amateur radio"
+HOMEPAGE="https://chirp.danplanet.com"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="radioreference"
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	dev-libs/libxml2[python]"
+RDEPEND="${DEPEND}
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	radioreference? ( dev-python/suds[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	sed -i -e "/share\/doc\/chirp/d" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pushd tests > /dev/null
+	"${PYTHON}" run_tests || die
+	popd > /dev/null
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/net-wireless/chirp/chirp-99999999.ebuild b/net-wireless/chirp/chirp-99999999.ebuild
index 461b1ed5328b..77faba828a0c 100644
--- a/net-wireless/chirp/chirp-99999999.ebuild
+++ b/net-wireless/chirp/chirp-99999999.ebuild
@@ -7,6 +7,11 @@ PYTHON_COMPAT=( python2_7 )
 if [[ ${PV} == "99999999" ]] ; then
 	SCM=mercurial
 	EHG_REPO_URI="http://d-rats.com/hg/chirp.hg"
+else
+	RESTRICT="test"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://trac.${PN}.danplanet.com/${PN}_daily/daily-${PV}/${PN}-daily-${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-daily-${PV}"
 fi
 
 inherit distutils-r1 xdg-utils ${SCM}
@@ -14,14 +19,6 @@ inherit distutils-r1 xdg-utils ${SCM}
 DESCRIPTION="Free open-source tool for programming your amateur radio"
 HOMEPAGE="https://chirp.danplanet.com"
 
-RESTRICT="test"
-if [[ ${PV} == "99999999" ]] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://trac.${PN}.danplanet.com/${PN}_daily/daily-${PV}/${PN}-daily-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-daily-${PV}"
-fi
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="radioreference"
-- 
cgit v1.2.3-65-gdbad