Rev bump from upstream that fixes some of the following bugs and some that I fixed. bugs #144640, #149340, #149341, #149601, #149848

Package-Manager: portage-2.1.2_pre2-r1

5 files changed, 290 insertions, 15 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 1c0bb0a39994..da5a6243b7ea 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.121 2006/10/05 21:42:30 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.122 2006/10/06 03:00:23 cardoe Exp $
+
+*mythtv-0.20_p11444 (06 Oct 2006)
+
+  06 Oct 2006; Doug Goldstein <cardoe@gentoo.org>
+  files/mythbackend-0.18.2.rc, +mythtv-0.20_p11444.ebuild:
+  Rev bump from upstream that fixes some of the following bugs and some that I
+  fixed. bugs #144640, #149340, #149341, #149601, #149848
 
   05 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   mythtv-0.19_p10505.ebuild:
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index d7b1d3258fce..407e6ae0beeb 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -5,10 +5,10 @@ AUX mythbackend-0.18.2.conf 431 RMD160 1879e25aadacf4c45c3857ec329546fd5950af36
 MD5 ce6902dd0c8832390052b427a14acc42 files/mythbackend-0.18.2.conf 431
 RMD160 1879e25aadacf4c45c3857ec329546fd5950af36 files/mythbackend-0.18.2.conf 431
 SHA256 89fa9de3a25937c47062adc3ba449067ef50564729117c4f171fe69459588810 files/mythbackend-0.18.2.conf 431
-AUX mythbackend-0.18.2.rc 996 RMD160 6481c40dfc97ac6ef4e6319d49d7a06a30da1416 SHA1 4aca0c56810de7344615f1d609e3f3ae936f4707 SHA256 c343be99413c23995613c0d9c5c31f5f09b567ece63d29cfe3fe75caf880ecb6
-MD5 dc6d9b020f4f907c16d0079c905f044b files/mythbackend-0.18.2.rc 996
-RMD160 6481c40dfc97ac6ef4e6319d49d7a06a30da1416 files/mythbackend-0.18.2.rc 996
-SHA256 c343be99413c23995613c0d9c5c31f5f09b567ece63d29cfe3fe75caf880ecb6 files/mythbackend-0.18.2.rc 996
+AUX mythbackend-0.18.2.rc 1010 RMD160 5d96bb169641b6c3cf271b2fe74ef4b42c92254c SHA1 8e54a5bb22da4fab1ed09d29c1f83d5ad06ebe71 SHA256 3f18073977bc94123af12d874b88e78067fb9fea6c449e1fe43e02349ad00925
+MD5 3d3567d15337956f4bea4b390b6d2744 files/mythbackend-0.18.2.rc 1010
+RMD160 5d96bb169641b6c3cf271b2fe74ef4b42c92254c files/mythbackend-0.18.2.rc 1010
+SHA256 3f18073977bc94123af12d874b88e78067fb9fea6c449e1fe43e02349ad00925 files/mythbackend-0.18.2.rc 1010
 AUX mythfilldatabase.cron 73 RMD160 ce57516fe3ac3f339ebaad6b88c85366d4dbbc5b SHA1 7ae24184f931336f317eaefaa7c27a8e4531e0ee SHA256 fc5a3b094fd403e9076fbb1903e826ddc97bd579cb0ba7ef6fc11940099fca3d
 MD5 3632cf0ce1fad88f806ae8801316a6fc files/mythfilldatabase.cron 73
 RMD160 ce57516fe3ac3f339ebaad6b88c85366d4dbbc5b files/mythfilldatabase.cron 73
@@ -34,6 +34,7 @@ DIST mythtv-0.19.tar.bz2 10162049 RMD160 cd90bb3629df55f9e803d867cf59e378e9cace0
 DIST mythtv-0.20.tar.bz2 12380677 RMD160 d9ef5221a1d821f2f210e7ebb0c32a88625fb522 SHA1 be6d2666a689340d40ca608f6a8a3af10f752a55 SHA256 777ff60afa89426f0e52e49b0e7a7661ddb45b59d2ebbfdcbe07fd179e526ff3
 DIST mythtv-0.20_svn11244.patch.bz2 2357 RMD160 aa8d95353a4e49ef339ec03eee7634186a8ef03a SHA1 2b40edc2948876de15ff210f23053f92c2365c88 SHA256 2861d79015607add1b135c3c5c16f86cbdda39ceb6bd9766e80e8a738f8f1b8a
 DIST mythtv-0.20_svn11281.patch.bz2 3209 RMD160 9fb4bbaab2d9f286eb01b6f9c5f5bd02593adbc6 SHA1 e7d8b7adc56091ff48f72c3efcdde40f7c5883bf SHA256 d039d85166dd4a023370b0c2115bed9c093dc1b9f3e18fb37486ed3cff4b44b5
