6 files changed, 3 insertions, 278 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 89f47a584110..730fbef35f96 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 09053775c6e9..d72d94123d82 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -17,12 +17,10 @@ AUX audacity-3.7.0-local-threadpool-libraries.patch 1066 BLAKE2B 8ceadbbb9e2b841
 AUX audacity-3.7.0-portsmf.patch 302 BLAKE2B 2dee89e346934ff5cadd1cbc5304fbec9b3391fd4be1cf9c3b27d8b1dbda8acfba2a6fff4f76a1237d277d540109c48efc03b7c8af88f58b40f0662992050d87 SHA512 b9b0bacf9f75120c40ca4796015ef11a80bc5d868b15009bfeb3f0bc15c2b2fe070326b70f6c09a1dde8dbb30de7372577ef4f07bc7c3cb95380e0065aeb45df
 DIST Audacity-3.3.3.tar.gz 57120215 BLAKE2B 566aa2529f2708c80eb8e2887c3f3b2a1477d0825133b960f824d0697716d5b5e3a3ba0bcb14a20afc2eba7ac544da154339d1cd37261225b06326e8ee3f730c SHA512 c484e747f5207785b1872d031be2c3c50e7bbce087909c41930e593e2ab5777e0ab527a2770d90d89854bdd131e3f1f7afe3696b30420e3d8370e9f95527c937
 DIST audacity-sources-3.4.2.tar.gz 57499669 BLAKE2B deb7cda94903826900c6d900883573a03a587ec3e03c6773a5452e3252f4c61ec76f09975f8e275b0fb8941f4e7d10eca66387d2f7c0a3f033ff4e1b1f08acc5 SHA512 5c754d2faa5867a98f24e8eae3fdb5d640483830ea9b62f94c6670e3689d87e61df6c14e9d557717d9fbfaca3b207188325369d8876248f1fc9edad43e4b500c
-DIST audacity-sources-3.7.0.tar.gz 61801488 BLAKE2B 97ff912d60c07a4e7509ad60814b944f3a0feb6b892328aee9375d64673eb2460bc54ef0dc2385173d92f8121ce330d0529a48940b0e08a434cbf05a8912f05c SHA512 0306cae5c42eb3b86781e37866fe1f95c0564c5a14525c69bbe9cfd614ee31d5296fa845bfd4be5f7a4c3e9ac67224e75dd114a16df9b5c6d1a1c79ce1d874bb
 DIST audacity-sources-3.7.1.tar.gz 61795370 BLAKE2B 7309418e2bcb44041b97f2d636974c9d90478051a4ecc9b6838e99f53e4d1c769bf7223df14ec822c3947293f6f784c922577b3a3824ee0b4f5783140c42d249 SHA512 cf50e2978d1c95d51f452c004a85b447fa541c669058a90485139d9c8c386d9f2dea6803c7eb96bc6eeea5db0cb2880650171973f4af8ceb0ca2e15ff4599523
 DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14 SHA512 f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d
 EBUILD audacity-3.3.3.ebuild 7247 BLAKE2B d13edb80efb3cc7da04706b30972265594527b09003be5c690e1a4f3c8fa3b918fea751eec1fc6bd29d3810547204fcc4421681ed657be63847b341e38d58708 SHA512 6120da23d94e41ceb840a3cc6e9a6295e4da03674fffce158625ab671eca780ba77985916396af40c0a19eb99facd9a4e31fda7b6ef6aff79b2f4a9d1ffa4888
 EBUILD audacity-3.4.2-r1.ebuild 6904 BLAKE2B 1884b799dbbcf59ea235d4351b1fe9da68f0d3c5964e671e8ddca49eb88e63512a19d774676b182711fd9742d9f18a1bdde1f6008a449200d73df19bd6130485 SHA512 b19140ac540f2c874eec6086475a1967c5fea707a80ff490e286c305dc0538666df48d5cf88f0fec9d912e9890e7e702c128efd3c3f421321a4fbcc9ce1feb66
