[proaudio] [1661] museseq: bumped to 1.0.1, repoman payment, some cleanup, removed unneeded patches & very old museseq-0.9_pre3.ebuild.

[ Thread Index | Date Index | More lists.tuxfamily.org/proaudio Archives ]


Revision: 1661
Author:   gentoid
Date:     2010-04-30 22:03:43 +0200 (Fri, 30 Apr 2010)
Log Message:
-----------
museseq: bumped to 1.0.1, repoman payment, some cleanup, removed unneeded patches & very old museseq-0.9_pre3.ebuild. museseq-2.9999.ebuild still fails

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/museseq/ChangeLog
    trunk/overlays/proaudio/media-sound/museseq/Manifest
    trunk/overlays/proaudio/media-sound/museseq/metadata.xml
    trunk/overlays/proaudio/media-sound/museseq/museseq-1.0_rc1.ebuild
    trunk/overlays/proaudio/media-sound/museseq/museseq-1.9999.ebuild
    trunk/overlays/proaudio/media-sound/museseq/museseq-2.9999.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/museseq/museseq-1.0.1.ebuild

Removed Paths:
-------------
    trunk/overlays/proaudio/media-sound/museseq/files/1.0.9999/
    trunk/overlays/proaudio/media-sound/museseq/museseq-0.9_pre3.ebuild

Modified: trunk/overlays/proaudio/media-sound/museseq/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/ChangeLog	2010-04-29 15:16:52 UTC (rev 1660)
+++ trunk/overlays/proaudio/media-sound/museseq/ChangeLog	2010-04-30 20:03:43 UTC (rev 1661)
@@ -1,7 +1,17 @@
 # ChangeLog for media-sound/museseq
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*museseq-1.0.1 (30 Apr 2010)
+
+  30 Apr 2010; Viktor Lazarev <taurus101v@xxxxxxxxx>
+  -files/1.0.9999/02_all_log2f_aliasing.patch, -museseq-0.9_pre3.ebuild,
+  museseq-1.0_rc1.ebuild, -files/1.0.9999/04_all_asneeded.patch,
+  +museseq-1.0.1.ebuild, museseq-1.9999.ebuild, -files/1.0.9999/amd64.diff,
+  museseq-2.9999.ebuild, metadata.xml:
+  version bump, repoman payment, some cleanup, remove unneeded patches & very
+  old ebuild
+
   07 Mar 2009; Dominique Michel <dominique.michel@xxxxxxxxx>
   museseq-2.9999: fix for fltk patch to apply
     

Modified: trunk/overlays/proaudio/media-sound/museseq/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/Manifest	2010-04-29 15:16:52 UTC (rev 1660)
+++ trunk/overlays/proaudio/media-sound/museseq/Manifest	2010-04-30 20:03:43 UTC (rev 1661)
@@ -1,14 +1,11 @@
-AUX 1.0.9999/02_all_log2f_aliasing.patch 1219 RMD160 571c7aecc73c98696a6673ee240054bde3f7c526 SHA1 6c94569e0dce6542b75c3c078a7fe52cae5800f7 SHA256 e92704bef93fd70d1f22c05763e46edd814116a805bcd46586682881f536c28b
-AUX 1.0.9999/04_all_asneeded.patch 531 RMD160 aebf5a6a52313ea3f6e9678b91bf9236ed5c3b75 SHA1 06b408317dc4a1d8070df338201113f36eab313e SHA256 0ee3c1eaf6680db9cace739e9271bbe9f8455986a26355f9ceae7743a3b2b368
-AUX 1.0.9999/amd64.diff 2781 RMD160 e3c00c771dffa50c1373a7c60d6c016e556a6d39 SHA1 c6287a77c8b303dbbcbbb725e3c18b299cc66687 SHA256 cbcf552f5040139d0c7a13a58c0c0c65d25cbaa87aa17d77edbaea6d23ea24bf
 AUX fix_zyn.patch 1115 RMD160 d5c4ecec65534f7e47cb928f58b045c50179ad8a SHA1 61d832a3adb6376c0b7570311514c4b157706e6a SHA256 0a66f0dfc9451efd7a19833dbb22a7abc6382e6857596c54475ff14eadf20ee7
 AUX museseq-9999-find_fltk.patch 363 RMD160 4fa8453e42443fd03f2d270560eac71e3d83e5e0 SHA1 7f59d4478601e533f5234a5ef802f8f0c7b32ccb SHA256 e31ec9777580f44a9c7facea9122c5c4a9e9e3ba4090a98968598e40d85889f2
 AUX sse_functions_64bit.s 12051 RMD160 8532994c45d1a0c2323411de26f121bb3a632350 SHA1 8a4ee6c6e2c7179daf1723d8f92873c3c4374f6b SHA256 460e6f8ec1a8a4691a72ebec5551c0104f933ea500c6f93ee51be47fb8508285
