0.20.x and 0.21 bump. Fixes race condition on SMP machines. Cleans up themes. Fixes quotes in Schedules Direct usernames, changes username length.

Package-Manager: portage-2.1.3.7

10 files changed, 35 insertions, 681 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 8fe1816ec432..32eebd30e683 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.178 2007/08/27 16:01:00 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.179 2007/08/28 20:37:18 cardoe Exp $
+
+*mythtv-0.21_pre14346 (28 Aug 2007)
+*mythtv-0.20.2_p14348 (28 Aug 2007)
+
+  28 Aug 2007; Doug Goldstein <cardoe@gentoo.org>
+  -mythtv-0.20.1_p13783.ebuild, -mythtv-0.20.2_p14282.ebuild,
+  -mythtv-0.20.2_p14307.ebuild, +mythtv-0.20.2_p14348.ebuild,
+  -mythtv-0.21_pre14278.ebuild, +mythtv-0.21_pre14346.ebuild:
+  0.20.x and 0.21 bump. Fixes race condition on SMP machines. Cleans up
+  themes. Fixes quotes in Schedules Direct usernames, changes username length.
 
 *mythtv-0.20.2_p14324 (27 Aug 2007)
 
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 8491997bcb04..20775efd3c3b 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -43,43 +43,34 @@ RMD160 9c0c1030aa65c8fd3f20501f45757515a9208a61 files/xinitrc 240
 SHA256 770990183ce8df60bf3bcbc3a334558155aedd0a80357556261fb938b4254e94 files/xinitrc 240
 DIST mythtv-0.20.1.tar.bz2 12429721 RMD160 7aecb245cbd94796ce311543d744042ceacd8e13 SHA1 48848bce345aa2e40d99506d6e98f256d380dd8a SHA256 6990d86ce17c93ff39d24ba27094c09e2a2ec78d044e57b7406216b51145237c
 DIST mythtv-0.20.1_svn13344.patch.bz2 967 RMD160 885bde4753d66202c4bc64777be032939db714ef SHA1 230da6ae663302b225e234b86ff4b6a1f5d68f10 SHA256 af1f5183adcf0354f9bb4412e93abd99cc7ae4e95af2c555c0e066efef993af2
-DIST mythtv-0.20.1_svn13783.patch.bz2 4286 RMD160 21cfef35f92064cf111f84ca13d64642dc6739b7 SHA1 31bfd77d2747c02f56dcdfaf7d64ccdf8441e4b2 SHA256 ff6acd80b23b36cf2c97cf587c05fe90972ee8005f775768479d4d9919e5e225
 EBUILD mythtv-0.20.1_p13344.ebuild 8180 RMD160 ae6d215795afcba8c7e3fa53d4d60a1407af988e SHA1 f944a9a26f434ec384d2e9ab0d6a91fc68f7fd73 SHA256 01813c4c11936290c7fb27ac817cdbd073effaa8ad060bdf2a9ea2f1c4098a5d
 MD5 8aff87fd93c9727455d99ad2472b6ee8 mythtv-0.20.1_p13344.ebuild 8180
 RMD160 ae6d215795afcba8c7e3fa53d4d60a1407af988e mythtv-0.20.1_p13344.ebuild 8180
 SHA256 01813c4c11936290c7fb27ac817cdbd073effaa8ad060bdf2a9ea2f1c4098a5d mythtv-0.20.1_p13344.ebuild 8180