-EBUILD audacity-3.7.0.ebuild 6925 BLAKE2B ccffb8bf679ddc8212722b21c1b11830cb79564d49e177cdbe40eb402a71d61cd20cd3ce97cec9135c48c8169fc878976bb6d624136fee0426dee7cbee8d9328 SHA512 363918e777b3da5f0bb46fd355c04a4929ae8cab74ec18a0e65b68494c22e34cc338e8ea7adda699bb90edcdf404908ce521f18a0a179c65e5f5a96a5f5a3252
 EBUILD audacity-3.7.1.ebuild 6998 BLAKE2B 4788577a01786135a018ccda77548361437533848570e1c63d6c4a06bee7bdb26923336ef80453375071d76268101ca1f16df87abf6f91d07e067d47bf6f5655 SHA512 ebcfab27c0601dc8ed9acbe3b72dc24aa52152e3d8ee6c43e67ebb8aeb00c634da3195b09e2d5b9e7d2f0d4bb8d327bee680721736ae339d95477e63af64cac0
 EBUILD audacity-9999.ebuild 7048 BLAKE2B 6c661ade492cc7d7287d7c69be4b4475b3f5fcfae01b29922842c8364260c3f05293679fd225d6a578d2a509e4b932bf0cac3b8910505bc91d5a5741b673b134 SHA512 9418de04b75ce522bc0b3d08278cae3802491a67e2a74ad120e3bf4b1dcc1d2b7c965e97773d5b4e44ef3fd029f135bfa4ccbcc53d79bd2f425199456cdc5ece
 MISC metadata.xml 1749 BLAKE2B 44bbb4f2f0b4837d87988fbc30c3d7e1063686a720797197e56d8c6c523e506fbab218622be10dfab50283a834f31fd795d286a3e36a7661105e84585baec8d4 SHA512 6e4e7fc5638fd7b3828b3081ec9541f53346d5ddd4bcba2fbf4bc398a6f57c4a4e02197cba134b99f8cf69e9e5dc1727a5b35d44e514e194ad3d93cc7617a3cf
