fix python shebang issue thanks to mgorny, minor fixes

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

5 files changed, 42 insertions, 31 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/Manifest b/net-wireless/gnuradio/Manifest
index 11ef06be3845..f75ce67a4da5 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -4,27 +4,27 @@ Hash: SHA512
 AUX gnuradio-3.6.1-automagic-audio.patch 2839 SHA256 3e65981e8e8e9c2fc5e8223bf7e93956d6f802bbd9df15277283e9d44b7c5a2b SHA512 406ecc20f4818f83cbd599c216c60a6d0daf70ed3d227613421d53466307e44f3d32cf5480401273baf74a488c3f73349c145452ca865f1ca9365314c1813768 WHIRLPOOL 363650437161e68f056229315f1d0b52fa409ba9b284196c16e7acf96b68e2e036930db45188f61b5b0bb0e4f51bd3007d8fee622476eb605c72f2ff4b6c24c7
 DIST gnuradio-3.6.5.1.tar.gz 3150283 SHA256 0875d2f0a7da0f3bcc1771b528b0f98f79d9ab69aa1ef953651bbbe1f57b4621 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8 WHIRLPOOL 7cf55be5fac7891a737d228d83718bbc43f9069c6275c5ac465ae11088559dca5e7fa31239e281271b529aa8b9ae1a0efe3850a16a40e53c0f1fe57e351ff2a8
 DIST gnuradio-3.7.2.1.tar.gz 2925751 SHA256 8c6b7e1fda31e9228bdd62a137af901b28757d7e1b044de2e985b96e53c83c80 SHA512 0a0fc63bc233628384535f3741282fd699db95656e8ef30960976823648ef1584c4b46055ab0294fb25028c0a5a9c10547586ca8e25b0692872128c5243c9a08 WHIRLPOOL e9d51839023c589691240ce36faf1cd470bf3018766f60c76288c9af93d6f95ec70f344098109acf5490af9f69cdc37537688a6f1997f8174803d9e022c0b86d
-EBUILD gnuradio-3.6.5.1-r1.ebuild 5561 SHA256 41475059ebe48ed87c11b9a8dd4c0f48fdce12080f6f43d69e7cafcc04e0b1ca SHA512 5ea41873f015c6ddd8f933ce995f2b6d77bbb073c7b31ae88ac4445a386e7f33d402388c1476d32a0097478354b5ce20166b718826d659efa9db01eb1e1f6eb8 WHIRLPOOL 8709e9b780f074b02522155aca5cfad23452f6bbb6e040b0d482d5b42ae5a4ef6c6ec3847b6b1e2b6d550b6939994b55e6cec2297b30c2ed7d21ee6ac935946b
+EBUILD gnuradio-3.6.5.1-r2.ebuild 5583 SHA256 5540842f65142861c5144fd494d8e8d47d7ef72746cb753f747afcd31387487f SHA512 91e151bf28e1d21e2d9da822cae7c02d4985498c5c7a4548b913fafed9898e7266e0268ecd7b0ae9f3a5ed15fdff5cc912b67f7475af72f59ad2761b512f0b68 WHIRLPOOL 605e0ea1da8bd38616c6751540ace9c174aedd6d87352dbea7acd26215efa20c6671367d96c5d61f154b7de8cf60079e690a11ca63f99c9dce4a2989f691243f
 EBUILD gnuradio-3.6.5.1.ebuild 5234 SHA256 adf83b3fe7d2f84096470cdaccc95e8f16f9c9e3b13e9fa3c590c2de5d97ad32 SHA512 3816b34df44f5d4100948032c26fa025417bb5ec604590fe8da98d8037b8001246e11eaf924524d3bec82e4e0a130f4d00313fdd5cde986cc715bd66af77043c WHIRLPOOL e54a3cf4ebad5e4faba5ab43931937826ee0b6f22b60fb0f931de78efa0ba23f83708594b4a4e78b8abbe5a58375f0b24822943c34f44f0e63b98f62d94d34fe
