proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

12 files changed, 438 insertions, 0 deletions

diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
new file mode 100644
index 000000000000..252f922cf8d0
--- /dev/null
+++ b/media-sound/zynaddsubfx/Manifest
@@ -0,0 +1,5 @@
+DIST ZynAddSubFX-2.4.1.tar.bz2 2449356 SHA256 cf796e23c1f268307373dca3d0dacaf80a19d813da4bd290742b6773e0a3c5fe
+DIST ZynAddSubFX-2.4.2.tar.bz2 2447485 SHA256 7d43bfece3b02625528dab7139e0fbada5768ac2722df137794b157602f8e802 SHA512 558389a62d121242ae8d3f2e9501082a64ef9e2f4540873d4baaaa82bac7113e2941d5119268bbfee375953d0fe8a8d91006f06998de4035705588e9c56b56d7 WHIRLPOOL bdec8e7a05db9b20948e2537cb644836093148a3438db67097e523acd64ee85c86ad6c978c821e840fc4096b380e325609d6d330e3f0e4d61fedc2c0d757876a
+DIST ZynAddSubFX-2.4.3.tar.bz2 2536667 SHA256 b84b595660ccec3ebc364c29c2d29def7d28a6947fc1dfb26bd8c34ca0e7f54d SHA512 2314c456db1a8a032a38b012c7c9e01f0a487c5eeb0027a741a4ffd6a7eea3382fcd26a8cd97b89af40800613c1ba164bb683be800957ea403f97dd6f23df5ff WHIRLPOOL 46aa59378f310105504b0ab5903d35826aa03dd080e6c7313237e34a2c9c82cea1d9c0f2cd986c65da38320b1376477b33424b8c69fd8fa591a53325df0b4a65
+DIST zynaddsubfx-2.5.0.tar.gz 4185453 SHA256 a3810708291367298e04002eda29237ff5f70240e432be84ea48b54895746aa7 SHA512 830388593079690153ae9cdcfb35362bd33208d93d7d56d5f4967c626dc3a12c7717088281d382696fbe22294874e37efd1566874743fb17dba54fee0eb40b0a WHIRLPOOL 81ca9724906846fcfdbc91e04865da9d8d3ebbb5a19ac5cb42639f13228d709815e651c07a4fd80b3c2af7b0f2f2538d50c06b0026119bb7f9e7eb922a9ed6a3
+DIST zynaddsubfx-2.5.1.tar.gz 4214568 SHA256 e2e3b92cfc4c2add5e7af6afc81dc74e31509459034b0680372dabbf68d98405 SHA512 387d96bb5d6dfebd3129c047091380850d80092cf8e397ab1932b7a149d0fd9fb67033768ef68b50d33362f98ba20697ad9e4c25b5cf268484a24ecc156857e0 WHIRLPOOL 323f30cacc6d3c875a1324413aba091cdf4f62925b0deb6faa8500ee0574f2d96e3030151c0bc7c8d044be91c6e38f4283a5251456957e7bc714f914e1daa519
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-docs.patch
new file mode 100644
index 000000000000..587e4a4219a9
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-docs.patch
@@ -0,0 +1,12 @@
+Index: ZynAddSubFX-2.4.1/CMakeLists.txt
+===================================================================
+--- ZynAddSubFX-2.4.1.orig/CMakeLists.txt
++++ ZynAddSubFX-2.4.1/CMakeLists.txt
+@@ -5,7 +5,3 @@ project(zynaddsubfx)
+ enable_testing()
+ #Currently the only directory that uses cmake
+ add_subdirectory(src)
+-
+-install(FILES AUTHORS.txt COPYING FAQ.txt HISTORY.txt README.txt
+-	DESTINATION share/doc/zynaddsubfx
+-	)
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch
new file mode 100644
index 000000000000..38446d7e11ca
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch
@@ -0,0 +1,38 @@
+Index: ZynAddSubFX-2.4.1/src/CMakeLists.txt
+===================================================================
+--- ZynAddSubFX-2.4.1.orig/src/CMakeLists.txt
++++ ZynAddSubFX-2.4.1/src/CMakeLists.txt
+@@ -96,24 +96,7 @@ if(FltkGui)
+     #message(STATUS "FLTK_LIBRARIES: ${FLTK_LIBRARIES}")
+     #message(STATUS "FLTK_MATH_LIBRARY: ${FLTK_MATH_LIBRARY}")
+ 
+-    #UGLY WORKAROUND
+-    find_program (MYFLTK_CONFIG fltk-config)
+-    if (MYFLTK_CONFIG)
+-        execute_process (COMMAND ${MYFLTK_CONFIG} --ldflags OUTPUT_VARIABLE MYFLTK_LDFLAGS)
+-        string(STRIP ${MYFLTK_LDFLAGS} MYFLTK_LIBRARIES)
+-    endif()
+-    mark_as_advanced(FORCE FLTK_BASE_LIBRARY)
+-    mark_as_advanced(FORCE FLTK_CONFIG_SCRIPT)
+-    mark_as_advanced(FORCE FLTK_DIR)
+-    mark_as_advanced(FORCE FLTK_FLUID_EXECUTABLE)
+-    mark_as_advanced(FORCE FLTK_FORMS_LIBRARY)
+-    mark_as_advanced(FORCE FLTK_GL_LIBRARY)
+-    mark_as_advanced(FORCE FLTK_IMAGES_LIBRARY)
+-    mark_as_advanced(FORCE FLTK_INCLUDE_DIR)
+-    mark_as_advanced(FORCE FLTK_MATH_LIBRARY)
+-
+-
+-    set(GUI_LIBRARIES ${FLTK_LIBRARIES} ${MYFLTK_LIBRARIES} ${OPENGL_LIBRARIES} zynaddsubfx_gui)
++    set(GUI_LIBRARIES ${FLTK_LIBRARIES} ${OPENGL_LIBRARIES} zynaddsubfx_gui)
+     add_definitions(-DFLTK_GUI)
+ 
+     message(STATUS "Will build fltk gui")
+@@ -121,6 +104,7 @@ if(FltkGui)
+ 	include_directories(
+ 			"${CMAKE_CURRENT_SOURCE_DIR}/UI"
+ 			"${CMAKE_CURRENT_BINARY_DIR}/UI"
++                        ${FLTK_INCLUDE_DIR}
+ 			)
+ 
+ 	add_subdirectory(UI)
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch
new file mode 100644
index 000000000000..72fa30a68145
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch
@@ -0,0 +1,58 @@
+Sounds hackish but that's the only way I found to force it to generate the
+functions in the .cxx files with fluid 1.3...
+
+Index: ZynAddSubFX-2.4.1/src/UI/BankUI.fl
+===================================================================
+--- ZynAddSubFX-2.4.1.orig/src/UI/BankUI.fl
++++ ZynAddSubFX-2.4.1/src/UI/BankUI.fl
+@@ -32,7 +32,7 @@ decl {\#include "../Misc/Config.h"} {pub
+ 
+ class BankProcess_ {} {
+   Function {process()} {open return_type {virtual void}
+-  } {}
++  } {code{;}}
+   decl {Bank *bank;} {public
+   }
+ } 
+Index: ZynAddSubFX-2.4.1/src/UI/OscilGenUI.fl
+===================================================================
+--- ZynAddSubFX-2.4.1.orig/src/UI/OscilGenUI.fl
++++ ZynAddSubFX-2.4.1/src/UI/OscilGenUI.fl
+@@ -129,7 +129,7 @@ delete [] spc;} {selected
+ 
+ class PSlider {: {public Fl_Slider}
+ } {
+-  Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} {}
++  Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} {code{;}}
+   Function {handle(int event)} {return_type int
+   } {
+     code {int X=x(),Y=y(),W=w(),H=h();
+Index: ZynAddSubFX-2.4.1/src/UI/PartUI.fl
+===================================================================
+--- ZynAddSubFX-2.4.1.orig/src/UI/PartUI.fl
++++ ZynAddSubFX-2.4.1/src/UI/PartUI.fl
+@@ -85,7 +85,7 @@ end();} {}
+ 
+ class PartUI_ {} {
+   Function {showparameters(int kititem,int engine)} {return_type virtual
+-  } {}
++  } {code{;}}
+ } 
+ 
+ class PartKitItem {: {public Fl_Group}
+Index: ZynAddSubFX-2.4.1/src/UI/PresetsUI.fl
+===================================================================
+--- ZynAddSubFX-2.4.1.orig/src/UI/PresetsUI.fl
++++ ZynAddSubFX-2.4.1/src/UI/PresetsUI.fl
+@@ -18,9 +18,9 @@ decl {\#include "../Params/Presets.h"} {
+ 
+ class PresetsUI_ {} {
+   Function {refresh()} {open return_type {virtual void}
+-  } {}
++  } {code{;}}
+   Function {~PresetsUI_()} {open return_type virtual
+-  } {}
++  } {code{;}}
+ } 
+ 
+ class PresetsUI {} {
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-nofltk.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-nofltk.patch
new file mode 100644
index 000000000000..c20828328f26
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-nofltk.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/show_bug.cgi?id=437018
+
+Index: ZynAddSubFX-2.4.3/src/main.cpp
+===================================================================
+--- ZynAddSubFX-2.4.3.orig/src/main.cpp
++++ ZynAddSubFX-2.4.3/src/main.cpp
+@@ -37,8 +37,6 @@
+ #include "Misc/Dump.h"
+ extern Dump dump;
+ 
+-#include <FL/Fl.H>
+-
+ //Nio System
+ #include "Nio/Nio.h"
+ 
+@@ -51,6 +49,8 @@ QApplication *app;
+ 
+ #elif defined FLTK_GUI
+ 
++#include <FL/Fl.H>
++
+ #include "UI/MasterUI.h"
+ #endif // FLTK_GUI
+ 
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.0-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.0-docs.patch
new file mode 100644
index 000000000000..a1b7d9332ea5
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.0-docs.patch
@@ -0,0 +1,14 @@
+Index: zynaddsubfx-2.5.0/CMakeLists.txt
+===================================================================
+--- zynaddsubfx-2.5.0.orig/CMakeLists.txt
++++ zynaddsubfx-2.5.0/CMakeLists.txt
+@@ -27,9 +27,6 @@ include(CTestConfig.cmake)
+ #Currently the only directory that uses cmake
+ add_subdirectory(src)
+ 
+-install(FILES AUTHORS.txt COPYING FAQ.txt HISTORY.txt README.adoc
+-	DESTINATION share/doc/zynaddsubfx
+-	)
+ install(FILES zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop
+     DESTINATION share/applications)
+ install(FILES zynaddsubfx.svg
diff --git a/media-sound/zynaddsubfx/metadata.xml b/media-sound/zynaddsubfx/metadata.xml
new file mode 100644
index 000000000000..b8228fecd796
--- /dev/null
+++ b/media-sound/zynaddsubfx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proaudio</herd>
+	<upstream>
+		<remote-id type="sourceforge">zynaddsubfx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.4.1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.4.1.ebuild
new file mode 100644
index 000000000000..e25e6d7dc9d1
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.4.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils cmake-utils
+
+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="alsa +fltk jack lash"
+
+RDEPEND=">=dev-libs/mini-xml-2.2.1
+	sci-libs/fftw:3.0
+	alsa? ( media-libs/alsa-lib )
+	fltk? ( >=x11-libs/fltk-1.3:1 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lash? ( media-sound/lash )"
+#	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+# Upstream uses the following preferences: alsa > jack > portaudio
+# At least one of them must be enabled
+# We do not support portaudio, so if alsa is disabled force jack.
+REQUIRED_USE="!alsa? ( jack )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fltk.patch
+	"${FILESDIR}"/${P}-fltk13.patch
+	"${FILESDIR}"/${P}-docs.patch
+)
+
+DOCS="ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt"
+
+src_configure() {
+	use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}"/src/CMakeLists.txt
+	mycmakeargs=(
+		`use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
+		`use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
+		`use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
+		`use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	insinto /usr/share/${PN}
+	doins -r "${S}"/banks "${S}"/examples
+}
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.4.2.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.4.2.ebuild
new file mode 100644
index 000000000000..786770a24d12
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.4.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils cmake-utils
+
+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="alsa +fltk jack lash"
+
+RDEPEND=">=dev-libs/mini-xml-2.2.1
+	sci-libs/fftw:3.0
+	alsa? ( media-libs/alsa-lib )
+	fltk? ( >=x11-libs/fltk-1.3:1 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lash? ( media-sound/lash )"
+#	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+# Upstream uses the following preferences: alsa > jack > portaudio
+# At least one of them must be enabled
+# We do not support portaudio, so if alsa is disabled force jack.
+REQUIRED_USE="!alsa? ( jack )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.1-docs.patch
+)
+
+DOCS="ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt"
+
+src_configure() {
+	use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}"/src/CMakeLists.txt
+	mycmakeargs=(
+		`use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
+		`use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
+		`use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
+		`use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	insinto /usr/share/${PN}
+	doins -r "${S}"/banks "${S}"/examples
+}
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild
new file mode 100644
index 000000000000..356c173ac66f
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils cmake-utils
+
+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="alsa +fltk jack lash"
+
+RDEPEND=">=dev-libs/mini-xml-2.2.1
+	sci-libs/fftw:3.0
+	alsa? ( media-libs/alsa-lib )
+	fltk? ( >=x11-libs/fltk-1.3:1 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lash? ( media-sound/lash )"
+#	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+# Upstream uses the following preferences: alsa > jack > portaudio
+# At least one of them must be enabled
+# We do not support portaudio, so if alsa is disabled force jack.
+REQUIRED_USE="!alsa? ( jack )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.1-docs.patch
+	"${FILESDIR}"/${PN}-2.4.3-nofltk.patch
+)
+
+DOCS="ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt"
+
+src_configure() {
+	use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}"/src/CMakeLists.txt
+	mycmakeargs=(
+		`use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
+		`use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
+		`use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
+		`use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	insinto /usr/share/${PN}
+	doins -r "${S}"/instruments/*
+}
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.5.0.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.5.0.ebuild
new file mode 100644
index 000000000000..668a82f16da5
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.5.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-utils flag-o-matic
+
+DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa +fltk jack lash"
+
+RDEPEND=">=dev-libs/mini-xml-2.2.1
+	sci-libs/fftw:3.0
+	alsa? ( media-libs/alsa-lib )
+	fltk? ( >=x11-libs/fltk-1.3:1 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lash? ( media-sound/lash )"
+#	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+# Upstream uses the following preferences: alsa > jack > portaudio
+# At least one of them must be enabled
+# We do not support portaudio, so if alsa is disabled force jack.
+REQUIRED_USE="!alsa? ( jack )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.0-docs.patch
+)
+
+DOCS="ChangeLog FAQ.txt HISTORY.txt README.adoc bugs.txt"
+
+src_configure() {
+	append-cxxflags "-std=c++11"
+	use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}"/src/CMakeLists.txt
+	mycmakeargs=(
+		`use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
+		`use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
+		`use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
+		`use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	insinto /usr/share/${PN}
+	doins -r "${S}"/instruments/*
+}
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.5.1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.5.1.ebuild
new file mode 100644
index 000000000000..668a82f16da5
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.5.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-utils flag-o-matic
+
+DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa +fltk jack lash"
+
+RDEPEND=">=dev-libs/mini-xml-2.2.1
+	sci-libs/fftw:3.0
+	alsa? ( media-libs/alsa-lib )
+	fltk? ( >=x11-libs/fltk-1.3:1 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lash? ( media-sound/lash )"
+#	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+# Upstream uses the following preferences: alsa > jack > portaudio
+# At least one of them must be enabled
+# We do not support portaudio, so if alsa is disabled force jack.
+REQUIRED_USE="!alsa? ( jack )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.0-docs.patch
+)
+
+DOCS="ChangeLog FAQ.txt HISTORY.txt README.adoc bugs.txt"
+
+src_configure() {
+	append-cxxflags "-std=c++11"
+	use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}"/src/CMakeLists.txt
+	mycmakeargs=(
+		`use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
+		`use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
+		`use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
+		`use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	insinto /usr/share/${PN}
+	doins -r "${S}"/instruments/*
+}