diff --git a/media-sound/audacity/audacity-3.7.0.ebuild b/media-sound/audacity/audacity-3.7.0.ebuild
deleted file mode 100644
index 17010e125d96..000000000000
--- a/media-sound/audacity/audacity-3.7.0.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.2-gtk3"
-
-inherit cmake wxwidgets xdg virtualx
-
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="https://www.audacityteam.org/"
-
-# A header-only thread pool library, without a build system, about 100
-# lines of code.  Probably not worth packaging individually.  Check
-# cmake-proxies/CMakeLists.txt and search for "ThreadPool".
-MY_THREADPOOL_DATE=20140926
-MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h -> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/audacity/audacity.git"
-else
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-	MY_P="Audacity-${PV}"
-	S="${WORKDIR}/${PN}-sources-${PV}"
-	SRC_URI="https://github.com/audacity/audacity/releases/download/Audacity-${PV}/${PN}-sources-${PV}.tar.gz"
-fi
-
-SRC_URI+=" audiocom? ( ${MY_THREADPOOL} )"
-
-# GPL-2+, GPL-3 - Audacity itself
-# ZLIB - The ThreadPool single-header library
-# CC-BY-3.0 - Documentation
-LICENSE="GPL-2+
-	GPL-3
-	audiocom? ( ZLIB )
-"
-SLOT="0"
-IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 +ogg
-	opus +portmixer sbsms test twolame vamp +vorbis wavpack"
-REQUIRED_USE="
-	audiocom? ( wavpack )
-	opus? ( ogg )
-	vorbis? ( ogg )
-"
-RESTRICT="!test? ( test )"
-
-# dev-db/sqlite:3 hard dependency.
-# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
-#   cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
-# sys-apps/util-linux hard dependency, from cmake-proxies/CMakeLists.txt
-#   for libuuid
-# portmidi became non-optional: building without it results in build
-#   failures, even with some of the Debian patches.  It's probably not
-#   in our best interest to fix that as a patch series.
-# glib, gtk and gdk are all directly relied on in the source, not just
-
-# Libraries used at runtime via dlopen:
-# - dev-libs/{serd,sord} - for LV2 support
-# - media-libs/{opus,sratom} :: For Opus and LV2 respectively
-# - media-sound/lame :: For MP3 export
-# - media-video/ffmpeg :: For generic FFMPEG export
-#   This one has the interesting property of many versions being
-#   supported at runtime.  See: libraries/lib-ffmpeg-support/impl
-#   Current support grid:
-#   - Lavf - 5[789]
-#   - Lavc - 5[789]
-#   - Lavu - 5[2567]
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/glib:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/libsndfile
-	media-libs/libsoundtouch:=
-	media-libs/portaudio[alsa?]
-	media-libs/portmidi
-	media-libs/portsmf:=
-	media-libs/soxr
-	media-sound/lame
-	sys-apps/util-linux
-	sys-libs/zlib:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	alsa? ( media-libs/alsa-lib )
-	audiocom? (
-		net-misc/curl
-	)
-	ffmpeg? ( media-video/ffmpeg )
-	flac? ( media-libs/flac:=[cxx] )
-	id3tag? ( media-libs/libid3tag:= )
-	lv2? (
-		dev-libs/serd
-		dev-libs/sord
-		media-libs/lilv
-		media-libs/lv2
-		media-libs/sratom
-		media-libs/suil
-	)
-	mpg123? ( media-sound/mpg123-base )
-	ogg? ( media-libs/libogg )
-	opus? (
-		media-libs/opus
-		media-libs/opusfile
-	)
-	sbsms? ( media-libs/libsbsms )
-	twolame? ( media-sound/twolame )
-	vamp? ( media-libs/vamp-plugin-sdk )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="${RDEPEND}
-	dev-libs/rapidjson
-	x11-base/xorg-proto
-	test? ( <dev-cpp/catch-3:0 )"
-BDEPEND="|| ( dev-lang/nasm dev-lang/yasm )
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	# fixes include path
-	"${FILESDIR}/audacity-3.7.0-portsmf.patch"
-
-	# disables ccache
-	"${FILESDIR}/audacity-3.7.0-disable-ccache.patch"
-
-	# Disables some header-based detection
-	"${FILESDIR}/audacity-3.7.0-allow-overriding-alsa-jack.patch"
-
-	# For has_networking
-	"${FILESDIR}/audacity-3.7.0-local-threadpool-libraries.patch"
-
-	# Allows running tests without conan
-	"${FILESDIR}/audacity-3.3.3-remove-conan-test-dependency.patch"
-
-	# #920363
-	"${FILESDIR}/audacity-3.7.0-audiocom-std-string.patch"
-
-	# 915041
-	"${FILESDIR}/audacity-3.7.0-do-not-include-template-on-unix-to-fix-clang-compile.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Keep in sync with has_networking and the ThreadPool.h SRC_URI.
-	if use audiocom; then
-		mkdir -p "${S}/lib-src/threadpool/ThreadPool/" || die
-		cp "${DISTDIR}/progschj-ThreadPool-${MY_THREADPOOL_DATE}.h" \
-		   "${S}/lib-src/threadpool/ThreadPool/ThreadPool.h" || die
-	fi
-
-	# Remove documentation incorrect installations
-	sed -i -e \
-		'/install( FILES "${topdir}\/LICENSE.txt" "${topdir}\/README.md"/,+1d' \
-		src/CMakeLists.txt || die
-}
-
-src_configure() {
-	setup-wxwidgets
-
-	# * always use system libraries if possible
-	# * USE_VST was omitted, it appears to no longer have dependencies
-	#   (this is different from VST3)
-	local mycmakeargs=(
-		# Tell the CMake-based build system it's building a release.
-		-DAUDACITY_BUILD_LEVEL=2
-
-		-Daudacity_conan_enabled=off
-
-		-Daudacity_has_networking=$(usex audiocom on off)
-		# Not useful on Gentoo.
-		-Daudacity_has_updates_check=OFF
-		-Daudacity_has_audiocom_upload=$(usex audiocom on off)
-
-		# Disable telemetry features.
-		-Daudacity_has_sentry_reporting=off
-		-Daudacity_has_crashreports=off
-
-		-Daudacity_has_tests=$(usex test on off)
-
-		# The VST3 SDK is unpackaged, and it appears to be under a breed
-		# of a proprietary license and the GPL.
-		-Daudacity_has_vst3=off
-
-		-Daudacity_lib_preference=system
-		-Daudacity_obey_system_dependencies=ON
-		-Daudacity_use_expat=system
-		-Daudacity_use_ffmpeg=$(usex ffmpeg loaded off)
-		-Daudacity_use_libid3tag=$(usex id3tag system off)
-		-Daudacity_use_ladspa=$(usex ladspa)
-		-Daudacity_use_lame=system
-		-Daudacity_use_wxwidgets=system
-		-Daudacity_use_libflac=$(usex flac system off)
-		-Daudacity_use_libmp3lame=system
-		-Daudacity_use_libmpg123=$(usex mpg123 system off)
-		-Daudacity_use_libogg=$(usex ogg system off)
-		-Daudacity_use_libopus=$(usex opus system off)
-		-Daudacity_use_libsndfile=system
-		-Daudacity_use_libvorbis=$(usex vorbis system off)
-		-Daudacity_use_lv2=$(usex lv2 system off)
-		-Daudacity_use_midi=system
-		-Daudacity_use_nyquist=local
-		-Daudacity_use_opusfile=$(usex opus system off)
-		-Daudacity_use_pch=off
-		-Daudacity_use_portaudio=system
-		-Daudacity_use_portmixer=$(usex portmixer system off)
-		-Daudacity_use_portsmf=system
-		-Daudacity_use_rapidjson=system
-		-Daudacity_use_sbsms=$(usex sbsms system off)
-		-Daudacity_use_soundtouch=system
-		-Daudacity_use_soxr=system
-		-Daudacity_use_twolame=$(usex twolame system off)
-		-Daudacity_use_vamp=$(usex vamp system off)
-		-Daudacity_use_wavpack=$(usex wavpack system off)
-
-		# See the allow-overriding-alsa-jack.patch patch
-		-DPA_HAS_ALSA=$(usex alsa on off)
-		## Keep watch of PA_HAS_OSS in lib-src/portmixer/CMakeLists.txt;
-		## AFAICT it introduces no deps as-is, but that could change.
-		## Similar goes for PA_HAS_JACK.
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
diff --git a/media-sound/xfmpc/Manifest b/media-sound/xfmpc/Manifest
index ac207256e48f..bd8b7bef74cb 100644
--- a/media-sound/xfmpc/Manifest
+++ b/media-sound/xfmpc/Manifest
@@ -1,5 +1,3 @@
-DIST xfmpc-0.3.1.tar.bz2 455660 BLAKE2B 2391217f1695ab0962a3ee52ea27ef44febbd8cf982d1bfba0c6952423c718f32dbea590930b9cef9cd3d932b2297cafb87870e27fb7579a764ad948e62918d6 SHA512 771835828cd89298d79c31cec2716b308889e6b835a2b16d0ef25eab6ed1667b055158f845ebf897df8f3f9f45a07fb6ad2994a9981695e74be2d56408e4abe0
 DIST xfmpc-0.3.2.tar.bz2 566036 BLAKE2B 5fe6affcf5c96b5fc0e6050b6fe3ab7f81013296133b49d44a807e2cc644b156e34c97d61cb9a980470e6e14f0d71ad76b132986d9e1252f0e7d2fff18284687 SHA512 340997f581e2821979d8501d3dcf010b50dbb0a9755465dbdcdd61de25fda299f0f0853128d7181deadea49faa182a823c33e30db30a56e0adc24dbe85b1252f
-EBUILD xfmpc-0.3.1.ebuild 795 BLAKE2B c01d4dea09dc74174717e4113e00359cfb716d9a6f108e68cf3bca1b5ef571da50534fa5cbc72af951967f4a1eae7c57ef5718214539573514d47ed48b7d7b5b SHA512 b0a3e41f27b761bed99bb1b157fa3346318990cc3d6e40d6db41a08ff7ed0f3409235ad11eab40400981b9e9b4875c9d32ed1a8740c747e60de3ebc256918708
-EBUILD xfmpc-0.3.2.ebuild 810 BLAKE2B 52e34c9b78e57a07e72904c5146ac4a052f01c90436e47e71d08c579b43e920da9ddddb9ed0a1278c299483431c3674a8c425d5c45513ac38a72ac0cbc8b1140 SHA512 4dd6acb8943c416837bc95c2620a8993544d38dc7d9700ad5e49d2d78790a375b5a8981ab69a87873326fddf3df8180a6b52d0a8c1b9a6016b8db41b0e6762be
+EBUILD xfmpc-0.3.2.ebuild 804 BLAKE2B 01f2ab6e6d56e0e8735e135a4ff35bbf629f18e2626348d63dbd28a40ce2fabc0e5857aa8827c6439d375d7ca88223114d47fcd5b5759d92fc0e84015ab15942 SHA512 3e62be116520a1bf376c5f27b8abb409331dd36a11bb623f85e4a4bec74afd4e9597c94089fcdabb75745396b3c6813c6bee7360414844d920339cc4c6dded59
 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
deleted file mode 100644
index 930177579294..000000000000
--- a/media-sound/xfmpc/xfmpc-0.3.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="Music Player Daemon (MPD) client for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/apps/xfmpc/start
-	https://gitlab.xfce.org/apps/xfmpc/
-"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-
-DEPEND="
-	>=dev-libs/glib-2.38.0:2=
-	>=media-libs/libmpd-0.15.0:=
-	>=x11-libs/gtk+-3.22.0:3=
-	>=xfce-base/libxfce4ui-4.12.0:=
-	>=xfce-base/libxfce4util-4.12.0:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/xfmpc/xfmpc-0.3.2.ebuild b/media-sound/xfmpc/xfmpc-0.3.2.ebuild
index 98aa79097655..cc053c13a1cf 100644
--- a/media-sound/xfmpc/xfmpc-0.3.2.ebuild
+++ b/media-sound/xfmpc/xfmpc-0.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.38.0:2=