Fix up .py, .sh, and .pl file installation. Based on work by Myk Taylor <myk002@yahoo.com>

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

3 files changed, 19 insertions, 15 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 3f4aceb7b8a7..8de33b25355f 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.361 2012/07/10 05:30:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.362 2012/07/12 02:27:06 cardoe Exp $
+
+  11 Jul 2012; Doug Goldstein <cardoe@gentoo.org>
+  mythtv-0.25.1_p20120708.ebuild:
+  Fix up .py, .sh, and .pl file installation. Based on work by Myk Taylor
+  <myk002@yahoo.com>
 
   09 Jul 2012; Doug Goldstein <cardoe@gentoo.org>
   mythtv-0.25.1_p20120708.ebuild:
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 049f4f5ec0aa..8b2c8fd2138e 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -19,6 +19,6 @@ 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
 EBUILD mythtv-0.24.1_p20110524.ebuild 9230 SHA256 d5c246f523e234fa8e5202930448db67b91a808d5bb8c4a014ee9f182eed8402 SHA512 7cf1c76ba2a6895d38a11555cdca43f61a17f6dac5948271b4261a22dc3497fd954efa5a85ca1a85e770e9395f49c723c9e39678e6537acbcd7502107e4a2235 WHIRLPOOL a5f96507b775ccdf2fbb7285b4aa5e263c0a97964ff904940d4b1fc08ae05934b64ec1bac7fdda596343e36ca1f04ead454bb76eb4feb7ced78ab909c1b35c98
 EBUILD mythtv-0.25.1.ebuild 7289 SHA256 b68a260a5b82f034ce21e5260f2b0b3c0d10133d0ce093036735b7cedf267e3b SHA512 708e61b42f70bceb8702a92ea8ae98b15fee63395b9479ab127764ecb1bd0d6cb32655beda18e8618212eb14083007a97f8e41009035cdf88899e2e970881c82 WHIRLPOOL ceae49c69fc9ce7269cb880fff13aef2f206ccfaaf1bde8a405e42589d66a7997fab42b610b3c07aebfd1ccaac7d3398160a996ee9ac1d90e256f8f68a3d10f0
-EBUILD mythtv-0.25.1_p20120708.ebuild 8494 SHA256 835ffd2506b32c04cf388c880661ebc7b7feb3ab575400cd89101186faf62b64 SHA512 7b1810125813ca8cf81753036416c439a40a11ff8719a78efda6e7d8870e57aa1ffa45757b15cc99ab487969cb239357efea2497f3974f29926f714a71da5c6c WHIRLPOOL 7342ede235ee813f5827d4001615d487685f4ab57276fbcc30a8146ce17dcb153c73013c119b97315ffc210d7bad5e20a6871d543825f47197a02883bb90087c
-MISC ChangeLog 71246 SHA256 5aab8c3b17863dbb31a602100ca319fe58a657112bfe1df1fad3adf70d01f52f SHA512 bc8482832ab0b8b1066858c3fcb882cc60e52a7e3732b97b3c8dc8326b4fb2b6783741a289908751a7f0a11a38947035760bb4d038e2bcb9cf3ee05b02a50ac6 WHIRLPOOL 4ca5530b03b3f334cf21675e21cc6a4c6de15e7d60edc2afa97401152fd1335e8e51d1b85bf0c0d643fad65f706fa568095f8dd6c354cffabab4895e80689783
+EBUILD mythtv-0.25.1_p20120708.ebuild 8535 SHA256 7f345f58f0fa6db5d26aa956c9c1ae63e8eee18b17c9a3ddcf955c0ad3de6b52 SHA512 7288cb5bd85330f4d612ac43ace989a6cf3137dcdacd413f5c87b7975eff4a0e74e38d1ab7749fc3896e70d2c208e45641364a1469a7184caf6b6934d6e0b277 WHIRLPOOL 11ba8914517c45e3f8eb9c306314d14965be9974f94a0d2e529f6eb912d244d61f6075cf5eb39b0cbb5c5e6f07670caa0eac0e12b69c053d2e7ff950db11b53b
+MISC ChangeLog 71426 SHA256 730730e9fdef8b8afc4f09d4fee77269fdc1e94d7c4c054f26484be60b3f22ac SHA512 f54eb821360e064b229dec9f80d558445c2bdc5516a6c125ec963af6e8f1002f67976dbc2bdd838ce98ba4e2931ccfef22b9f281ae42f9fac4bf08c6e3253644 WHIRLPOOL f89ae515d1f2aeed0544252a23d702e0f03aa1fcba76ee8c4022364dd8e41305afa40486cedf54c9e4abe4710238d5a446e1091ac72e103bcdb2600f5d8ae8ba
 MISC metadata.xml 3624 SHA256 28df7a0b436180584d0d6c20ea51ab67501b1c449e3a78c7645d8d46d0bdc5e7 SHA512 1cfb76b5bc418dfc79af5ebefa361a6146c328170e40035c9cc6481c92e43418aafe07ffd971abb56aff49f535ab0d3964079c2d0c72f67a47b39cd1c6ced9a5 WHIRLPOOL a61cf9be8a71b2be1801c7882c9c1bf8dd11e73b726021422a3524f94869639fce69b7d1f374e4001093becb5a643b3f8fd3816c2d2cf60ac42d150a6e689cee
diff --git a/media-tv/mythtv/mythtv-0.25.1_p20120708.ebuild b/media-tv/mythtv/mythtv-0.25.1_p20120708.ebuild
index ee4dd2d5d309..9adc7259a589 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.7 2012/07/10 05:30:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.25.1_p20120708.ebuild,v 1.8 2012/07/12 02:27:06 cardoe Exp $
 
 EAPI=4
 
@@ -229,10 +229,6 @@ src_configure() {
 	./configure ${myconf} || die "configure died"
 }
 
-src_compile() {
-	emake || die "emake failed"
-}
-
 src_install() {
 	emake INSTALL_ROOT="${D}" install || die "install failed"
 	dodoc AUTHORS UPGRADING README
@@ -250,8 +246,8 @@ src_install() {
 	keepdir /var/log/mythtv
 	chown -R mythtv "${ED}"/var/log/mythtv
 
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/mythtv.logrotate.d-r1 mythtv
+	#insinto /etc/logrotate.d
+	#newins "${FILESDIR}"/mythtv.logrotate.d-r2 mythtv
 
 	insinto /usr/share/mythtv/contrib
 	doins -r contrib/*
@@ -271,14 +267,17 @@ src_install() {
 	fi
 
 	# Make Python files executable and ensure they are executed by Python 2
-	for file in `find "${ED}" -type f -name \*.py`; do
-		fperms 0755 "${file}"
-		python_convert_shebangs 2 "${file}"
+	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
 
 	# Make shell & perl scripts executable
-	for file in `find "${ED}" -type f -name \*.sh -o -type f -name \*.pl`; do
-		fperms 0755 "${file}"
+	find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
+		while read file; do
+		chmod a+x "${file}"
 	done
 }