remove old trunk build. bump trunk for segfault fix. upnp fixes too.

Package-Manager: portage-2.1.3.6

8 files changed, 23 insertions, 540 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 5ca8e6a38b96..3e23d7365b30 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,13 @@
 # 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.168 2007/08/22 15:01:20 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.169 2007/08/22 15:06:43 cardoe Exp $
+
+*mythtv-0.21_pre14251 (22 Aug 2007)
+
+  22 Aug 2007; Doug Goldstein <cardoe@gentoo.org>
+  -mythtv-0.21_pre13285.ebuild, -mythtv-0.21_pre13775.ebuild,
+  -mythtv-0.21_pre14241.ebuild, +mythtv-0.21_pre14251.ebuild:
+  remove old trunk build. bump trunk for segfault fix. upnp fixes too.
 
   22 Aug 2007; Doug Goldstein <cardoe@gentoo.org>
   mythtv-0.20.1_p14146.ebuild, mythtv-0.21_pre14153.ebuild,
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 31e82043a6b6..7bedd27df89f 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -56,26 +56,18 @@ EBUILD mythtv-0.20.1_p14146.ebuild 9690 RMD160 d41581b03be8587b487e429a4933cc7ce
 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.21_pre13285.ebuild 7243 RMD160 1bfb7148a8e2f002a153145626f0283d92a635a8 SHA1 a026fedbe1d2cfeccd87d8f5a355ca1a42430c0b SHA256 a62c28e4622edddac483434a7dc78b7c8a4244be70da4ebb8b6b24017f3f732c
-MD5 d2fb98ee05600d3d3175d195b5369041 mythtv-0.21_pre13285.ebuild 7243
-RMD160 1bfb7148a8e2f002a153145626f0283d92a635a8 mythtv-0.21_pre13285.ebuild 7243
-SHA256 a62c28e4622edddac483434a7dc78b7c8a4244be70da4ebb8b6b24017f3f732c mythtv-0.21_pre13285.ebuild 7243
-EBUILD mythtv-0.21_pre13775.ebuild 7247 RMD160 84fd8ba1ee456c4bf7c77c7ab3460de02441a0be SHA1 1a880f98122fedaf3caafa4c79aff61d190d3b34 SHA256 a0550434c82157b8bfb877db79ab21cbbc8fc80a38977d5c051e444471e49b32
-MD5 f5e4311b740fa6ac5dfc72050e0034e7 mythtv-0.21_pre13775.ebuild 7247
-RMD160 84fd8ba1ee456c4bf7c77c7ab3460de02441a0be mythtv-0.21_pre13775.ebuild 7247
-SHA256 a0550434c82157b8bfb877db79ab21cbbc8fc80a38977d5c051e444471e49b32 mythtv-0.21_pre13775.ebuild 7247
 EBUILD mythtv-0.21_pre14153.ebuild 8895 RMD160 c83116fb2a9ba284d8d0635995deb2091df5edaa SHA1 c9757136aa8ffe22c12ed3d4ed618033f14b1c28 SHA256 be6e3c07751f88509a425c3ec9c6276b16876f7609984c372fe29b66406c13ba
 MD5 6f39ccb29c85400f0bb7dd0d7c384f53 mythtv-0.21_pre14153.ebuild 8895
 RMD160 c83116fb2a9ba284d8d0635995deb2091df5edaa mythtv-0.21_pre14153.ebuild 8895
 SHA256 be6e3c07751f88509a425c3ec9c6276b16876f7609984c372fe29b66406c13ba mythtv-0.21_pre14153.ebuild 8895