-EBUILD gnuradio-3.7.2.1-r1.ebuild 5573 SHA256 7fb8c9a623fdf10bc612a9f5ee7537cb5fdde73fd0cae5855c76c82c7d201176 SHA512 21947bb8cda177f7add5abce8ce24ea00a3f152a72d4e8523a6fa3a77c54d0c9fb9187acc64ecf80157908a4625a09e077d1b35b67b48c25dfae006af2353ad8 WHIRLPOOL f927f13c0e3b2088f6bbdca0578e0a0229781a1c6bb5ba32f09528c59b56e69c59bfc257bc0caf68f673bdcbcdef7a0f77fb744ab04146f13a136b27fc2c8169
+EBUILD gnuradio-3.7.2.1-r2.ebuild 5613 SHA256 13842ba703819c4ec69f8c33ed1fd0a105c2ccbf2220c69aa40ef879a3b147fd SHA512 d5e527c93bcd8b8953f96feb262dce567cc153db3727260ba082a46cfd3a38fd0c4176b0cf1481feac07ac4e1668868ff0a4a7139aeba0f4cf6871a71cdde1da WHIRLPOOL c8a63da32f3d5e516c4375eb4dc55d6dbb063a4f875434612d56342f82af32a9d3addfdb19dfb94fd91bed9290cc02850bd66369c81f8cfe01ca934bbff71b9e
 EBUILD gnuradio-3.7.2.1.ebuild 5675 SHA256 fcfa0237a20157d4d953cdd38194c585971fdc14d563320d0c20a12d81a00043 SHA512 33b81b72d6b8517aa71df25cb967fd04f9ef818a012f5c51d2aaaa83af8d6b9292b172c0c7c41a7e416f5310c98b0daad08009eef19ac99cb60e81782514d772 WHIRLPOOL 91ef295c0d40fcd0569ca0716aee8b4de40f5815e9c74f27527352bcddbf737ffbeeea3fa43a8e899f620f06feb03f3dadb6324f518279a7aa8d3a1a67b7d37e
-EBUILD gnuradio-9999.ebuild 5586 SHA256 e19534a8d3168a365a09e4339304b540114526c950aa276418a2f368d0badd43 SHA512 122037944a1101f150d044941aeb7fe73a47a0d591c7a8a070412f41aac00907d7144e621fa64dc534e9b993b783d04d01e3bf4345a92e7c4a60399053bd242c WHIRLPOOL 4569f8bf9768ace981fa10a7ba655b3fe70e67ff8697088c171e501887708b63e1020ba4cdf1132bfc06bc2d7a9e4870606c190dd46af235027f49abe5828999
-MISC ChangeLog 7381 SHA256 93a462f7a86c69157df18aeb22dbc93d4949ec54fbc4a2e485d44d67b3be6039 SHA512 1219b7649795c03e4fac79278d679f801773a7be9130531caba8ad5c514d1d138bb0d043c244819945a0d0f8a3f4ba63ac9e3c1343d47d696f9da98e5fecf69b WHIRLPOOL 8cf1be21308f756302c10568b8871de090a10a30c80b1e9d61a4357688c84b793f0ef107fb63a45992978262969d46f9ce4b1f409f38f24682618740829a2170
+EBUILD gnuradio-9999.ebuild 5608 SHA256 7406c5a3b612bc0f142efa93eddaba0e42d856230f0cf3dea472f87fb7c1d26b SHA512 dcd0657501fc31a72bac4d9ec127a8e8476df533d81b621af91f63cd5a47eadbca70140134d53d811dd88b6f0f4e990fd2173ba9f1d3328d9a61e9594be79ac0 WHIRLPOOL c9aa58e1eb0895a85f342a7500db1288a4e1bde86ec5f233b66ac48b184a2952655ffa1b5559921e864b05a9b03bbcbb66de2655d5816e8f91c01884b30a6e5d
+MISC ChangeLog 7702 SHA256 77af84dce1de6420017ace2415c247456a53ffcaf7e07221de57131cb392f444 SHA512 5646e3d7be4c7300c00bea526a25aa46091971ff80fdb60fab5e1e6cf675330ce6015437eaf59ed9b450f12fbd1cf7bc717014c7647f062147de2886a6d69530 WHIRLPOOL 3f4c32c3584f16f889af6576bfe730ad851ecdbfe07d6b2036a92fe2d55d44646bd4d761888f771d0b0a33127ccb38d8f95123693268eb2a876e831dbaa5f024
 MISC metadata.xml 932 SHA256 95bbb6d405dcad3e6493fd0ac72f6d6265ed76d2d7b3c71fcc50526571cc765d SHA512 33cf8b1561849cc735d43f6567f00af613e44e777cdd4235d01784d7eb7bae07040b1a7eff237a90b0b69e906e099f9dbabc2545b3b35c738653ca9c73cde7cc WHIRLPOOL 0dbb103c57e7ec0d8cbfd77b69193dbdf8d9762249a0df4304ee0e9b178c1b6000605525512429f09196bfc3b009f35f77eb1cad9043a65d8927ba7dfb5f678e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJTFLtyAAoJEKXdFCfdEflKbNUQAJJDPpvPBlLvgA3CNsPMpC/S
