USE flag tweaks, some more error msgs based on configuration, fine tune some depends, install contrib directory

(Portage version: 2.1_pre5-r4)

9 files changed, 102 insertions, 505 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 9031ca0c5716..404a7e79efe2 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.88 2006/02/27 07:56:02 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.89 2006/03/10 09:26:01 cardoe Exp $
+
+*mythtv-0.19_p9163-r1 (10 Mar 2006)
+
+  10 Mar 2006; Doug Goldstein <cardoe@gentoo.org> -mythtv-0.18.1-r2.ebuild,
+  -mythtv-0.19.ebuild, -mythtv-0.19-r1.ebuild, +mythtv-0.19_p9163-r1.ebuild:
+  USE flag tweaks, some more error msgs based on configuration, fine tune some
+  depends, install contrib directory
 
 *mythtv-0.19_p9163 (27 Feb 2006)
 
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index de2874178f5f..d07c068945da 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 76dea2ca29cb8fb0c20b09a1b40a9da2 ChangeLog 16383
-RMD160 6d09b473f487127376d55c6491fbcd509455f7c1 ChangeLog 16383
-SHA256 57609a62052784baa6ebd223c32b13b81fbb121bb0353d379d0072eef76676ce ChangeLog 16383
+MD5 78d7c2b7bc49a5c7a08082596966d7da ChangeLog 16690
+RMD160 dd4cedbc313bb83e9786e8120c33aca15dc75602 ChangeLog 16690
+SHA256 207d828e6cd189ee528237d796e03f7652e2f727d5c6afea88ddb69230bcb746 ChangeLog 16690
 MD5 4985a61b90909b7f1c926f79a3ba34bf files/0.18-mythbackend.conf 931
 RMD160 626d1a051ad5d9d724e1450e0bd0da21c57fe2d2 files/0.18-mythbackend.conf 931
 SHA256 ecb82a5de903a63df0c5821ace68a845cf49faa90d754fead240542980e95b2f files/0.18-mythbackend.conf 931
@@ -13,18 +10,12 @@ SHA256 2d797b88a8730e4d796efe102414880cb6cf5a2e1c398c2d9460537b6332e8b7 files/0.
 MD5 b288872f9393adf2b30f40b6ee01eac5 files/digest-mythtv-0.18.1-r1 67
 RMD160 8d5d3ed3984fad4f033ee80acb4158c4994beaf2 files/digest-mythtv-0.18.1-r1 67
 SHA256 c16789e34d2e5c3d5b0162a87a9bf758145aa3bfaaeb55e05438e4a30a235bb9 files/digest-mythtv-0.18.1-r1 67
-MD5 b288872f9393adf2b30f40b6ee01eac5 files/digest-mythtv-0.18.1-r2 67
-RMD160 8d5d3ed3984fad4f033ee80acb4158c4994beaf2 files/digest-mythtv-0.18.1-r2 67
-SHA256 c16789e34d2e5c3d5b0162a87a9bf758145aa3bfaaeb55e05438e4a30a235bb9 files/digest-mythtv-0.18.1-r2 67
-MD5 469774c8a2aebf913ddd8388e7945f7d files/digest-mythtv-0.19 244
-RMD160 df9a35cde9765eb16364c65f7ec6d316d107f380 files/digest-mythtv-0.19 244
-SHA256 0dfe196cf023e37679f736fec817dad08e4bd7b235e88c7ad573b05e849a5d0d files/digest-mythtv-0.19 244
-MD5 a9833b004b7894b0c0c1f57f439d74d7 files/digest-mythtv-0.19-r1 515
-RMD160 9bf8f764f9566413f558c15b6bb17c3b18de2b73 files/digest-mythtv-0.19-r1 515
-SHA256 d145d8d8c020e5b74dc0bfdf6c4b6c35c5bca333d17485c2775f362e36a79202 files/digest-mythtv-0.19-r1 515
 MD5 8a5ab7d90c02b6c10edef054a0a2f426 files/digest-mythtv-0.19_p9163 509
 RMD160 8df12123293877e26178c0e3a633ef2fb39e1463 files/digest-mythtv-0.19_p9163 509
 SHA256 39ad66ef70a0ff199932f2cd5b40411832e854e5ee1591fcdb26b445a98f4a82 files/digest-mythtv-0.19_p9163 509
