handle MythFlix/MythNews file collision for bug #239341. p19046 also includes minor fixes for Closed Caption display with DVDs in some situations, fixes for DVB-S which break DiSEqC unless its set for tone switch, and filesystem detection fuzzing with Storage Groups

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27-gentoo-r2 x86_64

9 files changed, 45 insertions, 1246 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 8753854b0f3c..1fd75eda58d7 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,20 @@
 # 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.260 2008/10/22 15:41:35 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.261 2008/11/11 15:46:22 cardoe Exp $
+
+*mythtv-0.21_p19046 (11 Nov 2008)
+*mythtv-0.21_p18314-r1 (11 Nov 2008)
+
+  11 Nov 2008; Doug Goldstein <cardoe@gentoo.org>
+  +files/mythtv-0.21-mythflix-naming-collision.patch,
+  -mythtv-0.21_p17637.ebuild, -mythtv-0.21_p17722.ebuild,
+  -mythtv-0.21_p18116.ebuild, -mythtv-0.21_p18314.ebuild,
+  +mythtv-0.21_p18314-r1.ebuild, -mythtv-0.21_p18501.ebuild,
+  -mythtv-0.21_p18812.ebuild, +mythtv-0.21_p19046.ebuild:
+  handle MythFlix/MythNews file collision for bug #239341. p19046 also
+  includes minor fixes for Closed Caption display with DVDs in some
+  situations, fixes for DVB-S which break DiSEqC unless its set for tone
+  switch, and filesystem detection fuzzing with Storage Groups
 
   22 Oct 2008; Rémi Cardona <remi@gentoo.org> mythtv-0.20.2_p15634.ebuild:
   pkgmove from xf86-video-i810 to xf86-video-intel
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index de2ee7aef41d..7f8edb8879ea 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,20 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bash_profile 63 RMD160 71ed6a00c824f8d2704b65371e54adb85ca6d861 SHA1 cd4bc03298d30fadb759d1a2463e930441c5a5e7 SHA256 9a753f699d07b5f481374d13ea3f2b2439a22f3a9a49b6280cc8d9eebf0b2ca9
 AUX mythbackend-0.18.2.conf 1430 RMD160 f966c40618592cae62a2e4345bb4cd5847ec0de6 SHA1 2a3cb59593c4fd1ba431b4ebe70b91782a418a02 SHA256 0b6d0514d410bdcbeaebded48488926fc2941edaeee518794d9884693a4eb9db
 AUX mythbackend-0.18.2.rc 1128 RMD160 0297452b3d9fe09479c737d136a73171a35eb643 SHA1 df4fe1ca7750c3ed27c9f5bbeb28dcebb36f9b1d SHA256 be994a8b6690e830820e82316f4ccce5b7f84ce68213de75e3740818227f6f3c
 AUX mythfilldatabase.cron 73 RMD160 ce57516fe3ac3f339ebaad6b88c85366d4dbbc5b SHA1 7ae24184f931336f317eaefaa7c27a8e4531e0ee SHA256 fc5a3b094fd403e9076fbb1903e826ddc97bd579cb0ba7ef6fc11940099fca3d
 AUX mythtv-0.20-as-needed.patch 4260 RMD160 a81bbadba9a09647ee10a6ba994db855ab72ba09 SHA1 a54c4b405616581b34aa899902619159cb38362f SHA256 cdf55c4847f2f27699947dd863568e638218cfe170bab47647b68997bcf9cfc2
 AUX mythtv-0.21-bttv.patch 612 RMD160 b1dd14a0c81102224c71674d14254c0e86c50c0f SHA1 aee6a8c51ab3ac90752822d0d1731761d627d643 SHA256 eace83d201375f0a1d102212196984c6aa0b76f1591007aa780eb9d34e87c301
