old

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

8 files changed, 16 insertions, 363 deletions

diff --git a/media-sound/zynaddsubfx/ChangeLog b/media-sound/zynaddsubfx/ChangeLog
index 4adc5ba75ac3..95b14d07d8e0 100644
--- a/media-sound/zynaddsubfx/ChangeLog
+++ b/media-sound/zynaddsubfx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/zynaddsubfx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.38 2012/01/05 17:30:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.39 2012/01/05 17:34:26 ssuominen Exp $
+
+  05 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -zynaddsubfx-2.2.1-r2.ebuild, -zynaddsubfx-2.2.1-r4.ebuild,
+  -zynaddsubfx-2.4.0.ebuild, -files/zynaddsubfx-2.4.0-ldflags.patch,
+  -files/zynaddsubfx-2.4.0-nullmidiin.patch,
+  -files/zynaddsubfx-2.4.0-string.patch:
+  old
 
   05 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> zynaddsubfx-2.4.1.ebuild:
   amd64/x86 stable wrt #395745
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 6b6df3e00e5b..f6439678c709 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,29 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX zynaddsubfx-2.4.0-ldflags.patch 462 RMD160 f1f32bb7808b03a2aca7ac8f5e0b857077bed2eb SHA1 057cd2d4a9e3252589bb22320319fa40a3d8a7f4 SHA256 d3dac5ee2ef086af35bf1cab6880b7792fb65ae5c2e652f56cb84682708aaa9c
-AUX zynaddsubfx-2.4.0-nullmidiin.patch 1130 RMD160 45e126303f72c4ea4a1b77a2f515eee0828b313b SHA1 50099c1c2c10a6cddd28f476fba50205d250b84b SHA256 d7affb50fc2146c7fde21770359057ff60bfe98e021684ce8b366bb39af9ca9c
-AUX zynaddsubfx-2.4.0-string.patch 819 RMD160 e96db048d3b3c95df0103206a8091d90126b5df4 SHA1 911c56e9c704d41ad0a2343cc74ad0a45effdf2c SHA256 ac2335d4d7deeed23f0b3a879367fd1c811c13e5cf5b5707254f803565e7a215
 AUX zynaddsubfx-2.4.1-docs.patch 420 RMD160 4a47f9fbcd150c19e8e0cb208694cf82e998e5a3 SHA1 ff748a72f2bbac27a4117052ddfb4fb2287fb038 SHA256 379c61a8f911d4794f3369f5b12b46142b46fb771d2cd2877e220c33e6891ec2
 AUX zynaddsubfx-2.4.1-fltk.patch 1492 RMD160 4abefa4db84b5a7663cc4e97e2d119db19773159 SHA1 2a4a8c4eb23bd5093c68a6fcf3f4d5afb5a81c58 SHA256 b4fab50f4fd3f91d655e9c613973b2a50750b73577044301cf6b7017d0714c47
 AUX zynaddsubfx-2.4.1-fltk13.patch 1978 RMD160 9a81931bc5d9fefb045c2d09e29b21f22b2cbbd8 SHA1 a91a54d02e65e271bde6c3b4fca5d66c92cc33a8 SHA256 34b328ae07ec901e0508914ae76f0b9b38cb0cf2e12afed585900eaee7048d22
-DIST ZynAddSubFX-2.2.1.tar.bz2 927022 RMD160 d21b7988182d2cf9a9c8ee873e708adec33e40fc SHA1 d49294b5e27d4b5a5aad106b0239ef273b583b88 SHA256 dab5dc86e0a2459fa2a870da133c7dda0aa2e1d895839594f4b520ca05cc80d2
-DIST ZynAddSubFX-2.4.0.tar.bz2 1418352 RMD160 a490b7ee3134c9a912d475f07e1e485d8fac578f SHA1 e253e99399590ef2ff7f276f720dc367e2864f10 SHA256 7675a7ac7741dcfce0bed197e2190f2e21b5b0a072458bcb605184b7be246c63
 DIST ZynAddSubFX-2.4.1.tar.bz2 2449356 RMD160 b0cf8e16e17d5db2d2c1976c2c69f8abdf753b13 SHA1 5abffff4ff2710dc427c4888a167c8f8a74d7c7e SHA256 cf796e23c1f268307373dca3d0dacaf80a19d813da4bd290742b6773e0a3c5fe