-DIST muse-0.9pre3.tar.gz 2350280 RMD160 3403ef6b02e6e81082fd38be01ac1ccbe94f47da SHA1 4c42ffc9c12523aa387a1e07752b4fd4a3dd0223 SHA256 53a201bb785244aa1a03c6839aa0a662773b3a7171cd771be083d82b0040d8f3
+DIST muse-1.0.1.tar.gz 2666184 RMD160 85b3325b9a7cf3b29733dc9c01ee7a5fcc081eb5 SHA1 9846c1df9d46b8ff50dfa428bc1c71a7b425abd9 SHA256 e78cb3f01791974976bc7577478d1cbecfdb7c5b3694fa742038b682a1abe03b
 DIST muse-1.0rc1.tar.gz 2461851 RMD160 ada06aa176756de54f650a0feb6d4958d6c1bf40 SHA1 db20ff7b039370a10f8bf7e56c415842a618b8b7 SHA256 c5f9fd6ad978dc789de1f60329b904d0476a142525d80ddaad3c13850fded756
-EBUILD museseq-0.9_pre3.ebuild 1616 RMD160 aa68d4ff99f55a80bd728209ac375604cc6ced57 SHA1 6312168c0429f5b0d69498b0eb1b5f57344e2ff9 SHA256 edc826bf1b0f8af9010e293968755b7bb9aaf1ead8b598ee8e9efc1f02c366b8
-EBUILD museseq-1.0_rc1.ebuild 1948 RMD160 c3fb92c958e1a9e3782e27f56c0ed88363b493d4 SHA1 75b227be8f2227fefafe02eddc1779e153c175e8 SHA256 e0bf56ada4acaa5dde7b283b74f1c6d798a1ac0d5eda7ddfca9b4f2910d33daa
-EBUILD museseq-1.9999.ebuild 2224 RMD160 03e898db0bb51fdbcc51e22f24a8f2eef764108f SHA1 f27e2b4e1f7e68cd76a3a2197dadf9ad09d9be03 SHA256 f5985213436fe8b683d229ebc19b27a20592d55c750728da4229e46faf5ef5b4
-EBUILD museseq-2.9999.ebuild 2470 RMD160 98982337cc5061ee1e2db9fb3029cce461fe86d2 SHA1 592ba6fa0d6879f707058fdee0fe47f3f3410993 SHA256 7c739110865995e37d97495742f8fb5f10618cc3323dec834cc56408371f55ac
-MISC ChangeLog 1143 RMD160 54341775755a2f8928678a6ba811acefe6e69b62 SHA1 73080076011ac7eb845a1129097ed2e5285328bf SHA256 6b78868a67b339fdc06fff505bd202fed5bcc7584d77add7792d0d5290571640
-MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
+EBUILD museseq-1.0.1.ebuild 2309 RMD160 c753bf1f2aa0e221115a04cb491f9583e0072d19 SHA1 004239e607796a229dfd86c6632a52c116a40b30 SHA256 a0ef5c424049ec3a4bd8d7fee1cc45ca79894386191a6b55c186dbf47731eadf
+EBUILD museseq-1.0_rc1.ebuild 1933 RMD160 4c2b4a26f1c929cec54c2ebba171893deb490b1d SHA1 fbb27a2bc823df9517c776aa788633d32863da17 SHA256 78667aa31644c03a697d82af4fe2302732d791e4461d733c84af00288a098333
+EBUILD museseq-1.9999.ebuild 2119 RMD160 7d71bc973b41466c3aafdb4d76c8a2925bb54794 SHA1 09802c1a44fa96cf509924acedf303866eacb3f3 SHA256 40b33b99e1e570737ab4f446a35175b200677c28fa6d59d32dfc6020699612b2
+EBUILD museseq-2.9999.ebuild 2619 RMD160 dce68d6918b2fb4e9503231a99ef1066d96832bb SHA1 17b03bd6b116b5249a5a147edc77c61d89128da7 SHA256 6781a853d33c81293a7551751c6abac5d595befeae0d4237c200bc94f8c2de5f
+MISC ChangeLog 1571 RMD160 44f41f0c63d3f54d2355f2ef8ca2def3fa57c496 SHA1 741dcee09c27c1f063209c214f4acd3853ebf1a3 SHA256 44a1f28a61f7f373215e8ab9a9871bd9c8f9f7431944b74c59693b29e9ff01f9
+MISC metadata.xml 403 RMD160 f54842a83c6d3d1aaa99ebc110744d28b17eb4cf SHA1 a98f705024fd03d18198ed61ab77e0de72b76831 SHA256 69a090e01608a5e43e0115774b6dfd83783fe80e884195fd36582be4d4f176d6

