gentoo resync : 04.01.2022

38 files changed, 418 insertions, 319 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 2aaae9f62f0d..41aca0a4f761 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index af930395bc35..aad7c81840ad 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,7 +1,5 @@
-DIST abcMIDI-2021.10.15.zip 607327 BLAKE2B f36d212c582c4098faffde797c55fcbfde086dd64cfbeca9f58300d80eeb519f3f5aaebf6649bab25912115c583a0e11998dd9c5076547bd77009749051ae7f2 SHA512 f9877444c28add8d036223d1f8aa309928d14a26b923509411fb5781192c77292138a02837015673a92c724b0ce59aa8fc11c66177371c9dd1d23501410f01e7
 DIST abcMIDI-2021.11.25.zip 607419 BLAKE2B bac5f8f31497a5cbc2133e70c7cfc1a925e22f8ffad67393a59fb1b976cab057f255bee9eaf4d8b48c597763c70e403aa9daf99a4ca82947d138493caed6d390 SHA512 d019c1445f75d91a7b2be5636aacadaeee29dcfbc195e2851ecf5dcf5ff0c45b459338dc625aed9cdcfcfaef1f1e120594126ded3ae044c3e3bae45ee6df38ab
 DIST abcMIDI-2021.12.12.zip 607868 BLAKE2B 89b978b3a8a635617e44a870a6d1f36c1053fafdee189fce5c1d419c51cea94f77b1ca1a8ecb6a7bd0cc0c4d92309a8f4d590ccba8d581f9793ae94fc8e4abb3 SHA512 909c25cbef04b9aada3914bbed1a13bc1ca47414a104601fdea733adc37bc7c7fd19be09c1dbdeac76e10df778a0d9481469d5df4d2b6a94622e157531d866e1
-EBUILD abcmidi-2021.10.15.ebuild 676 BLAKE2B da71fd66f245bdac7a72f8016e7c1c9324561e6f4b1cc0f1e943672edd93ae174913af401a8b0aa07a48926a9f508676d8008402f357a914a9e41252ca8e2589 SHA512 4505cce6306e087e8a8c038105ff4f3a40933de133a75159d735f7b08f41a3801bab2b03d32e52c29ba699814f96c654909bbb0d7088f952503963fcb3608b4f
-EBUILD abcmidi-2021.11.25.ebuild 678 BLAKE2B b09a3d0f7474ccaebf61cb08b70511e4a6a968af676434d24a90773632503424befdfac284b762eb02168f5949fd79c2349ba36fcf3f1f10c721018b0750f689 SHA512 280fe2968d73a5db39665edcc822938f8ed2ea7f47108dba58a42cc3ae4a053a0b7db4ca67db090d5a77e5a9aee14700a23b73c9494b1dcbba2e9f07a04580ba
+EBUILD abcmidi-2021.11.25.ebuild 676 BLAKE2B da71fd66f245bdac7a72f8016e7c1c9324561e6f4b1cc0f1e943672edd93ae174913af401a8b0aa07a48926a9f508676d8008402f357a914a9e41252ca8e2589 SHA512 4505cce6306e087e8a8c038105ff4f3a40933de133a75159d735f7b08f41a3801bab2b03d32e52c29ba699814f96c654909bbb0d7088f952503963fcb3608b4f
 EBUILD abcmidi-2021.12.12.ebuild 678 BLAKE2B b09a3d0f7474ccaebf61cb08b70511e4a6a968af676434d24a90773632503424befdfac284b762eb02168f5949fd79c2349ba36fcf3f1f10c721018b0750f689 SHA512 280fe2968d73a5db39665edcc822938f8ed2ea7f47108dba58a42cc3ae4a053a0b7db4ca67db090d5a77e5a9aee14700a23b73c9494b1dcbba2e9f07a04580ba
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2021.10.15.ebuild b/media-sound/abcmidi/abcmidi-2021.10.15.ebuild
deleted file mode 100644
index ae7e456f10f3..000000000000
--- a/media-sound/abcmidi/abcmidi-2021.10.15.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_P="abcMIDI-${PV}"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
-SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
-S="${WORKDIR}"/${PN}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-BDEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	sed -i "s:-O2::" configure.ac || die
-	sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.abc
-	fi
-}
diff --git a/media-sound/abcmidi/abcmidi-2021.11.25.ebuild b/media-sound/abcmidi/abcmidi-2021.11.25.ebuild
index a0a2a9de38ec..ae7e456f10f3 100644
--- a/media-sound/abcmidi/abcmidi-2021.11.25.ebuild
+++ b/media-sound/abcmidi/abcmidi-2021.11.25.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest
index 3df13bb27690..6bb10bc2fb59 100644
--- a/media-sound/amsynth/Manifest
+++ b/media-sound/amsynth/Manifest
@@ -1,5 +1,7 @@
 AUX amsynth-1.12.2-metadata.patch 522 BLAKE2B 8d49d9323dd7739c90aa456d5e123b3f2303764ae2c3959fc3a4b271e109d56151f3ddf08a21904fbd6aa4e397c96eea88c7735a02004e600d0c07b3a58dd9e1 SHA512 ea35b8ae9d11525b314cd4c89385e24b98c22dec34a042b694a707e9a3bdf8741497c6ede792d9837976cf939795f7e645be23174cddcc5df9b3fb228ef56198
 AUX amsynth-1.12.2-x11.patch 1233 BLAKE2B 4df9ab5cfc99ddfbf490a716ae52f13727d4307e4added4ca6916e9fdf31a09b909bdcd437d1076caa3e7c305145e5ab9a2ee1b1747c1c6fb4c506dc37b6fce1 SHA512 03732a90908d9756f9d8517021255860cadc73becec99888fc74d26aa307c2b7e756c265b8e04b356fcf95868d8c125129fcf32820d38131c857e762d2854e10
 DIST amsynth-1.12.2.tar.gz 1607129 BLAKE2B 8308a8a595dfe7b2c9924ff183134fdd5ad20ac2c957b1f52e474a8cb297cd73ee9f8b9938212deb21701e11ccbf776ea22cab763fb71940bf1df5c169e309db SHA512 a1eef3d5a0d0f0ec1edb93d89b3e456ea133a8445a9be73ba338771ae651a2008aea8dd077a9bcf0cd50e6bcc97ad98ab4c44a9baefd9f3381287afdf3325e8f
+DIST amsynth-1.12.3.tar.gz 1624332 BLAKE2B a78317a08c4b02c14578f68fb0fbd7de9380f439c8bc737321c253df5effcd23219ff02d50520768ed5c698b4f284a87435640e965ee4f1cd6023ae770dfd10a SHA512 ac4f32b2a35ebe15c0c63ded213c2ab73bb3a105ce9c857811f095807a1c032dfd518eea5709ea58594c54324bca194236d5fe4606fac274772c9012be2b1110
 EBUILD amsynth-1.12.2.ebuild 1135 BLAKE2B d1642af920eee3a3f40cdcca6802996ae7c44a2f070288b4639493dd2587c7a0c4b3c2271374d89ff186ff75d2de7a6fc175db10a10182854e35c550333a47ae SHA512 072dd5c9a8f8766db10f61ae69d4c98b4e9df33f2779d966bc8ef999c357b27fcd64bdf0b72e38aac8e2cbcd0a366be6d4c5662a69ba8dd996a35f9b7a2c0368
+EBUILD amsynth-1.12.3.ebuild 1153 BLAKE2B 9801e8b2e0b620b5360625977556e3f053f4da5d409a7d3d23a59fab201db06df1328415cccbe46e4eecdb065869130265532e652ed301ad557d7d1bb08e3afd SHA512 a78417056fdabe0a6ca6282024b22c70492de41715079018c7b70681546752228df29645dbce199d7e74f3cdcf4aa99e653dc56386cc476872c98e20cb519dd8
 MISC metadata.xml 581 BLAKE2B 5037cdf24f188f706fc4f413589b4c7c9c48c35bb611f1360f1a1395a2a8a123cca098cb4835ba5a4c8c85187fa6e829c515bc9909e89bf03e7d526236793cdf SHA512 fb63a72d147949e50e286a8aa2a3ecef65c1db90c5453dfb749fd8707a78beac99886ed6ccb1560b0dce48cd6b7212d51193b1af2b323ad2aa6bbc7bd538f965
