rev bump to new CVS snapshot to match MythTV snapshot

Package-Manager: portage-2.0.51-r14

12 files changed, 67 insertions, 226 deletions

diff --git a/media-plugins/mythmusic/ChangeLog b/media-plugins/mythmusic/ChangeLog
index ebcb67bfb8b0..b74e93cf8556 100644
--- a/media-plugins/mythmusic/ChangeLog
+++ b/media-plugins/mythmusic/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/mythmusic
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythmusic/ChangeLog,v 1.25 2004/12/05 01:02:16 iggy Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythmusic/ChangeLog,v 1.26 2005/01/20 08:20:59 cardoe Exp $
+
+*mythmusic-0.16.20050119 (20 Jan 2005)
+
+  20 Jan 2005; Doug Goldstein <cardoe@gentoo.org> metadata.xml,
+  -files/asm_fix.diff, -mythmusic-0.13.ebuild, -mythmusic-0.14.ebuild,
+  -mythmusic-0.15.1.ebuild, +mythmusic-0.16.20050119.ebuild:
+  rev bump to new CVS snapshot to match MythTV snapshot
+  delete old revs
 
   04 Dec 2004; Brian Jackson <iggy@gentoo.org> mythmusic-0.16.ebuild:
   I can't find any of the other media-tv guys, and it's been fairly bug free,
