Version bump and cleanup.

19 files changed, 184 insertions, 371 deletions

diff --git a/media-plugins/mythvideo/ChangeLog b/media-plugins/mythvideo/ChangeLog
index 37f8de110003..bb25ca468722 100644
--- a/media-plugins/mythvideo/ChangeLog
+++ b/media-plugins/mythvideo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/mythvideo
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythvideo/ChangeLog,v 1.13 2004/04/20 17:46:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythvideo/ChangeLog,v 1.14 2004/06/01 17:22:04 aliz Exp $
+
+*mythvideo-0.15.1 (01 Jun 2004)
+
+  01 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> mythvideo-0.11.ebuild,
+  mythvideo-0.12.ebuild, mythvideo-0.15.1.ebuild:
+  Version bump and cleanups.
 
   20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
   mythvideo-0.11.ebuild, mythvideo-0.12.ebuild, mythvideo-0.13.ebuild,
diff --git a/media-plugins/mythvideo/Manifest b/media-plugins/mythvideo/Manifest
index 56ff4e6569b6..638c195cf35d 100644
--- a/media-plugins/mythvideo/Manifest
+++ b/media-plugins/mythvideo/Manifest
@@ -1,3 +1,4 @@
+MD5 5fe367c089ba59c9e5b0489fb7cfe6d4 mythvideo-0.15.1.ebuild 1053
 MD5 8293832fbcff7fa04a63924946518f0e mythvideo-0.12.ebuild 1782
 MD5 5fe367c089ba59c9e5b0489fb7cfe6d4 mythvideo-0.14.ebuild 1053
 MD5 ab880b645c727db4b27e8b71f91289a6 mythvideo-0.11.ebuild 1765
@@ -8,3 +9,4 @@ MD5 1c1055ed7527e3c6e5c556e1f79456bc files/digest-mythvideo-0.11 67
 MD5 8b1f40b48872fd36d6dfd997ee675a30 files/digest-mythvideo-0.12 67
 MD5 a8800f5c5151851b8e57a6a777fde3b0 files/digest-mythvideo-0.13 67
 MD5 51fbad420f3d94ef8747f16c24ee8c18 files/digest-mythvideo-0.14 67