diff --git a/media-sound/amsynth/amsynth-1.12.3.ebuild b/media-sound/amsynth/amsynth-1.12.3.ebuild
new file mode 100644
index 000000000000..e42fb11b9d12
--- /dev/null
+++ b/media-sound/amsynth/amsynth-1.12.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg
+
+DESCRIPTION="Virtual analogue synthesizer"
+HOMEPAGE="https://github.com/amsynth/amsynth"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa dssi gtk jack lash lv2 nsm oss vst"
+
+REQUIRED_USE="dssi? ( gtk ) lv2? ( gtk )"
+
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+"
+RDEPEND="
+	alsa? (
+		media-libs/alsa-lib:=
+		media-sound/alsa-utils
+	)
+	dssi? (
+		media-libs/dssi:=
+		media-libs/liblo:=
+	)
+	gtk? (
+		x11-libs/gtk+:2
+		x11-libs/libX11
+	)
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )
+	lv2? ( media-libs/lv2 )
+"
+DEPEND="${RDEPEND}
+	oss? ( virtual/os-headers )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.12.2-metadata.patch"
+)
+
+src_prepare() {
+	default
+	! use gtk && eapply "${FILESDIR}/${PN}-1.12.2-x11.patch"
+}
+
+src_configure() {
+	econf \
+		$(use_with alsa) \
+		$(use_with dssi) \
+		$(use_with gtk gui) \
+		$(use_with jack) \
+		$(use_with lash) \
+		$(use_with lv2) \
+		$(use_with nsm) \
+		$(use_with oss) \
+		$(use_with vst)
+}
diff --git a/media-sound/daudio/Manifest b/media-sound/daudio/Manifest
index 2fd52acde700..ee679cddff76 100644
--- a/media-sound/daudio/Manifest
+++ b/media-sound/daudio/Manifest
@@ -1,6 +1,7 @@
 AUX daudio-0.3-makefile.patch 1683 BLAKE2B a1b54557e238fbe0d727948a0594e1e142d852362bd35da25a8b2be0106884666bb4d88783f6fff202f83a1545f27f52ee88ec34075ff2b4940d89538533f985 SHA512 4ca11073dcfef61fede2cdb7d99be6f3ec7d6c3c8e587faf33c6e06c4468c8e25b4726aa66ba119fc871c4930b42accff331db9a4bd76cac37f56a15c32bc5aa
+AUX daudio-0.3-musl-stdint.patch 2400 BLAKE2B 4c90dfdb97bc1f82249e83817b1b257121be451a9a4f357d62cd246f501873c0484bdd58139b2c5668f6850f3346d5853ddb3d30b0ca3e8a516e12ad2fe6720b SHA512 e6650407a2d2ce35ba0ac99ba2e4344041d92c341faa5c63d88d1f00654eee5a66c7206abb8e240b3c6b15fc5e7d215c2cf41b30f1fa5bb5b87842673f4b33cc
 AUX daudio-0.3-qa-implicit-declarations.patch 1980 BLAKE2B d31a67d6234c667e726907cdf41f18b2ea0e7dbf88d0a13fedae9690327fa6450f3bd2d3f46b5f387997e1dbdf0c40a910026b2260b0c1dcda9cd1c74ef3602d SHA512 0da091005e36825ef0f35e4029e48781a23d2c8ab00af33528de4999dcb7d2e98006b2623852ab7cadd6e129d1847a6a85f8f60b7340c755939d9fa45d094a5e
 AUX daudio.rc 425 BLAKE2B 6859ce9adb4668ce7528f9371272dfab206f2bb4880819995634b88c1c3902edbd49c3e84ceb8c4abbec84be5cadb547ee44e9ed462cc27ee928060d2c738a6b SHA512 c6f816faeac497e31365d9bf7b2c37c4c8688d88820c0dbc9e4819be13119e477cc3aea2fe3ca249d82b8d84ebb485d9516f0b93180a7c756d573dcb5f1e1900
 DIST daudio-0.3.tar.gz 76683 BLAKE2B da8c674be38224153af26b6a690a0fe23c4d24e90422260799657ff80242d2c8baaa2de85603d68e8daf6e880335fe84dc7467f10571590814b647aa65f88e9b SHA512 63266348c8235b09efb6958646b003a5e7ae1cfd7d97aeff928ed8e7b9ffc71666c0bcd93ee89db6c28cae5019056748631e9fef850ebf6ead7aefecc3037e3c
-EBUILD daudio-0.3-r1.ebuild 936 BLAKE2B 754573797a29b6ad8eb510e2e77ac1ba9f2ebb0c1a6a39a6ad60a67e54882e5d10a3cc2fc604abaa5865f06f44adac377681e1d7ec64d77c1663749561f24e78 SHA512 47c7d41b0acc85ea817bdad219f94566718e6b27c4a1f955d825868692962f23d52c441d12e897c5007b7c9302ae3967fd373233b9403239b0ab7f5608f4bdd3
+EBUILD daudio-0.3-r1.ebuild 967 BLAKE2B 0ddcaaf96aeecd5a7ce15bea26905ead1234aabc931ef28a78d72e8d71940a70068abf0a5ff8baf55e1398fd5f72ce1cbb40d03ae499abb5da20c605f1922a29 SHA512 5d56dedc9dc4c3368d2afea186c7d391b23c351bc34d967f041c5313da2c4c89d349fa6da505c58c7d6cf7db4812ad9f1b9db7c01b0a05b542bbfa44244e1808
 MISC metadata.xml 330 BLAKE2B 7bed91ca8797a4ad2fc012fb6595d192706c46e66aa9b95ee32a5dcc46d15e1a394e29d4db0a950581206bf83e412bc14e3deb38cc19085c6f13bf510f2efc14 SHA512 967eef88ca746c0cd9c18a6eac7c65597fdb872e3ea1897848c6c92d150b0a73bb64c1e105f51b3a78a96e7003dcd771700dd2340b2ceee53f3b5ce73dff90dc
diff --git a/media-sound/daudio/daudio-0.3-r1.ebuild b/media-sound/daudio/daudio-0.3-r1.ebuild
index 88cd0bcb1e04..0f7ca5bea943 100644
--- a/media-sound/daudio/daudio-0.3-r1.ebuild
+++ b/media-sound/daudio/daudio-0.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
@@ -11,16 +11,16 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-#-sparc: 0.3: static audio on local daemon. No audio when client connects to amd64 daemon
+# -sparc: 0.3: static audio on local daemon. No audio when client connects to amd64 daemon
 KEYWORDS="amd64 ~ppc -sparc x86"
 
-IUSE=""
 DEPEND=">=media-libs/libmad-0.15.0b-r1"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-makefile.patch"
 	"${FILESDIR}/${P}-qa-implicit-declarations.patch"