+MD5 8a5ab7d90c02b6c10edef054a0a2f426 files/digest-mythtv-0.19_p9163-r1 509
+RMD160 8df12123293877e26178c0e3a633ef2fb39e1463 files/digest-mythtv-0.19_p9163-r1 509
+SHA256 39ad66ef70a0ff199932f2cd5b40411832e854e5ee1591fcdb26b445a98f4a82 files/digest-mythtv-0.19_p9163-r1 509
 MD5 ce6902dd0c8832390052b427a14acc42 files/mythbackend-0.18.2.conf 431
 RMD160 1879e25aadacf4c45c3857ec329546fd5950af36 files/mythbackend-0.18.2.conf 431
 SHA256 89fa9de3a25937c47062adc3ba449067ef50564729117c4f171fe69459588810 files/mythbackend-0.18.2.conf 431
@@ -55,22 +46,9 @@ SHA256 8b2065fecfbbdd0caa3c5eb86b98c22766db07f555edbf3127e9454b468ecff6 metadata
 MD5 f2c7e6f87a9c718acdd942b22140e2a9 mythtv-0.18.1-r1.ebuild 5109
 RMD160 5598253366d0d608598df6503b33fcf636e6bc12 mythtv-0.18.1-r1.ebuild 5109
 SHA256 8bbf3b1c856ceeb623dc3ff016044a20afba27e7092e30666832f73c8512f766 mythtv-0.18.1-r1.ebuild 5109
