Version bump and cleanup.

7 files changed, 150 insertions, 230 deletions

diff --git a/media-tv/mythfrontend/ChangeLog b/media-tv/mythfrontend/ChangeLog
index d3c83f048fbe..625067ee77a1 100644
--- a/media-tv/mythfrontend/ChangeLog
+++ b/media-tv/mythfrontend/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/mythfrontend
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythfrontend/ChangeLog,v 1.14 2004/04/26 18:36:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythfrontend/ChangeLog,v 1.15 2004/06/01 17:25:48 aliz Exp $
+
+*mythfrontend-0.15.1 (01 Jun 2004)
+
+  01 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> mythfrontend-0.10.ebuild,
+  mythfrontend-0.11.ebuild, mythfrontend-0.12.ebuild,
+  mythfrontend-0.15.1.ebuild:
+  Version bump and cleanups.
 
   26 Apr 2004; Aron Griffis <agriffis@gentoo.org> mythfrontend-0.10.ebuild,
   mythfrontend-0.11.ebuild, mythfrontend-0.14-r1.ebuild:
diff --git a/media-tv/mythfrontend/Manifest b/media-tv/mythfrontend/Manifest
index 5dcf029b6f01..06107e787eb1 100644
--- a/media-tv/mythfrontend/Manifest
+++ b/media-tv/mythfrontend/Manifest
@@ -1,12 +1,8 @@
+MD5 e538bcc410d1e9c56b45a57fe758f75a mythfrontend-0.15.1.ebuild 4533
 MD5 0d74cffbfcc4c692b779d617d25b2324 mythfrontend-0.14-r1.ebuild 4301
-MD5 2c4c08b973462906879ea90d7f1836fe mythfrontend-0.11.ebuild 1442
 MD5 70611b9598602260cb0feb9616d3472d mythfrontend-0.13.ebuild 2835
-MD5 e1e58aeed812099b39c8cfac533702ac mythfrontend-0.10.ebuild 1506
-MD5 433fe0452c1ae1b1249fcad086b098f0 ChangeLog 2221
-MD5 6fe3d67afc42cbae25662a1956251f7b mythfrontend-0.12.ebuild 2843
+MD5 48efda1b68a1aff285a093705bfda4b2 ChangeLog 2441
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
-MD5 e14a28e72b9ac693884dc418dbeef119 files/digest-mythfrontend-0.10 65
-MD5 5234ae53ed7b1bb9ed541d47207430f8 files/digest-mythfrontend-0.11 65
-MD5 8919549e83320ae499758823c2488901 files/digest-mythfrontend-0.12 65
+MD5 788cdcff1808794391bf5ef2e157b5fb files/digest-mythfrontend-0.15.1 67
 MD5 a01439b4ddf480862e31867fc4689698 files/digest-mythfrontend-0.13 65
 MD5 24ab1e90e64fb0be4704e74b633e96b1 files/digest-mythfrontend-0.14-r1 65