+	"${FILESDIR}/${P}-musl-stdint.patch"
 )
 
 src_prepare() {
diff --git a/media-sound/daudio/files/daudio-0.3-musl-stdint.patch b/media-sound/daudio/files/daudio-0.3-musl-stdint.patch
new file mode 100644
index 000000000000..ff70b900d1f8
--- /dev/null
+++ b/media-sound/daudio/files/daudio-0.3-musl-stdint.patch
@@ -0,0 +1,82 @@
+https://bugs.gentoo.org/715246
+--- a/client/net.c
++++ b/client/net.c
+@@ -20,6 +20,7 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <stdio.h>
++#include <stdint.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+@@ -69,7 +70,7 @@ int netinit(char *hostname, int port) {
+     }
+     net_raddr.sin_family = AF_INET;
+     net_raddr.sin_port = htons(port);
+-    net_raddr.sin_addr.s_addr = *((u_int32_t *) host->h_addr);
++    net_raddr.sin_addr.s_addr = *((uint32_t *) host->h_addr);
+     return(s);
+ }
+ 
+--- a/server/bcast.c
++++ b/server/bcast.c
+@@ -21,6 +21,7 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <stdio.h>
++#include <stdint.h>
+ 
+ #include "../common/port.h"
+ #include "timer.h"
+@@ -75,11 +76,11 @@ int b_init(void) {
+     
+     addr.sin_family = AF_INET;
+     addr.sin_port = htons(BROADCASTPORT_D);
+-    addr.sin_addr.s_addr = (u_int32_t) INADDR_ANY;
++    addr.sin_addr.s_addr = (uint32_t) INADDR_ANY;
+     
+     baddr.sin_family = AF_INET;
+     baddr.sin_port = htons(BROADCASTPORT_C);
+-    baddr.sin_addr.s_addr = (u_int32_t) INADDR_BROADCAST;
++    baddr.sin_addr.s_addr = (uint32_t) INADDR_BROADCAST;
+     
+     if(bind(b_sock, (struct sockaddr *) &addr, sizeof(struct sockaddr_in)) == -1)
+ 	return(-1);
+--- a/server/local.c
++++ b/server/local.c
+@@ -21,6 +21,7 @@
+ #include <unistd.h>
+ #include <mad.h>
+ #include <stdio.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <errno.h>
+ #include <fcntl.h>
+@@ -207,7 +208,7 @@ int l_init(void) {
+     
+     addr.sin_family = AF_INET;
+     addr.sin_port = htons(LISTENPORT);
+-    addr.sin_addr.s_addr = (u_int32_t) INADDR_ANY;
++    addr.sin_addr.s_addr = (uint32_t) INADDR_ANY;
+     
+     if(bind(*s, (struct sockaddr *) &addr, sizeof(struct sockaddr_in)) == -1)
+ 	return(-1);
+--- a/streamer/streamer.c
++++ b/streamer/streamer.c
+@@ -25,6 +25,7 @@
+ #include <sys/socket.h>
+ #include <unistd.h>
+ #include <stdio.h>
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -129,7 +130,7 @@ int main(int argc, char *argv[]) {
+     }
+     addr.sin_family = AF_INET;
+     addr.sin_port = htons(LISTENPORT);
+-    addr.sin_addr.s_addr = (u_int32_t) htonl(INADDR_LOOPBACK);
++    addr.sin_addr.s_addr = (uint32_t) htonl(INADDR_LOOPBACK);
+ 
+     if(connect(s, (struct sockaddr *) &addr, sizeof(struct sockaddr_in)) == -1) {
+ 	perror("Failed to connect to localhost:5555");
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index d07f6a25f786..966ded1e7a42 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -1,8 +1,3 @@
-AUX easyeffects-5.0.4-meson_no_automagic.patch 1520 BLAKE2B e7eb71a9aacdb80cf45b7314acc80a42c48549047e754f8154fdfd901d0b25ec16e25ca64715d26335b9f2c6f8bd5bec2803b09e62f7e8c618435aff5f97e748 SHA512 db116e3727c497774b702c6537c6cef152c5898034ebd0260df4365d65b1e8465181aefb7b5ff28eab2eb5794ce331326b1cd0f313124f3a33c61f073af15b4c
-DIST easyeffects-5.0.4.tar.gz 2070912 BLAKE2B 848d2fa6fc1290b6fc25e13c4bbe4d8df932af63b8fb7e9642c6e24b29360dd17efba71ae0daae265538cd9cde1d9e33de453b0c469e3d54709a3f337cd583a7 SHA512 78074341c8376a4918d09950fd7db8804346cd2e00d6849da464662643809010eeb1d009c44ca5d3eadd2faf3bb9c43a18a41b7c3e77b883beff44618967b30e
-DIST easyeffects-6.1.4.tar.gz 1959269 BLAKE2B b3a4b7f2e1816353bfda4d232f380483e33316c166d8b6e7e704cb86ac07e99fac14bac68e7748a3731ee76d07317d62cb4cae90c39cdbd77d794ef8151de71b SHA512 104e1efaf2790d052bcc0d7512a86e86fe12041ea9020cb0c3664c723bcfb79a96e071ad3cb5b36cf2d77acc5deecea0adcd36c409410e20aaeac908923e9e9b
 DIST easyeffects-6.1.5.tar.gz 1696731 BLAKE2B ad091c64fa7ece0f569a09ed551be0498b48f2f6f5346de51bd358942cd440663a05bb7271e1e6e8ca29427a799b12a03c26a763498a2f1f2c3093a784b92e2c SHA512 0f4505e429416186f3af4338c1c7b5afac0f0ec343749bd9bcc8cf222349b2cb25714de493236c57b1dd60dfcc3e1359cab15cdeabb661f4cb20591b518f70a6
-EBUILD easyeffects-5.0.4-r1.ebuild 2272 BLAKE2B 9a0d0a24d713e2effca773730c0b7e7afaf83e4561b5bc83ca1459cada358e039e7b8fe7ded4c6dd6ec8f30ca8ea12d33fc65822b5ae2d812f320e71c2634a10 SHA512 b51edb7406290d1389ab8f98efa47c0739564ea8aee982acc27a4f544b5fd35211220b7361b7697b2d4f1b63e1d6e645016a4050c2ea482673e986dd314a31d0
-EBUILD easyeffects-6.1.4.ebuild 1997 BLAKE2B ac38c18dd06f16486a7d4595025b64e607fd28f75bae3de7ff12da36f421b2f003c0b79d15e5faf952e01260540229d3cf3ee3c63f3c363ae54f42911861ade9 SHA512 e58bcb7303515868a68e8553a2c8c0028cd8266514ac662d66786af1e4c34e89d02be8e7637e17d1e0b8bd70d23707931b9ef51eebbaf96df6b3eda351e0c66e
-EBUILD easyeffects-6.1.5.ebuild 2015 BLAKE2B 57921182fb3a2b9f1751c24b75614b8fe9ad42be4754463c19ccbf3de39b186564bfd3f13dd2ce9bdc9a4167f9945e44d297d8c930ba4ec4603ef48b20be1c93 SHA512 4f76014d7358280c49c186847ae7a306267afb3b976fe67605bcefda6c0908a793b0dc4fe14a409e7ba870eeaec1b0a461f539ab7504ec44ed3446ba431a38d4
-MISC metadata.xml 1285 BLAKE2B 2f08a86e1d8dc764ab015461101f7983cbad6c4856239ba2dcf332e23f3cbdeecb9e93bd464315b86125b708e8dba80008f1536dc4cc8fe240137e3cfdf461e5 SHA512 6bd4a58517ba2124ec04cb7dcbc36fc8f029729041abe623e1e4de8671439bba2471bb6d03febd780b820a2bd9b37384dc3c289c87f6eaa39d2005b544f16cf6
+EBUILD easyeffects-6.1.5.ebuild 2023 BLAKE2B 2f097197e93d3e4c62c05a3998c81129291f65c143a36c864eaceb3c941061eb54fd1cc93bda6ecf456dc22b546151e84cac23caeba4b467a8c08eb7e463d115 SHA512 542d72440be49b6229d2ce451fb3484775e1be14169d1570e8b68781c0808dc51f6ec521ff40df8153f084a90b5b279ae79c1856be88017b75355c46dd5107f5
+MISC metadata.xml 839 BLAKE2B d3fde7fe66f301f320a4fc3adb4a5fb5e5f84405b015209b696045eaffe251f7d1531efdb2d9fab6512647dac991290b622bf411dff36ecf304c9b063567c03c SHA512 fc68f37398082f885a2c7c5d117191fc37d1c1a51381439cefe1ae798b7b019598e81f5c5f1832950669cef340d418220024993b95aeb911dfd9fa1df0eb82fc
diff --git a/media-sound/easyeffects/easyeffects-5.0.4-r1.ebuild b/media-sound/easyeffects/easyeffects-5.0.4-r1.ebuild
deleted file mode 100644
index a83848d083ab..000000000000
--- a/media-sound/easyeffects/easyeffects-5.0.4-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
-HOMEPAGE="https://github.com/wwmm/easyeffects/tree/pipewire-gstreamer-legacy"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
-	EGIT_BRANCH="pipewire-gstreamer-legacy"
-else
-	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf rnnoise rubberband webrtc zamaudio"
-
-DEPEND=">=dev-libs/boost-1.72:=
-	>=dev-cpp/glibmm-2.56.0:2
-	>=dev-cpp/gtkmm-3.24:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=media-libs/gstreamer-1.12.5:1.0
-	media-libs/gst-plugins-base
-	>=media-libs/gst-plugins-bad-1.12.5:1.0
-	media-libs/libebur128
-	media-libs/libsndfile
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/zita-convolver-3.0.0
-	>=media-video/pipewire-0.3.24[gstreamer]
-	>=x11-libs/gtk+-3.20:3
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 )
-	rnnoise? ( media-libs/rnnoise )"
-RDEPEND="!media-sound/pulseeffects
-	${DEPEND}
-	gnome-extra/yelp
-	>=media-libs/gst-plugins-good-1.12.5:1.0
-	>=media-libs/lsp-plugins-1.1.24[lv2]
-	>=media-plugins/gst-plugins-ladspa-1.12.5:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.5:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.5:1.0
-	sys-apps/dbus
-	calf? ( >=media-plugins/calf-0.90.1[lv2] )
-	rubberband? ( media-libs/rubberband[ladspa] )
-	webrtc? ( media-plugins/gst-plugins-webrtc )
-	zamaudio? ( media-plugins/zam-plugins )"
-# Only header files are used from libsamplerate so put it here rather than DEPEND
-# to avoid unnecessary cross-compilation.
-BDEPEND="dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-	dev-util/itstool
-	media-libs/libsamplerate
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.4-meson_no_automagic.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature bs2b)
-		$(meson_feature rnnoise)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/easyeffects/easyeffects-6.1.4.ebuild b/media-sound/easyeffects/easyeffects-6.1.4.ebuild
deleted file mode 100644
index e99c0e46a097..000000000000
--- a/media-sound/easyeffects/easyeffects-6.1.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils flag-o-matic meson
-
-DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
-HOMEPAGE="https://github.com/wwmm/easyeffects"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
-else
-	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="calf +doc mda-lv2 zamaudio"
-
-# Tests fail since 6.1.0 due to upstream changes to the metainfo file.
-# TODO: check this every release.
-RESTRICT="test"
-
-DEPEND=">=dev-cpp/glibmm-2.68:2.68
-	>=dev-cpp/gtkmm-4.2.0:4.0
-	dev-cpp/nlohmann_json
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-3.0.6:3
-	media-libs/libbs2b
-	>=media-libs/libebur128-1.2.0
-	media-libs/libsndfile
-	>=media-libs/lilv-0.22
-	>=media-libs/lv2-1.18.2
-	media-libs/rnnoise
-	media-libs/rubberband[ladspa]
-	media-libs/speexdsp
-	>=media-libs/zita-convolver-3.0.0
-	>=media-video/pipewire-0.3.31
-	sci-libs/fftw:3.0
-	>=gui-libs/gtk-4.2.1:4"
-RDEPEND="${DEPEND}
-	>=media-libs/lsp-plugins-1.1.24[lv2]
-	sys-apps/dbus
-	calf? ( >=media-plugins/calf-0.90.1[lv2] )
-	doc? ( gnome-extra/yelp )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	zamaudio? ( media-plugins/zam-plugins )"
-# Only header files are used from libsamplerate so put it here rather than DEPEND
-# to avoid unnecessary cross-compilation.
-BDEPEND="dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-	dev-util/itstool
-	media-libs/libsamplerate
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if ! test-flag-CXX -std=c++20 ; then
-			die "You need at least GCC 8 or Clang 10 for C++20-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/easyeffects/easyeffects-6.1.5.ebuild b/media-sound/easyeffects/easyeffects-6.1.5.ebuild
index e2384d6fb9ab..ef8f7dcc1bb2 100644
--- a/media-sound/easyeffects/easyeffects-6.1.5.ebuild
+++ b/media-sound/easyeffects/easyeffects-6.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
 else
 	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
@@ -61,7 +61,7 @@ BDEPEND="dev-libs/appstream-glib
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != "binary" ]] ; then
 		if ! test-flag-CXX -std=c++20 ; then
