gentoo auto-resync : 19:04:2024 - 12:05:02

15 files changed, 225 insertions, 98 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index ccd3ed29e9a0..7f758e77b760 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/klick/Manifest b/media-sound/klick/Manifest
index 08d4d63482d9..481fc08c9e00 100644
--- a/media-sound/klick/Manifest
+++ b/media-sound/klick/Manifest
@@ -1,5 +1,5 @@
 AUX klick-0.12.2-gcc6.patch 2684 BLAKE2B 528a2f41e4ea7dc7dbdc36cfb79493998c6941b248a4a8cfc758881ef96a6f8ab49bb230713ece38271c69d1f7833d89e98b238083029d7edb5671f3cbd90f63 SHA512 a5023a129a4e2ac2e5b2bb3e264ae27c1cac25ea640629260f281b2849ce71a23920df1a514b88a67290909b5f1a9ae8fe433de1468b23a20bb9e1b9a6774142
 AUX klick-0.12.2-sconstruct.patch 1836 BLAKE2B 1e22becd7205fe5f9717b18d1d63f7dfc8b265d995c2d503553676c3d281fb7df818375f1fd76f64067d6d3150124c6f162dc42842d1a7ddf2ef39cf9a95e66a SHA512 0db89995a39962e91085c761cf9eb07470ab20a16dd90ae77e1e34bf912ede28aca15a8c7f7708fdfbafe3c84f3b92059aa01f160b936e20a32cd69fbc6d03c1
 DIST klick-0.12.2.tar.gz 111801 BLAKE2B 990743d079927fae0768c9fd7c979b88055e2886ae7d9f6a25116dbdea5b295b82446c6ac5c7e9af35f48058126bc925c4495f5776fb7cd4c6266741cd6c02bb SHA512 e0da321b4f5573e8a0b7ef53a554bf33b6d999b7125c62648d5ad64278107b429effa573187327d7c6fe5ae07bf9c7f81b96f069358315b2ee9166480f6dae7f
-EBUILD klick-0.12.2-r4.ebuild 1085 BLAKE2B 9f543ba0eceff049bf875815910837fb5a48a64d1066628e1a30a5f4e9ed08968bce1d6ea0593c1618581d3d538ea64672e87669be4e93a9bdee013329f6408f SHA512 eb3e523edf2ccc276650ec838f0cb85fabb0ace3d30c3607105b83f558bc121346142abfbd2ffa822ed06b1b6d1522f27fea7245dfca0e02dbc31f0119aa36b5
+EBUILD klick-0.12.2-r4.ebuild 1086 BLAKE2B c07c5b88c1a3097de780ae448b625cadac8a4c15d0148fcb4b4f65a96f6ee183d4be854978689e66865998de80023a236c3739c93dfc5bf366a715893dc27999 SHA512 3a61edfa3e4fa0defbd22def68598c26e5e30aa4ebb0f8f483cea3299de323fcd1086e29b27a2a2f661f7e31ac7cf072710d13d381f205f78c04ef9add17dd7d
 MISC metadata.xml 546 BLAKE2B 6f3499cca20243d15ae34193598bd09d8d88a40759744b440834fcab459d71e383d1584c575e346ea376552a1f0a40c098d9892b9963af1a75846dfaa4542420 SHA512 af8a15367d57e8592ee6271ac2ee6844170fd953542b9bd7d83ead0c5461b948a63513045d936f27766f8caa0b68e270bc6f500072db453eaca767cde98d239f
