fix rescheduling deadlock. fix change change from EPG. fix that all contrib scripts weren't executable. fix bug #292992 where backup scripts weren't executable

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

3 files changed, 337 insertions, 5 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index c0bc415ff478..89a64cc35397 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.300 2009/11/14 23:30:30 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.301 2009/11/14 23:48:42 cardoe Exp $
+
+*mythtv-0.22_p22824 (14 Nov 2009)
+
+  14 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
+  +mythtv-0.22_p22824.ebuild:
+  fix rescheduling deadlock. fix change change from EPG. fix that all
+  contrib scripts weren't executable. fix bug #292992 where backup scripts
+  weren't executable
 
 *mythtv-0.23_alpha22834 (14 Nov 2009)
 
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 4804d03fc1dd..ffc262827d4b 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -16,18 +16,20 @@ DIST mythtv-0.21_p19961.zip 17957135 RMD160 f6464fa25b945554bb95646329e0e7716014
 DIST mythtv-0.21_p20877.zip 17988425 RMD160 1f5d95f78480ac505c6324c8a008563789c83057 SHA1 ddaf21bbb7075ffe79d920a0e69a53d1233df088 SHA256 7e5b2347fc7d128f30565d1f6cac4631fe8e161b45122dfa4b53e10f24400318
 DIST mythtv-0.22_p22778.zip 26490383 RMD160 03e582a51ca244dbfdab6ae3c927240fc6210458 SHA1 eb7e8bdc4b841315c1b6d18de0410e317cfaecb5 SHA256 0f647e0c18f74d059822e897a3a3004f79870f3c93ca783c5804c566f606b2aa
 DIST mythtv-0.22_p22811.zip 26490542 RMD160 62148be0e29b8912ec6a35dcce8b5c15365cf15e SHA1 1c9a6d64cc6bcd073b9aadb1ec0fab8a8fc9f29d SHA256 42e36f4d93f96a655189dc330af98fa8f46ab305cdc01302fd5fd1bf332f190d
+DIST mythtv-0.22_p22824.zip 26490593 RMD160 b723476162161903a0d82a0a3df9a0d2c949c0a1 SHA1 ef2cd8acb847823b523e2100183439bf2fc53677 SHA256 e65f886bd675fa9906d84363b56a685c82ec4b1ff5b3a6b6b44ff03ef6d2df2d
 DIST mythtv-0.23_alpha22834.zip 29883175 RMD160 4055557ee494c204d45f56eed663ac8639902734 SHA1 6e8ecb88dc3a3155460bdec5234ac7370169a605 SHA256 b934904ba18f80355b51f65783675507b6a390af2aa115f406a5a02afddefea9
 EBUILD mythtv-0.21_p19961-r2.ebuild 8813 RMD160 74d39518eded6dbe685e7bf4729570b403452b23 SHA1 8174b4ad25571256fb9b363668ac8b1b0c29b435 SHA256 63c39a57f8b85290aa6abb9e700bbd053ef5a15f112765977bcd9aaa94320eb6
 EBUILD mythtv-0.21_p20877.ebuild 8842 RMD160 2e2f2ee25599cfeaa61d35202eef70c5b004d82b SHA1 ea0e64fe0a78ca851b937a76c1be8dba931a2f2f SHA256 722a6fdd1076163b96d57f2e209c267d53d7e7d383334e7d1ef55d7e13ee9794
 EBUILD mythtv-0.22_p22778.ebuild 9429 RMD160 51c142b5a617c27dbc06662634f27f807464e3eb SHA1 8fdc13b21bb47f75f81176b5d69ed5fdf1c0d350 SHA256 21180bf4a1d76dbee5b69ee0642b0998318b00751de18df6446ce8f725e1c3c8
 EBUILD mythtv-0.22_p22811.ebuild 9429 RMD160 e651158cf03718d8b3d0d9040997af4bb75a19b6 SHA1 c4542270b718bcd413c31df3097fb306586e7ae1 SHA256 91733e44f0272d56d4266e0b1e9d0d8d6d8fd7a0802728bbf8a45df9dbb2d620
+EBUILD mythtv-0.22_p22824.ebuild 9639 RMD160 6df6e079713725e7ec227b95b8b64a940fe850a5 SHA1 27262a5d71c36610bbcc20d9d153bad958ee1cb7 SHA256 e4ac18b3f2832bc7beb8177b77b409b612d3b7db08cb56793cb832dceaa8e820
 EBUILD mythtv-0.23_alpha22834.ebuild 9433 RMD160 3cee364a54b3cdf86014ee961206e9c3dfd39de5 SHA1 f92177c81cad181c5951ed25534cd88c1c172e19 SHA256 b5225ee05c76d545c567fc87821ceb06e02546c0234331ae3310a2b9a1cba858
