upstream fixes for crash in mythcommflag. Incorrect maxepisode count expiring of episodes. Fixes for CDROM tray and no disc present.

Package-Manager: portage-2.1.2.2

4 files changed, 323 insertions, 8 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 47835aa39b1d..cc28ff9bbe3b 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.145 2007/03/19 15:49:21 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.146 2007/03/23 04:49:48 cardoe Exp $
+
+*mythtv-0.20_p13110 (23 Mar 2007)
+
+  23 Mar 2007; Doug Goldstein <cardoe@gentoo.org>
+  +mythtv-0.20_p13110.ebuild:
+  upstream fixes for crash in mythcommflag. Incorrect maxepisode count
+  expiring of episodes. Fixes for CDROM tray and no disc present.
 
   19 Mar 2007; Doug Goldstein <cardoe@gentoo.org>
   mythtv-0.21_pre12945.ebuild:
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index f223d2913acc..c49a307f2f7c 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -56,6 +56,7 @@ DIST mythtv-0.20_svn12825.patch.bz2 27539 RMD160 20a4c388d92498ca63b701713705c29
 DIST mythtv-0.20_svn12884.patch.bz2 27677 RMD160 405a3ee81223240e833497d756483ffff1d011d7 SHA1 111ac027190eed09481968908a319e78d9060e9e SHA256 e07baf701f0a7ee197fe0bb9bf8739286564e38578c4e81ae07a4b95f451fde0
 DIST mythtv-0.20_svn12963.patch.bz2 28899 RMD160 9e1c4f6db95e0eb95aea6b86943a1eed7ee9474c SHA1 87712f721b4a0fb751b9fc57847ec270eafbc728 SHA256 25db085312f2dbe05d0bba2fc7266ecd9234dfa67baabf1b658dbeae4ca5d411
 DIST mythtv-0.20_svn13053.patch.bz2 29202 RMD160 f9d84892793cb6698337ec6ffd2ee3f42436e92f SHA1 6eb033261f31b89eda5d4ab72102980061f6a620 SHA256 2c9d8fd80358f3a938569f42f3663fed951d9e1d442403dbd0e5282005b13f4c
+DIST mythtv-0.20_svn13110.patch.bz2 30488 RMD160 378119af01fa6dde0e3e843009b80d4d2b3ee509 SHA1 939d40d5e770665c3eacce75d32d73d0d8cdf59e SHA256 b80295f344232d5bdb7d1a7565dae8162ec5d3f3a2eecb4aa011502549d2b47f
 EBUILD mythtv-0.19_p10505.ebuild 7756 RMD160 6e27fea3e0f1713c5496ee1e1fae653351388fee SHA1 4964d43d5f6f08ee46015ffe28073c65be4d233f SHA256 99b1183709d69152c2fbd5928e3bd688bdf41e570836f7207b1c26f18318bb2b
 MD5 9b8ee605c7020398c72bad2055d66851 mythtv-0.19_p10505.ebuild 7756
 RMD160 6e27fea3e0f1713c5496ee1e1fae653351388fee mythtv-0.19_p10505.ebuild 7756
@@ -112,14 +113,18 @@ EBUILD mythtv-0.20_p13053.ebuild 8232 RMD160 91fefcc5c2c6a151e87907f6e40b5b54e59
 MD5 d4848a8609ff844e939d61f67eae2f71 mythtv-0.20_p13053.ebuild 8232
 RMD160 91fefcc5c2c6a151e87907f6e40b5b54e5975a73 mythtv-0.20_p13053.ebuild 8232
 SHA256 7f33f4fbbe14b7684d1e95a094382072b7351d9bdff99561a1aa6ddba8d09a4d mythtv-0.20_p13053.ebuild 8232
+EBUILD mythtv-0.20_p13110.ebuild 8232 RMD160 0c03af8b159fda81e57c1b56247f1b3961014f3a SHA1 60551a363beafaefb00a46fecc9cb3606d6d305e SHA256 71dc1b73a9593cc2134883112a1b23349ac8f12718062c19762cda0c6e8b851d
+MD5 e652112c857e540fcbfbf47698643ddc mythtv-0.20_p13110.ebuild 8232
+RMD160 0c03af8b159fda81e57c1b56247f1b3961014f3a mythtv-0.20_p13110.ebuild 8232
+SHA256 71dc1b73a9593cc2134883112a1b23349ac8f12718062c19762cda0c6e8b851d mythtv-0.20_p13110.ebuild 8232
 EBUILD mythtv-0.21_pre12945.ebuild 7289 RMD160 e48293c7514f0b88bd4e475fa27e827383491209 SHA1 7af6f178864790a18ad09d56badb2d3173aa4777 SHA256 97f4c3b6ab406a41c8c09bc649a62f0bdd9e98b52def4b6c87fb19de9cb5300f
 MD5 72ad764895430cbc17923a12528d84d0 mythtv-0.21_pre12945.ebuild 7289
 RMD160 e48293c7514f0b88bd4e475fa27e827383491209 mythtv-0.21_pre12945.ebuild 7289
 SHA256 97f4c3b6ab406a41c8c09bc649a62f0bdd9e98b52def4b6c87fb19de9cb5300f mythtv-0.21_pre12945.ebuild 7289
