10 files changed, 60 insertions, 1665 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 245b015912e1..25f2b0b94d39 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,19 @@
 # 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.246 2008/06/28 01:25:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.247 2008/07/07 17:31:34 cardoe Exp $
+
+*mythtv-0.22_alpha17733 (07 Jul 2008)
+*mythtv-0.21_p17722 (07 Jul 2008)
+
+  07 Jul 2008; Doug Goldstein <cardoe@gentoo.org>
+  -mythtv-0.20.2_p14972.ebuild, -mythtv-0.21_p16867.ebuild,
+  -mythtv-0.21_p16926.ebuild, -mythtv-0.21_p16944.ebuild,
+  -mythtv-0.21_p17100.ebuild, -mythtv-0.21_p17435.ebuild,
+  mythtv-0.21_p17637.ebuild, +mythtv-0.21_p17722.ebuild,
+  -mythtv-0.22_alpha17132.ebuild, mythtv-0.22_alpha17449.ebuild,
+  +mythtv-0.22_alpha17733.ebuild:
+  add new 0.21 and 0.22 series versions. Remove old 0.20 and 0.21 versions.
+  Add libdvdcss depend on USE=dvd (bug #231072).
 
 *mythtv-0.21_p17637 (28 Jun 2008)
 
diff --git a/media-tv/mythtv/mythtv-0.20.2_p14972.ebuild b/media-tv/mythtv/mythtv-0.20.2_p14972.ebuild
deleted file mode 100644
index d170b24b0903..000000000000
--- a/media-tv/mythtv/mythtv-0.20.2_p14972.ebuild
+++ /dev/null
@@ -1,345 +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.20.2_p14972.ebuild,v 1.4 2008/04/03 23:10:54 cardoe Exp $
-
-inherit mythtv flag-o-matic multilib eutils qt3 subversion toolchain-funcs
-
-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 dbox2 debug directv 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 )
-		video_cards_via? ( x11-drivers/xf86-video-via )
-		video_cards_i810? ( x11-drivers/xf86-video-i810 )
-	)
-	$(qt_min_version 3.3)
-	virtual/mysql
-	virtual/opengl
-	virtual/glu
-	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	dts? ( media-libs/libdca )
-	dvd? ( 	media-libs/libdvdnav )
-	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
-	directv? ( virtual/perl-Time-HiRes )
-	ivtv? ( media-tv/ivtv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lcd? ( app-misc/lcdproc )
-	lirc? ( app-misc/lirc )
-	perl? ( dev-perl/DBD-mysql )
-	vorbis? ( media-libs/libvorbis )
-	ieee1394? (	>=sys-libs/libraw1394-1.2.0
-			>=sys-libs/libavc1394-0.5.3
-			>=media-libs/libiec61883-1.0.0 )
-	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,uucp"
-
-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() {
-	subversion_src_unpack
-
-	# As needed fix since they don't know how to write qmake let alone a real
-	# make system
-	epatch "${FILESDIR}"/${PN}-0.20-as-needed.patch
-
-	# 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\`:${SVNREV}:" \
-		-i "${S}"/version.pro || die "svnversion sed failed"
-}
-
-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"
-
-	# 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"
-#		LDLIBS="-liec61883 -lraw1394" CC=$(tc-getCC) emake firewire_tester || \
-#			die	"failed to compile firewire_tester"
-	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"
-	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 -r 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
-
-	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() {
-	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
-		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"
-	fi
-
-	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
-
-}
-
-pkg_info() {
-	/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."
-	/usr/bin/mysql -u root -p < /usr/share/mythtv/database/mc.sql
-}
diff --git a/media-tv/mythtv/mythtv-0.21_p16867.ebuild b/media-tv/mythtv/mythtv-0.21_p16867.ebuild
deleted file mode 100644
index 52be48bc4548..000000000000
--- a/media-tv/mythtv/mythtv-0.21_p16867.ebuild
+++ /dev/null
@@ -1,311 +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_p16867.ebuild,v 1.7 2008/06/26 21:40:21 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 debug directv dvb \
-ieee1394 jack lcd lirc mmx opengl opengl-video opengl-xvmc \
-perl python 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 )
-	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 )
-	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 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 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 /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_mod_cleanup /usr/$(get_libdir)/python*/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_p16926.ebuild b/media-tv/mythtv/mythtv-0.21_p16926.ebuild
deleted file mode 100644
index a3888ba410e3..000000000000
--- a/media-tv/mythtv/mythtv-0.21_p16926.ebuild
+++ /dev/null
@@ -1,315 +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_p16926.ebuild,v 1.4 2008/06/26 21:40:21 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 debug directv dvb \
-ieee1394 jack lcd lirc mmx opengl opengl-video opengl-xvmc \
-perl python 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 )
-	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 )
-	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 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"
-	# nvidia-drivers-71 don't support GLX 1.4
-	use video_cards_nvidia && has_version =x11-drivers/nvidia-drivers-71* \
-		&& 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
-		--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 /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_mod_cleanup /usr/$(get_libdir)/python*/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_p16944.ebuild b/media-tv/mythtv/mythtv-0.21_p16944.ebuild
deleted file mode 100644
index 6e7dfc44a166..000000000000
--- a/media-tv/mythtv/mythtv-0.21_p16944.ebuild
+++ /dev/null
@@ -1,318 +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_p16944.ebuild,v 1.3 2008/06/26 21:40:21 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 debug directv dvb \
-ieee1394 jack lcd lirc mmx opengl opengl-video opengl-xvmc \
-perl python 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 )
-	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 )
-	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 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"
-	use xvmc && use video_cards_via && myconf="${myconf} --enable-xvmc \
-		--enable-xvmc-pro --disable-xvmcw"
-	use xvmc && use video_cards_nvidia && use opengl-xvmc && \
-		myconf="${myconf} --enable-xvmc --enable-xvmc-opengl --disable-xvmcw"
-	# nvidia-drivers-71 don't support GLX 1.4
-	use video_cards_nvidia && has_version =x11-drivers/nvidia-drivers-71* \
-		&& 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
-		--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 /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_mod_cleanup /usr/$(get_libdir)/python*/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_p17100.ebuild b/media-tv/mythtv/mythtv-0.21_p17100.ebuild
deleted file mode 100644
index 65c9e11a8638..000000000000
--- a/media-tv/mythtv/mythtv-0.21_p17100.ebuild
+++ /dev/null
@@ -1,318 +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_p17100.ebuild,v 1.3 2008/06/26 21:40:21 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 debug directv dvb \
-ieee1394 jack lcd lirc mmx opengl opengl-video opengl-xvmc \
-perl python 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 )
-	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 )
-	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 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"
-	use xvmc && use video_cards_via && myconf="${myconf} --enable-xvmc \
-		--enable-xvmc-pro --disable-xvmcw"
-	use xvmc && use video_cards_nvidia && use opengl-xvmc && \
-		myconf="${myconf} --enable-xvmc --enable-xvmc-opengl --disable-xvmcw"
-	# nvidia-drivers-71 don't support GLX 1.4
-	use video_cards_nvidia && has_version =x11-drivers/nvidia-drivers-71* \
-		&& 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
-		--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 /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_mod_cleanup /usr/$(get_libdir)/python*/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_p17637.ebuild b/media-tv/mythtv/mythtv-0.21_p17637.ebuild
index bfc9b34b8d54..cf3564aec67e 100644
--- a/media-tv/mythtv/mythtv-0.21_p17637.ebuild
+++ b/media-tv/mythtv/mythtv-0.21_p17637.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_p17637.ebuild,v 1.1 2008/06/28 01:25:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_p17637.ebuild,v 1.2 2008/07/07 17:31:34 cardoe Exp $
 
 EAPI=1
 inherit flag-o-matic multilib eutils qt3 mythtv toolchain-funcs python confutils
