9 files changed, 337 insertions, 3 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index cb61db5c60d9..dccc78f8cbf1 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index a5d4c204bb60..c59c0e82d82b 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -19,10 +19,12 @@ DIST Audacity-3.3.3.tar.gz 57120215 BLAKE2B 566aa2529f2708c80eb8e2887c3f3b2a1477
 DIST audacity-sources-3.4.2.tar.gz 57499669 BLAKE2B deb7cda94903826900c6d900883573a03a587ec3e03c6773a5452e3252f4c61ec76f09975f8e275b0fb8941f4e7d10eca66387d2f7c0a3f033ff4e1b1f08acc5 SHA512 5c754d2faa5867a98f24e8eae3fdb5d640483830ea9b62f94c6670e3689d87e61df6c14e9d557717d9fbfaca3b207188325369d8876248f1fc9edad43e4b500c
 DIST audacity-sources-3.7.1.tar.gz 61795370 BLAKE2B 7309418e2bcb44041b97f2d636974c9d90478051a4ecc9b6838e99f53e4d1c769bf7223df14ec822c3947293f6f784c922577b3a3824ee0b4f5783140c42d249 SHA512 cf50e2978d1c95d51f452c004a85b447fa541c669058a90485139d9c8c386d9f2dea6803c7eb96bc6eeea5db0cb2880650171973f4af8ceb0ca2e15ff4599523
 DIST audacity-sources-3.7.2.tar.gz 62087884 BLAKE2B ecb060200a4ae848872b732ebe9dfc88546b332c3ba5399a36e3374b8b4f9ca7c24be2f796efb98d14491847b84ec6b3573abdd896f9f6eeb9c89a5c7d601e4d SHA512 7d6d75fa2a953981e524656eaf3b7a621003d315b1dc101f39601468413ff3045144b7ee581fa2136c16233880e2635b3103cc56d7eacaa5853aed0dbbaaa851
+DIST audacity-sources-3.7.3.tar.gz 62087367 BLAKE2B 9f0ab7b7c4e54e0e695b12068cee79d7d6dedc70968a37e5541d0217ec0e88eb62110a3e3059d7b4c796cc83b93a7531a2c99aa548b37fe46f962a36d656f025 SHA512 2c247221b890834c8022f7c9c63714fcc58fd75462c6052600dfbff764c8646a61a849f8fc4ccd2b5d0579528748ddca9bb0fbbc406a6289c7169ca7a07ce71d
 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.1.ebuild 6998 BLAKE2B 4788577a01786135a018ccda77548361437533848570e1c63d6c4a06bee7bdb26923336ef80453375071d76268101ca1f16df87abf6f91d07e067d47bf6f5655 SHA512 ebcfab27c0601dc8ed9acbe3b72dc24aa52152e3d8ee6c43e67ebb8aeb00c634da3195b09e2d5b9e7d2f0d4bb8d327bee680721736ae339d95477e63af64cac0
 EBUILD audacity-3.7.2.ebuild 6998 BLAKE2B 90581c9a4f29da9b609f3065ae03ae32892c58a842e8c2f9249092db86eace6efdfdd898871b76f14c729e6a77a7c05ae8974362da9aca66f9bcf713744a152c SHA512 6f506d5064beec3f5f50eaded43691bb73efa143956de880b5030c29f6e67c3fc7d7c6cd30b4f5b9c2c27435dc75fbd9d2e9aca1771dfa088cde79ae50a27f7c
+EBUILD audacity-3.7.3.ebuild 6998 BLAKE2B 90581c9a4f29da9b609f3065ae03ae32892c58a842e8c2f9249092db86eace6efdfdd898871b76f14c729e6a77a7c05ae8974362da9aca66f9bcf713744a152c SHA512 6f506d5064beec3f5f50eaded43691bb73efa143956de880b5030c29f6e67c3fc7d7c6cd30b4f5b9c2c27435dc75fbd9d2e9aca1771dfa088cde79ae50a27f7c
 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.3.ebuild b/media-sound/audacity/audacity-3.7.3.ebuild