-			die "You need at least GCC 8 or Clang 10 for C++20-specific compiler flags"
+			die "${PN} requires degree of C++20 support only available since GCC 10 or Clang 10"
 		fi
 	fi
 }
diff --git a/media-sound/easyeffects/files/easyeffects-5.0.4-meson_no_automagic.patch b/media-sound/easyeffects/files/easyeffects-5.0.4-meson_no_automagic.patch
deleted file mode 100644
index 4e547d404f80..000000000000
--- a/media-sound/easyeffects/files/easyeffects-5.0.4-meson_no_automagic.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -4,7 +4,7 @@
- 	'cpp',
- 	default_options : ['cpp_std=c++17','buildtype=debugoptimized'],
- 	version: '5.0.4',
--	meson_version: '>= 0.40.0'
-+	meson_version: '>= 0.47.0'
- )
- 
- add_global_arguments('-DG_LOG_DOMAIN="pulseeffects"', language : 'c')
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -0,0 +1,12 @@
-+option(
-+        'bs2b',
-+        type: 'feature',
-+        value: 'auto',
-+        description: 'Enable bs2b-based Crossfeed plug-in for improving headphone listening of stereo audio records'
-+)
-+option(
-+        'rnnoise',
-+        type: 'feature',
-+        value: 'auto',
-+        description: 'Enable rnnoise-based Noise Reduction plug-in'
-+)
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -108,7 +108,7 @@
- 	dependency('gstreamer-plugins-bad-1.0', version: '>=1.12.5'),
- 	dependency('gstreamer-fft-1.0'),
- 	dependency('lilv-0', version: '>=0.22', required: false),
--	dependency('libbs2b', required: false),
-+	dependency('libbs2b', required: get_option('bs2b')),
- 	dependency('boost', version: '>=1.72', modules:['filesystem']),
- 	dependency('sndfile'),
- 	dependency('threads')
---- a/src/rnnoise/meson.build
-+++ b/src/rnnoise/meson.build
-@@ -1,4 +1,5 @@
--dep_rnnoise = dependency('rnnoise', required: false)
-+opt_rnnoise = get_option('rnnoise')
-+dep_rnnoise = dependency('rnnoise', required: opt_rnnoise)
- 
- if dep_rnnoise.found()
- 
-@@ -28,7 +29,7 @@
-   	cpp_args: plugins_cxx_args
- )
- 
--else
-+elif opt_rnnoise.auto()
- 
- message('could not find the RNNoise library')
- 
diff --git a/media-sound/easyeffects/metadata.xml b/media-sound/easyeffects/metadata.xml
index baeb462dbb21..0291ee33b45a 100644
--- a/media-sound/easyeffects/metadata.xml
+++ b/media-sound/easyeffects/metadata.xml
@@ -10,15 +10,9 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<use>
-		<flag name="bs2b">Enable use of <pkg>media-libs/libbs2b</pkg> for the crossfeed FX</flag>
 		<flag name="calf">Enable use of <pkg>media-plugins/calf</pkg> for adding various FX</flag>
 		<flag name="doc">Install packages needed to display built-in user documentation</flag>
 		<flag name="mda-lv2">Enable use of <pkg>media-plugins/mda-lv2</pkg> for the loudness FX</flag>
-		<flag name="rnnoise">Enable use of <pkg>media-libs/rnnoise</pkg> for the neural network-based
-			noise-reduction FX</flag>
-		<flag name="rubberband">Enable use of <pkg>media-libs/rubberband</pkg> for the pitch-shifting FX</flag>
-		<flag name="webrtc">Enable use of <pkg>media-plugins/gst-plugins-webrtc</pkg> for various
-			voice-enhancement FX</flag>
 		<flag name="zamaudio">Enable use of <pkg>media-plugins/zam-plugins</pkg> for the maximizer FX</flag>
 	</use>
 	<upstream>
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index a3843da6ca1d..d9acc88ace31 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-music-40.1.1.tar.xz 978092 BLAKE2B cf9e41e1d519431c33edbd03eb72565612d127d7f6fd82ca34d46b1b3ed58073b7435d3b5b80b149a5fc47ea549018756914dbef5e512cb036303b64b4882083 SHA512 3095dfd31dc32f831e776055d5c1f8c32af5958be632050f709f5c3991b272769edac09a339638de2accf6aae4bf6e8dd1f377a0136897eade2c21d2ebce5f5e
-EBUILD gnome-music-40.1.1.ebuild 1917 BLAKE2B 79a231cea6c2402fec980c995cb8ba06b9c69cac14ac7cb65ee543407225e8eef3d5b1f15249afdcdca82220ef2ec147ca174225235b811ea0fef1b65b8d6e1a SHA512 1c28e3bed07c342b552fe12af83ed1cd96545679a3a1bb039ae3488aaefa958016fddd97dbbcdc1ff9cb9e2492e8ee9c17e0f4d6e118104b3b0f922e69bb9d1c
+EBUILD gnome-music-40.1.1.ebuild 1924 BLAKE2B 96d423604481ff621250708dc425c8c31e0e205b5a0b9bfb6d4070e34c2932ca1f98023efbed3053e30026a424b99b59365a1f92659c2b5bb792dcb91905d993 SHA512 572c936a5250e986f72aaba67d2b9d8010218729b32c667849a4dc6d55b2aa724d49a0f019eef0c8f1c790ae0c3333b1770c6c77c81b224fd60a2f9ed879e779
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-sound/gnome-music/gnome-music-40.1.1.ebuild b/media-sound/gnome-music/gnome-music-40.1.1.ebuild
index 9a1f62b03fb6..65ea2646249a 100644
--- a/media-sound/gnome-music/gnome-music-40.1.1.ebuild
+++ b/media-sound/gnome-music/gnome-music-40.1.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 
 DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.50:2
diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest
index 7bc322205d78..5d0b119f332c 100644
--- a/media-sound/openmpt123/Manifest
+++ b/media-sound/openmpt123/Manifest
@@ -1,3 +1,5 @@
 DIST libopenmpt-0.5.14+release.autotools.tar.gz 1446898 BLAKE2B ab6ff8db2e19d859fecca882aea3e569b58d96d5055ec0dd42494a7eb38fefa9c8b88f4700d354de71346c71c6d9a96327db1c2b7b48e227928dcba0ce7347d6 SHA512 8897549c18afb57c5bf54f4dd8a1d80983829bca958052d76cda1315ef4a37f4201575817b7cedfe17a44ee79051a52aa35b26a51b554091e92c9d2dcf5924a3
+DIST libopenmpt-0.6.0+release.autotools.tar.gz 1506911 BLAKE2B 44cf8c5f725d2b11409d23e293dca0c151cad17c029da7f70a22366e75baa1b49b763f67d617d84a142efd3933b90344ccca5d881e5c724e2cfe0210170593dc SHA512 8da6cf1f2dbf683c32f45cbf884784360cced5e21f9862c96a1a679bd90b36be9a7cc59accbf82271a804722986cb81e75915f6564aeaaa248ed3e967dfdfb1a
 EBUILD openmpt123-0.5.14.ebuild 1719 BLAKE2B 98f417e228f2ce65d60c3fcb52a34c3044ebacc33de6192b3264cad083c8141411f84f6d323896d5f4ad084f90296b51ff7afb7b84034fc3c81b6a0a6b3c5951 SHA512 6759737ab75659c1725d59d5aa1342f90edba5e9ef01064fb9f5dc17ddc86295a53dd84c3cfe530fc470483cbb93375b2c14d84b2faeae4904706340790ee4c6