@@ -10,7 +10,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE_VIDEO_CARDS="video_cards_nvidia"
-IUSE="aac alsa altivec autostart debug directv dvb fftw ieee1394 jack lcd \
+IUSE="aac alsa altivec autostart debug directv dvb dvd fftw ieee1394 jack lcd \
 lirc mmx opengl perl python x264 xvid xvmc ${IUSE_VIDEO_CARDS}"
 
 RDEPEND=">=media-libs/freetype-2.0
@@ -34,6 +34,7 @@ RDEPEND=">=media-libs/freetype-2.0
 				x11-apps/xset )
 	directv? ( virtual/perl-Time-HiRes )
 	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
+	dvd? ( media-libs/libdvdcss )
 	fftw? ( sci-libs/fftw:3.0 )
 	ieee1394? (	>=sys-libs/libraw1394-1.2.0
 			>=sys-libs/libavc1394-0.5.3
diff --git a/media-tv/mythtv/mythtv-0.21_p17435.ebuild b/media-tv/mythtv/mythtv-0.21_p17722.ebuild
index e2a1829cc5bd..80ee35a2bd6e 100644
--- a/media-tv/mythtv/mythtv-0.21_p17435.ebuild
+++ b/media-tv/mythtv/mythtv-0.21_p17722.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_p17435.ebuild,v 1.6 2008/06/26 21:40:21 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_p17722.ebuild,v 1.1 2008/07/07 17:31:34 cardoe Exp $
 
 EAPI=1
 inherit flag-o-matic multilib eutils qt3 mythtv toolchain-funcs python confutils
@@ -10,7 +10,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE_VIDEO_CARDS="video_cards_nvidia"
-IUSE="aac alsa altivec autostart debug directv dvb fftw ieee1394 jack lcd \
+IUSE="aac alsa altivec autostart debug directv dvb dvd fftw ieee1394 jack lcd \
 lirc mmx opengl perl python x264 xvid xvmc ${IUSE_VIDEO_CARDS}"
 
 RDEPEND=">=media-libs/freetype-2.0
@@ -34,6 +34,7 @@ RDEPEND=">=media-libs/freetype-2.0
 				x11-apps/xset )
 	directv? ( virtual/perl-Time-HiRes )
 	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