Modified: trunk/overlays/proaudio/media-sound/museseq/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/metadata.xml	2010-04-29 15:16:52 UTC (rev 1660)
+++ trunk/overlays/proaudio/media-sound/museseq/metadata.xml	2010-04-30 20:03:43 UTC (rev 1661)
@@ -6,4 +6,8 @@
 		<email>proaudio@xxxxxxxxxxxxx</email>
 		<name>pro-audio overlay team</name>
 	</maintainer>
+	<use>
+		<flag name="fluidsynth">Enable fluidsynth support</flag>
+		<flag name="zynaddsubfx">Enable zynaddsubfx support</flag>
+	</use>
 </pkgmetadata>

Deleted: trunk/overlays/proaudio/media-sound/museseq/museseq-0.9_pre3.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/museseq-0.9_pre3.ebuild	2010-04-29 15:16:52 UTC (rev 1660)
+++ trunk/overlays/proaudio/media-sound/museseq/museseq-0.9_pre3.ebuild	2010-04-30 20:03:43 UTC (rev 1661)
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit kde-functions eutils toolchain-funcs
-need-qt 3
-
-MY_P=${P/museseq/muse}
-MY_P=${MY_P/_/}
-
-DESCRIPTION="The Linux (midi) MUSic Editor (a sequencer)"
-SRC_URI="mirror://sourceforge/lmuse/${MY_P}.tar.gz"
-HOMEPAGE="http://www.muse-sequencer.org/";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc x86"
-IUSE="lash debug"
-
-DEPEND=">=x11-libs/qt-3.2.0
-	alsa? ( media-libs/alsa-lib )
-	>=media-sound/fluidsynth-1.0.3
-	doc? ( app-text/openjade
-		   app-doc/doxygen
-		   media-gfx/graphviz )
-	dev-lang/perl
-	>=media-libs/libsndfile-1.0.4
-	>=media-libs/libsamplerate-0.1.0
-	>=media-sound/jack-audio-connection-kit-0.98.0
-	lash? ( >=media-sound/lash-0.5.0 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf \
-		`use_enable lash` \
-		`use_enable debug` \
-		--disable-suid-install \
-		--enable-optimize \
-		--disable-suid-build \
-		|| die "Configure failed"
-
-	emake all || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install failed"
-	dodoc AUTHORS ChangeLog INSTALL NEWS README SECURITY README.*
-	mv ${D}/usr/bin/muse ${D}/usr/bin/museseq
-}
-
-pkg_postinst() {
-	echo
-	einfo "You have to enable realtime capabilities in order to run MuSE."
-	einfo "See http://www.gentoo.org/proj/en/desktop/sound/realtime.xml";
-	einfo
-	einfo "If using pam rlimits instead Realtime LSM and you hit this error:"
-	einfo "\"RtcTimer::setTimerFreq(): cannot set tick on /dev/rtc: Permission
-	denied\""
-	einfo "add the following to /etc/conf.d/local.start"
-	einfo "echo 1024 > /proc/sys/dev/rtc/max-user-freq"
-	echo
-}

