upstream merged --as-needed fixes from ticket #2402 for 0.20.2. new trunk (0.21) revision.

Package-Manager: portage-2.1.4

6 files changed, 375 insertions, 18 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 85352bf8c0b9..61a1806926be 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,14 @@
 # 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.205 2008/01/22 20:51:16 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.206 2008/01/24 15:58:11 cardoe Exp $
+
+*mythtv-0.21_pre15567 (24 Jan 2008)
+*mythtv-0.20.2_p15477 (24 Jan 2008)
+
+  24 Jan 2008; Doug Klima <cardoe@gentoo.org> +mythtv-0.20.2_p15477.ebuild,
+  -mythtv-0.21_pre15362.ebuild, +mythtv-0.21_pre15567.ebuild:
+  upstream merged --as-needed fixes from ticket #2402 for 0.20.2. new trunk
+  (0.21) revision.
 
   22 Jan 2008; Doug Klima <cardoe@gentoo.org> mythtv-0.20.2_p15332.ebuild,
   mythtv-0.21_pre15447.ebuild:
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 52006bed438e..545673d59b9a 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -53,18 +53,22 @@ EBUILD mythtv-0.20.2_p15332.ebuild 10231 RMD160 4bc4ddfd959ec400d8f6df33529e328b
 MD5 3bd6193c4ba9822762ebc0a79a9b91ad mythtv-0.20.2_p15332.ebuild 10231
 RMD160 4bc4ddfd959ec400d8f6df33529e328b1d457b4d mythtv-0.20.2_p15332.ebuild 10231
 SHA256 b3e4b5689e3b2c475fcd51eaa6768324c195abd195baa095696d37f27e73b25b mythtv-0.20.2_p15332.ebuild 10231
-EBUILD mythtv-0.21_pre15362.ebuild 9312 RMD160 2dd7f04482aafccf7528d3e5cbcd889a40eb5c3d SHA1 816342e5b5ccda6047a516db4d18ed2be741f7a5 SHA256 5516987df9365a9a43f0a3f342f969adc28e4913893899f94a70743f9bd45d62
-MD5 24c4ee54407f49e41795622dffcd771b mythtv-0.21_pre15362.ebuild 9312
-RMD160 2dd7f04482aafccf7528d3e5cbcd889a40eb5c3d mythtv-0.21_pre15362.ebuild 9312
-SHA256 5516987df9365a9a43f0a3f342f969adc28e4913893899f94a70743f9bd45d62 mythtv-0.21_pre15362.ebuild 9312
+EBUILD mythtv-0.20.2_p15477.ebuild 10091 RMD160 7315ba9b2ed4585f5d1f038edfb535c9cd6737dd SHA1 a64898b2aa949a36bb48fc107bbad70223930b83 SHA256 a2129c1ac54872fa93e8bbc7143b1d6a3f85a11881402a1ab8e35b8d6ba11b7f
+MD5 41ffd914a176ce30acd9117e8817d0de mythtv-0.20.2_p15477.ebuild 10091
+RMD160 7315ba9b2ed4585f5d1f038edfb535c9cd6737dd mythtv-0.20.2_p15477.ebuild 10091
+SHA256 a2129c1ac54872fa93e8bbc7143b1d6a3f85a11881402a1ab8e35b8d6ba11b7f mythtv-0.20.2_p15477.ebuild 10091
 EBUILD mythtv-0.21_pre15447.ebuild 9326 RMD160 79b01b740630eed6520afb7061f5883eaa55be59 SHA1 8f97eff7ac1702a313dd9115e8369f042c00e619 SHA256 ea5b3060b269ef12f17f0fba1c772a1b06d48a93c40164ee58383bd81d7b32a4
 MD5 2367c6b3a33a19c6c03b252b9b536f9f mythtv-0.21_pre15447.ebuild 9326
 RMD160 79b01b740630eed6520afb7061f5883eaa55be59 mythtv-0.21_pre15447.ebuild 9326
 SHA256 ea5b3060b269ef12f17f0fba1c772a1b06d48a93c40164ee58383bd81d7b32a4 mythtv-0.21_pre15447.ebuild 9326
