Ditch the postinst() message and don't attempt to install non-existant db files. Conditionally replace the pentium4 flags based on the gcc version.

2 files changed, 13 insertions, 28 deletions

diff --git a/media-plugins/mythmusic/ChangeLog b/media-plugins/mythmusic/ChangeLog
index f0890392d73e..0368bdba26bb 100644
--- a/media-plugins/mythmusic/ChangeLog
+++ b/media-plugins/mythmusic/ChangeLog
@@ -1,6 +1,10 @@
 # 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.14 2004/02/03 14:14:50 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythmusic/ChangeLog,v 1.15 2004/02/06 14:41:13 max Exp $
+
+  06 Feb 2004; Max Kalika <max@gentoo.org> mythmusic-0.14.ebuild:
+  Ditch the postinst() message and don't attempt to install non-existant db
+  files. Conditionally replace the pentium4 flags based on the gcc version.
 
 *mythmusic-0.14 (03 Feb 2004)
 
diff --git a/media-plugins/mythmusic/mythmusic-0.14.ebuild b/media-plugins/mythmusic/mythmusic-0.14.ebuild
index 3664d62ee979..31e5ffdf1f3a 100644
--- a/media-plugins/mythmusic/mythmusic-0.14.ebuild
+++ b/media-plugins/mythmusic/mythmusic-0.14.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.14.ebuild,v 1.1 2004/02/03 13:51:53 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythmusic/mythmusic-0.14.ebuild,v 1.2 2004/02/06 14:41:13 max Exp $
 
-inherit flag-o-matic
+inherit gcc flag-o-matic
 
 DESCRIPTION="Music player module for MythTV."
 HOMEPAGE="http://www.mythtv.org/"
@@ -26,7 +26,7 @@ DEPEND=">=media-sound/cdparanoia-3.9.8
 	|| ( >=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" ] ; 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."
 }