-EBUILD mythtv-0.20.1_p13783.ebuild 8183 RMD160 5c740088aa35743968a132727c8be13b13094d16 SHA1 997d02fcf4c1fa6fe57b1cd2a0db8d52c365c2dd SHA256 f7a0888137db3463d9025081e7913565686f5b968f9d45618ee5e16bf0b63d3d
-MD5 dbbc6b6b827f5a457e55ccca391bc2f9 mythtv-0.20.1_p13783.ebuild 8183
-RMD160 5c740088aa35743968a132727c8be13b13094d16 mythtv-0.20.1_p13783.ebuild 8183
-SHA256 f7a0888137db3463d9025081e7913565686f5b968f9d45618ee5e16bf0b63d3d mythtv-0.20.1_p13783.ebuild 8183
 EBUILD mythtv-0.20.1_p14146.ebuild 9690 RMD160 d41581b03be8587b487e429a4933cc7ce41ca714 SHA1 b67521c9da0110fa390b648c568e82865ab3289a SHA256 b1b010446fa8e0c723953cf435bf842cacbb1b120ac777e5d9c092e0e48ac129
 MD5 d9d03c99a666767d98006be81d60c141 mythtv-0.20.1_p14146.ebuild 9690
 RMD160 d41581b03be8587b487e429a4933cc7ce41ca714 mythtv-0.20.1_p14146.ebuild 9690
 SHA256 b1b010446fa8e0c723953cf435bf842cacbb1b120ac777e5d9c092e0e48ac129 mythtv-0.20.1_p14146.ebuild 9690
-EBUILD mythtv-0.20.2_p14282.ebuild 10237 RMD160 fbdd8d494d9452195fdef18ea699719295d418fe SHA1 e429082070ebe06cb0faa384ef770798b381b28a SHA256 eff5f8800e40f2fc03263013471a153b66f66a169a463cf4dc5bb36b9de1e12c
-MD5 b652f601343bb41f1bc83316df23c408 mythtv-0.20.2_p14282.ebuild 10237
-RMD160 fbdd8d494d9452195fdef18ea699719295d418fe mythtv-0.20.2_p14282.ebuild 10237
-SHA256 eff5f8800e40f2fc03263013471a153b66f66a169a463cf4dc5bb36b9de1e12c mythtv-0.20.2_p14282.ebuild 10237
-EBUILD mythtv-0.20.2_p14307.ebuild 10248 RMD160 8e4222be109e7f786bc7047e6299e9ebfb4d4349 SHA1 3b183332c29d1a1c50e1456522c62fc0bdbf446c SHA256 5b048a1f2119ecec6ce23158d3e79f44a09a669cfb74c9251f021962e02cd158
-MD5 a144ee12f0b4fa3f794a7d819017197e mythtv-0.20.2_p14307.ebuild 10248
-RMD160 8e4222be109e7f786bc7047e6299e9ebfb4d4349 mythtv-0.20.2_p14307.ebuild 10248
-SHA256 5b048a1f2119ecec6ce23158d3e79f44a09a669cfb74c9251f021962e02cd158 mythtv-0.20.2_p14307.ebuild 10248
 EBUILD mythtv-0.20.2_p14324.ebuild 10248 RMD160 c2da93f08976017441bbbf3f34b81fb76b917d19 SHA1 699dfdde814c3c1be4ec1d515cc527a280c0d0f3 SHA256 580a8acec775c3bd36030477bca94c9a37cad497be78a348142dea8c7dd0b9ba
 MD5 8c5ca085a8ce61a88c0f5f95b6250df2 mythtv-0.20.2_p14324.ebuild 10248
 RMD160 c2da93f08976017441bbbf3f34b81fb76b917d19 mythtv-0.20.2_p14324.ebuild 10248
 SHA256 580a8acec775c3bd36030477bca94c9a37cad497be78a348142dea8c7dd0b9ba mythtv-0.20.2_p14324.ebuild 10248
