gentoo resync : 22.06.2019

4 files changed, 2 insertions, 101 deletions

diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index b5937545625e..7c8b31d69bd6 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,7 +1,4 @@
-AUX zynaddsubfx-3.0.3-docs.patch 414 BLAKE2B 7988269f161ae948e63a05f9d84b986cf2a5c8644c594d14b431bb3366ac3e468d1668d1b03d1ad3e899e93a992c2b9722338f1a6ea1052994613ff7acce8eff SHA512 867cb63e0b057bf0930f8a2d7dfe50a547df740cb135dc21824b986f194c2384dd57e882f0ed2617c1e1306a88804849878eee4d825bf02908378acf0e00fb75
 AUX zynaddsubfx-3.0.5-docs.patch 436 BLAKE2B 23724992b4ce5a58961984481bcf9782a7960ca033a6abe7f71f061e8c7e4026de470b71080e5eb58f67f882a6138824d893949acd44d95ed026df24eaf95e3a SHA512 958d4f7bbb6b267b4aae2295df99eaad5f41f574183c1bb03ed6499475cb8ac3a2c52edaae60fce5a552e8d53dbed9f6677fa6c67aec4ec4dfa4436e591eae84
-DIST zynaddsubfx-3.0.3.tar.bz2 7989258 BLAKE2B 7b71dc358ed3d0248eafb1c4638b05cc7ea8dbb05fd36c40643bb8f9160ee462c229d1604a52e795b6787d9131cea92512ad783c137c9cbe17cf8d56461a581f SHA512 e60e22656388d444114959859c12014ec79d7ba555b0d217ad98ad06e273916eea0eee521bb9dbfdef5be34205280d355b44a8f15760eeff06b16410d560b5d7
 DIST zynaddsubfx-3.0.5.tar.bz2 8141703 BLAKE2B 61f28a62d5ef8c17b5e38febb8ad1ecd40c80f87b26d90804131b97b57534adf5ad96a1f54980b75fd5e71185e2d5376a7df35696c7bcfd593b5d8e34bd2e386 SHA512 1e4d5a6393937e6c7103e6d0e97df76f2d129350854c2f338aa888591091b1508c63e9b52c8e5a176e282ff2f6b72c6a87de54875c412771aff26e8ece2c84e8
-EBUILD zynaddsubfx-3.0.3-r1.ebuild 1918 BLAKE2B 501fa7c5c93f9cf71722e1a3db38857ecdb90a58552c5d4218c641b4ebf8708100d73eb9fcacd87a9c39e645c667ffb6b51af4b36637fdc57b92f6b28efdaa5c SHA512 b42788152ab56c7df2ea4ecddfcecf486bc5ad5166656b1657ffceb8ead452a41c12488b169c1d6e12785608d9510ea27021c80fe6cc7c429bbce490968a7e9d
-EBUILD zynaddsubfx-3.0.5.ebuild 2029 BLAKE2B 4d2683782c8df03c57384934cf30e1445301a601bcb7e24d51d8c58a01e45a59fa49c236e7b633e81aa76673e6156b81e672aa5b94c39dfcfbbc4136343b322c SHA512 04ffdb4f907618c1e23f159cb8f1754f21642116bf9c9c70398f76fe6a5201b393ff75a56b6bd99dae6d388150789f6b1886773e419cedbc7c7340a6b59f87a8
+EBUILD zynaddsubfx-3.0.5.ebuild 2028 BLAKE2B 6599985b323d85d40af8cf731bf646315fe46c8b6be4021c0bef47d5339bf01031df85926d55e6881353ee08afa2f1a6bc5ce58d7a662d61abc031b7b59cb08b SHA512 cde23e5fa31b984bc84772fde0f56c6e4308f4e00405d54c46748355eebc8a6aa02d07169d046814f8895897abf6800400723a3007116cfb1bba5cd2d307549b
 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
deleted file mode 100644
index 2a35e0544c8a..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/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-r1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild
deleted file mode 100644
index 82a682845d5a..000000000000
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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/*
-}
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
index e3cbf1ed9217..01b612a4bcdb 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.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 )"