bump and distutils->-r1 conversion

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

3 files changed, 54 insertions, 16 deletions

diff --git a/net-wireless/chirp/ChangeLog b/net-wireless/chirp/ChangeLog
index e2aaa6fce1c0..c07af7bc7e2e 100644
--- a/net-wireless/chirp/ChangeLog
+++ b/net-wireless/chirp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/chirp
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/chirp/ChangeLog,v 1.4 2013/02/09 23:36:43 zerochaos Exp $
+# 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 $
+
+*chirp-0.4.0 (26 Mar 2014)
+
+  26 Mar 2014; Rick Farina <zerochaos@gentoo.org> +chirp-0.4.0.ebuild,
+  chirp-9999.ebuild:
+  bump and distutils->-r1 conversion
 
 *chirp-0.3.0 (09 Feb 2013)
 
diff --git a/net-wireless/chirp/chirp-0.4.0.ebuild b/net-wireless/chirp/chirp-0.4.0.ebuild
new file mode 100644
index 000000000000..10777c9d6d30
--- /dev/null
+++ b/net-wireless/chirp/chirp-0.4.0.ebuild
@@ -0,0 +1,37 @@
+# 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 $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+if [[ ${PV} == "9999" ]] ; 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} == "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=""
+RESTRICT=test
+
+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
+}
diff --git a/net-wireless/chirp/chirp-9999.ebuild b/net-wireless/chirp/chirp-9999.ebuild
index 6d0a3ff976e4..7dec1cb2c80d 100644
--- a/net-wireless/chirp/chirp-9999.ebuild
+++ b/net-wireless/chirp/chirp-9999.ebuild
@@ -1,18 +1,16 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.3 2013/02/09 23:36:43 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/chirp/chirp-9999.ebuild,v 1.4 2014/03/26 02:39:15 zerochaos Exp $
 
 EAPI=5
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 3.*"
+PYTHON_COMPAT=( python2_7 )
 
 if [[ ${PV} == "9999" ]] ; then
 	SCM=mercurial
 	EHG_REPO_URI="http://d-rats.com/hg/chirp.hg"
 fi
 
-inherit distutils ${SCM}
+inherit distutils-r1 ${SCM}
 
 DESCRIPTION="Free open-source tool for programming your amateur radio"
 HOMEPAGE="http://chirp.danplanet.com"
@@ -34,14 +32,11 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
 	sed -i -e "/share\/doc\/chirp/d" setup.py || die
-	distutils_src_prepare
+	distutils-r1_src_prepare
 }
 
-src_test() {
-	testing() {
-		pushd tests &> /dev/null
-		PYTHONPATH="../build-${PYTHON_ABI}/lib" "$(PYTHON)" run_tests
-		popd &> /dev/null
-	}
-	python_execute_function testing
+python_test() {
+	pushd tests > /dev/null
+	"${PYTHON}" run_tests || die
+	popd > /dev/null
 }