migrate to python-single-r1 and add snapshot for gr 3.7 support

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

4 files changed, 59 insertions, 23 deletions

diff --git a/net-wireless/multimode/ChangeLog b/net-wireless/multimode/ChangeLog
index 8f4a282804e9..b0edcaff2569 100644
--- a/net-wireless/multimode/ChangeLog
+++ b/net-wireless/multimode/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/multimode
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/multimode/ChangeLog,v 1.6 2013/09/22 03:41:03 zerochaos Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/multimode/ChangeLog,v 1.7 2014/03/02 03:17:32 zerochaos Exp $
+
+*multimode-1.4_pre20140301 (02 Mar 2014)
+*multimode-1.00-r1 (02 Mar 2014)
+
+  02 Mar 2014; Rick Farina <zerochaos@gentoo.org> +multimode-1.00-r1.ebuild,
+  +multimode-1.4_pre20140301.ebuild, -multimode-1.00.ebuild,
+  multimode-9999.ebuild:
+  migrate to python-single-r1 and add snapshot for gr 3.7 support
 
   22 Sep 2013; Rick Farina <zerochaos@gentoo.org> multimode-1.00.ebuild,
   multimode-9999.ebuild:
diff --git a/net-wireless/multimode/multimode-1.00.ebuild b/net-wireless/multimode/multimode-1.00-r1.ebuild
index 60c7fc662202..aa0c120f422c 100644
--- a/net-wireless/multimode/multimode-1.00.ebuild
+++ b/net-wireless/multimode/multimode-1.00-r1.ebuild
@@ -1,11 +1,11 @@
-# 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/multimode/multimode-1.00.ebuild,v 1.4 2013/09/22 03:41:03 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/multimode/multimode-1.00-r1.ebuild,v 1.1 2014/03/02 03:17:32 zerochaos Exp $
 
 EAPI=5
-PYTHON_DEPEND="2:2.6"
+PYTHON_COMPAT="python2_7"
 
-inherit python
+inherit python-single-r1
 
 DESCRIPTION="multimode radio decoder for rtl-sdr devices using gnuradio"
 HOMEPAGE="https://www.cgran.org/browser/projects/multimode/trunk"
@@ -26,19 +26,14 @@ fi
 DEPEND=""
 RDEPEND="${DEPEND}
 	>=net-wireless/gr-osmosdr-0.0.1
-	>=net-wireless/gnuradio-3.6.1:=[utils]
+	<net-wireless/gnuradio-3.7:=[utils]
 	>=net-wireless/rtl-sdr-0.5.0"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_install() {
-	python_convert_shebangs $(python_get_version) ${PN}.py
 	newbin ${PN}.py ${PN}
 	insinto $(python_get_sitedir)
 	doins ${PN}_helper.py
 	insinto /usr/share/${PN}
 	doins ${PN}.grc
+	python_fix_shebang "${ED}"/usr/bin
 }
diff --git a/net-wireless/multimode/multimode-1.4_pre20140301.ebuild b/net-wireless/multimode/multimode-1.4_pre20140301.ebuild
new file mode 100644
index 000000000000..789fedf8cec2
--- /dev/null
+++ b/net-wireless/multimode/multimode-1.4_pre20140301.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/multimode/multimode-1.4_pre20140301.ebuild,v 1.1 2014/03/02 03:17:32 zerochaos Exp $
+
+EAPI=5
+PYTHON_COMPAT="python2_7"
+
+inherit python-single-r1
+
+DESCRIPTION="multimode radio decoder for rtl-sdr devices using gnuradio"
+HOMEPAGE="https://www.cgran.org/browser/projects/multimode/trunk"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://www.cgran.org/svn/projects/multimode/trunk"
+	inherit subversion
+	KEYWORDS=""
+else
+	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=net-wireless/gr-osmosdr-0.0.1
+	>=net-wireless/gnuradio-3.7:=[utils]
+	>=net-wireless/rtl-sdr-0.5.0"
+
+src_install() {
+	newbin ${PN}.py ${PN}
+	insinto $(python_get_sitedir)
+	doins ${PN}_helper.py
+	insinto /usr/share/${PN}
+	doins ${PN}.grc
+	python_fix_shebang "${ED}"/usr/bin
+}
diff --git a/net-wireless/multimode/multimode-9999.ebuild b/net-wireless/multimode/multimode-9999.ebuild
index f0d235437690..333a66b881bd 100644
--- a/net-wireless/multimode/multimode-9999.ebuild
+++ b/net-wireless/multimode/multimode-9999.ebuild
@@ -1,11 +1,11 @@
-# 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/multimode/multimode-9999.ebuild,v 1.6 2013/09/22 03:41:03 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/multimode/multimode-9999.ebuild,v 1.7 2014/03/02 03:17:32 zerochaos Exp $
 
 EAPI=5
-PYTHON_DEPEND="2:2.6"
+PYTHON_COMPAT="python2_7"
 
-inherit python
+inherit python-single-r1
 
 if [[ ${PV} == "9999" ]] ; then
 	ESVN_REPO_URI="https://www.cgran.org/svn/projects/multimode/trunk"
@@ -28,16 +28,11 @@ RDEPEND="${DEPEND}
 	=net-wireless/gnuradio-9999:=[utils]
 	=net-wireless/rtl-sdr-9999"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_install() {
-	python_convert_shebangs $(python_get_version) ${PN}.py
 	newbin ${PN}.py ${PN}
 	insinto $(python_get_sitedir)
 	doins ${PN}_helper.py
 	insinto /usr/share/${PN}
 	doins ${PN}.grc
+	python_fix_shebang "${ED}"/usr/bin
 }