gentoo resync : 08.01.2018

8 files changed, 76 insertions, 4 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 677c12a11f86..c2d3e62bb0bb 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index 604be5575980..c4a176fbb3c2 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -5,5 +5,5 @@ DIST asunder-2.9.2.tar.bz2 279227 BLAKE2B 7b8e1a54e4577267d7c4b4fa3f3fd5b434bc52
 EBUILD asunder-2.2.ebuild 763 BLAKE2B c78b5597cb260bb88a89737e8f386c8e1bd25a45f7ba8281d669086d863916660d4ea28edd0e66ae233f678d277fbfc05d8e20b1a11e0efa0018f16126ba284d SHA512 936fdea24d035939f8c39874704b5d8fba6e15d8c2787d6eb10c6e9cced86d74a73909faf3bcadab9a25f27e6f3785b73ac3f33edb502b93b72a5330842dee80
 EBUILD asunder-2.8.1.ebuild 1018 BLAKE2B c2ec47bf94c0bd707302b67905c40224d8836de59b5ce767f5196a6bfe52a881960df1213f864f0f7db28b020c8c7b75e45816f0cf38ce53376003190b229cf2 SHA512 b2dcba8f928fadda61294b804d6897f2661c04bd6a1ef8868d371627628263480907650b41e396401143d24419ba0acab30dd20f12126c23a69a32df64cf698f
 EBUILD asunder-2.9.1.ebuild 964 BLAKE2B 848b7ac90c5e14b17be7028a8157948452095ccefa4225a6fb770265b56e3216149e687c44c6c04e006633a9972125c36530b70eb79e643497310008c6a18cdb SHA512 ae4d3d3fc3c456433477dc78084044f181de66ff5f1686699593714344c901bbee6c65e5ff8886279119f9527022fc766ca2280b2d481c0cfb99b2f6ccd3e567
-EBUILD asunder-2.9.2-r1.ebuild 1078 BLAKE2B 323fd0384abf3fc19078666cff423763ef74bde67fa8a577cfb7bf8dd30bb78fce70fad91c16f511affb59e3e9452d5eda4c85cf0f8667ce87cb2dc4d480a8ca SHA512 839a8c6f8f3cacfdc30edd719395427308133d0ed8197fbed15bdba4528156ee27a8ed6ca265b09236cec170228362c2d89efa8aa7ffd454391aa50ecfff540b
+EBUILD asunder-2.9.2-r1.ebuild 1077 BLAKE2B f66d32dfbb906f4d8972b198837d90068c9e2f072dc1ac83e3068954691bfa8a2bfd909be8abdac7d72887ecfa35ad1d4656fc0ab09dc11e327d4a854a0f6433 SHA512 3cf5a77110d76e29d8a0fe648b09249db74d3983ce60ded19602aeb48da1ae53c316a5d4637bcc196781af9e1756efc4b37e3b16878df6e21bb783e51750b58d
 MISC metadata.xml 407 BLAKE2B 3977485349c4dbb217e3ddcafaf22c7d394b764e6196a21fc63781ccf16a989ffd00faa0d4fbd9ff1c7bd35879d3cfdf586d0b5723b3e09d78fc034bf9736a5b SHA512 504625a32837ff424070b0fa4e691e71b0be4270958289c10d768790750842c581c919332747b26d7c43ada99d007e6517ff181474d668fcedc1ded21ae32f21
diff --git a/media-sound/asunder/asunder-2.9.2-r1.ebuild b/media-sound/asunder/asunder-2.9.2-r1.ebuild
index 8496c8955212..02687a60142d 100644
--- a/media-sound/asunder/asunder-2.9.2-r1.ebuild
+++ b/media-sound/asunder/asunder-2.9.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="aac flac mac mp3 musepack opus vorbis wavpack"
 
 COMMON_DEPEND=">=media-libs/libcddb-0.9.5
