fix CVE-2007-6036. Fix internal DVD player issues. Fix ffmpeg header location issue. Fix EIT encoding.

Package-Manager: portage-2.1.4.4

5 files changed, 15 insertions, 645 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 1e9e71d1a509..30b1cf6f4c44 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.228 2008/03/28 16:04:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.229 2008/04/01 03:56:03 cardoe Exp $
+
+*mythtv-0.21_p16867 (01 Apr 2008)
+
+  01 Apr 2008; Doug Goldstein <cardoe@gentoo.org>
+  -mythtv-0.21_p16483.ebuild, -mythtv-0.21_p16658.ebuild,
+  -mythtv-0.21_p16812.ebuild, +mythtv-0.21_p16867.ebuild:
+  fix CVE-2007-6036. Fix internal DVD player issues. Fix ffmpeg header
+  location issue. Fix EIT encoding.
 
 *mythtv-0.21_p16812 (28 Mar 2008)
 
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 58849e502328..1d75d48e9c5a 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -11,16 +11,14 @@ AUX runmythfe 186 RMD160 e4b5bfeaecbf541e6cc45b6a9c0e5c048e3fccd0 SHA1 f5ec9dfd4
 AUX xinitrc 240 RMD160 9c0c1030aa65c8fd3f20501f45757515a9208a61 SHA1 11795aa8be5bd668d91acdd61aa80d5cc8af5cac SHA256 770990183ce8df60bf3bcbc3a334558155aedd0a80357556261fb938b4254e94
 EBUILD mythtv-0.20.2_p14972.ebuild 10237 RMD160 eae5584cc1f21c609f08b860dd36ffcb79cbac37 SHA1 0e8fce758816cea2312a212e87db3814dfcfed29 SHA256 d37e7ad04d9f6ea0164dc79b18950fb5f500cc5cd310c0a4aca76ffd4080aa7e
 EBUILD mythtv-0.20.2_p15634.ebuild 10065 RMD160 e06d1f91993fd6f35d35b7d1bd09650e36859b39 SHA1 0a8704af4aace69312f8b36d9c01b75367cc9be3 SHA256 472862f7f583f7c3e1d4fb98713640596818a2dd61ea9bc70510db926e16e3e1
-EBUILD mythtv-0.21_p16483.ebuild 9498 RMD160 c8c103deda48996a7729678a77b8ab1c8596e96f SHA1 42ec1efe5a3c7c1504f1d7dde4f7de58ec6e6552 SHA256 00582b2d00ea8c2bc44f11f18d1977971d18fcf3e7ba800e8ae3657daa40586e
-EBUILD mythtv-0.21_p16658.ebuild 9577 RMD160 73385db2e9c60040f2a03eb8ae65a6e9a1035394 SHA1 d771200b16629325c3a85b9050aeedcb7517178a SHA256 256eba1ebfa9fdb4d0597eb1f22e09fdc790871945b6eb7c10a97233e3829617
-EBUILD mythtv-0.21_p16812.ebuild 9577 RMD160 a7e4d7739e17f694be3c7522eed80d8059aa1754 SHA1 472a4a3ec13f87305494df3c391cc707699ae962 SHA256 938f9b7ee39e404dc8a85ee2a1b9a1db5b7d5e6ee5f20d5becf93e8ca6f07404
+EBUILD mythtv-0.21_p16867.ebuild 9577 RMD160 96b215e52131830432de4b38621be3b161191ed2 SHA1 cf83821f0fa394062ed7ace39bb155e728d47828 SHA256 00f4f8577ccc447993f7d15a9975025299f43335cdbaaac1121cf8e4a6f24278
 EBUILD mythtv-0.22_alpha16791.ebuild 10094 RMD160 b22e22333face10b607c355fdc618a23eb335bd5 SHA1 e120c1f8bec0644a954d2291e46ccebbe04bf3c2 SHA256 b53739b1fec9545b2e74f6a3f8cc212d275da9959db122f7586e93b489796c32