-MD5 cac72423d3f6c98d2ef628c3e83c4ff2 mythtv-0.18.1-r2.ebuild 5488
-RMD160 7cc27e0730e0a4b16aa64a1943b14487ffb0bfac mythtv-0.18.1-r2.ebuild 5488
-SHA256 7986004e945ce90abfb6bce7a87299932b1eb80a75e4423dbc5bc296ac1d3443 mythtv-0.18.1-r2.ebuild 5488
-MD5 6e5e12b7326db7aed174210a19df3fc3 mythtv-0.19-r1.ebuild 6384
-RMD160 eba77b65a33a359a82921f0e6a872a616915279f mythtv-0.19-r1.ebuild 6384
-SHA256 09bdff021e9d09bc78b7c6d399f182493d423220477fc6273f3ebe640b574faf mythtv-0.19-r1.ebuild 6384
-MD5 d3e3b07e51556dc0bcec9b8b6109c5aa mythtv-0.19.ebuild 6667
-RMD160 a0e4b46367ba6696ebffa42b46059adb7f0443fb mythtv-0.19.ebuild 6667
-SHA256 8de1da4d472c7aa999d1c06efcebdca70e0b3639159ec632f6aadc7b02f70970 mythtv-0.19.ebuild 6667
+MD5 2c5364d02626925480811ec445218550 mythtv-0.19_p9163-r1.ebuild 7943
+RMD160 23a263a7fcdd46ca3641b3619844f940ebfecdef mythtv-0.19_p9163-r1.ebuild 7943
+SHA256 d90252df9a8af8ee8d0b9721d72ca51e2839758d20ebb2a14faf0ac1204f704f mythtv-0.19_p9163-r1.ebuild 7943
 MD5 dfbeafc04a274b47e50a45d204824bf0 mythtv-0.19_p9163.ebuild 7073
 RMD160 81251f037be12f72a72f1d5a0569476e8c823bea mythtv-0.19_p9163.ebuild 7073
 SHA256 31cdc898b30c8e4695a30c876762f5dd15b750b5916a1a7bd8a29e16fb6e6ee9 mythtv-0.19_p9163.ebuild 7073
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEArtQBtvusYtCZMsRAkMZAJ46d239e1fFzbM/xycjtag1odAKZQCfQ8/X
-6VVE150bxZEGimQuM0OT/bo=
-=WAst
------END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/files/digest-mythtv-0.18.1-r2 b/media-tv/mythtv/files/digest-mythtv-0.18.1-r2
deleted file mode 100644
index c19a91ec4aa3..000000000000
--- a/media-tv/mythtv/files/digest-mythtv-0.18.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e6cabf88feeaf6ae8f830d3fdf7b113d mythtv-0.18.1.tar.bz2 8858839
diff --git a/media-tv/mythtv/files/digest-mythtv-0.19 b/media-tv/mythtv/files/digest-mythtv-0.19
deleted file mode 100644
index d2ae420a29ed..000000000000
--- a/media-tv/mythtv/files/digest-mythtv-0.19
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ebba5829d264bb4de2f75cae936141f4 mythtv-0.19.tar.bz2 10162049
-RMD160 cd90bb3629df55f9e803d867cf59e378e9cace07 mythtv-0.19.tar.bz2 10162049
-SHA256 ca73641116d3bbc7d353a99348f9f8c9a156bcc756c90a6ed06f1498d9d9cd8f mythtv-0.19.tar.bz2 10162049
diff --git a/media-tv/mythtv/files/digest-mythtv-0.19-r1 b/media-tv/mythtv/files/digest-mythtv-0.19-r1
deleted file mode 100644
index 00d68e5d88a9..000000000000
--- a/media-tv/mythtv/files/digest-mythtv-0.19-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 ebba5829d264bb4de2f75cae936141f4 mythtv-0.19.tar.bz2 10162049
-RMD160 cd90bb3629df55f9e803d867cf59e378e9cace07 mythtv-0.19.tar.bz2 10162049
-SHA256 ca73641116d3bbc7d353a99348f9f8c9a156bcc756c90a6ed06f1498d9d9cd8f mythtv-0.19.tar.bz2 10162049
-MD5 a42fc229ac455e18f93bc3567f8c84c2 mythtv-0.19_8926_9094.patch.bz2 14060
-RMD160 19b6d9626890a43f70496c3959f8206bde3e4b2c mythtv-0.19_8926_9094.patch.bz2 14060
-SHA256 6797c3caa1875b0be932699517bda8dc001cf88334dd2cdd2e454a94419c4fac mythtv-0.19_8926_9094.patch.bz2 14060
diff --git a/media-tv/mythtv/files/digest-mythtv-0.19_p9163-r1 b/media-tv/mythtv/files/digest-mythtv-0.19_p9163-r1
new file mode 100644
index 000000000000..fe1c61a6876d
--- /dev/null
+++ b/media-tv/mythtv/files/digest-mythtv-0.19_p9163-r1
@@ -0,0 +1,6 @@
+MD5 ffcc771cc1034c6425415461d3e981ca mythtv-0.19-rev9163.patch.bz2 16798
+RMD160 5799d8cf0f2c95e61ea86f291d02b9d7fa2559bc mythtv-0.19-rev9163.patch.bz2 16798
+SHA256 c956382fed04927f8fb20c7ec0dbe6725aad9e36cd616061cb9be3dce81e5bb2 mythtv-0.19-rev9163.patch.bz2 16798
+MD5 ebba5829d264bb4de2f75cae936141f4 mythtv-0.19.tar.bz2 10162049
+RMD160 cd90bb3629df55f9e803d867cf59e378e9cace07 mythtv-0.19.tar.bz2 10162049
+SHA256 ca73641116d3bbc7d353a99348f9f8c9a156bcc756c90a6ed06f1498d9d9cd8f mythtv-0.19.tar.bz2 10162049
diff --git a/media-tv/mythtv/mythtv-0.18.1-r2.ebuild b/media-tv/mythtv/mythtv-0.18.1-r2.ebuild
deleted file mode 100644
index 5b20dc3708a0..000000000000
--- a/media-tv/mythtv/mythtv-0.18.1-r2.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.1-r2.ebuild,v 1.11 2006/01/09 13:19:38 caleb Exp $
-
-inherit flag-o-matic eutils debug
-
-DESCRIPTION="Homebrew PVR project"
-HOMEPAGE="http://www.mythtv.org/"
-SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa altivec arts debug dvb frontendonly ieee1394 jack joystick lcd lirc mmx nvidia vorbis opengl oss unichrome"
-
-DEPEND=">=media-libs/freetype-2.0
-	>=media-sound/lame-3.93.1
-	virtual/x11
-	=x11-libs/qt-3*
-	dev-db/mysql
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	arts? ( kde-base/arts )
-	dvb? ( media-libs/libdvb )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lcd? ( app-misc/lcdproc )
-	lirc? ( app-misc/lirc )
-	nvidia? ( media-video/nvidia-glx )
-	vorbis? ( media-libs/libvorbis )
-	opengl? ( virtual/opengl )
-	ieee1394? (	>=sys-libs/libraw1394-1.2.0
-			sys-libs/libavc1394
-			>=media-libs/libiec61883-1.0.0 )
-	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )
-	!x11-base/xfree
-	!<x11-base/xorg-x11-6.8"
-
-pkg_setup() {
-
-	if ! built_with_use x11-libs/qt mysql ; then
-		eerror "Qt is missing MySQL support. Please add"
-		eerror "'mysql' to your USE flags, and re-emerge Qt."
-		die "Qt needs MySQL support"
-	fi
-
-	if ! built_with_use x11-base/xorg-x11 xv; then
-		eerror "xorg-x11 is missing XV support. Please add"
-		eerror "'xv' to your USE flags, and re-emerge xorg-x11."
-		die "xorg-x11 needs XV support"
-	fi
-
-	if use nvidia; then
-		echo
-		ewarn "You enabled the 'nvidia' USE flag, you must have a GeForce 4 or"
-		ewarn "greater to use this. Otherwise, you'll have crashes with MythTV"
-		echo
-	fi
-
-	einfo
-	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."
-	einfo
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-opengl-fix.patch
-
-	# Add support for --arch options, bug 94696
-	epatch ${FILESDIR}/${P}-cputypes-configure.patch
-
-	# Turn on CC on Mute patch
-#	cd ${S}/libs/libmythtv
-#	epatch ${FILESDIR}/${P}-cc-on-mute.patch
-
-	if [ $(get_libdir) != "lib" ] ; then
-		sed -i -e "s:\$\${PREFIX}/lib/:\$\${PREFIX}/$(get_libdir)/:g" \
-			-e "s:\$\${PREFIX}/lib$:\$\${PREFIX}/$(get_libdir):g" \
-			${S}/{filters,libs}/*/*.pro || die
-		sed -i -e "s:/lib/mythtv/:/$(get_libdir)/mythtv/:" \
-			${S}/libs/libmyth/mythcontext.cpp || die
-	fi
-
-#	# Fix bugs 40964 and 42943.
-#	filter-flags -fforce-addr -fPIC -momit-leaf-frame-pointer
-#	is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer"
-}
-
-src_compile() {
-	use unichrome && use nvidia && die "You can not have USE="unichrome" and USE="nvidia" at the same time. Must disable one or the other."
-	local myconf="$(use_enable altivec)
-		$(use_enable oss audio-oss)
-		$(use_enable alsa audio-alsa)
-		$(use_enable arts audio-arts)
-		$(use_enable jack audio-jack)
-		$(use_enable lirc)
-		$(use_enable joystick joystick-menu)
-		$(use_enable unichrome xvmc-vld)
-		$(use_enable dvb)
-		$(use_enable dvb dvb-eit)
-		--dvb-path=/usr/include
-		$(use_enable opengl opengl-vsync)
-		$(use_enable vorbis vorbis)
-		$(use_enable nvidia xvmc)
-		--enable-xv
-		$(use_enable ieee1394 firewire)
-		--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-cflags=${CFLAGS}"
-
-	hasq distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
-	hasq ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
-
-	if use frontendonly; then
-		##Backend Removal
-		cd ${S}
-		sed -e "s:CCONFIG linux backend:CCONFIG linux:" \
-			-i 'configure' || die "Removal of mythbackend failed"
-	fi
-
-	# let MythTV come up with our CFLAGS. Upstream will support this
-	CFLAGS=""
-	CXXFLAGS=""
-	econf ${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 COPYING FAQ UPGRADING ChangeLog README; do
-		test -e "${doc}" && dodoc ${doc}
-	done
-
-	if ! use frontendonly; then
-		newbin "setup/mythtv-setup" "mythsetup"
-
-		insinto /usr/share/mythtv/database
-		doins database/*
-
-		exeinto /usr/share/mythtv
-		doexe "${FILESDIR}/mythfilldatabase.cron"
-
-		newinitd ${FILESDIR}/0.18-mythbackend.rc mythbackend
-		newconfd ${FILESDIR}/0.18-mythbackend.conf mythbackend
-	fi
-
-	dobin ${FILESDIR}/runmythfe
-
-	ewarn "Want MythFrontend to always? Add the following to your"
-	ewarn "myth user. i.e. My user is mythtv"
-	echo "crontab -e -u mythtv"
-	echo "* * * * * /usr/bin/runmythfe &"
-	ewarn "And you're all set."
-
-	dodoc keys.txt docs/*.{txt,pdf}
-	dohtml docs/*.html
-
-	keepdir /var/log/mythtv
-}
diff --git a/media-tv/mythtv/mythtv-0.19.ebuild b/media-tv/mythtv/mythtv-0.19.ebuild
deleted file mode 100644
index bc5e75cb7853..000000000000
--- a/media-tv/mythtv/mythtv-0.19.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.19.ebuild,v 1.5 2006/02/18 11:01:05 cardoe Exp $
-
-inherit flag-o-matic eutils debug qt3
-
-DESCRIPTION="Homebrew PVR project"
-HOMEPAGE="http://www.mythtv.org/"
-SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa altivec arts debug dbox2 dvb dvd frontendonly ieee1394 jack joystick lcd lirc mmx nvidia oggvorbis opengl oss unichrome"
-
-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
-		)
-	virtual/x11 )
-	$(qt_min_version 3.3)
-	dev-db/mysql
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	arts? ( kde-base/arts )
-	dvd? ( media-libs/libdvdnav )
-	dvb? ( media-libs/libdvb )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lcd? ( app-misc/lcdproc )
-	lirc? ( app-misc/lirc )
-	nvidia? ( media-video/nvidia-glx
-		|| ( x11-libs/libXvMC virtual/x11 ) )
-	oggvorbis? ( media-libs/libvorbis )
-	opengl? ( virtual/opengl )
-	ieee1394? (	>=sys-libs/libraw1394-1.2.0
-			sys-libs/libavc1394
-			>=media-libs/libiec61883-1.0.0 )
-	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )
-	!x11-base/xfree
-	!<x11-base/xorg-x11-6.8"
-
-DEPEND="${RDEPEND}
-	|| ( x11-apps/xinit virtual/x11 )"
-
-PDEPEND="~x11-themes/mythtv-themes-${PV}"
-
-MYTHTV_GROUPS="video,audio"
-
-pkg_setup() {
-
-	if ! built_with_use x11-libs/qt mysql ; then
-		eerror "Qt is missing MySQL support. Please add"
-		eerror "'mysql' to your USE flags, and re-emerge Qt."
-		die "Qt needs MySQL support"
-	fi
-
-	if ! built_with_use x11-libs/qt opengl ; then
-		eerror "Qt requires OpenGL support. Please add"
-		eerror "'opengl' to your USE flags, and re-emerge Qt."
-		die "Qt needs OpenGL support."
-	fi
-
-	if ! has_version x11-libs/libXv && ! built_with_use x11-base/xorg-x11 xv; then
-		eerror "xorg-x11 is missing XV support. Please add"
-		eerror "'xv' to your USE flags, and re-emerge xorg-x11."
-		die "xorg-x11 needs XV support"
-	fi
-
-	if use nvidia; then
-		echo
-		ewarn "You enabled the 'nvidia' USE flag, you must have a GeForce 4 or"
-		ewarn "greater to use this. Otherwise, you'll have crashes with MythTV"
-		echo
-	fi
-
-	einfo
-	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."
-	einfo
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-#	if [ $(get_libdir) != "lib" ] ; then
-#		sed -i -e "s:\$\${PREFIX}/lib/:\$\${PREFIX}/$(get_libdir)/:g" \
-#			-e "s:\$\${PREFIX}/lib$:\$\${PREFIX}/$(get_libdir):g" \
-#			${S}/{filters,libs}/*/*.pro || die
-#		sed -i -e "s:/lib/mythtv/:/$(get_libdir)/mythtv/:" \
-#			${S}/libs/libmyth/mythcontext.cpp || die
-#	fi
-
-#	# Fix bugs 40964 and 42943.
-#	filter-flags -fforce-addr -fPIC -momit-leaf-frame-pointer
-#	is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer"
-}
-
-src_compile() {
-	use unichrome && use nvidia && die "You can not have USE="unichrome" and USE="nvidia" at the same time. Must disable one or the other."
-	local myconf="--prefix=/usr --mandir=/usr/share/man"
-	use oss || myconf="${myconf} --disable-audio-oss"
-	use alsa || myconf="${myconf} --disable-audio-alsa"
-	use arts || myconf="${myconf} --disable-audio-arts"
-	use jack || myconf="${myconf} --disable-audio-jack"
-	use altivec || myconf="${myconf} --disable-altivec"
-	use unichrome && myconf="${myconf} --enable-xvmc"
-	use nvidia && myconf="${myconf} --enable-xvmc"
-	myconf="${myconf}
-		$(use_enable lirc)
-		$(use_enable joystick joystick-menu)
-		$(use_enable dbox2)
-		$(use_enable dvb)
-		$(use_enable dvb dvb-eit)
-		--dvb-path=/usr/include
-		$(use_enable dvd)
-		$(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
-#		cd ${S}
-#		sed -e "s:CCONFIG linux backend:CCONFIG linux:" \
-#			-i 'configure' || die "Removal of mythbackend failed"
-#	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 COPYING 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
-
-	dobin ${FILESDIR}/runmythfe
-
-	ewarn "Want MythFrontend to always? Add the following to your"
-	ewarn "myth user. i.e. My user is mythtv"
-	echo "crontab -e -u mythtv"
-	echo "* * * * * /usr/bin/runmythfe &"
-	ewarn "And you're all set."
-
-	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
-}
-
-pkg_preinst() {
-	enewuser mythtv -1 "-1" -1 ${MYTHTV_GROUPS} || die "Problem adding mythtv user"
-	usermod -G ${MYTHTV_GROUPS} mythtv
-}
-
-pkg_postinst() {
-	einfo "Want MythFrontend to alway run? Run the following:"
-	echo " #crontab -e -u mythtv"
-	einfo "And add the following:"
-	echo "* * * * * /usr/bin/runmythfe &"
-	echo
-	echo
-	einfo "To always have MythBackend running and available run the following:"
-	echo "rc-update add mythbackend default"
-}
-
diff --git a/media-tv/mythtv/mythtv-0.19-r1.ebuild b/media-tv/mythtv/mythtv-0.19_p9163-r1.ebuild
index 4c31c70dac27..0197edc371d9 100644
--- a/media-tv/mythtv/mythtv-0.19-r1.ebuild
+++ b/media-tv/mythtv/mythtv-0.19_p9163-r1.ebuild
@@ -1,18 +1,25 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.19-r1.ebuild,v 1.1 2006/02/22 20:03:02 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.19_p9163-r1.ebuild,v 1.1 2006/03/10 09:26:01 cardoe Exp $
 
 inherit flag-o-matic eutils debug qt3
 
+PATCHREV=9163
+MY_PV="${PV%_*}"
+
 DESCRIPTION="Homebrew PVR project"
 HOMEPAGE="http://www.mythtv.org/"
-SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2
-	http://dev.gentoo.org/~cardoe/files/${P}_8926_9094.patch.bz2"
+SRC_URI="http://www.mythtv.org/mc/${PN}-${MY_PV}.tar.bz2
+	http://dev.gentoo.org/~cardoe/files/${PN}-${MY_PV}-rev${PATCHREV}.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa altivec arts debug dbox2 dvb dvd frontendonly ieee1394 jack joystick lcd lirc mmx nvidia oggvorbis opengl oss unichrome"
+
+IUSE_VIDEO_CARDS="video_cards_i810 video_cards_nvidia video_cards_via"
+
+IUSE="alsa altivec arts backendonly debug dbox2 dvb dvd frontendonly ieee1394 jack joystick lcd
+lirc mmx oggvorbis opengl xvmc ${IUSE_VIDEO_CARDS}"
 
 RDEPEND=">=media-libs/freetype-2.0
 	>=media-sound/lame-3.93.1
@@ -24,32 +31,38 @@ RDEPEND=">=media-libs/freetype-2.0
 		x11-libs/libXxf86vm
 		)
 	virtual/x11 )