-MISC ChangeLog 38743 RMD160 95dcf43b9717c021675ffabf6c7977d8f1fb79f0 SHA1 64a8ae7444c72b6cb15dfcbf0a363f2e16febe0a SHA256 54a532bd9a45c3983ae7d120b73d4d52bf24d21bb170dc2ebc556d82055e80a0
-MD5 77d8a1e95c8152bf630e8db77e42a320 ChangeLog 38743
-RMD160 95dcf43b9717c021675ffabf6c7977d8f1fb79f0 ChangeLog 38743
-SHA256 54a532bd9a45c3983ae7d120b73d4d52bf24d21bb170dc2ebc556d82055e80a0 ChangeLog 38743
+EBUILD mythtv-0.21_pre15567.ebuild 9326 RMD160 dcd15343fb195b7d6d9e852257926c44b8aab324 SHA1 2e0494c7940a2a1e223cbe380bb2b1103b0a109c SHA256 004a65bcc499bda973cbcf5ce3315cb771858560df94f4445848713e3e3bfa67
+MD5 13592529dbb0213c5be0de415c3d2785 mythtv-0.21_pre15567.ebuild 9326
+RMD160 dcd15343fb195b7d6d9e852257926c44b8aab324 mythtv-0.21_pre15567.ebuild 9326
+SHA256 004a65bcc499bda973cbcf5ce3315cb771858560df94f4445848713e3e3bfa67 mythtv-0.21_pre15567.ebuild 9326
+MISC ChangeLog 39050 RMD160 eca51db6b92205291f452fca42c3d08983b73704 SHA1 31f8f36f5c6ff0a408630c201892933c77b48360 SHA256 91e72d47e1fd4f0160e76cdc592dfb068484c07f500a196501b391265e97a457
+MD5 7eb80a91b4f37f85425287b78830c055 ChangeLog 39050
+RMD160 eca51db6b92205291f452fca42c3d08983b73704 ChangeLog 39050
+SHA256 91e72d47e1fd4f0160e76cdc592dfb068484c07f500a196501b391265e97a457 ChangeLog 39050
 MISC metadata.xml 4714 RMD160 c65d058e83e36342d6a49b63a6e9609e11242b66 SHA1 0de80f93ca1adfede5783d30a45953ec4cd27c9b SHA256 7501a841c218dd17bee56aeefcfc60194241b3a5468898850c5bedf5dafd28e5
 MD5 3aedf4ecaf5e1e93b8ec46fab7d6d950 metadata.xml 4714
 RMD160 c65d058e83e36342d6a49b63a6e9609e11242b66 metadata.xml 4714