+	dvd? ( media-libs/libdvdcss )
 	fftw? ( sci-libs/fftw:3.0 )
 	ieee1394? (	>=sys-libs/libraw1394-1.2.0
 			>=sys-libs/libavc1394-0.5.3
diff --git a/media-tv/mythtv/mythtv-0.22_alpha17449.ebuild b/media-tv/mythtv/mythtv-0.22_alpha17449.ebuild
index 1e014e9dd809..c0748cf480c7 100644
--- a/media-tv/mythtv/mythtv-0.22_alpha17449.ebuild
+++ b/media-tv/mythtv/mythtv-0.22_alpha17449.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.22_alpha17449.ebuild,v 1.2 2008/06/26 21:40:21 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.22_alpha17449.ebuild,v 1.3 2008/07/07 17:31:34 cardoe Exp $
 
 EAPI=1
 inherit flag-o-matic multilib eutils qt4 mythtv toolchain-funcs python
@@ -10,7 +10,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE_VIDEO_CARDS="video_cards_nvidia"
-IUSE="alsa altivec autostart debug directv dvb \
+IUSE="alsa altivec autostart debug directv dvb dvd \
 fftw ieee1394 jack lcd lirc mmx opengl perl python \
 x264 xvid xvmc ${IUSE_VIDEO_CARDS}"
 
@@ -33,6 +33,7 @@ RDEPEND=">=media-libs/freetype-2.0
 				x11-apps/xset )
 	directv? ( virtual/perl-Time-HiRes )
 	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
