gentoo xmass resync : 25.12.2021

3 files changed, 2 insertions, 123 deletions

diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 557ffc577864..9b0d460d095a 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,3 @@
-DIST fluidsynth-2.2.3.tar.gz 1745344 BLAKE2B 0d08c67532392d32501a71f1e6fac6d55a0a0a607dae914106e1674df0a96869041530f75669193305a091ec40177e2925345df24d75a369c87e738ec1f4eb2e SHA512 67f8da02714350cc0439fbdce763d00cb08d01301a6aaa3e2655e67935048b43e18968c9a52aa64c702b5e30ae2b2b4946f69e8be4af5889fa414c654d4eb13e
 DIST fluidsynth-2.2.4.tar.gz 1746638 BLAKE2B 28a2a8048ad3f652afd424358b1b268d42672eb8fba0bdb30c72c06041617844fb5b90bc922e905d80ca2818eac03e9e5ce7f9a57b4cf68a43f60ed4bfddcd49 SHA512 46c3f0759cc011f34e5ba80684df4e8b593315d564da2341aaea14a5f0ba9cf732933f6ebc8712506f194b044a8e2b198b9e50879ff4221e6a9ab8051e79b48f
-EBUILD fluidsynth-2.2.3.ebuild 3360 BLAKE2B ad1ee9272aa056d67edec8ff2325c028dbea02a563debff1e6e3cdff7896610316033f544e70e7d13b537b48dddcd70717cd9283a285e8b12b6f8ae0e56038d2 SHA512 9b82983139158b67a8470c7531741e7390711e8cc803a113e5dc0068a7a6e23f824cc215c3e3c57472fd0738e3d6dceee57798ff24aed40cf7e545a800b0cea7
-EBUILD fluidsynth-2.2.4.ebuild 3367 BLAKE2B 867afcc1b81a7d8dc4e42a26fcacc8d58c71fb5d8c0879ed8d174fefdde173a45979617220df85d718cdf336e09b37edb87550ddd2c074067ba2ddd28443bd78 SHA512 244c2fd1570edbb0e73afd36312ce5d07e164d24a52a60b54d479239586d88354847859105710072aabcfe2768bf957baf26441aa129c677f6e2d008d90e8135
+EBUILD fluidsynth-2.2.4.ebuild 3360 BLAKE2B 0e319d650cdc52bd9f53fc1e06b648ce37c98a9c757800828e7a9fcd98f475e1ec465116f68bcbfd813438ef9690d41e166b50d9148536b2dcc027a8d29f4e0b SHA512 ed077ad3818d3a2c606f3862cef14d59c6db0fcd56e395595bd728108ae486d8ad11d1450b38aa417849ecaf7f795ddc27ea2b5181105256b699a8cc19f7f7b1
 MISC metadata.xml 431 BLAKE2B f739f538274e2e63b1977673b0766a594db59982ab71d6552d1e841434c4040bb7af29d441b1d9e8ce61385dbdb8e522b5591f6826a4c52f085bf004f9fe8426 SHA512 c8085e7652a504610fb841e302ee380de58a67a16a9b874447c00ee20c2d56119254eed954704e8bd4cf8e574980da2dd2f90baa5c99e59cd534e26245af67bb
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.3.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.3.ebuild
deleted file mode 100644
index 57dcd76a5287..000000000000
--- a/media-sound/fluidsynth/fluidsynth-2.2.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib systemd
-
-DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="https://www.fluidsynth.org"
-SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-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-sdk[${MULTILIB_USEDEP}]
-		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
-	)
-	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-Denable-alsa=$(usex alsa)
-		-Denable-aufile=ON
-		-Denable-dbus=$(usex dbus)
-		-Denable-debug=$(usex debug)
-		-Denable-dsound=OFF # Windows
-		-Denable-floats=OFF # loat instead of double for DSP samples
-		-Denable-fpe-check=$(usex debug)
-		-Denable-ipv6=$(usex ipv6)
-		-Denable-jack=$(usex jack)
-		-Denable-ladspa=$(usex ladspa)
-		-Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
-		-Denable-midishare=OFF # http://midishare.sourceforge.net/
-		-Denable-network=$(usex network)
-		-Denable-opensles=OFF
-		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
-		-Denable-oss=$(usex oss)
-		-Denable-libsndfile=$(usex sndfile)
-		-Denable-pkgconfig=ON
-		-Denable-portaudio=$(usex portaudio)
-		-Denable-profiling=$(usex debug)
-		-Denable-pulseaudio=$(usex pulseaudio)
-		-Denable-readline=$(usex readline)
-		-Denable-sdl2=$(usex sdl)
-		-Denable-systemd=$(usex systemd)
-		-Denable-threads=$(usex threads)
-		-Denable-trap-on-fpe=$(usex debug)
-		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
-		-Denable-waveout=OFF # Windows
-		-Denable-winmidi=OFF # Windows
-	)
-
-	if use alsa; then
-		mycmakeargs+=( -Denable-lash=$(usex lash) )
-	else
-		mycmakeargs+=( -Denable-lash=OFF )
-	fi
-
-	if use systemd; then
-		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
-	fi
-
-	cmake-multilib_src_configure
-}
-
-install_systemd_files() {
-	if multilib_is_native_abi; then
-		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
-		insinto /etc
-		doins "${BUILD_DIR}/fluidsynth.conf"
-	fi
-}
-
-multilib_src_test() {
-	eninja check
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-
-	if use systemd; then
-		multilib_foreach_abi install_systemd_files
-
-		elog "When using fluidsynth as a systemd service, make sure"
-		elog "to configure your fluidsynth settings globally in "
-		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
-	fi
-}
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.4.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.4.ebuild
index a285914d267a..fd161f332594 100644
--- a/media-sound/fluidsynth/fluidsynth-2.2.4.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.2.4.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/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="