+AUX mythtv-0.21-mythflix-naming-collision.patch 468 RMD160 1029a1cd2c3bb6cbe76cee0fddfdd47260e8824b SHA1 8e6a00045a6eabcd8c5fa9b424aafe7b6691a84a SHA256 ef6a1c9dfe624453536bb19538a714e989cff28497e910d129c914ffe9159633
 AUX mythtv.logrotate.d 434 RMD160 c76842df30c1e9cc772f57dd3a3532c017d4176d SHA1 f5e772659b2616a55ca7326f65d8917352029b51 SHA256 a9032f190b28c3778340799be668779638ee09cf85e8febc669443f3aaf3578c
 AUX runmythfe 186 RMD160 e4b5bfeaecbf541e6cc45b6a9c0e5c048e3fccd0 SHA1 f5ec9dfd4781b28c0af8745c282ce242141590d8 SHA256 bebc665f37b21193be2f259cb8daf6863dfd4336e4e1424a7a989d6b679964fe
 AUX xinitrc 240 RMD160 9c0c1030aa65c8fd3f20501f45757515a9208a61 SHA1 11795aa8be5bd668d91acdd61aa80d5cc8af5cac SHA256 770990183ce8df60bf3bcbc3a334558155aedd0a80357556261fb938b4254e94
 EBUILD mythtv-0.20.2_p15634.ebuild 10031 RMD160 0f7bd8bd16463a44141c8e83ae2af1961ec82e4f SHA1 57e1dec480bac218d6e29a5a6a4806194e5ccf7a SHA256 76720f53d9272e1ee25eab66717566f75d71e22f4160b116ae87d493b3d640bd
-EBUILD mythtv-0.21_p17637.ebuild 9045 RMD160 fcef9fa69739b168faafbb183027f8e046aca4d9 SHA1 8101dcab72c32fdfa54c46c52e39268f64475bad SHA256 dbf42d82ec384fcc39e85848ad3335ceaecaf7c3481ee7592f47a970d00ed78c
-EBUILD mythtv-0.21_p17722.ebuild 9045 RMD160 a59d1c3765cc615b6c2d64d483af2332901c0317 SHA1 e47de9030a809649494653437d35aca46ec39e65 SHA256 b7b103c92e2b1307edc90a3e63b87f1f6efb48ddf4f1758e2c7ee81788bad35b
-EBUILD mythtv-0.21_p18116.ebuild 9045 RMD160 7059f5c2d43c98e2c6cbe73b429cf5d474570590 SHA1 65d25bc8058936cc8dcb5b2012f018bd7dd5cf09 SHA256 d7d57ac6ba82ee574bf30262c64e295fc65e1a8ee47c951d324cef34c777eabe
-EBUILD mythtv-0.21_p18314.ebuild 9067 RMD160 4bbed063b06415645ed460aaef230ff4ad2923d9 SHA1 d3aca72ce6523388272fb519d3c4baaec66a9345 SHA256 e9e832b8a8e600bd6f3b4a2315235387ffb2a2b381e823c2454d115ee04f2cfb
-EBUILD mythtv-0.21_p18501.ebuild 9170 RMD160 5c3322b7182b47312050d9ebc80f92397c3a6d92 SHA1 a8e7ad3647b24865f002f0a58486666cdb089ce3 SHA256 a141873473d317de91a60b06596af7fd3fe4fa78945584a5b7f9efde323efcee
-EBUILD mythtv-0.21_p18812.ebuild 9170 RMD160 5463e40d1ec896b0b1d753f20524e688ce749c24 SHA1 3dbd018c72f3d983aaa40e1fffb02f84874f6886 SHA256 b95741b20d8e5398b17c1e349b948d14f4287ef89ec6c7f3f066546d72dd3fe1
+EBUILD mythtv-0.21_p18314-r1.ebuild 9170 RMD160 80f58592c860cfb5cbc1c1697ba327ccb5ad65f7 SHA1 54361f9ff086008e5583572ba4ff62d2b69d2c7a SHA256 b5611930c9a5b5eb514683a4d6c5b4d2d01632dcabc4ae43946e9cd4f404553a
+EBUILD mythtv-0.21_p19046.ebuild 9013 RMD160 a029487a4a08e012300de55e7358395d3d248c03 SHA1 fe788e2b391bea6fc542de4de193b857beaf0696 SHA256 684d3bafa3b98e6014d1a74f1066593b9cf2902e3cfd93485f4efa4dbcfc4ff4
 EBUILD mythtv-0.22_alpha17733.ebuild 8674 RMD160 69c0bc2d584665da8571bc9e7ed3a21b1ab3893c SHA1 6113be14a275ce8a0cbd7e1389c9e2e3e5b34124 SHA256 3fb1829fce1d49a0fa074fb611731d659ffe177838f52ee312d92a9795888fc7
 EBUILD mythtv-0.22_alpha18535.ebuild 8561 RMD160 5ce80403e7d06ee5ca2d570d2c10a6b6d6155d8f SHA1 c7a2ae0a0ed86570a3af15f6cdc3dbb473a6583a SHA256 82791aea02d10f56b47e624d9d374919dd89330554c74d71732478aafe74aa33