-MISC ChangeLog 26173 RMD160 9244ca0429a725b5246990dfadde589c293420e0 SHA1 2f6a55ca85d670ed6acd0e44a915fc2ce0f19524 SHA256 702d51e9c4c911f4b4f28c07d6b0e95b6831017aa28706efb48474cf49f3fb68
-MD5 a86b0f9761a499f330de948af63a56fe ChangeLog 26173
-RMD160 9244ca0429a725b5246990dfadde589c293420e0 ChangeLog 26173
-SHA256 702d51e9c4c911f4b4f28c07d6b0e95b6831017aa28706efb48474cf49f3fb68 ChangeLog 26173
+MISC ChangeLog 26426 RMD160 36da6cd70fe789e20297d8e66a7614141529c6b5 SHA1 bdbc58ac765f64d59d3500e020f28be633589ea7 SHA256 a7186ba7137edcc6fe16e2c506a21919a33e67b9be96df8934852a4dfa1d3fa6
+MD5 1d71c65bc0402faf7a9f86fbe64ef33b ChangeLog 26426
+RMD160 36da6cd70fe789e20297d8e66a7614141529c6b5 ChangeLog 26426
+SHA256 a7186ba7137edcc6fe16e2c506a21919a33e67b9be96df8934852a4dfa1d3fa6 ChangeLog 26426
 MISC metadata.xml 222 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e SHA1 c6bd979f236f5e6fe9332eb6568bee402efc793f SHA256 8b2065fecfbbdd0caa3c5eb86b98c22766db07f555edbf3127e9454b468ecff6
 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e metadata.xml 222
@@ -166,13 +171,16 @@ SHA256 004c362f8f6a0a2335390e94201b5bf722233c0bff51f5da8da5653ec487e961 files/di
 MD5 8f1492209a5ca22c4780f7b45d3cf44c files/digest-mythtv-0.20_p13053 512
 RMD160 d5048d36836c480d83395bcee8942cca3de64b61 files/digest-mythtv-0.20_p13053 512
 SHA256 d20e036f880172c2770956cbde31dc2bfd87f72ae164ce2e61a68b92a700df4b files/digest-mythtv-0.20_p13053 512