Copied: trunk/overlays/proaudio/media-sound/museseq/museseq-1.0.1.ebuild (from rev 1660, trunk/overlays/proaudio/media-sound/museseq/museseq-1.0_rc1.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/museseq-1.0.1.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/museseq/museseq-1.0.1.ebuild	2010-04-30 20:03:43 UTC (rev 1661)
@@ -0,0 +1,81 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils flag-o-matic
+
+MY_P=${P/museseq/muse}
+MY_P=${MY_P/_/}
+
+DESCRIPTION="The Linux (midi) MUSic Editor (a sequencer)"
+SRC_URI="mirror://sourceforge/lmuse/${MY_P}.tar.gz"
+HOMEPAGE="http://www.muse-sequencer.org/";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fluidsynth lash pch"
+# how about "dssi (open)jade sse vst/win"?
+RDEPEND="
+	x11-libs/qt-core:4[qt3support]
+	x11-libs/qt-gui:4[qt3support]
+	>=media-libs/alsa-lib-0.9.0
+	fluidsynth? ( >=media-sound/fluidsynth-1.0.3 )
+	dev-lang/perl
+	>=media-libs/libsndfile-1.0.1
+	>=media-libs/libsamplerate-0.1.0
+	>=media-sound/jack-audio-connection-kit-0.98.0
+	lash? ( >=media-sound/lash-0.5.0 )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/openjade
+		   app-doc/doxygen
+		   media-gfx/graphviz )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	# new strange --as-needed error, not like the old one
+	filter-ldflags -Wl,--as-needed --as-needed
+
+	for i in am in; do
+		sed -e "/-include \$(top_srcdir)\/all.h/s/dir)\/all.h/dir)\/all.h -DINSTPREFIX=\"\$(prefix)\"/" \
+			-i "./muse/remote/Makefile.${i}" || die "fix Makefile.${i} failed";
+	done
+
+	sed -e "/string launcherfilename =/s/string(INSTPREFIX)/string(\"INSTPREFIX\")/" \
+		-i "./muse/remote/pyapi.cpp" || die "fix failed"
+
+	econf \
+		`use_enable lash` \
+		`use_enable debug` \
+		`use_enable pch` \
+		--disable-suid-install \
+		--enable-optimize \
+		--disable-suid-build \
+		|| die "Configure failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+	dodoc AUTHORS ChangeLog INSTALL NEWS README SECURITY README.*
+	mv "${D}/usr/bin/muse" "${D}/usr/bin/museseq"
+
+	newicon "packaging/muse_icon.png" "${PN}.png"
+	make_desktop_entry ${PN} "MusE Sequencer" ${PN} "AudioVideo;Audio;Sequencer"
+}
+
+pkg_postinst() {
+	echo
+	einfo "You have to enable realtime capabilities in order to run MuSE."
+	einfo "See http://www.gentoo.org/proj/en/desktop/sound/realtime.xml";
+	einfo
+	einfo "If using pam rlimits instead Realtime LSM and you hit this error:"
+	einfo "\"RtcTimer::setTimerFreq(): cannot set tick on /dev/rtc: Permission denied\""
+	einfo "add the following to /etc/sysctl.conf and run \"sysctl -a\""
+	echo
+	einfo "dev.rtc.max-user-freq = 1024"
+	echo
+}

Modified: trunk/overlays/proaudio/media-sound/museseq/museseq-1.0_rc1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/museseq-1.0_rc1.ebuild	2010-04-29 15:16:52 UTC (rev 1660)
+++ trunk/overlays/proaudio/media-sound/museseq/museseq-1.0_rc1.ebuild	2010-04-30 20:03:43 UTC (rev 1661)
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=1
+EAPI="2"
 
-inherit eutils autotools flag-o-matic 
+inherit eutils flag-o-matic
 
 MY_P=${P/museseq/muse}
 MY_P=${MY_P/_/}
@@ -18,26 +18,28 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc fluidsynth lash pch"
 