-EBUILD mythtv-0.21_pre14241.ebuild 8894 RMD160 5244490dcafd852657dfe5bd921f8becbfa9020b SHA1 371d5d159385d489e30300e069cc019aa602dcce SHA256 e31334f7aeb12582bac04fa476fa10a40d6e0450d21e3662a4d95aba5e996000
-MD5 e34aafb8d4e8f5f2257fe153b91e9872 mythtv-0.21_pre14241.ebuild 8894
-RMD160 5244490dcafd852657dfe5bd921f8becbfa9020b mythtv-0.21_pre14241.ebuild 8894
-SHA256 e31334f7aeb12582bac04fa476fa10a40d6e0450d21e3662a4d95aba5e996000 mythtv-0.21_pre14241.ebuild 8894
-MISC ChangeLog 30998 RMD160 6e912ec044520b8360a8cb164a993618e2007522 SHA1 8f3a8b36f97bca0e20b64fdcde1db9360f4f9b38 SHA256 c5936560caadcdefa5602e12170f7b0979978b1cebe89a617c4a345316d40933
-MD5 91cc39398c678657367f68da64759d61 ChangeLog 30998
-RMD160 6e912ec044520b8360a8cb164a993618e2007522 ChangeLog 30998
-SHA256 c5936560caadcdefa5602e12170f7b0979978b1cebe89a617c4a345316d40933 ChangeLog 30998
+EBUILD mythtv-0.21_pre14251.ebuild 8894 RMD160 61ec9023697220488bd66063bda550f7ca6c4620 SHA1 8ca4a2d43b4a111b3e1ae62af0f25adf2bc70d5a SHA256 56e4d61adb4931aa155227a464f65855a80213b65812258badc81c8ce6e2fcde
+MD5 676dddc486b0b1f8dd10ef844c35054a mythtv-0.21_pre14251.ebuild 8894
+RMD160 61ec9023697220488bd66063bda550f7ca6c4620 mythtv-0.21_pre14251.ebuild 8894
+SHA256 56e4d61adb4931aa155227a464f65855a80213b65812258badc81c8ce6e2fcde mythtv-0.21_pre14251.ebuild 8894
+MISC ChangeLog 31281 RMD160 5a773fa7d4beb8e06e926bf6a55e27c60f5f5a8c SHA1 08eaf8846ee3d65eb3f05d694cbab794138cc639 SHA256 968996de2e9b06dccbe3f45ce40b61fe43a20548df87cbcdb8e3e28b04ba08d1
+MD5 14b250d59f6bf5abe7cd0ba06e2f4724 ChangeLog 31281
+RMD160 5a773fa7d4beb8e06e926bf6a55e27c60f5f5a8c ChangeLog 31281
+SHA256 968996de2e9b06dccbe3f45ce40b61fe43a20548df87cbcdb8e3e28b04ba08d1 ChangeLog 31281
 MISC metadata.xml 222 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e SHA1 c6bd979f236f5e6fe9332eb6568bee402efc793f SHA256 8b2065fecfbbdd0caa3c5eb86b98c22766db07f555edbf3127e9454b468ecff6
 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e metadata.xml 222
@@ -89,22 +81,16 @@ SHA256 a52984bdbd8d569ac2ed3dd558c9e1db01c45762d7ebe682d29c307bca37bb5c files/di
 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.21_pre13285 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.21_pre13285 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.21_pre13285 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.21_pre13775 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.21_pre13775 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.21_pre13775 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.21_pre14153 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.21_pre14153 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.21_pre14153 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.21_pre14241 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.21_pre14241 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.21_pre14241 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.21_pre14251 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.21_pre14251 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.21_pre14251 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGzE/PoeSe8B0zEfwRAoJxAJsGum4s+ZzxIPxmwu6iLFodlBRYXwCfde0d
