version bump, unify live and versioned ebuild

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)

5 files changed, 18 insertions, 88 deletions

diff --git a/net-wireless/chirp/ChangeLog b/net-wireless/chirp/ChangeLog
index c07af7bc7e2e..c60ff1cb991f 100644
--- a/net-wireless/chirp/ChangeLog
+++ b/net-wireless/chirp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/chirp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/chirp/ChangeLog,v 1.5 2014/03/26 02:39:15 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/chirp/ChangeLog,v 1.6 2014/10/08 23:45:00 zerochaos Exp $
+
+*chirp-0.4.1 (08 Oct 2014)
+
+  08 Oct 2014; Rick Farina <zerochaos@gentoo.org> +chirp-0.4.1.ebuild,
+  -chirp-0.2.3.ebuild, -chirp-0.3.0.ebuild, -chirp-0.4.0.ebuild,
+  chirp-9999.ebuild:
+  version bump, unify live and versioned ebuild
 
 *chirp-0.4.0 (26 Mar 2014)
 
diff --git a/net-wireless/chirp/chirp-0.2.3.ebuild b/net-wireless/chirp/chirp-0.2.3.ebuild
deleted file mode 100644
index 2dc4fd8937ac..000000000000
--- a/net-wireless/chirp/chirp-0.2.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/chirp/chirp-0.2.3.ebuild,v 1.3 2012/11/30 17:20:08 zerochaos Exp $
-
-EAPI=4
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 3.*"
-
-if [[ ${PV} == "9999" ]] ; then
-	SCM=mercurial
-	EHG_REPO_URI="http://d-rats.com/hg/chirp.hg"
-fi
-
-inherit distutils ${SCM}
-
-DESCRIPTION="Free open-source tool for programming your amateur radio"
-HOMEPAGE="http://chirp.danplanet.com"
-
-if [[ ${PV} == "9999" ]] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://chirp.danplanet.com/download/${PV}/${P}.tar.gz"
-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_src_prepare
-}
-
-src_test() {
-	echo "No tests"
-}
diff --git a/net-wireless/chirp/chirp-0.3.0.ebuild b/net-wireless/chirp/chirp-0.3.0.ebuild
deleted file mode 100644
index 38b349e6f58b..000000000000
--- a/net-wireless/chirp/chirp-0.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/chirp/chirp-0.3.0.ebuild,v 1.1 2013/02/09 23:36:43 zerochaos Exp $
-
-EAPI=5
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 3.*"
-
-if [[ ${PV} == "9999" ]] ; then
-	SCM=mercurial
-	EHG_REPO_URI="http://d-rats.com/hg/chirp.hg"
-fi
-
-inherit distutils ${SCM}
-
-DESCRIPTION="Free open-source tool for programming your amateur radio"
-HOMEPAGE="http://chirp.danplanet.com"
-
-if [[ ${PV} == "9999" ]] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://chirp.danplanet.com/download/${PV}/${P}.tar.gz"
-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_src_prepare
-}
-
-src_test() {
-	echo "No tests"
-}
diff --git a/net-wireless/chirp/chirp-0.4.0.ebuild b/net-wireless/chirp/chirp-0.4.1.ebuild
index 10777c9d6d30..8f2dfbbd166a 100644
--- a/net-wireless/chirp/chirp-0.4.0.ebuild
+++ b/net-wireless/chirp/chirp-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/chirp/chirp-0.4.0.ebuild,v 1.1 2014/03/26 02:39:15 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/chirp/chirp-0.4.1.ebuild,v 1.1 2014/10/08 23:45:00 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -20,11 +20,11 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="http://chirp.danplanet.com/download/${PV}/${P}.tar.gz"
+	RESTRICT="test"
 fi
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RESTRICT=test
 
 DEPEND="dev-python/pyserial
 	dev-libs/libxml2[python]"
@@ -35,3 +35,9 @@ 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-9999.ebuild b/net-wireless/chirp/chirp-9999.ebuild
index 7dec1cb2c80d..eb7ad7469344 100644
--- a/net-wireless/chirp/chirp-9999.ebuild
+++ b/net-wireless/chirp/chirp-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/chirp/chirp-9999.ebuild,v 1.4 2014/03/26 02:39:15 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/chirp/chirp-9999.ebuild,v 1.5 2014/10/08 23:45:00 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -20,6 +20,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="http://chirp.danplanet.com/download/${PV}/${P}.tar.gz"
+	RESTRICT="test"
 fi
 LICENSE="GPL-3"
 SLOT="0"