-EBUILD zynaddsubfx-2.2.1-r2.ebuild 2060 RMD160 fc5fbacb00f63df9d2fa9025f4872445918a744f SHA1 73241c9172d2605825351969e892415e6303c353 SHA256 5c406cc8576fef4dfa21348e98b01316b62759919939b7add3255a4ec80accf0
-EBUILD zynaddsubfx-2.2.1-r4.ebuild 2360 RMD160 db8ee7e4f1214a71c76ff815434a3846d0d59f66 SHA1 2d5a89d8b4422585aed1ec10fb5d2eabcb4c857f SHA256 da4b8460d8a1a6450179e523f9c17094af438e3ca94a8af38a6b602b2f87f1db
-EBUILD zynaddsubfx-2.4.0.ebuild 2846 RMD160 2f163493f2af6d8299bf5a158dd60b546c527eb2 SHA1 a8e0b45a4bcf675df5d8e49dabb33d04247e5184 SHA256 734e5f8788bcf9681ad9f4417e6de814428f839af84ee7ce18b11de647776b5d
 EBUILD zynaddsubfx-2.4.1.ebuild 1766 RMD160 7341f3966cd540e6317ac0ae30008217dbabd0a4 SHA1 6364dfeee58e4c32a8f555045dd13b20376f2b7b SHA256 106b402638962af18f9f2899345cf8180b035a2d5ccb17cd37ef95aa7d59f103
