gentoo Easter resync : 12.04.2020

3 files changed, 2 insertions, 79 deletions

diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 77014ba02548..f948589a162a 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,7 +1,5 @@
-DIST fluidsynth-2.0.4.tar.gz 1378042 BLAKE2B 0fc75ea68169c47d64bdf727b8d78e311b36cb04509832f449a52d05e085908bd1ef837dd4c5e23edc25286b8ff3fdf69a9d042520c8eb2a3234fb929bed8de5 SHA512 d58ddc5f4da9bb5954a82749617548ef32edd25f6ca5c6d5c2b06d23090784ec175d2422553a66776f543c6b253f037a6cf1e717a853344ffb899fa53752eec0
 DIST fluidsynth-2.0.7.tar.gz 1315250 BLAKE2B 13186522b3eea6bdd9f4893fabe9d06e67061647c83cb9479630333b0bbc5878682d5d19d9050403875ac49f66f756947d48928e3367efef537408e86c4c4a00 SHA512 c939c77277767541b90ae8bc24687cd9cd11b375264e6b5017658f5fd9c5637a3ce09bc4ad837a349e4a63883fe5ecbe80e65dd91d2cbf71072bcbcfc068614e
 DIST fluidsynth-2.1.0.tar.gz 1356096 BLAKE2B f1dcf05a3d776d3e8be15330e2177e59c10da25063cba577b734aed2af98955c18b7184ee73866503c0cc9c5374c14a8a0030f630be98c9319680a34d8cab117 SHA512 d7af4047ebde49ef48098ae9dbab5d90422a4536acf28a2de32d8da67a50ebbbcf30e06833b630bd54e441040be0e432b377e3b63bf666e63106e69cd408ea0d
-EBUILD fluidsynth-2.0.4.ebuild 1961 BLAKE2B f63939bd52524ea1923c2a77aa6c295df9eb992136dbec734f81a1e6088df9a2ef435e77ee4c52ed870a20c312255fb6571f57bb58b15540bef48ecc7da05ccf SHA512 be79b683fa99dce6f3dbd7b4000714cc7dd1d12ff90e45af57fd03c0a7fc432a338d74a1ba4332a9f21a0e3d8a37ec30b9d35b4ad928821edc2562385984f47f
 EBUILD fluidsynth-2.0.7.ebuild 2538 BLAKE2B ce7275797d9a3fb38ff3b95e753d4ba81d5c11f3cb84c9213cf96847d2c6dd408f3039eb928218e999b9e358f2e92c2b79f3f12dd85174eb53ae6eaf5ed9822b SHA512 9529008829a8d0829404d1ef85aa622cd833d034bafba538d527a9c0a380513ef8483eb8c8d4e40b096ecc16841ec70381546e0f0f06e165240ba8f5d93e15a1
-EBUILD fluidsynth-2.1.0.ebuild 3323 BLAKE2B 4a9572ecf61630814035fbb6106becf333dfb58b76078acb8a3c2dfb4c8135f62360b5045e6fdf886b398da34af02ca7065caa9c7802a4e4ad48ee2d55fef941 SHA512 2da4bad58fe2d78fda897b009b7dc93756ff5bb61219c9aac9122a7e68020dc042574f4a95dd88c91b838685d9e3f42045060d7a4a4233d9287eafd90483e7be
+EBUILD fluidsynth-2.1.0.ebuild 3322 BLAKE2B 26e0a6129178d2815e34a95e0d93794ae675ac2f60d385f61ddcac0f12b66891da4add575360e4ed4b9204d8cec7f831030d74fff9ebf2cd2ff98dc5a5812d61 SHA512 24f2c02595add7681d482fe819de32229736a3679d4df4d1598bb3d5b31c7166f7edd296f5641a620587ff01ee207c75be48a9195fe58e19f7b1b9743b799c69
 MISC metadata.xml 430 BLAKE2B cef06a37f27e4ef3a555000188873f0f36a89dc90a3576dc15fb384a8f3c8f5bd38ccb79f56704ec7031823d3057eda17ac975a3ea1e265133e5ff81afc141d8 SHA512 c702d31a98e905d95f95f6cdfc16d8a71de5a5a55628e59e56d408a6599cdf6ab005642ee064217d88e0061c2856692e1446e340a3e80f2bc17ed1d3c2a14e9a
diff --git a/media-sound/fluidsynth/fluidsynth-2.0.4.ebuild b/media-sound/fluidsynth/fluidsynth-2.0.4.ebuild
deleted file mode 100644
index 6d6850bf5167..000000000000
--- a/media-sound/fluidsynth/fluidsynth-2.0.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="http://www.fluidsynth.org/"
-SRC_URI="https://github.com/FluidSynth/fluidsynth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="alsa dbus debug examples ipv6 jack ladspa lash oss portaudio pulseaudio +readline +sndfile"
-
-BDEPEND="
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-DEPEND="
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	alsa? (
-		media-libs/alsa-lib[${MULTILIB_USEDEP}]
-		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	ladspa? (
-		media-libs/ladspa-cmt[${MULTILIB_USEDEP}]
-		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
-	)
-	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS NEWS README.md THANKS TODO doc/{fluidsynth-v20-devdoc,xtrafluid}.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-Denable-alsa=$(usex alsa)
-		-Denable-dbus=$(usex dbus)
-		-Denable-debug=$(usex debug)
-		-Denable-ipv6=$(usex ipv6)
-		-Denable-jack=$(usex jack)
-		-Denable-ladspa=$(usex ladspa)
-		-Denable-oss=$(usex oss)
-		-Denable-libsndfile=$(usex sndfile)
-		-Denable-portaudio=$(usex portaudio)
-		-Denable-pulseaudio=$(usex pulseaudio)
-		-Denable-readline=$(usex readline)
-	)
-
-	if use alsa; then
-		mycmakeargs+=( -Denable-lash=$(usex lash) )
-	else
-		mycmakeargs+=( -Denable-lash=OFF )
-	fi
-
-	cmake-multilib_src_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	if use examples; then
-		docinto examples
-		dodoc doc/*.c
-	fi
-}
diff --git a/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild b/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
index 292ecd242d22..672fdd204679 100644
--- a/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="