Do not call python_convert_shebangs() on files, which are not Python scripts. Patch by Arfrever.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

5 files changed, 35 insertions, 14 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 6bb6f6e1855f..492920964d97 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.374 2012/07/21 21:47:20 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.375 2012/07/23 16:31:26 floppym Exp $
+
+  23 Jul 2012; Mike Gilbert <floppym@gentoo.org> mythtv-0.25.1_p20120708.ebuild,
+  mythtv-0.25.1_p20120715.ebuild, mythtv-0.25.2_p20120716.ebuild:
+  Do not call python_convert_shebangs() on files, which are not Python scripts.
+  Patch by Arfrever.
 
   21 Jul 2012; Doug Goldstein <cardoe@gentoo.org>
   mythtv-0.25.2_p20120716.ebuild:
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 92775e1f9484..88520d4bf4a3 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX bash_profile 63 SHA256 9a753f699d07b5f481374d13ea3f2b2439a22f3a9a49b6280cc8d9eebf0b2ca9 SHA512 1338a6871ba04100b3c74f91140be834ee659cb7fcf3aa1bdd251631e47690fae88b8eb80984ff5e35b2a4cf9b3fb1b0be8205fe220c82b19e9d935cc790d5b6 WHIRLPOOL 10220cf7662f150863b47529a90c831407ce93d272d64960cfa727992d0b4dfe2e13de2c62d7a4b27f924526307822fa488d9551f6e8f62a47f63a89dfaee9fe
 AUX mythbackend.conf 475 SHA256 1790de4ff212dcd4f9b94ff284d9db6ba9d465cd96cb120c444a34655b99239f SHA512 4e4f349791efcfed4d9d775d4b8b2168cf276ae00ee104bf475aff10872541495d9d204c3f5c42ea75ae13daed81f5cbadb7e41ddcf149c37aeae22ebdf24511 WHIRLPOOL 93745b61cd719d0bafcb33f79fcd9830009c8754d6854d5c826e5a1f79a070bce467e41b71f24432040cdfe04f27594fd68d957608d815b6e1f49164a5832bbe
 AUX mythbackend.init 1519 SHA256 3f584044a9b2ef87652feae13dcc4e6fd71d814578381127e1982551e2740a76 SHA512 9d38ecc63ea0e8c1ddae26400ed387bccee6ae8cd46d34a620a653b825e4085653a5bf4f3fb0d198c09040a78ee62aa5c5690b97cc0672522ce31e1426d7515d WHIRLPOOL d44da8b0ca5e75fdc193de5cd99a3f4acfb0c9ff4e2f39b74904a7a30aa837ece797c631292ee7ca9c9e108036b51721d12eea54ec974ee3792d2a56ba6ac577
@@ -10,8 +13,15 @@ DIST mythtv-0.25.1-61e7a0e946.tar.xz 37304 SHA256 8b516be07d3519872f2f74728aebe7
 DIST mythtv-0.25.1.tar.bz2 31827158 SHA256 7638ffc547b62f2d6dd031c6f164ccb993387a7b4b6d9218cdd37594c1cca508 SHA512 ea3d3746fd14a602638026d8cd7f373cd36ad5175ac33e0718ab61a9dee2f199fa9226253e126c78cbbf253705006fc3b05ab408495a905bad468f0a863f7567 WHIRLPOOL 4c214e5ca794d2ddf3a0c542ad23245064cd986cdc7d3cb7036c57b2c50bed851bbd701965709f5fdbafb05f9eef45133b77958e8ba0aa59908265e6d4db0514
 DIST mythtv-0.25.2-4e446508ec.tar.xz 660 SHA256 96c3bbc78ac03d83416abbd2e442a34448f6043dea1a7102d24b92e3b80e08b4 SHA512 68b76baf0bce0a7a8f9a10b338ee6495ac116414a335b5967982b5ebde40b12ded691b27e7c580f9b50c18dc38387cbf2a4bbecd1832b8d212f89999769514e3 WHIRLPOOL bdd7d35976b5cdc7111ad93ad76e646dd657bac8438d8803491c9c0c072fc462d74549fb4ffce6d9be8215225a34ef94278c69ca49a231955eff98bc4ab06e7a
 DIST mythtv-0.25.2.tar.bz2 31838320 SHA256 d6b7f1692f30b3dde170d2b755453675de1d222aa8556197e62b8d8617beeac6 SHA512 12a88768edeb6b1fd132279352e0d3045bf469af025feb48a1ce7c558f7030baf26b2dd8e3fab42a178bfda8cd25357ce77328aa88d331758ef7005ee1a38e3e WHIRLPOOL c1c1c09b882b9db0918ba8cf5ad2b78dfd8cead2f39b8a4cadb549cc5a89086434d4ecdca0b9c449c9927962399335b1d8a90d4cfea6078fd2c4875eeb50b27f