+DIST mythtv-0.20_svn11444.patch.bz2 13532 RMD160 026000436cc842bc3d1c0e525926d403e3f2bcdf SHA1 90cdf24e31cb8159509a8fd0176fafb8e4dd2919 SHA256 794fcb3103603b38b9388450666f8942b32d6898b4ded5e095ed9fea41419dec
 EBUILD mythtv-0.19_p10505.ebuild 7759 RMD160 9ebcb67757acd224aec37d155d96d820df86958a SHA1 e79b9ac2b605bccd59ce7cf929915d06a854f9ac SHA256 20bbfb96e9ec9683d01ccb0a9d9589caeaae969ba4993633315153563878a699
 MD5 2cee10acbf7023d05e87d3646d50be19 mythtv-0.19_p10505.ebuild 7759
 RMD160 9ebcb67757acd224aec37d155d96d820df86958a mythtv-0.19_p10505.ebuild 7759
@@ -46,10 +47,14 @@ EBUILD mythtv-0.20_p11281.ebuild 7330 RMD160 87d69d18e8fbf659cc3b65c4f05ed2505dd
 MD5 9e600ae8acf1090d5c6f747d84c0ab59 mythtv-0.20_p11281.ebuild 7330
 RMD160 87d69d18e8fbf659cc3b65c4f05ed2505dd88958 mythtv-0.20_p11281.ebuild 7330
 SHA256 5bc49c529457eed4304206e54052a78d6d78a79612ac51f71457702d6a9b9c43 mythtv-0.20_p11281.ebuild 7330
-MISC ChangeLog 21727 RMD160 7ac8773bbc5e6cccabc81e0ac6f425d1ea8f99e0 SHA1 f8ab37aa56516561f92fbd0f25092e2e3ba16313 SHA256 ea1162f6666881fc5bac075c4bf40b88970f16b098b5feb72c1e05b8187d46c5
-MD5 dc764e978c2b13203b10e54b5bfa6e98 ChangeLog 21727
-RMD160 7ac8773bbc5e6cccabc81e0ac6f425d1ea8f99e0 ChangeLog 21727
-SHA256 ea1162f6666881fc5bac075c4bf40b88970f16b098b5feb72c1e05b8187d46c5 ChangeLog 21727
+EBUILD mythtv-0.20_p11444.ebuild 7361 RMD160 be4dd760890da18ce0d392c2b8fcab8339919c6b SHA1 bd7eeca7bb3ee638ca027dad002c5e829e81897c SHA256 67dc4001ceccc99d7b89bb383fd8a471122a0c9dc56eab4bbafc71492f182164
+MD5 ada41c42c88c7948dbca5b2de69a8925 mythtv-0.20_p11444.ebuild 7361
+RMD160 be4dd760890da18ce0d392c2b8fcab8339919c6b mythtv-0.20_p11444.ebuild 7361
+SHA256 67dc4001ceccc99d7b89bb383fd8a471122a0c9dc56eab4bbafc71492f182164 mythtv-0.20_p11444.ebuild 7361
+MISC ChangeLog 22007 RMD160 28286ae25d28204afb5acf1ee00c559559bd9e22 SHA1 a98955f9149df91e5b35e89265209fd085f893ea SHA256 7ee23e811fd6af6a7af41ab73e5c49cc1c6f50b54f98b1de2c2a7335a291be38
+MD5 8f7ff767ad0f9ad7cdfb69812b26aa7e ChangeLog 22007
+RMD160 28286ae25d28204afb5acf1ee00c559559bd9e22 ChangeLog 22007
+SHA256 7ee23e811fd6af6a7af41ab73e5c49cc1c6f50b54f98b1de2c2a7335a291be38 ChangeLog 22007
 MISC metadata.xml 222 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e SHA1 c6bd979f236f5e6fe9332eb6568bee402efc793f SHA256 8b2065fecfbbdd0caa3c5eb86b98c22766db07f555edbf3127e9454b468ecff6
 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e metadata.xml 222
@@ -63,10 +68,13 @@ SHA256 c244a3436f678f2a17373b043c32bbd9407c4564a2065e75a17bfdf287ea548b files/di
 MD5 4776689ba4e0f1e7dc904fe538239f10 files/digest-mythtv-0.20_p11281 509
 RMD160 f6e87b9845704cad8437494213859265f63196a2 files/digest-mythtv-0.20_p11281 509
 SHA256 f2737bcfdba3bd7443906339354270bc858a5dbabed235889f8840ab07b0aba3 files/digest-mythtv-0.20_p11281 509
