Version bump and cleanup.

7 files changed, 20 insertions, 109 deletions

diff --git a/media-plugins/mythmusic/ChangeLog b/media-plugins/mythmusic/ChangeLog
index f9bd1786dc8e..69a10267a765 100644
--- a/media-plugins/mythmusic/ChangeLog
+++ b/media-plugins/mythmusic/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/mythmusic
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythmusic/ChangeLog,v 1.19 2004/05/01 17:30:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythmusic/ChangeLog,v 1.20 2004/06/01 17:19:13 aliz Exp $
+
+*mythmusic-0.15.1 (01 Jun 2004)
+
+  01 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> mythmusic-0.11.ebuild,
+  mythmusic-0.12.ebuild, mythmusic-0.15.1.ebuild:
+  Version bump and cleanups.
 
   01 May 2004; Aron Griffis <agriffis@gentoo.org> mythmusic-0.14.ebuild:
   Add inherit eutils
diff --git a/media-plugins/mythmusic/Manifest b/media-plugins/mythmusic/Manifest
index b8e849806a53..3135280b72b9 100644
--- a/media-plugins/mythmusic/Manifest
+++ b/media-plugins/mythmusic/Manifest
@@ -1,10 +1,12 @@
 MD5 131c376ed96a0217394dd8d2777d7c25 mythmusic-0.12.ebuild 2302
+MD5 71b66f89cad5e01460f8b365acd5ff3e mythmusic-0.15.1.ebuild 1811
 MD5 71b66f89cad5e01460f8b365acd5ff3e mythmusic-0.14.ebuild 1811
 MD5 863b9ba062460e918a49704d73f0eedc mythmusic-0.11.ebuild 2194
 MD5 8e0f746611fc5b11d81c2c492fc49472 mythmusic-0.13.ebuild 2302
 MD5 870246d8dbbbea978a1eb31de1b8ebbe ChangeLog 3435
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
 MD5 8f32dd57de13b3cce86d582ecc59c4d2 files/asm_fix.diff 507
+MD5 848e6023c9cf8a12929e5dc1bd7468d6 files/digest-mythmusic-0.15.1 69
 MD5 d3782b76395f4d656284b24c9ee8e7b4 files/digest-mythmusic-0.11 67
 MD5 84fa19b3a9087c7357d9de3c374abee2 files/digest-mythmusic-0.12 67
 MD5 2019c295b59aab34531f15790e8d79f0 files/digest-mythmusic-0.13 67
diff --git a/media-plugins/mythmusic/files/digest-mythmusic-0.11 b/media-plugins/mythmusic/files/digest-mythmusic-0.11
deleted file mode 100644
index f4a0e354e145..000000000000
--- a/media-plugins/mythmusic/files/digest-mythmusic-0.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3c6add40f3680fd755b6011d37e6c24b mythmusic-0.11.tar.bz2 167010
diff --git a/media-plugins/mythmusic/files/digest-mythmusic-0.12 b/media-plugins/mythmusic/files/digest-mythmusic-0.12
deleted file mode 100644
index e3da303d57cc..000000000000
--- a/media-plugins/mythmusic/files/digest-mythmusic-0.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 04afe787b0dea4092abc1aced3e58d2e mythmusic-0.12.tar.bz2 198951
diff --git a/media-plugins/mythmusic/files/digest-mythmusic-0.15.1 b/media-plugins/mythmusic/files/digest-mythmusic-0.15.1
new file mode 100644
index 000000000000..b0e8a5aab3e3
--- /dev/null
+++ b/media-plugins/mythmusic/files/digest-mythmusic-0.15.1
@@ -0,0 +1 @@
+MD5 9cbd46dc0185eef72b68ee2fc7d36583 mythmusic-0.15.1.tar.bz2 228563
diff --git a/media-plugins/mythmusic/mythmusic-0.11.ebuild b/media-plugins/mythmusic/mythmusic-0.11.ebuild
deleted file mode 100644
index f38d12033924..000000000000
--- a/media-plugins/mythmusic/mythmusic-0.11.ebuild
+++ /dev/null
@@ -1,77 +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/mythmusic/mythmusic-0.11.ebuild,v 1.5 2004/04/26 18:29:00 agriffis 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? ( =dev-libs/fftw-2* )
-	opengl? ( virtual/opengl =dev-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`"
-
-	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"
-
-	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.12.ebuild b/media-plugins/mythmusic/mythmusic-0.15.1.ebuild
index 629937106db1..eaa321e1ae2e 100644
--- a/media-plugins/mythmusic/mythmusic-0.12.ebuild
+++ b/media-plugins/mythmusic/mythmusic-0.15.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythmusic/mythmusic-0.12.ebuild,v 1.4 2004/04/26 18:29:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythmusic/mythmusic-0.15.1.ebuild,v 1.1 2004/06/01 17:19:13 aliz Exp $
 
-inherit flag-o-matic
+inherit gcc flag-o-matic eutils
 
 DESCRIPTION="Music player module for MythTV."
 HOMEPAGE="http://www.mythtv.org/"
@@ -10,7 +10,7 @@ SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE="opengl sdl X"
 
 DEPEND=">=media-sound/cdparanoia-3.9.8
@@ -23,10 +23,10 @@ DEPEND=">=media-sound/cdparanoia-3.9.8
 	X? ( =dev-libs/fftw-2* )
 	opengl? ( virtual/opengl =dev-libs/fftw-2* )
 	sdl? ( >=media-libs/libsdl-1.2.5 )
-	|| ( >=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"
@@ -39,9 +39,11 @@ src_compile() {
 	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
+	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"
@@ -55,26 +57,5 @@ src_compile() {
 
 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."
 }