Fixing bug #168248 and bug #159342

Package-Manager: portage-2.1.2-r12

4 files changed, 319 insertions, 8 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 7626d6114567..37509c007ee6 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,12 @@
 # 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.138 2007/02/21 22:07:59 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.139 2007/03/01 05:59:46 cardoe Exp $
+
+*mythtv-0.20_p12884 (01 Mar 2007)
+
+  01 Mar 2007; Doug Goldstein <cardoe@gentoo.org>
+  +mythtv-0.20_p12884.ebuild:
+  Fixing bug #168248 and bug #159342
 
 *mythtv-0.20_p12825 (21 Feb 2007)
 
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index fd09955caa53..6bb5465103ad 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -45,6 +45,7 @@ DIST mythtv-0.20_svn12599.patch.bz2 22933 RMD160 0e5f14ef15c432671e45b2fd7c5f870
 DIST mythtv-0.20_svn12783.patch.bz2 26553 RMD160 2ac3bade32a2de8db4afb3e683b6e85e378796fd SHA1 26f5da1c01bc5828502fc234e253c8206ea981e2 SHA256 de8e8641fd087e9d17e5c5dd8098a11aad6b047cc8a7a6edd135c65dace630aa
 DIST mythtv-0.20_svn12801.patch.bz2 26998 RMD160 c7bf7410e98c56518ffa332b631e4ab27050d7c3 SHA1 380bb891ef3119d41c787b6eb4be5cc3771e822c SHA256 495adc461a3af5512f1803ccee525c0a73e4083b838bbf834c884aba43c901e3
 DIST mythtv-0.20_svn12825.patch.bz2 27539 RMD160 20a4c388d92498ca63b701713705c2976d27b0d0 SHA1 c0ee147581237f6a824a31709b0d7d70004f0502 SHA256 779e5e9d3d058620f1146fd775aa0d9484c11bb8a8d3b8400f4d1570d42ba793
+DIST mythtv-0.20_svn12884.patch.bz2 27677 RMD160 405a3ee81223240e833497d756483ffff1d011d7 SHA1 111ac027190eed09481968908a319e78d9060e9e SHA256 e07baf701f0a7ee197fe0bb9bf8739286564e38578c4e81ae07a4b95f451fde0
 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
@@ -89,10 +90,14 @@ EBUILD mythtv-0.20_p12825.ebuild 8104 RMD160 91ff8011c88cc85363f9f74cc2ba7940f73
 MD5 fbeec3c6bad3218c8e3986a5ee48c6ac mythtv-0.20_p12825.ebuild 8104
 RMD160 91ff8011c88cc85363f9f74cc2ba7940f73e816c mythtv-0.20_p12825.ebuild 8104
 SHA256 1b4206dc57ae6ed57edd8bdf82cf440ed33ff25c88b1f53c6cfcf63eaa85d42b mythtv-0.20_p12825.ebuild 8104
