fix python shebang issue thanks to mgorny, minor fixes

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

4 files changed, 25 insertions, 14 deletions

diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 0f64cc3a029e..0bc1cad7a872 100644
--- a/net-wireless/gnuradio/ChangeLog
+++ b/net-wireless/gnuradio/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/gnuradio
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.39 2014/03/03 17:25:08 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.40 2014/03/05 16:18:40 zerochaos Exp $
+
+*gnuradio-3.6.5.1-r2 (05 Mar 2014)
+*gnuradio-3.7.2.1-r2 (05 Mar 2014)
+
+  05 Mar 2014; Rick Farina <zerochaos@gentoo.org> +gnuradio-3.6.5.1-r2.ebuild,
+  +gnuradio-3.7.2.1-r2.ebuild, -gnuradio-3.6.5.1-r1.ebuild,
+  -gnuradio-3.7.2.1-r1.ebuild, gnuradio-9999.ebuild:
+  fix python shebang issue thanks to mgorny, minor fixes
 
   03 Mar 2014; Rick Farina <zerochaos@gentoo.org> gnuradio-3.6.5.1-r1.ebuild,
   gnuradio-3.7.2.1-r1.ebuild, gnuradio-9999.ebuild:
diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
index fd5786138653..3b307ec4f79c 100644
--- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.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/gnuradio/gnuradio-3.6.5.1-r1.ebuild,v 1.2 2014/03/03 17:25:08 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild,v 1.1 2014/03/05 16:18:40 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -117,8 +117,9 @@ src_configure() {
 		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
 		$(cmake-utils_use_enable qt4 GR_QTGUI) \
 		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		-DENABLE_GR_CORE=ON
-		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DENABLE_GR_CORE=ON \
+		-DSYSCONFDIR="${EPREFIX}"/etc \
+		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
 	use qt4 && mycmakeargs+=( -DQWT_INCLUDE_DIRS="${EPREFIX}"/usr/include/qwt5 )
 	cmake-utils_src_configure
@@ -149,7 +150,7 @@ src_install() {
 		doicon "${fd_path}/"*.png
 	fi
 
-	python_fix_shebang "${ED}"usr/share/${PN}/
+	python_fix_shebang "${ED}"
 }
 
 src_test()
diff --git a/net-wireless/gnuradio/gnuradio-3.7.2.1-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.2.1-r2.ebuild
index 8d2f8bb9c304..e72a43da1468 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.2.1-r1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.2.1-r2.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/gnuradio/gnuradio-3.7.2.1-r1.ebuild,v 1.2 2014/03/03 17:25:08 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.2.1-r2.ebuild,v 1.1 2014/03/05 16:18:40 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -51,7 +51,7 @@ RDEPEND="${PYTHON_DEPS}
 	grc? (
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygtk:2
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
 	)
 	jack? (
 		media-sound/jack-audio-connection-kit
@@ -118,8 +118,9 @@ src_configure() {
 		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
 		$(cmake-utils_use_enable qt4 GR_QTGUI) \
 		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		-DENABLE_GR_CORE=ON
-		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DENABLE_GR_CORE=ON \
+		-DSYSCONFDIR="${EPREFIX}"/etc \
+		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
 	use qt4 && mycmakeargs+=( -DQWT_INCLUDE_DIRS="${EPREFIX}"/usr/include/qwt5 )
 	cmake-utils_src_configure
@@ -150,7 +151,7 @@ src_install() {
 		doicon "${fd_path}/"*.png
 	fi
 
-	python_fix_shebang "${ED}"usr/share/${PN}/
+	python_fix_shebang "${ED}"
 }
 
 src_test()
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index a581f9711de2..9f5704c8df8d 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-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/gnuradio/gnuradio-9999.ebuild,v 1.11 2014/03/03 17:25:08 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.12 2014/03/05 16:18:40 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -118,8 +118,9 @@ src_configure() {
 		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
 		$(cmake-utils_use_enable qt4 GR_QTGUI) \
 		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		-DENABLE_GR_CORE=ON
-		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DENABLE_GR_CORE=ON \
+		-DSYSCONFDIR="${EPREFIX}"/etc \
+		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
 	use qt4 && mycmakeargs+=( -DQWT_INCLUDE_DIRS="${EPREFIX}"/usr/include/qwt5 )
 	cmake-utils_src_configure
@@ -150,7 +151,7 @@ src_install() {
 		doicon "${fd_path}/"*.png
 	fi
 
-	python_fix_shebang "${ED}"usr/share/${PN}/
+	python_fix_shebang "${ED}"
 }
 
 src_test()