-HowQc1GGheGtZk+YvfdanBc=
-=UTVe
+iD8DBQFGzFEKoeSe8B0zEfwRAp91AJ9/sz81/QinVi7gfQKxRowV97DP4wCfbfqP
+0j0ZpAmaLgEniDSguWZvLUE=
+=Jdwu
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/files/digest-mythtv-0.21_pre13775 b/media-tv/mythtv/files/digest-mythtv-0.21_pre13775
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/media-tv/mythtv/files/digest-mythtv-0.21_pre13775
+++ /dev/null
diff --git a/media-tv/mythtv/files/digest-mythtv-0.21_pre14241 b/media-tv/mythtv/files/digest-mythtv-0.21_pre14241
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/media-tv/mythtv/files/digest-mythtv-0.21_pre14241
+++ /dev/null
diff --git a/media-tv/mythtv/files/digest-mythtv-0.21_pre13285 b/media-tv/mythtv/files/digest-mythtv-0.21_pre14251
index e69de29bb2d1..e69de29bb2d1 100644
--- a/media-tv/mythtv/files/digest-mythtv-0.21_pre13285
+++ b/media-tv/mythtv/files/digest-mythtv-0.21_pre14251
diff --git a/media-tv/mythtv/mythtv-0.21_pre13285.ebuild b/media-tv/mythtv/mythtv-0.21_pre13285.ebuild
deleted file mode 100644
index af235176966c..000000000000
--- a/media-tv/mythtv/mythtv-0.21_pre13285.ebuild
+++ /dev/null
@@ -1,255 +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.21_pre13285.ebuild,v 1.4 2007/07/31 13:52:59 cardoe Exp $
-
-inherit flag-o-matic multilib eutils qt3 mythtv subversion
-
-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 debug dbox2 dts dvb dvd hdhomerun ieee1394 iptv 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
-
-	[[ $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
-
-	# mcpu to march
-	epatch "${FILESDIR}"/${PN}-trunk-mcpu-march.patch
-
-	# As needed fix since they don't know how to write qmake let alone a real
-	# make system. And they won't accept this upstream since it comes from
-	# Gentoo
-	#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 dbox2 || myconf="${myconf} --disable-dbox2"
-	use hdhomerun || myconf="${myconf} --disable-hdhomerun"
-	use altivec || myconf="${myconf} --disable-altivec"
-	use xvmc && myconf="${myconf} --enable-xvmc"
-	use xvmc && use video_cards_via && myconf="${myconf} --enable-xvmc-pro"
-	use xvmc && ! use video_cards_nvidia && myconf="${myconf} --disable-xvmc-opengl"
-	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)
-		$(use_enable iptv)
-		--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"
-
-	# 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
-
-	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 contrib/*
-
-	insinto /usr/share/mythtv/configfiles
-	doins configfiles/*
-
-	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
-}
-
-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() {
-	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 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.21_pre13775.ebuild b/media-tv/mythtv/mythtv-0.21_pre13775.ebuild
deleted file mode 100644
index 4825badae883..000000000000
--- a/media-tv/mythtv/mythtv-0.21_pre13775.ebuild
+++ /dev/null
@@ -1,255 +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.21_pre13775.ebuild,v 1.4 2007/07/31 13:52:59 cardoe Exp $
-
-inherit flag-o-matic multilib eutils qt3 mythtv subversion
-
-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 debug dbox2 dts dvb dvd hdhomerun ieee1394 iptv 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
-
-	[[ $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
-
-	# mcpu to march
-	epatch "${FILESDIR}"/${PN}-trunk-mcpu-march-2.patch
-
-	# As needed fix since they don't know how to write qmake let alone a real
-	# make system. And they won't accept this upstream since it comes from
-	# Gentoo
-	#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} --enable-libdts"
-	use dbox2 || myconf="${myconf} --disable-dbox2"
-	use hdhomerun || myconf="${myconf} --disable-hdhomerun"
-	use altivec || myconf="${myconf} --disable-altivec"
-	use xvmc && myconf="${myconf} --enable-xvmc"
-	use xvmc && use video_cards_via && myconf="${myconf} --enable-xvmc-pro"
-	use xvmc && ! use video_cards_nvidia && myconf="${myconf} --disable-xvmc-opengl"
-	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)
-		$(use_enable iptv)
-		--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"
-
-	# 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
-
-	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 contrib/*
-
-	insinto /usr/share/mythtv/configfiles
-	doins configfiles/*
-
-	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
-}
-
-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() {
-	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 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.21_pre14241.ebuild b/media-tv/mythtv/mythtv-0.21_pre14251.ebuild
index 2ff1b79c8902..d879e7ffcc1f 100644
--- a/media-tv/mythtv/mythtv-0.21_pre14241.ebuild
+++ b/media-tv/mythtv/mythtv-0.21_pre14251.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_pre14241.ebuild,v 1.3 2007/08/22 15:01:19 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_pre14251.ebuild,v 1.1 2007/08/22 15:06:43 cardoe Exp $
 
 inherit flag-o-matic multilib eutils qt3 mythtv subversion toolchain-funcs