-MISC ChangeLog 24942 RMD160 c119636a73150ca6eb518a45f00be09a8ea1522c SHA1 e5950d78732f1b5832757ee20c0062f8489608a8 SHA256 1171e985d65ca69cc280c25a30c818a1be696c7383b19a4f4a053d1fb7391205
-MD5 fad3ea88848f4da9c4ae0e55645164c8 ChangeLog 24942
-RMD160 c119636a73150ca6eb518a45f00be09a8ea1522c ChangeLog 24942
-SHA256 1171e985d65ca69cc280c25a30c818a1be696c7383b19a4f4a053d1fb7391205 ChangeLog 24942
+EBUILD mythtv-0.20_p12884.ebuild 8157 RMD160 e12485f3f11498421fa590bf2ae9cf93c76ab128 SHA1 15c5e23a0d4b6bd453e44bb383efa54e4bf62089 SHA256 f1c7a3a9e4e460bce400ef40f27ef856769e8c183ba728acd0351c3573e9f764
+MD5 9481e74f3fcbd44eb43686ed792dd9ef mythtv-0.20_p12884.ebuild 8157
+RMD160 e12485f3f11498421fa590bf2ae9cf93c76ab128 mythtv-0.20_p12884.ebuild 8157
+SHA256 f1c7a3a9e4e460bce400ef40f27ef856769e8c183ba728acd0351c3573e9f764 mythtv-0.20_p12884.ebuild 8157
+MISC ChangeLog 25095 RMD160 475dc90e73dd343f02feecc5647df4805580e399 SHA1 d2e830ea7a3fbdbaad4e2985ba9a79b52ae0e897 SHA256 2b5b46d671c598baaaf1524d57e20bcaca46da8b00f015110ee85a34133d178b
+MD5 7b91ba25603d2ed9cf284170394b8629 ChangeLog 25095
+RMD160 475dc90e73dd343f02feecc5647df4805580e399 ChangeLog 25095
+SHA256 2b5b46d671c598baaaf1524d57e20bcaca46da8b00f015110ee85a34133d178b ChangeLog 25095
 MISC metadata.xml 222 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e SHA1 c6bd979f236f5e6fe9332eb6568bee402efc793f SHA256 8b2065fecfbbdd0caa3c5eb86b98c22766db07f555edbf3127e9454b468ecff6
 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e metadata.xml 222
@@ -130,10 +135,13 @@ SHA256 8d8e91a7fa5f0105c30e83760338c7f5007c113a0e2431fe68431d541d03cde9 files/di
 MD5 54a83ae44faaccff0d6048510ce0670a files/digest-mythtv-0.20_p12825 512
 RMD160 270d48cc0cd8f9a811344ceb17809d5b65e69270 files/digest-mythtv-0.20_p12825 512
 SHA256 058468a3e0cae6f5f8af48a670b7d0236474e4d38da5e1db3929a54cc0451c54 files/digest-mythtv-0.20_p12825 512
+MD5 a19bd16301decf27970dcd54757da403 files/digest-mythtv-0.20_p12884 512
+RMD160 395ad1c4aa1ff90d485ed6a2ce6e48c2567d038d files/digest-mythtv-0.20_p12884 512
+SHA256 db45714611bf491ebf134379888b0f90848304695234eed84a4ff9fd1d46f93a files/digest-mythtv-0.20_p12884 512
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF3MLDoeSe8B0zEfwRAkKWAJ4tNgA4gTJ0sMyTEYva3388jEQGSACfQie+
-4vnTeR9nl0V/d1IFFk/AyEE=
-=pCOV
+iD8DBQFF5mvcoeSe8B0zEfwRAgV3AJ9O9nzzjuhp56S8byNrD53ZkNrGwACdGByE
+meXA7hJHL0GRGa/AlBe4wHU=
+=lvl9
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/files/digest-mythtv-0.20_p12884 b/media-tv/mythtv/files/digest-mythtv-0.20_p12884
new file mode 100644
index 000000000000..66a34e464cfd
--- /dev/null
+++ b/media-tv/mythtv/files/digest-mythtv-0.20_p12884
@@ -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 8adaa58a7e92bb3242ef22ca2829d166 mythtv-0.20_svn12884.patch.bz2 27677
+RMD160 405a3ee81223240e833497d756483ffff1d011d7 mythtv-0.20_svn12884.patch.bz2 27677
+SHA256 e07baf701f0a7ee197fe0bb9bf8739286564e38578c4e81ae07a4b95f451fde0 mythtv-0.20_svn12884.patch.bz2 27677
diff --git a/media-tv/mythtv/mythtv-0.20_p12884.ebuild b/media-tv/mythtv/mythtv-0.20_p12884.ebuild
new file mode 100644
index 000000000000..4f87b89c677c
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.20_p12884.ebuild
@@ -0,0 +1,291 @@
+# 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_p12884.ebuild,v 1.1 2007/03/01 05:59:46 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 /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
+
+}
+