Version bump. Patch to stop using lash private api. Patch to build with GCC 4.3. Patch to fix some of the anti-aliasing rules.

(Portage version: 2.1.5_rc10)

3 files changed, 25 insertions, 39 deletions

diff --git a/media-sound/museseq/ChangeLog b/media-sound/museseq/ChangeLog
index 4f5d3c17bd5d..73916ff31887 100644
--- a/media-sound/museseq/ChangeLog
+++ b/media-sound/museseq/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-sound/museseq
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/ChangeLog,v 1.50 2008/05/13 05:35:43 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/ChangeLog,v 1.51 2008/05/16 13:04:01 drac Exp $
+
+*museseq-0.9 (16 May 2008)
+
+  16 May 2008; Samuli Suominen <drac@gentoo.org>
+  +files/0.9/02_all_log2f_aliasing.patch,
+  +files/0.9/03_all_lash_private_api.patch,
+  -files/museseq-0.9_pre2-asneeded.patch, +files/0.9/01_all_gcc43.patch,
+  +files/0.9/04_all_asneeded.patch, -museseq-0.9_pre2.ebuild,
+  +museseq-0.9.ebuild:
+  Version bump. Patch to stop using lash private api. Patch to build with
+  GCC 4.3. Patch to fix some of the anti-aliasing rules.
 
   13 May 2008; Samuli Suominen <drac@gentoo.org> museseq-0.8.1-r1.ebuild:
   Move documentation generation tools into DEPEND wrt #221679.
diff --git a/media-sound/museseq/files/museseq-0.9_pre2-asneeded.patch b/media-sound/museseq/files/museseq-0.9_pre2-asneeded.patch
deleted file mode 100644
index 6c9026c4ca06..000000000000
--- a/media-sound/museseq/files/museseq-0.9_pre2-asneeded.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: muse-0.9pre2/muse/Makefile.in
-===================================================================
---- muse-0.9pre2.orig/muse/Makefile.in
-+++ muse-0.9pre2/muse/Makefile.in
-@@ -390,11 +390,12 @@ muse_LDADD = \
- 	cliplist/libcliplist.a \
-       instruments/libinstruments.a \
- 	widgets/libwidgets.a \
--      ../synti/libsynti/libsynti.la
--
--muse_LDFLAGS = -fno_exceptions $(X_LIBS) $(QT_LIBS) \
-+      ../synti/libsynti/libsynti.la \
-+	$(X_LIBS) $(QT_LIBS) \
- 	-lasound $(SNDFILE_LIBS) $(JACK_LIBS) $(LASH_LIBS) $(FST_LIBS)
- 
-+muse_LDFLAGS = -fno_exceptions 
-+
- CLEANFILES = stamp-chown
- DISTCLEANFILES = .muse.bin.bak
- MAINTAINERCLEANFILES = depcomp config.guess \
diff --git a/media-sound/museseq/museseq-0.9_pre2.ebuild b/media-sound/museseq/museseq-0.9.ebuild
index e646e55d6378..38cbb37a9262 100644
--- a/media-sound/museseq/museseq-0.9_pre2.ebuild
+++ b/media-sound/museseq/museseq-0.9.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.9_pre2.ebuild,v 1.4 2008/01/14 17:02:18 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.9.ebuild,v 1.1 2008/05/16 13:04:01 drac Exp $
 
 inherit kde-functions virtualx eutils
 
 MY_P=${P/museseq/muse}
-MY_P=${MY_P/_/}
 
 DESCRIPTION="MusE is a MIDI/Audio sequencer with recording and editing capabilities"
+HOMEPAGE="http://www.muse-sequencer.org"
 SRC_URI="mirror://sourceforge/lmuse/${MY_P}.tar.gz"
-HOMEPAGE="http://www.muse-sequencer.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="doc lash debug"
 
@@ -21,39 +19,36 @@ RDEPEND="$(qt_min_version 3.2)
 	>=media-libs/alsa-lib-0.9.0
 	>=media-sound/fluidsynth-1.0.3
 	dev-lang/perl
-	>=media-libs/libsndfile-1.0.1
-	>=media-libs/libsamplerate-0.1.0
+	media-libs/libsndfile
+	media-libs/libsamplerate
 	>=media-sound/jack-audio-connection-kit-0.98.0
 	lash? ( media-sound/lash )"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( app-text/openjade
 		app-doc/doxygen
 		media-gfx/graphviz )"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-asneeded.patch"
+	EPATCH_SUFFIX="patch" epatch "${FILESDIR}"/${PV}
 }
 
 src_compile() {
-	Xeconf --disable-suid-build \
-		--disable-optimize \
-		$(use_enable lash) \
-		$(use_enable debug) || die "configure failed"
+	Xeconf --disable-suid-build --disable-optimize \
+		$(use_enable lash) $(use_enable debug) \
+		|| die "Xeconf failed."
 
-	emake all || die
+	emake || die "emake failed."
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS README SECURITY README.*
-	mv "${D}/usr/bin/muse" "${D}/usr/bin/museseq"
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README* SECURITY
+	mv "${D}"/usr/bin/muse "${D}"/usr/bin/museseq
 }
 
 pkg_postinst() {