Version bump for daylight savings time bugfix with qt-3.3.4. Use proper toolchain compiler. Removed ieee1394 support since it requires a package not yet in portage. This closes bugs #81767 and #87947.

Package-Manager: portage-2.0.51.19

6 files changed, 420 insertions, 33 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 6b221ad4e90b..29552fc185ff 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.47 2005/03/26 08:24:50 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.48 2005/04/06 10:07:40 eradicator Exp $
+
+*mythtv-0.17-r1 (06 Apr 2005)
+
+  06 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/mythtv-0.17-qt334-dst-fix.patch, mythtv-0.17.ebuild,
+  +mythtv-0.17-r1.ebuild:
+  Version bump for daylight savings time bugfix with qt-3.3.4. Use proper
+  toolchain compiler. Removed ieee1394 support since it requires a package not
+  yet in portage. This closes bugs #81767 and #87947.
 
   26 Mar 2005; Doug Goldstein <cardoe@gentoo.org> mythtv-0.17.ebuild:
   remove install of depreciated mysql.txt. added msgs for ieee1394 and nvidia
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index efada5115fa3..0b6bf3a78a4d 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,20 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f0f5f9cac2fbd9e0b16799ef3ce884d5 mythtv-0.17.ebuild 7094
-MD5 f5e313e37938a6988e60395716056801 mythtv-0.16.ebuild 5794
+MD5 08f2d5b04990ac5d8fa38709ca416bb4 ChangeLog 9758
 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
-MD5 54c3223aa496562c5d4a87218998ea13 ChangeLog 9370
+MD5 f5e313e37938a6988e60395716056801 mythtv-0.16.ebuild 5794
+MD5 9fca63df1af4a4e5a98fd325bf1db13c mythtv-0.17.ebuild 6887
+MD5 ba24a459f85bc88324dbb6911da78682 mythtv-0.17-r1.ebuild 7330
+MD5 fb4505fe7e8b832e115d777bf836d3bc files/digest-mythtv-0.16 66
+MD5 2623cb1c902bf07fca69b846e7a0915a files/mythbackend.conf 1186
 MD5 5938ea3584383e501674bf67a7f7e2a7 files/mythbackend.rc6 1776
 MD5 b3a4780890d53640604812b8069a8297 files/mythfilldatabase.cron 74
-MD5 2623cb1c902bf07fca69b846e7a0915a files/mythbackend.conf 1186
-MD5 fb4505fe7e8b832e115d777bf836d3bc files/digest-mythtv-0.16 66
-MD5 590c9a6a89442b347c3a5f52d1781351 files/digest-mythtv-0.17 66
 MD5 8d46f5508de5d412db9e4a757db00e26 files/mythtv-0.16-cx88.patch 674