diff --git a/media-tv/mythfrontend/files/digest-mythfrontend-0.15.1 b/media-tv/mythfrontend/files/digest-mythfrontend-0.15.1
new file mode 100644
index 000000000000..55e1ca838ced
--- /dev/null
+++ b/media-tv/mythfrontend/files/digest-mythfrontend-0.15.1
@@ -0,0 +1 @@
+MD5 91aca494281ae966f45f941026b72985 mythtv-0.15.1.tar.bz2 6209329
diff --git a/media-tv/mythfrontend/mythfrontend-0.10.ebuild b/media-tv/mythfrontend/mythfrontend-0.10.ebuild
deleted file mode 100644
index ac9fae146d5b..000000000000
--- a/media-tv/mythfrontend/mythfrontend-0.10.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythfrontend/mythfrontend-0.10.ebuild,v 1.7 2004/04/26 18:36:23 agriffis Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Homebrew PVR project frontend."
-HOMEPAGE="http://www.mythtv.org/"
-SRC_URI="http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="lcd"
-
-DEPEND="virtual/x11
-	>=x11-libs/qt-3
-	>=media-sound/lame-3.92
-	>=media-libs/freetype-2.0
-	>=sys-apps/sed-4
-	lcd? ( app-misc/lcdproc )"
-
-RDEPEND="${DEPEND}
-	!media-tv/mythtv"
-
-S="${WORKDIR}/mythtv-${PV}"
-
-src_unpack() {
-	unpack ${A}
-
-	for i in `grep -lr usr/local "${S}"` ; do
-		sed -e "s:usr/local:usr:" -i "${i}" || die "sed failed"
-	done
-}
-
-src_compile() {
-	cpu="`get-flag march`"
-	if [ -n "${cpu}" ] ; then
-		sed -e "s:pentiumpro:${cpu}:g" -i "${S}/settings.pro" || die "sed failed"
-	fi
-
-	qmake -o "${S}/Makefile" "${S}/mythtv.pro"
-
-	econf `use_enable lcd` || die "econf failed"
-
-	# Parallel build doesn't work.
-	make || die "compile problem"
-}
-
-src_install() {
-	make INSTALL_ROOT="${D}" install || die "make install failed"
-
-	dodir /etc/mythtv
-	mv "${D}/usr/share/mythtv/mysql.txt" "${D}/etc/mythtv"
-	dosym /etc/mythtv/mysql.txt /usr/share/mythtv/mysql.txt
-
-	rm -rf "${D}"/usr/bin/myth{backend,commflag,filldatabase,transcode} \
-		"${D}/usr/share/mythtv/setup.xml"
-
-	dodoc AUTHORS COPYING FAQ README UPGRADING keys.txt docs/*.txt
-	dohtml docs/*.html
-}
diff --git a/media-tv/mythfrontend/mythfrontend-0.11.ebuild b/media-tv/mythfrontend/mythfrontend-0.11.ebuild
deleted file mode 100644
index f861e7bf8497..000000000000
--- a/media-tv/mythfrontend/mythfrontend-0.11.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythfrontend/mythfrontend-0.11.ebuild,v 1.6 2004/04/26 18:36:23 agriffis Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Homebrew PVR project frontend."
-HOMEPAGE="http://www.mythtv.org/"
-SRC_URI="http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="lcd"
-
-DEPEND="virtual/x11
-	>=x11-libs/qt-3
-	>=media-sound/lame-3.92
-	>=media-libs/freetype-2.0
-	>=sys-apps/sed-4
-	lcd? ( app-misc/lcdproc )"
-
-RDEPEND="${DEPEND}
-	!media-tv/mythtv"
-
-S="${WORKDIR}/mythtv-${PV}"
-
-src_unpack() {
-	unpack ${A}
-
-	for i in `grep -lr usr/local "${S}"` ; do
-		sed -e "s:usr/local:usr:" -i "${i}" || die "sed failed"
-	done
-}
-
-src_compile() {
-	cpu="`get-flag march`"
-	if [ -n "${cpu}" ] ; then
-		sed -e "s:pentiumpro:${cpu}:g" -i "${S}/settings.pro" || die "sed failed"
-	fi
-
-	qmake -o "${S}/Makefile" "${S}/mythtv.pro"
-
-	econf "`use_enable lcd`" || die "econf failed"
-	make || die "compile problem"
-}
-
-src_install() {
-	einstall INSTALL_ROOT="${D}"
-
-	dodir /etc/mythtv
-	mv "${D}/usr/share/mythtv/mysql.txt" "${D}/etc/mythtv"
-	dosym /etc/mythtv/mysql.txt /usr/share/mythtv/mysql.txt
-
-	rm -rf "${D}"/usr/bin/myth{backend,commflag,filldatabase,transcode} \
-		"${D}/usr/share/mythtv/setup.xml"
-
-	dodoc AUTHORS COPYING FAQ README UPGRADING keys.txt docs/*.txt
-	dohtml docs/*.html
-}
diff --git a/media-tv/mythfrontend/mythfrontend-0.12.ebuild b/media-tv/mythfrontend/mythfrontend-0.12.ebuild
deleted file mode 100644
index 8a21b0507f2b..000000000000
--- a/media-tv/mythfrontend/mythfrontend-0.12.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythfrontend/mythfrontend-0.12.ebuild,v 1.4 2004/04/26 04:07:44 agriffis Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Homebrew PVR project frontend."
-HOMEPAGE="http://www.mythtv.org/"
-SRC_URI="http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="alsa lcd lirc nvidia"
-
-DEPEND="virtual/x11
-	>=x11-libs/qt-3.1
-	>=media-sound/lame-3.93.1
-	>=media-libs/freetype-2.0
-	>=sys-apps/sed-4
-	alsa? ( media-libs/alsa-lib )
-	lcd? ( app-misc/lcdproc )
-	lirc? ( app-misc/lirc )
-	nvidia? ( media-video/nvidia-glx )"
-
-RDEPEND="${DEPEND}
-	!media-tv/mythtv"
-
-S="${WORKDIR}/mythtv-${PV}"
-
-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
-
-	return 0
-}
-
-src_unpack() {
-	unpack ${A}
-
-	for i in `grep -lr "usr/local" "${S}"` ; do
-		sed -e "s:usr/local:usr:g" -i "${i}" || die "sed failed"
-	done
-}
-
-src_compile() {
-	local cpu="`get-flag march || get-flag mcpu`"
-	if [ "${cpu}" ] ; then
-		sed -e "s:pentiumpro:${cpu}:g" -i "settings.pro" || die "sed failed"
-	fi
-
-	if [ "`use alsa`" ] ; then
-		sed -e "s:#CONFIG += using_alsa:CONFIG += using_alsa:" \
-			-e "s:#EXTRA_LIBS += -lasound:EXTRA_LIBS += -lasound:" \
-			-i "settings.pro" || die "enable alsa sed 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 lirc`" ] ; then
-		sed -e "s:#CONFIG += using_lirc:CONFIG += using_lirc:" \
-			-e "s:#EXTRA_LIBS += -llirc_client:EXTRA_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:#EXTRA_LIBS += -lXvMCNVIDIA:EXTRA_LIBS += -lXvMCNVIDIA:" \
-			-i "settings.pro" || die "enable xvmc sed failed"
-	fi
-	# Needs a VIA supported kernel driver.
-	#if [ "`use via`" ] ; then
-	#	sed -e "s:#CONFIG += using_via:CONFIG += using_via:"
-	#		-e "s:#EXTRA_LIBS += -lddmpeg:EXTRA_LIBS += -lddmpeg:"
-	#		-i "settings.pro" || die "enable lirc sed failed"
-	#fi
-
-	qmake -o "Makefile" "mythtv.pro"
-
-	econf || die "econf failed"
-	make || die "compile problem"
-}
-
-src_install() {
-	einstall INSTALL_ROOT="${D}"
-
-	dodir /etc/mythtv
-	mv "${D}/usr/share/mythtv/mysql.txt" "${D}/etc/mythtv"
-	dosym /etc/mythtv/mysql.txt /usr/share/mythtv/mysql.txt
-
-	rm -rf "${D}"/usr/bin/myth{backend,commflag,filldatabase,transcode} \
-		"${D}/usr/share/mythtv/setup.xml"
-
-	dodoc AUTHORS COPYING FAQ README UPGRADING keys.txt docs/*.{txt,pdf}
-	dohtml docs/*.html
-}
diff --git a/media-tv/mythfrontend/mythfrontend-0.15.1.ebuild b/media-tv/mythfrontend/mythfrontend-0.15.1.ebuild
new file mode 100644
index 000000000000..f30fbad1908a
--- /dev/null
+++ b/media-tv/mythfrontend/mythfrontend-0.15.1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythfrontend/mythfrontend-0.15.1.ebuild,v 1.1 2004/06/01 17:25:48 aliz Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Homebrew PVR project frontend."
+HOMEPAGE="http://www.mythtv.org/"
+SRC_URI="http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="alsa arts dvb directfb lcd lirc nvidia cle266 opengl"
+
+DEPEND="virtual/x11
+	>=x11-libs/qt-3.1
+	>=media-sound/lame-3.93.1
+	>=media-libs/freetype-2.0
+	>=sys-apps/sed-4
+	alsa? ( media-libs/alsa-lib )
+	arts? ( kde-base/arts )
+	directfb? ( dev-libs/DirectFB )
+	dvb? ( media-libs/libdvb )
+	lcd? ( app-misc/lcdproc )
+	lirc? ( app-misc/lirc )
+	nvidia? ( media-video/nvidia-glx )
+	cle266? ( media-libs/libddmpeg )"
+
+RDEPEND="${DEPEND}
+	!media-tv/mythtv"
+
+S="${WORKDIR}/mythtv-${PV}"
+
+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
+
+	return 0
+}
+
+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
+}
+
+src_compile() {
+	# Fix bugs 40964 and 42943.
+	filter-flags -fforce-addr -fPIC
+
+	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
+
+	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 directfb`" ] ; then
+		sed -e 's:#CONFIG += using_directfb:CONFIG += using_directfb:' \
+			-e 's:#EXTRA_LIBS += `directfb:EXTRA_LIBS += `directfb:' \
+			-e 's:#QMAKE_CXXFLAGS += `directfb:QMAKE_CXXFLAGS += `directfb:' \
+			-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:' \
+			-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"
+	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 xvmc sed failed"
+	fi
+	if [ "`use cle266`" ] ; then
+		sed -e 's:#CONFIG += using_viahwslice:CONFIG += using_viahwslice:' \
+			-e 's:#DEFINES += USING_VIASLICE:DEFINES += USING_VIASLICE:' \
+			-e 's:#EXTRA_LIBS += -lddmpeg:EXTRA_LIBS += -lddmpeg:' \
+			-i 'settings.pro' || die "enable lirc sed failed"
+	fi
+	if [ "`use opengl`" ] ; then
+		sed -e 's:#DEFINES += USING_OPENGL_VSYNC:DEFINES += USING_OPENGL_VSYNC:' \
+			-e 's:#EXTRA_LIBS += -lGL -lGLU:EXTRA_LIBS += -lGL -lGLU:' \
+			-i 'settings.pro' || die "enable opgenl sed failed"
+	fi
+
+	qmake -o "Makefile" "mythtv.pro"
+
+	econf || die "econf failed"
+	emake -j1 || die "compile problem"
+}
+
+src_install() {
+	einstall INSTALL_ROOT="${D}"
+
+	dodir /etc/mythtv
+	mv "${D}/usr/share/mythtv/mysql.txt" "${D}/etc/mythtv"
+	dosym /etc/mythtv/mysql.txt /usr/share/mythtv/mysql.txt
+
+	rm -rf "${D}"/usr/bin/myth{backend,commflag,filldatabase,transcode} \
+		"${D}/usr/share/mythtv/setup.xml"
+
+	dodoc AUTHORS COPYING FAQ README UPGRADING keys.txt docs/*.{txt,pdf}
+	dohtml docs/*.html
+}