+	dvd? ( media-libs/libdvdcss )
 	fftw? ( sci-libs/fftw:3.0 )
 	ieee1394? (	>=sys-libs/libraw1394-1.2.0
 			>=sys-libs/libavc1394-0.5.3
diff --git a/media-tv/mythtv/mythtv-0.22_alpha17132.ebuild b/media-tv/mythtv/mythtv-0.22_alpha17733.ebuild
index fea4285519b8..b8df3327b94d 100644
--- a/media-tv/mythtv/mythtv-0.22_alpha17132.ebuild
+++ b/media-tv/mythtv/mythtv-0.22_alpha17733.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.22_alpha17132.ebuild,v 1.3 2008/06/26 21:40:21 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.22_alpha17733.ebuild,v 1.1 2008/07/07 17:31:34 cardoe Exp $
 
 EAPI=1
 inherit flag-o-matic multilib eutils qt4 mythtv toolchain-funcs python
@@ -9,10 +9,10 @@ DESCRIPTION="Homebrew PVR project"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_via"
-IUSE="alsa altivec autostart debug directv dvb \
-ieee1394 jack lcd lirc mmx opengl opengl-video \
-opengl-xvmc perl python xvmc ${IUSE_VIDEO_CARDS}"
+IUSE_VIDEO_CARDS="video_cards_nvidia"
+IUSE="alsa altivec autostart debug directv dvb dvd \
+fftw ieee1394 jack lcd lirc mmx opengl perl python \
+x264 xvid xvmc ${IUSE_VIDEO_CARDS}"
 
 RDEPEND=">=media-libs/freetype-2.0
 	>=media-sound/lame-3.93.1
@@ -33,6 +33,8 @@ RDEPEND=">=media-libs/freetype-2.0
 				x11-apps/xset )
 	directv? ( virtual/perl-Time-HiRes )
 	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
+	dvd? ( media-libs/libdvdcss )
+	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 )
@@ -41,7 +43,8 @@ RDEPEND=">=media-libs/freetype-2.0
 	lirc? ( app-misc/lirc )
 	perl? ( dev-perl/DBD-mysql )
 	python? ( dev-python/mysql-python )
-	opengl-xvmc? ( >=x11-drivers/nvidia-drivers-100 )
+	x264? ( media-libs/x264 )
+	xvid? ( media-libs/xvid )
 	xvmc? ( x11-libs/libXvMC
 		app-admin/eselect-xvmc )"
 
@@ -50,46 +53,25 @@ DEPEND="${RDEPEND}
 	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-4* gif jpeg mysql opengl png tiff; then
-		echo
-		eerror "MythTV requires Qt to be built with gif, jpeg, mysql, opengl,"
-		eerror "png, and tiff use flags enabled."
-		eerror "Please re-emerge =x11-libs/qt-4*, after having the use flags set."
-		echo
-		die "Please fix the above issues, before continuing."
-	fi
+	confutils_require_built_with_all =x11-libs/qt-4* gif jpeg mysql opengl \
+		png tiff
 
-	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
+	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 & & series cards."
 	fi
 
-	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS} || die "Problem adding mythtv user"
+	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS} \
+		|| die "Problem adding mythtv user"
 	usermod -a -G ${MYTHTV_GROUPS} mythtv
 }
 
@@ -113,14 +95,17 @@ src_compile() {
 		--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 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"
-	# nvidia-drivers-71 don't support GLX 1.4
-	use video_cards_nvidia && has_version =x11-drivers/nvidia-drivers-71* \
-		&& myconf="${myconf} --enable-glx-procaddrarb"
+	use x264 && myconf="${myconf} --enable-libx264"
+	use xvid && myconf="${myconf} --enable-libxvid"
+
+	#from bug #220857
+	use xvmc && myconf="${myconf} --enable-xvmc --enable-xvmcw \
+		--disable-xvmc-vld"
+
+	# according to the Ubuntu guys, this works better being always on
+	myconf="${myconf} --enable-glx-procaddrarb"
 
 	myconf="${myconf}
 		$(use_enable dvb)
@@ -132,8 +117,7 @@ src_compile() {
 		--enable-opengl-vsync
 		--enable-xrandr
 		--enable-xv
-		--enable-x11
-		--enable-gpl"
+		--enable-x11"
 
 	if use mmx || use amd64; then
 		myconf="${myconf} --enable-mmx"
@@ -275,25 +259,27 @@ pkg_postinst() {
 	python_version
 	python_mod_optimize /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
 	elog "To always have MythBackend running and available run the following:"
 	elog "rc-update add mythbackend default"
-	echo
+	elog
 	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"
+	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
 
 	if use autostart; then
-		echo
+		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"