net-wireless/chirp: bump, fix dep for radioreference

Package-Manager: Portage-2.3.3, Repoman-2.3.1

6 files changed, 17 insertions, 98 deletions

diff --git a/net-wireless/chirp/Manifest b/net-wireless/chirp/Manifest
index 1f5188ed3c00..e9ea28a40e11 100644
--- a/net-wireless/chirp/Manifest
+++ b/net-wireless/chirp/Manifest
@@ -1,3 +1 @@
-DIST chirp-daily-20160513.tar.gz 578031 SHA256 5937262df82e09367f799820e106ee40bd0e0607401ecb2309fea702bf0a08c8 SHA512 8d270630fe88221693a141ff1ef1c42c3b8e23216f6b3a26e3640047cc0716fde86cb14477e805871a90f825482db1f8f04e83471b54560bfd8995ee8d7f1cea WHIRLPOOL 4987ecb386f7954ca08ec3d40cf505902bcbecbb1e5c4f70f8fe03b6e79a37f374720c6a08b676e68843da930173100c74383b8ea0722e36876cf10939feeb84
-DIST chirp-daily-20160717.tar.gz 595641 SHA256 de7e89d554cd88bcf754a4c7ccb9e3fcde25cd90bc06317889dbda05e1f5ad56 SHA512 b202e9c524413cbc1a32ea9d0ed6577d0f9991b5bc253fbd28e265d292ce0cb9d23f25d140d9787280c4a029740957abf60404c863871528bcb6b511909eba6c WHIRLPOOL 33dd77bffc5dcda52297eb80abddf93d4e80566996f0dfeb682cdc87a65451da40493885aef7a8d113dabe63dbd5b0e8ceb361f4c52a35e8b4cdf916e83a4ae9
-DIST chirp-daily-20170217.tar.gz 667978 SHA256 58f850099e42f31e403463603b5774901f4d99c67def66c0ff05e93471cd3e56 SHA512 01472472904c5cc62554448e3a0e757db27208fece24f760cbb6cbf853541204d80478521121eaa2b5ed703cc9c8638d98000fa2921da5a20b7ee5d8b934b745 WHIRLPOOL f658e324e4119f14f6b5254acbd188eb73bd66c657d8b64744b46e2b93caf5b00cc8b8c6a35f82021a7e67e0e24eb3808dc8f25159fc30240c1d2d190ccb94ff
+DIST chirp-daily-20170222.tar.gz 668028 SHA256 5a889e79d5a3a1961f6d5a166d930f642e34b6aab8e80e0cf987dc06c64300f3 SHA512 31308e3606f8eda8da95e1c1f17e1c9ab14b451161ca282dfde1685d7b92cee7a8e2f6f7d51643ddd9165517ab47e7eb55045c99a01aef67239b2dc27ee20c80 WHIRLPOOL e17f9bfedb71c2dd5595702f9ba38af7cabf2423cb5ed7c3df2bd540eef8fae5725c8af3b320652e9add74e32d9a12c04a91e6fb31da34648d8741d03deea9fa
diff --git a/net-wireless/chirp/chirp-20160513.ebuild b/net-wireless/chirp/chirp-20160513.ebuild
deleted file mode 100644
index 57beb142c07b..000000000000
--- a/net-wireless/chirp/chirp-20160513.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-if [[ ${PV} == "99999999" ]] ; then
-	SCM=mercurial
-	EHG_REPO_URI="http://d-rats.com/hg/chirp.hg"
-fi
-
-inherit distutils-r1 ${SCM}
-
-DESCRIPTION="Free open-source tool for programming your amateur radio"
-HOMEPAGE="http://chirp.danplanet.com"
-
-if [[ ${PV} == "99999999" ]] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://trac.${PN}.danplanet.com/${PN}_daily/daily-${PV}/${PN}-daily-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-daily-${PV}"
-	RESTRICT="test"
-fi
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/pyserial
-	dev-libs/libxml2[python]"
-RDEPEND="${DEPEND}
-	dev-python/pygtk"
-
-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
-}
diff --git a/net-wireless/chirp/chirp-20160717.ebuild b/net-wireless/chirp/chirp-20160717.ebuild
deleted file mode 100644
index 57beb142c07b..000000000000
--- a/net-wireless/chirp/chirp-20160717.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-if [[ ${PV} == "99999999" ]] ; then
-	SCM=mercurial
-	EHG_REPO_URI="http://d-rats.com/hg/chirp.hg"
-fi
-
-inherit distutils-r1 ${SCM}
-
-DESCRIPTION="Free open-source tool for programming your amateur radio"
-HOMEPAGE="http://chirp.danplanet.com"
-
-if [[ ${PV} == "99999999" ]] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://trac.${PN}.danplanet.com/${PN}_daily/daily-${PV}/${PN}-daily-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-daily-${PV}"
-	RESTRICT="test"
-fi
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/pyserial
-	dev-libs/libxml2[python]"
-RDEPEND="${DEPEND}
-	dev-python/pygtk"
-
-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
-}
diff --git a/net-wireless/chirp/chirp-20170217.ebuild b/net-wireless/chirp/chirp-20170222.ebuild
index 6a372a1b1aac..ca6714578c8b 100644
--- a/net-wireless/chirp/chirp-20170217.ebuild
+++ b/net-wireless/chirp/chirp-20170222.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 if [[ ${PV} == "99999999" ]] ; then
@@ -24,12 +24,14 @@ else
 fi
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
+IUSE="radioreference"
 
-DEPEND="dev-python/pyserial
+DEPEND="${PYTHON_DEPS}
+	dev-python/pyserial[${PYTHON_USEDEP}]
 	dev-libs/libxml2[python]"
 RDEPEND="${DEPEND}
-	dev-python/pygtk"
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	radioreference? ( dev-python/suds[${PYTHON_USEDEP}] )"
 
 src_prepare() {
 	sed -i -e "/share\/doc\/chirp/d" setup.py || die
diff --git a/net-wireless/chirp/chirp-99999999.ebuild b/net-wireless/chirp/chirp-99999999.ebuild
index 57beb142c07b..ca6714578c8b 100644
--- a/net-wireless/chirp/chirp-99999999.ebuild
+++ b/net-wireless/chirp/chirp-99999999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 if [[ ${PV} == "99999999" ]] ; then
@@ -24,12 +24,14 @@ else
 fi
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
+IUSE="radioreference"
 
-DEPEND="dev-python/pyserial
+DEPEND="${PYTHON_DEPS}
+	dev-python/pyserial[${PYTHON_USEDEP}]
 	dev-libs/libxml2[python]"
 RDEPEND="${DEPEND}
-	dev-python/pygtk"
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	radioreference? ( dev-python/suds[${PYTHON_USEDEP}] )"
 
 src_prepare() {
 	sed -i -e "/share\/doc\/chirp/d" setup.py || die
diff --git a/net-wireless/chirp/metadata.xml b/net-wireless/chirp/metadata.xml
index 6158e092633b..6217ee6be73b 100644
--- a/net-wireless/chirp/metadata.xml
+++ b/net-wireless/chirp/metadata.xml
@@ -11,4 +11,7 @@
 </maintainer>
 <longdescription lang="en">
 </longdescription>
+<use>
+	<flag name="radioreference">support downloading data from radioreference.com (premium users only)</flag>
+</use>
 </pkgmetadata>