gentoo resync : 03.03.2019

3 files changed, 2 insertions, 58 deletions

diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 400dbd2e44f5..62a09d723b34 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,5 +1,4 @@
 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 1919 BLAKE2B 4f3ef4df64fe5fe024458497023710d876aab85fda37c4fbdfa8a790ef21903e0f03804d7fa645207dab5423b92e1c835556f5c1350dbcb7f8a27079b51cdf5f SHA512 0ec1d782e3f9c3a09824fb5ccd13e189d903225481e081688c4a27746dddf41fa5b236f8008d044d575257a027b56a04a699294134bcc6551cd02d301b1062a6
-EBUILD zynaddsubfx-3.0.3.ebuild 1567 BLAKE2B c4e2e6b115c326e769ed98d95262d8545b576f3b809c403fcbae03717dfc40e8ccebced31acd82281a3712452e4b1206bba427239492a045d856920df3409fbf SHA512 e18092a175c36dc1958ee03bc388c330685a806aaa227e45a6ead4cde139e656dd9d7b82eac851875821fb6c465e176e438894c78f6bfa5c1f09bdf95fa0cd35
+EBUILD zynaddsubfx-3.0.3-r1.ebuild 1918 BLAKE2B 501fa7c5c93f9cf71722e1a3db38857ecdb90a58552c5d4218c641b4ebf8708100d73eb9fcacd87a9c39e645c667ffb6b51af4b36637fdc57b92f6b28efdaa5c SHA512 b42788152ab56c7df2ea4ecddfcecf486bc5ad5166656b1657ffceb8ead452a41c12488b169c1d6e12785608d9510ea27021c80fe6cc7c429bbce490968a7e9d
 MISC metadata.xml 427 BLAKE2B 80fb772abd373ede6be0c3b99fd252f059ebbc6efa5ab1dffee1c0a517289cb199a7ca58c7db4942565dd96c2749fbecf0a9e82382a2387e5c785ced868b4312 SHA512 dc8afdd20a8f6e7d052dc69f4a17698b481db997ef36e199fce32e8ed586a0a0c6d9c881fc378bcd20e57ffe0f4ec1389680ee9ed0fa04ad8b13aa082112e490
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild
index 3e5d0e71fa8c..82a682845d5a 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild
@@ -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 doc dssi +fltk jack lash portaudio"
 
 REQUIRED_USE="|| ( alsa jack portaudio )"
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
deleted file mode 100644
index b929690c9c52..000000000000
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 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/mxml-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/*
-}