+EBUILD openmpt123-0.6.0.ebuild 1719 BLAKE2B 98f417e228f2ce65d60c3fcb52a34c3044ebacc33de6192b3264cad083c8141411f84f6d323896d5f4ad084f90296b51ff7afb7b84034fc3c81b6a0a6b3c5951 SHA512 6759737ab75659c1725d59d5aa1342f90edba5e9ef01064fb9f5dc17ddc86295a53dd84c3cfe530fc470483cbb93375b2c14d84b2faeae4904706340790ee4c6
 MISC metadata.xml 328 BLAKE2B 25f8b37a7e7885a50e5b7305c9090033c78b1154214e05060c3407f0d27ac436aa3f0da1dff3a5ba1685bef390f1fe99416893aaf59e002921cc3464ce0d2167 SHA512 6686c75dbfcd5a5f9d6ef4d667916f54388180045471f8eb585c7b0d6e03f5d56c3fc892c97851f7453318309a456bbfd877eb240cbf008b71984009d08a8181
diff --git a/media-sound/openmpt123/openmpt123-0.6.0.ebuild b/media-sound/openmpt123/openmpt123-0.6.0.ebuild
new file mode 100644
index 000000000000..82cbe36ce684
--- /dev/null
+++ b/media-sound/openmpt123/openmpt123-0.6.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib
+
+MY_P="libopenmpt-${PV}+release.autotools"
+DESCRIPTION="libopenmpt-based command line player for tracked music files (modules)"
+HOMEPAGE="https://lib.openmpt.org/libopenmpt/"
+SRC_URI="https://lib.openmpt.org/files/libopenmpt/src/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE="flac portaudio pulseaudio sdl sndfile"
+
+RDEPEND="
+	~media-libs/libopenmpt-${PV}
+	flac? ( media-libs/flac )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( >=media-libs/libsdl2-2.0.4 )
+	sndfile? ( media-libs/libsndfile )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Normally libopenmpt is built alongside openmpt123. Avoid the
+	# internal dependency and link it externally.
+	rm -r libopenmpt/ || die
+	sed -i \
+		-e "s:libopenmpt/libopenmpt\.pc::g" \
+		configure || die
+	sed -i \
+		-e "/_${PN}_DEPENDENCIES/s:libopenmpt\.la::g" \
+		-e "/_${PN}_LDADD/s:libopenmpt\.la:-lopenmpt:g" \
+		Makefile.in || die
+}
+
+src_configure() {
+	# A lot of these optional dependencies relate to libopenmpt, which
+	# we package separately, so we disable them here.
+	econf \
+		--disable-static \
+		--enable-openmpt123 \
+		--disable-examples \
+		--disable-tests \
+		--disable-doxygen-doc \
+		--without-zlib \
+		--without-mpg123 \
+		--without-ogg \
+		--without-vorbis \
+		--without-vorbisfile \
+		$(use_with pulseaudio) \
+		$(use_with portaudio) \
+		--without-portaudiocpp \
+		$(use_with sdl sdl2) \
+		$(use_with sndfile) \
+		$(use_with flac)
+}
+
+src_compile() {
+	emake "bin/${PN}$(get_exeext)"
+}
+
+src_install() {
+	dobin "bin/${PN}$(get_exeext)"
+}
diff --git a/media-sound/orpheus/Manifest b/media-sound/orpheus/Manifest
index 1cfe292964e0..8be3b5a3f843 100644
--- a/media-sound/orpheus/Manifest
+++ b/media-sound/orpheus/Manifest
@@ -5,6 +5,7 @@ AUX orpheus-1.6-constify.patch 2123 BLAKE2B 9842e55e4b0418f77e7f88f045e55eb95353
 AUX orpheus-1.6-cppflags.patch 830 BLAKE2B a5a4d8ca2633fe31bf1b3917e7004578187ef8677a99cecb870e9e181276a2f9a03518989caf2816c52dd07c168cc6d2104b59b9d326786dd0d895a1a4633181 SHA512 4a8d51eb3ef9cadfa78c0d11ae264166589dc0a63f084f904bb7a698fda6aa570cfb940b3ad50b0fbff201d21df049369d92b7ed5452cff473ee2d7b60fda43f
 AUX orpheus-1.6-fix-buildsystem.patch 4346 BLAKE2B 30fd0a668a6903c1b6f285c096caa096efcd187c138a2d304e591f3543d13ff5112949852c1ffc23043a3f2f98fd1c397baeec1555506a70973125a03d86fdca SHA512 fa05fec6ec5280a2a0289c55eaac5ca84286731cff2ceb294e645a0b69415fee785ad203169a455019dbebe89e700314821779c1d81d13dc21d6ccac7109ba63
 AUX orpheus-1.6-gcc47.patch 275 BLAKE2B 90f817ffe97c0f32865ed2b87a9ec7a044045fe478ace3d290ce0fdd5446e01ab496e0e57d5ff86e6039397c2e797d086485f8c3f3f8ec85aa1592ef294c2c16 SHA512 d502efb94e6cc1e1cb452a5c7f4ed4f662353ef1bb953117d725f8125a4c7f43713071089ce5df2ab9d8adb3f2b62b178e8869b2cf2b52681ba9f9510aa313d7
+AUX orpheus-1.6-musl-stdint.patch 769 BLAKE2B aca09903fe3e46f504a83507877701240689b4b0e3b1210655afe9d53c2f93305a48d4da450c4b060cb7a95ab22ac65689ad96baca664c3ae07887f06c76726f SHA512 ad484b277ba2a650eadb6678cbbd47ce67abc30692fe7372baf8c52471375c6da2dd8a290618cbfc995a02d4a18e63028bcdc50269bbc2b24e1b07f0e25ab52f
 DIST orpheus-1.6.tar.gz 440553 BLAKE2B de5621aaf6962668bceebb35a95df7ab543b517cfe208346cdccab4f73f458611b65e4fef515c4f284d2fa83e8fc24aa77e8e6e1808fab489d056f10de7f7a99 SHA512 40f4ac7533449940370f29d4a14281d7f235ce711166e0e979f3e2a5ca37f792dc74b5267ee2a4f51af6c20f346c543d0d9f1fc88f47670971ad32f7c2856abb