-MISC ChangeLog 51623 RMD160 34b7ea68fcc91862841f636f9e4c612fbacb9c66 SHA1 0f626b965db1fd7e8de7e59eb444445a141201f9 SHA256 4ed85bc2bcb57b3854cb688f93a124114c8e6b78d4e94bad3a3af02081822b0c
+MISC ChangeLog 52312 RMD160 b6429c321b7bd0ab25dd87a099e6062d27aba46e SHA1 a649a9b45fac1e71214ee79b86e319b34f34df77 SHA256 47433a8e1317e10efffad2d79fd66766c48a7eb3105239e7ef35e7d21206e877
 MISC metadata.xml 4844 RMD160 0b620c4698e23467c7811be942b0bd9d24ee2208 SHA1 684ac9148eee29189fbb9a94f81802ad2cbd22dc SHA256 89dd2fa121bab4de5c58b62103fcbafc2468539f29c27fa93f81e2f411f96fa3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkZqXsACgkQoeSe8B0zEfw89QCfVEBmYGzBujEXa5Bfr/hlwGYx
+x6kAmwfTllWaNYSjA6iS5yZ43JtXNGGk
+=8jyq
+-----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/files/mythtv-0.21-mythflix-naming-collision.patch b/media-tv/mythtv/files/mythtv-0.21-mythflix-naming-collision.patch
new file mode 100644
index 000000000000..49fa98fae5bc
--- /dev/null
+++ b/media-tv/mythtv/files/mythtv-0.21-mythflix-naming-collision.patch
@@ -0,0 +1,11 @@
+Index: themes/default-wide/netflix-ui.xml

+===================================================================

+--- themes/default-wide/netflix-ui.xml (revision 14295)

++++ themes/default-wide/netflix-ui.xml (revision 19046)

+@@ -267,5 +267,5 @@

+ 

+       <image name="background" draworder="0" fleximage="no">

+-        <filename>news-info-bg.png</filename>

++        <filename>mythflix_background.png</filename>

+         <position>0,0</position>

+       </image>

