Added final fixes.

3 files changed, 8 insertions, 80 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 1dd7aa3e5f92..44db0cec89e0 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,12 +1,12 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.32 2004/09/10 16:00:39 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.33 2004/09/10 16:54:12 aliz Exp $
 
 *mythtv-0.16 (10 Sep 2004)
 
   10 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> mythtv-0.16.ebuild:
   Version bump. I've re-done some of the ebuild layout and added a myth
-  eclass to save some code. Hardmasked until all myth packages are synched.
+  eclass to save some code.
 
   14 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> mythtv-0.15.1-r1.ebuild:
   Added debug support and missing use flags to IUSE.
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 2f554d5b38da..559ce2e9db4f 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,9 +1,9 @@
 MD5 3d9bee3ecb9fb56ee0662360121d9792 mythtv-0.15.1.ebuild 6637
 MD5 bb8f641b460d061161d9982b0464b9dc mythtv-0.13-r1.ebuild 4519
-MD5 c5f4238f17018f1eb9a15f03198b15ca mythtv-0.16.ebuild 7720
+MD5 32e1d254ec7fd31bbb7e0d9f0130cf0c mythtv-0.16.ebuild 5516
 MD5 ed986a83ce07ad7d884bc14715a48b8b mythtv-0.15.1-r1.ebuild 7656
 MD5 069bb2ed03255dd27030c717e89ff508 mythtv-0.14-r1.ebuild 5581
-MD5 6a81396b31d205f32fe0977f0bb78471 ChangeLog 6769
+MD5 5430e70764d291099f02e583c9e2994a ChangeLog 6721
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
 MD5 75594236f281302bcb8f60629e0da65b files/tvformat.fix.0.13.diff 407
 MD5 788cdcff1808794391bf5ef2e157b5fb files/digest-mythtv-0.15.1 67
diff --git a/media-tv/mythtv/mythtv-0.16.ebuild b/media-tv/mythtv/mythtv-0.16.ebuild
index 7af2cbe59c3c..b1857be15770 100644
--- a/media-tv/mythtv/mythtv-0.16.ebuild
+++ b/media-tv/mythtv/mythtv-0.16.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.16.ebuild,v 1.1 2004/09/10 16:00:39 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.16.ebuild,v 1.2 2004/09/10 16:54:12 aliz Exp $
 
-inherit myth flag-o-matic
+inherit myth flag-o-matic eutils
 
 DESCRIPTION="Homebrew PVR project"
 HOMEPAGE="http://www.mythtv.org/"
@@ -143,58 +143,15 @@ setup_pro() {
 		-i 'settings.pro' || die "enable xrandr sed failed"
 }
 
-src_unpack() {
-	myth_src_unpack
-
-	# enable exceptions if they are disabled (qt-e).
-	# this might not work.. if so, rebuild qt-e with rtti and exceptions
-#	sed -i -e "s:-fno-exceptions:-fexceptions:g" programs/mythfilldatabase/Makefile
-}
-	
-
-#src_unpack() {
-#	unpack ${A} && cd ${S}
-#
-#	for i in `grep -lr "usr/local" "${S}"` ; do
-#		sed -e "s:usr/local:usr:g" -i "${i}" || die "sed failed"
-#	done
-#
-#	use directfb && epatch ${FILESDIR}/mythtv-0.15-directfb.patch
-#
-#	# Applies patch for gcc-3.4.0 closing bug #52819
-#	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
-#		epatch ${FILESDIR}/gcc-3.4-fix.patch
-#	fi
-#}
-
 src_compile() {
+	export QMAKESPEC="linux-g++"
+
 	econf || die
 	sed -i -e "s:OPTFLAGS=.*:OPTFLAGS=${CFLAGS}:g" config.mak
 
 	qmake -o "Makefile" "${PN}.pro"
 	make || die
 }
-	
-
-33src_compile() {
-
-	if [ "${ARCH}" == "amd64" ]; then
-		sed -e "s:-march=pentiumpro::" -e "/DEFINES += MMX/d" -i settings.pro
-	else
-		local cpu="`get-flag march || get-flag mcpu`"
-		if [ "${cpu}" ] ; then
-			sed -e "s:pentiumpro:${cpu}:g" -i "settings.pro" || die "sed failed"
-		fi
-	fi
-
-
-	sed -i -e "s:-O3::g" -e "s:-fomit-frame-pointer::g" settings.pro
-
-	qmake -o "Makefile" "${PN}.pro"
-
-	econf || die "econf failed"
-	emake -j1 || die "compile problem"
-}
 
 src_install() {
 	myth_src_install
@@ -220,32 +177,3 @@ src_install() {
 
 	keepdir /var/{log,run}/mythtv
 }
-
-55pkg_postinst() {
-	ewarn "Please note that /usr/share/mythtv/setup has been moved"
-	ewarn "to /usr/bin/mythsetup"
-	echo
-
-	einfo "If this is the first time you install MythTV,"
-	einfo "you need to add /usr/share/mythtv/database/mc.sql"
-	einfo "to your mysql database."
-	einfo
-	einfo "You might run 'mysql < /usr/share/mythtv/database/mc.sql'"
-	einfo
-	einfo "Next, you need to run the mythsetup program."
-	einfo "It will ask you some questions about your hardware, and"
-	einfo "then run XMLTV's grabber to configure your channels."
-	einfo
-	einfo "Once you have configured your database, you can run"
-	einfo "/usr/bin/mythfilldatabase to populate the schedule"
-	einfo "or copy /usr/share/mythtv/mythfilldatabase.cron to"
-	einfo "/etc/cron.daily for this to happen automatically."
-	einfo
-	einfo "If you're upgrading from an older version and for more"
-	einfo "setup and usage instructions, please refer to:"
-	einfo "   /usr/share/doc/${PF}/README.gz"
-	einfo "   /usr/share/doc/${PF}/UPGRADING.gz"
-	echo
-	einfo "You need to emerge xmltv manually since it is no longer needed"
-	einfo "if the internal DataDirect implementation is to be used."
-}