new file mode 100644
index 000000000000..af043ce141be
--- /dev/null
+++ b/media-sound/audacity/audacity-3.7.3.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+
+inherit cmake flag-o-matic 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 )
+	test? ( mpg123 )
+	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
+
+	# bug #944212
+	append-cflags -std=gnu17
+
+	# * 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/cava/Manifest b/media-sound/cava/Manifest
index 6c62592a96cf..482d2bd2f705 100644
--- a/media-sound/cava/Manifest
+++ b/media-sound/cava/Manifest
@@ -1,5 +1,5 @@
 DIST cava-0.10.3.tar.gz 297550 BLAKE2B fbe4146aeeb07c99b37efd08a65e381e2cfc8800429fe3e144db76fc53c47f747f644d9d01146c7ec300d6b3d886492ab2cef44c1511691ec35b748f3fa188a2 SHA512 35ee4821e094c2ea567012329c21a8283450100eada4f7e33f7decd935db94adbefd2a2a41801e0ef49eea0dcd859c397c5b3dc7316f0640394d67e3b658876c
 DIST cava-0.10.4.tar.gz 426075 BLAKE2B b4d8b4669cba86ea08fd62f1206306406ae9197405d1d717f492526a55a032a8599c76e8606bd60cf876c50b7f4338fd2f36a65b626312ef8d0fd7b4e5e453c0 SHA512 1f11e3d89465990a026c4cd9e30853967b0ab542b310afe5464f399baec08e769b2bda52d07654eb449adbb66de1a6db721a2cbc90c241193de58b1e12d52259
 EBUILD cava-0.10.3-r1.ebuild 2458 BLAKE2B 25b9dabd7703143effa0131b99af773108354ee4b4430b32f77e9fee60b8e53e3d935d106f4418c0f11eaf0577462b805389ddeb847c681830788adb69a45f79 SHA512 b215429f7c229af4610dd545ff2e5905509cadaab76e12ef2f1b8e5caa017f8997d0b1d739ef898a8522c0161997dcfb6f9f7b01b8b2a07f5f6499cd9b7f748e
-EBUILD cava-0.10.4.ebuild 2004 BLAKE2B ce4ffd5a5f072ea69cadbf1b102b9d687f0b605a66368161eb1bcdb03bb5ffddf34b4d0480493eef0901096c55942e843e48877f7c03e5c43c5d482c5a974f2c SHA512 14fd483bee56f57d5c5ca3960d42c0ef6752491d9bf08318cf3b5be08c454aed8785075393454c269eb65ab1a1c693b87b5afe9032c4fec0761023624adb8947
+EBUILD cava-0.10.4.ebuild 2002 BLAKE2B 2253a3c3021eaa6b9bdd0977ddce171f8c8bd99e02a1a80b5e449e1d1a7028ea73ef742444731afd15ab872e6fc9a35b376ed1a41398b360ac4d5ec9c8e5943c SHA512 2e936c9e73b521edda7ae41793bcfd93b23323a945cf3f425d494316ada205af7513062c43de4ffb5a78102e360ca47398a94b00a4a75f26aa64ccb6fc4951eb
 MISC metadata.xml 521 BLAKE2B 9b5fc566431d23ee6c56ed429d3337a6fbccddde718487bf9e1cac36e5fc70173e20a070669a8c85179443af12bc032eecfa4b9829d96422170ff4cdd92518ee SHA512 57cdabe9b70f97abb5bd5e64b3b0f25ec113ce80f8b1eaa45682f814b20fa120fe0efc38552aed23c3cb4d918ba9f0d67030d18b4a307fbf0f81a8b962e35c87