diff --git a/media-sound/klick/klick-0.12.2-r4.ebuild b/media-sound/klick/klick-0.12.2-r4.ebuild
index 29bd9c9b86be..bee2f5f90249 100644
--- a/media-sound/klick/klick-0.12.2-r4.ebuild
+++ b/media-sound/klick/klick-0.12.2-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit python-any-r1 scons-utils toolchain-funcs
 
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index febf94c076ab..827913e56dc3 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,7 +1,5 @@
-DIST lollypop-1.4.29.tar.xz 593980 BLAKE2B 8a3a985cb18c196665377c7c29670b98f352a86284ee8bb5af13b1017346b0b2b938dee6e53d56d0b8d98b191a64e5efd1c7126879c7017c3f10d5aa96570a39 SHA512 f81315a94cbcc726cd453d58faffe5c33ebcbdaef55a5a36d2a9dc20dec9340c2d263d935b5115148b049fca52e57c88eac36386e56f0965f22674eba26ae813
-DIST lollypop-1.4.35.tar.xz 596016 BLAKE2B 6776d98d8d0da18dade3ac022ea7980e9762834ebaadae453abb0dd0f0d98298f2457d2cb18f21159e2d12d4735d3c87740b0449a090f7778b7d77ba82634e40 SHA512 8cde0db23dd011370fbcf2a32389f801d7586598bb653b921f4525af17e2eb4771a306e34a340bb8c4a1666727c4b1c3a84490f362ca3c473fb7c5b3982a644d
 DIST lollypop-1.4.37.tar.xz 600812 BLAKE2B 08719d3c370332d398cb7dfc3c89128c895f89b0f5ca2b10fd85b1ef88d79ec96fbf945bbf4549e029e80726c80ccf6212e87d13b8808c08615626c6f01a4297 SHA512 9266677e8200626859793693e8cbf0e76b134fe37ff1b915841c1aebb5785eaaf1af5325c57bed78e887c98e947101103b1898d81c62cd9517b3420aebfeb685