-MISC ChangeLog 43357 RMD160 758d48861e83ee421a78d6ddf5bbd0305778ff19 SHA1 f863e7ff2b0c39c36f178fa371ba77a9d2117f0d SHA256 6c0f780cc693258db7212e8b0b14ab7bfa0f8134387e5529e042df8b99b888c0
+MISC ChangeLog 43666 RMD160 3fd51ee6bb8844007ba891fc8b0a1fb570aacce7 SHA1 45e24e06d3ded8e91d18073518d753a417e3885d SHA256 be3864ec56e4e220342e5b9309b556313df6e2ed4940395b7829b30e74714a27
 MISC metadata.xml 4714 RMD160 c65d058e83e36342d6a49b63a6e9609e11242b66 SHA1 0de80f93ca1adfede5783d30a45953ec4cd27c9b SHA256 7501a841c218dd17bee56aeefcfc60194241b3a5468898850c5bedf5dafd28e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkftFw4ACgkQoeSe8B0zEfyD8gCfZaR7w7xrivJaFFwKs5rYW7iC
-dg8AnAvmEzXTZVOJXXj7110ONDODpkOk
-=ieTf
+iEYEARECAAYFAkfxsl8ACgkQoeSe8B0zEfzUZQCfWrkcCqI+8v1FWTfP1CBbfXCI
+MQYAnAy7ms+46rOZL6QtQ6d2gcQUuoMx
+=oi4V
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/mythtv-0.21_p16483.ebuild b/media-tv/mythtv/mythtv-0.21_p16483.ebuild
deleted file mode 100644
index b035bc9efd5e..000000000000
--- a/media-tv/mythtv/mythtv-0.21_p16483.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_p16483.ebuild,v 1.1 2008/03/10 17:30:54 cardoe Exp $
-
-EAPI=1
-inherit flag-o-matic multilib eutils qt3 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 dbox2 debug directv dvb dvd hdhomerun ieee1394 iptv \
-ivtv jack joystick lcd lirc mmx opengl opengl-video opengl-xvmc perl python \
-vorbis 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-3.3:3
-	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 )
-	directv? ( virtual/perl-Time-HiRes )
-	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
-	dvd? ( 	media-libs/libdvdnav )
-	ieee1394? (	>=sys-libs/libraw1394-1.2.0
-			>=sys-libs/libavc1394-0.5.0
-			>=media-libs/libiec61883-1.0.0 )
-	ivtv? ( media-tv/ivtv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lcd? ( app-misc/lcdproc )
-	lirc? ( app-misc/lirc )
-	perl? ( dev-perl/DBD-mysql )
-	python? ( dev-python/mysql-python )
-	opengl-xvmc? ( >=x11-drivers/nvidia-drivers-100 )
-	xvmc? ( x11-libs/libXvMC
-		app-admin/eselect-xvmc )"
-
-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,uucp"
-
-pkg_setup() {
-
-	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
-		die "Please fix the above issues, before continuing."
-	fi
-
-	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
-
-	if use xvmc && use opengl-xvmc ; then
-		einfo "Enabling USE=opengl-xvmc results in an experimental OpenGL"
-		einfo "& XvMC renderer that only works on NVIDIA GeForce 4,5,6, & 7"
-		einfo "series of cards. It is typically slower then stock XVideo"
-		einfo "support that is the default in MythTV."
-		echo
-	fi
-
-	if use opengl-video ; then
-		einfo "Enabling USE=opengl-video results in an experimental OpenGL"
-		einfo "renderer that is typically slower then the default XVideo"
-		einfo "renderer. Enable at your own risk."
-		echo
-	fi
-
-	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS} || die "Problem adding mythtv user"
-	usermod -a -G ${MYTHTV_GROUPS} mythtv
-}
-
-src_unpack() {
-	subversion_src_unpack
-
-	# upstream wants the revision number in their version.cpp
-	# since the subversion.eclass strips out the .svn directory
-	# svnversion in MythTV's build doesn't work
-	sed -e "s:\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`:${MYTHTV_REV}:" \
-		-i "${S}"/version.pro || die "svnversion sed failed"
-
-	# 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
-}
-
-src_compile() {
-	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 dbox2 || myconf="${myconf} --disable-dbox2"
-	use hdhomerun || myconf="${myconf} --disable-hdhomerun"
-	use ivtv || myconf="${myconf} --disable-ivtv"
-	use jack || myconf="${myconf} --disable-audio-jack"
-	use opengl-video && myconf="${myconf} --enable-opengl-video"
-	use xvmc && ! use video_cards_via  ! use opengl-xvmc && myconf="${myconf} --enable-xvmc --xvmc-lib=XvMCW"
-	use xvmc && use video_cards_via && myconf="${myconf} --enable-xvmc --enable-xvmc-pro"
-	use xvmc && use video_cards_nvidia && use opengl-xvmc && myconf="${myconf} --enable-xvmc --enable-xvmc-opengl"
-	myconf="${myconf}
-		$(use_enable dvb)
-		$(use_enable ieee1394 firewire)
-		$(use_enable iptv)
-		$(use_enable joystick joystick-menu)
-		$(use_enable lirc)
-		--disable-audio-arts
-		--disable-directfb
-		--dvb-path=/usr/include
-		--enable-opengl-vsync
-		--enable-xrandr
-		--enable-xv
-		--enable-x11
-		--enable-gpl"
-
-	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
-	CFLAGS=""
-	CXXFLAGS=""
-	einfo "Running ./configure ${myconf}"
-	./configure ${myconf} || die "configure died"
-
-	eqmake3 mythtv.pro -o "Makefile" || die "eqmake3 failed"
-	emake || die "emake failed"
-
-	# firewire support should build the tester
-	if use ieee1394; then
-		cd contrib
-		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../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.c \
-			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
-			die "failed to compile 6200ch"
-		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../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.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"
-		dodoc contrib/firewire_tester-README
-
-		dobin 6200ch || die "failed to install 6200ch"
-		dodoc contrib/channel_changers/6200ch-README
-
-		dobin sa3250ch || die "failed to install sa3250ch"
-		dodoc contrib/channel_changers/sa3250ch-README
-	fi
-
-	dobin red_eye || die "failed to install red_eye"
-	dodoc contrib/channel_changers/red_eye-README
-
-	if use directv; then
-		dobin contrib/channel_changers/d10control.pl || die "failed to install d10control"
-		dodoc contrib/channel_changers/d10control-README
-	fi
-}
-
-pkg_preinst() {
-	export CONFIG_PROTECT="${CONFIG_PROTECT} ${ROOT}/home/mythtv/"
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize "${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/MythTV"
-
-	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"
-
-	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"
-
-	if use xvmc; then
-		echo
-		elog "Please set the proper XvMC provider with eselect xvmc"
-	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
-
-}
-
-pkg_postrm()
-{
-	python_version
-	python_mod_cleanup "/usr/$(get_libdir)/python${PYVER}/site-packages/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
-}
diff --git a/media-tv/mythtv/mythtv-0.21_p16812.ebuild b/media-tv/mythtv/mythtv-0.21_p16812.ebuild
deleted file mode 100644
index c683088cc075..000000000000
--- a/media-tv/mythtv/mythtv-0.21_p16812.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_p16812.ebuild,v 1.1 2008/03/28 16:04:01 cardoe Exp $
-
-EAPI=1
-inherit flag-o-matic multilib eutils qt3 mythtv toolchain-funcs python
-
-DESCRIPTION="Homebrew PVR project"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_via"
-IUSE="aac alsa altivec autostart dbox2 debug directv dvb dvd hdhomerun ieee1394 iptv \
-ivtv jack joystick lcd lirc mmx opengl opengl-video opengl-xvmc perl python \
-vorbis 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-3.3:3
-	virtual/mysql
-	virtual/opengl
-	virtual/glu
-	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.43 )
-	aac? ( media-libs/faad2 )
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	autostart? ( net-dialup/mingetty
-				x11-wm/evilwm
-				x11-apps/xset )
-	directv? ( virtual/perl-Time-HiRes )
-	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
-	dvd? ( 	media-libs/libdvdnav )
-	ieee1394? (	>=sys-libs/libraw1394-1.2.0
-			>=sys-libs/libavc1394-0.5.0
-			>=media-libs/libiec61883-1.0.0 )
-	ivtv? ( media-tv/ivtv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lcd? ( app-misc/lcdproc )
-	lirc? ( app-misc/lirc )
-	perl? ( dev-perl/DBD-mysql )
-	python? ( dev-python/mysql-python )
-	opengl-xvmc? ( >=x11-drivers/nvidia-drivers-100 )
-	xvmc? ( x11-libs/libXvMC
-		app-admin/eselect-xvmc )"
-
-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,uucp"
-
-pkg_setup() {
-
-	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
-		die "Please fix the above issues, before continuing."
-	fi
-
-	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
-
-	if use xvmc && use opengl-xvmc ; then
-		einfo "Enabling USE=opengl-xvmc results in an experimental OpenGL"
-		einfo "& XvMC renderer that only works on NVIDIA GeForce 4,5,6, & 7"
-		einfo "series of cards. It is typically slower then stock XVideo"
-		einfo "support that is the default in MythTV."
-		echo
-	fi
-
-	if use opengl-video ; then
-		einfo "Enabling USE=opengl-video results in an experimental OpenGL"
-		einfo "renderer that is typically slower then the default XVideo"
-		einfo "renderer. Enable at your own risk."
-		echo
-	fi
-
-	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS} || die "Problem adding mythtv user"
-	usermod -a -G ${MYTHTV_GROUPS} mythtv
-}
-
-src_unpack() {
-	subversion_src_unpack
-
-	# upstream wants the revision number in their version.cpp
-	# since the subversion.eclass strips out the .svn directory
-	# svnversion in MythTV's build doesn't work
-	sed -e "s:\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`:${MYTHTV_REV}:" \
-		-i "${S}"/version.pro || die "svnversion sed failed"
-
-	# 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
-}
-
-src_compile() {
-	local myconf="--prefix=/usr
-		--mandir=/usr/share/man
-		--libdir-name=$(get_libdir)"
-	use aac && myconf="${myconf} --enable-libfaad"
-	use alsa || myconf="${myconf} --disable-audio-alsa"
-	use altivec || myconf="${myconf} --disable-altivec"
-	use dbox2 || myconf="${myconf} --disable-dbox2"
-	use hdhomerun || myconf="${myconf} --disable-hdhomerun"
-	use ivtv || myconf="${myconf} --disable-ivtv"
-	use jack || myconf="${myconf} --disable-audio-jack"
-	use opengl-video && myconf="${myconf} --enable-opengl-video"
-	use xvmc && ! use video_cards_via  ! use opengl-xvmc && myconf="${myconf} --enable-xvmc --xvmc-lib=XvMCW"
-	use xvmc && use video_cards_via && myconf="${myconf} --enable-xvmc --enable-xvmc-pro"
-	use xvmc && use video_cards_nvidia && use opengl-xvmc && myconf="${myconf} --enable-xvmc --enable-xvmc-opengl"
-	myconf="${myconf}
-		$(use_enable dvb)
-		$(use_enable ieee1394 firewire)
-		$(use_enable iptv)
-		$(use_enable joystick joystick-menu)
-		$(use_enable lirc)
-		--disable-audio-arts
-		--disable-directfb
-		--dvb-path=/usr/include
-		--enable-opengl-vsync
-		--enable-xrandr
-		--enable-xv
-		--enable-x11
-		--enable-gpl"
-
-	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
-	CFLAGS=""
-	CXXFLAGS=""
-	einfo "Running ./configure ${myconf}"
-	./configure ${myconf} || die "configure died"
-
-	eqmake3 mythtv.pro -o "Makefile" || die "eqmake3 failed"
-	emake || die "emake failed"
-
-	# firewire support should build the tester
-	if use ieee1394; then
-		cd contrib
-		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../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.c \
-			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
-			die "failed to compile 6200ch"
-		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../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.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"
-		dodoc contrib/firewire_tester-README
-
-		dobin 6200ch || die "failed to install 6200ch"
-		dodoc contrib/channel_changers/6200ch-README
-
-		dobin sa3250ch || die "failed to install sa3250ch"
-		dodoc contrib/channel_changers/sa3250ch-README
-	fi
-
-	dobin red_eye || die "failed to install red_eye"
-	dodoc contrib/channel_changers/red_eye-README
-
-	if use directv; then
-		dobin contrib/channel_changers/d10control.pl || die "failed to install d10control"
-		dodoc contrib/channel_changers/d10control-README
-	fi
-}
-
-pkg_preinst() {
-	export CONFIG_PROTECT="${CONFIG_PROTECT} ${ROOT}/home/mythtv/"
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize "${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/MythTV"
-
-	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"
-
-	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"
-
-	if use xvmc; then
-		echo
-		elog "Please set the proper XvMC provider with eselect xvmc"
-	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
-
-}
-
-pkg_postrm()
-{
-	python_version
-	python_mod_cleanup "/usr/$(get_libdir)/python${PYVER}/site-packages/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
-}
diff --git a/media-tv/mythtv/mythtv-0.21_p16658.ebuild b/media-tv/mythtv/mythtv-0.21_p16867.ebuild
index 0d16103af1fb..634300c3b182 100644
--- a/media-tv/mythtv/mythtv-0.21_p16658.ebuild
+++ b/media-tv/mythtv/mythtv-0.21_p16867.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_p16658.ebuild,v 1.2 2008/03/18 14:46:04 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_p16867.ebuild,v 1.1 2008/04/01 03:56:03 cardoe Exp $
 
 EAPI=1
 inherit flag-o-matic multilib eutils qt3 mythtv toolchain-funcs python