5 files changed, 2 insertions, 125 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 7b3d13c62380..bbf8a246fa11 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 8c899e03b710..f4276e80a969 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,7 +1,5 @@
 AUX 2.3.2-musl-implicit-declaration-fix.patch 991 BLAKE2B 519b679a16f547b590ba64ec4f045c4e7570f15c59eadfd31072913218c118e3253e7bd35c5854c4878e1288921fabe11897504a42642d3b3ce698fbaa1fbb32 SHA512 cda4b24e0959c4578d192f8708eedb75469141c906276a3fc088971bd0689900d54b18f2059815479080a0a44c6befa5a56e703d2f55ab113f5f5c28617f7236
-DIST fluidsynth-2.3.1.tar.gz 1758632 BLAKE2B a1501303e02b3ea64d87be5cff08d5f2f2be170b38faedc8e6bc4fd18c0dafe268fa6110708664ef0659df9f0e9680551ac483d30364977e768af60dfdff7e83 SHA512 1633294bf6c714361c381151b62d9dd2c8f388490153e7964bfa14fd647a681db9ebfe1de0a06279972d6c5b30377f67361feb4db186b1faa235600f0ae02b22
 DIST fluidsynth-2.3.2.tar.gz 1773755 BLAKE2B 2d88e52223ff9c6bc5bcbcd8b15f30abb12632202b9a5c5eecc5eb95620aeaa2d7d9b80b76e6b26eef95ca92521bdc9e6d539f8235d90ca0429b12bb72db1a6f SHA512 21798b5a80a7edd8ef02b983d9b230af45cc66b98b32d593228e12dbec15b12c6cf6c0f3692c12af66de1ba2049fa9d6ad2b68c7d1579347eec14d24870b0025
-EBUILD fluidsynth-2.3.1.ebuild 3452 BLAKE2B ad87e841d41bace7720904372f33ec26da9685a68e8ac6849db841e3c73606c9335d885ac8ceb629b98ef83c806f032dc284441bc8caa7b83bc30924193f4dd5 SHA512 ac76893a9282bea3dbbaa5299dfc3e3a3f1fbb2660f69b298f09a504317a303c4ea9b6416d13493339a04b9c2a650b82a644cd0bf01144133f0913d4c3b13ad1
 EBUILD fluidsynth-2.3.2-r2.ebuild 3523 BLAKE2B b5a06a8a0c3db03200eaea057f9fc153a76a9b1ced08c03f69f9c43aa30e247a89f58aac6fd6d8dba0bcde6fbbdc380df83b89b3e92931227528d258153c33e4 SHA512 2004d6fd6c2e3addc6a175b19c60524d2ce29d2213b853a8285b1f9b98bfb268768070a98cd014a7c9a457ae75a508a8d3d20d33fae37ff7ca280fb96734a697
 EBUILD fluidsynth-2.3.2.ebuild 3454 BLAKE2B 629018f4cb334ad7963932f848e6eca273d9294321b732aa5c7a581d506c4ba83d201bcc9b30a1921c32751ccb67b2162b2dfe19830e8885cc7590bae76d00cd SHA512 ffe40ef484ed6f0fc578c29926f624e9c6e973dcb064be8295b2a6dbb329ecf57f2a9cf17d20696d9976114b8a7fed4ad4205c61d2b52c4e1ed364ca675dcb22
 MISC metadata.xml 509 BLAKE2B f94b91d9486a14757aa47e69269d6321fb330556f24ac0d2d47d7734bc28164d9cff5d7ff7728aa6d59606006bc4bfa090662b9dd087a6bf36ae23660604938a SHA512 7bf5aeb69570ef736dc6a1a3d652449b0142978ee5e6ed9902d4f851deea87c8fb94bee821ee9ae93bc529411f336288021718490e86c2815de5d30111bd3b28