diff --git a/media-sound/terminatorx/Manifest b/media-sound/terminatorx/Manifest
index d4c545409ed2..c2150cc4af4e 100644
--- a/media-sound/terminatorx/Manifest
+++ b/media-sound/terminatorx/Manifest
@@ -4,5 +4,5 @@ AUX terminatorx-4.0.1-gtkcombotext.patch 437 BLAKE2B 582d82d04bd443188325f127a97
 DIST terminatorX-3.84.tar.gz 572143 BLAKE2B 9ee576ae34b5349347a4f8dda429d5366ad6e8f9d1907e3cf22af3287e6340d616b59e5f3e56d56b6652768ac216c5ac8e598eb4fac54291fb00ce8bc6dd2d0c SHA512 9b538007acc98b1dd7bb2e310be53bcf1971a94e5c03ea8ca48c59b05f1a0bddd75bf30ab4cfb03d49165098ba63643eaa3bda117cdf833df2438c29a774db6c
 DIST terminatorX-4.0.1.tar.bz2 1832692 BLAKE2B 61eeb6362cdf56cb73df3bfbff65cf3699a0ef686d77894b87feab5f25f927267bc28573c3ee41981ded3b452b1d37c035260ffbe0fdcf6d0b0c0319c61a6137 SHA512 06128633e128f2158367dcde0e913dafc68d62644e7a5182a2391829dadcb9c46430d0cac16cb17113939623266f32cb4624a8548a51b8c01bdfa2860a6c0093
 EBUILD terminatorx-3.84-r1.ebuild 1458 BLAKE2B 36915b95eb05620a8c30285366101441db11b74005a4cea0a05a1c0cbc40d66359a378b4c5f7de70f70e2120c0e5d6884c515cf78520a2a6c9496ba970d57582 SHA512 8a872bf1af96f6a8f6e1836bb6c32454a885993da86a478281ceb45813b99e887fec831df5d3f5058bcc53870ab5962ed31d56a49039877127537e6bfb8a079e
-EBUILD terminatorx-4.0.1-r1.ebuild 1407 BLAKE2B d88dd5ee806385e001e56a703430427b7ccc334233dda2684354c1a074b4b10876dab921f7b1dcf74bea18be4a7d551cad0b8fc1dbb15140467f6ef9cbee8e97 SHA512 8364c49b28c982200d491cc1325d55426d29365d05b54f544c907c404f1d8bf213bbeb53ad86f83b505c6aa99bee6b53cc376a091fd6dd4ee29755efe2fcf04f
+EBUILD terminatorx-4.0.1-r1.ebuild 1406 BLAKE2B 42dbae32ae93ab1f72602280c408230703c6f5d651ff4e43e6b3902cb9a860cf5e75e7c19d8c9979b9f80f7f28a99c3f9570fc646702943244ecb3e992f54a46 SHA512 809b217a45de7d55092c4f5bdf22574dfe2a99ce978f270e2b814572c3d4d14ebb9e56e8b0fa8806fad3c1b2125384a05a44f0eace00b00b43236f1c7132944b
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/terminatorx/terminatorx-4.0.1-r1.ebuild b/media-sound/terminatorx/terminatorx-4.0.1-r1.ebuild
index d410a5efe62e..08a23c074a74 100644
--- a/media-sound/terminatorx/terminatorx-4.0.1-r1.ebuild
+++ b/media-sound/terminatorx/terminatorx-4.0.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.terminatorx.org/dist/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 # Making X optional fails when disabled: https://bugs.gentoo.org/636832
 IUSE="alsa debug mad pulseaudio vorbis sox"
 
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 619038c2afb1..7008e77aa663 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,6 +1,9 @@
 AUX zynaddsubfx-2.5.2-docs.patch 536 BLAKE2B 83bf70e8b7becadec45a7523019a4b6d02c499dc3cfcd27eadcf59d604c78ed5671e088b35041da2ec156eb5b4e3420605fe5a27ccd227839d445d1ca5fb0327 SHA512 a2ac81dbc36c44678733fd43569a9cc1431d1491a5ef5d43253db6086107e49feaf4154b938b8c05111a5174361351338f0dc9db377218b1805598e1780f6d18
+AUX zynaddsubfx-3.0.3-docs.patch 559 BLAKE2B cde5e6e4a3bfe0c03e013549a723f2415d0b3a5809ca3fac268e537af5cfdac71e1d9cc108ce708b2e509bc1705bb8dfd2aed31a15e5bb58356979f38fcfdbc5 SHA512 3771f0ea2d3fb3c3df4749e95312f026765af20b8531e93d37033d50ede8c4ecb90ab0879ce474db7ec9c9d6a606c8e64a22e82116ff85b8775a8ad804f5d448
 DIST zynaddsubfx-3.0.1.tar.bz2 6811606 BLAKE2B 4dc400b97381f03c4bc6ff749f1bcb6e4bb41c796a97b0ccf2cf3c8dd0b98235dec40f726e838934923719b8d3378be92a5e70b6a613ee8b9922632c22b0b691 SHA512 49592e46872ae966461dfc5f7cbd2ebcf3f3a6d43139f6cd0eba65e098fb33370840c0e1f4f224a18adfc97eae9fa5583eca6a48f43b9200d5522cc413b0ce43
 DIST zynaddsubfx-3.0.2.tar.bz2 7979193 BLAKE2B 9c77ef24de20a694477bf2d433fc2ee4ca3ad9d34c33e24ebabd91c4449fbabeae9d146645ce95d25355e9e8c277dd677f4c30032e65a22e6c8a336cd344fb50 SHA512 96d1df903a6afbaee991221ca30b21a20d97bc6d1cbe5c9fef94f2d1c3fb88e0294c263aec282559885d6e2f5841ad2c80d863af9f58f161791a33a9c0c08f57