-EBUILD mythtv-0.25.1_p20120708.ebuild 8528 SHA256 433e042e7cb005d30c57a16cd5825d71ee9b4db12a7d017f96ca91d444ec39ec SHA512 5bf0afa8e88254ef7947b4702f3a9cde42326febb723b50e2d562d29c8689c5bf9b220e7b63345cd2e44e3d86e9c98ec0e21d1227b61981d505629f203ac69c6 WHIRLPOOL 9a6c0f3d2307de8ec41c9c7b760f3e03109ec9daf94e3ab4df7d6664d9c5add84da8123c8ba83b6c2815724f688cafbea419e840e6d761de47d0a63fd740c732
-EBUILD mythtv-0.25.1_p20120715.ebuild 8462 SHA256 4c1d0452b946028903ab8ebd9efc5508d61319260ee3d384bca3e259bc9eb579 SHA512 a819b5de07d00f65662c27696eb18f0fd563ad6452b892e8411061489882ef0d9e642850591592718067512c5c599a463143e9ede13fd97d447d73678cce0b52 WHIRLPOOL e2993ed35ac89231df79c9837918afd46bde3c9ba2d473b1042a8240ab7dbe686d4bdeb3c81bf49af14e919104f75a71cb3936963717862b0c419f214e243ae2
-EBUILD mythtv-0.25.2_p20120716.ebuild 9159 SHA256 468a1eb5a50757d89af1e92b2390e9d62c62f3e5f1fae5d062484e4f21245aec SHA512 8212cf1fb6430b58aac9a38c8c25e18f226584419d6cba10395be3debf6f3679464fc7e28edaae904c78d5519cc414206a9daf0111ad6fdec1ad0492db91345b WHIRLPOOL 0eb32edbeae5901ba8115e348fd636e2d4e46edf60a68778a078eac9549dc0003f7feb6fe1e1d5847e2c7e421b0e580eb9565d91ccea42ad8d655fbdeb73b3b3
-MISC ChangeLog 73851 SHA256 344e4be10579e95d77f0442d22bff2c03c53b4637c6986d45de3ab44bbdc17ef SHA512 067d1f6ae1eef5875c9491ddfbea8b017eb93bd207daddd06ed332f76c5c0db292cdf374a507f0f583d895ecb58c051ad59d3b9230cb8ebea10c38f0c96aa480 WHIRLPOOL 99d44fc9233a6d5b6c77563815a32ae15980546742fcb34240515f8472f8cbce5497c7ecb0a08e0afe511a2b6789adb9e3f0223d969616feb5d3c12c9c3a9079
+EBUILD mythtv-0.25.1_p20120708.ebuild 8560 SHA256 39ceddc6c2a4f314df5e4b53279b2397e87e53155a713d3f93ac7a1200fdf9ef SHA512 55a2bdd19043bbb41fdb1c8d203b7c0fc993e140630a21fc934c5ae0a3fac268fc3d8ec54e35057f73df7dec29a01ff3324e415ccf6aaba6e7a01f13b541d15b WHIRLPOOL 3f8c838875d021017792b9a7254a58a1ac629737a5cdb8ce662a93647c53bb053f1cd1f87639bfaa9b2e3ec3d9cf99350a4cd6edb2908a96487805cf18095185
+EBUILD mythtv-0.25.1_p20120715.ebuild 8494 SHA256 4c573f2f03cb9220e79eedb6b855aa1cfda1ef0a19a711f6468e5e5e90bf17ce SHA512 1cb2cbcb41191d0494a781abbe0f6f7bd23ca02152620f4f74212fcdc66d850d9cfa37043d3ed2cb4ae54906d106d98ccf59534cf4714bb3bdf26429e5f99969 WHIRLPOOL 1de58494707fe3a2551d0ef08d15ad3555df4a1451d66f2651a760eca2d9aa520d5e0108fd6424eadd3f3935f2924031554b9a2b71e4892e928dac59e6110d72
+EBUILD mythtv-0.25.2_p20120716.ebuild 9191 SHA256 1b7881f2fa7e40d5fd91c3926283a59a0224ddde8cd9dccc8f90839003495d4f SHA512 ac381e0012a1c772044b2a2c2b411291ec583ae03f0836c059cb6be8d87474a78bcf4d66dca39923c97e9c78a10de6155573e1c6223e879a60ac32d1f12c5e71 WHIRLPOOL 6bc84e9145eef0a143b21a8c0cffecbb9360302c9bbc37555dca4fd9cbb8e3774b2ca63f5631142deb514402c019edea39684554f5de1ef353b552402675c5b9
+MISC ChangeLog 74101 SHA256 14af974cbae78d0615de89855a59d5fcf0effc41a8878062f45e124e6eb452f4 SHA512 6fb63594235b2665fbe4231018594ba84ed4867e0261824c13e2056ded1ae1b7f2cc7066e8b95d4f9f43348b57f2d661e45658a15c09c2b70d16893789415891 WHIRLPOOL 50dd473aa4438d95c6f54e5413797a6ae1f921c518a4145cd5b21c34d58a535d08f9412d0ac59823613826e95791300354276110d51dfa9454f2e5b48e843065
 MISC metadata.xml 3337 SHA256 76329ce8dcd446b6fd47b87b57d9397c1a18326f908713720d06d0b0fd9d36a4 SHA512 c159813007fe8e8a057a8e17f5782685b736c1e8e41cea9234e428a7b09855f325061459e3c6b9f3c9cd26d8f27a71d8fb0e53383848e5d399cded85e2de225d WHIRLPOOL 87f3899cbe9caea5948b1af12028e3ab202230eb35f9ca15a193fec203643a99f5cde0060b10f30ed7ee5570c2d9696ae7d379d5f63eefb5317bce7ad24b1ccc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlANfGYACgkQC77qH+pIQ6SWWwD+IUh1OwTK5dVLGvr5MkghxVSP