diff --git a/media-sound/fluidsynth/fluidsynth-2.3.1.ebuild b/media-sound/fluidsynth/fluidsynth-2.3.1.ebuild
deleted file mode 100644
index d8c8395a14ce..000000000000
--- a/media-sound/fluidsynth/fluidsynth-2.3.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib systemd toolchain-funcs
-
-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 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss pipewire 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}]
-	)
-	pipewire? (
-		media-video/pipewire:0=[${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=(
-		-DCMAKE_C_COMPILER="$(tc-getCC)"
-		-Denable-alsa=$(usex alsa)
-		-Denable-aufile=ON
-		-Denable-dbus=$(usex dbus)
-		-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-portaudio=$(usex portaudio)
-		-Denable-profiling=$(usex debug)
-		-Denable-pulseaudio=$(usex pulseaudio)
-		-Denable-pipewire=$(usex pipewire)
-		-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/xfmpc/Manifest b/media-sound/xfmpc/Manifest
index 5c910ce1e154..460250f7b148 100644
--- a/media-sound/xfmpc/Manifest
+++ b/media-sound/xfmpc/Manifest
@@ -1,5 +1,5 @@
 DIST xfmpc-0.3.0.tar.bz2 443234 BLAKE2B ee0f491baadfb6be9148de8060758f788f773bdbc0354d6061889e979fb16eeb7a44357b61e698908c972714616b4268ed443d1d6323cbf0f457cdfd6cdf0fc1 SHA512 6e876aca2c2a6764fe97f061c97dc0fa9ce72b7ab6a2597b5f54bdce39789cc73bd038a0ef69b87d826c225efb9c3a2d19aa9ed7872ce7ee9ac5d7bd275444a3
 DIST xfmpc-0.3.1.tar.bz2 455660 BLAKE2B 2391217f1695ab0962a3ee52ea27ef44febbd8cf982d1bfba0c6952423c718f32dbea590930b9cef9cd3d932b2297cafb87870e27fb7579a764ad948e62918d6 SHA512 771835828cd89298d79c31cec2716b308889e6b835a2b16d0ef25eab6ed1667b055158f845ebf897df8f3f9f45a07fb6ad2994a9981695e74be2d56408e4abe0
 EBUILD xfmpc-0.3.0.ebuild 768 BLAKE2B 94c1ca9a19414e7b1d5cd217a4aa67b41525717227e76a267fc9c864c1635f96b1c94d877da81e21c505c6e515b9a32e02b7ae0bb74e681aae419cfaa5c70073 SHA512 5038a745344bed18aecfbf515dc7278935bc65ab0a81012f3df44dc1803a062a877dd8ab584369c7a7c979ed3f278a92b4328309d25af88654b4ca4ff1b0ea95
-EBUILD xfmpc-0.3.1.ebuild 763 BLAKE2B 9ec3f20a2fda11e0adf3e9915ca973d3321dcf3543dd3a995850bb747dc792158de87fd0805bd903991c9ad996f55bc8a3d396fbd058a0fecc7a5d3cd21eb0c3 SHA512 aa38187db387ea9c23a0dc21c4bdce75064ceffaa5f363b4b4009d8b0a2312dabc5d91a87e7dbd4596bb4a6932e48f4690f5e79e0c8965fa8616c2a45bfba555
+EBUILD xfmpc-0.3.1.ebuild 761 BLAKE2B 15835b6d47c9e4a608f63894a095573a2c33daf436419017b8cedfb0a89277e78838e79588eedf36bd2ae661fdd0ff64188d500dd4e9dd1c22705c6fcb5ece61 SHA512 423dee1965b22865635bd17828024efcbee742580152f38cf0f0a546ce16660e78dddf399932a04607ed1ec810746b629e520e990d03c795e5110b3b7e0604e5
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/media-sound/xfmpc/xfmpc-0.3.1.ebuild b/media-sound/xfmpc/xfmpc-0.3.1.ebuild
index 69378a9435cf..ae1a39537c81 100644
--- a/media-sound/xfmpc/xfmpc-0.3.1.ebuild
+++ b/media-sound/xfmpc/xfmpc-0.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	>=dev-libs/glib-2.38.0:2=