+MD5 590c9a6a89442b347c3a5f52d1781351 files/digest-mythtv-0.17 66
+MD5 bcfd584bc73afea9d88c8afe7d47f5be files/mythtv-0.17-qt334-dst-fix.patch 5663
+MD5 590c9a6a89442b347c3a5f52d1781351 files/digest-mythtv-0.17-r1 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCRR0U5+pdB4IBr0URAoqYAJ96tRyDHNTvdcIiO0wPywjTXq1XvwCfZRGF
-sLphC3Ab+YWaON6NCgFFdF8=
-=59bG
+iD8DBQFCU7VdArHZZzCEUG0RAi5iAJ9n4KECc06iDQPIVEhoFKuoYDtyxgCfQsbS
+WEc2cgWCZoRRxiP1qhLdAmU=
+=e1xQ
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/files/digest-mythtv-0.17-r1 b/media-tv/mythtv/files/digest-mythtv-0.17-r1
new file mode 100644
index 000000000000..b710a001a6eb
--- /dev/null
+++ b/media-tv/mythtv/files/digest-mythtv-0.17-r1
@@ -0,0 +1 @@
+MD5 c996dc690d36e946396fc5cd4b715e3b mythtv-0.17.tar.bz2 16122954
diff --git a/media-tv/mythtv/files/mythtv-0.17-qt334-dst-fix.patch b/media-tv/mythtv/files/mythtv-0.17-qt334-dst-fix.patch
new file mode 100644
index 000000000000..61edeefbcfe8
--- /dev/null
+++ b/media-tv/mythtv/files/mythtv-0.17-qt334-dst-fix.patch
@@ -0,0 +1,169 @@
+diff -BurN libs/libmyth/util.cpp libs/libmyth/util.cpp
+--- libs/libmyth/util.cpp	2005-01-27 15:43:13.000000000 -0800
++++ libs/libmyth/util.cpp	2005-04-04 14:20:31.584196189 -0700
+@@ -741,6 +741,23 @@
+ 
+     return text;
+ }
++int MythSecsTo(const QDateTime &from, const QDateTime &to)
++{
++    return (from.time().secsTo(to.time()) +
++            from.date().daysTo(to.date()) * 60 * 60 * 24);
++}
++ 
++QDateTime MythUTCToLocal(const QDateTime &utc)
++{
++    QDateTime local = QDateTime(QDate(1970, 1, 1));
++
++    int timesecs = MythSecsTo(local, utc);
++    QDateTime localdt;
++    localdt.setTime_t(timesecs);
++
++    return localdt;
++}
++  	
+ 
+ long long stringToLongLong(const QString &str)
+ {
+diff -BurN libs/libmyth/util.h libs/libmyth/util.h
+--- libs/libmyth/util.h	2005-01-23 14:45:30.000000000 -0800
++++ libs/libmyth/util.h	2005-04-04 14:21:32.149926366 -0700
+@@ -3,6 +3,7 @@
+ 
+ #include <qsocket.h>
+ #include <qstringlist.h>
++#include <qdatetime.h>
+ #include <qcolor.h>
+ 
+ #include <time.h>
+@@ -47,6 +48,9 @@
+ 
+ QString cutDownString(QString text, QFont *testFont, int maxwidth);
+ 
++QDateTime MythUTCToLocal(const QDateTime &utc);
++int MythSecsTo(const QDateTime &from, const QDateTime &to);
++
+ long long stringToLongLong(const QString &str);
+ QString longLongToString(long long ll);
+ 
+diff -BurN libs/libmythtv/datadirect.cpp libs/libmythtv/datadirect.cpp
+--- libs/libmythtv/datadirect.cpp	2005-01-27 23:33:46.000000000 -0800
++++ libs/libmythtv/datadirect.cpp	2005-04-04 14:25:45.985077439 -0700
+@@ -1,6 +1,7 @@
+ #include "datadirect.h"
+ #include "../libmyth/mythwidgets.h"
+ #include "../libmyth/mythcontext.h"
++#include "../libmyth/util.h"
+ 
+ #include <qfile.h>
+ #include <qstring.h>
+@@ -68,16 +69,19 @@
+         curr_schedule.stationid = pxmlatts.value("station");
+ 
+         QString timestr = pxmlatts.value("time");
+-        QDateTime basedt = QDateTime(QDate(1970, 1, 1));
++        //QDateTime basedt = QDateTime(QDate(1970, 1, 1));
++	QDateTime UTCdt = QDateTime::fromString(timestr, Qt::ISODate);
++	
++	curr_schedule.time = MythUTCToLocal(UTCdt);
++
++        //QDateTime UTCdt;
++        //QDateTime localdt;
++        //UTCdt = QDateTime::fromString(pxmlatts.value("time"), Qt::ISODate);
+ 
+-        QDateTime UTCdt;
+-        QDateTime localdt;
+-        UTCdt = QDateTime::fromString(pxmlatts.value("time"), Qt::ISODate);
++        //int timesecs = basedt.secsTo(UTCdt);
++        //localdt.setTime_t(timesecs);
+ 
+-        int timesecs = basedt.secsTo(UTCdt);
+-        localdt.setTime_t(timesecs);
+-
+-        curr_schedule.time = localdt;
++        //curr_schedule.time = localdt;
+         QString durstr;
+ 
+         durstr = pxmlatts.value("duration");
+diff -BurN libs/libmythtv/siparser.cpp libs/libmythtv/siparser.cpp
+--- libs/libmythtv/siparser.cpp	2005-02-06 10:15:30.000000000 -0800
++++ libs/libmythtv/siparser.cpp	2005-04-04 14:29:42.170931847 -0700
+@@ -1,4 +1,5 @@
+ #include "../libmyth/mythcontext.h"
++#include "../libmyth/util.h"
+ #include "siparser.h"
+ #include <qdatetime.h>
+ #include <qtextcodec.h>
+@@ -931,17 +932,19 @@
+     QDateTime UTCTime = QDateTime(QDate(year,month,day),QTime(hour,min,sec));
+ 
+     // Convert to localtime
+-    QDateTime EPOCTime = QDateTime(QDate(1970, 1, 1));
+-    int timesecs = EPOCTime.secsTo(UTCTime);
++    return MythUTCToLocal(UTCTime);
+ 
+-    QDateTime LocalTime;
++    //QDateTime EPOCTime = QDateTime(QDate(1970, 1, 1));
++    //int timesecs = EPOCTime.secsTo(UTCTime);
+ 
+-    LocalTime.setTime_t(timesecs);
++    //QDateTime LocalTime;
+ 
+-    QString UTCText = UTCTime.toString();
+-    QString LocalText = LocalTime.toString();
++    //LocalTime.setTime_t(timesecs);
+ 
+-    return LocalTime;
++    //QString UTCText = UTCTime.toString();
++    //QString LocalText = LocalTime.toString();
++
++    //return LocalTime;
+ 
+ }
+ 
+@@ -1994,13 +1997,14 @@
+ //    QDateTime UTCTime = ATSCEPOC.addSecs(offset - (((STTHandler*) Table[STT])->GPSOffset) );
+     QDateTime UTCTime = ATSCEPOC.addSecs(offset - 13 );
+     // Get UTC
+-    QDateTime UTCEPOC = QDateTime(QDate(1970,1,1));
++    return MythUTCToLocal(UTCTime);
++    //QDateTime UTCEPOC = QDateTime(QDate(1970,1,1));
+     // Now sloppily convert it to localtime
+ 
+-    int timesecs = UTCEPOC.secsTo(UTCTime);
+-    QDateTime LocalTime;
+-    LocalTime.setTime_t(timesecs);
+-    return LocalTime;
++    //int timesecs = UTCEPOC.secsTo(UTCTime);
++    //QDateTime LocalTime;
++    //LocalTime.setTime_t(timesecs);
++    //return LocalTime;
+ }
+ 
+ /*
+diff -BurN programs/mythfilldatabase/filldata.cpp programs/mythfilldatabase/filldata.cpp
+--- programs/mythfilldatabase/filldata.cpp	2005-02-09 13:35:13.000000000 -0800
++++ programs/mythfilldatabase/filldata.cpp	2005-04-04 14:31:47.732685624 -0700
+@@ -1013,13 +1013,15 @@
+ 
+     if (!quiet)
+         cout << "Clearing data for source...\n";
+-    QDateTime basedt = QDateTime(QDate(1970, 1, 1));
+-    QDateTime fromlocaldt;
+-    int timesecs = basedt.secsTo(ddprocessor.getActualListingsFrom());
+-    fromlocaldt.setTime_t(timesecs);
+-    QDateTime tolocaldt;
+-    timesecs = basedt.secsTo(ddprocessor.getActualListingsTo());
+-    tolocaldt.setTime_t(timesecs);
++    QDateTime fromlocaldt = MythUTCToLocal(ddprocessor.getActualListingsFrom());
++    QDateTime tolocaldt = MythUTCToLocal(ddprocessor.getActualListingsTo());
++    //QDateTime basedt = QDateTime(QDate(1970, 1, 1));
++    //QDateTime fromlocaldt;
++    //int timesecs = basedt.secsTo(ddprocessor.getActualListingsFrom());
++    //fromlocaldt.setTime_t(timesecs);
++    //QDateTime tolocaldt;
++    //timesecs = basedt.secsTo(ddprocessor.getActualListingsTo());
++    //tolocaldt.setTime_t(timesecs);
+ 
+     if (!quiet)
+         cout << "Clearing from " << fromlocaldt.toString() 
diff --git a/media-tv/mythtv/mythtv-0.17-r1.ebuild b/media-tv/mythtv/mythtv-0.17-r1.ebuild
new file mode 100644
index 000000000000..b6cf01132820
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.17-r1.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.17-r1.ebuild,v 1.1 2005/04/06 10:07:40 eradicator Exp $
+
+inherit myth flag-o-matic eutils toolchain-funcs
+
+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="~x86 ~amd64"
+IUSE="alsa arts dvb lcd lirc nvidia cle266 opengl xv mmx" # ieee1394"
+
+DEPEND=">=media-libs/freetype-2.0
+	>=media-sound/lame-3.93.1
+	>=x11-libs/qt-3.1
+	dev-db/mysql
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	>=sys-apps/sed-4
+	arts? ( kde-base/arts )
+	dvb? ( media-libs/libdvb )
+	lcd? ( app-misc/lcdproc )
+	lirc? ( app-misc/lirc )
+	nvidia? ( media-video/nvidia-glx )
+	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )"
+
+#	ieee1394? ( sys-libs/libraw1394 )
+
+RDEPEND="${DEPEND}
+	!media-tv/mythfrontend"
+
+pkg_setup() {
+
+	local qt_use="$(</var/db/pkg/`best_version x11-libs/qt`/USE)"
+	if ! has mysql ${qt_use} ; 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 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
+
+}
+
+setup_pro() {
+	if [ "${ARCH}" == "amd64" ] || ! use mmx; then
+		sed -e "s:DEFINES += MMX:DEFINES -= MMX:" \
+			-i 'settings.pro' || "Removal of MMX failed"
+	fi
+
+	if ! use xv ; then
+		sed -e 's:CONFIG += using_xv:#CONFIG += using_xv:' \
+			-e 's:EXTRA_LIBS += -L/usr/X11R6/lib:#EXTRA_LIBS += -L/usr/X11R6/lib:' \
+			-i 'settings.pro' || die "disable xv failed"
+	fi
+
+	if use lcd ; then
+		sed -e 's:#DEFINES += LCD_DEVICE:DEFINES += LCD_DEVICE:' \
+			-i 'settings.pro' || die "enable lcd sed failed"
+	fi
+
+	if use alsa ; then
+		sed -e 's:#CONFIG += using_alsa:CONFIG += using_alsa:' \
+			-e 's:#ALSA_LIBS = -lasound:ALSA_LIBS = -lasound:' \
+			-i 'settings.pro' || die "enable alsa sed failed"
+	fi
+
+	if use arts ; then
+		sed -e 's:artsc/artsc.h:artsc.h:' \
+			-i "libs/libmyth/audiooutputarts.h" || die "sed failed"
+		sed -e 's:#CONFIG += using_arts:CONFIG += using_arts:' \
+			-e 's:#ARTS_LIBS = .*:ARTS_LIBS = `artsc-config --libs`:' \
+			-e 's:#EXTRA_LIBS += -L/opt/.*:EXTRA_LIBS += `artsc-config --libs`:' \
+			-e 's:#INCLUDEPATH += /opt/.*:QMAKE_CXXFLAGS += `artsc-config --cflags`:' \
+			-i 'settings.pro' || die "enable arts sed failed"
+	fi
+
+	if use dvb ; then
+		sed -e 's:#CONFIG += using_dvb:CONFIG += using_dvb:' \
+			-e 's:#DEFINES += USING_DVB:DEFINES += USING_DVB:' \
+			-e 's:#INCLUDEPATH += /usr/src/.*:INCLUDEPATH += /usr/include/linux/dvb:' \
+			-i 'settings.pro' || die "enable dvb sed failed"
+	fi
+
+	if use lirc ; then
+		sed -e 's:#CONFIG += using_lirc:CONFIG += using_lirc:' \
+			-e 's:#LIRC_LIBS = -llirc_client:LIRC_LIBS = -llirc_client:' \
+			-i 'settings.pro' || die "enable lirc sed failed"
+	fi
+
+	if use nvidia ; then
+		sed -e 's:#CONFIG += using_xvmc:CONFIG += using_xvmc:' \
+			-e 's:#DEFINES += USING_XVMC:DEFINES += USING_XVMC:' \
+			-e 's:#EXTRA_LIBS += -lXvMCNVIDIA:EXTRA_LIBS += -lXvMCNVIDIA:' \
+			-i 'settings.pro' || die "enable nvidia xvmc sed failed"
+	fi
+
+	if use nvidia && use cle266; then
+		die "You can not have USE="cle266" and USE="nvidia" at the same time. Must disable one or the other."
+	fi
+
+	if use cle266 ; then
+		sed -e 's:#CONFIG += using_xvmc using_xvmc_vld:CONFIG += using_xvmc using_xvmc_vld:' \
+			-e 's:#DEFINES += USING_XVMC USING_XVMC_VLD:DEFINES += USING_XVMC USING_XVMC_VLD:' \
+			-e 's:#EXTRA_LIBS += -lviaXvMC -lXvMC:EXTRA_LIBS += -lviaXvMC -lXvMC:' \
+			-i 'settings.pro' || die "enable cle266 sed failed"
+	fi
+
+	if ! use cle266 ; then # needed because nvidia and cle266 are not compatible
+		sed -e 's:CONFIG += using_xvmc using_xvmc_vld:#CONFIG += using_xvmc using_xvmc_vld:' \
+			-e 's:DEFINES += USING_XVMC USING_XVMC_VLD:#DEFINES += USING_XVMC USING_XVMC_VLD:' \
+			-e 's:EXTRA_LIBS += -lviaXvMC -lXvMC:#EXTRA_LIBS += -lviaXvMC -lXvMC:' \
+			-i 'settings.pro' || die "disable VLD XvMC sed failed"
+	fi
+
+#	if use ieee1394 ; then
+#		sed -e 's:#CONFIG += using_firewire:CONFIG += using_firewire:' \
+#			-e 's:#DEFINES += USING_FIREWIRE:DEFINES += USING_FIREWIRE:' \
+#			-e 's:#EXTRA_LIBS += -lraw1394 -liec61883:EXTRA_LIBS += -lraw1394 -liec61883:' \
+#			-i 'settings.pro' || die "failed to enable firewire support"
+#	fi
+
+	if use opengl ; then
+		sed -e 's:#DEFINES += USING_OPENGL_VSYNC:DEFINES += USING_OPENGL_VSYNC:' \
+			-e 's:#EXTRA_LIBS += -lGL:EXTRA_LIBS += -lGL:' \
+			-e 's:#CONFIG += using_opengl:CONFIG += using_opengl:' \
+			-i 'settings.pro' || die "enable opengl sed failed"
+	fi
+
+	#Gentoo X ebuilds always have XrandrX
+	sed -e 's:#CONFIG += using_xrandr:CONFIG += using_xrandr:' \
+		-e 's:#DEFINES += USING_XRANDR:DEFINES += USING_XRANDR:' \
+		-i 'settings.pro' || die "enable xrandr sed failed"
+}
+
+src_unpack() {
+
+	if use cle266; then
+		ewarn "If you have a VIA ITX board with XvMC VLD on it... you need to pull the sources for this stuff yourself"
+		ewarn "and install it yourself before continuing. It is currently not packaged up and requires drm patches to Xorg"
+		ewarn "these patches are not in the xorg-x11. http://bugs.gentoo.org/show_bug.cgi?id=82125"
+		sleep 5
+	fi
+
+#	if use ieee1394; then
+#		ewarn "The required libraries to use firewire support are only available via Subversion. They are not stable enough to"
+#		ewarn "be packaged up in Portage. This is only here as a courtesy for users that use it and have installed the libraries"
+#		ewarn "themselves manually. http://bugs.gentoo.org/show_bug.cgi?id=81767"
+#		sleep 5
+#	fi
+
+	# Fix bugs 40964 and 42943.
+	filter-flags -fforce-addr -fPIC
+
+	# fix bug 67832, 81610, etc
+	is-flag "-march=pentium4" && replace-flags "-O3" "-O2"
+	is-flag "-march=pentium4" && replace-flags "-0s" "-O2"
+	is-flag "-march=athlon-xp" && replace-flags "-O3" "-O2"
+
+	myth_src_unpack || die "unpack failed"
+
+	cd ${S}
+	# Fix bug with daylight savings time
+	epatch ${FILESDIR}/mythtv-0.17-qt334-dst-fix.patch
+}
+
+src_compile() {
+	export QMAKESPEC="linux-g++"
+
+	econf || die
+	sed -i -e "s:OPTFLAGS=.*:OPTFLAGS=${CFLAGS}:g" config.mak
+
+	qmake -o "Makefile" "${PN}.pro"
+	make qmake || die
+	emake -C libs/libavcodec CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
+	emake -C libs/libavformat CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
+	emake -C libs/libmythsamplerate CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
+	emake -C libs/libmythsoundtouch CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
+	emake -C libs/libmythmpeg2 CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
+	emake -C libs/libmyth CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
+	emake -C libs/libmythtv CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
+	emake -C libs CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
+}
+
+src_install() {
+	myth_src_install || die "install failed"
+	newbin "setup/setup" "mythsetup"
+
+	insinto /usr/share/mythtv/database
+	doins database/*
+
+	exeinto /usr/share/mythtv
+	doexe "${FILESDIR}/mythfilldatabase.cron"
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/mythbackend.rc6" mythbackend
+	insinto /etc/conf.d
+	newins "${FILESDIR}/mythbackend.conf" mythbackend
+
+	dodoc keys.txt docs/*.{txt,pdf}
+	dohtml docs/*.html
+
+	keepdir /var/{log,run}/mythtv
+}
diff --git a/media-tv/mythtv/mythtv-0.17.ebuild b/media-tv/mythtv/mythtv-0.17.ebuild
index 44339b0d38dc..703553c2b9f2 100644
--- a/media-tv/mythtv/mythtv-0.17.ebuild
+++ b/media-tv/mythtv/mythtv-0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.17.ebuild,v 1.6 2005/03/26 08:24:50 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.17.ebuild,v 1.7 2005/04/06 10:07:40 eradicator Exp $
 
 inherit myth flag-o-matic eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="alsa arts dvb lcd lirc nvidia cle266 opengl xv mmx ieee1394"
+IUSE="alsa arts dvb lcd lirc nvidia cle266 opengl xv mmx" # ieee1394"
 
 DEPEND=">=media-libs/freetype-2.0
 	>=media-sound/lame-3.93.1
@@ -24,9 +24,10 @@ DEPEND=">=media-libs/freetype-2.0
 	lcd? ( app-misc/lcdproc )
 	lirc? ( app-misc/lirc )
 	nvidia? ( media-video/nvidia-glx )
-	ieee1394? ( sys-libs/libraw1394 )
 	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )"
 
+#	ieee1394? ( sys-libs/libraw1394 )
+
 RDEPEND="${DEPEND}
 	!media-tv/mythfrontend"
 
@@ -39,14 +40,6 @@ pkg_setup() {
 		die "Qt needs MySQL support"
 	fi
 
-	if use ieee1394; then
-		echo
-		ewarn "If you want to USE ieee1394, you need to install libiec61883"
-		ewarn "which is not available in Portage at this time. Do this at your"
-		ewarn "own risk. No Support provided."
-		echo
-	fi
-
 	if use nvidia; then
 		echo
 		ewarn "You enabled the 'nvidia' USE flag, you must have a GeForce 4 or"
@@ -127,12 +120,12 @@ setup_pro() {
 			-i 'settings.pro' || die "disable VLD XvMC sed failed"
 	fi
 
-	if use ieee1394 ; then
-		sed -e 's:#CONFIG += using_firewire:CONFIG += using_firewire:' \
-			-e 's:#DEFINES += USING_FIREWIRE:DEFINES += USING_FIREWIRE:' \
-			-e 's:#EXTRA_LIBS += -lraw1394 -liec61883:EXTRA_LIBS += -lraw1394 -liec61883:' \
-			-i 'settings.pro' || die "failed to enable firewire support"
-	fi
+#	if use ieee1394 ; then
+#		sed -e 's:#CONFIG += using_firewire:CONFIG += using_firewire:' \
+#			-e 's:#DEFINES += USING_FIREWIRE:DEFINES += USING_FIREWIRE:' \
+#			-e 's:#EXTRA_LIBS += -lraw1394 -liec61883:EXTRA_LIBS += -lraw1394 -liec61883:' \
+#			-i 'settings.pro' || die "failed to enable firewire support"
+#	fi
 
 	if use opengl ; then
 		sed -e 's:#DEFINES += USING_OPENGL_VSYNC:DEFINES += USING_OPENGL_VSYNC:' \
@@ -156,12 +149,12 @@ src_unpack() {
 		sleep 5
 	fi
 
-	if use ieee1394; then
-		ewarn "The required libraries to use firewire support are only available via Subversion. They are not stable enough to"
-		ewarn "be packaged up in Portage. This is only here as a courtesy for users that use it and have installed the libraries"
-		ewarn "themselves manually. http://bugs.gentoo.org/show_bug.cgi?id=81767"
-		sleep 5
-	fi
+#	if use ieee1394; then
+#		ewarn "The required libraries to use firewire support are only available via Subversion. They are not stable enough to"
+#		ewarn "be packaged up in Portage. This is only here as a courtesy for users that use it and have installed the libraries"
+#		ewarn "themselves manually. http://bugs.gentoo.org/show_bug.cgi?id=81767"
+#		sleep 5
+#	fi
 
 	# Fix bugs 40964 and 42943.
 	filter-flags -fforce-addr -fPIC