-MISC ChangeLog 59347 RMD160 57bdd788051c695cb47458d9bd6820a7174e0466 SHA1 5db643dd2b83330bb7364f6fcfcae24eafb5931f SHA256 2010742b57b712947bbade5511de339d6456993d8ff74c83cd9f8d600cd860a3
+MISC ChangeLog 59629 RMD160 05fdf0df73ad0affc89e7dba1daa0fb4aab7235f SHA1 b45c1876f6486f639cf4812b6ea0a7e56bbf8191 SHA256 4376679ae3c2402852936f17c278a68d0f9c1a7a926b8b5084644abff6442738
 MISC metadata.xml 3143 RMD160 47d2f8051b6bb74cd23339f2420e780b0a8cb576 SHA1 bcfaa512f647812838ceb91a769a0c4889346526 SHA256 74eab4ea852e3a4d5b7e3500ae78e6284d4ed967c7fa8c8c1512771b64383a75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkr/PZwACgkQoeSe8B0zEfw8UwCfQZ9mtZwWS4bXiWHdaQbrLyTB
-WJQAn30nAPnfPS3tk/c1YYor5JvUO79N
-=ednE
+iEYEARECAAYFAkr/QgEACgkQoeSe8B0zEfwFugCeJSzlFsAIaqs5WGogUrd1QE5V
+HxAAn38d7ukkhzY8PiVT1391vEJxyC7H
+=ch+i
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/mythtv-0.22_p22824.ebuild b/media-tv/mythtv/mythtv-0.22_p22824.ebuild
new file mode 100644
index 000000000000..7164c2847e1c
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.22_p22824.ebuild
@@ -0,0 +1,322 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.22_p22824.ebuild,v 1.1 2009/11/14 23:48:43 cardoe Exp $
+
+EAPI=2
+inherit flag-o-matic multilib eutils qt4 mythtv toolchain-funcs python
+
+DESCRIPTION="Homebrew PVR project"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_via"
+IUSE="alsa altivec autostart +css debug directv dvb \
+fftw ieee1394 jack lcd lirc mmx perl pulseaudio python \
+tiff vdpau xvmc ${IUSE_VIDEO_CARDS}"
+
+RDEPEND=">=media-libs/freetype-2.0
+	>=media-sound/lame-3.93.1
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXv
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+	>=x11-libs/qt-core-4.4:4[qt3support]
+	>=x11-libs/qt-gui-4.4:4[qt3support,tiff?]
+	>=x11-libs/qt-sql-4.4:4[qt3support,mysql]
+	>=x11-libs/qt-opengl-4.4:4[qt3support]
+	>=x11-libs/qt-webkit-4.4:4
+	virtual/mysql
+	virtual/opengl
+	virtual/glu
+	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.43 )
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	autostart? ( net-dialup/mingetty
+				x11-wm/evilwm
+				x11-apps/xset )
+	css? ( media-libs/libdvdcss )
+	directv? ( virtual/perl-Time-HiRes )
+	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
+	fftw? ( sci-libs/fftw:3.0 )
+	ieee1394? (	>=sys-libs/libraw1394-1.2.0
+			>=sys-libs/libavc1394-0.5.3
+			>=media-libs/libiec61883-1.0.0 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lcd? ( app-misc/lcdproc )
+	lirc? ( app-misc/lirc )
+	perl? ( dev-perl/DBD-mysql )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.7 )
+	python? ( dev-python/mysql-python )
+	vdpau? ( x11-libs/libvdpau )
+	xvmc? ( x11-libs/libXvMC )"
+
+DEPEND="${RDEPEND}
+	x11-proto/xineramaproto
+	x11-proto/xf86vidmodeproto
+	x11-apps/xinit
+	!<media-plugins/mythcontrols-0.22
+	!<x11-themes/mythtv-themes-0.22
+	!<x11-themes/mythtv-themes-extra-0.22"
+
+MYTHTV_GROUPS="video,audio,tty,uucp"
+
+pkg_setup() {
+	einfo "This ebuild now uses a heavily stripped down version of your CFLAGS"
+
+	if use xvmc && use video_cards_nvidia; then
+		elog
+		elog "For NVIDIA based cards, the XvMC renderer only works on"
+		elog "the NVIDIA 4, 5, 6 & 7 series cards."
+	fi
+
+	# puts the SVN branch name into an environment variable that the build
+	# system reads and embeds into the binaries for version info
+	export URL=${MYTHTV_REPO}
+
+	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
+	usermod -a -G ${MYTHTV_GROUPS} mythtv
+}
+
+src_prepare() {
+	# puts the SVN revision into a special file that the build system
+	# reads and embeds into the binaries for version info
+	echo "SOURCE_VERSION=${MYTHTV_REV}" > "${S}/VERSION"
+
+	# Perl bits need to go into vender_perl and not site_perl
+	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
+		-i "${S}"/bindings/perl/perl.pro
+
+	epatch "${FILESDIR}/${PN}-0.21-ldconfig-sanxbox-fix.patch"
+}
+
+src_configure() {
+	local myconf="--prefix=/usr
+		--mandir=/usr/share/man
+		--libdir-name=$(get_libdir)"
+	use alsa || myconf="${myconf} --disable-audio-alsa"
+	use altivec || myconf="${myconf} --disable-altivec"
+	use fftw && myconf="${myconf} --enable-libfftw3"
+	use jack || myconf="${myconf} --disable-audio-jack"
+	use vdpau && myconf="${myconf} --enable-vdpau"
+
+	#from bug #220857 and fixed for bug #292481
+	use xvmc && myconf="${myconf} --enable-xvmc --enable-xvmcw"
+	if use video_cards_via && use xvmc; then
+		myconf="${myconf} --enable-xvmc-vld";
+	else
+		myconf="${myconf} --disable-xvmc-vld";
+	fi
+
+	# according to the Ubuntu guys, this works better being always on
+	myconf="${myconf} --enable-glx-procaddrarb"
+
+	myconf="${myconf}
+		$(use_enable dvb)
+		$(use_enable ieee1394 firewire)
+		$(use_enable lirc)
+		--disable-audio-arts
+		--disable-directfb
+		--dvb-path=/usr/include
+		--enable-opengl-vsync
+		--enable-xrandr
+		--enable-xv
+		--enable-x11"
+
+	if use mmx || use amd64; then
+		myconf="${myconf} --enable-mmx"
+	else
+		myconf="${myconf} --disable-mmx"
+	fi
+
+	if use perl && use python; then
+		myconf="${myconf} --with-bindings=perl,python"
+	elif use perl; then
+		myconf="${myconf} --with-bindings=perl"
+	elif use python; then
+		myconf="${myconf} --with-bindings=python"
+	else
+		myconf="${myconf} --without-bindings=perl,python"
+	fi
+
+	if use debug; then
+		myconf="${myconf} --compile-type=debug"
+	else
+		myconf="${myconf} --compile-type=profile"
+	fi
+
+	## CFLAG cleaning so it compiles
+	MARCH=$(get-flag "march")
+	MTUNE=$(get-flag "mtune")
+	#strip-flags
+	#filter-flags "-march=*" "-mtune=*" "-mcpu=*"
+	#filter-flags "-O" "-O?"
+
+	if [[ -n "${MARCH}" ]]; then
+		myconf="${myconf} --cpu=${MARCH}"
+	fi
+	if [[ -n "${MTUNE}" ]]; then
+		myconf="${myconf} --tune=${MTUNE}"
+	fi
+
+#	myconf="${myconf} --extra-cxxflags=\"${CXXFLAGS}\" --extra-cflags=\"${CFLAGS}\""
+	hasq distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
+	hasq ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
+
+	# let MythTV come up with our CFLAGS. Upstream will support this
+	unset CFLAGS
+	unset CXXFLAGS
+	einfo "Running ./configure ${myconf}"
+	sh ./configure ${myconf} || die "configure died"
+}
+
+src_compile() {
+	eqmake4 mythtv.pro -o "Makefile" || die "eqmake4 failed"
+	emake || die "emake failed"
+
+	# firewire support should build the tester
+	if use ieee1394; then
+		cd contrib
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../firewire_tester \
+			development/firewire_tester/firewire_tester.c \
+			${LDFLAGS} -liec61883 -lraw1394 || \
+			die "failed to compile firewire_tester"
+
+		cd channel_changers
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -std=gnu99 -o ../../6200ch \
+			6200ch/6200ch.c \
+			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
+			die "failed to compile 6200ch"
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../sa3250ch \
+			sa3250ch/sa3250ch.c \
+			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
+			die "failed to compile sa3250ch"
+	fi
+
+	cd "${S}"/contrib/channel_changers
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../red_eye red_eye/red_eye.c \
+		${LDFLAGS} || die "failed to compile red_eye"
+}
+
+src_install() {
+
+	einstall INSTALL_ROOT="${D}" || die "install failed"
+	dodoc AUTHORS FAQ UPGRADING  README
+
+	insinto /usr/share/mythtv/database
+	doins database/*
+
+	exeinto /usr/share/mythtv
+	doexe "${FILESDIR}/mythfilldatabase.cron"
+
+	newinitd "${FILESDIR}"/mythbackend-0.18.2.rc mythbackend
+	newconfd "${FILESDIR}"/mythbackend-0.18.2.conf mythbackend
+
+	dodoc keys.txt docs/*.{txt,pdf}
+	dohtml docs/*.html
+
+	keepdir /etc/mythtv
+	chown -R mythtv "${D}"/etc/mythtv
+	keepdir /var/log/mythtv
+	chown -R mythtv "${D}"/var/log/mythtv
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/mythtv.logrotate.d mythtv
+
+	insinto /usr/share/mythtv/contrib
+	doins -r contrib/*
+
+	dobin "${FILESDIR}"/runmythfe
+
+	if use autostart; then
+		dodir /etc/env.d/
+		echo 'CONFIG_PROTECT="/home/mythtv/"' > "${D}"/etc/env.d/95mythtv
+
+		insinto /home/mythtv
+		newins "${FILESDIR}"/bash_profile .bash_profile
+		newins "${FILESDIR}"/xinitrc .xinitrc
+	fi
+
+	if use ieee1394; then
+		dobin firewire_tester || die "failed to install firewire_tester"
+		newdoc contrib/development/firewire_tester/README README.firewire_tester
+
+		dobin 6200ch || die "failed to install 6200ch"
+		newdoc contrib/channel_changers/6200ch/README README.6200ch
+
+		dobin sa3250ch || die "failed to install sa3250ch"
+		newdoc contrib/channel_changers/sa3250ch/README README.sa3250ch
+	fi
+
+	dobin red_eye || die "failed to install red_eye"
+	newdoc contrib/channel_changers/red_eye/README README.red_eye
+
+	if use directv; then
+		dobin contrib/channel_changers/d10control.pl || die "failed to install d10control"
+		newdoc contrib/channel_changers/d10control/README README.d10control
+	fi
+
+	# correct permissions so the scripts are actually usable
+	fperms 755 /usr/share/mythtv/contrib/*/*.pl
+	fperms 755 /usr/share/mythtv/mythconverg_backup.pl
+	fperms 755 /usr/share/mythtv/mythconverg_restore.pl
+
+}
+
+pkg_preinst() {
+	export CONFIG_PROTECT="${CONFIG_PROTECT} ${ROOT}/home/mythtv/"
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize $(python_get_sitedir)/MythTV
+
+	elog
+	elog "To always have MythBackend running and available run the following:"
+	elog "rc-update add mythbackend default"
+	elog
+	ewarn "Your recordings folder must be owned by the user 'mythtv' now"
+	ewarn "chown -R mythtv /path/to/store"
+
+	if use xvmc && [[ ! -s "${ROOT}/etc/X11/XvMCConfig" ]]; then
+		ewarn
+		ewarn "No XvMC implementation has been selected yet"
+		ewarn "Use 'eselect xvmc list' for a list of available choices"
+		ewarn "Then use 'eselect xvmc set <choice>' to choose"
+		ewarn "'eselect xvmc set nvidia' for example"
+	fi
+
+	elog "Want mythfrontend to start automatically?"
+	elog "Set USE=autostart. Details can be found at:"
+	elog "http://dev.gentoo.org/~cardoe/mythtv/autostart.html"
+
+	if use autostart; then
+		elog
+		elog "Please add the following to your /etc/inittab file at the end of"
+		elog "the TERMINALS section"
+		elog "c8:2345:respawn:/sbin/mingetty --autologin mythtv tty8"
+	fi
+
+	elog
+	ewarn "Beware when you change ANY packages on your system that it may"
+	ewarn "break some or all of the MythTV components. MythTV's build system"
+	ewarn "is very fragile and only supports automagic dependencies."
+	ewarn "i.e. It depends on libraries and components it finds at build time"
+	ewarn "We try to mitigate this with RDEPENDs but be prepared to run"
+	ewarn "revdep-rebuild as necessary."
+
+}
+
+pkg_postrm()
+{
+	use python && python_mod_cleanup $(python_get_sitedir)/MythTV
+}
+
+pkg_info() {
+	"${ROOT}"/usr/bin/mythfrontend --version
+}
+
+pkg_config() {
+	echo "Creating mythtv MySQL user and mythconverg database if it does not"
+	echo "already exist. You will be prompted for your MySQL root password."
+	"${ROOT}"/usr/bin/mysql -u root -p < "${ROOT}"/usr/share/mythtv/database/mc.sql
+}