-EBUILD mythtv-0.21_pre14278.ebuild 9257 RMD160 78721711c1d93878d82801fecdfd4f568cc93ee7 SHA1 c9e5cf6c23fee477133953a2d1ff15f5486f9aad SHA256 9fc2829433a6670efc20108a883193c699bf0f420f4b9c5a124f7489da46a18a
-MD5 cc3ef8cbbbd6aa887aef8a978f8df647 mythtv-0.21_pre14278.ebuild 9257
-RMD160 78721711c1d93878d82801fecdfd4f568cc93ee7 mythtv-0.21_pre14278.ebuild 9257
-SHA256 9fc2829433a6670efc20108a883193c699bf0f420f4b9c5a124f7489da46a18a mythtv-0.21_pre14278.ebuild 9257
+EBUILD mythtv-0.20.2_p14348.ebuild 10248 RMD160 7d6e4e37b613d29e347813a7886170bb1df47d5e SHA1 9cb1f137b7734f129bf651a441cd2b6b5d7f895c SHA256 393f242625678c77c15372b50e75d5d0c5a5069d8e68b6bb90638769bca80b61
+MD5 1ea5fb85627e52c588e2d428f2e6be57 mythtv-0.20.2_p14348.ebuild 10248
+RMD160 7d6e4e37b613d29e347813a7886170bb1df47d5e mythtv-0.20.2_p14348.ebuild 10248
+SHA256 393f242625678c77c15372b50e75d5d0c5a5069d8e68b6bb90638769bca80b61 mythtv-0.20.2_p14348.ebuild 10248
 EBUILD mythtv-0.21_pre14327.ebuild 9268 RMD160 9eac5f882dd58ec2378424923f2bf3f8240ed657 SHA1 cda27e2a7496dcaea89145e74773468972dd3906 SHA256 f450620c9fc0a0d90a84dcd56bcfa2c2d4a0c8b0f73c71d0f6fc94db59a78bd2
 MD5 07b5b24cd53459aecb847d4c8c29a6b5 mythtv-0.21_pre14327.ebuild 9268
 RMD160 9eac5f882dd58ec2378424923f2bf3f8240ed657 mythtv-0.21_pre14327.ebuild 9268
 SHA256 f450620c9fc0a0d90a84dcd56bcfa2c2d4a0c8b0f73c71d0f6fc94db59a78bd2 mythtv-0.21_pre14327.ebuild 9268
-MISC ChangeLog 33118 RMD160 900106284dc0152bcbedaa649062ae8dc34d7382 SHA1 3f2f93e69fd7eec6f20bf037a493244feac45460 SHA256 f8c3bcad5f922f12e3bcb7402152bdbbf261bc3b5228722433dfda97f5fb0d15
-MD5 14242498dac5b0e9ec22ffa440b9d88b ChangeLog 33118
-RMD160 900106284dc0152bcbedaa649062ae8dc34d7382 ChangeLog 33118
-SHA256 f8c3bcad5f922f12e3bcb7402152bdbbf261bc3b5228722433dfda97f5fb0d15 ChangeLog 33118
+EBUILD mythtv-0.21_pre14346.ebuild 9268 RMD160 c8bd3b7ac163dcca45ad0358829467b92ac2735c SHA1 49337eec56ce41995421a769306e4ca9f3f23628 SHA256 1dda9298aca6c3d9878708e9ded9a2b9de0521ab31f8efc10168783af82c18c7
+MD5 ab4a73a5eb59fee7ce659a856bbd92f6 mythtv-0.21_pre14346.ebuild 9268
+RMD160 c8bd3b7ac163dcca45ad0358829467b92ac2735c mythtv-0.21_pre14346.ebuild 9268
+SHA256 1dda9298aca6c3d9878708e9ded9a2b9de0521ab31f8efc10168783af82c18c7 mythtv-0.21_pre14346.ebuild 9268
+MISC ChangeLog 33579 RMD160 bbee5d1dfd793f3e05ff13ec1b6640c45f6aa07f SHA1 6ccf9bc94d01ff9487e80cf0e248f4c52569d472 SHA256 ceb8dd43686a40f7519d701e791e1985c56fe719577872f828057779f39ad12d
+MD5 5806b24765dffd1d79f7ba4cb2863925 ChangeLog 33579
+RMD160 bbee5d1dfd793f3e05ff13ec1b6640c45f6aa07f ChangeLog 33579
+SHA256 ceb8dd43686a40f7519d701e791e1985c56fe719577872f828057779f39ad12d ChangeLog 33579
 MISC metadata.xml 222 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e SHA1 c6bd979f236f5e6fe9332eb6568bee402efc793f SHA256 8b2065fecfbbdd0caa3c5eb86b98c22766db07f555edbf3127e9454b468ecff6
 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e metadata.xml 222
