From 7d842af46012837cb6eae0b3fb90acd923746d8c Mon Sep 17 00:00:00 2001 From: MarcT Date: Fri, 2 Dec 2011 22:15:44 -0500 Subject: [PATCH] more corrections --- eclass/myth-git.eclass | 4 +- media-plugins/mythvideo/Manifest | 4 -- media-plugins/mythvideo/files/mythvideo.daily | 7 -- .../mythvideo/files/mythvideo.hourly | 7 -- .../mythvideo/files/mythvideo.weekly | 6 -- media-plugins/mythvideo/mythvideo-9999.ebuild | 69 ------------------- media-tv/mythtv/Manifest | 2 +- media-tv/mythtv/mythtv-9999.ebuild | 9 +-- 8 files changed, 8 insertions(+), 100 deletions(-) delete mode 100644 media-plugins/mythvideo/Manifest delete mode 100644 media-plugins/mythvideo/files/mythvideo.daily delete mode 100644 media-plugins/mythvideo/files/mythvideo.hourly delete mode 100644 media-plugins/mythvideo/files/mythvideo.weekly delete mode 100644 media-plugins/mythvideo/mythvideo-9999.ebuild diff --git a/eclass/myth-git.eclass b/eclass/myth-git.eclass index 0a5e52a..2bd9c71 100644 --- a/eclass/myth-git.eclass +++ b/eclass/myth-git.eclass @@ -11,7 +11,7 @@ # Modified: Marc Tousignant # -inherit git eutils flag-o-matic multilib versionator toolchain-funcs +inherit git-2 eutils flag-o-matic multilib versionator toolchain-funcs ECLASS=myth-git INHERITED="${INHERITED} ${ECLASS}" @@ -62,7 +62,7 @@ myth-git_src_unpack() { pkg_pro="myththemes.pro" fi - git_src_unpack + git-2_src_unpack if has ${_MODULE} ${MYTHPLUGINS} ; then cd ${S}/mythplugins diff --git a/media-plugins/mythvideo/Manifest b/media-plugins/mythvideo/Manifest deleted file mode 100644 index bffd2c6..0000000 --- a/media-plugins/mythvideo/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX mythvideo.daily 269 RMD160 13431220b3cc91961d78266bf1251b48efba4657 SHA1 4a570ce4a9da838a156f57a05c1fb17a52e2a612 SHA256 42f4b3db5eedd93b820fd42180d1f061d6a2dbf11f477eed3a3519d5383caaa4 -AUX mythvideo.hourly 346 RMD160 74a515538284f3fc3771e408ac232899190b3db1 SHA1 60489a161e214c805aac8eb23f19203766f859f7 SHA256 9df78982657ce87bf98400831b4c6501585c72615bcaee203e932341fc8626f9 -AUX mythvideo.weekly 274 RMD160 a0797f10290341c7c5f2b2958882f67d1bdad84c SHA1 2b474efd248f46582ca41f2039aa4617cfe2b19d SHA256 e086ccaf37f3c53bc782502c969d89ac4961441b0e5d8aa0cf10f8ef24757520 -EBUILD mythvideo-9999.ebuild 1755 RMD160 b86f50769912820b8e3845cc1a208f32a953bc9a SHA1 8e0b7829b7fdbeb966d4e58635ac2e2c6eb646db SHA256 546feae54edd2c2315b4e233de79686308c3d53e2fdd3695876304290bebac96 diff --git a/media-plugins/mythvideo/files/mythvideo.daily b/media-plugins/mythvideo/files/mythvideo.daily deleted file mode 100644 index 865cc72..0000000 --- a/media-plugins/mythvideo/files/mythvideo.daily +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -#Daily maintenance mode for Jamu -DIRECTORY=$(grep ^mythtv /etc/passwd | awk -F : '{print $6}') -if [ -f "$DIRECTORY/.mythtv/config.xml" ]; then - su mythtv -c "/usr/bin/python /usr/share/mythtv/mythvideo/scripts/jamu.py -M >> '/var/log/mythtv/jamu.log'" -fi - diff --git a/media-plugins/mythvideo/files/mythvideo.hourly b/media-plugins/mythvideo/files/mythvideo.hourly deleted file mode 100644 index ecb035d..0000000 --- a/media-plugins/mythvideo/files/mythvideo.hourly +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -#Hourly massive update to ensure users see graphics coming in for upcoming recordings and current recordings -DIRECTORY=$(grep ^mythtv /etc/passwd | awk -F : '{print $6}') -if [ -f "$DIRECTORY/.mythtv/config.xml" ]; then - su mythtv -c "/usr/bin/python /usr/share/mythtv/mythvideo/scripts/jamu.py -MW >> '/var/log/mythtv/jamu.log'" -fi - diff --git a/media-plugins/mythvideo/files/mythvideo.weekly b/media-plugins/mythvideo/files/mythvideo.weekly deleted file mode 100644 index 9a27d1b..0000000 --- a/media-plugins/mythvideo/files/mythvideo.weekly +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -#Janitor mode to clean up stale stuff -DIRECTORY=$(grep ^mythtv /etc/passwd | awk -F : '{print $6}') -if [ -f "$DIRECTORY/.mythtv/config.xml" ]; then - su mythtv -c "/usr/bin/python /usr/share/mythtv/mythvideo/scripts/jamu.py -MJ >> '/var/log/mythtv/jamu.log'" -fi diff --git a/media-plugins/mythvideo/mythvideo-9999.ebuild b/media-plugins/mythvideo/mythvideo-9999.ebuild deleted file mode 100644 index 28eee14..0000000 --- a/media-plugins/mythvideo/mythvideo-9999.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Copyright 2005 Preston Crow -# Copyright 2009-2010 Marc Tousignant -# Modifications by (Simon at Koala) from mythtv-dev list. -# Modifications by Marc Tousignant -# ( If you make changes, please add a copyright notice above, but -# never remove an existing notice. ) -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" -inherit myth-git - -DESCRIPTION="Video player module for MythTV." -HOMEPAGE="http://www.mythtv.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug jamu" - -DEPEND=">=sys-apps/sed-4 - sys-block/eject - >=media-tv/mythtv-${PV}" - -RDEPEND="${DEPEND} - dev-perl/libwww-perl - dev-perl/HTML-Parser - dev-perl/URI - dev-perl/XML-Simple - dev-python/mysql-python - dev-python/imdbpy - dev-python/imaging - dev-python/lxml - || ( media-video/xine-ui media-video/mplayer )" - -setup_pro() { - return 0 -} - -src_configure() { - return 0 -} - -src_install() { - myth-git_src_install - - # setup JAMU cron jobs - if use jamu; then - exeinto /etc/cron.daily - newexe "${FILESDIR}/mythvideo.daily" mythvideo || die - exeinto /etc/cron.hourly - newexe "${FILESDIR}/mythvideo.hourly" mythvideo || die - exeinto /etc/cron.weekly - newexe "${FILESDIR}/mythvideo.weekly" mythvideo || die - insinto /home/mythtv/.mythtv/ - newins mythvideo/mythvideo/scripts/jamu-example.conf jamu.conf || die - fi -} - -pkg_postinst() { - elog "MythVideo can use any media player to playback files if you" - elog "are *NOT* using Storage Groups. If you are using Storage" - elog "Groups, you *MUST* use the Internal player." - elog - elog "Otherwise, you can install mplayer, xine or any other video" - elog "player and use that instead by configuring the player to use." - elog "The default is 'Internal'." -} diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest index e0f2421..aec8e66 100644 --- a/media-tv/mythtv/Manifest +++ b/media-tv/mythtv/Manifest @@ -3,4 +3,4 @@ AUX mythbackend.conf 905 RMD160 4cd5cc44d7e06966869518bce9facc40d959a5ed SHA1 b1 AUX mythbackend.rc6 1702 RMD160 3bb347c2d27883f6340c4239bdfb096f2c426e81 SHA1 5cd60814f484ce7c438b3d49ad4ee06dc24c6604 SHA256 12927586f41fa89cea8a87dbc8934e94032bbf45fcddb2452b7ec760b272b216 AUX mythfilldatabase.cron 74 RMD160 748e75c79f0ea0de2bd548e04bb1ff92c3f819bb SHA1 a8bf9761d415f0dccb0de218105f61b36374c4b7 SHA256 e4b1c7cc85f1520d8b5ec0534617d7cd3f9f0f691544c4e8595244250bae3138 AUX mythtv-0.22-sandbox.patch 475 RMD160 a6004ed9327a28828bdc310eba45b95ddcea45e6 SHA1 27fc69bed7c26444c2e94c4bda28d68a28f1a73a SHA256 f0537f4ecd03dc451d7eddead0773257c1afa6252f08cac626afa1d9c69029ae -EBUILD mythtv-9999.ebuild 5272 RMD160 b1c690c471cf58dc2e339ab6e63fa31f563f5196 SHA1 8b5936e87a35f67e2914c99d28d75aa31515dfc7 SHA256 30ccb094d8005e99d58a91136d9ead09c4b81108b58d2e27300220dd4ef4c94b +EBUILD mythtv-9999.ebuild 5301 RMD160 48120ee732bc01aab4275b9c57c621f50c107573 SHA1 a0c0f04b0f29448fd5a32cbef117e8b20a780a72 SHA256 0ed6715cbfe5d3f06483fb467a6c7e6fdc779f7f5b3b44aece5d698017a0c368 diff --git a/media-tv/mythtv/mythtv-9999.ebuild b/media-tv/mythtv/mythtv-9999.ebuild index 830d1a6..43e9ad4 100644 --- a/media-tv/mythtv/mythtv-9999.ebuild +++ b/media-tv/mythtv/mythtv-9999.ebuild @@ -6,7 +6,8 @@ # $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-9999.ebuild,v 1.3 2009/07/10 14:05:04 Marc Tousignant Exp $ EAPI="2" -inherit myth-git qt4 flag-o-matic multilib eutils toolchain-funcs +inherit myth-git qt4-r2 flag-o-matic multilib eutils toolchain-funcs python +inherit linux-info DESCRIPTION="Homebrew PVR project" HOMEPAGE="http://www.mythtv.org/" @@ -125,9 +126,6 @@ setup_pro() { src_configure() { use debug && use profile && die "You can not have USE="debug" and USE="profile" at the same time. Must disable one or the other." - has distcc ${FEATURES} || myconf="${myconf} --disable-distcc" - has ccache ${FEATURES} || myconf="${myconf} --disable-ccache" - use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput" myconf="$(use_enable alsa audio-alsa) @@ -155,6 +153,9 @@ src_configure() { use debug && myconf="${myconf} --compile-type=debug" use profile && myconf="${myconf} --compile-type=profile" + + has distcc ${FEATURES} || myconf="${myconf} --disable-distcc" + has ccache ${FEATURES} || myconf="${myconf} --disable-ccache" } src_compile() {