-DEPEND=">=x11-libs/qt-3.2.0:3
+RDEPEND="
+	x11-libs/qt-core:4[qt3support]
+	x11-libs/qt-gui:4[qt3support]
 	>=media-libs/alsa-lib-0.9.0
 	fluidsynth? ( >=media-sound/fluidsynth-1.0.3 )
-	doc? ( app-text/openjade
-		   app-doc/doxygen
-		   media-gfx/graphviz )
 	dev-lang/perl
-	>=media-libs/libsndfile-1.0.0
+	>=media-libs/libsndfile-1.0.1
 	>=media-libs/libsamplerate-0.1.0
 	>=media-sound/jack-audio-connection-kit-0.98.0
 	lash? ( >=media-sound/lash-0.5.0 )"
 
+DEPEND="${RDEPEND}
+	doc? ( app-text/openjade
+		   app-doc/doxygen
+		   media-gfx/graphviz )"
+
 S="${WORKDIR}/${MY_P}"
 
-src_compile() {
+src_configure() {
 	# new strange --as-needed error, not like the old one
 	filter-ldflags -Wl,--as-needed --as-needed
 
-	addpredict /usr/qt/3/etc/settings/.qt_plugins_3.3rc.lock
-
 	econf \
 		`use_enable lash` \
 		`use_enable debug` \
@@ -46,14 +48,12 @@
 		--enable-optimize \
 		--disable-suid-build \
 		|| die "Configure failed"
-
-	emake all || die
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "install failed"
+	make DESTDIR="${D}" install || die "install failed"
 	dodoc AUTHORS ChangeLog INSTALL NEWS README SECURITY README.*
-	mv ${D}/usr/bin/muse ${D}/usr/bin/museseq
+	mv "${D}/usr/bin/muse" "${D}/usr/bin/museseq"
 
 	newicon "packaging/muse_icon.png" "${PN}.png"
 	make_desktop_entry ${PN} "MusE Sequencer" ${PN} "AudioVideo;Audio;Sequencer"

Modified: trunk/overlays/proaudio/media-sound/museseq/museseq-1.9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/museseq-1.9999.ebuild	2010-04-29 15:16:52 UTC (rev 1660)
+++ trunk/overlays/proaudio/media-sound/museseq/museseq-1.9999.ebuild	2010-04-30 20:03:43 UTC (rev 1661)
@@ -1,34 +1,35 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.9.ebuild,v 1.4 2008/07/27 21:30:21 carlo Exp $
 
-EAPI=1
+EAPI="2"
 
-inherit kde-functions exteutils cvs
+inherit exteutils subversion
 
-MY_PN=${PN/museseq/muse}
-
 DESCRIPTION="MusE is a MIDI/Audio sequencer with recording and editing capabilities"
 HOMEPAGE="http://www.muse-sequencer.org";
 SRC_URI=""
 
-ECVS_SERVER="lmuse.cvs.sourceforge.net:/cvsroot/lmuse"
-ECVS_MODULE="muse"
-ECVS_BRANCH="REL07"
+ESVN_REPO_URI="https://lmuse.svn.sourceforge.net/svnroot/lmuse/trunk/muse";
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="doc lash debug"
 
-RDEPEND=">=x11-libs/qt-3.2.0:3
+MY_PN=${PN/museseq/muse}
+
+RDEPEND="
+	x11-libs/qt-core:4[qt3support]
+	x11-libs/qt-gui:4[qt3support]
 	>=media-libs/alsa-lib-0.9.0
 	>=media-sound/fluidsynth-1.0.3
 	dev-lang/perl
-	>=media-libs/libsndfile-1.0.0
+	>=media-libs/libsndfile-1.0.1
 	>=media-libs/libsamplerate-0.1.0
 	>=media-sound/jack-audio-connection-kit-0.98.0
 	lash? ( >=media-sound/lash-0.5.0 )"
+
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( app-text/openjade
@@ -37,21 +38,13 @@
 
 S="${WORKDIR}/${MY_PN}"
 
-src_unpack() {
-	cvs_src_unpack
-	cd "${S}"
-	EPATCH_SUFFIX="patch" epatch "${FILESDIR}"/${PV}
-}
-
-src_compile() {
+src_configure() {
 	einfo "Running autogen..."
 	./autogen.sh || die "autogen failed"
 
 	econf --disable-suid-build --disable-optimize \
 		$(use_enable lash) $(use_enable debug) \
 		|| die "econf failed."
-
-	emake || die "emake failed."
 }
 
 src_install() {

Modified: trunk/overlays/proaudio/media-sound/museseq/museseq-2.9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/museseq-2.9999.ebuild	2010-04-29 15:16:52 UTC (rev 1660)
+++ trunk/overlays/proaudio/media-sound/museseq/museseq-2.9999.ebuild	2010-04-30 20:03:43 UTC (rev 1661)
@@ -1,13 +1,12 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI="2"
 
 inherit subversion eutils toolchain-funcs cmake-utils flag-o-matic
 
-ESVN_REPO_URI="https://lmuse.svn.sourceforge.net/svnroot/lmuse/trunk/muse";
-RESTRICT="ccache"
+ESVN_REPO_URI="https://lmuse.svn.sourceforge.net/svnroot/lmuse/trunk/muse_qt4_evolution";
 
 MY_PN=${PN/museseq/muse}
 S=${WORKDIR}/${MY_PN}
@@ -20,16 +19,11 @@
 KEYWORDS=""
 IUSE="doc dssi fluidsynth lash vst zynaddsubfx"
 
-DEPEND="|| ( ( x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-xmlpatterns
+RDEPEND="|| ( ( x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-xmlpatterns
 		x11-libs/qt-qt3support x11-libs/qt-svg )
 		>=x11-libs/qt-4.2:4[qt3support] )
-	>=dev-util/cmake-2.4.7
-	=sys-devel/gcc-4*
 	>=media-libs/alsa-lib-1.0
 	>=media-sound/fluidsynth-1.0.3
-	doc? ( app-text/openjade
-		   app-doc/doxygen
-		   media-gfx/graphviz )
 	dev-lang/perl
 	>=media-libs/libsndfile-1.0.1
 	>=media-libs/libsamplerate-0.1.0
@@ -40,15 +34,27 @@
 			>=dev-libs/mini-xml-2 )
 	vst? ( media-libs/fst )"
 
+DEPEND="
+	>=dev-util/cmake-2.4.7
+	=sys-devel/gcc-4*
+	doc? ( app-text/openjade
+		   app-doc/doxygen
+		   media-gfx/graphviz )"
+
 src_unpack() {
 	subversion_src_unpack
-	cd ${S}
+	cd "${S}"
+}
 
+src_prepare() {
+
 	# copy over correct header from ardour in case of amd64
-	use amd64 && cp ${FILESDIR}/sse_functions_64bit.s al/dspSSE.cpp
+	use amd64 && cp "${FILESDIR}/sse_functions_64bit.s" al/dspSSE.cpp
 
 	# find fltk
 	epatch "${FILESDIR}/${PN}-9999-find_fltk.patch"
+	#sed -e "/set (FLTK_INCLUDE/s/include\"/include\/fltk-1.1\"/" \
+	#	-i CMakeLists.txt || die "FLTK path fix failed"
 
 	# doc stuff
 	use doc || sed -i -e 's@muse share doc@muse share@' CMakeLists.txt
@@ -57,7 +63,7 @@
 src_configure() {
 	# linking with --as-needed is broken :(
 	filter-ldflags -Wl,--as-needed --as-needed
-	
+
 	# work around -lQtSvg not found error
 	append-flags "-L/usr/$(get_libdir)/qt4"
 	append-ldflags "-L/usr/$(get_libdir)/qt4"
@@ -69,10 +75,10 @@
 		$(cmake-utils_use_enable zynaddsubfx ZYNADDSUBFX)
 		"
 	cmake-utils_src_configure
-	
+
 	# workaround empty revision.h
 	svn info ${ESVN_STORE_DIR}/${PN}/muse | grep Revision | \
-		cut	-f 2 -d " " > ${WORKDIR}/${PN}_build/revision.h \
+		cut	-f 2 -d " " > "${WORKDIR}/${PN}_build/revision.h" \
 		|| die "generating revision.h failed"
 
 }


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/