@@ -87,31 +78,25 @@ SHA256 8b2065fecfbbdd0caa3c5eb86b98c22766db07f555edbf3127e9454b468ecff6 metadata
 MD5 f07477eafcd63be782b14aea85c92049 files/digest-mythtv-0.20.1_p13344 518
 RMD160 79443a93c92f493d09027828311637a6b93809dd files/digest-mythtv-0.20.1_p13344 518
 SHA256 2ede071c1c437e40263f366033d6ffe71696a356d9febfd246091bcfd3248772 files/digest-mythtv-0.20.1_p13344 518
-MD5 23c37100cf978399032025bd8bd27eaa files/digest-mythtv-0.20.1_p13783 521
-RMD160 8f7a71fe8205491e11283d07f2df27396b3cf65b files/digest-mythtv-0.20.1_p13783 521
-SHA256 a52984bdbd8d569ac2ed3dd558c9e1db01c45762d7ebe682d29c307bca37bb5c files/digest-mythtv-0.20.1_p13783 521
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.20.1_p14146 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.20.1_p14146 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.20.1_p14146 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.20.2_p14282 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.20.2_p14282 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.20.2_p14282 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.20.2_p14307 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.20.2_p14307 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.20.2_p14307 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.20.2_p14324 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.20.2_p14324 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.20.2_p14324 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.21_pre14278 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.21_pre14278 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.21_pre14278 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.20.2_p14348 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.20.2_p14348 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.20.2_p14348 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.21_pre14327 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.21_pre14327 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.21_pre14327 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.21_pre14346 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.21_pre14346 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.21_pre14346 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG0vVDoeSe8B0zEfwRAq/MAJ9rzNFnVpQII/weqss7R4Ul5otDlwCdEkQM
-G7t25zTtDBkgULJOaVeEsCQ=
-=TJ/z
+iD8DBQFG1IeIoeSe8B0zEfwRAvK4AJ4hKPlCx2X5HOR8sXBnHWrmJD/O3gCfexl7
+cDQ2/CBMWWiujk3JGT+GR+g=
+=fUUh
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/files/digest-mythtv-0.20.1_p13783 b/media-tv/mythtv/files/digest-mythtv-0.20.1_p13783
deleted file mode 100644
index 800503a1ecb0..000000000000
--- a/media-tv/mythtv/files/digest-mythtv-0.20.1_p13783
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 a4ce30a679b8ffa5633750d3f6b06f23 mythtv-0.20.1.tar.bz2 12429721
-RMD160 7aecb245cbd94796ce311543d744042ceacd8e13 mythtv-0.20.1.tar.bz2 12429721
-SHA256 6990d86ce17c93ff39d24ba27094c09e2a2ec78d044e57b7406216b51145237c mythtv-0.20.1.tar.bz2 12429721
-MD5 d4682f3960af872b2ba94ef63a7c722a mythtv-0.20.1_svn13783.patch.bz2 4286
-RMD160 21cfef35f92064cf111f84ca13d64642dc6739b7 mythtv-0.20.1_svn13783.patch.bz2 4286
-SHA256 ff6acd80b23b36cf2c97cf587c05fe90972ee8005f775768479d4d9919e5e225 mythtv-0.20.1_svn13783.patch.bz2 4286
diff --git a/media-tv/mythtv/files/digest-mythtv-0.20.2_p14282 b/media-tv/mythtv/files/digest-mythtv-0.20.2_p14348
index e69de29bb2d1..e69de29bb2d1 100644
--- a/media-tv/mythtv/files/digest-mythtv-0.20.2_p14282
+++ b/media-tv/mythtv/files/digest-mythtv-0.20.2_p14348
diff --git a/media-tv/mythtv/files/digest-mythtv-0.21_pre14278 b/media-tv/mythtv/files/digest-mythtv-0.21_pre14278
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/media-tv/mythtv/files/digest-mythtv-0.21_pre14278
+++ /dev/null
diff --git a/media-tv/mythtv/files/digest-mythtv-0.20.2_p14307 b/media-tv/mythtv/files/digest-mythtv-0.21_pre14346
index e69de29bb2d1..e69de29bb2d1 100644
--- a/media-tv/mythtv/files/digest-mythtv-0.20.2_p14307
+++ b/media-tv/mythtv/files/digest-mythtv-0.21_pre14346
diff --git a/media-tv/mythtv/mythtv-0.20.1_p13783.ebuild b/media-tv/mythtv/mythtv-0.20.1_p13783.ebuild
deleted file mode 100644
index f8fe6220d9ba..000000000000
--- a/media-tv/mythtv/mythtv-0.20.1_p13783.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.20.1_p13783.ebuild,v 1.3 2007/07/31 13:52:59 cardoe Exp $
-
-inherit mythtv flag-o-matic multilib eutils qt3
-
-DESCRIPTION="Homebrew PVR project"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE_VIDEO_CARDS="video_cards_i810 video_cards_nvidia video_cards_via"
-
-IUSE="alsa altivec autostart backendonly crciprec debug dbox2 dts dvb dvd freebox frontendonly hdhomerun ieee1394 ivtv jack joystick lcd lirc mmx vorbis opengl perl xvmc ${IUSE_VIDEO_CARDS}"
-
-RDEPEND=">=media-libs/freetype-2.0
-	>=media-sound/lame-3.93.1
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXv
-	x11-libs/libXrandr
-	x11-libs/libXxf86vm
-	xvmc? (
-		x11-libs/libXvMC
-		video_cards_nvidia? ( x11-drivers/nvidia-drivers )
-		video_cards_via? ( x11-drivers/xf86-video-via )
-		video_cards_i810? ( x11-drivers/xf86-video-i810 )
-	)
-	$(qt_min_version 3.3)
-	virtual/mysql
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	dts? ( media-libs/libdts )
-	dvd? ( 	media-libs/libdvdnav
-		media-libs/libdts )
-	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
-	ivtv? ( media-tv/ivtv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lcd? ( app-misc/lcdproc )
-	lirc? ( app-misc/lirc )
-	vorbis? ( media-libs/libvorbis )
-	opengl? ( virtual/opengl )
-	ieee1394? (	>=sys-libs/libraw1394-1.2.0
-			>=sys-libs/libavc1394-0.5.0
-			>=media-libs/libiec61883-1.0.0 )
-	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )
-	autostart? ( net-dialup/mingetty
-				x11-wm/evilwm
-				x11-apps/xset )"
-
-DEPEND="${RDEPEND}
-	x11-proto/xineramaproto
-	x11-proto/xf86vidmodeproto
-	x11-apps/xinit"
-
-PDEPEND="=x11-themes/mythtv-themes-${MY_PV}*"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-MYTHTV_GROUPS="video,audio,tty,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() {
-	unpack ${A}
-	cd "${S}"
-
-	#Fixes of the bugs found in the release
-	mythtv-fixes_patch
-
-	# As needed fix since they don't know how to write qmake let alone a real
-	# make system
-	epatch "${FILESDIR}"/${PN}-0.20-as-needed.patch
-}
-
-src_compile() {
-	local myconf="--prefix=/usr
-		--mandir=/usr/share/man
-		--libdir-name=$(get_libdir)"
-	use alsa || myconf="${myconf} --disable-audio-alsa"
-	use jack || myconf="${myconf} --disable-audio-jack"
-	use dts || myconf="${myconf} --disable-dts"
-	use freebox || myconf="${myconf} --disable-freebox"
-	use dbox2 || myconf="${myconf} --disable-dbox2"
-	use hdhomerun || myconf="${myconf} --disable-hdhomerun"
-	use crciprec || myconf="${myconf} --disable-crciprec"
-	use altivec || myconf="${myconf} --disable-altivec"
-	use xvmc && myconf="${myconf} --enable-xvmc"
-	use xvmc && use video_cards_via && myconf="${myconf} --enable-xvmc-pro"
-	use perl && myconf="${myconf} --with-bindings=perl"
-	myconf="${myconf}
-		--disable-audio-arts
-		$(use_enable lirc)
-		$(use_enable joystick joystick-menu)
-		$(use_enable dvb)
-		--dvb-path=/usr/include
-		$(use_enable opengl opengl-vsync)
-		$(use_enable ieee1394 firewire)
-		--enable-xrandr
-		--enable-xv
-		--disable-directfb
-		--enable-x11
-		--enable-proc-opt"
-
-	if use mmx || use amd64; then
-		myconf="${myconf} --enable-mmx"
-	else
-		myconf="${myconf} --disable-mmx"
-	fi
-
-	if use debug; then
-		myconf="${myconf} --compile-type=debug"
-	else
-		myconf="${myconf} --compile-type=release"
-	fi
-
-	## CFLAG cleaning so it compiles
-	MARCH=$(get-flag "march")
-	MTUNE=$(get-flag "mtune")
-	MCPU=$(get-flag "mcpu")
-	strip-flags
-	filter-flags "-march=*" "-mtune=*" "-mcpu=*"
-	filter-flags "-O" "-O?"
-
-	if [[ -n "${MARCH}" ]]; then
-		myconf="${myconf} --arch=${MARCH}"
-	fi
-	if [[ -n "${MTUNE}" ]]; then
-		myconf="${myconf} --tune=${MTUNE}"
-	fi
-	if [[ -n "${MCPU}" ]]; then
-		myconf="${myconf} --cpu=${MCPU}"
-	fi
-
-#	myconf="${myconf} --extra-cxxflags=\"${CXXFLAGS}\" --extra-cflags=\"${CFLAGS}\""
-	hasq distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
-	hasq ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
-
-	if use frontendonly; then
-		##Backend Removal
-		ewarn
-		ewarn "You are using the experimental feature for only installing the frontend."
-		ewarn "You will not get Gentoo support nor support from MythTV upstream for this."
-		ewarn "If this breaks, you own both pieces."
-		ewarn
-		myconf="${myconf} --disable-backend"
-	fi
-
-	if use backendonly; then
-		##Frontend Removal
-		ewarn
-		ewarn "You are using the experimental feature for only installing the backend."
-		ewarn "You will not get Gentoo support nor support from MythTV upstream for this."
-		ewarn "If this breaks, you own both pieces."
-		ewarn
-		myconf="${myconf} --disable-frontend"
-	fi
-
-	# let MythTV come up with our CFLAGS. Upstream will support this
-	CFLAGS=""
-	CXXFLAGS=""
-	einfo "Running ./configure ${myconf}"
-	./configure ${myconf} || die "configure died"
-
-	${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake -o "Makefile" mythtv.pro || die "qmake failed"
-	emake || die "emake failed"
-
-}
-
-src_install() {
-
-	einstall INSTALL_ROOT="${D}" || die "install failed"
-	for doc in AUTHORS FAQ UPGRADING ChangeLog README; do
-		test -e "${doc}" && dodoc ${doc}
-	done
-
-	if ! use frontendonly; then
-		insinto /usr/share/mythtv/database
-		doins database/*
-
-		exeinto /usr/share/mythtv
-		doexe "${FILESDIR}/mythfilldatabase.cron"
-
-		newinitd ${FILESDIR}/mythbackend-0.18.2.rc mythbackend
-		newconfd ${FILESDIR}/mythbackend-0.18.2.conf mythbackend
-	fi
-
-	dodoc keys.txt docs/*.{txt,pdf}
-	dohtml docs/*.html
-
-	keepdir /etc/mythtv
-	chown -R mythtv "${D}"/etc/mythtv
-	keepdir /var/log/mythtv
-	chown -R mythtv "${D}"/var/log/mythtv
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/mythtv.logrotate.d mythtv
-
-	insinto /usr/share/mythtv/contrib
-	doins contrib/*
-
-	insinto /usr/share/mythtv/configfiles
-	doins configfiles/*
-
-	if ! use backendonly; then
-		dobin "${FILESDIR}"/runmythfe
-
-		if use autostart; then
-			dodir /etc/env.d/
-			echo 'CONFIG_PROTECT="/home/mythtv/"' > ${D}/etc/env.d/95mythtv
-
-			insinto /home/mythtv
-			newins "${FILESDIR}"/bash_profile .bash_profile
-			newins "${FILESDIR}"/xinitrc .xinitrc
-		fi
-	fi
-}
-
-pkg_preinst() {
-	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS} || die "Problem adding mythtv user"
-	usermod -a -G ${MYTHTV_GROUPS} mythtv
-
-	export CONFIG_PROTECT="${CONFIG_PROTECT} ${ROOT}/home/mythtv/"
-}
-
-pkg_postinst() {
-	if ! use backendonly; then
-		echo
-		elog "Want mythfrontend to start automatically?"
-		elog "Set USE=autostart. Details can be found at:"
-		elog "http://dev.gentoo.org/~cardoe/mythtv/autostart.html"
-	fi
-
-	if ! use frontendonly; then
-		echo
-		elog "To always have MythBackend running and available run the following:"
-		elog "rc-update add mythbackend default"
-		echo
-		ewarn "Your recordings folder must be owned by the user 'mythtv' now"
-		ewarn "chown -R mythtv /path/to/store"
-	fi
-
-	if use autostart; then
-		echo
-		elog "Please add the following to your /etc/inittab file at the end of"
-		elog "the TERMINALS section"
-		elog "c8:2345:respawn:/sbin/mingetty --autologin mythtv tty8"
-	fi
-
-}
diff --git a/media-tv/mythtv/mythtv-0.20.2_p14282.ebuild b/media-tv/mythtv/mythtv-0.20.2_p14282.ebuild
deleted file mode 100644
index c0087a887673..000000000000
--- a/media-tv/mythtv/mythtv-0.20.2_p14282.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.20.2_p14282.ebuild,v 1.2 2007/08/24 16:16:18 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
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	dts? ( || ( media-libs/libdca media-libs/libdts ) )
-	dvd? ( 	media-libs/libdvdnav
-		media-libs/libdts )
-	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 )
-	vorbis? ( media-libs/libvorbis )
-	opengl? ( virtual/opengl )
-	ieee1394? (	>=sys-libs/libraw1394-1.2.0
-			>=sys-libs/libavc1394-0.5.0
-			>=media-libs/libiec61883-1.0.0 )
-	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )
-	autostart? ( net-dialup/mingetty
-				x11-wm/evilwm
-				x11-apps/xset )"
-
-DEPEND="${RDEPEND}
-	x11-proto/xineramaproto
-	x11-proto/xf86vidmodeproto
-	x11-apps/xinit"
-
-PDEPEND="=x11-themes/mythtv-themes-${MY_PV}*"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-MYTHTV_GROUPS="video,audio,tty,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} -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.20.2_p14307.ebuild b/media-tv/mythtv/mythtv-0.20.2_p14348.ebuild
index 8a32a46a763c..5ce2f6873cd9 100644
--- a/media-tv/mythtv/mythtv-0.20.2_p14307.ebuild
+++ b/media-tv/mythtv/mythtv-0.20.2_p14348.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.20.2_p14307.ebuild,v 1.2 2007/08/27 15:57:11 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.20.2_p14348.ebuild,v 1.1 2007/08/28 20:37:18 cardoe Exp $
 
 inherit mythtv flag-o-matic multilib eutils qt3 subversion toolchain-funcs
 
diff --git a/media-tv/mythtv/mythtv-0.21_pre14278.ebuild b/media-tv/mythtv/mythtv-0.21_pre14346.ebuild
index 39ecd718eb9d..409f9b75b404 100644
--- a/media-tv/mythtv/mythtv-0.21_pre14278.ebuild
+++ b/media-tv/mythtv/mythtv-0.21_pre14346.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_pre14278.ebuild,v 1.2 2007/08/24 16:16:18 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_pre14346.ebuild,v 1.1 2007/08/28 20:37:18 cardoe Exp $
 
 inherit flag-o-matic multilib eutils qt3 mythtv subversion toolchain-funcs
 
@@ -190,7 +190,7 @@ src_compile() {
 			die "failed to compile firewire_tester"
 
 		cd channel_changers
-		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../6200ch 6200ch.c \
+		$(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 \