+MD5 e15e758ba887eb0ff1df3ff4f24db090 files/digest-mythvideo-0.15.1 69
diff --git a/media-plugins/mythvideo/files/digest-mythvideo-0.15.1 b/media-plugins/mythvideo/files/digest-mythvideo-0.15.1
new file mode 100644
index 000000000000..cef27e83c7fc
--- /dev/null
+++ b/media-plugins/mythvideo/files/digest-mythvideo-0.15.1
@@ -0,0 +1 @@
+MD5 500a2f7206a08c0be495c44b5cb35cc7 mythvideo-0.15.1.tar.bz2 218076
diff --git a/media-plugins/mythvideo/mythvideo-0.11.ebuild b/media-plugins/mythvideo/mythvideo-0.11.ebuild
deleted file mode 100644
index 043b4d38a096..000000000000
--- a/media-plugins/mythvideo/mythvideo-0.11.ebuild
+++ /dev/null
@@ -1,65 +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-plugins/mythvideo/mythvideo-0.11.ebuild,v 1.5 2004/04/20 17:46:24 eradicator Exp $
-
-IUSE=""
-
-inherit flag-o-matic
-
-DESCRIPTION="Video player module for MythTV."
-HOMEPAGE="http://www.mythtv.org/"
-SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND=">=sys-apps/sed-4
-	|| ( media-video/mplayer media-video/xine-ui )
-	|| ( >=media-tv/mythtv-${PV} >=media-tv/mythfrontend-${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 [ ! -z "${cpu}" ] ; then
-		sed -e "s:pentiumpro:${cpu}:g" -i "${S}/settings.pro" || die "sed failed"
-	fi
-
-	qmake -o "${S}/Makefile" "${S}/${PN}.pro"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	einstall INSTALL_ROOT="${D}"
-
-	insinto "/usr/share/mythtv/database/${PN}"
-	doins videodb/*.sql
-
-	dodoc COPYING README
-	newdoc videodb/README README.db
-}
-
-pkg_postinst() {
-	einfo "If this is the first time you install MythVideo,"
-	einfo "you need to add /usr/share/mythtv/database/${PN}/metadata.sql"
-	einfo "to your MythTV database."
-	einfo
-	einfo "You might run 'mysql < /usr/share/mythtv/database/${PN}/metadata.sql'"
-	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}/README.db.gz"
-	ewarn "This part is important as there might be database changes"
-	ewarn "which need to be performed or this package will not work"
-	ewarn "properly."
-	echo
-}
diff --git a/media-plugins/mythvideo/mythvideo-0.12.ebuild b/media-plugins/mythvideo/mythvideo-0.12.ebuild
deleted file mode 100644
index 28032c4407b3..000000000000
--- a/media-plugins/mythvideo/mythvideo-0.12.ebuild
+++ /dev/null
@@ -1,64 +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-plugins/mythvideo/mythvideo-0.12.ebuild,v 1.4 2004/04/20 17:46:24 eradicator Exp $
-
-IUSE=""
-
-inherit flag-o-matic
-
-DESCRIPTION="Video player module for MythTV."
-HOMEPAGE="http://www.mythtv.org/"
-SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND=">=sys-apps/sed-4
-	|| ( media-video/mplayer media-video/xine-ui )
-	|| ( >=media-tv/mythtv-${PV} >=media-tv/mythfrontend-${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() {
-	local cpu="`get-flag march || get-flag mcpu`"
-	if [ ! -z "${cpu}" ] ; then
-		sed -e "s:pentiumpro:${cpu}:g" -i "settings.pro" || die "sed failed"
-	fi
-
-	qmake -o "Makefile" "${PN}.pro"
-	emake || die "compile problem"
-}
-
-src_install () {
-	einstall INSTALL_ROOT="${D}"
-
-	insinto "/usr/share/mythtv/database/${PN}"
-	doins videodb/*.sql
-
-	dodoc COPYING README UPGRADING
-	newdoc videodb/README README.db
-}
-
-pkg_postinst() {
-	einfo "If this is the first time you install MythVideo,"
-	einfo "you need to add /usr/share/mythtv/database/${PN}/metadata.sql"
-	einfo "to your MythTV database."
-	einfo
-	einfo "You might run 'mysql < /usr/share/mythtv/database/${PN}/metadata.sql'"
-	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}/README.db.gz"
-	ewarn "This part is important as there might be database changes"
-	ewarn "which need to be performed or this package will not work"
-	ewarn "properly."
-	echo
-}
diff --git a/media-plugins/mythweather/mythweather-0.11.ebuild b/media-plugins/mythvideo/mythvideo-0.15.1.ebuild
index 0d601c4958eb..31eb896c0e0d 100644
--- a/media-plugins/mythweather/mythweather-0.11.ebuild
+++ b/media-plugins/mythvideo/mythvideo-0.15.1.ebuild
@@ -1,24 +1,25 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythweather/mythweather-0.11.ebuild,v 1.4 2004/04/20 17:46:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythvideo/mythvideo-0.15.1.ebuild,v 1.1 2004/06/01 17:22:04 aliz Exp $
 
 IUSE=""
 
 inherit flag-o-matic
 
-DESCRIPTION="Weather forcast module for MythTV."
+DESCRIPTION="Video player module for MythTV."
 HOMEPAGE="http://www.mythtv.org/"
 SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 
 DEPEND=">=sys-apps/sed-4
-	|| ( >=media-tv/mythtv-${PV} >=media-tv/mythfrontend-${PV} )"
+	|| ( media-video/mplayer media-video/xine-ui )
+	|| ( >=media-tv/mythtv-${PV}* >=media-tv/mythfrontend-${PV}* )"
 
 src_unpack() {
-	unpack ${A}
+	unpack ${A} && cd "${S}"
 
 	for i in `grep -lr "usr/local" "${S}"` ; do
 		sed -e "s:/usr/local:/usr:" -i "${i}" || die "sed failed"
@@ -26,17 +27,16 @@ src_unpack() {
 }
 
 src_compile() {
-	cpu="`get-flag march`"
+	local cpu="`get-flag march || get-flag mcpu`"
 	if [ ! -z "${cpu}" ] ; then
-		sed -e "s:pentiumpro:${cpu}:g" -i "${S}/settings.pro" || die "sed failed"
+		sed -e "s:pentiumpro:${cpu}:g" -i "settings.pro" || die "sed failed"
 	fi
 
-	qmake -o "${S}/Makefile" "${S}/${PN}.pro"
-
+	qmake -o "Makefile" "${PN}.pro"
 	emake || die "compile problem"
 }
 
-src_install() {
+src_install () {
 	einstall INSTALL_ROOT="${D}"
-	dodoc AUTHORS COPYING README
+	dodoc COPYING README UPGRADING
 }
diff --git a/media-plugins/mythweather/ChangeLog b/media-plugins/mythweather/ChangeLog
index 2768f47e5a08..56ab3f528471 100644
--- a/media-plugins/mythweather/ChangeLog
+++ b/media-plugins/mythweather/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/mythweather
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythweather/ChangeLog,v 1.13 2004/04/20 17:46:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythweather/ChangeLog,v 1.14 2004/06/01 17:23:26 aliz Exp $
+
+*mythweather-0.15 (01 Jun 2004)
+
+  01 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> mythweather-0.11.ebuild,
+  mythweather-0.12.ebuild, mythweather-0.15.ebuild:
+  Version bump and cleanups.
 
   20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
   mythweather-0.11.ebuild, mythweather-0.12.ebuild, mythweather-0.13.ebuild,
diff --git a/media-plugins/mythweather/Manifest b/media-plugins/mythweather/Manifest
index 756ee0493839..74d1f78e5eab 100644
--- a/media-plugins/mythweather/Manifest
+++ b/media-plugins/mythweather/Manifest
@@ -2,9 +2,11 @@ MD5 c81de3dc23aa29251e966ed5c018c343 mythweather-0.12.ebuild 995
 MD5 86e8a7863834dbe93e152da25951407c mythweather-0.14.ebuild 1009
 MD5 03f2f8eae7bff731832df0d77c5af8f1 mythweather-0.11.ebuild 988
 MD5 7e8a136d64e0e47789317c20f9d7f8c2 mythweather-0.13.ebuild 995
+MD5 86e8a7863834dbe93e152da25951407c mythweather-0.15.ebuild 1009
 MD5 1dd5b43df06cecb4ae48cf9d7c7dc9ef ChangeLog 2281
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
 MD5 6a31e4f0a87c61e3e7f0eb55dca2f03b files/digest-mythweather-0.11 69
 MD5 916ba5d7844b0abae782627b8d1a21fe files/digest-mythweather-0.12 69
 MD5 ea775d05013e97dd4c419804de2ed3b6 files/digest-mythweather-0.13 69
 MD5 1ab52ed2da7b97e38a6f31621371a400 files/digest-mythweather-0.14 69
+MD5 acf4a287fc12a8d0a64dc92ac04c4522 files/digest-mythweather-0.15 69
diff --git a/media-plugins/mythweather/files/digest-mythweather-0.11 b/media-plugins/mythweather/files/digest-mythweather-0.11
deleted file mode 100644
index 0f0b4fe72b99..000000000000
--- a/media-plugins/mythweather/files/digest-mythweather-0.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 22ec089fb144ef2c316b028c67d266af mythweather-0.11.tar.bz2 814175
diff --git a/media-plugins/mythweather/files/digest-mythweather-0.12 b/media-plugins/mythweather/files/digest-mythweather-0.12
deleted file mode 100644
index 14f49fcf11a2..000000000000
--- a/media-plugins/mythweather/files/digest-mythweather-0.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8daad867e4eaf04506401975647d6144 mythweather-0.12.tar.bz2 824577
diff --git a/media-plugins/mythweather/files/digest-mythweather-0.15 b/media-plugins/mythweather/files/digest-mythweather-0.15
new file mode 100644
index 000000000000..ab8bfda83312
--- /dev/null
+++ b/media-plugins/mythweather/files/digest-mythweather-0.15
@@ -0,0 +1 @@
+MD5 0e1f011e3572dc3fd7a5fb9aa00d91e1 mythweather-0.15.tar.bz2 847427
diff --git a/media-plugins/mythweather/mythweather-0.12.ebuild b/media-plugins/mythweather/mythweather-0.15.ebuild
index 7c6bd435b4ad..46f0d5d621d3 100644
--- a/media-plugins/mythweather/mythweather-0.12.ebuild
+++ b/media-plugins/mythweather/mythweather-0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythweather/mythweather-0.12.ebuild,v 1.4 2004/04/20 17:46:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythweather/mythweather-0.15.ebuild,v 1.1 2004/06/01 17:23:26 aliz Exp $
 
 IUSE=""
 
@@ -12,13 +12,13 @@ SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 
 DEPEND=">=sys-apps/sed-4
-	|| ( >=media-tv/mythtv-${PV} >=media-tv/mythfrontend-${PV} )"
+	|| ( >=media-tv/mythtv-${PV}* >=media-tv/mythfrontend-${PV}* )"
 
 src_unpack() {
-	unpack ${A}
+	unpack ${A} && cd "${S}"
 
 	for i in `grep -lr "usr/local" "${S}"` ; do
 		sed -e "s:/usr/local:/usr:" -i "${i}" || die "sed failed"
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..270c481f482b 100644
--- a/media-tv/mythfrontend/Manifest
+++ b/media-tv/mythfrontend/Manifest
@@ -1,3 +1,4 @@
+MD5 0d74cffbfcc4c692b779d617d25b2324 mythfrontend-0.15.1.ebuild 4301
 MD5 0d74cffbfcc4c692b779d617d25b2324 mythfrontend-0.14-r1.ebuild 4301
 MD5 2c4c08b973462906879ea90d7f1836fe mythfrontend-0.11.ebuild 1442
 MD5 70611b9598602260cb0feb9616d3472d mythfrontend-0.13.ebuild 2835
@@ -5,6 +6,7 @@ MD5 e1e58aeed812099b39c8cfac533702ac mythfrontend-0.10.ebuild 1506
 MD5 433fe0452c1ae1b1249fcad086b098f0 ChangeLog 2221
 MD5 6fe3d67afc42cbae25662a1956251f7b mythfrontend-0.12.ebuild 2843
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
+MD5 788cdcff1808794391bf5ef2e157b5fb files/digest-mythfrontend-0.15.1 67
 MD5 e14a28e72b9ac693884dc418dbeef119 files/digest-mythfrontend-0.10 65
 MD5 5234ae53ed7b1bb9ed541d47207430f8 files/digest-mythfrontend-0.11 65
 MD5 8919549e83320ae499758823c2488901 files/digest-mythfrontend-0.12 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
+}