+	xvmc? (
+		|| ( x11-libs/libXvMC virtual/x11 )
+		video_cards_nvidia? ( media-video/nvidia-glx )
+		video_cards_via? ( || ( x11-drivers/xf86-video-via virtual/x11 ) )
+		video_cards_i810? ( || ( x11-drivers/xf86-video-i810 virtual/x11 ) )
+	)
 	$(qt_min_version 3.3)
 	dev-db/mysql
 	alsa? ( >=media-libs/alsa-lib-0.9 )
 	arts? ( kde-base/arts )
-	dvd? ( media-libs/libdvdnav )
+	dvd? ( 	media-libs/libdvdnav
+		media-libs/libdts )
 	dvb? ( media-libs/libdvb )
 	jack? ( media-sound/jack-audio-connection-kit )
 	lcd? ( app-misc/lcdproc )
 	lirc? ( app-misc/lirc )
-	nvidia? ( media-video/nvidia-glx
-		|| ( x11-libs/libXvMC virtual/x11 ) )
 	oggvorbis? ( media-libs/libvorbis )
 	opengl? ( virtual/opengl )
 	ieee1394? (	>=sys-libs/libraw1394-1.2.0
-			sys-libs/libavc1394
+			>=sys-libs/libavc1394-0.5.0
 			>=media-libs/libiec61883-1.0.0 )
 	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )
-	!x11-base/xfree
 	!<x11-base/xorg-x11-6.8"
 
 DEPEND="${RDEPEND}
 	|| ( x11-apps/xinit virtual/x11 )"
 
-PDEPEND="~x11-themes/mythtv-themes-${PV}"
+PDEPEND="=x11-themes/mythtv-themes-${MY_PV}*"
 
-MYTHTV_GROUPS="video,audio"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+MYTHTV_GROUPS="video,audio,plugdev,tty"
 
 pkg_setup() {
 
@@ -71,13 +84,31 @@ pkg_setup() {
 		die "xorg-x11 needs XV support"
 	fi
 
-	if use nvidia; then
+	if use xvmc && use video_cards_nvidia; then
 		echo
-		ewarn "You enabled the 'nvidia' USE flag, you must have a GeForce 4 or"
+		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 built_with_use dev-db/mysql utf8; then
+		echo
+		ewarn "Your MySQL installation on this machine most likely won't work"
+		ewarn "because you compiled it with USE=utf8. Either use another mysql"
+		ewarn "server (on another machine) or recompile MySQL without utf8."
+		echo
+	fi
+
+	if has x11-libs/libX11 virtual/x11; then
+		echo
+		eerror "Congratulations. You've unmasked modular X but somehow managed"
+		eerror "to royally screw up its installation. This means you've broke"
+		eerror "dependancy checking for ALL your X based apps. You don't have"
+		eerror "to believe me but don't insist the dependancies for MythTV are"
+		eerror "broken, because it is you that is broken."
+		die "You are broken"
+	fi
+
 	einfo
 	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"
@@ -91,21 +122,17 @@ src_unpack() {
 	cd ${S}
 
 	#Fixes of the bugs found in the 0.19 release
-	#Release rev: 8926
-	#Patch rev: 9094
-	epatch "${WORKDIR}"/${P}_8926_9094.patch
+	epatch "${WORKDIR}"/${PN}-${MY_PV}-rev${PATCHREV}.patch
 }
 
 src_compile() {
-	use unichrome && use nvidia && die "You can not have USE="unichrome" and USE="nvidia" at the same time. Must disable one or the other."
 	local myconf="--prefix=/usr --mandir=/usr/share/man"
 	use oss || myconf="${myconf} --disable-audio-oss"
 	use alsa || myconf="${myconf} --disable-audio-alsa"
 	use arts || myconf="${myconf} --disable-audio-arts"
 	use jack || myconf="${myconf} --disable-audio-jack"
 	use altivec || myconf="${myconf} --disable-altivec"
-	use unichrome && myconf="${myconf} --enable-xvmc"
-	use nvidia && myconf="${myconf} --enable-xvmc"
+	use xvmc && myconf="${myconf} --enable-xvmc"
 	myconf="${myconf}
 		$(use_enable lirc)
 		$(use_enable joystick joystick-menu)
@@ -156,12 +183,25 @@ src_compile() {
 	hasq distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
 	hasq ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
 
-#	if use frontendonly; then
-#		##Backend Removal
-#		cd ${S}
-#		sed -e "s:CCONFIG linux backend:CCONFIG linux:" \
-#			-i 'configure' || die "Removal of mythbackend failed"
-#	fi
+	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=""
@@ -192,14 +232,15 @@ src_install() {
 		newconfd ${FILESDIR}/mythbackend-0.18.2.conf mythbackend
 	fi
 
-	dobin ${FILESDIR}/runmythfe
-
-	ewarn "Want MythFrontend to always? Add the following to your"
-	ewarn "myth user. i.e. My user is mythtv"
-	echo "crontab -e -u mythtv"
-	echo "* * * * * /usr/bin/runmythfe &"
-	ewarn "And you're all set."
+	if ! use backendonly; then
+		dobin ${FILESDIR}/runmythfe
 
+		ewarn "Want MythFrontend to always? Add the following to your"
+		ewarn "myth user. i.e. My user is mythtv"
+		echo "crontab -e -u mythtv"
+		echo "* * * * * /usr/bin/runmythfe &"
+		ewarn "And you're all set."
+	fi
 	dodoc keys.txt docs/*.{txt,pdf}
 	dohtml docs/*.html
 
@@ -207,6 +248,9 @@ src_install() {
 	chown -R mythtv "${D}"/etc/mythtv
 	keepdir /var/log/mythtv
 	chown -R mythtv "${D}"/var/log/mythtv
+
+	insinto /usr/share/mythtv/contrib
+	doins contrib/*
 }
 
 pkg_preinst() {
@@ -223,5 +267,8 @@ pkg_postinst() {
 	echo
 	einfo "To always have MythBackend running and available run the following:"
 	echo "rc-update add mythbackend default"
+	echo
+	ewarn "Your recordings folder must be owned by the user 'mythtv' now"
+	echo "chown -R mythtv /path/to/store"
 }