-EBUILD orpheus-1.6-r3.ebuild 913 BLAKE2B 6f068cca608943190a12e37d6adac09095d333478a8b90ed8d4269f056d35a84852b432b551bd8a31d51ba2352b929128733303be95a26b947147bfe6167db73 SHA512 add3909c566097b196e57335934889565d0a451c9c6513bd79a04798ced53a1dc4177e764568b3f62528fedc1ac840aeeab86f77c08be1d734b8e430a3fd604a
+EBUILD orpheus-1.6-r3.ebuild 943 BLAKE2B 973e849a195ca43c0d96726127e4246735e6f34fe9224acf778cedf9f5bca2fc0256396ce6508594390138c22f28c62991440de7bf5d51ee7d1e76b52c68c637 SHA512 87e9a7633539987632f019d55a99c512aee10324c5d3f3db507b3515aab7f204acee0501fd5060f2cc4a1c3de97e10d92e069350495f6313044e18f2c597ad8b
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-sound/orpheus/files/orpheus-1.6-musl-stdint.patch b/media-sound/orpheus/files/orpheus-1.6-musl-stdint.patch
new file mode 100644
index 000000000000..9665d342b6f2
--- /dev/null
+++ b/media-sound/orpheus/files/orpheus-1.6-musl-stdint.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/715698
+--- a/src/mp3track.cc
++++ b/src/mp3track.cc
+@@ -33,6 +33,7 @@
+ #include <sys/stat.h>
+ #include <signal.h>
+ #include <unistd.h>
++#include <stdint.h>
+ #include <stdio.h>
+ #include <netinet/in.h>
+ 
+@@ -55,8 +56,8 @@ static int cpid = -1, trackcount = 0;
+ static FILE *fpread, *fpwrite;
+ static char cbuf[65535];
+ 
+-static u_int32_t extract_bitfield(unsigned char *h, int start, int end) {
+-    u_int32_t hdr;
++static uint32_t extract_bitfield(unsigned char *h, int start, int end) {
++    uint32_t hdr;
+     memcpy(&hdr, h, 4);
+     hdr = ntohl(hdr);
+     hdr = hdr << start;
+@@ -237,7 +238,7 @@ void mp3track::readtag() {
+ 	11025, 12000, 8000, 0
+     };
+ 
+-    u_int32_t aux;
++    uint32_t aux;
+     int i, filelen;
+ 
+     if(f.is_open()) {
diff --git a/media-sound/orpheus/orpheus-1.6-r3.ebuild b/media-sound/orpheus/orpheus-1.6-r3.ebuild
index cd2786b8a7b5..2c29e8793369 100644
--- a/media-sound/orpheus/orpheus-1.6-r3.ebuild
+++ b/media-sound/orpheus/orpheus-1.6-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -12,7 +12,6 @@ SRC_URI="http://konst.org.ua/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
 
 RDEPEND="sys-libs/ncurses:0=
 	media-libs/libvorbis
@@ -28,6 +27,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-bufsize.patch
 	"${FILESDIR}"/${P}-gcc47.patch
 	"${FILESDIR}"/${P}-constify.patch
+	"${FILESDIR}"/${P}-musl-stdint.patch
 )
 
 src_prepare() {
diff --git a/media-sound/paprefs/Manifest b/media-sound/paprefs/Manifest
index e8f720f7332b..df94f3ba59f2 100644
--- a/media-sound/paprefs/Manifest
+++ b/media-sound/paprefs/Manifest
@@ -1,3 +1,5 @@
 DIST paprefs-1.1.tar.xz 69144 BLAKE2B 9809bb73156be1e4020679637c1203524a0ccc5f5e1fb3696724925bb196cd397e433c22e993e7353cfaadd38260980676af6ace2cac795c0b615298d1d85805 SHA512 4203fcb485b40223a5c8672fdbbd2875a25d05d85366773015728f54a17020098ee9e9fd1c02180c01799e100b99389c970855fc1bd69921d32d8e43c749ce76
+DIST paprefs-1.2.tar.xz 74820 BLAKE2B 5b4e3b2e4e0e940a7685dbff287cf42951931da1aad6f011a72115a8393bae11f6e80dc09a3e5724afaaac0e6580dcc7a37a9b9b4ab6fc6a53f29647d9980a4d SHA512 2bc50116528c150060711899c66976179e433f6be36f6b7806f0fd3f66346ce14037875e7f119dc205d2047c3998d78105fa7d7c397dfcf02fb8d3bfec34154c
 EBUILD paprefs-1.1-r1.ebuild 939 BLAKE2B e392fae53c00d30b07e9dbe843c360edde26cce313b78f9b96b00e2aaf63924c0a5aec2029dde26da8434b32b14112721b91e2fec036b2acfe76d68bea7b697e SHA512 e8fe1c5cc828753144974db389296a9e58ec38ea6101aef5b0d426f711860bf121cf2d3ea82289ad7d432dc279b698deadab158854d472997c02a20ad76f6764
+EBUILD paprefs-1.2.ebuild 823 BLAKE2B e94127ffa5bf4cced9e3ffcaf3fb261863c399e3aed19adb278b68f48a726c67b14d5da8496b7647e3dec1397ff95b766b8c268512f896513cd3aa618f1147e7 SHA512 2b32aeb3b8b03007b6f984e905fd3d86218c96d4bbd49f5db2b570dd4d224ed7ec6ba9dcd042ba1104c4902ef7e9732e434ac79b2aa6151f19c02ddde39d4b40
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/paprefs/paprefs-1.2.ebuild b/media-sound/paprefs/paprefs-1.2.ebuild
new file mode 100644
index 000000000000..ee0a35651ddf
--- /dev/null
+++ b/media-sound/paprefs/paprefs-1.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic meson xdg
+
+DESCRIPTION="PulseAudio Preferences, configuration dialog for PulseAudio"
+HOMEPAGE="https://freedesktop.org/software/pulseaudio/paprefs"
+SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="dev-cpp/atkmm:0
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:3.0
+	dev-libs/glib:2
+	dev-libs/libsigc++:2
+	media-sound/pulseaudio[glib]
+	x11-libs/gtk+:3
+	|| (
+		x11-themes/tango-icon-theme
+		x11-themes/adwaita-icon-theme
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	append-cxxflags -std=c++11 #568590
+	local mymesonargs=(
+		-Dlynx=false
+	)
+	meson_src_configure
+}
diff --git a/media-sound/pulseaudio-daemon/Manifest b/media-sound/pulseaudio-daemon/Manifest
index bf0ed0e5acf2..32fb42eb6036 100644
--- a/media-sound/pulseaudio-daemon/Manifest
+++ b/media-sound/pulseaudio-daemon/Manifest
@@ -5,5 +5,5 @@ AUX pulseaudio.init.d-5 2224 BLAKE2B d7710b77b209391016e9f84b574cdf70636904d7f54
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
-EBUILD pulseaudio-daemon-15.0.ebuild 9725 BLAKE2B 1a3a670ff5323aed60c01c84dbdc68400f3cad7b56572a6ad8d77692bc94191da2aebc163446c125edf04ae83f54fe7d89591ba8f6102c87ed7f7777d9a5b9ba SHA512 ce49d520414e54ec8ef27dc7de63cd176a0f701c73f374187026aca9a5e451069a36d101d30bd680e573db266eab667bb3b5cc02a797c1dd887d815c77bafd35
+EBUILD pulseaudio-daemon-15.0.ebuild 9692 BLAKE2B b00c8b2fbda1e985f4b1cdaa9df8697721aafa14be152b652961be93eead93290924aa71a187c5d95f2b875d66433e3d9a7fd93824556a87ef2803dd64956a5d SHA512 3e8de26cde8d3c1f4ecb15e7a68ccb200af2f3c20d84f5d31e3f9efbe43c64e3e89e50377c9954058070996488c69dba5687c1d772df3eea3e76a23b67d67260
 MISC metadata.xml 2745 BLAKE2B b8ff0973c3b5bdee1a05c598a7070e67ad385bfb32f51acaf80081ce9607d2bfb6a99233be9df31409dbac6a85a48f32f763f71be3ab960090ba104a613094a0 SHA512 42872d8b934e8216c30c525072977df9abc9e9487ba7de8d4a1df9343236ebb735bcb89109cd97cc0e7ddf0261370aa605aee8cdb8f5b457e26904b023a1990c
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-15.0.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-15.0.ebuild
index b8bc3c50f0e5..2af849121400 100644
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-15.0.ebuild
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -64,7 +64,6 @@ COMMON_DEPEND="
 	>=media-libs/speexdsp-1.2
 	|| (
 		elibc_glibc? ( virtual/libc )
-		elibc_uclibc? ( virtual/libc )
 		dev-libs/libpcre:3
 	)
 	alsa? ( >=media-libs/alsa-lib-1.0.24 )
diff --git a/media-sound/pulseaudio-modules-bt/Manifest b/media-sound/pulseaudio-modules-bt/Manifest
index 7c4dc561dcc9..95d7a9016717 100644
--- a/media-sound/pulseaudio-modules-bt/Manifest
+++ b/media-sound/pulseaudio-modules-bt/Manifest
@@ -2,5 +2,6 @@ DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34
 DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
 DIST pulseaudio-modules-bt-1.4.tar.gz 87558 BLAKE2B 98b21d8fced5b88d59e45ca4fa2505d3606616a8a09dd95eb91e30b0d31c8a0ec7e52e4c2fd1b601130f69a997871064849fa0c8847ec0686fb42a2ccd7ac43b SHA512 390b6ad0931b464a546c6624bec38cc5b6da7084e4defe2045f4164b0c910a9dd6d4327466eb0e53fcfbc78c995cf2e3634a75b67ee2a14f38ed18e31b5d2bce
 EBUILD pulseaudio-modules-bt-1.4-r1.ebuild 2170 BLAKE2B b692c89de2f16c30586737d6577531086f3cc6794f638de1dd7251711bfe9188c9d7ab341d9c8e73d3f4edbb517247d6ad6fd19e8996b576b2063d98b5170abf SHA512 7c28546f9eb9d1e4758d403d04eac9c76e7cac9c20c3b1e96891ba0be9cd6f77fbed171861d57315e967ed41b5f40171e99b6def9c5c24fb6df1c79d0216ac51
+EBUILD pulseaudio-modules-bt-1.4-r2.ebuild 2216 BLAKE2B cd82ba965af111a44f5c486ba4c333da1c1ccb84823bf1e92b296df3333dcb5e3b246c8bffcaf7f39419fe11a7035166da6f584c183b56143e52bfaa634a502d SHA512 fa5965f4a3c9f4a84b5d0af4ae3be2877fee1eb1f25c95d9654284cf147f9f842ab9681672e6b397d595730ee24dc2192eafa694b5ae418faf40d379b2084db2
 EBUILD pulseaudio-modules-bt-1.4.ebuild 2170 BLAKE2B 9e09eaf4e2ba634bb05c48a8db1a813a201589c7dc41a44653de6d630e03571f5d73c6071ff03dc292218b47881eb9cab717ee71ee61ea1941777021e5d58e56 SHA512 af3d8e0303cd3eec86155cf390fdca9d0ea68000bd6c84f91a772be354a630fc20e06cf4c172ac9a702ec2bef5884f532c78cd2c9fb5c1243f3bc40c03628546
 MISC metadata.xml 767 BLAKE2B 7787505018f779a109f761f1ad5d73bc19654491d1a9adb900fb97cb023abcb76753f964d9c39eb9a98924391bd8a08e916c652b21e942dda31c84e8e16dce01 SHA512 2b12af8d5dda44c9cb5f58685f49c65a865f29e9f1506f5d5e5c4cce6629b19e49774e71c7b078c877ed053ee5c6530d219cf9fbe1c2a8c9a4e4628c497d5848
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r2.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r2.ebuild
new file mode 100644
index 000000000000..5ce55a2c7a12
--- /dev/null
+++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake readme.gentoo-r1
+
+DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth"
+HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt"
+
+PULSE_VER="15.0"
+SRC_URI="
+	https://github.com/EHfive/pulseaudio-modules-bt/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PULSE_VER}.tar.xz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="fdk +ffmpeg +ldac +native-headset ofono-headset"
+
+DEPEND="
+	fdk? ( media-libs/fdk-aac:0= )
+	ffmpeg? ( media-video/ffmpeg )
+	media-libs/sbc
+	ldac? ( media-libs/libldac )
+	>=net-wireless/bluez-5
+	>=sys-apps/dbus-1.0.0
+	ofono-headset? ( >=net-misc/ofono-1.13 )
+	>=media-sound/pulseaudio-${PULSE_VER}[-bluetooth,daemon(+)]
+	!media-sound/pulseaudio[bluetooth]
+"
+# Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+DISABLE_AUTOFORMATTING="no"
+DOC_CONTENTS="
+After getting media-sound/pulseaudio merged without its bluetooth
+support (to not collide with this) you may have removed the loading
+of bluetooth modules in default.pa config file, leading to failure
+to use your bluetooth device (see
+https://github.com/EHfive/pulseaudio-modules-bt/issues/33).
+Please ensure you have this lines present in your /etc/pulse/default.pa
+file:
+
+.ifexists module-bluetooth-policy.so
+load-module module-bluetooth-policy
+.endif
+
+.ifexists module-bluetooth-discover.so
+load-module module-bluetooth-discover
+.endif
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# pulseaudio headers needed to build
+	rmdir pa/ || die
+	ln -s ../pulseaudio-${PULSE_VER}/ pa || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCODEC_AAC_FDK=$(usex fdk "ON" "OFF")
+		-DCODEC_APTX_FF=$(usex ffmpeg "ON" "OFF")
+		-DCODEC_APTX_HD_FF=$(usex ffmpeg "ON" "OFF")
+		-DCODEC_LDAC=$(usex ldac "ON" "OFF")
+		-DNATIVE_HEADSET=$(usex native-headset "ON" "OFF")
+		-DOFONO_HEADSET=$(usex ofono-headset "ON" "OFF")
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index f8e5eb307807..e680c455c5f7 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -9,7 +9,7 @@ AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
 DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
-EBUILD pulseaudio-13.0-r1.ebuild 11453 BLAKE2B 87e52e6b724603770f5d8ed003ae0801c733c97e036445f7b0279fda84323cd4bc7f25e89ed1c71aebb51e16d448dc15f5d8e0b26eac225155fa6d9c9e299295 SHA512 60b553dfa5733975526c39c269f3169e9993128840d49e99fb6c164094e77d72f47046461e0d60351ac2b2225fa5702a18977f92af811f0ff2340854f9630d23
-EBUILD pulseaudio-15.0-r1.ebuild 11131 BLAKE2B 97acbff6f752aa03f0fae1980603d552d0198d2e4dbef65cae0126d2ca5206bbcc8c2de3f11e853cc623e722f1b74b91ecd1a704204919128d7adc41b4cc2ec0 SHA512 438a0f5937ccc0749f2a902ac62ba34e510607cc43468fa99149da081e03a15e218a70a9795992ba75a5b017aa82c0940074de30c4545444c76487765eaf64f0
+EBUILD pulseaudio-13.0-r1.ebuild 11420 BLAKE2B 9dbe3d7ca0e295c016925e23369ec3b499dfa2d48c67289936c4211c07a72512251efc2e61688571ed5a0b6406a85f78efecaa8f5385283ea40d1659ceb54a86 SHA512 d5a27a4a1382dbaf0df03f72c020ed35ca221f98e3231cbd8a210656fd45a355091c7fdf1754e20ab63a97eeafedffa49b6a307a7bf0ce410a5cfaff998989c8
 EBUILD pulseaudio-15.0-r100.ebuild 1105 BLAKE2B a57a7c879c6a180c9a6495a5acbbfc2bad20173a6c971737f673835f57d730b5808bad5360f3b90af6629c92d968a4b38b181fc148ee9dbccaf2a60da163032e SHA512 d40c2271be2b359ffe8738a3f49d42e86acddec899ac93695bc66453920e2b118a001404ae96e49baab3184edb6c20db90b4a9674b774b4e093444e3fd751ed1
+EBUILD pulseaudio-15.0-r2.ebuild 11169 BLAKE2B 87e797d697ecdf882c30da4bb573322dab4c2a24c92f18738c93cfad16cf9405d1a3745db130e2774758b459e131b06f66b5d794eb0fc40d760ef8b2bee16710 SHA512 d751359d6305ceb29957a325aa77b4a1b4206f5d86ed98346df1e9f272f06fb43867e5154ab65b8911d36816d74d7238970ceb06b792ea3e08ef5ef63fa5b663
 MISC metadata.xml 3400 BLAKE2B 5e80f40f078e30e51975512fc465417c647106cdd5076c41f6bdd9b2a8757759a1e72391a2f8a90666c60b7ffa968e5b28b2b9aeae6906ef8837a7c959ace18a SHA512 6b81f6a80d6aaf72f56d00256e2715cd53758fc6adbd0a7a5b2836d9dc30ce61fd8a591e52ebb7e33288d6a87b172f75ae610dc9b13d4c28101eea5c2d2eb073
diff --git a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
index 98ed59a66526..5c3f45966c18 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,7 +39,6 @@ REQUIRED_USE="
 RDEPEND="
 	|| (
 		elibc_glibc? ( virtual/libc )
-		elibc_uclibc? ( virtual/libc )
 		dev-libs/libpcre
 	)
 	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
diff --git a/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-15.0-r2.ebuild
index 14c9658fb5b7..91cc01e8a068 100644
--- a/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-15.0-r2.ebuild
@@ -128,6 +128,7 @@ COMMON_DEPEND="
 	udev? ( >=virtual/udev-143[hwdb(+)] )
 	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
 	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
 		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
 		daemon? (
 			x11-libs/libICE
diff --git a/media-sound/solfege/Manifest b/media-sound/solfege/Manifest
index 6b20cec2b286..0f9126a23476 100644
--- a/media-sound/solfege/Manifest
+++ b/media-sound/solfege/Manifest
@@ -4,5 +4,5 @@ AUX solfege-3.23.4-itstool.patch 6767 BLAKE2B 0f0fe564fea7ab8396fb597257bccf90ca
 AUX solfege-3.23.4-no-xmllint.patch 448 BLAKE2B bbc9b1247f68f36ab2a426972255dee4fa6c2531919df090133c9daf59e964eb6be93bac04f99e88c0d1184f10429b2b3d63b8b7a6eeb8acb089628f25295832 SHA512 3eda0a2c845d6f4e82b79542835a9a20658a522c86b162821b0b0a61187505c811710660ee1fa5395709f14607fbd8e95b542263c155284e47950b5178a1854d
 AUX solfege-3.23.4-topdocs-encodings.patch 1347 BLAKE2B 40211d4dada0e2d3d9185f299ab2ad7e8b4e3afeab24a6c35d9c5bdd8685f35bea157d3f6ab916aa6a347c96f5a35495c7e61682b118513e3a2a35833334a712 SHA512 550f1ad9a01fb27e3d3a5e6b8b99a2126b8607cf72bcaef2d8f039c28c77e0f11e0e41da3f01907f4fdc430cb97b114135b9c1a64317fdbff106d9377cfeed8d
 DIST solfege-3.23.4.tar.gz 5148412 BLAKE2B 8543aaa659f753af87f7b911401ee38713aa51afcf3dc33d4bfacbc880c8088aff78a81ce03369ba0b58d14a4b6965d78d97486ac2c3481f066591db0f29743d SHA512 e489dec514b4f387ebac7627d83d1a7766718d10a26c3ec6257d3f4b27a082501df16a27c8a16023b34a06cd4832fabaa1c73bcded52c502fc68ab57b303eeea
-EBUILD solfege-3.23.4.ebuild 1731 BLAKE2B a88a6776a852a028bc0f545cedfb98b9aa2c75becc311547dce745a2c6326217d288b484a6d067980eab171851c33e3cbd30c0e00e768c548f689bb4bcf3d616 SHA512 654d0189d6b8ff3997841b3728a15deaa3683ccf92c9a53f7375736c3014634b204ceb2d50793b82f4c45abe8f380ac28fc8f5e47e5f55a58c3cf6861817975d
+EBUILD solfege-3.23.4.ebuild 1732 BLAKE2B 298de3bf2e000555de8f5696ed1529e916d5deb1bc59b912333c287973ab6e06422fb8348672c11e8d2c7b1cbb5d637f810d8b2dd7665d221bcf92f29e458f2d SHA512 b0f57bba5f85c8e93696b50e93c6dc1f85f3365bc0ff32586adf62038127fd2ba1773e7ab2e322cfd81f4d0f94c9aac7ad0ae5517865e97adb8fbdd191888db1
 MISC metadata.xml 331 BLAKE2B b26139d5db022491a92096b70eda384142000c6f50420b4338f17c4c432e248379b3fb72e83c4b807aabb7965bef0d91c4a452d2568e1a104f0cc8a7dc26b9c8 SHA512 598e866e8dab808bd631c40b1ff9c0d4d60c549f5b2da082dba85076a455786103255fc99634e6c38ed2a80b13a5cb582716fb0135d743ee6dfade136af9bf4a
diff --git a/media-sound/solfege/solfege-3.23.4.ebuild b/media-sound/solfege/solfege-3.23.4.ebuild
index 71a32e160ee9..11bc70dbefdf 100644
--- a/media-sound/solfege/solfege-3.23.4.ebuild
+++ b/media-sound/solfege/solfege-3.23.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 inherit autotools python-single-r1
 
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index b1c7244d1f7b..2bc6762ad27c 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,3 +1,3 @@
 DIST sound-juicer-3.38.0.tar.xz 1775916 BLAKE2B d811f91256197cb6575f491e3c692a60ccfaa78ae28d5a489c27e835dec07a16c19b5bae6cae774e6efe3bc7ae10cffc3c03f652f9e60263325167cb1b348743 SHA512 d76d38839c1f5a997a900d0ba4f43d59e38d9a1d547f51bdf15d1aa9ee0a2b24210a876bfccb7b221feb1adab5882ac1d884da6131a0f259dd985326222eff9f
-EBUILD sound-juicer-3.38.0.ebuild 1255 BLAKE2B 5ff9754b15e7c07adc065505583936ebc0d6301bfcf359a1e51a308f9b75cdd86c17a473c50a32e973170d7f39c302784042b1b62b243eefd49b53ff5fe3f50c SHA512 cdaa222520fa7aa201a15c91d243974ac6d79db076e01dc8155b1da3e42cce5c9c0d182ebc9cdd80900f5c1c187a7df1b7bdab945d8021608edf4031d5ae761b
+EBUILD sound-juicer-3.38.0.ebuild 1262 BLAKE2B 93c85c6d629ff49db561dd43adf2e937f951478193eb57815e588cf1a30bb02227154a58a3a4d62d2348fa1c48e1cd7de4898839c18c1208647675ff4149658f SHA512 708b707ed8360b1267265e3c00192363da61c02bd73c34d04773cb2165222e23a523b93c703830137a532480cab41d2ed6dadffef5659c6a2eb07a2a75b11751
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
index 8109b508d30d..de08dd174e7d 100644
--- a/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="flac test vorbis"
 RESTRICT="!test? ( test )"
 
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 8fd87f7347f8..d7507b6a3a27 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,4 +1,4 @@
 DIST strawberry-1.0.0.tar.xz 11149316 BLAKE2B db500acb75c1e206c7eb2b5b668fc850444da8383ea98926e05d3eaee46a477f9b7c24017c75a1ea8d0ac8d89287a137aa65ef9098527b0449e3b5b14e37fa9e SHA512 e7f03eb068bd2de22b83b0bdd493dabbbe054bb0f7d3f4d237ff38955e382a13d7c42f60c9a257c906ded46567b6f4ca9139920291df8a7688fb4025cdfec488
-EBUILD strawberry-1.0.0-r2.ebuild 3158 BLAKE2B eb0105b01331c95f162ac0cc8ffdc3cec4fd2fa69e7fa7d912ca61471cdafb3025f836f8baa886740e9377f35ef53d967017ad56382e150af1437979c2f849b1 SHA512 e9fa7f4eb3e23aacb4c3d376d2725997b8d5aab614bc8b1b091b3eca1c8a52a303343de4e98b835dc2073b0f250daf65f31047275a4b5f34be998958ced86fd6
-EBUILD strawberry-9999.ebuild 3160 BLAKE2B 08afb3e7c4d0b32c675f9bfb400f947f71538a2eebdc27206552819dde7d1a17f0778446af994fe007ecda0ddc951acc5dd4d92366d41b12fc13cec4efa4c40a SHA512 81a3f1449f973492f757ebf8f0fe16743a7d5cba3793c2fbe7b56d819edf1b28868bc4307ac356b2f11ae9f5f6141745914c994567149364e69238e715f5f03d
+EBUILD strawberry-1.0.0-r3.ebuild 3050 BLAKE2B cc7af3d47d128f8bf0ec448100c413f2a8575e1e777967fd1fbab801393ae22fa984a326215c3d0f7effda78a247e194fc7d1f805524fb6a9dbd79e9a80b8c68 SHA512 05985dafb6975a6a2a94cc91d3a5c19fbd2d883ad79483adb1f9428aced426a37dc1520899f7588edd8717e483a8e804317af2f2587c62e38a1eb10bfb153405
+EBUILD strawberry-9999.ebuild 3052 BLAKE2B 9a491efa29dae00d1bbb920fd3f54344db71cbf9e2b55286ccecdac0715c16a66b3a1d2ee56cfc6e2e749576c45b134024364f5534824985034623dda9ea485b SHA512 cabc602ece8c7e895a741d6158c031a9e74922b6e1c0b9ebc826af22b065eb9076f495f67d27f6d72bf0535dbfff876afd5d3a92f3188ffc95735e6742f51cc9
 MISC metadata.xml 585 BLAKE2B 1b52d815e1846552591795504e346af937c10cec32eb466c2d6ce64d541b94ce635fe30b268fd0b4180cc6b755086a3a9350ae319a3c11c9291351e419f5a363 SHA512 e3c610802ecf38062db532d7124f19bf555238359701627bcd0765ffad22aab6c8c8b457d45795a0784eef4beaa2e6764a15083dd203e2a3d3fa04d5de8208fa
diff --git a/media-sound/strawberry/strawberry-1.0.0-r2.ebuild b/media-sound/strawberry/strawberry-1.0.0-r3.ebuild
index 7fb0814fa2d5..ab29187dd035 100644
--- a/media-sound/strawberry/strawberry-1.0.0-r2.ebuild
+++ b/media-sound/strawberry/strawberry-1.0.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,12 +8,12 @@ inherit cmake flag-o-matic plocale xdg
 PLOCALES="ca cs de es fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
 
 DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
-HOMEPAGE="https://www.strawbs.org/"
+HOMEPAGE="https://www.strawberrymusicplayer.org/"
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/jonaski/strawberry.git"
+	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
 	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
@@ -27,10 +27,8 @@ BDEPEND="
 	virtual/pkgconfig
 "
 COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
 	dev-db/sqlite:=
 	dev-libs/glib:2
-	dev-libs/libxml2
 	dev-libs/protobuf:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -39,11 +37,9 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
 	media-libs/alsa-lib
-	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
 	>=media-libs/taglib-1.11.1_p20181028
-	sys-libs/zlib
-	virtual/glu
 	x11-libs/libX11
 	cdda? ( dev-libs/libcdio:= )
 	gstreamer? (
@@ -70,10 +66,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	>=dev-cpp/gtest-1.8.0
 	dev-libs/boost
-	dev-qt/qtopengl:5
 	dev-qt/qttest:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
 "
 
 DOCS=( Changelog README.md )
diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index 83b0bbf5f703..3649ac2be758 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,12 +8,12 @@ inherit cmake flag-o-matic plocale xdg
 PLOCALES="ca cs de es fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
 
 DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
-HOMEPAGE="https://www.strawbs.org/"
+HOMEPAGE="https://www.strawberrymusicplayer.org/"
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/jonaski/strawberry.git"
+	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
@@ -27,10 +27,8 @@ BDEPEND="
 	virtual/pkgconfig
 "
 COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
 	dev-db/sqlite:=
 	dev-libs/glib:2
-	dev-libs/libxml2
 	dev-libs/protobuf:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -39,11 +37,9 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
 	media-libs/alsa-lib
-	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
 	>=media-libs/taglib-1.11.1_p20181028
-	sys-libs/zlib
-	virtual/glu
 	x11-libs/libX11
 	cdda? ( dev-libs/libcdio:= )
 	gstreamer? (
@@ -70,10 +66,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	>=dev-cpp/gtest-1.8.0
 	dev-libs/boost
-	dev-qt/qtopengl:5
 	dev-qt/qttest:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
 "
 
 DOCS=( Changelog README.md )