+MD5 64893c0f40dedebeabadf31554243f50 files/digest-mythtv-0.20_p13110 512
+RMD160 79349e8b9b28dffa99f2dd0e610eadc32af4aadb files/digest-mythtv-0.20_p13110 512
+SHA256 af7b2e5d9f57b29d683d537b08094e9f82686da9660df977fdc5f2bc9a227b0c files/digest-mythtv-0.20_p13110 512
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.21_pre12945 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.21_pre12945 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.21_pre12945 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF/rHooeSe8B0zEfwRAqARAJ474D0PBYWdWV7V7MDg8WIoRIpT3wCfTZH2
-ulsMR8HAm4USzLkjkeR/N+E=
-=dHsL
+iD8DBQFGA1xvoeSe8B0zEfwRAh0RAKCITy26RgJ3CS4tQywncSJcC0Sk7gCfRWcp
+jLHYeEQIQMs24PF8e+roaz8=
+=hq7j
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/files/digest-mythtv-0.20_p13110 b/media-tv/mythtv/files/digest-mythtv-0.20_p13110
new file mode 100644
index 000000000000..1f8d5aecad0d
--- /dev/null
+++ b/media-tv/mythtv/files/digest-mythtv-0.20_p13110
@@ -0,0 +1,6 @@
+MD5 52bec1e0fadf7d24d6dcac3f773ddf74 mythtv-0.20.tar.bz2 12380677
+RMD160 d9ef5221a1d821f2f210e7ebb0c32a88625fb522 mythtv-0.20.tar.bz2 12380677
+SHA256 777ff60afa89426f0e52e49b0e7a7661ddb45b59d2ebbfdcbe07fd179e526ff3 mythtv-0.20.tar.bz2 12380677
+MD5 b6e919e2d41c6c2e703752a5d9fb015d mythtv-0.20_svn13110.patch.bz2 30488
+RMD160 378119af01fa6dde0e3e843009b80d4d2b3ee509 mythtv-0.20_svn13110.patch.bz2 30488
+SHA256 b80295f344232d5bdb7d1a7565dae8162ec5d3f3a2eecb4aa011502549d2b47f mythtv-0.20_svn13110.patch.bz2 30488
diff --git a/media-tv/mythtv/mythtv-0.20_p13110.ebuild b/media-tv/mythtv/mythtv-0.20_p13110.ebuild
new file mode 100644
index 000000000000..b7bcb49cd6bf
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.20_p13110.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.20_p13110.ebuild,v 1.1 2007/03/23 04:49:48 cardoe Exp $
+
+inherit mythtv flag-o-matic multilib eutils qt3
+
+DESCRIPTION="Homebrew PVR project"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE_VIDEO_CARDS="video_cards_i810 video_cards_nvidia video_cards_via"
+
+IUSE="alsa altivec autostart backendonly crciprec debug dbox2 dts dvb dvd freebox frontendonly hdhomerun ieee1394 ivtv jack joystick lcd lirc mmx vorbis opengl perl 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
+	xvmc? (
+		x11-libs/libXvMC
+		video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers
+								 x11-drivers/nvidia-legacy-drivers ) )
+		video_cards_via? ( x11-drivers/xf86-video-via )
+		video_cards_i810? ( x11-drivers/xf86-video-i810 )
+	)
+	$(qt_min_version 3.3)
+	virtual/mysql
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	dts? ( media-libs/libdts )
+	dvd? ( 	media-libs/libdvdnav
+		media-libs/libdts )
+	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
+	ivtv? ( media-tv/ivtv )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lcd? ( app-misc/lcdproc )
+	lirc? ( app-misc/lirc )
+	vorbis? ( media-libs/libvorbis )
+	opengl? ( virtual/opengl )
+	ieee1394? (	>=sys-libs/libraw1394-1.2.0
+			>=sys-libs/libavc1394-0.5.0
+			>=media-libs/libiec61883-1.0.0 )
+	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )
+	autostart? ( net-dialup/mingetty
+				x11-wm/evilwm
+				x11-apps/xset )"
+
+DEPEND="${RDEPEND}
+	x11-proto/xineramaproto
+	x11-proto/xf86vidmodeproto
+	x11-apps/xinit"
+
+PDEPEND="=x11-themes/mythtv-themes-${MY_PV}*"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+MYTHTV_GROUPS="video,audio,tty"
+
+pkg_setup() {
+
+	local rip=0
+	if ! built_with_use -a =x11-libs/qt-3* mysql opengl ; then
+		echo
+		eerror "MythTV requires Qt to be built with mysql and opengl use flags enabled."
+		eerror "Please re-emerge =x11-libs/qt-3*, after having the use flags set."
+		echo
+		rip=1
+	fi
+
+	if use xvmc && use video_cards_nvidia; then
+		echo
+		ewarn "You enabled the 'xvmc' USE flag, you must have a GeForce 4 or"
+		ewarn "greater to use this. Otherwise, you'll have crashes with MythTV"
+		echo
+	fi
+
+	if use xvmc && ! ( use video_cards_i810 || use video_cards_nvidia || use video_cards_via ); then
+		echo
+		eerror "You enabled the XvMC USE flag but did not configure VIDEO_CARDS with either"
+		eerror "an nVidia, Intel i810, or VIA video card."
+		echo
+		rip=1
+	fi
+
+	if use autostart && use backendonly; then
+		echo
+		eerror "You can't have USE=autostart while having USE=backendonly."
+		eerror "USE=autostart is for mythfrontend"
+		echo
+		rip=1
+	fi
+
+	[[ $rip == 1 ]] && die "Please fix the above issues, before continuing."
+
+	echo
+	einfo "This ebuild now uses a heavily stripped down version of your CFLAGS"
+	einfo "Don't complain because your -momfg-fast-speed CFLAG is being stripped"
+	einfo "Only additional CFLAG issues that will be addressed are for binary"
+	einfo "package building."
+	echo
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	#Fixes of the bugs found in the release
+	mythtv-fixes_patch
+
+	# As needed fix since they don't know how to write qmake let alone a real
+	# make system
+	epatch "${FILESDIR}"/${PN}-${MY_PV}-as-needed.patch
+}
+
+src_compile() {
+	local myconf="--prefix=/usr
+		--mandir=/usr/share/man
+		--libdir-name=$(get_libdir)"
+	use alsa || myconf="${myconf} --disable-audio-alsa"
+	use jack || myconf="${myconf} --disable-audio-jack"
+	use dts || myconf="${myconf} --disable-dts"
+	use freebox || myconf="${myconf} --disable-freebox"
+	use dbox2 || myconf="${myconf} --disable-dbox2"
+	use hdhomerun || myconf="${myconf} --disable-hdhomerun"
+	use crciprec || myconf="${myconf} --disable-crciprec"
+	use altivec || myconf="${myconf} --disable-altivec"
+	use xvmc && myconf="${myconf} --enable-xvmc"
+	use xvmc && use video_cards_via && myconf="${myconf} --enable-xvmc-pro"
+	use perl && myconf="${myconf} --with-bindings=perl"
+	myconf="${myconf}
+		--disable-audio-arts
+		$(use_enable lirc)
+		$(use_enable joystick joystick-menu)
+		$(use_enable dvb)
+		--dvb-path=/usr/include
+		$(use_enable opengl opengl-vsync)
+		$(use_enable ieee1394 firewire)
+		--enable-xrandr
+		--enable-xv
+		--disable-directfb
+		--enable-x11
+		--enable-proc-opt"
+
+	if use mmx || use amd64; then
+		myconf="${myconf} --enable-mmx"
+	else
+		myconf="${myconf} --disable-mmx"
+	fi
+
+	if use debug; then
+		myconf="${myconf} --compile-type=debug"
+	else
+		myconf="${myconf} --compile-type=release"
+	fi
+
+	## CFLAG cleaning so it compiles
+	MARCH=$(get-flag "march")
+	MTUNE=$(get-flag "mtune")
+	MCPU=$(get-flag "mcpu")
+	strip-flags
+	filter-flags "-march=*" "-mtune=*" "-mcpu=*"
+	filter-flags "-O" "-O?"
+
+	if [[ -n "${MARCH}" ]]; then
+		myconf="${myconf} --arch=${MARCH}"
+	fi
+	if [[ -n "${MTUNE}" ]]; then
+		myconf="${myconf} --tune=${MTUNE}"
+	fi
+	if [[ -n "${MCPU}" ]]; then
+		myconf="${myconf} --cpu=${MCPU}"
+	fi
+
+#	myconf="${myconf} --extra-cxxflags=\"${CXXFLAGS}\" --extra-cflags=\"${CFLAGS}\""
+	hasq distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
+	hasq ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
+
+	if use frontendonly; then
+		##Backend Removal
+		ewarn
+		ewarn "You are using the experimental feature for only installing the frontend."
+		ewarn "You will not get Gentoo support nor support from MythTV upstream for this."
+		ewarn "If this breaks, you own both pieces."
+		ewarn
+		myconf="${myconf} --disable-backend"
+	fi
+
+	if use backendonly; then
+		##Frontend Removal
+		ewarn
+		ewarn "You are using the experimental feature for only installing the backend."
+		ewarn "You will not get Gentoo support nor support from MythTV upstream for this."
+		ewarn "If this breaks, you own both pieces."
+		ewarn
+		myconf="${myconf} --disable-frontend"
+	fi
+
+	# let MythTV come up with our CFLAGS. Upstream will support this
+	CFLAGS=""
+	CXXFLAGS=""
+	einfo "Running ./configure ${myconf}"
+	./configure ${myconf} || die "configure died"
+
+	${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake -o "Makefile" mythtv.pro || die "qmake failed"
+	emake || die "emake failed"
+
+}
+
+src_install() {
+
+	einstall INSTALL_ROOT="${D}" || die "install failed"
+	for doc in AUTHORS FAQ UPGRADING ChangeLog README; do
+		test -e "${doc}" && dodoc ${doc}
+	done
+
+	if ! use frontendonly; then
+		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
+	fi
+
+
+	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 contrib/*
+
+	insinto /usr/share/mythtv/configfiles
+	doins configfiles/*
+
+	if ! use backendonly; then
+		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
+	fi
+}
+
+pkg_preinst() {
+	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS} || die "Problem adding mythtv user"
+	usermod -a -G ${MYTHTV_GROUPS} mythtv
+
+	export CONFIG_PROTECT="${CONFIG_PROTECT} ${ROOT}/home/mythtv/"
+}
+
+pkg_postinst() {
+	if ! use backendonly; then
+		echo
+		elog "Want mythfrontend to start automatically?"
+		elog "Set USE=autostart. Details can be found at:"
+		elog "http://dev.gentoo.org/~cardoe/mythtv/autostart.html"
+	fi
+
+	if ! use frontendonly; then
+		echo
+		elog "To always have MythBackend running and available run the following:"
+		elog "rc-update add mythbackend default"
+		echo
+		ewarn "Your recordings folder must be owned by the user 'mythtv' now"
+		ewarn "chown -R mythtv /path/to/store"
+	fi
+
+	if use autostart; then
+		echo
+		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
+
+}
+