-hsvIfOnGWXSlcvZ9itLr9D4mRp741XxyYwWdjSHKng3HWjU7T5xr7lkVuEXk/rJZ
-mTWZ85jntix1yTnN1h4+lIHgCAVFx17gPBYe2LJUNb1TcWRJEIlcBR6bO5ADcsqQ
-6S/BmeK1SwuAkbRiwpn3ovu7Md++JX6cF+n8lRoLzsj5YtvgwwrZwDkdlCHOQNTS
-fTthOpC73gkXR3JxI/4SiuaC4Ltbp5gDip880uXNHQFUch4BTLA6r1lNLK9u1Pqx
-HdOXph+lUxA/d/lKtH4x5Vz73BGWFP4RzyIFKxS6A/Q5ts9QYC7eSpyRohhSSx2i
-6xO9powHqjOLYDPyH0p+pgXr3RG4rVxtdLFgccKsIe2VpUEJYEuKEv5k/5d1Hpvg
-J9ALimJ3KPAf2UwlCSEtNh33TI4/0cLdACyIz/Ke5CeVuIdTaENDIbx+LOHMufRS
-AdSxc4h6RYSnCDI9+SVd5hiiNeZoTBXZ9efj5zCiFCe1K7O2d43P9zmZY7fsUvV1
-6SN0Q3E6p4dRfUqgdtH1Q8dqRhUQKGTRtSI1YMwVyskV24QwGokNob9FSqc4u8wJ
-/rga6qt7Tg1Rvck8Jx061hxx96Nb0LFV1np02RPhEmmN2/vDC7148v7o86/pXp7N
-misHbajnPsoCzTRoE2PV
-=ohu5
+iQIcBAEBCgAGBQJTF07jAAoJEKXdFCfdEflKEPMP/RoC12asrXda3V/AH0iqEtdR
+r/3FRQNzJP1FlWS9OIST4kbCxi1vBUoibjBGmAnHzZDPNrLCGzm19/CBD2n9aSKd
+rLcE7E6mlf1QpjZXeWfYaFYD8KRx9q+HsrZla/4iI8S27p8RCjMXTb/QBP5DWVqR
+cbD9lhHTP1t3nACOaptcutpOlVzbcHyL+P2OrGLnfG6H1kesSZKP1tQoXw+SEv5y
+HNFB6QdP0gEKoytBg4QTRIdjrv2sqC3IKt+OADTkaVhGYResSqaEkKzxy9f03on/
+uT2AbyHQSfmnBbxTq3P57HYC/xjsDbAIbzfbBjx77fayhKZYWy9AZP0cM4++NWRt
+APdjaz/mFst38gE2xb0PH+QnE89TPkS+Y4Tg+ENx7+iLNXAiredFIwB6veO8GWAo
+Fy0UAqNj3dgMqRBDTUvX0OY7qvxvxC2uENf7ZisS7fBbSnBFTZPC63MMe0RavNV5
+vKrAP/Dt39JmrP3UZlJ3GPr1EfLc05EaMOtFFW/PvmLhE2/By5pD4UCU1dkR3Gth
+1oRmGHaac69dzQkYlNUD6OwpGt46lnFd4uBgokOVwXFPJcC4buYaJlm4b5sv9c+y
+XR6BiBDf3XGpl/I/KvedVdZAYQz4cIR+CMhEvf3Z4AZDgAtfwBoQs7ss7Z/gy0yZ
+gq01AmUhKGxL2BEMzAA8
+=NmKi
 -----END PGP SIGNATURE-----
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()