+MD5 eafe2aa1440b4cfe8f5e738666212389 files/digest-mythtv-0.20_p11444 512
+RMD160 85bf502866d1fdc974a762cef2de0d175bf6db05 files/digest-mythtv-0.20_p11444 512
+SHA256 0427babbaf2dacd5287bb6dd0978452f76e47098d0ca693ee09316cbf72b57a6 files/digest-mythtv-0.20_p11444 512
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJXxLkT4lNIS36YERAi4VAKDFhn1Yu6Ga7QsJFTCiHFhmZrLOpgCff8Ym
-JWvNwrCIMGXKVwOY2ArL4EE=
-=Efcz
+iD8DBQFFJcbVoeSe8B0zEfwRAltxAJ9r/n2kzIRgxvTWtsv9UrgktBisfQCdGlVj
+5h3Qv0vxrFtj/Gioprr5srk=
+=doZQ
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/files/digest-mythtv-0.20_p11444 b/media-tv/mythtv/files/digest-mythtv-0.20_p11444
new file mode 100644
index 000000000000..73abf9db8d76
--- /dev/null
+++ b/media-tv/mythtv/files/digest-mythtv-0.20_p11444
@@ -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 5bfa3c6147b99ddecabede5cdbb2241c mythtv-0.20_svn11444.patch.bz2 13532
+RMD160 026000436cc842bc3d1c0e525926d403e3f2bcdf mythtv-0.20_svn11444.patch.bz2 13532
+SHA256 794fcb3103603b38b9388450666f8942b32d6898b4ded5e095ed9fea41419dec mythtv-0.20_svn11444.patch.bz2 13532
diff --git a/media-tv/mythtv/files/mythbackend-0.18.2.rc b/media-tv/mythtv/files/mythbackend-0.18.2.rc
index 2f08ffdaf823..61f3324bb429 100644
--- a/media-tv/mythtv/files/mythbackend-0.18.2.rc
+++ b/media-tv/mythtv/files/mythbackend-0.18.2.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/files/mythbackend-0.18.2.rc,v 1.3 2006/01/11 17:57:48 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/files/mythbackend-0.18.2.rc,v 1.4 2006/10/06 03:00:23 cardoe Exp $
 
 depend() {
 	need net
@@ -11,8 +11,8 @@ depend() {
 start() {
 	[[ -z "${MYTH_VERBOSE}" ]] && MYTH_VERBOSE="none"
 
-	QTDIR=/usr/qt/3
-	HOME=/etc/mythtv
+	export QTDIR=/usr/qt/3
+	export HOME=/etc/mythtv
 		
 	#fixes for bug #101308
 	unset DISPLAY
diff --git a/media-tv/mythtv/mythtv-0.20_p11444.ebuild b/media-tv/mythtv/mythtv-0.20_p11444.ebuild
new file mode 100644
index 000000000000..69d32d664de2
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.20_p11444.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.20_p11444.ebuild,v 1.1 2006/10/06 03:00:23 cardoe Exp $
+
+inherit mythtv flag-o-matic multilib eutils debug qt3
+
+DESCRIPTION="Homebrew PVR project"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE_VIDEO_CARDS="video_cards_i810 video_cards_nvidia video_cards_via"
+
+IUSE="alsa altivec backendonly crciprec debug dbox2 dts dvb dvd freebox frontendonly hdhomerun ieee1394 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)
+	dev-db/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 )
+	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 )"
+
+DEPEND="${RDEPEND}
+	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
+
+	[[ $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
+
+	# Seriously... testing.. or maybe seeing if the OpenGL spec says these are
+	# public... or checking mesa before assuming they're there
+	epatch "${FILESDIR}"/${PN}-${MY_PV}-vsync.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
+
+	dobin "${FILESDIR}"/runmythfe
+
+	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 /usr/share/mythtv/contrib
+	doins contrib/*
+}
+
+pkg_preinst() {
+	enewuser mythtv -1 "-1" -1 ${MYTHTV_GROUPS} || die "Problem adding mythtv user"
+	usermod -a -G ${MYTHTV_GROUPS} mythtv
+}
+
+pkg_postinst() {
+	if ! use backendonly; then
+		echo
+		einfo "Want mythfrontend to start automatically? Run the following:"
+		einfo "crontab -e -u mythtv"
+		einfo "Add add the following:"
+		einfo "* * * * * /usr/bin/runmythfe &"
+	fi
+	echo
+	einfo "To always have MythBackend running and available run the following:"
+	einfo "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"
+}
+