old

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

7 files changed, 8 insertions, 347 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/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"
-}