Disable DVB for now. Extend CPU detection. Fix potential portage bug in pkg_setup().

3 files changed, 20 insertions, 13 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index d58418199a05..33d67d496a1d 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.8 2003/10/20 02:58:33 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.9 2003/10/28 16:08:38 max Exp $
+
+  28 Oct 2003; Max Kalika <max@gentoo.org> mythtv-0.12.ebuild:
+  Disable DVB for now. Extend CPU detection. Fix potential portage bug in
+  pkg_setup().
 
 *mythtv-0.12 (19 Oct 2003)
 
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 7abdec36a6ce..a87f7585e4fa 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,6 +1,6 @@
-MD5 aa30f6e3797eebda4e7ad9f74798682b mythtv-0.12.ebuild 4427
+MD5 a580ceddbe5794beba1e44706de19a02 mythtv-0.12.ebuild 4493
 MD5 ff7a010a65450c2f3c3aa1d78c9e3dbb mythtv-0.11.ebuild 2778
-MD5 816f0de7930383744dd858db142a1228 ChangeLog 3468
+MD5 f0010c62bda7910bf540253e99a5d8b4 ChangeLog 3621
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
 MD5 152e8592b5f35fa068bfe1c4093e03d2 mythtv-0.10.ebuild 2841
 MD5 ce8c4dae21199ea11abd156b16cc3b8a files/mythbackend.conf 867
diff --git a/media-tv/mythtv/mythtv-0.12.ebuild b/media-tv/mythtv/mythtv-0.12.ebuild
index ab164bb5e287..326f58bac2e2 100644
--- a/media-tv/mythtv/mythtv-0.12.ebuild
+++ b/media-tv/mythtv/mythtv-0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.12.ebuild,v 1.2 2003/10/20 03:04:16 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.12.ebuild,v 1.3 2003/10/28 16:08:38 max Exp $
 
 inherit flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
-IUSE="alsa dvb lcd lirc nvidia"
+IUSE="alsa lcd lirc nvidia"
 
 DEPEND="virtual/x11
 	>=x11-libs/qt-3.1
@@ -20,10 +20,10 @@ DEPEND="virtual/x11
 	>=media-tv/xmltv-0.5.16
 	>=sys-apps/sed-4
 	alsa? ( media-libs/alsa-lib )
-	dvb? ( media-libs/libdvb )
 	lcd? ( app-misc/lcdproc )
 	lirc? ( app-misc/lirc )
 	nvidia? ( media-video/nvidia-glx )"
+	#dvb? ( media-libs/libdvb )
 
 RDEPEND="${DEPEND}
 	!media-tv/mythfrontend"
@@ -35,6 +35,8 @@ pkg_setup() {
 		eerror "'mysql' to your USE flags, and re-emerge Qt."
 		die "Qt needs mysql support"
 	fi
+
+	return 0
 }
 
 src_unpack() {
@@ -46,7 +48,7 @@ src_unpack() {
 }
 
 src_compile() {
-	local cpu="`get-flag march`"
+	local cpu="`get-flag march || get-flag mcpu`"
 	if [ "${cpu}" ] ; then
 		sed -e "s:pentiumpro:${cpu}:g" -i "settings.pro" || die "sed failed"
 	fi
@@ -56,12 +58,13 @@ src_compile() {
 			-e "s:#EXTRA_LIBS += -lasound:EXTRA_LIBS += -lasound:" \
 			-i "settings.pro" || die "enable alsa 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:" \
-			-i "settings.pro" || die "enable dvb sed failed"
-	fi
+	# Not quite ready for prime time.
+	#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:" \
+	#		-i "settings.pro" || die "enable dvb sed failed"
+	#fi
 	if [ "`use lcd`" ] ; then
 		sed -e "s:#DEFINES += LCD_DEVICE:DEFINES += LCD_DEVICE:" \
 			-i "settings.pro" || die "enable lcd sed failed"