-MISC ChangeLog 6738 RMD160 daa04ec5570da060aa8a71d643b6ebb50899048c SHA1 26dcb548d16dca48de76df7c55f548a9726d30c6 SHA256 5b54c4c036c3a5f476c9728ee7b659d75c00df74db6da694c5001543dfd234bf
+MISC ChangeLog 7016 RMD160 7235e9c5e40e71564bc08f514fafbabb4ea65992 SHA1 c85207c723c71143a86189775832a5ed690dbb70 SHA256 f6d26f5a080eaf07e8e186e74a4ad708ecff2108e8a8444e4960fc6a939c6aa2
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPBd2oAAoJEEdUh39IaPFNoAQH/0WPFvQ1KMQU/oG9XSwZ/8Wa
-dxU0AfyHiERiAMFEHjkB2e/RMWKiK2lNyEdM01uYnnTdwL7PSJYXj8QoRjZDmUo0
-wK0/higVO6Mh5Fnf3Pb/OOSpaJTJo9wioROzzNJq+YtDbs0H19w+bPwTO0DITUBe
-IJC+BMguhHfqb9kmGkOeFXtdwDqq1EMqG+okhqp3fbSRRi5SwEGYoKfQDtchOY28
-aczuKsUgSPhGobWzVaAfFLfys/U5F2CCNaWtmQ7ZSvBH6miIwuST0OWJMwZ6s135
-n3u4NsC4R9Gyi89IgQ10eclNtHSf99L+1YL8FtgvBY26WscLAyRByEYyyQmMPG4=
-=N5sx
+iQEcBAEBAgAGBQJPBd6nAAoJEEdUh39IaPFNX2QH/jP+63aIgytJ0XukzshYAdfP
+UZ4FlEnLH3wJgywjJU2/8tQVNlrgpJHZlApL5I1dlkitBLedarGNCybMmpMbvfbD
+qwgs10HWfHGhUebIj1bWc5LK5ShD/KYl+DkwyAJPVUTbHZZGDzmV/asr7zYLvBUv
+jnWXOJurPtBAu6b7MELFcCSFYqLaNUlxIFkSFiWhK2p7blxSHO8rdYgCGVK0IBA+
+4XOyAvRTn6mDoaGp7oSd9aArP9GPGCea7k/oFS/QZbFX2JEQHzAInTid+shRLVAM
+Id2KUi8ohqxh03q6VEhq3eZPCw+oqzkpAtZbHxDaVAxb/A15Bj1zrjEr7ysRGO0=
+=jlIH
 -----END PGP SIGNATURE-----
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.0-ldflags.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.0-ldflags.patch
deleted file mode 100644
index 13f9a7a31956..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.0-ldflags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: ZynAddSubFX-2.4.0/src/Makefile
-===================================================================
---- ZynAddSubFX-2.4.0.orig/src/Makefile
-+++ ZynAddSubFX-2.4.0/src/Makefile
-@@ -101,9 +101,9 @@ else
- 
- 
- ifeq ($(OS_PORT),LINUX) 
--	$(CXX) -o zynaddsubfx */*.o *.o $(LIBS)
-+	$(CXX) $(LDFLAGS) -o zynaddsubfx */*.o *.o $(LIBS)
- else
--	$(CXX) -o zynaddsubfx.exe */*.o *.o $(LIBS)
-+	$(CXX) $(LDFLAGS) -o zynaddsubfx.exe */*.o *.o $(LIBS)
- endif 
- endif
- endif
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.0-nullmidiin.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.0-nullmidiin.patch
deleted file mode 100644
index 261bb1b656f5..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.0-nullmidiin.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: ZynAddSubFX-2.4.0/src/Input/NULLMidiIn.cpp
-===================================================================
---- ZynAddSubFX-2.4.0.orig/src/Input/NULLMidiIn.cpp
-+++ ZynAddSubFX-2.4.0/src/Input/NULLMidiIn.cpp
-@@ -34,7 +34,7 @@ NULLMidiIn::~NULLMidiIn()
-  * Get the midi command,channel and parameters
-  * It returns MidiNull because it is a dummy driver
-  */
--void NULLMidiIn::getmidicmd(MidiCmdType &cmdtype,unsigned char &cmdchan,unsigned char *cmdparams)
-+void NULLMidiIn::getmidicmd(MidiCmdType &cmdtype,unsigned char &cmdchan,int *cmdparams)
- {
-     cmdtype=MidiNull;
- };
-Index: ZynAddSubFX-2.4.0/src/Input/NULLMidiIn.h
-===================================================================
---- ZynAddSubFX-2.4.0.orig/src/Input/NULLMidiIn.h
-+++ ZynAddSubFX-2.4.0/src/Input/NULLMidiIn.h
-@@ -39,7 +39,7 @@ public:
-     /**Get the midi command,channel and parameters
-      * It returns MidiNull because it is a dummy driver
-      */
--    void getmidicmd(MidiCmdType &cmdtype,unsigned char &cmdchan,unsigned char *cmdparams);
-+    void getmidicmd(MidiCmdType &cmdtype,unsigned char &cmdchan,int *cmdparams);
- 
- private:
- };
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.0-string.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.0-string.patch
deleted file mode 100644
index d901d4981c01..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.0-string.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&atid=502314&aid=2834750&group_id=62934
-
-Index: ZynAddSubFX-2.4.0/src/main.cpp
-===================================================================
---- ZynAddSubFX-2.4.0.orig/src/main.cpp
-+++ ZynAddSubFX-2.4.0/src/main.cpp
-@@ -210,11 +210,11 @@ void *thread3(void *arg)
-         string filename;
-         switch (lash->checkevents(filename)) {
-         case LASHClient::Save:
--            ui->do_save_master(filename);
-+            ui->do_save_master(filename.c_str());
-             lash->confirmevent(LASHClient::Save);
-             break;
-         case LASHClient::Restore:
--            ui->do_load_master(filename);
-+            ui->do_load_master(filename.c_str());
-             lash->confirmevent(LASHClient::Restore);
-             break;
-         case LASHClient::Quit:
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r2.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r2.ebuild
deleted file mode 100644
index 6cc64ce7209c..000000000000
--- a/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r2.ebuild,v 1.10 2011/03/20 20:06:18 jlec Exp $
-
-EAPI=1
-inherit eutils
-
-MY_P=ZynAddSubFX-${PV}
-
-DESCRIPTION="ZynAddSubFX is an opensource software synthesizer."
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zynaddsubfx/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-#IUSE="oss alsa jack mmx"
-IUSE="oss alsa jack"
-
-RDEPEND="
-	x11-libs/fltk:1
-	sci-libs/fftw:3.0
-	jack? ( media-sound/jack-audio-connection-kit )
-	>=dev-libs/mini-xml-2.2.1"
-#	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2 || die
-}
-
-src_compile() {
-	local FFTW_VERSION=3
-	local ASM_F2I=NO
-	local LINUX_MIDIIN=NONE
-	local LINUX_AUDIOOUT=NONE
-
-	if use oss ; then
-		LINUX_MIDIIN=OSS
-		LINUX_AUDIOOUT=OSS
-		use jack && LINUX_AUDIOOUT=OSS_AND_JACK
-	else
-		use jack && LINUX_AUDIOOUT=JACK
-	fi
-
-	use alsa && LINUX_MIDIIN=ALSA
-#	use portaudio && LINUX_AUDIOOUT=PA
-#	use mmx && ASM_F2I=YES
-
-	cd "${S}/src"
-	make \
-		FFTW_VERSION=${FFTW_VERSION} \
-		ASM_F2I=${ASM_F2I} \
-		LINUX_MIDIIN=${LINUX_MIDIIN} \
-		LINUX_AUDIOOUT=${LINUX_AUDIOOUT} \
-		|| die "compile failed"
-	cd "${S}/ExternalPrograms/Spliter"
-	./compile.sh
-	cd "${S}/ExternalPrograms/Controller"
-	./compile.sh
-}
-
-src_install() {
-	dobin "${S}/src/zynaddsubfx"
-	dobin "${S}/ExternalPrograms/Spliter/spliter"
-	dobin "${S}/ExternalPrograms/Controller/controller"
-	dodoc ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt
-
-	for i in "Arpeggios" "Bass" "Brass" "Choir and Voice" "Drums" \
-			 "Dual" "Fantasy" "Guitar" "Misc" "Noises" "Organ" \
-			 "Pads" "Plucked" "Reed and Wind" "Rhodes" "Splited" \
-			 "Strings" "Synth" "SynthPiano"
-	do
-		insinto "/usr/share/${PN}/banks/${i}"
-		doins "${S}/banks/${i}/"*
-	done
-
-	insinto /usr/share/${PN}/presets
-	doins "${S}/presets/"*
-	insinto /usr/share/${PN}
-	doins "${S}/examples/"*
-}
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r4.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r4.ebuild
deleted file mode 100644
index d7a4151534b6..000000000000
--- a/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.2.1-r4.ebuild,v 1.6 2011/03/20 20:06:18 jlec Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-MY_P=ZynAddSubFX-${PV}
-
-DESCRIPTION="ZynAddSubFX is an opensource software synthesizer."
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zynaddsubfx/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-#IUSE="oss alsa jack mmx"
-IUSE="oss alsa jack"
-
-RDEPEND="
-	x11-libs/fltk:1
-	sci-libs/fftw:3.0
-	jack? ( media-sound/jack-audio-connection-kit )
-	alsa? ( media-libs/alsa-lib )
-	>=dev-libs/mini-xml-2.2.1"
-#	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i -e '/CXXFLAGS +=/s:CXXFLAGS +=:override CXXFLAGS +=:' \
-		-e '/export CXXFLAGS/d' \
-		-e '/\$(MAKE) -C UI/s:$: CXXFLAGS="${CXXFLAGS}":' \
-		"${S}/src/Makefile" || die "unable to reset CXXFLAGS overrides."
-}
-
-src_compile() {
-	local FFTW_VERSION=3
-	local ASM_F2I=NO
-	local LINUX_MIDIIN=NONE
-	local LINUX_AUDIOOUT=NONE
-
-	if use oss ; then
-		LINUX_MIDIIN=OSS
-		LINUX_AUDIOOUT=OSS
-		use jack && LINUX_AUDIOOUT=OSS_AND_JACK
-	else
-		use jack && LINUX_AUDIOOUT=JACK
-	fi
-
-	use alsa && LINUX_MIDIIN=ALSA
-#	use portaudio && LINUX_AUDIOOUT=PA
-#	use mmx && ASM_F2I=YES
-
-	cd "${S}/src"
-	make \
-		FFTW_VERSION=${FFTW_VERSION} \
-		ASM_F2I=${ASM_F2I} \
-		LINUX_MIDIIN=${LINUX_MIDIIN} \
-		LINUX_AUDIOOUT=${LINUX_AUDIOOUT} \
-		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-		CXX="$(tc-getCXX)" \
-		|| die "compile failed"
-	cd "${S}/ExternalPrograms/Spliter"
-	./compile.sh
-	cd "${S}/ExternalPrograms/Controller"
-	./compile.sh
-}
-
-src_install() {
-	dobin "${S}/src/zynaddsubfx"
-	dobin "${S}/ExternalPrograms/Spliter/spliter"
-	dobin "${S}/ExternalPrograms/Controller/controller"
-	dodoc ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt
-
-	for i in "Arpeggios" "Bass" "Brass" "Choir and Voice" "Drums" \
-			 "Dual" "Fantasy" "Guitar" "Misc" "Noises" "Organ" \
-			 "Pads" "Plucked" "Reed and Wind" "Rhodes" "Splited" \
-			 "Strings" "Synth" "SynthPiano"
-	do
-		insinto "/usr/share/${PN}/banks/${i}"
-		doins "${S}/banks/${i}/"*
-	done
-
-	insinto /usr/share/${PN}/presets
-	doins "${S}/presets/"*
-	insinto /usr/share/${PN}
-	doins "${S}/examples/"*
-}
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild
deleted file mode 100644
index 8ce9b9c12d7f..000000000000
--- a/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/zynaddsubfx-2.4.0.ebuild,v 1.3 2011/03/20 20:06:18 jlec Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-MY_P=ZynAddSubFX-${PV}
-
-DESCRIPTION="ZynAddSubFX is an opensource software synthesizer."
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zynaddsubfx/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="oss alsa jack lash +fltk"
-
-RDEPEND="
-	sci-libs/fftw:3.0
-	fltk? ( x11-libs/fltk:1 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	alsa? ( media-libs/alsa-lib )
-	lash? ( media-sound/lash )
-	>=dev-libs/mini-xml-2.2.1"
-#	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i -e '/CXXFLAGS +=/s:CXXFLAGS +=:override CXXFLAGS +=:' \
-		-e '/export CXXFLAGS/d' \
-		-e '/\$(MAKE) -C UI/s:$: CXXFLAGS="${CXXFLAGS}":' \
-		-e '/\$(MAKE) -C $@/s:$: CXXFLAGS="${CXXFLAGS}":' \
-		"${S}/src/Makefile" || die "unable to reset CXXFLAGS overrides."
-	sed -e 's/gcc -g/$(CC) $(CFLAGS)/' \
-		-e 's/gcc -o/$(CC) $(LDFLAGS) -o/' \
-		-i "${S}/ExternalPrograms/Spliter/Makefile" || die
-	sed -e 's/gcc -o/$(CC) $(LDFLAGS) -o/' \
-		-e 's/gcc/$(CC) $(CFLAGS)/' \
-		-i "${S}/ExternalPrograms/Controller/Makefile" || die
-	epatch "${FILESDIR}/${P}-string.patch"
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-	epatch "${FILESDIR}/${P}-nullmidiin.patch"
-}
-
-use_echo_yesno() {
-	if use $1 ; then
-		echo "YES"
-	else
-		echo "NO"
-	fi
-}
-
-src_configure() {
-	cd "${S}/src"
-	echo "OS_PORT=LINUX" > Makefile.inc
-	echo "FFTW_VERSION=3" >> Makefile.inc
-	echo "ASM_F2I=NO" >> Makefile.inc
-	echo "DISABLE_GUI=$(use_echo_yesno !fltk)" >> Makefile.inc
-	if use oss ; then
-		use alsa || echo "MIDIIN=OSS" >> Makefile.inc
-		if use jack; then
-			echo "AUDIOOUT=OSS_AND_JACK" >> Makefile.inc
-		else
-			echo "AUDIOOUT=OSS" >> Makefile.inc
-		fi
-	else
-		if use jack; then
-			echo "AUDIOOUT=JACK" >> Makefile.inc
-		else
-			echo "AUDIOOUT=NONE" >> Makefile.inc
-		fi
-	fi
-	if use alsa ;  then
-		echo "MIDIIN=ALSA" >> Makefile.inc
-	else
-		use oss || echo "MIDIIN=NONE" >> Makefile.inc
-	fi
-	echo "LINUX_USE_LASH=$(use_echo_yesno lash)" >> Makefile.inc
-}
-
-src_compile() {
-	tc-export CC CXX
-
-	cd "${S}/src"
-	emake -j1 \
-		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-		|| die "compile failed"
-	if use fltk ; then
-		cd "${S}/ExternalPrograms/Spliter"
-		emake || die
-		cd "${S}/ExternalPrograms/Controller"
-		emake || die
-	fi
-}
-
-src_install() {
-	dobin "${S}/src/zynaddsubfx"
-	use fltk && dobin "${S}/ExternalPrograms/Spliter/spliter"
-	use fltk && dobin "${S}/ExternalPrograms/Controller/controller"
-	dodoc ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt
-
-	insinto "/usr/share/${PN}"
-	doins -r "${S}/banks" "${S}/examples"
-}