+DIST zynaddsubfx-3.0.3.tar.bz2 7989258 BLAKE2B 7b71dc358ed3d0248eafb1c4638b05cc7ea8dbb05fd36c40643bb8f9160ee462c229d1604a52e795b6787d9131cea92512ad783c137c9cbe17cf8d56461a581f SHA512 e60e22656388d444114959859c12014ec79d7ba555b0d217ad98ad06e273916eea0eee521bb9dbfdef5be34205280d355b44a8f15760eeff06b16410d560b5d7
 EBUILD zynaddsubfx-3.0.1-r1.ebuild 1571 BLAKE2B 1e1cab6adc6ad3f2657269ae245f95ff9fe445dafea4d9d2f44e7f72cd12f0905b32e831b2c9da81ca1615b8b3ebdf2e3818ea21bdac27fdc834d0dae3eab6bf SHA512 163faa12e7e0028d9c426e1b2668a6c71f9f2362ba1057d3a943ac3dffcf5dfdf744519b906d6a6377464215eb4e196543f99082436ef9f612931f9ddcd3fdfd
 EBUILD zynaddsubfx-3.0.2.ebuild 1573 BLAKE2B 8e4374f2e7a9bc3f3c8f669537dbaef564dad959ef690c52890fa5a3a5272725ad7a520de5ed02a4d21ad8a53d346eb98147598e89efb038857e1c57a688af6b SHA512 6ef70dd65df30cd77c4f278248e7dfe83f811d7b26af7bc58804016cd8c08d0df14f2ade82c3e43d6d4e6c411b3ed6a336b3d1a9f9d90b7be14c9185ac531e49
+EBUILD zynaddsubfx-3.0.3.ebuild 1573 BLAKE2B 4aa8c9d99c5f9d871eba76a94c854fec463e9c5c6e52c20787bc4e7aa4e22eb8010cc7b86a4800dbab22b398ddbc338ddd7520c5820cc7a50698242e9dff2c11 SHA512 2578616821af9f69a9cca8510614fbca592f57457c63dfa208d6ec1839abbb0d6f6a534feb45326369c08126bf710730b675b18d847024e3e1d4feec7d9022fa
 MISC metadata.xml 340 BLAKE2B 1e630f1735f05b15bcc045f0146e81e932bfe6f08262a40518d15ababe8fe73e04f597b0aa7dd026e316a501276885fe5b842ccf7177c0880f754d1481c46c82 SHA512 c59fcb3065e3b34c3e3e23a8db07dbe245a8addcf7a6958834b5715bc0a8319c8d0cfa3b40925e7e9838df031843a5218bbcf91721ce57bee2632111dc27d4a3
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
new file mode 100644
index 000000000000..b094986ea86a
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
@@ -0,0 +1,14 @@
+Index: zynaddsubfx-2.5.2/CMakeLists.txt
+===================================================================
+--- zynaddsubfx-2.5.2.orig/CMakeLists.txt
++++ zynaddsubfx-2.5.2/CMakeLists.txt
+@@ -28,9 +28,6 @@ include(CTestConfig.cmake)
+ #Currently the only directory that uses cmake
+ add_subdirectory(src)
+
+-install(FILES AUTHORS.txt COPYING HISTORY.txt README.adoc
+-	DESTINATION share/doc/zynaddsubfx
+-	)
+ install(FILES zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop zynaddsubfx-oss.desktop
+     DESTINATION share/applications)
+ install(FILES zynaddsubfx.svg
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
new file mode 100644
index 000000000000..a2778f8b90eb
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils cmake-utils flag-o-matic multilib
+
+DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${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
+	media-libs/liblo
+	alsa? ( media-libs/alsa-lib )
+	fltk? ( >=x11-libs/fltk-1.3:1 )
+	jack? ( virtual/jack )
+	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}-${PV}-docs.patch
+)
+
+DOCS=( ChangeLog HISTORY.txt README.adoc )
+
+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"`
+		-DPluginLibDir=$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	insinto /usr/share/${PN}
+	doins -r "${S}"/instruments/*
+}