diff --git a/media-sound/cava/cava-0.10.4.ebuild b/media-sound/cava/cava-0.10.4.ebuild
index 8a77c7512ae6..57bc257ef899 100644
--- a/media-sound/cava/cava-0.10.4.ebuild
+++ b/media-sound/cava/cava-0.10.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/karlstav/cava/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="MIT Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa jack +ncurses pipewire portaudio pulseaudio sdl sndio"
 
 RDEPEND="
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index 4d3c6220c2c2..e9cd20422b3c 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,7 +1,9 @@
 AUX pavucontrol-5.0-make-libcanberra-optional.patch 3727 BLAKE2B 27e38b16e1eaf64c7b1c3b0f3a6efc85bd4b290fef8b4c4c64a0e6e24de6565090e8a1f5d0ec1dc6ef1b65ff3c3c0836186ee53f27c844ca68515e98ea239e0c SHA512 3b866adf8495b8ffdbe48329ab4d54663ea3294e031f6d870d3c278b26b1d0314245ed4bca88e905e79cb503506f5762c3332fb5c9cc66ebe8205feb89e21369
 AUX pavucontrol-6.1-docdir.patch 466 BLAKE2B 77279c89f4889b6d96513f7be743d593065b01b1c94038c95746ca278225ac3c7fea2079984ebfb5052c3c22976afcb40c3ed107bb78bbdd8a30a330a6003305 SHA512 c8221cc4753b356603447f1ef913129e7c8fc867dbb9e7d57b7a07b622a0c41097e8b2c7255dff117928a579e39142f515a9439da036e46a3a257cae2c360689
+AUX pavucontrol-6.1-libcanberra-automagic.patch 1591 BLAKE2B 97e4f80b0fc17691d9cd6d92c9bdf6bd9488fd6f12e6f65ef42128a54c8c3d4fb1e82cf243d0f48c0ae9d61464eb67c366b205aaad3c104cd02d75178e1d18a1 SHA512 e6713ae40753b2972dbfef84ceeede6ca8312e89802d105f05b3660ce6f665ba55460778fc992b97abdeeddd2903cb411130519ae93c81de4d3b222d00cfd4dc
 DIST pavucontrol-5.0.tar.xz 194248 BLAKE2B 9e6b9b7d94be51a4ad8b5310e031c4fed0f5299e67c770c9a573c0647edf27345014fb6504892fad29b9b5e79ce43ed312217dbed8e2b31b805f291531062903 SHA512 5673d783c2c819a68b49025c051bedd39f4caba446a479797b06569e24a96acc0924ba680d2416baff8c3211cfc7c94760d503900207fbe7c89c5cb2adaebec1
 DIST pavucontrol-6.1.tar.xz 169488 BLAKE2B 888fbe404482e5da5b59d10f913f174daa128029babbb9493df5df5d6d3c0b95e22d03a3ec2629fbcd4f33c6267f6e2173428d7eb9be8b7f4c7f012d3e777e92 SHA512 90a0d85916010f624928f6aa68524f776b0a529d84e75287739a07db48e4084767ca0caf75503e44e04d8add84b1d668ee9ed5b822b8f8f945cd902cdf78413a
 EBUILD pavucontrol-5.0-r4.ebuild 1059 BLAKE2B 9a89dc64569d4af159421bb1a3f3938cca18d3fef422580928f957f098a0b7293692242672b296e73ca32f1f4b127ff9316dd68e927315d5b8d9dc15dcc33ccc SHA512 5b41954bce30f44c077af758a9dd361f4f7a27993707001528132127fc6499f49a9c8c1a712c4bee9ed94e31c6d0071e182afb0f27bb41cd088160bebf934f11
+EBUILD pavucontrol-6.1-r1.ebuild 1008 BLAKE2B cdeb2b10ca744cfecf4eb0d22fe53018688ab7becf52db64884934e683257a52f451178d90929f9ae1abe0dfabe566f6cf76b032ce4ffa038cf98128533e49a2 SHA512 dac838b213c831814220bd4eef77767178460adacfa771ca8b9cd7dcc2dd9de774e35230ba6d40fca40200288902dcefe5ffc3787b8131eddfe3e6e05af70a84
 EBUILD pavucontrol-6.1.ebuild 824 BLAKE2B 28a3c697803d900612c1c23d314eb5ffa79c7c21e7b7d44a37e591ad6d13b70a625dcad946f621a575d3e1d7e45617aca47e85e120bbc5052afe23f1d5bed345 SHA512 3385a0e66299a46e904286f659da94af8fef7adad8d04baddeb3a032e2c9b1c4894687f7e9daf99a907533480bb4d13e8783a2138af5bc391ae347ccb33ba6d3
-MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
+MISC metadata.xml 453 BLAKE2B 87654c3918a35652e229e756989ea1e28673139af38cafbd424d9d837bb4876c6429a744fbd24a4ac3dada76edfc62e2e89368147a93153b0c44b70e5fefaab8 SHA512 c75806ec49576d080381bd488c8b833601f777c1ef55ef19f4e2df6262bdb9f2e9a71e37082122de700017aeea4c20d4cb9a5ff7796b52946af24b51d2bbfcad
diff --git a/media-sound/pavucontrol/files/pavucontrol-6.1-libcanberra-automagic.patch b/media-sound/pavucontrol/files/pavucontrol-6.1-libcanberra-automagic.patch
new file mode 100644
index 000000000000..deef40022731
--- /dev/null
+++ b/media-sound/pavucontrol/files/pavucontrol-6.1-libcanberra-automagic.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/950761
+https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/merge_requests/104
+
+From 53b44d9ccd2e095a9c0ce1511e122e4ed37bbbb5 Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Mon, 10 Mar 2025 20:44:02 +0200
+Subject: [PATCH] Add a option for controlling libcanberra feature
+
+The retains the previous behavior of automagic except it allows the user to
+explicitly enable or disable the feature.
+
+Chose to call the feature a more agnostic "audio-feedback".
+
+Bug: https://bugs.gentoo.org/950761
+See-Also: 22b04fff6e881b4e0a1b8344a6513bdf99a10c65
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+--- a/meson.build
++++ b/meson.build
+@@ -10,7 +10,7 @@ cpp = meson.get_compiler('cpp')
+ 
+ gtkmm_dep = dependency('gtkmm-4.0', version : '>= 4.0', required : true)
+ sigcpp_dep = dependency('sigc++-3.0', required : true)
+-canberragtk_dep = dependency('libcanberra', version : '>= 0.16', required : false)
++canberragtk_dep = dependency('libcanberra', version : '>= 0.16', required : get_option('audio-feedback'))
+ 
+ libpulse_dep = dependency('libpulse', version : '>= 5.0', required : true)
+ libpulsemlglib_dep = dependency('libpulse-mainloop-glib', version : '>= 0.9.16', required : true)
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,6 @@
+ option('lynx',
+        type : 'boolean', value : true,
+        description : 'Enable building of the README text file for installation')
++option('audio-feedback',
++       type : 'feature', value: 'auto',
++       description : 'Play a sound when you change the volume of a sink')
+-- 
+GitLab
+
diff --git a/media-sound/pavucontrol/metadata.xml b/media-sound/pavucontrol/metadata.xml
index b69a849fd57e..5fc3212e38fe 100644
--- a/media-sound/pavucontrol/metadata.xml
+++ b/media-sound/pavucontrol/metadata.xml
@@ -5,4 +5,10 @@
 	<email>sound@gentoo.org</email>
 	<name>Gentoo Sound project</name>
 </maintainer>
+<upstream>
+	<remote-id type="freedesktop-gitlab">pulseaudio/pavucontrol</remote-id>
+</upstream>
+<use>
+	<flag name="sound">Enable sound notifications using <pkg>media-libs/libcanberra</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/media-sound/pavucontrol/pavucontrol-6.1-r1.ebuild b/media-sound/pavucontrol/pavucontrol-6.1-r1.ebuild
new file mode 100644
index 000000000000..c1268cc03768
--- /dev/null
+++ b/media-sound/pavucontrol/pavucontrol-6.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Pulseaudio Volume Control, GTK based mixer for Pulseaudio"
+HOMEPAGE="https://freedesktop.org/software/pulseaudio/pavucontrol/"
+SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="sound"
+
+RDEPEND="
+	dev-cpp/gtkmm:4.0
+	dev-libs/json-glib
+	dev-libs/libsigc++:3
+	>=media-libs/libpulse-15.0[glib]
+	virtual/freedesktop-icon-theme
+	sound? ( media-libs/libcanberra )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}/pavucontrol-6.1-libcanberra-automagic.patch"
+)
+
+src_prepare() {
+	default
+
+	# Follow Gentoo FHS with docdir
+	sed -i -e "/^docdir/ { s/${PN}/${PF}/ }" meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dlynx=false
+		$(meson_feature sound audio-feedback)
+	)
+
+	meson_src_configure
+}