diff --git a/media-tv/mythtv/mythtv-0.21_p17637.ebuild b/media-tv/mythtv/mythtv-0.21_p17637.ebuild
deleted file mode 100644
index d7dc213d93bb..000000000000
--- a/media-tv/mythtv/mythtv-0.21_p17637.ebuild
+++ /dev/null
@@ -1,308 +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_p17637.ebuild,v 1.4 2008/10/03 14:46:01 cardoe Exp $
-
-EAPI=1
-inherit flag-o-matic multilib eutils qt3 mythtv toolchain-funcs python confutils
-
-DESCRIPTION="Homebrew PVR project"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE_VIDEO_CARDS="video_cards_nvidia"
-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
-	>=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/faac
-			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/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 )
-	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 )
-	x264? ( media-libs/x264 )
-	xvid? ( media-libs/xvid )
-	xvmc? ( x11-libs/libXvMC )"
-
-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() {
-
-	confutils_require_built_with_all =x11-libs/qt-3* mysql opengl
-
-	elog "This ebuild now uses a heavily stripped down version of your CFLAGS"
-
-	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 & 7 series cards."
-	fi
-
-	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
-	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 --enable-libfaac"
-	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 x264 && myconf="${myconf} --enable-libx264"
-	use xvid && myconf="${myconf} --enable-libxvid"
-	# let's give this a whirl from bug #220857
-	use xvmc && myconf="${myconf} --enable-xvmc --enable-xvmcw \
-		--disable-xvmc-vld"
-	#use xvmc && ! use video_cards_via && \
-	#	myconf="${myconf} --enable-xvmc"
-	#use xvmc && use video_cards_via && myconf="${myconf} --enable-xvmc \
-	#	--enable-xvmc-pro --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"
-	# according to the Ubuntu guys, this works better always on
-	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-libmp3lame
-		--enable-xrandr
-		--enable-xv
-		--enable-x11"
-
-	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"
-
-	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"
-
-	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
-		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_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_p17722.ebuild b/media-tv/mythtv/mythtv-0.21_p17722.ebuild
deleted file mode 100644
index d0c3c501966c..000000000000
--- a/media-tv/mythtv/mythtv-0.21_p17722.ebuild
+++ /dev/null
@@ -1,308 +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_p17722.ebuild,v 1.3 2008/10/03 14:46:01 cardoe Exp $
-
-EAPI=1
-inherit flag-o-matic multilib eutils qt3 mythtv toolchain-funcs python confutils
-
-DESCRIPTION="Homebrew PVR project"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE_VIDEO_CARDS="video_cards_nvidia"
-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
-	>=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/faac
-			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/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 )
-	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 )
-	x264? ( media-libs/x264 )
-	xvid? ( media-libs/xvid )
-	xvmc? ( x11-libs/libXvMC )"
-
-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() {
-
-	confutils_require_built_with_all =x11-libs/qt-3* mysql opengl
-
-	elog "This ebuild now uses a heavily stripped down version of your CFLAGS"
-
-	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 & 7 series cards."
-	fi
-
-	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
-	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 --enable-libfaac"
-	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 x264 && myconf="${myconf} --enable-libx264"
-	use xvid && myconf="${myconf} --enable-libxvid"
-	# let's give this a whirl from bug #220857
-	use xvmc && myconf="${myconf} --enable-xvmc --enable-xvmcw \
-		--disable-xvmc-vld"
-	#use xvmc && ! use video_cards_via && \
-	#	myconf="${myconf} --enable-xvmc"
-	#use xvmc && use video_cards_via && myconf="${myconf} --enable-xvmc \
-	#	--enable-xvmc-pro --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"
-	# according to the Ubuntu guys, this works better always on
-	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-libmp3lame
-		--enable-xrandr
-		--enable-xv
-		--enable-x11"
-
-	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"
-
-	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"
-
-	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
-		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_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_p18116.ebuild b/media-tv/mythtv/mythtv-0.21_p18116.ebuild
deleted file mode 100644
index 3b34937aaea8..000000000000
--- a/media-tv/mythtv/mythtv-0.21_p18116.ebuild
+++ /dev/null
@@ -1,308 +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_p18116.ebuild,v 1.3 2008/10/03 14:46:01 cardoe Exp $
-
-EAPI=1
-inherit flag-o-matic multilib eutils qt3 mythtv toolchain-funcs python confutils
-
-DESCRIPTION="Homebrew PVR project"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE_VIDEO_CARDS="video_cards_nvidia"
-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
-	>=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/faac
-			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/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 )
-	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 )
-	x264? ( media-libs/x264 )
-	xvid? ( media-libs/xvid )
-	xvmc? ( x11-libs/libXvMC )"
-
-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() {
-
-	confutils_require_built_with_all =x11-libs/qt-3* mysql opengl
-
-	elog "This ebuild now uses a heavily stripped down version of your CFLAGS"
-
-	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 & 7 series cards."
-	fi
-
-	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
-	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 --enable-libfaac"
-	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 x264 && myconf="${myconf} --enable-libx264"
-	use xvid && myconf="${myconf} --enable-libxvid"
-	# let's give this a whirl from bug #220857
-	use xvmc && myconf="${myconf} --enable-xvmc --enable-xvmcw \
-		--disable-xvmc-vld"
-	#use xvmc && ! use video_cards_via && \
-	#	myconf="${myconf} --enable-xvmc"
-	#use xvmc && use video_cards_via && myconf="${myconf} --enable-xvmc \
-	#	--enable-xvmc-pro --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"
-	# according to the Ubuntu guys, this works better always on
-	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-libmp3lame
-		--enable-xrandr
-		--enable-xv
-		--enable-x11"
-
-	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"
-
-	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"
-
-	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
-		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_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_p18314.ebuild b/media-tv/mythtv/mythtv-0.21_p18314-r1.ebuild
index 87d46596006a..874d67bcbb3a 100644
--- a/media-tv/mythtv/mythtv-0.21_p18314.ebuild
+++ b/media-tv/mythtv/mythtv-0.21_p18314-r1.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_p18314.ebuild,v 1.4 2008/10/03 14:46:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_p18314-r1.ebuild,v 1.1 2008/11/11 15:46:22 cardoe Exp $
 
 EAPI=1
 inherit flag-o-matic multilib eutils qt3 mythtv toolchain-funcs python confutils
@@ -84,6 +84,9 @@ src_unpack() {
 	# 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
+	
+	# fix mythflix naming collision
+	epatch "${FILESDIR}"/${PN}-0.21-mythflix-naming-collision.patch
 }
 
 src_compile() {
diff --git a/media-tv/mythtv/mythtv-0.21_p18812.ebuild b/media-tv/mythtv/mythtv-0.21_p18812.ebuild
deleted file mode 100644
index 93fa58754f7b..000000000000
--- a/media-tv/mythtv/mythtv-0.21_p18812.ebuild
+++ /dev/null
@@ -1,308 +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_p18812.ebuild,v 1.1 2008/10/21 17:43:01 cardoe Exp $
-
-EAPI=2
-inherit flag-o-matic multilib eutils qt3 mythtv toolchain-funcs python confutils
-
-DESCRIPTION="Homebrew PVR project"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE_VIDEO_CARDS="video_cards_nvidia"
-IUSE="aac alsa altivec autostart debug directv dvb dvd fftw ieee1394 jack lcd \
-lirc mmx opengl 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[mysql,opengl]
-	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/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 )
-	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 )
-	xvmc? ( x11-libs/libXvMC )"
-
-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() {
-	elog "This ebuild now uses a heavily stripped down version of your CFLAGS"
-
-	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 & 7 series cards."
-	fi
-
-	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
-	usermod -a -G ${MYTHTV_GROUPS} mythtv
-}
-
-src_prepare() {
-	# 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
-
-	# fix issue with bttv support being over v4l1, which no longer works
-	# properly with kernel 2.6.25 and higher
-	epatch "${FILESDIR}"/${PN}-0.21-bttv.patch
-}
-
-src_configure() {
-	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 fftw && myconf="${myconf} --enable-libfftw3"
-	use jack || myconf="${myconf} --disable-audio-jack"
-	# let's give this a whirl from bug #220857
-	use xvmc && myconf="${myconf} --enable-xvmc --enable-xvmcw \
-		--disable-xvmc-vld"
-	#use xvmc && ! use video_cards_via && \
-	#	myconf="${myconf} --enable-xvmc"
-	#use xvmc && use video_cards_via && myconf="${myconf} --enable-xvmc \
-	#	--enable-xvmc-pro --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"
-	# according to the Ubuntu guys, this works better always on
-	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"
-# per discussions with j-rod and janng in #mythtv, these are disabled
-#		--enable-libmp3lame
-#	use x264 && myconf="${myconf} --enable-libx264"
-#	use xvid && myconf="${myconf} --enable-libxvid"
-#	use aac && myconf="${myconf} --enable-libfaac"
-
-	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"
-}
-
-src_compile() {
-	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"
-
-	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"
-
-	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
-		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_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_p18501.ebuild b/media-tv/mythtv/mythtv-0.21_p19046.ebuild
index 427cc5efe387..48144fff9529 100644
--- a/media-tv/mythtv/mythtv-0.21_p18501.ebuild
+++ b/media-tv/mythtv/mythtv-0.21_p19046.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_p18501.ebuild,v 1.4 2008/10/21 17:43:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_p19046.ebuild,v 1.1 2008/11/11 15:46:22 cardoe Exp $
 
 EAPI=2
 inherit flag-o-matic multilib eutils qt3 mythtv toolchain-funcs python confutils
@@ -79,10 +79,6 @@ src_prepare() {
 	# 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
-
-	# fix issue with bttv support being over v4l1, which no longer works
-	# properly with kernel 2.6.25 and higher
-	epatch "${FILESDIR}"/${PN}-0.21-bttv.patch
 }
 
 src_configure() {