gentoo resync : 10.02.2019

4 files changed, 92 insertions, 6 deletions

diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index a209b4fb0381..ff1909223a28 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,4 +1,5 @@
-AUX zynaddsubfx-3.0.3-docs.patch 559 BLAKE2B cde5e6e4a3bfe0c03e013549a723f2415d0b3a5809ca3fac268e537af5cfdac71e1d9cc108ce708b2e509bc1705bb8dfd2aed31a15e5bb58356979f38fcfdbc5 SHA512 3771f0ea2d3fb3c3df4749e95312f026765af20b8531e93d37033d50ede8c4ecb90ab0879ce474db7ec9c9d6a606c8e64a22e82116ff85b8775a8ad804f5d448
+AUX zynaddsubfx-3.0.3-docs.patch 414 BLAKE2B 7988269f161ae948e63a05f9d84b986cf2a5c8644c594d14b431bb3366ac3e468d1668d1b03d1ad3e899e93a992c2b9722338f1a6ea1052994613ff7acce8eff SHA512 867cb63e0b057bf0930f8a2d7dfe50a547df740cb135dc21824b986f194c2384dd57e882f0ed2617c1e1306a88804849878eee4d825bf02908378acf0e00fb75
 DIST zynaddsubfx-3.0.3.tar.bz2 7989258 BLAKE2B 7b71dc358ed3d0248eafb1c4638b05cc7ea8dbb05fd36c40643bb8f9160ee462c229d1604a52e795b6787d9131cea92512ad783c137c9cbe17cf8d56461a581f SHA512 e60e22656388d444114959859c12014ec79d7ba555b0d217ad98ad06e273916eea0eee521bb9dbfdef5be34205280d355b44a8f15760eeff06b16410d560b5d7
+EBUILD zynaddsubfx-3.0.3-r1.ebuild 1920 BLAKE2B 1efefa9809a8712e8d5e6873390ee84e2454fb445f03504cd1e06b4fb67100dca63f771ee959fb2294c54cee4418a0d50acc72d9fcfbd449f0aa3547a65fd56e SHA512 db94f5e26b35651c9791ab93b81fa87abb807ee96c7c4b3d3554e909af458cf352fad5d19f42c4e67d28f7daca88f9611e84bba3e3f44d4888e74e6380b869e8
 EBUILD zynaddsubfx-3.0.3.ebuild 1567 BLAKE2B c4e2e6b115c326e769ed98d95262d8545b576f3b809c403fcbae03717dfc40e8ccebced31acd82281a3712452e4b1206bba427239492a045d856920df3409fbf SHA512 e18092a175c36dc1958ee03bc388c330685a806aaa227e45a6ead4cde139e656dd9d7b82eac851875821fb6c465e176e438894c78f6bfa5c1f09bdf95fa0cd35
-MISC metadata.xml 340 BLAKE2B 1e630f1735f05b15bcc045f0146e81e932bfe6f08262a40518d15ababe8fe73e04f597b0aa7dd026e316a501276885fe5b842ccf7177c0880f754d1481c46c82 SHA512 c59fcb3065e3b34c3e3e23a8db07dbe245a8addcf7a6958834b5715bc0a8319c8d0cfa3b40925e7e9838df031843a5218bbcf91721ce57bee2632111dc27d4a3
+MISC metadata.xml 427 BLAKE2B 80fb772abd373ede6be0c3b99fd252f059ebbc6efa5ab1dffee1c0a517289cb199a7ca58c7db4942565dd96c2749fbecf0a9e82382a2387e5c785ced868b4312 SHA512 dc8afdd20a8f6e7d052dc69f4a17698b481db997ef36e199fce32e8ed586a0a0c6d9c881fc378bcd20e57ffe0f4ec1389680ee9ed0fa04ad8b13aa082112e490
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
index b094986ea86a..2a35e0544c8a 100644
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
@@ -1,7 +1,5 @@
-Index: zynaddsubfx-2.5.2/CMakeLists.txt
-===================================================================
---- zynaddsubfx-2.5.2.orig/CMakeLists.txt
-+++ zynaddsubfx-2.5.2/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -28,9 +28,6 @@ include(CTestConfig.cmake)
  #Currently the only directory that uses cmake
  add_subdirectory(src)
diff --git a/media-sound/zynaddsubfx/metadata.xml b/media-sound/zynaddsubfx/metadata.xml
index bca5422640b4..63c95289a8f5 100644
--- a/media-sound/zynaddsubfx/metadata.xml
+++ b/media-sound/zynaddsubfx/metadata.xml
@@ -5,6 +5,9 @@
 		<email>proaudio@gentoo.org</email>
 		<name>Gentoo ProAudio Project</name>
 	</maintainer>
+	<use>
+		<flag name="dssi">Enable support for DSSI Soft Synth Interface</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">zynaddsubfx</remote-id>
 	</upstream>
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild
new file mode 100644
index 000000000000..42707c6895ba
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Software synthesizer capable of making a countless number of instruments"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa doc dssi +fltk jack lash portaudio"
+
+REQUIRED_USE="|| ( alsa jack portaudio )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	>=dev-libs/mxml-2.2.1
+	media-libs/liblo
+	sci-libs/fftw:3.0
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	dssi? ( media-libs/dssi )
+	fltk? (
+		>=x11-libs/fltk-1.3:1
+		x11-libs/libX11
+		x11-libs/libXpm
+	)
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )
+	portaudio? ( media-libs/portaudio )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-docs.patch )
+
+DOCS=( ChangeLog HISTORY.txt README.adoc )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! use dssi; then
+		sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die
+	fi
+	if ! use jack; then
+		sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die
+	fi
+	if ! use lash; then
+		sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die
+	fi
+	if ! use portaudio; then
+		sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+
+	local mycmakeargs=(
+		-DPluginLibDir=$(get_libdir)
+		$(cmake-utils_use_find_package alsa Alsa)
+		$(cmake-utils_use_find_package doc Doxygen)
+		$(cmake-utils_use_find_package fltk FLTK)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile doc
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake-utils_src_install
+	insinto /usr/share/${PN}
+	doins -r instruments/*
+}