+/bT01MlR7oVWsB5Z1hgBAKShF4VK4UX7Mro67OM0/Kz7EzQUfajrQFsXmDnajdyr
+=dmk2
+-----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/mythtv-0.25.1_p20120708.ebuild b/media-tv/mythtv/mythtv-0.25.1_p20120708.ebuild
index 4ac396bfe7ae..c9b70410b244 100644
--- a/media-tv/mythtv/mythtv-0.25.1_p20120708.ebuild
+++ b/media-tv/mythtv/mythtv-0.25.1_p20120708.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.25.1_p20120708.ebuild,v 1.10 2012/07/12 03:03:14 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.25.1_p20120708.ebuild,v 1.11 2012/07/23 16:31:26 floppym Exp $
 
 EAPI=4
 
@@ -266,14 +266,16 @@ src_install() {
 		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
 	fi
 
-	# Make Python files executable and ensure they are executed by Python 2
+	# Make Python files executable
 	find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
 		if [[ ! "${file##*/}" = "__init__.py" ]]; then
 			chmod a+x "${file}"
-			python_convert_shebangs -q 2 "${file}"
 		fi
 	done
 
+	# Ensure that Python scripts are executed by Python 2
+	python_convert_shebangs -q -r 2 "${ED}/usr/share/mythtv"
+
 	# Make shell & perl scripts executable
 	find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
 		while read file; do
diff --git a/media-tv/mythtv/mythtv-0.25.1_p20120715.ebuild b/media-tv/mythtv/mythtv-0.25.1_p20120715.ebuild
index 9a693f2a2f4f..6ec9f7a85748 100644
--- a/media-tv/mythtv/mythtv-0.25.1_p20120715.ebuild
+++ b/media-tv/mythtv/mythtv-0.25.1_p20120715.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.25.1_p20120715.ebuild,v 1.1 2012/07/15 22:40:09 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.25.1_p20120715.ebuild,v 1.2 2012/07/23 16:31:26 floppym Exp $
 
 EAPI=4
 
@@ -262,14 +262,16 @@ src_install() {
 		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
 	fi
 
-	# Make Python files executable and ensure they are executed by Python 2
+	# Make Python files executable
 	find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
 		if [[ ! "${file##*/}" = "__init__.py" ]]; then
 			chmod a+x "${file}"
-			python_convert_shebangs -q 2 "${file}"
 		fi
 	done
 
+	# Ensure that Python scripts are executed by Python 2
+	python_convert_shebangs -q -r 2 "${ED}/usr/share/mythtv"
+
 	# Make shell & perl scripts executable
 	find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
 		while read file; do
diff --git a/media-tv/mythtv/mythtv-0.25.2_p20120716.ebuild b/media-tv/mythtv/mythtv-0.25.2_p20120716.ebuild
index c3c16b3f785e..28c13b1fa021 100644
--- a/media-tv/mythtv/mythtv-0.25.2_p20120716.ebuild
+++ b/media-tv/mythtv/mythtv-0.25.2_p20120716.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.25.2_p20120716.ebuild,v 1.7 2012/07/21 21:47:20 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.25.2_p20120716.ebuild,v 1.8 2012/07/23 16:31:26 floppym Exp $
 
 EAPI=4
 
@@ -287,14 +287,16 @@ src_install() {
 		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
 	fi
 
-	# Make Python files executable and ensure they are executed by Python 2
+	# Make Python files executable
 	find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
 		if [[ ! "${file##*/}" = "__init__.py" ]]; then
 			chmod a+x "${file}"
-			python_convert_shebangs -q 2 "${file}"
 		fi
 	done
 
+	# Ensure that Python scripts are executed by Python 2
+	python_convert_shebangs -q -r 2 "${ED}/usr/share/mythtv"
+
 	# Make shell & perl scripts executable
 	find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
 		while read file; do