diff --git a/media-plugins/mythmusic/files/asm_fix.diff b/media-plugins/mythmusic/files/asm_fix.diff
deleted file mode 100644
index 05c984bd6da8..000000000000
--- a/media-plugins/mythmusic/files/asm_fix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN mythmusic-0.14/mythmusic/goom/zoom_filter_xmmx.c mythmusic-0.14-modified/mythmusic/goom/zoom_filter_xmmx.c
---- mythmusic-0.14/mythmusic/goom/zoom_filter_xmmx.c	2003-06-17 10:37:36.000000000 -0500
-+++ mythmusic-0.14-modified/mythmusic/goom/zoom_filter_xmmx.c	2004-04-30 03:10:12.937571336 -0500
-@@ -117,7 +117,7 @@
- 				"andl $15,%%eax\n"
- 
- 				"movd (%%ebx,%%eax,4),%%mm3\n"
--				::"X"(precalCoef):"eax","ebx");
-+				::"m"(precalCoef):"eax","ebx");
- 
- 			/*
- 			 * extraction des coefficients...
diff --git a/media-plugins/mythmusic/files/digest-mythmusic-0.13 b/media-plugins/mythmusic/files/digest-mythmusic-0.13
deleted file mode 100644
index 58e048368ede..000000000000
--- a/media-plugins/mythmusic/files/digest-mythmusic-0.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b467f5e25ff4d9b492b9b7e032594333 mythmusic-0.13.tar.bz2 200517
diff --git a/media-plugins/mythmusic/files/digest-mythmusic-0.14 b/media-plugins/mythmusic/files/digest-mythmusic-0.14
deleted file mode 100644
index 0a1860da20a1..000000000000
--- a/media-plugins/mythmusic/files/digest-mythmusic-0.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 25b2512aae8c39b6b423356f88be542c mythmusic-0.14.tar.bz2 213506
diff --git a/media-plugins/mythmusic/files/digest-mythmusic-0.15.1 b/media-plugins/mythmusic/files/digest-mythmusic-0.15.1
deleted file mode 100644
index b0e8a5aab3e3..000000000000
--- a/media-plugins/mythmusic/files/digest-mythmusic-0.15.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9cbd46dc0185eef72b68ee2fc7d36583 mythmusic-0.15.1.tar.bz2 228563
diff --git a/media-plugins/mythmusic/files/digest-mythmusic-0.16.20050119 b/media-plugins/mythmusic/files/digest-mythmusic-0.16.20050119
new file mode 100644
index 000000000000..78e8a292ef85
--- /dev/null
+++ b/media-plugins/mythmusic/files/digest-mythmusic-0.16.20050119
@@ -0,0 +1 @@
+MD5 3eefedbe8cbcb80949ff9c6b015f88a5 mythmusic-0.16.20050119.tar.bz2 272259
diff --git a/media-plugins/mythmusic/metadata.xml b/media-plugins/mythmusic/metadata.xml
index a6b9e38a1b93..1cb3ba51155e 100644
--- a/media-plugins/mythmusic/metadata.xml
+++ b/media-plugins/mythmusic/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>media-tv</herd>
+<maintainer>
+	<email>cardoe@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/mythmusic/mythmusic-0.13.ebuild b/media-plugins/mythmusic/mythmusic-0.13.ebuild
deleted file mode 100644
index 2d79bee8d809..000000000000
--- a/media-plugins/mythmusic/mythmusic-0.13.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythmusic/mythmusic-0.13.ebuild,v 1.5 2004/12/29 02:47:48 ribosome Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Music 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"
-IUSE="opengl sdl X"
-
-DEPEND=">=media-sound/cdparanoia-3.9.8
-	>=media-libs/libmad-0.14.2b
-	>=media-libs/libid3tag-0.14.2b
-	>=media-libs/libvorbis-1.0
-	>=media-libs/libcdaudio-0.99.6
-	>=media-libs/flac-1.1.0
-	>=sys-apps/sed-4
-	X? ( =sci-libs/fftw-2* )
-	opengl? ( virtual/opengl =sci-libs/fftw-2* )
-	sdl? ( >=media-libs/libsdl-1.2.5 )
-	|| ( >=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 myconf
-	myconf="${myconf} `use_enable X fftw`"
-	myconf="${myconf} `use_enable opengl`"
-	myconf="${myconf} `use_enable sdl`"
-
-	# Fix bug 31952
-	replace-flags mcpu=pentium4 mcpu=pentium3
-	replace-flags march=pentium4 march=pentium3
-	local cpu="`get-flag march || get-flag mcpu`"
-	if [ "${cpu}" ] ; then
-		sed -e "s:pentiumpro:${cpu}:g" -i "settings.pro" || die "sed failed"
-	fi
-
-	qmake -o "Makefile" "${PN}.pro"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "compile problem"
-}
-
-src_install() {
-	einstall INSTALL_ROOT="${D}"
-
-	insinto "/usr/share/mythtv/database/${PN}"
-	doins musicdb/*.sql
-
-	dodoc AUTHORS COPYING README UPGRADING
-	newdoc musicdb/README README.db
-}
-
-pkg_postinst() {
-	einfo "If this is the first time you install MythMusic,"
-	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}/UPGRADING.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."
-}
diff --git a/media-plugins/mythmusic/mythmusic-0.14.ebuild b/media-plugins/mythmusic/mythmusic-0.14.ebuild
deleted file mode 100644
index 505e03701b18..000000000000
--- a/media-plugins/mythmusic/mythmusic-0.14.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythmusic/mythmusic-0.14.ebuild,v 1.8 2004/12/29 02:47:48 ribosome Exp $
-
-inherit gcc flag-o-matic eutils
-
-DESCRIPTION="Music 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"
-IUSE="opengl sdl X"
-
-DEPEND=">=media-sound/cdparanoia-3.9.8
-	>=media-libs/libmad-0.14.2b
-	>=media-libs/libid3tag-0.14.2b
-	>=media-libs/libvorbis-1.0
-	>=media-libs/libcdaudio-0.99.6
-	>=media-libs/flac-1.1.0
-	>=sys-apps/sed-4
-	X? ( =sci-libs/fftw-2* )
-	opengl? ( virtual/opengl =sci-libs/fftw-2* )
-	sdl? ( >=media-libs/libsdl-1.2.5 )
-	|| ( >=media-tv/mythtv-${PV} >=media-tv/mythfrontend-${PV} )"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	for i in `grep -lr "usr/local" "${S}"` ; do
-		sed -e "s:/usr/local:/usr:" -i "${i}" || die "sed failed"
-	done
-
-	# This was fixed in CVS but didn't make it into 0.14
-	# There is a problem  in the goom plugin
-	# 20040429 - raker@gentoo.org
-	epatch ${FILESDIR}/asm_fix.diff
-}
-
-src_compile() {
-	local myconf
-	myconf="${myconf} `use_enable X fftw`"
-	myconf="${myconf} `use_enable opengl`"
-	myconf="${myconf} `use_enable sdl`"
-
-	if [ "`gcc-version`" = "3.2" ] || [ "`gcc-version`" = "3.3" ] ; then
-		replace-flags mcpu=pentium4 mcpu=pentium3
-		replace-flags march=pentium4 march=pentium3
-	fi
-
-	local cpu="`get-flag march || get-flag mcpu`"
-	if [ "${cpu}" ] ; then
-		sed -e "s:pentiumpro:${cpu}:g" -i "settings.pro" || die "sed failed"
-	fi
-
-	qmake -o "Makefile" "${PN}.pro"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "compile problem"
-}
-
-src_install() {
-	einstall INSTALL_ROOT="${D}"
-	dodoc AUTHORS COPYING README UPGRADING
-}
diff --git a/media-plugins/mythmusic/mythmusic-0.15.1.ebuild b/media-plugins/mythmusic/mythmusic-0.15.1.ebuild
deleted file mode 100644
index 24344a3b8dcf..000000000000
--- a/media-plugins/mythmusic/mythmusic-0.15.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythmusic/mythmusic-0.15.1.ebuild,v 1.4 2004/12/29 02:47:48 ribosome Exp $
-
-inherit gcc flag-o-matic eutils
-
-DESCRIPTION="Music 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"
-IUSE="opengl sdl X"
-
-DEPEND=">=media-sound/cdparanoia-3.9.8
-	>=media-libs/libmad-0.14.2b
-	>=media-libs/libid3tag-0.14.2b
-	>=media-libs/libvorbis-1.0
-	>=media-libs/libcdaudio-0.99.6
-	>=media-libs/flac-1.1.0
-	>=sys-apps/sed-4
-	X? ( =sci-libs/fftw-2* )
-	opengl? ( virtual/opengl =sci-libs/fftw-2* )
-	sdl? ( >=media-libs/libsdl-1.2.5 )
-	|| ( >=media-tv/mythtv-${PV}* >=media-tv/mythfrontend-${PV}* )"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	for i in `grep -lr "usr/local" "${S}"` ; do
-		sed -e "s:/usr/local:/usr:" -i "${i}" || die "sed failed"
-	done
-}
-
-src_compile() {
-	local myconf
-	myconf="${myconf} `use_enable X fftw`"
-	myconf="${myconf} `use_enable opengl`"
-	myconf="${myconf} `use_enable sdl`"
-
-	if [ "`gcc-version`" = "3.2" ] || [ "`gcc-version`" = "3.3" ] ; then
-		replace-flags mcpu=pentium4 mcpu=pentium3
-		replace-flags march=pentium4 march=pentium3
-	fi
-
-	local cpu="`get-flag march || get-flag mcpu`"
-	if [ "${cpu}" ] ; then
-		sed -e "s:pentiumpro:${cpu}:g" -i "settings.pro" || die "sed failed"
-	fi
-
-	qmake -o "Makefile" "${PN}.pro"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "compile problem"
-}
-
-src_install() {
-	einstall INSTALL_ROOT="${D}"
-	dodoc AUTHORS COPYING README UPGRADING
-}
diff --git a/media-plugins/mythmusic/mythmusic-0.16.20050119.ebuild b/media-plugins/mythmusic/mythmusic-0.16.20050119.ebuild
new file mode 100644
index 000000000000..6e9567712465
--- /dev/null
+++ b/media-plugins/mythmusic/mythmusic-0.16.20050119.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythmusic/mythmusic-0.16.20050119.ebuild,v 1.1 2005/01/20 08:20:59 cardoe Exp $
+
+inherit myth flag-o-matic
+
+DESCRIPTION="Music player module for MythTV."
+HOMEPAGE="http://www.mythtv.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 -amd64"
+IUSE="opengl sdl X nls"
+
+S=${WORKDIR}/mythmusic
+
+DEPEND=">=media-sound/cdparanoia-3.9.8
+	>=media-libs/libmad-0.14.2b
+	>=media-libs/libid3tag-0.14.2b
+	>=media-libs/libvorbis-1.0
+	>=media-libs/libcdaudio-0.99.6
+	>=media-libs/flac-1.1.0
+	>=sys-apps/sed-4
+	X? ( =sci-libs/fftw-2* )
+	opengl? ( virtual/opengl =sci-libs/fftw-2* )
+	sdl? ( >=media-libs/libsdl-1.2.5 )
+	|| ( ~media-tv/mythtv-0.16.20050115* ~media-tv/mythfrontend-0.16.20050115* )"
+
+setup_pro() {
+	return 0
+}
+
+src_unpack() {
+	if [ "`gcc-version`" = "3.2" ] || [ "`gcc-version`" = "3.3" ] ; then
+		replace-flags mcpu=pentium4 mcpu=pentium3
+		replace-flags march=pentium4 march=pentium3
+	fi
+
+	myth_src_unpack || die "unpack failed"
+}
+
+
+src_compile() {
+	econf \
+		`use_enable X fftw` \
+		`use_enable opengl` \
+		`use_enable sdl`
+
+	myth_src_compile || die "compile failed"
+}
diff --git a/media-plugins/mythmusic/mythmusic-0.16.ebuild b/media-plugins/mythmusic/mythmusic-0.16.ebuild
index 7fa0ece2661d..e74c53b4d410 100644
--- a/media-plugins/mythmusic/mythmusic-0.16.ebuild
+++ b/media-plugins/mythmusic/mythmusic-0.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythmusic/mythmusic-0.16.ebuild,v 1.4 2004/12/29 02:47:48 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythmusic/mythmusic-0.16.ebuild,v 1.5 2005/01/20 08:20:59 cardoe Exp $
 
 inherit myth gcc flag-o-matic