gentoo resync : 16.06.2018

5 files changed, 3 insertions, 132 deletions

diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 7008e77aa663..3424b57de5ab 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,9 +1,4 @@
-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
+EBUILD zynaddsubfx-3.0.3.ebuild 1571 BLAKE2B f0a66394c74568fd2ec8ff6321e3da4e55027adf229d906d4352eb32411bf3cdf041e0baf189f7e604e3ccebfad646c11bfff7538f7ff34e620c7b0f8cc4edb3 SHA512 47fd2b5be892cf03baf8192627a82a9f2e1ae9462dc3802fd835d2d09f5536da383f65b91700e67f5d2e5244ea812e1dd4d38276247de7e1ba880991e4c6ed6a
 MISC metadata.xml 340 BLAKE2B 1e630f1735f05b15bcc045f0146e81e932bfe6f08262a40518d15ababe8fe73e04f597b0aa7dd026e316a501276885fe5b842ccf7177c0880f754d1481c46c82 SHA512 c59fcb3065e3b34c3e3e23a8db07dbe245a8addcf7a6958834b5715bc0a8319c8d0cfa3b40925e7e9838df031843a5218bbcf91721ce57bee2632111dc27d4a3
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.2-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.2-docs.patch
deleted file mode 100644
index e3cc2784cdaa..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.2-docs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
-     DESTINATION share/applications)
- install(FILES zynaddsubfx.svg
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.1-r1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.1-r1.ebuild
deleted file mode 100644
index 0060de73b304..000000000000
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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}-2.5.2-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/*
-}
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.2.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.2.ebuild
deleted file mode 100644
index b07ade848065..000000000000
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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}-2.5.2-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/*
-}
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
index a2778f8b90eb..988efc1b9940 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="alsa +fltk jack lash"
 
 RDEPEND=">=dev-libs/mini-xml-2.2.1