-EBUILD lollypop-1.4.29.ebuild 1404 BLAKE2B b1740f4834f7cc60cfe2578d5920e1166b1c6daee78f1a3bec0127d46dd005eeb1bbedb6c69a6cd3bff3ddc12a88e200e5af0d641d5b68a08934fd0c2da63d3c SHA512 a1cc8a5f02d67e83c9db28d04a47a321787dfd116caadd72a5a5b93ccc10011779c715f599a8fa586e986a41f00f0933f4aea635a638178d05d49bc148a31605
-EBUILD lollypop-1.4.35.ebuild 1598 BLAKE2B 95cd4030b49f2bd27806c3698a166bf56a1d0c0d63669899bac43794f8b5606835fe10b728ccf505715fb091e949614ff024cbad7bf6e803cf4d8b9fcaa6773b SHA512 c111e038805caec57276b9d86cd07047cf7d15c94a5961e1c8d2dadb544c5da4e718911291a21693a30d5e6616e5f63110324b85d50a9d647e76c88130e68981
+DIST lollypop-1.4.39.tar.xz 599984 BLAKE2B c985bda8f8ec979cc222f3860f17f2d2329bbd04f808462011f92dcca350c9b5a99af6e5aa3efc68e128946f932890d35602e1dcfbb4b86d46468dc188e5443d SHA512 5a7fe675fb70d7f4f8d4c15f8a6e4faad0f430689f3612dd72801da10174218feb444f40ee90bdcbcf39f63b0df5889c2244772f50b7389d27f3a9e969f7cdbf
 EBUILD lollypop-1.4.37.ebuild 1650 BLAKE2B cf197546a91e45faaab88f55ef0ad202129682e587987abebf680516c59ac17c4260934d69eadb749e27ec28741b6b0415abd7cf992c7ec0168dab50b612a3a0 SHA512 e1ffd1aa5a81fd5deb03854f7ae1463aed40733722d3bab0548f32be2747a4b0359f0213a98e2597009ad496b8c9d805c6320dce4cac8c430b94ce5c923a4c06
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+EBUILD lollypop-1.4.39.ebuild 1959 BLAKE2B 6e432b76a2613ad902395bab50ba0f3081d41309dc3fbe65c31d75e70017a02d3881422218eb271ffe954f98681520c7fba34433ac7fd00b85f693876de18c17 SHA512 b5a6376d96cf20a3c0924d61982bc416d0c7f30772bdcd9469a05fff7b51946cd3200a6ddfe60994a1643aefacffbcf063d67fab6437179b0bb7899f2d7d90da
+MISC metadata.xml 476 BLAKE2B bf4a804dde9b1da1a7561e7c4787779133d20030168df814d5632aaf89079151975daa180e96f6fe4b249570b53f7b2e08f617099cde6f3ec6c3c6f78f0c40d2 SHA512 864541883742c13e4345415f774693902dad6e7eef961614d318b0368b1964f7cbc6ee3e2d0534480531a9d7af8a74cffea3f161dc3120aed1071195e3a98be9
diff --git a/media-sound/lollypop/lollypop-1.4.29.ebuild b/media-sound/lollypop/lollypop-1.4.29.ebuild
deleted file mode 100644
index 2ce038840f74..000000000000
--- a/media-sound/lollypop/lollypop-1.4.29.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="sqlite"
-inherit python-single-r1 gnome2-utils meson xdg
-
-DESCRIPTION="Modern music player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
-SRC_URI="https://adishatz.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# Dependencies being checked by Meson
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	net-libs/libsoup:2.4[introspection]
-	x11-libs/gtk+:3[introspection]
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	')
-"
-
-BDEPEND="
-	${COMMON_DEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		dev-libs/appstream-glib
-		dev-util/desktop-file-utils
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	app-crypt/libsecret[introspection]
-	dev-libs/totem-pl-parser[introspection]
-	gui-libs/libhandy:1[introspection]
-	$(python_gen_cond_dep '
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/gst-python[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-	')
-"
-
-src_install() {
-	meson_src_install
-	python_optimize
-	python_fix_shebang "${ED}/usr/bin"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-sound/lollypop/lollypop-1.4.35.ebuild b/media-sound/lollypop/lollypop-1.4.39.ebuild
index 5bf74c27b2ce..7806e83ea85f 100644
--- a/media-sound/lollypop/lollypop-1.4.35.ebuild
+++ b/media-sound/lollypop/lollypop-1.4.39.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="sqlite"
-inherit python-single-r1 gnome2-utils meson xdg
+inherit gnome2-utils meson python-single-r1 xdg
 
 DESCRIPTION="Modern music player for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
+# Tarballs on adishatz.org have files from Git submodule 'subprojects/po'
 SRC_URI="https://adishatz.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
 
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 # Dependencies being checked by Meson
-COMMON_DEPEND="
+DEPEND="
 	dev-libs/glib:2
 	dev-libs/gobject-introspection
-	net-libs/libsoup:2.4[introspection]
+	net-libs/libsoup:3.0[introspection]
 	x11-libs/gtk+:3[introspection]
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
@@ -32,7 +33,6 @@ COMMON_DEPEND="
 "
 
 BDEPEND="
-	${COMMON_DEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 	test? (
@@ -42,11 +42,11 @@ BDEPEND="
 "
 
 RDEPEND="
-	${COMMON_DEPEND}
-	media-plugins/gst-plugins-pulse
+	${DEPEND}
 	app-crypt/libsecret[introspection]
 	dev-libs/totem-pl-parser[introspection]
 	gui-libs/libhandy:1[introspection]
+	media-plugins/gst-plugins-pulse
 	$(python_gen_cond_dep '
 		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/gst-python[${PYTHON_USEDEP}]
@@ -58,13 +58,24 @@ src_install() {
 	meson_src_install
 	python_optimize
 	python_fix_shebang "${ED}/usr/bin"
+	python_fix_shebang "${ED}/usr/libexec/lollypop-sp"
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update
-	elog "Remember to install the necessary gst-plugins packages to read your audio files"
-	elog "You can also use the gst-plugins-meta pakcage and its USE flags."
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Remember to install the necessary gst-plugins packages for your audio files."
+		elog "You can also use the gst-plugins-meta package and its USE flags."
+	fi
+
+	local log_yt_dlp ver
+	for ver in ${REPLACING_VERSIONS}; do
+		ver_test "${ver}" -lt "1.4.36" && log_yt_dlp=1
+	done
+	[[ ${log_yt_dlp} ]] &&
+		elog "Since version 1.4.36, Lollypop relies on yt-dlp instead of youtube-dl."
 }
 
 pkg_postrm() {
diff --git a/media-sound/lollypop/metadata.xml b/media-sound/lollypop/metadata.xml
index 115e9d64a669..28a02ea04c47 100644
--- a/media-sound/lollypop/metadata.xml
+++ b/media-sound/lollypop/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>liaoyuan@gmail.com</email>
+		<name>Yuan Liao</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gnome-gitlab">World/lollypop</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index ac0fb7243740..92d1a73c85a4 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,3 +1,5 @@
+AUX pavucontrol-5.0-make-libcanberra-optional.patch 3727 BLAKE2B 27e38b16e1eaf64c7b1c3b0f3a6efc85bd4b290fef8b4c4c64a0e6e24de6565090e8a1f5d0ec1dc6ef1b65ff3c3c0836186ee53f27c844ca68515e98ea239e0c SHA512 3b866adf8495b8ffdbe48329ab4d54663ea3294e031f6d870d3c278b26b1d0314245ed4bca88e905e79cb503506f5762c3332fb5c9cc66ebe8205feb89e21369
 DIST pavucontrol-5.0.tar.xz 194248 BLAKE2B 9e6b9b7d94be51a4ad8b5310e031c4fed0f5299e67c770c9a573c0647edf27345014fb6504892fad29b9b5e79ce43ed312217dbed8e2b31b805f291531062903 SHA512 5673d783c2c819a68b49025c051bedd39f4caba446a479797b06569e24a96acc0924ba680d2416baff8c3211cfc7c94760d503900207fbe7c89c5cb2adaebec1
 EBUILD pavucontrol-5.0-r2.ebuild 836 BLAKE2B 3a4c18ccd682c477c931dca5e3c5f61700aedf49820933ab17059290824649572f565cd7523493b4e1aa090a62407f65d57891e82a4388981814cc708c0c1395 SHA512 10caf61a4adf2efd673f92a2d75328f884d8e96700e0fc104b384bc8f6a61415d53d67317c1960ad585f4170577062b1c45ec66174a55a3713a1e6e07666483d
+EBUILD pavucontrol-5.0-r3.ebuild 1017 BLAKE2B e94815d58fdcd1e34789a7802c6307b7e3ce6665e5e0ff63ac5f47f70afb8c3f3a797265e815b7563ca07eedd5a98bd8c27d4334e64bed6765edcb228e4aea57 SHA512 9ef6f5dfb237f4fa212fa743968d53c5d6b3603f88a9cd869a4662ff22d3b95723bac1c3fc8f366f7a684f926545399dfd4e77ec01f5ef220d200357f04f0010
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/pavucontrol/files/pavucontrol-5.0-make-libcanberra-optional.patch b/media-sound/pavucontrol/files/pavucontrol-5.0-make-libcanberra-optional.patch
new file mode 100644
index 000000000000..595cf9f8d0bd
--- /dev/null
+++ b/media-sound/pavucontrol/files/pavucontrol-5.0-make-libcanberra-optional.patch
@@ -0,0 +1,125 @@
+From 8916cb62b0facf45ccb220fd2efd5746fdaf79b8 Mon Sep 17 00:00:00 2001
+From: Adrian Ratiu <adrian.ratiu@collabora.com>
+Date: Mon, 25 Mar 2024 02:19:42 +0200
+Subject: [PATCH] Make libcanberra optional
+
+libcanberra is an old abandoned project whose last release
+was well over a decade ago, despite getting some few fixes
+on its master branch since then, which are unreleased.
+
+My problem with libcanberra is that it can't be built on
+pure wayland systems (no X11 headers) which are becoming
+more common nowadays.
+
+It is the only thing keeping pavucontrol tied to X11, all
+other dependencies (eg gtk+) build fine on pure wayland.
+Since canberra is not a core part of the project, let's
+make it optional so pavucontrol can build & work on
+pure wayland systems.
+
+Ideally in the future libcanberra can be replaced with
+something else, however I don't have the bandwidth to
+take this on for now, so I'm just making it optional.
+
+Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
+---
+ configure.ac           | 9 ++++++++-
+ src/pavuapplication.cc | 2 --
+ src/pavucontrol.cc     | 4 ++++
+ src/sinkwidget.cc      | 5 +++++
+ 4 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 056ba5e..1b793b8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -41,10 +41,17 @@ AC_TYPE_SIGNAL
+ AC_HEADER_STDC
+ AX_CXX_COMPILE_STDCXX_11
+ 
+-PKG_CHECK_MODULES(GUILIBS, [ gtkmm-3.0 >= 3.22 sigc++-2.0 libcanberra-gtk3 >= 0.16 json-glib-1.0 ])
++PKG_CHECK_MODULES(GUILIBS, [ gtkmm-3.0 >= 3.22 sigc++-2.0 json-glib-1.0 ])
+ AC_SUBST(GUILIBS_CFLAGS)
+ AC_SUBST(GUILIBS_LIBS)
+ 
++AC_CHECK_LIB([canberra-gtk3], [canberra_gtk_play], [HAVE_LIBCANBERRA=yes], [HAVE_LIBCANBERRA=no])
++AS_IF([test "x$HAVE_LIBCANBERRA" = "xyes"], [
++    AC_DEFINE([HAVE_LIBCANBERRA], [1], [Have libcanberra support.])
++    AC_SUBST(LIBCANBERRA_CFLAGS)
++    AC_SUBST(LIBCANBERRA_LIBS)
++])
++
+ if test -d ../pulseaudio ; then
+    PULSE_CFLAGS='-I$(top_srcdir)/../pulseaudio/src'
+    PULSE_LIBS='-L$(top_srcdir)/../pulseaudio/src/.libs -lpulse -lpulse-mainloop-glib'
+diff --git a/src/pavuapplication.cc b/src/pavuapplication.cc
+index 6773b53..60c016c 100644
+--- a/src/pavuapplication.cc
++++ b/src/pavuapplication.cc
+@@ -24,8 +24,6 @@
+ 
+ #include "i18n.h"
+ 
+-#include <canberra-gtk.h>
+-
+ #include "pavuapplication.h"
+ #include "pavucontrol.h"
+ #include "mainwindow.h"
+diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc
+index 18d5400..ff652be 100644
+--- a/src/pavucontrol.cc
++++ b/src/pavucontrol.cc
+@@ -29,7 +29,9 @@
+ #include <json-glib/json-glib.h>
+ #endif
+ 
++#ifdef HAVE_LIBCANBERRA
+ #include <canberra-gtk.h>
++#endif
+ 
+ #include "pavucontrol.h"
+ #include "i18n.h"
+@@ -916,7 +918,9 @@ MainWindow* pavucontrol_get_window(pa_glib_mainloop *m, bool maximize, bool _ret
+     tab_number = _tab_number;
+     retry = _retry;
+ 
++#ifdef HAVE_LIBCANBERRA
+     ca_context_set_driver(ca_gtk_context_get(), "pulse");
++#endif
+ 
+     mainWindow = MainWindow::create(maximize);
+ 
+diff --git a/src/sinkwidget.cc b/src/sinkwidget.cc
+index f30bd37..41d7bb8 100644
+--- a/src/sinkwidget.cc
++++ b/src/sinkwidget.cc
+@@ -24,7 +24,10 @@
+ 
+ #include "sinkwidget.h"
+ 
++#ifdef HAVE_LIBCANBERRA
+ #include <canberra-gtk.h>
++#endif
++
+ #if HAVE_EXT_DEVICE_RESTORE_API
+ #  include <pulse/format.h>
+ #  include <pulse/ext-device-restore.h>
+@@ -120,6 +123,7 @@ void SinkWidget::executeVolumeUpdate() {
+ 
+     pa_operation_unref(o);
+ 
++#ifdef HAVE_LIBCANBERRA
+     ca_context_playing(ca_gtk_context_get(), 2, &playing);
+     if (playing)
+         return;
+@@ -136,6 +140,7 @@ void SinkWidget::executeVolumeUpdate() {
+                            NULL);
+ 
+     ca_context_change_device(ca_gtk_context_get(), NULL);
++#endif
+ }
+ 
+ void SinkWidget::onMuteToggleButton() {
+-- 
+2.43.2
+
diff --git a/media-sound/pavucontrol/pavucontrol-5.0-r3.ebuild b/media-sound/pavucontrol/pavucontrol-5.0-r3.ebuild
new file mode 100644
index 000000000000..c818ec9985c6
--- /dev/null
+++ b/media-sound/pavucontrol/pavucontrol-5.0-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="nls X"
+
+inherit autotools
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0-make-libcanberra-optional.patch"
+)
+
+RDEPEND="
+	dev-libs/json-glib
+	X? (
+		>=dev-cpp/gtkmm-3.22:3.0[X]
+		>=media-libs/libcanberra-0.16[gtk3]
+	)
+	!X? ( >=dev-cpp/gtkmm-3.22:3.0 )
+	>=dev-libs/libsigc++-2.2:2
+	>=media-libs/libpulse-15.0[glib]
+	virtual/freedesktop-icon-theme
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-lynx
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 61938af3a844..e361a457d39e 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,3 +1,3 @@
 DIST yoshimi-2.3.2.tar.gz 8720491 BLAKE2B 37a1c1ee9d07aba2b4fa22bbff200c16abf3437b6c4b48b53842be6a7b8e7999dd4bc294446d9b80b5a5a9e7485a5e3c3c73f2cf4029581e60f9644b705f47ee SHA512 6ddca4a5cffc609880fcbb625eca471b9926cb3cc0bef9f349ef3fafe6280f5e3957e62db0c103856c680d0a3dde0b15225569d7171553ae74ee4c78c848b598
-EBUILD yoshimi-2.3.2.ebuild 1003 BLAKE2B 7e367f13cd07e04424ab517de20dd30a464ff30cadbaf440291f672007a91ae9a99e60971e4e6e7e757dc48cb264adeb64c0a71f7b9ccb7f6ed9861d2cc52bad SHA512 b2ba017fe458e31210a4208f84b73a57e38c74a3f7004c3f2c463e91122e3e0b9aa6b436343b9a25bfda05a7982f7686a97f8bc8dd88ce7be965c20140cf120e
+EBUILD yoshimi-2.3.2-r1.ebuild 1004 BLAKE2B 26dc7e9a70aeb881fb66a469912fbd822646b5b2c29f636367a43890b8a57041488f3d762cdf6b45cad2206087a3bd28fe27ba013baa42956130c7fab99ac042 SHA512 be88ae507f3b826ac728ca6f13e35fab8cec79059905b8ac4fd850c918caa25c0b798b8692a4ccc8927e6fc555fa6f901bbe0549a8402fecd29cafb49b8e51db
 MISC metadata.xml 1414 BLAKE2B 4dab154682ec4f0dfe9f4ee1f2b1510f020ef9bf8ce8b871c7bae3709a505faff8e07a2af20cedc3de357dd01c5a2bc192b2776153c1fb028894db732e0215dc SHA512 0ae6d64001643cc80c58929a4d28af6c3c4e0433b31567091e495dd34c350f7fa8908bf89d9aea1b3f004b40e7c8b60ec36025d04fa510f93af17f2316833c61
diff --git a/media-sound/yoshimi/yoshimi-2.3.2.ebuild b/media-sound/yoshimi/yoshimi-2.3.2-r1.ebuild
index c2c19289acf5..d52b5bb9ab3d 100644
--- a/media-sound/yoshimi/yoshimi-2.3.2.ebuild
+++ b/media-sound/yoshimi/yoshimi-2.3.2-r1.ebuild
@@ -8,6 +8,7 @@ inherit cmake flag-o-matic xdg
 DESCRIPTION="Software synthesizer based on ZynAddSubFX"
 HOMEPAGE="https://yoshimi.github.io/"
 SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,7 +17,7 @@ IUSE="+lv2"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
-	dev-libs/mxml
+	dev-libs/mxml:0
 	media-libs/alsa-lib
 	media-libs/fontconfig
 	media-libs/libsndfile
@@ -31,8 +32,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${P}/src"
-
 DOCS=( ../Changelog ../README.txt )
 
 src_prepare() {
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 137b3179a6e3..813aeb9d5cec 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -7,6 +7,6 @@ AUX zynaddsubfx-3.0.6-libzest_location.patch 446 BLAKE2B 68425cda772935e71d06977
 AUX zynaddsubfx-3.0.6-stdint.patch 2758 BLAKE2B cbf55ba32bdcd7a0af06a418fdb6d1c0caaf8b806382d41bb4946a6d68ab89f878c40a30fb5a2f89b42118653658e7721f7fbd14f62172253aff6d282d2494e2 SHA512 8aca66bc2ee3d886d8b3741dbbf67f1b90804a7b87a3a2858a4134f3104a5ab374e3823afc4e07f5deb02c193474f7e00b536c9c87b2fe897c1db6ffd4bdbe66
 DIST zyn-fusion-ui-src-3.0.6.tar.bz2 5266884 BLAKE2B d9715c319bfd313792f550e12a47939dec665eda6ef395f8bb7a175b11f0922a4037428f99dc95fe749c40074ce8976fa9d257b6bc1e8f1feb63ca943c3bdd76 SHA512 7f195cf6a193376160441863d725383640bc75ad0c21b8ef7786da67a42fe014be103e3c3d9c29c83ffc3d78b9e11a4031a6b3922d457a336d184228c16077cd
 DIST zynaddsubfx-3.0.6.tar.bz2 10001014 BLAKE2B 4adbeffb9bc0bd77bf81a6734f5c26fc676426e644e27cebb8e54e8d74d869c0e1b468782cd1a64aacef8f9b788d434a8d30a194944650eea03c4fd146ee7bf7 SHA512 86311f00d97e20c7eb22a46c99736c56765ed9737e728ef380a324e4a92c731086ed74f5d7bfeae104b690ab1ee1b40bfb8f240bc4c46f8afd47308ec48cbcea
-EBUILD zynaddsubfx-3.0.6-r1.ebuild 2052 BLAKE2B 8ef524786fc687869e5bfd58a7beaa06370c08dfad9d6b99e217888d65f3cabc68c4a813c38190f749c794841bc28a99c09c4ce4964b56acdedd2b5f0dd0033b SHA512 d3add8926136989d580f1c7420024fa7b412a54c176af01a1c64b02c27ba090555a803639ebfb4d963e078c56c02f89ee540d5376326ef2a26e13245678c32fa
-EBUILD zynaddsubfx-3.0.6-r2.ebuild 2703 BLAKE2B 89a6a39848eb95e5a6c41940406f0c690789a027accc46c658bfc03de033004d2aed4a589898a4160179ba2661b6b5e56f940447e46bf12d29eb7dc96e3449f1 SHA512 e567ff9ccd950b933afabea47723902979794298a43b33ee1fa1afeaabe1c030f0485f304b8722c317cf272f22719809a2b811a06c5efaffe4921036f4ecd259
+EBUILD zynaddsubfx-3.0.6-r3.ebuild 2054 BLAKE2B 1cda86d74e25092397ba5439a14e4bab9decf777f617bad97644282e32a344c3c1256c0ead0a36698638d0b0e6d7eac6629f8f7286b341f91aaf67ad616ab100 SHA512 2cae065b4d1750f1bf3683b9a923bc90a73a8f421aa3dfc5e3b1969f4eef69d83f6ef85244e48c349e20d781e3906ec8e17c5a4a2f0189d471edcd44388ffa31
+EBUILD zynaddsubfx-3.0.6-r4.ebuild 2705 BLAKE2B a5d77dbc0e518bcc2476f1816073725f347b03da164980b863882802c2a09a696e473783cbaa468e7993bc77c539d8f39d5720fcb7bed5364d3838f4c3ff6493 SHA512 97b69e73be52c3e362814dfbe87666fbc0c2cf7255701f5d6177bdbe95f51495cb2d54282047bba0a0ae2e669a73d95c4f516a672c091cd0b83ad4afbe684d41
 MISC metadata.xml 428 BLAKE2B 5a450f26afae683f0aa9ff386c87c37c3445b81240d4864fe90564f2c86913af772174cfeaeb82c29b4df0b92337d00f710d8779c9f3300865e7d20e6f9fc06c SHA512 53de61301fd080758dc195c67dfaf9ece5fba941988d17ca6edb7249e01a8804fe4e7edf961a4a0ec6891730dc6f6250e5cf7e91441061eb1e487be243c9b111
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r3.ebuild
index 6868486d950a..4a73f9d41f32 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r1.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r3.ebuild
@@ -16,7 +16,7 @@ IUSE="+alsa doc dssi +fltk jack lash portaudio"
 REQUIRED_USE="|| ( alsa jack portaudio )"
 
 DEPEND="
-	dev-libs/mxml
+	dev-libs/mxml:0
 	media-libs/liblo
 	sci-libs/fftw:3.0
 	sys-libs/zlib
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r2.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r4.ebuild
index 05abe62b9ec7..07fa613793a6 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r2.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r4.ebuild
@@ -20,7 +20,7 @@ IUSE="+alsa doc dssi jack lash portaudio"
 REQUIRED_USE="|| ( alsa jack portaudio )"
 
 DEPEND="
-	dev-libs/mxml
+	dev-libs/mxml:0
 	media-libs/liblo
 	sci-libs/fftw:3.0
 	sys-libs/zlib