@@ -78,16 +82,19 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.20.2_p15332 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.20.2_p15332 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.20.2_p15332 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.21_pre15362 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.21_pre15362 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.21_pre15362 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.20.2_p15477 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.20.2_p15477 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.20.2_p15477 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.21_pre15447 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.21_pre15447 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.21_pre15447 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.21_pre15567 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.21_pre15567 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.21_pre15567 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHlldcoeSe8B0zEfwRAlnAAJ9PRiL7nBIZoVo9WP+vXiJnkyHXdgCfW+xt
-L7a2Lepb1GvVclme95SjLOs=
-=SDIh
+iD8DBQFHmLWwoeSe8B0zEfwRAlGnAJsGfCjOciWwQe3NX5Euggnk2OGKngCdGZBO
+QXJDk2RtWjz/PyoYMEZu1ns=
+=lBXQ
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/files/digest-mythtv-0.21_pre15362 b/media-tv/mythtv/files/digest-mythtv-0.20.2_p15477
index e69de29bb2d1..e69de29bb2d1 100644
--- a/media-tv/mythtv/files/digest-mythtv-0.21_pre15362
+++ b/media-tv/mythtv/files/digest-mythtv-0.20.2_p15477
diff --git a/media-tv/mythtv/files/digest-mythtv-0.21_pre15567 b/media-tv/mythtv/files/digest-mythtv-0.21_pre15567
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/media-tv/mythtv/files/digest-mythtv-0.21_pre15567
diff --git a/media-tv/mythtv/mythtv-0.20.2_p15477.ebuild b/media-tv/mythtv/mythtv-0.20.2_p15477.ebuild
new file mode 100644
index 000000000000..a98d1ade7314
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.20.2_p15477.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.20.2_p15477.ebuild,v 1.1 2008/01/24 15:58:11 cardoe Exp $
+
+inherit mythtv flag-o-matic multilib eutils qt3 subversion toolchain-funcs
+
+DESCRIPTION="Homebrew PVR project"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE_VIDEO_CARDS="video_cards_i810 video_cards_nvidia video_cards_via"
+
+IUSE="alsa altivec autostart backendonly crciprec dbox2 debug directv dts dvb dvd freebox frontendonly hdhomerun ieee1394 ivtv jack joystick lcd lirc mmx vorbis opengl perl xvmc ${IUSE_VIDEO_CARDS}"
+
+RDEPEND=">=media-libs/freetype-2.0
+	>=media-sound/lame-3.93.1
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXv
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+	xvmc? (
+		x11-libs/libXvMC
+		video_cards_nvidia? ( x11-drivers/nvidia-drivers )
+		video_cards_via? ( x11-drivers/xf86-video-via )
+		video_cards_i810? ( x11-drivers/xf86-video-i810 )
+	)
+	$(qt_min_version 3.3)
+	virtual/mysql
+	virtual/opengl
+	virtual/glu
+	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	dts? ( || ( media-libs/libdca media-libs/libdts ) )
+	dvd? ( 	media-libs/libdvdnav )
+	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
+	directv? ( virtual/perl-Time-HiRes )
+	ivtv? ( media-tv/ivtv )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lcd? ( app-misc/lcdproc )
+	lirc? ( app-misc/lirc )
+	perl? ( dev-perl/DBD-mysql )
+	vorbis? ( media-libs/libvorbis )
+	ieee1394? (	>=sys-libs/libraw1394-1.2.0
+			>=sys-libs/libavc1394-0.5.0
+			>=media-libs/libiec61883-1.0.0 )
+	autostart? ( net-dialup/mingetty
+				x11-wm/evilwm
+				x11-apps/xset )"
+
+DEPEND="${RDEPEND}
+	x11-proto/xineramaproto
+	x11-proto/xf86vidmodeproto
+	x11-apps/xinit"
+
+PDEPEND="=x11-themes/mythtv-themes-${MY_PV}*"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+MYTHTV_GROUPS="video,audio,tty,uucp"
+
+pkg_setup() {
+
+	local rip=0
+	if ! built_with_use -a =x11-libs/qt-3* mysql opengl ; then
+		echo
+		eerror "MythTV requires Qt to be built with mysql and opengl use flags enabled."
+		eerror "Please re-emerge =x11-libs/qt-3*, after having the use flags set."
+		echo
+		rip=1
+	fi
+
+	if use xvmc && use video_cards_nvidia; then
+		echo
+		ewarn "You enabled the 'xvmc' USE flag, you must have a GeForce 4 or"
+		ewarn "greater to use this. Otherwise, you'll have crashes with MythTV"
+		echo
+	fi
+
+	if use xvmc && ! ( use video_cards_i810 || use video_cards_nvidia || use video_cards_via ); then
+		echo
+		eerror "You enabled the XvMC USE flag but did not configure VIDEO_CARDS with either"
+		eerror "an nVidia, Intel i810, or VIA video card."
+		echo
+		rip=1
+	fi
+
+	if use autostart && use backendonly; then
+		echo
+		eerror "You can't have USE=autostart while having USE=backendonly."
+		eerror "USE=autostart is for mythfrontend"
+		echo
+		rip=1
+	fi
+
+	[[ $rip == 1 ]] && die "Please fix the above issues, before continuing."
+
+	echo
+	einfo "This ebuild now uses a heavily stripped down version of your CFLAGS"
+	einfo "Don't complain because your -momfg-fast-speed CFLAG is being stripped"
+	einfo "Only additional CFLAG issues that will be addressed are for binary"
+	einfo "package building."
+	echo
+}
+
+src_unpack() {
+	subversion_src_unpack
+
+	# 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"
+
+	eqmake3 -o "Makefile" mythtv.pro || die "qmake failed"
+	emake || die "emake failed"
+
+	# firewire support should build the tester
+	if use ieee1394; then
+		cd contrib
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../firewire_tester firewire_tester.c \
+			${LDFLAGS} -liec61883 -lraw1394 || \
+			die "failed to compile firewire_tester"
+
+		cd channel_changers
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -std=gnu99 -o ../../6200ch 6200ch.c \
+			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
+			die "failed to compile 6200ch"
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../sa3250ch sa3250ch.c \
+			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
+			die "failed to compile sa3250ch"
+#		LDLIBS="-liec61883 -lraw1394" CC=$(tc-getCC) emake firewire_tester || \
+#			die	"failed to compile firewire_tester"
+	fi
+
+	cd "${S}"/contrib/channel_changers
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../red_eye red_eye.c ${LDFLAGS} || \
+		die "failed to compile red_eye"
+}
+
+src_install() {
+
+	einstall INSTALL_ROOT="${D}" || die "install failed"
+	for doc in AUTHORS FAQ UPGRADING ChangeLog README; do
+		test -e "${doc}" && dodoc ${doc}
+	done
+
+	if ! use frontendonly; then
+		insinto /usr/share/mythtv/database
+		doins database/*
+
+		exeinto /usr/share/mythtv
+		doexe "${FILESDIR}"/mythfilldatabase.cron
+
+		newinitd "${FILESDIR}"/mythbackend-0.18.2.rc mythbackend
+		newconfd "${FILESDIR}"/mythbackend-0.18.2.conf mythbackend
+	fi
+
+	dodoc keys.txt docs/*.{txt,pdf}
+	dohtml docs/*.html
+
+	keepdir /etc/mythtv
+	chown -R mythtv "${D}"/etc/mythtv
+	keepdir /var/log/mythtv
+	chown -R mythtv "${D}"/var/log/mythtv
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/mythtv.logrotate.d mythtv
+
+	insinto /usr/share/mythtv/contrib
+	doins -r contrib/*
+
+	insinto /usr/share/mythtv/configfiles
+	doins configfiles/*
+
+	if ! use backendonly; then
+		dobin "${FILESDIR}"/runmythfe
+
+		if use autostart; then
+			dodir /etc/env.d/
+			echo 'CONFIG_PROTECT="/home/mythtv/"' > "${D}"/etc/env.d/95mythtv
+
+			insinto /home/mythtv
+			newins "${FILESDIR}"/bash_profile .bash_profile
+			newins "${FILESDIR}"/xinitrc .xinitrc
+		fi
+	fi
+
+	if use ieee1394; then
+		dobin firewire_tester || die "failed to install firewire_tester"
+		dodoc contrib/firewire_tester-README
+
+		dobin 6200ch || die "failed to install 6200ch"
+		dodoc contrib/channel_changers/6200ch-README
+
+		dobin sa3250ch || die "failed to install sa3250ch"
+		dodoc contrib/channel_changers/sa3250ch-README
+	fi
+
+	dobin red_eye || die "failed to install red_eye"
+	dodoc contrib/channel_changers/red_eye-README
+
+	if use directv; then
+		dobin contrib/channel_changers/d10control.pl || die "failed to install d10control"
+		dodoc contrib/channel_changers/d10control-README
+	fi
+}
+
+pkg_preinst() {
+	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS} || die "Problem adding mythtv user"
+	usermod -a -G ${MYTHTV_GROUPS} mythtv
+
+	export CONFIG_PROTECT="${CONFIG_PROTECT} ${ROOT}/home/mythtv/"
+}
+
+pkg_postinst() {
+	if ! use backendonly; then
+		echo
+		elog "Want mythfrontend to start automatically?"
+		elog "Set USE=autostart. Details can be found at:"
+		elog "http://dev.gentoo.org/~cardoe/mythtv/autostart.html"
+	fi
+
+	if ! use frontendonly; then
+		elog
+		elog "To always have MythBackend running and available run the following:"
+		elog "rc-update add mythbackend default"
+		elog
+		ewarn "Your recordings folder must be owned by the user 'mythtv' now"
+		ewarn "chown -R mythtv /path/to/store"
+	fi
+
+	if use autostart; then
+		elog
+		elog "Please add the following to your /etc/inittab file at the end of"
+		elog "the TERMINALS section"
+		elog "c8:2345:respawn:/sbin/mingetty --autologin mythtv tty8"
+	fi
+
+}
+
+pkg_info() {
+	/usr/bin/mythfrontend --version
+}
+
+pkg_config() {
+	echo "Creating mythtv MySQL user and mythconverg database if it does not"
+	echo "already exist. You will be prompted for your MySQL root password."
+	/usr/bin/mysql -u root -p < /usr/share/mythtv/database/mc.sql
+}
diff --git a/media-tv/mythtv/mythtv-0.21_pre15362.ebuild b/media-tv/mythtv/mythtv-0.21_pre15567.ebuild
index 915100659dd7..cd88d40010eb 100644
--- a/media-tv/mythtv/mythtv-0.21_pre15362.ebuild
+++ b/media-tv/mythtv/mythtv-0.21_pre15567.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_pre15362.ebuild,v 1.1 2008/01/07 20:18:31 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_pre15567.ebuild,v 1.1 2008/01/24 15:58:11 cardoe Exp $
 
 inherit flag-o-matic multilib eutils qt3 mythtv subversion toolchain-funcs
 
@@ -121,10 +121,11 @@ src_compile() {
 	use dbox2 || myconf="${myconf} --disable-dbox2"
 	use hdhomerun || myconf="${myconf} --disable-hdhomerun"
 	use altivec || myconf="${myconf} --disable-altivec"
+	use ivtv || myconf="${myconf} --disable-ivtv"
+	use perl || myconf="${myconf} --without-bindings=perl"
 	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)
@@ -180,7 +181,7 @@ src_compile() {
 	einfo "Running ./configure ${myconf}"
 	./configure ${myconf} || die "configure died"
 
-	${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake -o "Makefile" mythtv.pro || die "qmake failed"
+	eqmake3 -o "Makefile" mythtv.pro || die "qmake failed"
 	emake || die "emake failed"
 
 	# firewire support should build the tester