gentoo resync : 25.09.2021

74 files changed, 1485 insertions, 901 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 82058f182409..00bc5201c7b4 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index df8fa60b3b42..75ad64e378b5 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,3 +1,5 @@
 DIST abcMIDI-2021.06.27.zip 605658 BLAKE2B b522c96b7f8990f297cc13a3334872763fb2879f5893f09e630d66ab425d1772e0eee64273249d26e8118c6d341dad84129e140d8c309adab160f3120b5a18a2 SHA512 b1e4a7a9b93e6633abe211258995cfa84bb8eaed3870ed20e244aa12353c6cc351ea7e1c842e4e410dad9dd91b2e8c918826138bec39503c56e95062f4a99f37
+DIST abcMIDI-2021.09.15.zip 605783 BLAKE2B 814dbc75489e0df509219d64d3a094a1988832f38199236559cd2137890855acd18e5cddd1fc82dab942e183b8fd18aa1cbc1b0082bd7e6c3bc89180fc196ba5 SHA512 2bce8af706b51d10ee250cfa770d6047929bd575af57b4ca24c08e55b7105d25ec117983d2e84f4bc35350da2c0b351dd27585bbe6580846b23a3a91f523d7ee
 EBUILD abcmidi-2021.06.27.ebuild 676 BLAKE2B 916e0595b5c1cbf9dad1ba1c9fd7fdba8010898e12ebbc95ef02bcc725cb22a44e8608bf07ec3dd253128aafa3af728ae3709bb9a8bef786b3e6124cd32ae7c5 SHA512 3f000a5a47de4dcc3da9279dee49e962f526833ec4f85dd7f2d749d54b4c08057a99b53deef3c978f7dd1840ffd96b97d3db875d7bf559e27e18042eb8dc8bc6
+EBUILD abcmidi-2021.09.15.ebuild 678 BLAKE2B d93bc531703f192645a2ad0dcb2609079e2582413c0091d7b2159689add101121039dc83e730573c75e108bb9d70633a020a9db1c0de4bbe7c541bf1895a68d2 SHA512 7139e646e3b903d6636ac931e12e59b9b09f22e88c456465ba6288a4091bf957f1c46fd2126d6cbc079b342c9021685e82a8bc6054b8b7683e6f743065a0c1ba
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2021.09.15.ebuild b/media-sound/abcmidi/abcmidi-2021.09.15.ebuild
new file mode 100644
index 000000000000..10c98f2d31f4
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2021.09.15.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 79c4482a8bf6..0fcc457ba91b 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -7,7 +7,7 @@ AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b76
 DIST alsa-utils-1.2.4.tar.bz2 1286259 BLAKE2B 41eb0b8186c1956c19d8f8b28863ab54c66ff531b9ec5c48cc6c5ed8ca249d135614112ce412d6adb6f21982235e06a4148591777cce00d17ea537aacbd664ad SHA512 13080abda55269513b3751044dac292d695e273073a62d74ed4a32c68f448a2b015fe16604650821a6398b6ef6a7b6008cb9f0b7fb7f4ee1fa2b4eb2dcf29770
 DIST alsa-utils-1.2.5.1.tar.bz2 1326965 BLAKE2B 79f96fd3ba1d92e72dc634dc01439acd3ccd02555c39cc1714c52bbd1e4bc8b68ec7bf5d219a704533e4a61587c3528504ef9cd7c652924d74daafa90f74e42a SHA512 bbafeb9189ec5802965c4e69cf6e7cd4c132ffb77b57f164d6585649890f96edd052c72697171fd629b39e12f78648fea634468df34c1a80255227ca397907bf
 DIST alsa-utils-1.2.5.tar.bz2 1326676 BLAKE2B 52cbe978390e1b5600bf7422e67ece1d24a946d99acddbc059bf6eb3a0b8dfe37cc573167013296e923bf1597973eb55b2580eaf849e088822ba7b2afc14279f SHA512 0e319e553c9c209a46f5c83c50007bd82acf1c9cf78649978b3ab6fbb4349f51c1c7c6a975a8c24d25ba07ad5325e74d2c34dc5c89180998a0f63d1326fde8b1
-EBUILD alsa-utils-1.2.4.ebuild 2348 BLAKE2B 0b51fb69c74f99f97c623fd16bed5cbe310aa16a3e1801206b2fb4ee1b66aaa67e9cfa5fd23457b700adc2eb7d337f429007ab9166db0a63f39a8916baf99d37 SHA512 ab75b6e5a55e3488bc436d293354edbd6f135047be7871123ab408f0fabdbd46bb0e0c60594e55bec69b914bb26d1805a7174e1891c530dc63a7a8f04a4eb0d8
+EBUILD alsa-utils-1.2.4.ebuild 2347 BLAKE2B e88315e90b294ccdb23be786b62441b4dc8a962512253a585b52eb20c0198e6c5b19105f2f379829002afa5f04c1ffd6a4646a4c413585bf07eccb7bc7b13343 SHA512 aa4a8d1783e8ccc6ac18a1143fcb8200a24132cbe12d547ff22c77634fd05b212dfec2aeb6d72bf8f2a2526707e7898d9daba01f5673245b3d6bae59b733a19c
 EBUILD alsa-utils-1.2.5-r1.ebuild 2513 BLAKE2B 8ed803654a0a5918ae83774e65f07159ff0ea14324c937c3f6452ab526241db10dc5c5c3486b9ad9f33b765fcebea6eaeb9324f5f0d5fe14be30677969322250 SHA512 ac76c3dbef7dca7fb2da0ad8c93a862393712bb5ce638083adb7c2eea9e63167981117f5a91193b0b6cc5aeb66590ddf9b0d91b752e3792812608f2cb18a001f
 EBUILD alsa-utils-1.2.5.1.ebuild 2362 BLAKE2B 7acbdbc09430867420509a8d1eec1bfe99384e7c063d5409844ff320a784a7a1621799c78f5c0368f41eb0b17438d6389f4fbe6d581955f4dff6e45920f467f7 SHA512 5089297682395c41c7aec121853425d0c5acf9232e4cbd6b83a0b4bedc6ca3e6e3ebd4b5a8926fd0d22e1a4d5b3f5d2fb858b5a30aab3ca144416e1c17cfafa8
 MISC metadata.xml 480 BLAKE2B 1017b3f508632b0a56786a3b1e46304e4f4cbfd78335f07894ea0d4200e743a22ff0f4803f38314d0fc10dab6d35c40dd1af69e1d5aad3d36034a1cd504c4862 SHA512 c8440f0dc84c3e0d5459c07b975fc723ab346c5b817aaa1ae113964af9678d89d00692fb58494a1c88324a5cfbc9d2bede644362b34e97405c6add51730e943e
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
index 41322ff53b32..777934934c41 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 2522fee6adf8..446f66447100 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,7 +1,5 @@
 AUX ardour-6.8-metadata.patch 653 BLAKE2B 3929d825fd8de5205d0f5aa8d0172e6374ca9ffd195789386b756ae540e1842a9902592b8b6d74019c52f134e8cb9886085e23277ef022883c4425dc580c5bc9 SHA512 963f3cfcd00a3fb15cb9875f7fc31a8294058898b6fab94feb32f786369643139b1e8787ecc47a4ea6a33dabe6bd90f564b6009e0d6e482d8e5129534c789972
-DIST Ardour-6.8.0.tar.bz2 12152361 BLAKE2B 9f00a0eeae40fcb1f24e3138a639d1063a9cdbaecae2f17425bce133edee5e34ce4d0a1455be4da00725e52389bc1f9d829825b7ef5c591df2c5b0ce5538f463 SHA512 9f829df99fd6d857d54491e18a5c936b4a9b5e55715d71618454dc7c23fb3aaaaa2878a0ec87035c226a69da604111e27ddb00cd28087e34a46e24810c0ff403
 DIST Ardour-6.9.0.tar.bz2 12297369 BLAKE2B 62037130b9f2d15a7f527b549c552a281105298dc85e3019d0f7ac09cb791f2b5460c4a7bd2f2098ccade6b87c70a16e6414691d90ec4baafeb6065f26d10a66 SHA512 ace45f5bfe6d0c9e4bb1712ae53ebaee2f15f883045650cae3ddcae251d4fd2f645ba745effb739b47c73a0568ae9e8ae443b711dd610584e04575fd9046b234
-EBUILD ardour-6.8-r1.ebuild 4826 BLAKE2B 51df9831d221a6d0452e851a4668f576b9c4953ce4a963ab93ef19742c2fdc5a3c79920b790ef6f2d1535ebfdbc5980a17125a8257b551116947ff0150a66c39 SHA512 be04f3db61ac1a0f15c2c202ca0a87c522280c798b1c7140284d028c36a3be80ee1802cd3a46b12b6333ce23697a7661084e44bf72adca0bbaf0f02394d55ab3
-EBUILD ardour-6.9.ebuild 4833 BLAKE2B 31b4b2bc2270be509b0c1430490001284e3fbe8b584120120927522f386407b70c7e2a039292d435467d289641ce53dd2e94c64f506a7721b55db74b38c0475d SHA512 26daaed2414da80dd52fb7f238a48ed1ba82557e8e6cb270af1e6f9a4eda3d5db287a85596da7214f49cd92ac3ddcb3c066d8ed58506bf379e48535220f94af8
+EBUILD ardour-6.9.ebuild 4831 BLAKE2B 09fa9ace72b02d6c66b7293cdbb580ff0378fa5beb2e8840279e86e86a4fc37ddc44f26ca3a3dcf7c503f91e546f8f0a8ba2728eba3c3e9234aeb31a22df0cc3 SHA512 a47116f116f5a58bd8c7890657159399f07dc59aab31977520869999cd08565e93a8f60e520bcfe16b9f77dff145fc93f5aae55e5a9f492081cee12ba57e1909
 EBUILD ardour-9999.ebuild 4996 BLAKE2B f2bb5c3a8440dd0b663917f340ea3189b6a21e202bb0be0b794db9212b0d0a180004c1c051f9792b4eb77a514337091e484340d1120fbf630d5e490bbd8c4ce3 SHA512 a5b90a1ba7bbe9faa129a489e8b19815dc6ccb9bb5eca32d2616be8ea2f0cbe0831711bf54c2718ba104df0e26316f2dffdcee595a683c925afa3b0534331231
 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb
diff --git a/media-sound/ardour/ardour-6.8-r1.ebuild b/media-sound/ardour/ardour-6.8-r1.ebuild
deleted file mode 100644
index f1e41fea895e..000000000000
--- a/media-sound/ardour/ardour-6.8-r1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE='threads(+)'
-PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
-inherit eutils toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="https://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
-	inherit git-r3
-else
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
-	S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="6"
-IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-cpp/libgnomecanvasmm:2.6
-	dev-libs/boost:=
-	dev-libs/glib:2
-	dev-libs/libsigc++:2
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/libgnomecanvas-2
-	media-libs/alsa-lib
-	media-libs/aubio
-	media-libs/flac
-	media-libs/freetype:2
-	media-libs/libart_lgpl
-	media-libs/liblo
-	media-libs/liblrdf
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/libsoundtouch
-	media-libs/raptor:2
-	media-libs/rubberband
-	media-libs/taglib
-	media-libs/vamp-plugin-sdk
-	net-misc/curl
-	sys-libs/readline:0=
-	sci-libs/fftw:3.0[threads]
-	virtual/libusb:1
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/pango
-	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
-	media-libs/lilv
-	media-libs/sratom
-	dev-libs/sord
-	media-libs/suil
-	media-libs/lv2"
-#	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	jack? ( virtual/jack )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-metadata.patch"
-)
-
-pkg_pretend() {
-	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
-		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
-}
-
-pkg_setup() {
-	if has_version \>=dev-libs/libsigc++-2.6 ; then
-		append-cxxflags -std=c++11
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
-	MARCH=$(get-flag march)
-	OPTFLAGS=""
-	if use cpu_flags_x86_sse; then
-		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled sse but use an march that does not support sse!"
-			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
-		fi
-		OPTFLAGS="sse"
-	fi
-	if use cpu_flags_x86_mmx; then
-		if [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled mmx with i486 set as march! You have been warned!"
-		fi
-		OPTFLAGS="${OPTFLAGS} mmx"
-	fi
-	if use cpu_flags_x86_3dnow; then
-		OPTFLAGS="${OPTFLAGS} 3dnow"
-	fi
-	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
-		-i "${S}"/wscript || die
-	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
-	append-flags "-lboost_system"
-	python_fix_shebang "${S}"/wscript
-	python_fix_shebang "${S}"/waf
-	my_lcmsg() {
-		rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
-	}
-	plocale_for_each_disabled_locale my_lcmsg
-}
-
-src_configure() {
-	# avoid bug https://bugs.gentoo.org/800067
-	local -x AS="$(tc-getCC) -c"
-
-	local backends="alsa,dummy"
-	use jack && backends+=",jack"
-	use pulseaudio && backends+=",pulseaudio"
-
-	tc-export CC CXX
-	mkdir -p "${D}"
-	local myconf=(
-		--configdir=/etc
-		--freedesktop
-		--noconfirm
-		--optimize
-		--with-backends=${backends}
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-		$(usex doc "--docs" '')
-		$(usex nls "--nls" "--no-nls")
-		$(usex phonehome "--phone-home" "--no-phone-home")
-		# not possible right now  --use-external-libs
-	)
-
-	waf-utils_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	waf-utils_src_compile
-	use nls && waf-utils_src_compile i18n
-}
-
-src_install() {
-	local s
-
-	waf-utils_src_install
-
-	mv ${PN}.1 ${PN}${SLOT}.1 || die
-	doman ${PN}${SLOT}.1
-
-	for s in 16 22 32 48 256 512; do
-		newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
-	done
-
-	sed -i \
-		-e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
-		-e 's/;AudioEditing;/;X-AudioEditing;/' \
-		build/gtk2_ardour/ardour${SLOT}.desktop || die
-	domenu build/gtk2_ardour/ardour${SLOT}.desktop
-
-	insinto /usr/share/mime/packages
-	newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Please do _not_ report problems with the package to ${PN} upstream."
-	elog "If you think you've found a bug, check the upstream binary package"
-	elog "before you report anything to upstream."
-}
diff --git a/media-sound/ardour/ardour-6.9.ebuild b/media-sound/ardour/ardour-6.9.ebuild
index 41b264273ca0..c8eefac90452 100644
--- a/media-sound/ardour/ardour-6.9.ebuild
+++ b/media-sound/ardour/ardour-6.9.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 1ab51353aa70..be7efdfdc754 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -2,6 +2,6 @@ DIST audacious-3.10.1.tar.bz2 564481 BLAKE2B d1f76f34f0f6fbbe5ba92a95015fa0f3ef6
 DIST audacious-4.0.5.tar.bz2 577422 BLAKE2B a65810baf0f733327a3e37e6efd2af3d35245b1e99936a4cd39d8068e0df06779ab3c08e839e4b3586f70bec2d16a605c62328f863f747247181851ac7c151c2 SHA512 4be7ebeee937f9b29931a28e1d80782b9df8beec70eab3917f5adccd0bf02aa6003a5b8361359b792edac2d2f31a257b853db43d59dd0674e5a3fbec7e7c1e46
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
 EBUILD audacious-3.10.1-r1.ebuild 1696 BLAKE2B 09463aa9d83d1d610ea48321f81783dc2127d3be5b8d4574cc96d7edaebbbe8b88cf025aa4a8606cb2c6a4ce6745a59bc0f787203c66f07735dfd5732152aa5a SHA512 f31880f63020fb113020bf60a59f187117d1f60e545102da755615419affbd5599ce97c856e80541b1db67346855081ee0ec220584effa252d5f534534fe98aa
-EBUILD audacious-4.0.5.ebuild 1766 BLAKE2B 4977dcdedca220fd9de9760af086e9195aa4fdd9bb7fc3547b529cdb569b73fc5c9fc5b0ffaccfd4d3e725f82d602f4e161d85c41996ba1103272cad2771714d SHA512 1f983f029630e6da151a176ee69968983e5abd6c9cb7164c783c1296353c7d633aab4f09410751a9dc7d3276128606c06b57f7198693039b9cdfe217aaa424e4
-EBUILD audacious-9999.ebuild 1768 BLAKE2B 05d92d11c5b4b4fab175c6ff7a07996d86a9939f5303e23a046133d04308b9d90ff7391e866f0bf458ee72a16674c1f6e128343b172e3825c3928ccab53d383b SHA512 df4cd28d09993ccc387eba815757984ebad77bdb2070258fe0f1be8e1d2321135ff6a25fdabae66441a8ddc92d4d104e06b754841163d0ece945cf2ac603cca6
+EBUILD audacious-4.0.5.ebuild 1773 BLAKE2B 0debd08f37dd9d9e1bbe5cf313afc2d5769f75a12bab7b6df82ca73d3fbb92946aa2ba98a27395a1b2fcf8b1f5a9cedac67ffc9f2e212e395362e27f69022602 SHA512 effed1ada2d153a2734607ea4e0c3b0990d70dddd9eafe8b703ca1fc8683d85cba863d5ee5e49babf643919ecdbe68aa563a4df9e8135f862de827c55e443203
+EBUILD audacious-9999.ebuild 1775 BLAKE2B 2d19d6000935c4b791cd4e7004c233728934565837ac2ee5e404037ac84fd31a4bbcd5d7e04dc30cc79096f03f2dbf23121673ff2d5b89788901ce0ebf424839 SHA512 7ffb349b5d701f1d333804e469fc01e46740f4fa8d63cf5c89bfb61a9cf077648bd022c6d9bccc5c640f2e8220456dfaf32abd2c40c823c6d0f907b5ebe1844a
 MISC metadata.xml 368 BLAKE2B 4f11ce67a96b1567d44e7662ef108657336f4769c1bce6ee1077465e1a71d222f11030d47eb9d804b27f71e9bbfb20aadff7d227bb084e4ae42136fbbb3f9bd6 SHA512 802980a1e3d91b964da2864afdea30f7402f46f52fc89ee7827512d56d5f106041d1585e77daac35e579fb331faf3db502d8a846041ba7816a35dce60a035cd5
diff --git a/media-sound/audacious/audacious-4.0.5.ebuild b/media-sound/audacious/audacious-4.0.5.ebuild
index 98cdf80db1ab..560b050d80ca 100644
--- a/media-sound/audacious/audacious-4.0.5.ebuild
+++ b/media-sound/audacious/audacious-4.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
 else
 	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~riscv x86"
 fi
 inherit xdg
 
diff --git a/media-sound/audacious/audacious-9999.ebuild b/media-sound/audacious/audacious-9999.ebuild
index 13924b39fcb0..a292996186c1 100644
--- a/media-sound/audacious/audacious-9999.ebuild
+++ b/media-sound/audacious/audacious-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
 else
 	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 inherit xdg
 
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index d9eff1ee60c4..f384db99be73 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -6,5 +6,5 @@ AUX audacity-2.4.2-fix-metainfo.patch 468 BLAKE2B 87133634ca1be0ce0392b044d60a16
 AUX audacity-2.4.2-fix-vertical-track-resizing.patch 462 BLAKE2B 3f6fe748506f39ca64b72449853bc396389c2760767d916301298951aaa7b82cc1379c2b7d9860b4579a964dedc6806c85120cd3f4f1aa2b726ae5846bae1df2 SHA512 dc7c2cb3ae1e47e00f473b0943994e352275dc41d41255b2b1ba2e042d9bd6ab046f2088cda81dbc22f2ffeb13a97d28073ce078e35bb29e868f6fa2e8b9e0df
 DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8 SHA512 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc SHA512 8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
-EBUILD audacity-2.4.2-r2.ebuild 3955 BLAKE2B f4183c6a0075c0cb44c05c9345093c18502e70dc4201863f39038b2811f8e6084b88bb049cfc230f83858336928b87d1d085667e0c3e72cb36fd7897416de8db SHA512 9c8ef46c73966b333cbe9fdaa40b7fe49a20a7dc3c4929d28a7d2eb6dec66378b4863f23cb3f94fab51bf4b1aabe3845d7c449d6f72b20a34e85e228a2a4783e
+EBUILD audacity-2.4.2-r2.ebuild 3962 BLAKE2B 6ff677255c0b798b7b98bec8684cda997d008012f9bbc06963fb75efe58b0e86f84d2b62d39ec1216efcd7e1c27d2c6ca8f73cb1c7dccd8d3698af82d9d9c258 SHA512 f2e7d99afa0603f2c2ed38310bc7d818d596de2300eca4af64f870fba700ffc3c4770533ff8abf241624690c76dc42c3816dec30e3bbad9704b0e2bc690962a1
 MISC metadata.xml 1203 BLAKE2B a6f86e53fa032e8f94350551bac53e9ddfedbf72b8ba0904bbe25d145605d7ebaa231046d21887bb733eac4baeda4d95f0c14c62c9c50671d17b19f197dfa51b SHA512 bca12de8ebee74b56879147a5fa26433461202548d4f2744d236682fc292763e6178feece1d8337cd72a950170690b6cae84caa39b5adc7ca6cebc9e2b02d311
diff --git a/media-sound/audacity/audacity-2.4.2-r2.ebuild b/media-sound/audacity/audacity-2.4.2-r2.ebuild
index 31ae2a91f847..a1800d264fb4 100644
--- a/media-sound/audacity/audacity-2.4.2-r2.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 ~riscv x86"
 IUSE="alsa doc ffmpeg +flac id3tag jack +ladspa +lv2 mad ogg oss
 	portmidi +portmixer portsmf sbsms twolame vamp +vorbis +vst"
 
diff --git a/media-sound/cmusfm/Manifest b/media-sound/cmusfm/Manifest
index ab64b24541ca..58eb758c4a61 100644
--- a/media-sound/cmusfm/Manifest
+++ b/media-sound/cmusfm/Manifest
@@ -1,5 +1,3 @@
-DIST cmusfm-0.4.0.tar.gz 41451 BLAKE2B 02fe95079b902c23b594d25c93e99da4ff9a62437a3edb0ff0812db6d490a6320da5e6b5387aa49a55490b02c17b7982d48b3d773687ccffa5d85adee6b54aeb SHA512 dba2ca51953186ca21bd5074367da21c74a371b1ae7578cc851badf3f225274bfe7f3e5f5d7a322c50be9d839af2568339d10fae2d402548e5246a11f6acf9ae
 DIST cmusfm-0.4.1.tar.gz 41960 BLAKE2B 4de96b821c56f64c485dae8ff1e4d342e8f1548650a455ec707f01f53afeb7ca3e333ca62b514e2389a884d9138eb5d228a7376c5a1d5cdd163abc8ab9482608 SHA512 994599675822de5f809b3eedc423c37afe24e88df29fe4474d1834bf1e9573464d2bdbb084181db1d6c3bc0541891ccbb4514afa066c034e39035192ebc95211
-EBUILD cmusfm-0.4.0.ebuild 824 BLAKE2B d545b00c61a8673566bd9441f218eac8a002e13f62d1a36e2372b759c1d319ce66d5709a0d6edfa804fd492c722750e7c3a910bdb22c361d250d3a5da0d56275 SHA512 a81ccf415645833e912156e5da7ad891cfd62cdf2e22b24ee9b1c1b739b534c2ff1d0f516b119418d610d713dec82473045307dbc1588678c515b2714d999448
-EBUILD cmusfm-0.4.1.ebuild 826 BLAKE2B bb7d3d59579a71287a91c134d10b3e36085d97deaf0cdd8e49d6c7b028aa02d94aca50bbcfded9b22eeb695da991cc84e7d142cdf5ff73c87fa8b8a511d1e169 SHA512 af62618a187d8b8c96ceeb6182c67b19d6551f614313d9e1d71ac8473ce17d71e77c061dbed755ed72258f1c5d2911a7576e1c825b12defd7c09c2337c2b2ea4
+EBUILD cmusfm-0.4.1.ebuild 824 BLAKE2B d545b00c61a8673566bd9441f218eac8a002e13f62d1a36e2372b759c1d319ce66d5709a0d6edfa804fd492c722750e7c3a910bdb22c361d250d3a5da0d56275 SHA512 a81ccf415645833e912156e5da7ad891cfd62cdf2e22b24ee9b1c1b739b534c2ff1d0f516b119418d610d713dec82473045307dbc1588678c515b2714d999448
 MISC metadata.xml 340 BLAKE2B 19d391cfec8f0ade7c898ada1a1c5b83e3f33593d98d09a760eaa07e519f696cb0d3cd11bbe83b7253db718941ec1c379f4aa23c140d818ecac900827e165f04 SHA512 02f161f1808db61a84f93242b39529b8a4e765921288c49827b7adeb38045df28ebeaa2782cd1a278ed1a74e9e80d8076832caa907c83a42ee4a197f2ff6b4ea
diff --git a/media-sound/cmusfm/cmusfm-0.4.0.ebuild b/media-sound/cmusfm/cmusfm-0.4.0.ebuild
deleted file mode 100644
index efe088bb52b6..000000000000
--- a/media-sound/cmusfm/cmusfm-0.4.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools readme.gentoo-r1
-
-DESCRIPTION="Last.fm scrobbler for cmus music player"
-HOMEPAGE="https://github.com/Arkq/cmusfm"
-SRC_URI="https://github.com/Arkq/cmusfm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libnotify"
-
-DEPEND="
-	net-misc/curl
-	dev-libs/openssl:0=
-	libnotify? ( x11-libs/libnotify )
-"
-RDEPEND="
-	${DEPEND}
-	media-sound/cmus
-"
-BDEPEND="virtual/pkgconfig"
-
-DOC_CONTENTS="Please refer to the README.md file before running cmusfm the first time."
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable libnotify)
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-}
diff --git a/media-sound/cmusfm/cmusfm-0.4.1.ebuild b/media-sound/cmusfm/cmusfm-0.4.1.ebuild
index b2cac96f9c33..efe088bb52b6 100644
--- a/media-sound/cmusfm/cmusfm-0.4.1.ebuild
+++ b/media-sound/cmusfm/cmusfm-0.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Arkq/cmusfm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libnotify"
 
 DEPEND="
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index e03d5633989f..86f4068eccee 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,3 +1,5 @@
 DIST drumstick-2.3.1.tar.gz 1978856 BLAKE2B 47f7c9872964fb267834b23e2d52fc1b10826629fb256dae410161305c3587845ffcaf00f0d30a73df67b4a00849c53f3f1412c0473a52fbf69b106362175b3e SHA512 aaf0080405765878c8d1e164343eff0bb18d4add4a2f67de1ed0e978ae688948b73121f9cb50c52c23fc34b8c57e184d22a5c5aaa29969409071567142685dc7
+DIST drumstick-2.4.0.tar.gz 2094661 BLAKE2B 98f79081e9aa942b24355f86a14bb273145b7d764f19ad671050e74546ff513ee76fe2dac290f75ea1b1c54a709232da0f26e63d1829a5317174793692f2664f SHA512 633ae93c11f22999b6cadac7481e162d6e24499b614ba58e785e73b6af39a1cfbca235fcbb4b21107840f1e4dff059caaf32f9945ea80434a5017b816f62774f
 EBUILD drumstick-2.3.1.ebuild 1318 BLAKE2B fb184940b7b5bf8bb6054586de8f41cc93f755637199da2692466c427d811d3ba78ac3a255642a335efdd8ba2f47257065178ac301b76f9b0e7816f11fbbb5af SHA512 cedb23d0ca9fed19c41197db463ea1d8c01d78f52e0a1dc00d0d1897979dd57150fd683eaa3a344b3bda6b518f46bc2b218fea553d9d4be1d998f14baabe5cdc
+EBUILD drumstick-2.4.0.ebuild 1282 BLAKE2B 019bce62e329ed8f99d946684005d3e9c57d45ef48a9bdc5fe4ac81c6d9f01a8adab66f01bda027d29b6e42ccfc8dd40c24a9a34a40593703a3e25a0ed602cb0 SHA512 497b08f55faf4f3b4f7485936ff1d15515314db60d9366719116e2de469e6880fcb69027066b7f8fa370a667cb969875b589d163256e706849df393e6d03d27a
 MISC metadata.xml 599 BLAKE2B 1e9aa003d4bb54a9eba1e9ee7a9b36515992fd66bc7f876973c02e59da7dd84667ae8e839ebb1c22a1a463aedb26c5b88588277192673dae23adcd075dde2416 SHA512 59b60a0327a8febf9ddfd6e42d5ff6056a6ee1cca61b0d507f11686eb8fdb6bc2c5f614e19d4276b3c354b291d2bbb8b30b845d8d9bb9dcbadec10db6632e8a5
diff --git a/media-sound/drumstick/drumstick-2.4.0.ebuild b/media-sound/drumstick/drumstick-2.4.0.ebuild
new file mode 100644
index 000000000000..70bc8c734398
--- /dev/null
+++ b/media-sound/drumstick/drumstick-2.4.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
+HOMEPAGE="https://drumstick.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fluidsynth network pulseaudio"
+
+RESTRICT="test"
+
+BDEPEND="
+	dev-libs/libxslt
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	x11-misc/shared-mime-info
+	doc? (
+		app-doc/doxygen[dot]
+		app-text/docbook-xsl-stylesheets
+	)
+"
+DEPEND="
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	fluidsynth? ( media-sound/fluidsynth )
+	network? ( dev-qt/qtnetwork:5 )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS readme.md TODO )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF
+		-DUSE_DBUS=ON
+		-DUSE_FLUIDSYNTH=$(usex fluidsynth)
+		-DUSE_NETWORK=$(usex network)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_DOCS=$(usex doc)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doxygen
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake_src_install
+}
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index 84ad8aaaf8c2..d0e559d96668 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -2,7 +2,9 @@ AUX easyeffects-5.0.4-meson_no_automagic.patch 1520 BLAKE2B e7eb71a9aacdb80cf45b
 DIST easyeffects-5.0.4.tar.gz 2070912 BLAKE2B 848d2fa6fc1290b6fc25e13c4bbe4d8df932af63b8fb7e9642c6e24b29360dd17efba71ae0daae265538cd9cde1d9e33de453b0c469e3d54709a3f337cd583a7 SHA512 78074341c8376a4918d09950fd7db8804346cd2e00d6849da464662643809010eeb1d009c44ca5d3eadd2faf3bb9c43a18a41b7c3e77b883beff44618967b30e
 DIST easyeffects-6.0.3.tar.gz 1905373 BLAKE2B f423cefd0e6124ee1128bf5a07fb23df03df4ca25a6ebcbcd122032e5768ee68ff3464cdb51263d731fee3e9f5fee180858d96ab627771099808b1194adb78b1 SHA512 eb88f0befb6cf86b7da03137cb7ed6ac833f204d17860d9bd508dc8b007b2a0fb941b63a015b1179cb4da28abd0b3d8a8c53d026fd5a22057fee27e02618035c
 DIST easyeffects-6.1.0.tar.gz 1921987 BLAKE2B 419f8e88ff9fc1e40779f91efca4eb2b3145b1fcad885fd376a73d8b8dd3f7a0af43a73361e22c02e739503a3ca4d91885921848e3d8ef9186b2907b0e400476 SHA512 2a6ed01377f5bd4f6891980f2b22d499da8369207069b7869e146543ad125f274bbc61ab0f2608e8737b2650df0bedf0b619a3eb200e3444ddfd0ae8960bebfe
+DIST easyeffects-6.1.2.tar.gz 1924029 BLAKE2B 74b5cbf2c7ae93ce12ee8ff6a6931f258b7e56b4af91a6b9873cb795309dbfb690fcda51584edd35adf05e85788070f698cbb6e4a914be0b7c5630bb0815b041 SHA512 2700dbf335a2414b3a294b66eeda8c12eef0df8a6f62b53fee9b6f0d5877f13d5791b24fca3d8560e84ae3d3bdbbb11d95f50934668f250f6052d3ba08711e10
 EBUILD easyeffects-5.0.4-r1.ebuild 2272 BLAKE2B 9a0d0a24d713e2effca773730c0b7e7afaf83e4561b5bc83ca1459cada358e039e7b8fe7ded4c6dd6ec8f30ca8ea12d33fc65822b5ae2d812f320e71c2634a10 SHA512 b51edb7406290d1389ab8f98efa47c0739564ea8aee982acc27a4f544b5fd35211220b7361b7697b2d4f1b63e1d6e645016a4050c2ea482673e986dd314a31d0
 EBUILD easyeffects-6.0.3-r1.ebuild 1855 BLAKE2B 8a8f589feb8ad0bce561cd0cbb3f5ca083f0f37eddaf897b216aeda605eeb3e33c2b20428fe21864391da33720ddda0f8d26ba1faeb18f30ae5a20fb66ffc150 SHA512 8cd9c763ea0978c4a6f07594b41043f1256eff9c7e37f24cb13b180e6cb1baa3830912eb88ab8f6588462ea5e77c49ab0f97a1f33fb8203aecb47c45ed95e721
 EBUILD easyeffects-6.1.0.ebuild 1995 BLAKE2B 5e9b574dcf1121d5497af2feeb2e8c30e0eab2c003b09bcf87c14edd75be3135fdac40e7f10857fe45a459305a2596224f2cf106acdcff0bdf5efefca1035622 SHA512 7571ee5331c5a547cfa6385ad00e2f4c66be4c0ec5108ac543c471535b02647d60c2431b69645a85f8556579bf28a33816e6e8c0bc49d61e4207b8c47c7eaec1
-MISC metadata.xml 1196 BLAKE2B ab1e81e59538ba3c149e0cbb972bfe34d3a8ac9da97a1b22bc078736c51dcab4fdee207fe2ca160485dd493f8e8d3ba088fd7580e08f5556c638e1c4ebed0ebc SHA512 bac5474251636d22f9f41dd0411d1744c120a4cf10e69a6807e3ab2d0c8de1a9fa4b726e1bd762d730d774545523e1bf98d01325e56dc980cad2f6e1e28c7cb3
+EBUILD easyeffects-6.1.2.ebuild 2008 BLAKE2B 9828e0f5a814090892a0a423593b324124deb6b7a8d083a77f8ebaacc98405858d745b0bc0b91a5f326629db4f0bc7887a91f4cfa66cd2839ab93741ede04bc4 SHA512 b1a46a3ab371076ffaca4471548d8b4c8eb7a3c8aff408ff9e89051069a15cdbc79234b3faacfd890f46366cc03a03f970bd0b9051a1f4a1aeb2009de795fd6e
+MISC metadata.xml 1285 BLAKE2B 2f08a86e1d8dc764ab015461101f7983cbad6c4856239ba2dcf332e23f3cbdeecb9e93bd464315b86125b708e8dba80008f1536dc4cc8fe240137e3cfdf461e5 SHA512 6bd4a58517ba2124ec04cb7dcbc36fc8f029729041abe623e1e4de8671439bba2471bb6d03febd780b820a2bd9b37384dc3c289c87f6eaa39d2005b544f16cf6
diff --git a/media-sound/easyeffects/easyeffects-6.1.2.ebuild b/media-sound/easyeffects/easyeffects-6.1.2.ebuild
new file mode 100644
index 000000000000..88d5ad9d6625
--- /dev/null
+++ b/media-sound/easyeffects/easyeffects-6.1.2.ebuild
@@ -0,0 +1,78 @@
+# 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 toolchain-funcs
+
+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"
+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/metadata.xml b/media-sound/easyeffects/metadata.xml
index 2b6bcdf5e3f2..baeb462dbb21 100644
--- a/media-sound/easyeffects/metadata.xml
+++ b/media-sound/easyeffects/metadata.xml
@@ -12,6 +12,7 @@
 	<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>
diff --git a/media-sound/ecasound/Manifest b/media-sound/ecasound/Manifest
index 5a2b98ff7a35..09ded93d4398 100644
--- a/media-sound/ecasound/Manifest
+++ b/media-sound/ecasound/Manifest
@@ -1,5 +1,5 @@
 AUX ecasound-2.9.1-tinfo.patch 442 BLAKE2B fd9d1251bcfc8a05acae992b0e5baca334d118a3a2fd3d009b6239fb13e0b11e46131a8e94e215d168a82f176e3061f5789b86329a18814625df47733e3f4422 SHA512 c7d20dadeeb2e1b7dc1a611e1e2889bfb7ad222724f18d7bdd7334e0831183e957cc5f6097cf33fb15d2441ba941d2c90147cfd5ced1d50f05d142e1c04cac54
 AUX ecasound-2.9.3-ldflags.patch 2718 BLAKE2B c37cfbe326e7219d97286ce1c298af6d5eb21989f986a80f58cc7fef8392f169757395cb0e72f3dce2221e9fe128856b252279d4ba85a77218264faad2053c86 SHA512 2f27fbb2ebfc85ecd91333e17a24964409471f791bed1f4f94210b13277bc836969d4d7f9ff3f70791f72fe32edb2ffa04a07ebbb2528be92ef33624861e39ee
 DIST ecasound-2.9.3.tar.gz 1101628 BLAKE2B 52aaa96abee9a911c613ac772fd3df3ff7bb4a8309283089d19e2f7265be26eb6e77304896cda2ed1c71742f36dfe1e38209afd42b921d56f12d43f08b4fe2d2 SHA512 4f70e6f54cd05194a4ffe80905e7488d16d32d684c87736dfdac7b3aebf3d20cbf417964d75e00e781f6f0614b8b699061c69fcbf7e1761d66ce1abfcd5f1140
-EBUILD ecasound-2.9.3.ebuild 2340 BLAKE2B be16599cff4b41652b65b9b9f37b7b7d9fbc625740f87004df93730a5afc3b64a4901f10d7816a57caf8144ac22a5a464258fcbaa2ddd0663f884f0307985f48 SHA512 d08dc25457937861a8d21ba0ab16a5c3500bbf15407a64ab4c019054e6908f7fa458a64de0ec2420cedc7c1fa4b6cb6a73512a128861f4f46317e2d66f03464a
+EBUILD ecasound-2.9.3.ebuild 2393 BLAKE2B 36a63ab78fc859c09dbadf479ec45a871c86ce8c77cd252421c773bef03deaec08c37d3c7efa4ecf4aa481734771b2e1029649e05efb707fa2b126c867245d15 SHA512 693a5d74279f69704ab9cbcd157c760f3d2707e0b43b95fdeaecd946c499fca5209d44db2db551ae86aaa4e85ce9e706b21f1c64daa0aaa1116c76a82ece7998
 MISC metadata.xml 1074 BLAKE2B 9301046a8443aa5ee5db4a2c09f65b1cf24991fafa6920061ab1bd668bf31eb74b6659e5346fe3493dbf154eed47e60a8ae9c936bcdd7f7c5fcdaa0e2a9e0b6f SHA512 81f59c71f4869241fce6ba622a2139502e9a21340aa21057dbd01b3d8dd16e100b55bfa804a2eea712ab9c010112101705349697297a3ea8f2aef37358c20d7e
diff --git a/media-sound/ecasound/ecasound-2.9.3.ebuild b/media-sound/ecasound/ecasound-2.9.3.ebuild
index 7cdadd6983e4..3b3f4545b17f 100644
--- a/media-sound/ecasound/ecasound-2.9.3.ebuild
+++ b/media-sound/ecasound/ecasound-2.9.3.ebuild
@@ -35,6 +35,7 @@ RDEPEND="sys-libs/readline:0=
 	sndfile? ( media-libs/libsndfile:= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
+BDEPEND="sys-apps/ed"
 PATCHES=(
 	"${FILESDIR}"/${P}-ldflags.patch
 	"${FILESDIR}"/${PN}-2.9.1-tinfo.patch
@@ -47,10 +48,9 @@ pkg_setup() {
 src_prepare() {
 	default
 
-#	if use python ; then
-#		sed -i -e "s:\$(ecasoundc_libs):\0 $(python_get_library -l):" \
-#			pyecasound/Makefile.am || die "sed failed"
-#	fi
+	# https://bugs.gentoo.org/787620
+	printf '%s\n' H '/^EXTRACXXFLAGS="-std=c++98"$/s/98/11/' w q |
+		ed -s configure.ac || die "Couldn't patch EXTRACXXFLAGS in configure.ac"
 
 	eautoreconf
 }
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index c8128dacf705..827443168c29 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,3 +1,5 @@
 DIST fluidsynth-2.2.2.tar.gz 1741567 BLAKE2B 78fe02ae37db70e7aa92071aa609ff6f3dc6217827f89091ded1a8e2d30e84f3d7a095e101fcccfe720e9c3445f58e15da588cfcd7063388ab642649536b8fa0 SHA512 208956e367725de4b1faeba7d4125a6a85bb4191ef0354a7087809e93d93b8986cdc30b78c135a743104851d15f3bb09776855fa02a686de0810dd14c97851c3
+DIST fluidsynth-2.2.3.tar.gz 1745344 BLAKE2B 0d08c67532392d32501a71f1e6fac6d55a0a0a607dae914106e1674df0a96869041530f75669193305a091ec40177e2925345df24d75a369c87e738ec1f4eb2e SHA512 67f8da02714350cc0439fbdce763d00cb08d01301a6aaa3e2655e67935048b43e18968c9a52aa64c702b5e30ae2b2b4946f69e8be4af5889fa414c654d4eb13e
 EBUILD fluidsynth-2.2.2.ebuild 3360 BLAKE2B ad1ee9272aa056d67edec8ff2325c028dbea02a563debff1e6e3cdff7896610316033f544e70e7d13b537b48dddcd70717cd9283a285e8b12b6f8ae0e56038d2 SHA512 9b82983139158b67a8470c7531741e7390711e8cc803a113e5dc0068a7a6e23f824cc215c3e3c57472fd0738e3d6dceee57798ff24aed40cf7e545a800b0cea7
+EBUILD fluidsynth-2.2.3.ebuild 3367 BLAKE2B 8126d5f51d31d714c4beca9871255cb273c3fa0137eac9c5943ad9d707a24efd3fa6f9021556e518014912871d8da3cdfb29a7e012e3c362a60e37fccc211633 SHA512 d91b463664bf0c74da652a306add23cac56bbe5184ce36ebf3399b9a4a4e791368504d5e942a952464df83a967f9a796b990197e9f58d2c92994c5d62a4bb2c1
 MISC metadata.xml 431 BLAKE2B f739f538274e2e63b1977673b0766a594db59982ab71d6552d1e841434c4040bb7af29d441b1d9e8ce61385dbdb8e522b5591f6826a4c52f085bf004f9fe8426 SHA512 c8085e7652a504610fb841e302ee380de58a67a16a9b874447c00ee20c2d56119254eed954704e8bd4cf8e574980da2dd2f90baa5c99e59cd534e26245af67bb
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.3.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.3.ebuild
new file mode 100644
index 000000000000..47b4d58442e8
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-2.2.3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib systemd
+
+DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
+HOMEPAGE="https://www.fluidsynth.org"
+SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	alsa? (
+		media-libs/alsa-lib[${MULTILIB_USEDEP}]
+		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	ladspa? (
+		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
+		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
+	)
+	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-Denable-alsa=$(usex alsa)
+		-Denable-aufile=ON
+		-Denable-dbus=$(usex dbus)
+		-Denable-debug=$(usex debug)
+		-Denable-dsound=OFF # Windows
+		-Denable-floats=OFF # loat instead of double for DSP samples
+		-Denable-fpe-check=$(usex debug)
+		-Denable-ipv6=$(usex ipv6)
+		-Denable-jack=$(usex jack)
+		-Denable-ladspa=$(usex ladspa)
+		-Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
+		-Denable-midishare=OFF # http://midishare.sourceforge.net/
+		-Denable-network=$(usex network)
+		-Denable-opensles=OFF
+		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
+		-Denable-oss=$(usex oss)
+		-Denable-libsndfile=$(usex sndfile)
+		-Denable-pkgconfig=ON
+		-Denable-portaudio=$(usex portaudio)
+		-Denable-profiling=$(usex debug)
+		-Denable-pulseaudio=$(usex pulseaudio)
+		-Denable-readline=$(usex readline)
+		-Denable-sdl2=$(usex sdl)
+		-Denable-systemd=$(usex systemd)
+		-Denable-threads=$(usex threads)
+		-Denable-trap-on-fpe=$(usex debug)
+		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
+		-Denable-waveout=OFF # Windows
+		-Denable-winmidi=OFF # Windows
+	)
+
+	if use alsa; then
+		mycmakeargs+=( -Denable-lash=$(usex lash) )
+	else
+		mycmakeargs+=( -Denable-lash=OFF )
+	fi
+
+	if use systemd; then
+		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
+	fi
+
+	cmake-multilib_src_configure
+}
+
+install_systemd_files() {
+	if multilib_is_native_abi; then
+		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
+		insinto /etc
+		doins "${BUILD_DIR}/fluidsynth.conf"
+	fi
+}
+
+multilib_src_test() {
+	eninja check
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	docinto pdf
+	dodoc doc/*.pdf
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+
+	if use systemd; then
+		multilib_foreach_abi install_systemd_files
+
+		elog "When using fluidsynth as a systemd service, make sure"
+		elog "to configure your fluidsynth settings globally in "
+		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
+	fi
+}
diff --git a/media-sound/kmidimon/Manifest b/media-sound/kmidimon/Manifest
index 6ffa004b0f5f..4140e7e42776 100644
--- a/media-sound/kmidimon/Manifest
+++ b/media-sound/kmidimon/Manifest
@@ -1,3 +1,6 @@
+AUX kmidimon-1.1.0-fix-install.patch 446 BLAKE2B 3a1a4633c63dee9334ddd1f8a5b40f8a8427d83193ea65e7296c833f7856544323c47a02684ad90c59906fb63d9dc5f2de008a0b197a4e6325f953461271ad95 SHA512 9a3cdb4586b988a78c9f38fc167475db27cec608bbeca2bf489252a74007bcde241732e9cf4dbe5db709637ffa70e5e43ddb2b51859c0bfde723f420d8c1dae8
 DIST kmidimon-1.0.0.tar.bz2 322397 BLAKE2B 6c70e6b6162fe53fbaf7b7945035cb3974120501504c74c3fc0a0c607b2c38153f72cdefdc5f68b97c02148aefc3cd6e49ec0ea45f8b8f9ee6c11ab9383b813d SHA512 3c69fdc128bf5c0b7ec123b06ce3ef0e2220a04e8e721d8fbfa461dc8392b08250f2d333fc0f6080135107a97cd16736327648c4cb4cca72ea4d43c1007ad744
+DIST kmidimon-1.1.0.tar.bz2 392541 BLAKE2B b4b45eaf0d370c0b0989e7c1a7a30473cb8e252346687a6b3d99a5d3e78a8155893e478d354cadc00b1a7df07a174dbd21ae07fd9a0746f5b7dcdb5786520797 SHA512 6792d2b45e2ee9da777d2f29623453a41532d6f6d93a6e375afd07b4cbcf2eb18f11ab2d9358febbb22925ee7e63912c5bd4714a3804b95971a52a1c0b00a324
 EBUILD kmidimon-1.0.0.ebuild 692 BLAKE2B f4377cebe26ef311506cba8e6b1c58142f0ec4babbe9d849bbada819af45f6aa44cbd0c97ca8261898c52b70bfada6b505dc48edb508ac54757795af20d79669 SHA512 42a8574b2ae3910f11cdc4bf07a0e739270f4998cdd2dabd574c5e73a9c30bcaa1b009e4c44456ba315c6d9aca7f88badd93816eaf345063a9fac35878423a08
+EBUILD kmidimon-1.1.0.ebuild 704 BLAKE2B 0c28d4e8a2115feff95b3fb3483601a3ea4b01e5640de8a922d68aaffd1ff6dbc63438421f5f1d32a91695f5504f65ed963d4544400a5f9a0cd5cddbd089018e SHA512 27f0a3ab0327b75819be82071ea4e9876400a54f02bca775c6b77bd16368d526a2d6ae7174509af5e23a9b8f546cbb69dd155f1b123a1021352c797e907be3ce
 MISC metadata.xml 442 BLAKE2B 20c1a6190737f4d447ab159fa0568f27b731d3472b3a4ec26fc4d3225ec9e82fca014d82ad41fe1c8c6b80e785973d066bf7101078ccccd7efac67d3d992749b SHA512 bf4cb478d26b5e1f49057954f77284b6126c72541925299b71f901559bba3020c25a8ca6e6b9b4ccee966f612c71a6b8554f08e64e97e00c3c09232ded483c09
diff --git a/media-sound/kmidimon/files/kmidimon-1.1.0-fix-install.patch b/media-sound/kmidimon/files/kmidimon-1.1.0-fix-install.patch
new file mode 100644
index 000000000000..8bc48a7d5559
--- /dev/null
+++ b/media-sound/kmidimon/files/kmidimon-1.1.0-fix-install.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2021-09-18 22:32:19.273613410 +0200
++++ b/CMakeLists.txt	2021-09-23 00:07:47.940122305 +0200
+@@ -92,8 +92,6 @@
+ 
+ install( FILES net.sourceforge.kmidimon.desktop
+          DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
+-install( FILES net.sourceforge.kmidimon.appdata.xml
+-         DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo )
+ 
+ install( FILES standards.ins
+          DESTINATION ${CMAKE_INSTALL_DATADIR}/kmidimon )
diff --git a/media-sound/kmidimon/kmidimon-1.1.0.ebuild b/media-sound/kmidimon/kmidimon-1.1.0.ebuild
new file mode 100644
index 000000000000..ad3369ffd0dc
--- /dev/null
+++ b/media-sound/kmidimon/kmidimon-1.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="MIDI monitor for ALSA sequencer"
+HOMEPAGE="https://kmidimon.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	>=media-sound/drumstick-2.4.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	dev-qt/linguist-tools:5
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-install.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 09cbd476203e..dea201a88632 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -2,6 +2,6 @@ DIST mpg123-1.28.1.tar.bz2 1066558 BLAKE2B 4516ed6cafda21aaaf132266b91ae235ca0b9
 DIST mpg123-1.28.2.tar.bz2 1065867 BLAKE2B 2fc585598e49334b608c2a8487b40b599dc1a57afc53249975a339dbc381b968cc099d4274fb74872d3c4c54d1a6ee1858c4b00c78feb93809c823cc56398661 SHA512 45ac11c5997d13f80917e135a40d2fb4448703dad56271dfe8ce7c8dea339cbac7727ec121779040bd7a07fc4ea79086860ea4a8ec879eda3bdcbf7d57348cda
 DIST mpg123-1.29.0.tar.bz2 1068523 BLAKE2B f044dcdef62156cc34a4709d6ead71042e936d77a86386563862d54d7b18635dd378d4dcac1358228c8275d7bcef894f17432cac0519373d11d4c5f18e346728 SHA512 4261a086395f118f6723d8a3757ebcf5244359be07af634d8bf802e48524978a0974f8b17b423bbf38d262c82ac9e31e0fd5d07a735f63f5e33f58d82dc5fdaf
 EBUILD mpg123-1.28.1-r1.ebuild 2985 BLAKE2B f8336768a984ea5833a8367c5117634c8cb2df08a26dd15347198ccbc8a6ddb7af7823d2159aad3840a2c0a0f0c38a917ace673985c98bdcede043defde6066a SHA512 349beec6a8e9d9c7a2f4762760da91fc4683d956098cf7bb9b230aab601eeb1754f428fbcb141e2cb66f0c834651ad2b6ca64ceecee9b2200f8f449b6912306f
-EBUILD mpg123-1.28.2-r1.ebuild 2999 BLAKE2B 49a074e953c393d80541c36a02e2ca1340937b4d844650177316b76662a2b4a47c775ff119f32ad0c65605f1daf554c6e46c985bbf83070961064479c9fea15e SHA512 359623d74681fd7401f131d63094219cb2a1e42fa2fa1a27692c48c432e1929809c5b10f9b9a6d3a97983de05ae4410f176368d39e9c269a10eac264d81447ee
+EBUILD mpg123-1.28.2-r1.ebuild 2994 BLAKE2B bd492a7b8daae68de10d10c23aadceb89c135bbb8c4d7f1d039b4aacc4ca5174cae5f9034ee2a1036c44fb0f46dec2540151eb056b1124971470527988b1e15f SHA512 2280c59a37c5ff30fac9a0c15fae050032cc5a2bcc423c9a2944d44f0b41024e3bd12559110dd33984d8a1954df3e13ad9aa3d4cca4b9b9e0d7e3a0ad5c91e46
 EBUILD mpg123-1.29.0.ebuild 2999 BLAKE2B 49a074e953c393d80541c36a02e2ca1340937b4d844650177316b76662a2b4a47c775ff119f32ad0c65605f1daf554c6e46c985bbf83070961064479c9fea15e SHA512 359623d74681fd7401f131d63094219cb2a1e42fa2fa1a27692c48c432e1929809c5b10f9b9a6d3a97983de05ae4410f176368d39e9c269a10eac264d81447ee
 MISC metadata.xml 526 BLAKE2B 42eed8f068420cefea4cf3e75a880889be7abe182feec2aa95e0e7f550cf68eb2582460e43500d24b7ad189adb3e0e135da1079efb405957fe3dfc6b93a91ece SHA512 11e572b6ec77d6c971766e666db84ee4b605479c3f89ba639177de7fb109a8d9e38d1f5034a52554736e6bd0915aae84830169ba3580f6d64794adc4c8cb9d0e
diff --git a/media-sound/mpg123/mpg123-1.28.2-r1.ebuild b/media-sound/mpg123/mpg123-1.28.2-r1.ebuild
index 29a2b1f3de75..b4af182dace6 100644
--- a/media-sound/mpg123/mpg123-1.28.2-r1.ebuild
+++ b/media-sound/mpg123/mpg123-1.28.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index 875250651a24..09f95479e5b9 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,5 +1,5 @@
 DIST pavucontrol-4.0.tar.xz 165216 BLAKE2B 5a556dbd8132d811b7704b377f4a62ad606378e235f9892a7951e1f981917e4196d17e85350ef757a956e6fbc448f0f6cd600b5656e12e2152b71d10b5e64e2a SHA512 eaea303c46ddb36733aed88c8a603907d70e4539c345d8acec23527d3306ee21ae630c0508bdab6ae52cbc2f1eb8fc4b212abda72876dc92e83fba7ceb623be2
 DIST pavucontrol-5.0.tar.xz 194248 BLAKE2B 9e6b9b7d94be51a4ad8b5310e031c4fed0f5299e67c770c9a573c0647edf27345014fb6504892fad29b9b5e79ce43ed312217dbed8e2b31b805f291531062903 SHA512 5673d783c2c819a68b49025c051bedd39f4caba446a479797b06569e24a96acc0924ba680d2416baff8c3211cfc7c94760d503900207fbe7c89c5cb2adaebec1
 EBUILD pavucontrol-4.0.ebuild 858 BLAKE2B e613591d317859e84c8330efa3adaa311b005153044e4e588c9131ded0fac49a0e7ed6212d77a214cc8e9b5419e9ac96359ead9cbf61bde86c7c8c96ef656107 SHA512 3edc52431b727d80603cfc51704d57f4cec1e12fdbeeaa56729d64cdaf0bf2edce65028f9c0d929f7c0cfa64541fd5a706fb97fcc65cdc286835bffad2bdf956
-EBUILD pavucontrol-5.0-r1.ebuild 829 BLAKE2B 25f09546b23c8847dc832d18bf202fa466ddd75d45cbf6c31c406f41bfb2b2671967a8cc344dd570e51d9fc37f1d4e9b54a369b15954dca5d7105fffb4d6ae34 SHA512 ed8fab2e2d3eb88051e20f5b86f4325837fdbbc1aabd5db69cd261bac038f0e25465c51fd5f99b98c05106c44b588b14deedddda5791c1a6b137b6cbf60f51c7
+EBUILD pavucontrol-5.0-r1.ebuild 836 BLAKE2B bfb1bcf5f301e83df97d1942280500e679af41f0916e349913f0690040fd6f150c6707d477c21d04b51dbb751c89d0418dd494a7966e763a27b7fe828b8d10eb SHA512 c835444b0adb89b081aef99e174812b4745c0d5ddcd83e6c69ac7bf599375f420e0ef2a93818d9fcd0bb750bf7b9bae6a074bf0209823a842b0296fc027028c1
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild b/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
index e0559cf0d304..e34a65496b9e 100644
--- a/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-sound/pulseaudio-daemon/Manifest b/media-sound/pulseaudio-daemon/Manifest
new file mode 100644
index 000000000000..38b1b175f308
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/Manifest
@@ -0,0 +1,9 @@
+AUX 15.0-daemon-only.patch 9282 BLAKE2B 9a73eb993c5ca018ac59ce18544f8273fa9c96a3a1b97fbe6744bce764368bce8873ca0145c5c227a94ed17083d1200e70ae016fbdde1b7e8bf1ac632cf1073c SHA512 35b093f7d5dc7603a34584e66579af0519d1dceea960812878676f5c0ab4e7e08f6b9923a195690313a7c9a0a759e91c6d08b087f0d4e99dac6b4619eab4e4fe
+AUX pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch 1045 BLAKE2B f654fb6fefff1eb289b133ca83313ec2c0ba77f63d86134d7ec31616f238b66553ab8817614946bfc5fb0a807edc055f837091ee028fe5f9fc2496e89fefbe6d SHA512 b8ca56b37fd120bd7ba83f7fac32d7908a426588cca9b286189783cb464fb09ca34ef8dc367cc1470b042b5c3a210de3cff3e07a7c93fd7a85c01fbf5ffb56f0
+AUX pulseaudio.conf.d 151 BLAKE2B 99b185b9353259f37f3396c6f2bb56b80cac0159c9c5d06af4b298ad71d9c577dd6b3f0d9097fc95184b14193d0d55252987465ebd93bd0005849a68ce9b428d SHA512 f97ed431e371e43d297b099952bf1e897b243a822183524b8e3ea17e888c08590bb3793e195bc22e3254eae7f2e1fa00204a752638746c4dde825a423f08c24b
+AUX pulseaudio.init.d-5 2224 BLAKE2B d7710b77b209391016e9f84b574cdf70636904d7f54caf9297357ebee97e8ae10c54119521ecad99fbef5f1ad341128b06816f8c733faa29d9c44fa8c435008b SHA512 a11d02fd1c6672a7f022e6ef3e3ad8e3a7f2bf50257c38573db0823415c990021a7bf29b1e194d3d9c8a59464673958604086ef519313a4e3a6bd79071397f29
+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 9719 BLAKE2B 9d8c5bd0647218f6c81162e8627af20b8b8adc1c7106ad40f2bb288449aa03bb4c52f1911d7b8e977118afdcf748216d9759bbcfd1f1f00281db866e36360621 SHA512 5667265fb99022b342340f5e407bc6833c86df20f41f739be746fb36b74680c9e20fad2101499d844611ede393f56481fdcf8d361feb8d3404cb293a6ca25926
+MISC metadata.xml 2745 BLAKE2B b8ff0973c3b5bdee1a05c598a7070e67ad385bfb32f51acaf80081ce9607d2bfb6a99233be9df31409dbac6a85a48f32f763f71be3ab960090ba104a613094a0 SHA512 42872d8b934e8216c30c525072977df9abc9e9487ba7de8d4a1df9343236ebb735bcb89109cd97cc0e7ddf0261370aa605aee8cdb8f5b457e26904b023a1990c
diff --git a/media-sound/pulseaudio-daemon/files/15.0-daemon-only.patch b/media-sound/pulseaudio-daemon/files/15.0-daemon-only.patch
new file mode 100644
index 000000000000..4d99c1ebe639
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/15.0-daemon-only.patch
@@ -0,0 +1,298 @@
+From f4f28cc436a506d1dfbd514968b2976ab31cdf5f Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <mart@leio.tech>
+Date: Fri, 24 Sep 2021 15:19:05 +0300
+Subject: [PATCH] build-sys: meson: Allow building the daemon only
+
+---
+ man/meson.build                   |  2 ++
+ meson.build                       | 23 ++++++++++++++++++++---
+ meson_options.txt                 |  3 +++
+ po/meson.build                    |  3 ---
+ shell-completion/bash/meson.build |  2 ++
+ src/daemon/meson.build            |  4 ++--
+ src/meson.build                   | 11 +++++++++++
+ src/modules/gsettings/meson.build |  3 +--
+ src/tests/meson.build             |  9 +++++++--
+ src/utils/meson.build             | 10 ++++++----
+ 10 files changed, 54 insertions(+), 16 deletions(-)
+
+diff --git a/man/meson.build b/man/meson.build
+index 31c581a8f..c12ad5e6a 100644
+--- a/man/meson.build
++++ b/man/meson.build
+@@ -14,6 +14,7 @@ if get_option('daemon')
+   ]
+ endif
+ 
++if not get_option('daemon-only')
+ manpages += [
+   ['pacat', '1', ['paplay', 'parec', 'parecord', 'pamon']],
+   ['pactl', '1'],
+@@ -31,6 +32,7 @@ if x11_dep.found()
+     ['pax11publish', '1'],
+   ]
+ endif
++endif
+ 
+ # FIXME: Add esdcompat if HAVE_ESOUND
+ #manpages += ['esdcompat', '1'],
+diff --git a/meson.build b/meson.build
+index 63ed62342..420cc6fac 100644
+--- a/meson.build
++++ b/meson.build
+@@ -53,6 +53,8 @@ libpulse_mainloop_glib_version = '@0@.@1@.@2@'.format(
+   libpulse_mainloop_glib_version_info[1],
+ )
+ 
++i18n = import('i18n')
++
+ # Paths
+ 
+ prefix = get_option('prefix')
+@@ -68,6 +70,7 @@ localedir = join_paths(prefix, get_option('localedir'))
+ localstatedir = join_paths(prefix, get_option('localstatedir'))
+ sysconfdir = join_paths(prefix, get_option('sysconfdir'))
+ privlibdir = join_paths(libdir, 'pulseaudio')
++po_dir = join_paths(meson.current_source_dir(), 'po')
+ 
+ if host_machine.system() == 'windows'
+   # Windows only supports loading libraries from the same dir as the executable
+@@ -796,20 +799,28 @@ check_dep = dependency('check', version : '>= 0.9.10', required : get_option('te
+ if get_option('doxygen')
+   subdir('doxygen')
+ endif
+-subdir('po')
++if not get_option('daemon-only')
++  subdir('po')
++endif
+ if get_option('man')
+   subdir('man')
+ endif
+ subdir('shell-completion/bash')
+-subdir('shell-completion/zsh')
++if not get_option('daemon-only')
++  subdir('shell-completion/zsh')
++endif
+ subdir('src')
+-subdir('vala')
++if not get_option('daemon-only')
++ subdir('vala')
++endif
+ 
+ # Now generate config.h from everything above
+ configure_file(output : 'config.h', configuration : cdata)
+ 
+ # pkg-config files
+ 
++if not get_option('daemon-only')
++
+ pc_cdata = configuration_data()
+ 
+ pc_cdata.set('prefix', prefix)
+@@ -842,8 +853,12 @@ foreach file : pc_files
+     install_dir : pkgconfigdir)
+ endforeach
+ 
++endif # !daemon-only
++
+ # CMake files
+ 
++if not get_option('daemon-only')
++
+ m4 = find_program('m4', required: true)
+ 
+ cmakedir = join_paths(libdir, 'cmake', 'PulseAudio')
+@@ -872,6 +887,8 @@ configure_file(
+   install_dir : cmakedir,
+ )
+ 
++endif # !daemon-only
++
+ ############################################################
+ 
+ # Final summary
+diff --git a/meson_options.txt b/meson_options.txt
+index bb41a42a7..62828ac5c 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,6 +1,9 @@
+ option('daemon',
+        type : 'boolean', value : true,
+        description : 'Enable building and installation of pulseaudio daemon and supporting configuration files')
++option('daemon-only',
++       type : 'boolean', value : false,
++       description : 'Build and install only the pulseaudio daemon and supporting configuration files, relying on a system installation of libpulse')
+ option('doxygen',
+        type : 'boolean', value : true,
+        description : 'Enable building and installation of documentation generated with doxygen')
+diff --git a/po/meson.build b/po/meson.build
+index 34278db47..33429373c 100644
+--- a/po/meson.build
++++ b/po/meson.build
+@@ -1,4 +1,3 @@
+-i18n = import('i18n')
+ i18n.gettext(
+   meson.project_name(),
+   preset: 'glib',
+@@ -7,5 +6,3 @@ i18n.gettext(
+   args: ['--msgid-bugs-address=https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/new',
+          '--width=90'],
+ )
+-
+-po_dir = meson.current_source_dir()
+diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build
+index 3ba5cb16f..83d90b94b 100644
+--- a/shell-completion/bash/meson.build
++++ b/shell-completion/bash/meson.build
+@@ -8,6 +8,7 @@ if bashcompletiondir != 'no'
+     ]
+   endif
+ 
++  if not get_option('daemon-only')
+   aliases += [
+     'pacat',
+     'pactl',
+@@ -16,6 +17,7 @@ if bashcompletiondir != 'no'
+     'parec',
+     'parecord',
+   ]
++  endif
+ 
+   install_data('pulseaudio', install_dir : bashcompletiondir)
+ 
+diff --git a/src/daemon/meson.build b/src/daemon/meson.build
+index 262e193b2..e8f70a453 100644
+--- a/src/daemon/meson.build
++++ b/src/daemon/meson.build
+@@ -30,8 +30,8 @@ executable('pulseaudio',
+   install_rpath : privlibdir,
+   include_directories : [configinc, topinc],
+   link_args : ['-ffast-math'],
+-  link_with : [libpulsecore, libpulsecommon, libpulse],
+-  dependencies : [ltdl_dep, cap_dep, dbus_dep, libsystemd_dep, dl_dep, libintl_dep, platform_dep, platform_socket_dep],
++  link_with : [libpulsecore],
++  dependencies : [ltdl_dep, cap_dep, dbus_dep, libsystemd_dep, dl_dep, libintl_dep, platform_dep, platform_socket_dep, libpulsecommon_dep, libpulse_dep],
+   c_args : pa_c_args,
+ )
+ 
+diff --git a/src/meson.build b/src/meson.build
+index e2860811b..a56667271 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -188,6 +188,15 @@ else
+ endif
+ # FIXME: Do SIMD things
+ 
++if get_option('daemon-only')
++  libpulsecommon_dep = cc.find_library('pulsecommon-' + pa_version_major_minor, dirs : privlibdir, required : true)
++  libpulse_dep = dependency('libpulse', required : true)
++  libpulse_simple_dep = dependency('libpulse-simple', required : true)
++  if glib_dep.found()
++    libpulse_mainloop_glib_dep = dependency('libpulse-mainloop-glib', required : true)
++  endif
++else
++
+ libpulsecommon = shared_library('pulsecommon-' + pa_version_major_minor,
+   libpulsecommon_sources,
+   libpulsecommon_headers,
+@@ -207,6 +216,8 @@ libpulsecommon = shared_library('pulsecommon-' + pa_version_major_minor,
+ libpulsecommon_dep = declare_dependency(link_with: libpulsecommon)
+ 
+ subdir('pulse')
++endif
++
+ if get_option('daemon')
+   subdir('pulsecore')
+   subdir('daemon')
+diff --git a/src/modules/gsettings/meson.build b/src/modules/gsettings/meson.build
+index 68a72c3ff..9604699e7 100644
+--- a/src/modules/gsettings/meson.build
++++ b/src/modules/gsettings/meson.build
+@@ -8,8 +8,7 @@ gsettings_helper = executable('gsettings-helper',
+   gsettings_helper_sources,
+   c_args : pa_c_args,
+   include_directories : [configinc, topinc],
+-  link_with : [libpulsecommon, libpulse],
+-  dependencies : [gio_dep],
++  dependencies : [gio_dep, libpulsecommon_dep, libpulse_dep],
+   install_dir : pulselibexecdir,
+   install_rpath : privlibdir,
+   install : true,
+diff --git a/src/tests/meson.build b/src/tests/meson.build
+index acd301037..56d71299f 100644
+--- a/src/tests/meson.build
++++ b/src/tests/meson.build
+@@ -20,8 +20,6 @@ default_tests += [
+     [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
+   [ 'json-test', 'json-test.c',
+     [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
+-  [ 'mainloop-test', 'mainloop-test.c',
+-    [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
+   [ 'proplist-test', 'proplist-test.c',
+     [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
+   [ 'thread-mainloop-test', 'thread-mainloop-test.c',
+@@ -32,6 +30,13 @@ default_tests += [
+     [ check_dep, libm_dep, libpulse_dep, libpulsecommon_dep ] ],
+ ]
+ 
++if not get_option('daemon-only')
++  default_tests += [
++    [ 'mainloop-test', 'mainloop-test.c',
++      [ check_dep, libpulse_dep, libpulsecommon_dep ] ],
++  ]
++endif
++
+ if get_option('daemon')
+   default_tests += [
+     [ 'asyncmsgq-test', 'asyncmsgq-test.c',
+diff --git a/src/utils/meson.build b/src/utils/meson.build
+index c9635fdb6..7ed6e738f 100644
+--- a/src/utils/meson.build
++++ b/src/utils/meson.build
+@@ -1,3 +1,4 @@
++if not get_option('daemon-only')
+ pacat_sources = [
+   'pacat.c',
+ ]
+@@ -41,6 +42,7 @@ executable('pactl',
+   dependencies : [sndfile_dep, libintl_dep],
+   c_args : pa_c_args,
+ )
++endif
+ 
+ if get_option('daemon')
+   if host_machine.system() != 'windows'
+@@ -53,8 +55,7 @@ if get_option('daemon')
+       install: true,
+       install_rpath : privlibdir,
+       include_directories : [configinc, topinc],
+-      link_with : [libpulsecommon, libpulse],
+-      dependencies: [libintl_dep],
++      dependencies: [libintl_dep, libpulsecommon_dep, libpulse_dep],
+       c_args : pa_c_args,
+     )
+ 
+@@ -67,13 +68,13 @@ if get_option('daemon')
+       install: true,
+       install_rpath : privlibdir,
+       include_directories : [configinc, topinc],
+-      link_with : [libpulsecommon, libpulse],
+-      dependencies: [libintl_dep],
++      dependencies: [libintl_dep, libpulsecommon_dep, libpulse_dep],
+       c_args : pa_c_args,
+     )
+   endif
+ endif
+ 
++if not get_option('daemon-only')
+ if x11_dep.found()
+   pax11publish_sources = [
+     'pax11publish.c',
+@@ -121,3 +122,4 @@ if dbus_dep.found() and fftw_dep.found()
+ endif
+ 
+ install_data('pa-info', install_dir : bindir)
++endif
+-- 
+2.32.0
+
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
new file mode 100644
index 000000000000..f3df62031d34
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/806052
+
+commit 42af3ee08381faa5807fde68d4c8ec0d7ad5e9a5
+Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+Date:   Tue Aug 3 09:43:32 2021 +0300
+
+    build-sys: meson: Require xice, xsm and xtst for daemon only
+    
+    Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/613>
+
+--- a/meson.build
++++ b/meson.build
+@@ -681,9 +681,9 @@ endif
+ x11_dep = dependency('x11-xcb', required : get_option('x11'))
+ if x11_dep.found()
+   xcb_dep  = dependency('xcb',  required : true, version : '>= 1.6')
+-  ice_dep  = dependency('ice',  required : true)
+-  sm_dep   = dependency('sm',   required : true)
+-  xtst_dep = dependency('xtst', required : true)
++  ice_dep  = dependency('ice',  required : get_option('daemon'))
++  sm_dep   = dependency('sm',   required : get_option('daemon'))
++  xtst_dep = dependency('xtst', required : get_option('daemon'))
+   cdata.set('HAVE_X11', 1)
+   if cc.has_function('XSetIOErrorExitHandler', dependencies: x11_dep)
+     cdata.set('HAVE_XSETIOERROREXITHANDLER', 1)
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio.conf.d b/media-sound/pulseaudio-daemon/files/pulseaudio.conf.d
new file mode 100644
index 000000000000..9e7245344a57
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio.conf.d
@@ -0,0 +1,6 @@
+# Config file for /etc/init.d/pulseaudio
+
+# For more see "pulseaudio -h".
+
+# Startup options
+PA_OPTS="--log-target=syslog --disallow-module-loading=1"
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio.init.d-5 b/media-sound/pulseaudio-daemon/files/pulseaudio.init.d-5
new file mode 100644
index 000000000000..a14f5e74aa53
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio.init.d-5
@@ -0,0 +1,80 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount
+	use net
+
+	local script="/etc/pulse/system.pa"
+
+	for opt in ${PA_OPTS}; do
+		case "$opt" in
+			--file=*)	script="${opt#*=}" ;;
+			-F*)		script="${opt#-F}" ;;
+		esac
+	done
+
+	config "$script"
+
+	local needs="$(get_options need)"
+	if [ -n "${needs}" ]; then
+		need ${needs}
+		return
+	fi
+
+	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-console-kit' "$script"; then
+	    needs="${needs} consolekit"
+	fi
+
+#ifdef UDEV
+	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-udev-detect' "$script"; then
+	    needs="${needs} udev"
+	fi
+#endif
+
+#ifdef AVAHI
+	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-zeroconf-publish' "$script"; then
+	    needs="${needs} avahi-daemon"
+	fi
+#endif
+
+#ifdef BLUETOOTH
+	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-bt-proximity' "$script"; then
+	    needs="${needs} bluetooth"
+	fi
+#endif
+
+#ifdef ALSA
+	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-alsa-(sink|source)' "$script" || 
+	    egrep -q '^[[:space:]]*load-module[[:space:]]+module-(udev-)?detect' "$script" ||
+	    egrep -q '^[[:space:]]*add-autoload-source[[:space:]]+(input|output)[[:space:]]+module-alsa-(sink|source)' "$script"; then
+	    needs="${needs} alsasound"
+	fi
+#endif
+
+	need "${needs}"
+	save_options need "${needs}"
+}
+
+start() {
+	if [ -z "${PULSEAUDIO_SHOULD_NOT_GO_SYSTEMWIDE}" ]; then
+		eerror "Please don't use system wide PulseAudio unless you read the"
+		eerror "documentation available at http://www.pulseaudio.org/wiki/WhatIsWrongWithSystemMode"
+		eerror ""
+		eerror "When you're done, please set the variable PULSEAUDIO_SHOULD_NOT_GO_SYSTEMWIDE in"
+		eerror "/etc/conf.d/pulseaudio . Please remember that upstream does not support this mode"
+		eerror "when used for standard desktop configurations."
+		return 1
+	fi
+	ebegin "Starting pulseaudio"
+	PA_ALL_OPTS="${PA_OPTS} --fail=1 --daemonize=1 --system"
+	start-stop-daemon --start --exec /usr/bin/pulseaudio -- ${PA_ALL_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping pulseaudio"
+	start-stop-daemon --stop --quiet --exec /usr/bin/pulseaudio --pidfile /var/run/pulse/pid
+	eend $?
+}
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio.service b/media-sound/pulseaudio-daemon/files/pulseaudio.service
new file mode 100644
index 000000000000..c5f0d5799929
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=System wide PulseAudio instance
+After=syslog.target network.target alsasound.service
+
+[Service]
+Restart=always
+ExecStart=/usr/bin/pulseaudio --system --log-target=syslog
+
+[Install]
+WantedBy=multi-user.target
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio.tmpfiles b/media-sound/pulseaudio-daemon/files/pulseaudio.tmpfiles
new file mode 100644
index 000000000000..88374e35574b
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/files/pulseaudio.tmpfiles
@@ -0,0 +1 @@
+d /var/run/pulse 0755 pulse audio -
diff --git a/media-sound/pulseaudio-daemon/metadata.xml b/media-sound/pulseaudio-daemon/metadata.xml
new file mode 100644
index 000000000000..9808d54c65cf
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/metadata.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="X">
+      Build the X11 publish module to export PulseAudio information
+      through X11 protocol for clients to make use. Don't enable this
+      flag if you want to use a system wide instance. If unsure, enable
+      this flag.
+    </flag>
+    <flag name="alsa-plugin">
+      Request installing <pkg>media-plugins/alsa-plugins</pkg> with
+      PulseAudio plugin enabled. This ensures that clients supporting
+      ALSA only will use PulseAudio.
+    </flag>
+    <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for giving each session a PA client</flag>
+    <flag name="oss">
+      Enable OSS sink/source (output/input). Deprecated, upstream does
+      not support this on systems where other sink/source systems are
+      available (i.e.: Linux). The padsp wrapper is now always build
+      if the system supports OSS at all.
+    </flag>
+    <flag name="glib">
+      Build the GSettings PA module.
+    </flag>
+    <flag name="system-wide">
+      Allow preparation and installation of the system-wide init
+      script for PulseAudio. Since this support is only supported for
+      embedded situations, do not enable without reading the upstream
+      instructions at
+      https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ .
+    </flag>
+    <flag name="asyncns">Use libasyncns for asynchronous name resolution.</flag>
+    <flag name="equalizer">
+      Enable the equalizer module (requires <pkg>sci-libs/fftw</pkg>).
+    </flag>
+    <flag name="ssl">
+      Use <pkg>dev-libs/openssl</pkg> to provide support for RAOP
+      (AirPort) streaming.
+    </flag>
+    <flag name="gdbm">
+      Use <pkg>sys-libs/gdbm</pkg> to store PulseAudio
+      databases. Recommended for desktop usage. This flag causes the
+      whole package to be licensed under GPL-2 or later.
+    </flag>
+    <flag name="webrtc-aec">
+      Uses the webrtc.org AudioProcessing library for enhancing VoIP calls
+      greatly in applications that support it by performing acoustic echo
+      cancellation, analog gain control, noise suppression and other processing.
+    </flag>
+    <flag name="systemd">
+      Build with <pkg>sys-apps/systemd</pkg> support to replace standalone
+      ConsoleKit.
+    </flag>
+    <flag name="native-headset">
+      Build with native HSP backend for bluez 5.
+    </flag>
+    <flag name="ofono-headset">
+      Build with oFono HFP backend for bluez 5, requires <pkg>net-misc/ofono</pkg>.
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-15.0.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-15.0.ebuild
new file mode 100644
index 000000000000..3d1ba6413c14
--- /dev/null
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-15.0.ebuild
@@ -0,0 +1,320 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PV="${PV/_pre*}"
+MY_P="pulseaudio-${MY_PV}"
+
+inherit bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
+else
+	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+
+SLOT="0"
+
+# +alsa-plugin as discussed in bug #519530
+# TODO: Deal with bluez5-gstreamer - requires ldacenc and rtpldacpay gstreamer elements
+# TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec
+# NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file
+IUSE="+alsa +alsa-plugin +asyncns bluetooth dbus elogind equalizer +gdbm gstreamer +glib gtk ipv6 jack lirc
+native-headset ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf"
+
+RESTRICT="!test? ( test )"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+# Basically all IUSE are either ${MULTILIB_USEDEP} for client libs or they belong under !daemon ()
+# We duplicate alsa-plugin, {native,ofono}-headset under daemon to let users deal with them at once
+REQUIRED_USE="
+	alsa-plugin? ( alsa )
+	bluetooth? ( dbus )
+	?? ( elogind systemd )
+	equalizer? ( dbus )
+	native-headset? ( bluetooth )
+	ofono-headset? ( bluetooth )
+	udev? ( || ( alsa oss ) )
+	zeroconf? ( dbus )
+"
+
+# NOTE:
+# - libpcre needed in some cases, bug #472228
+# - media-libs/speexdsp is providing echo canceller implementation and used in resampler
+# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too
+COMMON_DEPEND="
+	>=media-libs/libpulse-${PV}[glib?,systemd?]
+	dev-libs/libatomic_ops
+	>=media-libs/libsndfile-1.0.20
+	>=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 )
+	asyncns? ( >=net-libs/libasyncns-0.1 )
+	bluetooth? (
+		>=net-wireless/bluez-5
+		media-libs/sbc
+	)
+	dev-libs/libltdl
+	sys-kernel/linux-headers
+	>=sys-libs/libcap-2.22-r2
+	dbus? ( >=sys-apps/dbus-1.4.12 )
+	elogind? ( sys-auth/elogind )
+	equalizer? (
+		sci-libs/fftw:3.0
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	glib? ( >=dev-libs/glib-2.28.0:2 )
+	gstreamer? (
+		media-libs/gst-plugins-base
+		>=media-libs/gstreamer-1.14
+	)
+	gtk? ( x11-libs/gtk+:3 )
+	jack? ( virtual/jack )
+	lirc? ( app-misc/lirc )
+	ofono-headset? ( >=net-misc/ofono-1.13 )
+	orc? ( >=dev-lang/orc-0.4.15 )
+	selinux? ( sec-policy/selinux-pulseaudio )
+	sox? ( >=media-libs/soxr-0.1.1 )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	udev? ( >=virtual/udev-143[hwdb(+)] )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
+	X? (
+		>=x11-libs/libxcb-1.6
+		x11-libs/libICE
+		x11-libs/libSM
+		>=x11-libs/libX11-1.4.0
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+	!<media-sound/pulseaudio-15.0-r100
+"
+
+# pulseaudio ships a bundle xmltoman, which uses XML::Parser
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( >=dev-libs/check-0.9.10 )
+	X? ( x11-base/xorg-proto )
+"
+
+# alsa-utils dep is for the alsasound init.d script (see bug 155707); TODO: read it
+# NOTE: Only system-wide needs acct-group/audio unless elogind/systemd is not used
+RDEPEND="
+	${COMMON_DEPEND}
+	system-wide? (
+		alsa? ( media-sound/alsa-utils )
+		acct-user/pulse
+		acct-group/audio
+		acct-group/pulse-access
+	)
+"
+
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
+"
+
+BDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
+	sys-devel/gettext
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+	orc? ( >=dev-lang/orc-0.4.15 )
+	system-wide? ( dev-util/unifdef )
+"
+
+DOCS=( NEWS README )
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/pulseaudio-15.0-xice-xsm-xtst-daemon-only.patch
+	"${FILESDIR}"/${PV}-daemon-only.patch
+)
+
+src_prepare() {
+	default
+
+	gnome2_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		--localstatedir="${EPREFIX}"/var
+
+		-Ddaemon=true
+		-Ddaemon-only=true
+		-Ddoxygen=false
+		-Dgcov=false
+		-Dman=true
+		# tests involve random modules, so just do them for the native # TODO: tests should run always
+		$(meson_use test tests)
+		-Ddatabase=$(usex gdbm gdbm simple) # tdb is also an option but no one cares about it
+		-Dstream-restore-clear-old-devices=true
+		-Drunning-from-build-tree=false
+
+		# Paths
+		-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/pulseaudio/modules" # Was $(get_libdir)/${P}
+		-Dsystemduserunitdir=$(systemd_get_userunitdir)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
+
+		# Optional features
+		$(meson_feature alsa)
+		$(meson_feature asyncns)
+		$(meson_feature zeroconf avahi)
+		$(meson_feature bluetooth bluez5)
+		-Dbluez5-gstreamer=disabled # no ldacenc/rtpldacpay gst elements packaged yet
+		$(meson_use native-headset bluez5-native-headset)
+		$(meson_use ofono-headset bluez5-ofono-headset)
+		$(meson_feature dbus)
+		$(meson_feature elogind)
+		$(meson_feature equalizer fftw)
+		$(meson_feature glib) # WARNING: toggling this likely changes ABI
+		$(meson_feature glib gsettings) # Supposedly correct?
+		$(meson_feature gstreamer)
+		$(meson_feature gtk)
+		-Dhal-compat=true # Consider disabling on next revbump
+		$(meson_use ipv6)
+		$(meson_feature jack)
+		$(meson_feature lirc)
+		$(meson_feature ssl openssl)
+		$(meson_feature orc)
+		$(meson_feature oss oss-output)
+		-Dsamplerate=disabled # Matches upstream
+		$(meson_feature sox soxr)
+		-Dspeex=enabled
+		$(meson_feature systemd)
+		$(meson_feature tcpd tcpwrap) # TODO: This should technically be enabled for 32bit too, but at runtime it probably is never used without daemon?
+		$(meson_feature udev)
+		-Dvalgrind=auto
+		$(meson_feature X x11)
+
+		# Echo cancellation
+		-Dadrian-aec=false # Not packaged?
+		$(meson_feature webrtc-aec)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Installed by media-libs/libpulse
+	rm "${D}/$(get_bashcompdir)"/pulseaudio || die
+
+	if use system-wide; then
+		newconfd "${FILESDIR}"/pulseaudio.conf.d pulseaudio
+
+		use_define() {
+			local define=${2:-$(echo ${1} | tr '[:lower:]' '[:upper:]')}
+
+			use "${1}" && echo "-D${define}" || echo "-U${define}"
+		}
+
+		unifdef -x 1 \
+			$(use_define zeroconf AVAHI) \
+			$(use_define alsa) \
+			$(use_define bluetooth) \
+			$(use_define udev) \
+			"${FILESDIR}"/pulseaudio.init.d-5 \
+			> "${T}"/pulseaudio \
+			|| die
+
+		doinitd "${T}"/pulseaudio
+
+		systemd_dounit "${FILESDIR}"/pulseaudio.service
+
+		# We need /var/run/pulse, bug 442852
+		newtmpfiles "${FILESDIR}"/pulseaudio.tmpfiles pulseaudio.conf
+	else
+		# Prevent warnings when system-wide is not used, bug 447694
+		if use dbus; then
+			rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
+		fi
+	fi
+
+	if use zeroconf; then
+		sed -i \
+			-e '/module-zeroconf-publish/s:^#::' \
+			"${ED}/etc/pulse/default.pa" \
+			|| die
+	fi
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+
+	if use system-wide; then
+		tmpfiles_process "pulseaudio.conf"
+
+		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
+		elog "This mode should only be used on headless servers, embedded systems,"
+		elog "or thin clients. It will usually require manual configuration, and is"
+		elog "incompatible with many expected pulseaudio features."
+		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
+		elog ""
+		elog "For more information, see"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
+		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
+		elog ""
+	fi
+
+	if use equalizer; then
+		elog "You will need to load some extra modules to make qpaeq work."
+		elog "You can do that by adding the following two lines in"
+		elog "/etc/pulse/default.pa and restarting pulseaudio:"
+		elog "load-module module-equalizer-sink"
+		elog "load-module module-dbus-protocol"
+		elog ""
+	fi
+
+	if use native-headset && use ofono-headset; then
+		elog "You have enabled both native and ofono headset profiles. The runtime decision"
+		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
+		elog ""
+	fi
+
+	if use systemd; then
+		elog "It's recommended to start pulseaudio via its systemd user units:"
+		elog ""
+		elog "  systemctl --user enable pulseaudio.service pulseaudio.socket"
+		elog ""
+		elog "The change from autospawn to user units will take effect after restarting."
+		elog ""
+	fi
+
+	optfeature_header "PulseAudio can be enhanced by installing the following:"
+	use equalizer && optfeature "using the qpaeq script" dev-python/PyQt5[dbus,widgets]
+	use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 4d4fc9ef7fe2..4656f1c1df0e 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -9,6 +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 11451 BLAKE2B 52399970366b0217262e323c5dd095785a013c900d8b195e0004994de746d0bcb833453cd93c56e43289ab0dc868a8c7c32c54f0eded761bd9d4bbb17d9b00da SHA512 40683ea13f4b53046579261042c3c1f74b58346b56e1bbaa3a2372275b2b8e35b19cc315e52b1b57ff3f4361d0614acfe989514375944e235c8656ae1b66fa5f
-EBUILD pulseaudio-15.0.ebuild 10592 BLAKE2B c7ddd059704a6e935301099f2b95499a81ff50ff810dbab03cbb85771f9b258b952b877d1e8f37bf5c6241850a29c96958cd1801a1213ebab7728f5a7ea24be0 SHA512 787a9b70844c7f530ce4aea07155ad9e035ef3ffce680b9030fbf467d758dbc96daa7e51b41ce7fc55b5ac0b808c3025ab4b931a5187af6572b3f6e9bcd3c419
+EBUILD pulseaudio-13.0-r1.ebuild 11453 BLAKE2B 87e52e6b724603770f5d8ed003ae0801c733c97e036445f7b0279fda84323cd4bc7f25e89ed1c71aebb51e16d448dc15f5d8e0b26eac225155fa6d9c9e299295 SHA512 60b553dfa5733975526c39c269f3169e9993128840d49e99fb6c164094e77d72f47046461e0d60351ac2b2225fa5702a18977f92af811f0ff2340854f9630d23
+EBUILD pulseaudio-15.0-r1.ebuild 11138 BLAKE2B 1b975161875288a5a27c02bd877948488e3c2cee5ee5bc2cddfad3daba3827ea1baca84244db45018efbe1c370e3012675e1168095cb0bdaadd1adc3476c4357 SHA512 c857248a0b959c4642d0d8ce4b383711c454ce02bf1433e4459968251cd7da08a11e08ead5610ea886260bcb78e31a932cb048356c558cd1ad4bc11f052da0d1
+EBUILD pulseaudio-15.0-r100.ebuild 1105 BLAKE2B a57a7c879c6a180c9a6495a5acbbfc2bad20173a6c971737f673835f57d730b5808bad5360f3b90af6629c92d968a4b38b181fc148ee9dbccaf2a60da163032e SHA512 d40c2271be2b359ffe8738a3f49d42e86acddec899ac93695bc66453920e2b118a001404ae96e49baab3184edb6c20db90b4a9674b774b4e093444e3fd751ed1
 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 ee5b8c283111..98ed59a66526 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
@@ -74,7 +74,7 @@ RDEPEND="
 	ssl? ( dev-libs/openssl:0= )
 	media-libs/speexdsp
 	gdbm? ( sys-libs/gdbm:= )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
 	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
 	dev-libs/libltdl:0
diff --git a/media-sound/pulseaudio/pulseaudio-15.0.ebuild b/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild
index a28a050fb041..cc9151b23f59 100644
--- a/media-sound/pulseaudio/pulseaudio-15.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild
@@ -29,7 +29,7 @@ LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 SLOT="0"
 
 # +alsa-plugin as discussed in bug #519530
-# TODO: Deal with bluez5-gstreamer
+# TODO: Deal with bluez5-gstreamer - requires ldacenc and rtpldacpay gstreamer elements
 # TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec
 # NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file
 IUSE="+alsa +alsa-plugin +asyncns bluetooth dbus +daemon doc elogind equalizer +gdbm
@@ -51,6 +51,7 @@ REQUIRED_USE="
 		!bluetooth
 		!equalizer
 		!gdbm
+		!gstreamer
 		!gtk
 		!jack
 		!lirc
@@ -73,6 +74,8 @@ REQUIRED_USE="
 "
 
 BDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
 	sys-devel/gettext
 	sys-devel/m4
 	virtual/libiconv
@@ -123,7 +126,7 @@ COMMON_DEPEND="
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	udev? ( >=virtual/udev-143[hwdb(+)] )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
 	X? (
 		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
 		daemon? (
@@ -136,6 +139,7 @@ COMMON_DEPEND="
 	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
 "
 
+# pulseaudio ships a bundle xmltoman, which uses XML::Parser
 DEPEND="
 	${COMMON_DEPEND}
 	dev-libs/libatomic_ops
@@ -177,45 +181,57 @@ src_prepare() {
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Dadrian-aec=false # Not packaged?
 		--localstatedir="${EPREFIX}"/var
+
+		$(meson_native_use_bool daemon)
+		$(meson_native_use_bool doc doxygen)
+		-Dgcov=false
+		# tests involve random modules, so just do them for the native # TODO: tests should run always
+		$(meson_native_use_bool test tests)
+		-Ddatabase=$(multilib_native_usex gdbm gdbm simple) # tdb is also an option but no one cares about it
+		-Dstream-restore-clear-old-devices=true
+		-Drunning-from-build-tree=false
+
+		# Paths
 		-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/${PN}/modules" # Was $(get_libdir)/${P}
 		-Dsystemduserunitdir=$(systemd_get_userunitdir)
 		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
 		-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
+
+		# Optional features
 		$(meson_native_use_feature alsa)
+		$(meson_feature asyncns)
+		$(meson_native_use_feature zeroconf avahi)
 		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_bool daemon)
-		$(meson_native_use_bool doc doxygen)
+		-Dbluez5-gstreamer=disabled # no ldacenc/rtpldacpay gst elements packaged yet
 		$(meson_native_use_bool native-headset bluez5-native-headset)
 		$(meson_native_use_bool ofono-headset bluez5-ofono-headset)
+		$(meson_feature dbus)
+		$(meson_native_use_feature elogind)
+		$(meson_native_use_feature equalizer fftw)
+		$(meson_feature glib) # WARNING: toggling this likely changes ABI
 		$(meson_native_use_feature glib gsettings) # Supposedly correct?
 		$(meson_native_use_feature gstreamer)
 		$(meson_native_use_feature gtk)
+		-Dhal-compat=true # Consider disabling on next revbump
+		$(meson_use ipv6)
 		$(meson_native_use_feature jack)
-		-Dsamplerate=disabled # Matches upstream
-		-Dstream-restore-clear-old-devices=true
 		$(meson_native_use_feature lirc)
+		$(meson_native_use_feature ssl openssl)
 		$(meson_native_use_feature orc)
 		$(meson_native_use_feature oss oss-output)
-		$(meson_native_use_feature ssl openssl)
-		# tests involve random modules, so just do them for the native # TODO: tests should run always
-		$(meson_native_use_bool test tests)
-		$(meson_native_use_feature udev)
-		$(meson_native_use_feature webrtc-aec)
-		$(meson_native_use_feature zeroconf avahi)
-		$(meson_native_use_feature equalizer fftw)
+		-Dsamplerate=disabled # Matches upstream
 		$(meson_native_use_feature sox soxr)
-		-Ddatabase=$(multilib_native_usex gdbm gdbm simple) # tdb is also an option but no one cares about it
-		$(meson_feature glib) # WARNING: toggling this likely changes ABI
-		$(meson_feature asyncns)
-		#$(meson_use cpu_flags_arm_neon neon-opt)
-		$(meson_native_use_feature tcpd tcpwrap)
-		$(meson_feature dbus)
-		$(meson_native_use_feature elogind)
-		$(meson_feature X x11)
+		-Dspeex=enabled
 		$(meson_native_use_feature systemd)
-		$(meson_use ipv6)
+		$(meson_native_use_feature tcpd tcpwrap) # TODO: This should technically be enabled for 32bit too, but at runtime it probably is never used without daemon?
+		$(meson_native_use_feature udev)
+		-Dvalgrind=auto
+		$(meson_feature X x11)
+
+		# Echo cancellation
+		-Dadrian-aec=false # Not packaged?
+		$(meson_native_use_feature webrtc-aec)
 	)
 
 	if multilib_is_native_abi; then
@@ -226,6 +242,7 @@ multilib_src_configure() {
 			emesonargs+=( -Dpulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
 		fi
 	else
+		emesonargs+=( -Dman=false )
 		if ! use elibc_glibc; then
 			# Non-glibc multilib is probably non-existent but just in case:
 			ewarn "padsp wrapper for OSS emulation will only work with native ABI applications!"
diff --git a/media-sound/pulseaudio/pulseaudio-15.0-r100.ebuild b/media-sound/pulseaudio/pulseaudio-15.0-r100.ebuild
new file mode 100644
index 000000000000..bc04ffed9af7
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-15.0-r100.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+SRC_URI=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="metapackage"
+
+SLOT="0"
+
+IUSE="+alsa +alsa-plugin bluetooth +daemon +glib jack zeroconf"
+
+# TODO: Get rid of the REQUIRED_USE by adapting the consumers to the splits with correct USE deps and dropping IUSE here
+REQUIRED_USE="
+	!daemon? (
+		!alsa
+		!alsa-plugin
+		!bluetooth
+		!jack
+		!zeroconf
+	)
+"
+
+RDEPEND="
+	>=media-libs/libpulse-${PV}[glib?,${MULTILIB_USEDEP}]
+	daemon? ( >=media-sound/pulseaudio-daemon-${PV}[alsa?,bluetooth?,jack?,zeroconf?] )
+"
+DEPEND="${RDEPEND}"
+# TODO: Figure out alsa-plugin handling, where pulseaudio-daemon isn't a multilib-minimal package
+PDEPEND="alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )"
+BDEPEND=""
+
+S="${WORKDIR}"
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index b25447d65797..7d20fe6cc72d 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,4 +1,4 @@
 AUX pulseeffects-4.8.5-meson_no_automagic.patch 1529 BLAKE2B d3ac44aed8a08ab62b932032b3c25e7e0019fbdc2c70e33114d4cca787e3f441ffe2bdc0c3c8c65a5f5a79b396c965b3f2c2fc4f1a9c392c1dc347c53f6460fa SHA512 508856da931ffeeab631ac684ba918e113144b345d95670bf0ac7c3cb1a4033745f2dfbfbf2cbb02a26a61c21146d74b0cbf22951386b3fc574f314d6318ae69
 DIST pulseeffects-4.8.5.tar.gz 2028531 BLAKE2B 0ba68c90d4eb25e3b22c4f39f989bef428c970f0dcfa0b301c500928f835d76c31cd1d7692d1a853b3121d4e8fbee8102c1f538b06cb15933509719a6da5d8a0 SHA512 b72f4d5356af1308d997f01ac2efc5eefb569e9a1253f0a19918aec5f9c2d386ab5c293a5aa6a28e8d15200289f32d34c8f3d524bc50874c750afdee61bc0820
-EBUILD pulseeffects-4.8.5-r1.ebuild 2222 BLAKE2B 96e6a9145485a868f6d33d7db84ac1064f59312b32e72386b44e59616cf5bc2c70a1676c94ee9759d5c3804c4c29c930c5749a63134f704e6338b5b5f71d59ff SHA512 7876d3d1046cd485378498351c2e7affb4b12d2247ef1e5a97f0eaabc1677403d3439f7a9f116041e62e0788ec6f0303136527a4e268108aab0fb3f3cfda330d
-MISC metadata.xml 1264 BLAKE2B 994cf064545bc487bca37a844d641c2ff33ff3a4a065610cc775083fb95ee8e17c20768c6ed8afe100088471d5c3ee6027b8f7d5fd3e9ce75e01516fa8ae5311 SHA512 74fb6d0b04f8062d738c9776d079ff1e4a3b0890dc0e3ba278c07747cc81535188ae2b178374cfc516d0b71755f7963734c1784251742b5f320021ccb274aa5d
+EBUILD pulseeffects-4.8.5-r1.ebuild 2236 BLAKE2B 1dc26ed814192ccc3af475a41b5bce38b5659b895983071cd6a4a3be9f3ba5d864c7f9b7e9721e6f42b8776a4697af024ddc3d394fd0995fff284a457f0ab2be SHA512 484d0995b1f56ea5df785612a2ddbce2e6d6473995228838ff1fa54126dd14453cfcff3621e8dde3cba59cd9d5cf8bbb3a3596c4b2e7b4859e6af7a2e72bc219
+MISC metadata.xml 1353 BLAKE2B 8a3ab829edb36bf0f711057096176b15fad113820ec9910d5791c20cf9bc2802396264c43550a8a46b1f8318357b4d4e6a99c264d7b0b89aadc201b8f5098dee SHA512 bab593219b241f0903415945c110bdbe08197618d648785bbe0a7ed5c8a53618e16d60f82e5456ccd4236762384ae571bfc484bbb2f6aac8c99bd9d339f30e65
diff --git a/media-sound/pulseeffects/metadata.xml b/media-sound/pulseeffects/metadata.xml
index a28210d17cf4..9e2ce750f76e 100644
--- a/media-sound/pulseeffects/metadata.xml
+++ b/media-sound/pulseeffects/metadata.xml
@@ -12,6 +12,7 @@
 	<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="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>
diff --git a/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild
index 5a542f3586a9..9ca5a1a00987 100644
--- a/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="bs2b calf rnnoise rubberband webrtc zamaudio"
+IUSE="bs2b calf +doc rnnoise rubberband webrtc zamaudio"
 
 DEPEND=">=dev-libs/boost-1.72:=
 	>=dev-cpp/glibmm-2.56.0:2
@@ -39,7 +39,6 @@ DEPEND=">=dev-libs/boost-1.72:=
 	rnnoise? ( media-libs/rnnoise )"
 RDEPEND="!media-sound/easyeffects
 	${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
@@ -47,6 +46,7 @@ RDEPEND="!media-sound/easyeffects
 	>=media-plugins/gst-plugins-pulse-1.12.5:1.0
 	sys-apps/dbus
 	calf? ( >=media-plugins/calf-0.90.1[lv2] )
+	doc? ( gnome-extra/yelp )
 	rubberband? ( media-libs/rubberband[ladspa] )
 	webrtc? ( media-plugins/gst-plugins-webrtc )
 	zamaudio? ( media-plugins/zam-plugins )"
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 81e36004c363..5d596f7a0c59 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,3 @@
 DIST rhythmbox-3.4.4.tar.xz 3890320 BLAKE2B 69c89c0478d6c43e1c4a10d39f25c25c3dc81f9b93f870e0de8947395e0f49d3902cb8dcf74c945da744536090b7058616545ad706626047e0c8fb61b0b792d7 SHA512 1fcd41dd66ffe34852f8cedb80ade57d101118295d6fd6f0a8687000ab6500991d2e11482daedb30a7abaf63e54e33ee3c4eaab73b075ec5e5907182f9a8c865
-EBUILD rhythmbox-3.4.4.ebuild 3322 BLAKE2B a175033a5d2bf703671b4bf8414e8771810fe11629f63898788336e8ee2da73dc5cf872207cf9b91689c080511e46c97ec2d1fcbad0afd3702d9f038808083ad SHA512 c4350649c225a42413ab6c400998145df0500d87f5d9d1f724206b7cc99c8ff5f3685eb219bc88c80d87c7aaa1e40624e2b2ef229429bb5ff6eb111975eff89c
+EBUILD rhythmbox-3.4.4.ebuild 3329 BLAKE2B a0594365eb10aced4bbbff60e493a79d92f51ada1568071189bc43cb606e6f722dfb48008e39bac6d8ce73d9bb6d8e41f0d8930bb08516a5ed1a63ea9dbdb2ec SHA512 a6d76672409528d751f5f44de5697354972c35953078957f86bc582302cc396cc4edd426180709001b984ea134817875f47f98df078e9044342fca5ca6f0e041
 MISC metadata.xml 546 BLAKE2B 3f273ab651f53329ae8c493be78977713b4bcf31b35a65d66b523f5b27e11b456b26cddf78ce4ec7b08478fff2fceb875b7e976e9491cb63007744ea93f518ed SHA512 bb4c662bc4728e72ff31d32101da0b67e77e254e3511de9b7cf5bf98bc224f21d6b31e07f3c687c41d66f7abe15109d353402d6db5405086edea1f5518f2436d
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
index 817f3a7425e4..287b4eb83505 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/media-sound/sndio/Manifest b/media-sound/sndio/Manifest
index c9d78f1a1943..f7cb9ab53067 100644
--- a/media-sound/sndio/Manifest
+++ b/media-sound/sndio/Manifest
@@ -1,7 +1,5 @@
 AUX sndiod 36 BLAKE2B 51d51ddac64b89c01cb7ec6b009cabb17168b1664e4339d895070fd6e844e5b1cce7be92c6198ebf57e733e40261f767921d9678957b633a903c2bd659266c4d SHA512 80f2fc6eb775889ac9ba6257651a18bf030668d577727a8f78dc864717e90251757eb779a6ac97ae5468629da59a399c9df013d470744b6d480c1aa09a602323
-DIST sndio-1.7.0.tar.gz 147989 BLAKE2B 20f5969cfd6d6a62d9c04e493eda7648f686ad394db18e43ae574db235f31a025705f40f9c6ea821e04449bc1cdbc35c23dbeff9575b71fccc92c24140341d7e SHA512 f9db7bad5f30e8790488c4d20198c8a5a51f04f94e4b1067eadd7fe0fcc6f6ced3250173a627439d661dcf6faabc7bc4786b30af013788a5c88d972f1c9dc1f8
 DIST sndio-1.8.0.tar.gz 156249 BLAKE2B 46d279c0a9ab40253d9f4abf5892d6c2cbbbeeeeb5ff72f45287b16adce122550025ee2d50b45de5e6952dfac1f25041e520692b0afc31ce9cfa5e122d8799fa SHA512 c3225e59e50c3dee41df7df1d87d32ed616117ea6883d9c643a57091b2239b03988c00230882c32f68331952852781dccb8bdc5a6c92780d97a294a1bd9d8ef8
-EBUILD sndio-1.7.0-r1.ebuild 1042 BLAKE2B dec9d99b4875b58581a6f15ec73bb10ec7cf52611869e06cef594f1b0280f253489d343c7cb26554b572e58f730f37858d87ca4d9994be046cf8b330ec77f7e2 SHA512 883db34be9c592cd2528f7ff108868d541d823907b4e1a96327751bbe837680e9612a4b80d34a46b69d39e55916ff04b33a93299d6c14b631fdf2d3f81c9473c
 EBUILD sndio-1.8.0.ebuild 1056 BLAKE2B 622f2503a9f3180924dcb1531b3c421f93e0e9cc0281e5ca4d0897ea82e659fdd161e1ac10f0565129fb883c65fd42da271680424a39f1fbd39069b4b1c37455 SHA512 883e1b5b899c5633dcf2f3fd2f167bdbbb33d1434f7309779c6e3cc0fe71d7ff582209ca01f9a228e170506ca22df4d0eb5541468241b1e089d19800b1b41d47
 EBUILD sndio-9999.ebuild 1049 BLAKE2B 55f1786cacbae3e9e3706cb9d23ff2879d224a6a5929cc0bc3f9ba9dec6728c81017023e6c2b859f3816af09663b1d87a43a789afb0d26f98965dfc16d6f1d4b SHA512 afbfa868aaaddffad8c066e3840cd85b9ba272894c3f31b56608c1953659e4c3fea7eef59d5ba2f70e2fd63f4bb4490b5062f6cf940bc784a581f42d315e713e
 MISC metadata.xml 410 BLAKE2B 75c853b9665a82c30c29f3aa0e9171fe2665ed2f7e4c1a7ccdd04258a07e4ef753ad01066934adccc3434aa52332b7007148c818b568335a2429bd8afc61d974 SHA512 b26adba8415ba084c079fabf29b966886bda8736165fbd9f0db13fe4da80e9be373ea7ed2d59e3b8c2b9a04eb84d8327f432c091c3ee936a82650a7983a7a483
diff --git a/media-sound/sndio/sndio-1.7.0-r1.ebuild b/media-sound/sndio/sndio-1.7.0-r1.ebuild
deleted file mode 100644
index f7fa4e0c4498..000000000000
--- a/media-sound/sndio/sndio-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="small audio and MIDI framework part of the OpenBSD project"
-HOMEPAGE="http://www.sndio.org/"
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://caoua.org/git/sndio"
-	EGIT_MIN_CLONE_TYPE="single+tags"
-else
-	SRC_URI="http://www.sndio.org/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-fi
-
-LICENSE="ISC"
-SLOT="0/7.0"
-IUSE="alsa"
-
-DEPEND="
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	${DEPEND}
-	acct-user/sndiod
-"
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	tc-export CC
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--privsep-user=sndiod \
-		--with-libbsd \
-		$(use_enable alsa) \
-	|| die "Configure failed"
-}
-
-src_install() {
-	multilib-minimal_src_install
-
-	doinitd "${FILESDIR}/sndiod"
-}
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 62015fbe95eb..668c4acd5b43 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,4 +1,6 @@
 AUX sonic-visualiser-4.3-meson.build.patch 4428 BLAKE2B 30f2fb4f69f633de44e7f50f901a14a997cc785cbd23b33668e7587ff1cdc270eea94f7caa6fb54605009ebcadcb8d0b69d26980aa592a89696fcf4ede919b89 SHA512 1bf40499f8a15572ec1aad67685508aaac5fb7f41fd8ba4c5e129bed04b1fc0052f87618036b9ef3fd3c6205c7a8a27dfcf5349d6b9c99eb3de7a6348a775238
 DIST sonic-visualiser-4.3.tar.gz 6467269 BLAKE2B 4c9bbfc751f94dfc0e8c93a8ba791b0a4bf949fe1f528a081da583ad720dcb25b3e6f84e31104f11ab5003b338b62a1ca1a9572bc9ec820d0a4269d25cbe0e04 SHA512 cbe0edee9f346545222e05156e4536710db932d6ec335687e91f2f4b24582e7f47703a3ecade87574ead8fa78dca821fd9ff2eb0d6e44c2b9c33c8d053fd738d
+DIST sonic-visualiser-4.4.tar.gz 6475000 BLAKE2B 37797b5fdcc397530a8b36bb1727bc56be703738505a117c853616eace41344b9526f98602ec872f4baa157cb1e92044bf7e3ef9079fa24b456453542bcf5763 SHA512 a76a6e5fc2381a3e7c89762687176fa60a8b731951438094af0ecd50103f73104a4366eacf731015573f8d5e5f436cf497a3e0e041363d5158d4f546bdd1f7b0
 EBUILD sonic-visualiser-4.3-r1.ebuild 1638 BLAKE2B 24fd029abfaa5de80f6975679db06cd0e3f6b8de17ab7b209bf964f4f2eebee5627bfb44768c0fd676fbd4d8d5009167c2f7fddeabc63c4aca6a98e08a30f263 SHA512 e7ae7fae399d1ad994ae92cd38a6dbaf7e628e6c12a466e448c8536f68902239844bdd6d4313f1028e31feef01abba4021610fc5c2153d83f5541d782e854a42
+EBUILD sonic-visualiser-4.4.ebuild 1855 BLAKE2B 7aa499545f4d0ba092cdde4821e2afdb189f61f12c8499e4ed25a9835941a77f4475ae1d64da6868b6c9827ccb243f64b9ba1a943d22f09be008da08d80fefde SHA512 064aa5f61c4ded7ba9402011eb741da97442ea804a8fe8ba9f9193489c5b69a5e08e7314e84add7dcc0b8409db45102a414191a812c25b2ccb3ad5530b5c1613
 MISC metadata.xml 457 BLAKE2B fee1474516a395ba251de868c533ab4f88ac346a169a71e1513593f0ffa99f3365f0a7d87c24c31e73cf4f06d500b8bafe83f02230e6f24ebf8c0a23b43cd662 SHA512 58c25ca412527ef47411204f5ce579c3731c5b19922c43c13f069dae0c498e63879cc209e1f93e3487a2c32972df8ac45af690b4d470bfea9e497a3b9699c3a7
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.4.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.4.ebuild
new file mode 100644
index 000000000000..8d1d65fccee0
--- /dev/null
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg
+
+DESCRIPTION="Music audio files viewer and analiser"
+HOMEPAGE="https://www.sonicvisualiser.org/ https://github.com/sonic-visualiser/sonic-visualiser"
+# original location is this, but there is an certificate issue:
+# https://code.soundsoftware.ac.uk/attachments/download/2811/sonic-visualiser-4.4.tar.gz
+# the tarball from github misses some files so it cannot be used
+SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test"
+
+BDEPEND="
+	dev-qt/qttest:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/capnproto:=
+	dev-libs/serd
+	dev-libs/sord
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/alsa-lib
+	media-libs/dssi
+	media-libs/ladspa-sdk
+	media-libs/liblrdf
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/rubberband
+	media-libs/speex
+	media-libs/vamp-plugin-sdk
+	sci-libs/fftw:3.0=
+	id3tag? ( media-libs/libid3tag:= )
+	jack? ( virtual/jack )
+	mad? ( media-libs/libmad )
+	ogg? (
+		media-libs/libfishsound
+		media-libs/liboggz
+	)
+	opus? ( media-libs/opusfile )
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}"
+
+# tests fail without mp3 support
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	|| ( jack pulseaudio portaudio )
+	test? ( id3tag mad )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.3-meson.build.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use id3tag)
+		$(meson_use jack)
+		$(meson_use mad)
+		$(meson_use ogg)
+		$(meson_use opus)
+		$(meson_use osc)
+		$(meson_use portaudio)
+		$(meson_use pulseaudio)
+	)
+	meson_src_configure
+}
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 36c221be7a4d..21a60f1f28ad 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,4 +1,5 @@
 DIST sox-14.4.2_p20200803.zip 1089835 BLAKE2B fa53d8c9f14620675bf534090bf6c69ec256bb977aa1b3c01b2d95ba8e685eb4f9d479872f303b2954aa1b063c095bf3b90e5b746fd8d7d66e35476e5218fa6b SHA512 8c485a53b9ecce9ecf759d7bbf8d95e568a89505bec7d1258afded4c7ad0f28c624b637a188ab87b64dee720db59b8de20c347805910f0401f00550832e16392
+DIST sox-14.4.2_p20210509.zip 942551 BLAKE2B 2ddd229faacb9190fe18052b1c02da40d4c3f24fc73dd08b28ac99bef267cb05f8bcbf64e0c397c391b3be2467667783ed94f6c60798af069567e1c237ec9ccd SHA512 4868f9b77141b7e2caf2571ceb68a48bd744732e72f63ed787f8e0b9fe39b77de4e998b32d99c2500e10b017a1fd1a3379f4f9f8b67db6093b85d02cb3447934
 EBUILD sox-14.4.2_p20200803-r2.ebuild 2833 BLAKE2B 321acd4a7c6587b310c85ebcaaffa3ea60aed488e4b3ef95fc082275e91e2170212d762a7f9de55c6e3d9050e18c4c56af3b560385f5decea16dafb75c79f58e SHA512 59e0d8bf59301124f02c2dc859c8debc4e50c62bb7055826380bdb6f2c57df51142e18af43bcf27bc07583370c4e50a75b82f3b1bdd51423c564a47ea631638d
-EBUILD sox-14.4.2_p20200803-r3.ebuild 2900 BLAKE2B baaf29a02a9a7f34367401b5e10343e42311b2401716612cbc21b84598081e80ac1dbf2b8f29dbdd16a2a706c40bf0b12ddad872f87640d0f86c001296c7026f SHA512 0e112327c5eff4fdaf2e75515bbf0d07ab0293b99136fb256c195847c5cc6a323d4af953c28116104a8d953e002c186297641b8e50a8b0985e39dfa3bb83a523
+EBUILD sox-14.4.2_p20210509.ebuild 2881 BLAKE2B 86854ebf9a5cf2aaef74d07430053f58f9aa746134911c4580c86de2ee0b29e1076a327705bd64b5984e206b2f176941c76b709b5b72eee6bdbe228cd2f5323f SHA512 90a85252bf4de9ed8247f4a37f8bc475e882754432d3e453c15d0c6d2806ead973ae0e8f21d1ad8683570e4e0950da243388ed4748291761ecf1400c285611d2
 MISC metadata.xml 709 BLAKE2B 29d863a59fa534ccdaf3ccfe73ec03ff931055b7537ce3ef1111a596c8178f944910cd3c917e25f778a1e297d5fd0023833d0a8556adb6cd187fbd59e2ff5703 SHA512 a40c70b421b78a8bf2b7044b1b512600120c0352bf61755ba7d48af621fcc33c82ef3c7eff3df10c913add4b7250f7fb7461ea7171b21a07f306794d7c1cbdbf
diff --git a/media-sound/sox/sox-14.4.2_p20200803-r3.ebuild b/media-sound/sox/sox-14.4.2_p20210509.ebuild
index 4425958e83b7..78d457847df5 100644
--- a/media-sound/sox/sox-14.4.2_p20200803-r3.ebuild
+++ b/media-sound/sox/sox-14.4.2_p20210509.ebuild
@@ -8,19 +8,19 @@ inherit autotools
 # We take a snapshot because of the huge number of security
 # and other fixes since the release of 14.4.2.
 # Recommend mirroring the snapshot; unclear if they are stable URIs.
-COMMIT="50857c46c03a85c72826e819f5e815aad4a4633d"
+COMMIT="42b3557e13e0fe01a83465b672d89faddbe65f49"
 MY_P="sox-code-${COMMIT}"
 
 DESCRIPTION="The swiss army knife of sound processing programs"
 HOMEPAGE="http://sox.sourceforge.net"
 # Source: https://sourceforge.net/code-snapshots/git/s/so/sox/code.git/${MY_P}.zip
-SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.zip -> ${P}.zip"
+SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${MY_P}.zip -> ${P}.zip"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile sndio static-libs twolame wavpack"
+IUSE="alsa amr ao encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile sndio static-libs twolame wavpack"
 
 BDEPEND="
 	app-arch/unzip
@@ -77,27 +77,26 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_with alsa) \
-		$(use_with amr amrnb) \
-		$(use_with amr amrwb) \
-		$(use_with ao) \
-		$(use_enable debug) \
+		$(use_enable alsa) \
+		$(use_enable amr amrnb) \
+		$(use_enable amr amrwb) \
+		$(use_enable ao) \
 		$(use_with encode lame) \
-		$(use_with flac) \
+		$(use_enable flac) \
 		$(use_with id3tag) \
 		$(use_with ladspa) \
 		$(use_with mad) \
 		$(use_enable openmp) \
-		$(use_with ogg oggvorbis) \
-		$(use_with oss) \
-		$(use_with opus) \
+		$(use_enable ogg oggvorbis) \
+		$(use_enable oss) \
+		$(use_enable opus) \
 		$(use_with png) \
-		$(use_with pulseaudio) \
-		$(use_with sndfile) \
-		$(use_with sndio) \
+		$(use_enable pulseaudio) \
+		$(use_enable sndfile) \
+		$(use_enable sndio) \
 		$(use_enable static-libs static) \
 		$(use_with twolame) \
-		$(use_with wavpack) \
+		$(use_enable wavpack) \
 		--with-distro="Gentoo"
 }
 
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index f239e3b1014b..cd6497d76e04 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,5 +1,5 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
-DIST spotify-client_1.1.67.586.gbb5ef64e_amd64.deb 118938508 BLAKE2B 41239d0c67e3f9e1e4ef2b437320307f1cf947e022635b7c3b9103bfe5fe33f0b1465e9384e78cbb4684b0dec2efd974aa2ac4d1a15860907d66be0b04b14246 SHA512 d105eed1f013be2704ad7f0aaeb80ab2f8f19a0cfe69782f32fc95241d2900560996ec17101222365e1ad3b02ff9fa866da3f0709277a5bb40d032f5a58f7062
+DIST spotify-client_1.1.68.632.g2b11de83_amd64.deb 112586002 BLAKE2B 9591b9ff4bc5ba4227cb964b4d77f80441701353d704c2ba502c8f8cf21b64ad406b89e41355c0b2db7a9dfa7db985b555603b38b6e8eed4371732f4b81e67d6 SHA512 742bf459d7d87cc269a4c29cd2489753c6f7b62f3ee2150808c4931c29ee0d89f5b5ae47589112768e5958da73cba857074845fd017bd53c4574ea84c6770074
 EBUILD spotify-1.0.72-r1.ebuild 3208 BLAKE2B dbe0adc8f45c8c83d2a6734b36439ac0ce67b48ea518ae9153a5006c1ef4e923cd768a983495c35bac8d1469d4e7f5b5c26e73284f43ff9d5d84dd23e80c6740 SHA512 8955f11f24a1a50827b2dc9c37e03ac0c24ad8d352cf91598a3d39c65679f54cd3b8660f21e5a8f1347e408ec1fea8e23a962fd7e2c93b64f034d74a9304ae26
-EBUILD spotify-1.1.67-r1.ebuild 3441 BLAKE2B 523420d1b4dd8d4d7192d589492a149f2b95eca72fb7f24362e5d3b6919ca8d28747c4d7f55a5b1bfd6e3e3a58c22ce1ac8b844a106686091bfc0ccec9d15f77 SHA512 40f93d1a80ddec16e9da90bad56be60bd9e3d6b3c0395fe8be35ad7de20c58e9caaabd042de4ae2c5a5c5f7b1d1c264c2ee2152265a73c2e79a542fc4ba6d01c
+EBUILD spotify-1.1.68.ebuild 3441 BLAKE2B 659f28431cd6bd030616e6d6b5eb0649b6393d16e66319658994ad7d969f2a3c15f08edb4f1506c206135a586b5b418a626a13b2332bda1e9e48973b47980bdf SHA512 0d1258dd6a1f4f3c78c26973b9851e039a18e8549db5d0bc346bac6c0ccf88d9420b00690a678d46c225f6ed2665a7c318b532a10303c58420b649e5d87b174d
 MISC metadata.xml 633 BLAKE2B acdcc4b02017e86b02be5f5e7fb56a292c5c0be9bceebf2a6d2caa4512ef240f5c1dc9d1ee6f48b1d8391556dccd81e94cda1e7233af5cd666536f5c6cb35a1e SHA512 c7b74768267009ac22c3ed90da61a60ea3ef6bb6a35c859f58ab2707af310f5201f35a526182402d669639b470ca47cd59f5a7b820b170122c4989b15f960fcc
diff --git a/media-sound/spotify/spotify-1.1.67-r1.ebuild b/media-sound/spotify/spotify-1.1.68.ebuild
index a723919517c8..86a2a079c2e7 100644
--- a/media-sound/spotify/spotify-1.1.67-r1.ebuild
+++ b/media-sound/spotify/spotify-1.1.68.ebuild
@@ -7,7 +7,7 @@ inherit desktop pax-utils unpacker xdg
 DESCRIPTION="Spotify is a social music platform"
 HOMEPAGE="https://www.spotify.com/download/linux/"
 SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="586.gbb5ef64e"
+BUILD_ID_AMD64="632.g2b11de83"
 SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
 LICENSE="Spotify"
 SLOT="0"
diff --git a/media-sound/terminatorx/Manifest b/media-sound/terminatorx/Manifest
index 9d1a26c481d3..5ae15cbacefa 100644
--- a/media-sound/terminatorx/Manifest
+++ b/media-sound/terminatorx/Manifest
@@ -1,5 +1,8 @@
 AUX terminatorx-4.0.1-desktop-QA.patch 268 BLAKE2B 0f99d7317802773c3afc3c0e54c7744f79df333b65480123d929ab7a8bf5cebbe2772db241fec1570a2fced0a0e3ad71f2f7602e5f9c12c2faf8165edb5e8547 SHA512 3aaed47fdecceceee188f37a6af2a0fe35c9605fec5a581f48d17c4cb237512d0abc38e5da59b42d8b22bd16cf03947291746460f0bd6c4991f36ead81de1010
 AUX terminatorx-4.0.1-gtkcombotext.patch 437 BLAKE2B 582d82d04bd443188325f127a9766f6b35d6547339a839bbc7460f800bcf0721e30c6c77e42cfcfb5a91c683a11c90fb967849e8b7577e68dc11448b1a1f9873 SHA512 d801d60deb2d18444979791246c9eac7b41f2e7f8ecf5fa25a9b4d9294b0c0bd5dc107ac63aab04a85962efdea316f43df9736ef6009a174f1e8d6a7eb53c1c3
+AUX terminatorx-4.1.0-metadata-dir.patch 438 BLAKE2B 848b76d7c86b049964cbdf0b3070491f78430c8b613f9860824ea550a32c9a4309da656d6c970ebda52819cbea21cc3dad75666f02b8f4f4cbf5c5b1d223a35b SHA512 263bda47b9376b5de8c056999be92655658355ef2c0557ecf84fa7f84542c78580071cb04e46907df028bd4badf72547084ffee1bea31809c0e9c294d8f00e05
 DIST terminatorX-4.0.1.tar.bz2 1832692 BLAKE2B 61eeb6362cdf56cb73df3bfbff65cf3699a0ef686d77894b87feab5f25f927267bc28573c3ee41981ded3b452b1d37c035260ffbe0fdcf6d0b0c0319c61a6137 SHA512 06128633e128f2158367dcde0e913dafc68d62644e7a5182a2391829dadcb9c46430d0cac16cb17113939623266f32cb4624a8548a51b8c01bdfa2860a6c0093
+DIST terminatorX-4.1.0.tar.bz2 1832295 BLAKE2B a328d05bb0c3c88719eb711dcf3f50eac08cd140e3225f42633744b39ce49f3e074263997ec21b2cc245740fa3f672a19b89d929fad1d0131981988fc80f37fc SHA512 2dc87bdbb4f4d24e10f0c8fac99b4ccecac6036c6dc950184cbdd1d05fe0a4c723ea1b04c49837fb0aa8f149ca9d2fb5d2c42f5109031184980a14fe549312fc
 EBUILD terminatorx-4.0.1-r2.ebuild 1411 BLAKE2B c226688c9595acfd1c65058abf1ce6761fd02e49026710c59b42625c8caea0179228bfddb9f1867113436844d218ca6fac347726e800bf5cbfc20c78aa06bf2c SHA512 f13956c85e3f4cfa624139a82a322dd0ac0e621d42a668429a732dd17a5c32bfe363b215810769d026a7b16e979e8ce4b4267e0b734149112ea5faf2599ed6a7
+EBUILD terminatorx-4.1.0.ebuild 1448 BLAKE2B 7dbdab35960e4605cfd585ea4c1bb17baae80d4767e7532ecc53ab0d2e5c5aa24ec195fe29da611070183b5c3f7b606f5832293157899a170972cc0a2e68975f SHA512 3253dd8009a5387951208338a26765b16d84882e1216de43f0edf40e34f921f99308da299aec90466107067ffe96d9f3a7b82910b990a320f733f4a1da64f4a5
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/terminatorx/files/terminatorx-4.1.0-metadata-dir.patch b/media-sound/terminatorx/files/terminatorx-4.1.0-metadata-dir.patch
new file mode 100644
index 000000000000..3f873271e00b
--- /dev/null
+++ b/media-sound/terminatorx/files/terminatorx-4.1.0-metadata-dir.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index cd70e20..5b9a142 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -362,7 +362,7 @@ EXTRA_DIST = COPYING-DOCS\
+ # Destkop Entry
+ desktopdir = $(datadir)/applications
+ desktop_DATA = terminatorX.desktop
+-appdatadir = $(datarootdir)/appdata
++appdatadir = $(datarootdir)/metadata
+ appdata_DATA = terminatorX.appdata.xml 
+ mimedir = $(datadir)/mime-info
+ mime_DATA = terminatorX.mime terminatorX.keys
diff --git a/media-sound/terminatorx/terminatorx-4.1.0.ebuild b/media-sound/terminatorx/terminatorx-4.1.0.ebuild
new file mode 100644
index 000000000000..3774d5dea080
--- /dev/null
+++ b/media-sound/terminatorx/terminatorx-4.1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2
+
+MY_P=${P/terminatorx/terminatorX}
+
+DESCRIPTION="Realtime audio synthesizer allowing you to 'scratch' on sampled audio data"
+HOMEPAGE="https://www.terminatorx.org/"
+# this is the original location but there is an issue with their certificate so mirroring the file
+#SRC_URI="https://www.terminatorx.org/dist/${MY_P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Making X optional fails when disabled: https://bugs.gentoo.org/636832
+IUSE="alsa debug mad pulseaudio vorbis sox"
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib )
+	mad? ( media-sound/madplay )
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? ( media-libs/libvorbis )
+	sox? ( media-sound/sox
+		media-sound/mpg123 )
+	x11-libs/gtk+:3
+	>=dev-libs/glib-2.2:2
+
+	x11-libs/libXi
+	x11-libs/libXxf86dga
+
+	dev-libs/libxml2:2
+	media-libs/audiofile:=
+	media-libs/ladspa-sdk
+	media-libs/liblrdf
+	media-plugins/cmt-plugins
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	app-text/gnome-doc-utils
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-metadata-dir.patch"
+)
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-x11 \
+		$(use_enable alsa) \
+		$(use_enable debug) \
+		$(use_enable mad) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable vorbis) \
+		$(use_enable sox)
+}
diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index 4459dfbabb82..7d21280de44b 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -1,7 +1,5 @@
 AUX upmpdcli.confd 26 BLAKE2B 840eb6e9353266f3669c00dda2a317a6146780180ff0998641dd258806b8dce0a1c49caca570c2ce1fac97e0bf3a347536c147f1a38092ae745bddd728128a01 SHA512 3dd82c12d66aac4be69a98cf25098fdb9c377c4ad0559d07f99cfb4599b6454a6880486053091d55e30b45ac8d877cfa544b1f3dc617d11c32c058767ae6a64f
 AUX upmpdcli.initd 387 BLAKE2B 1cf2ab80c9447041b2b1d1a921c164a6c0436204909c4857db798ed9930d3c1f6e5957a4382cfa884e9fa296ac8d72cc5e3d4d8025234251b665fb5d85efc12f SHA512 fcbefe70aecd05f4fea6427734933344cd1f537fd187c14f05d809f8cf8bb720241aeddc526e9c5497f76e5e7cdcf14798a160b4e4303d1482b53b646dd2b03f
 DIST upmpdcli-1.5.12.tar.gz 582091 BLAKE2B da3c0826a40e815790fa7f758c7511b5932190f0913295098e9c1fae92f9b0083ffbe2b7e95c97cedf76580cefaea27f4ef1f89326dbb67089314f6ff7f8c181 SHA512 ebe8076e3f99b525df115d11940a46a518725a34dcdfbb42eb763b6e148beb968a8e2015c4dd9e696224f3da2745b7356b3094de68332f50590a3421372f1dfc
-DIST upmpdcli-1.5.7.tar.gz 552203 BLAKE2B fe8e8aa3f4c777925dce2a143aec201462cb2da9e33f604d48848f27acc51fad42e1c626c17b5325918f0d1de1b37c1c456240f811af118b83bc7ce3260e0687 SHA512 ce86b8f9b4e7614433ab542facbf7452426b66bf026bb21ea0e868cde9b492b09a86ee8aa259a9353f2ede6a22d1055987986747aa8e284714c5e60f73a3a55a
-EBUILD upmpdcli-1.5.12.ebuild 1034 BLAKE2B 0caee9f429812affd145864fb0affbe5268f06204ec9935484fe84fe45b6ae9aa198077eaf733b630d4e3a414a3f8b233ff8069d422bbedb202bd47cdc9b6e03 SHA512 034872dbd08edfdbb5a9ed3237d10fdc0c8a1e7843ba3e8e588146f84e05161831b5bd4a79688b5f724852e0bd2700e2e34cc33e657dd8be0876bfd6fe583ce1
-EBUILD upmpdcli-1.5.7.ebuild 1266 BLAKE2B 8e943647e08b7513f9f836a4d8b39a12719722b1480a4ee431c037b424e0b972c6163d99cd7ceafce40adc51d119a2a4988ae6375634766aafaffea5562a40fd SHA512 1357b27d8910b1875da2b1b5957d7b6a5dd1d01b0a8c7444ff12759d96735ebe10963213ce25451da82ccc6a854eec9397ccea70f230b037cf304eecc220a49b
+EBUILD upmpdcli-1.5.12.ebuild 1032 BLAKE2B 77a9478420316c2c6a821a41f53c7736d048f641cc1d5e01c1e897afe3b37f1b9fdaa3f50353ba307013826ad00d0071fa3753b7fda37b5fda7b533f2864b555 SHA512 3d6fad7e7496e23114743ee897644284631565ed30d1f42227f44a1bd1b7f88db63a51482141d413597185fb4f78c303e0b676d9f767338c138fa21cb967eafd
 MISC metadata.xml 324 BLAKE2B 53acf2369d1e3957218ea3634ed2fe10034b9d74109af9df7acfcf29a37697ade6488aefc5df3503754833b0f6dc5df777feb945355f633fa6e1a3ade8b13adf SHA512 871929dc11894dc91b3257a5e9e8f5164e3f5e1af0dce2cc7571dd106cc70bd777562bb56913ca45f3bf1cf0316938f7f2c0a8386bdcf408c0f834385db4d45d
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.12.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.12.ebuild
index cd91d0a00939..d5b5585b951c 100644
--- a/media-sound/upmpdcli/upmpdcli-1.5.12.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.5.12.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="thirdparty"
 
 DEPEND="
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.7.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.7.ebuild
deleted file mode 100644
index 32fbe2a26ccc..000000000000
--- a/media-sound/upmpdcli/upmpdcli-1.5.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
-LICENSE="GPL-2"
-
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="thirdparty"
-
-DEPEND="
-	dev-libs/jsoncpp
-	media-libs/libmpdclient
-	net-libs/libmicrohttpd
-	>=net-libs/libupnpp-0.20.0-r1
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/upmpdcli
-	acct-user/upmpdcli
-	app-misc/recoll
-	thirdparty? ( dev-python/requests )
-"
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit systemd/upmpdcli.service
-}
-
-pkg_postinst() {
-	einfo
-	einfo "This package no longer assumes that upmpdcli is driving an"
-	einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)."
-	einfo "Probably it is though, so be sure your mpd is built with"
-	einfo "USE=curl."
-	einfo
-	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
-	einfo "detects sc2mpd at run-time, capabilities are added"
-	einfo "including internet radio support.  See upstream docs"
-	einfo "for more information."
-}
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 2c4b1e695f1e..74d9c8099aee 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,16 +1,9 @@
-AUX xmms2-0.8-ffmpeg2.patch 455 BLAKE2B 4009dd67794554c3dd98199944410f435f978d1ea86c3c280678d24cd8b85846e34d73c6a960e5188827d1523300e7869a3c0c1094fd355fc9c77f917a257508 SHA512 6aa567c3d823780c7fc8951735f59bcbe3345989e077d3ea6d8100acedd3ebf30523f05152fb80827c236ff83674bb47ca0917b5d2331c4d79c4502e41b365a3
 AUX xmms2-0.8-rtvg.patch 1358 BLAKE2B 1544ae0719b02ad94c19239d7ad3b16d3df3a29e1a5580b7541f2c8966f88c9fefafe2e151524e8e0397ac147c65898a841629acaf7f6d96fb76f0f57e4e2e33 SHA512 cc4d0d6cb459040fa55478b55780f34556f78627a2313b598eb276509248f3b6df4c252722ca2f996847e2f3a01392e9435fefd1ad5342c3a87a54bf0673cb0f
-AUX xmms2-0.8_p20161122-be-hash.patch 1075 BLAKE2B 7c9678016751b207a5ef48c0f7963bc0a2e3e99fb461e52b5745bc5e2dde6c329bb358e58802c127aef96d5912e22a7df7a64f719286e9cf7787703765c4b18f SHA512 051e22907315bb6bda201497e1c2ef84d919fc7d39aefac187b3616c5f6c41e768cdd79cfe197fbadfdda3863f9e9c96b5f72fa07d5e1655451328cde8ba5781
 AUX xmms2-0.8_p20161122-cpp-client.patch 624 BLAKE2B fd08746e4ce3c83a1cfed7a6794e169f435da2a1fdf639ae2d948109a22526a5a68f03f1dfabeaabc022dda8b403d08b2cf3c6944429b1b748ee75ac69840caf SHA512 19af5f465c1e48a9ca780b6cad1348eb6fc315b05923f0d4ded7c6972e2cbb3213ad8adf994e13c80c1d69c47bee97660fccad85c9b98ab9752a0ff9f930ea7c
 AUX xmms2-0.8_p20161122-faad.patch 629 BLAKE2B e2dc8964d1002ff55be736e6b0370f946e9d8dbdeaab8f9f50bebce210b431894174e80fbba8bc77c79f048c69d8ece85585395840a09fce6b58fdaaf404494f SHA512 7a40d77cefcc483e6ee24a672b30ddd9f763e642bbac6baf88c315ea4a1aea9c87212627fd641f6107f76ab3185a762129ed02c2f090b2264f89016fe4ff2d5f
-AUX xmms2-0.8_p20161122-gcc-10.patch 222 BLAKE2B a198b2e69081253f299ff1c7f94f0a2d3572a31caf4b7ec7de20e8d9a9bc404c58a98b31f0da6560034fe09599ae2e9f03b97728f45ad2fc30061b384c9fb13d SHA512 44685777b04e46e236104a74e654162a85b5c76c9838572921cc78b4775a7c2d5127566202415bfab10bb17261e242b034dde8aaf44024b66daa55a150ed1352
 AUX xmms2-0.8_p20161122-mac-4.patch 1215 BLAKE2B 746bcf75ce5b1f73ecb4023e776080674da5781d122f988ddb719ccdfb1da95fb632242004096a79861c0a9f0a3a49734a86bd8ac4c0541d3b3742cd722c8d44 SHA512 14b46640163f1d651e310d1bf08ec190a7449615c574952c19fa2c7f86215d83d3ee6d6cbe0f665a5fdd44ec44e44bc339a480ce753f16f2b49a4206dde1c12b
-AUX xmms2-0.8_p20161122-tarball.patch 2764 BLAKE2B 1d6ea9bc40db3145460a8ef06c732114475087ea05eef65fd837d6c3bf346478579d7c6ab0bf33387d2228a319245e0e4d2562935be75a58abd04e88205d4373 SHA512 5b03d129a55ac14462a68e47ecba29c2817eb83d122a3614c624c743ecc29a7bac066644aa61d5ac74f9cb59808d1a9bac077dc360c507da722c206b948301ac
-DIST waf-2.0.19.tar.bz2 682213 BLAKE2B 0bd2e31827ac65e0565abc09df37a42193ff37b50b6d0244f8b10ba7f308b4ba31ba864742d8c8d4005b86e611223dc4315cf70c0dbbf6b7db8f02e4f551fbb2 SHA512 ae7f3973c79e44313b4894c75763ad43ccd2be88e0d351d7f606ce495c5a464a379c85c076ebd8ba577fc88918af2bbb39bbec1049f25f02c14d98388e012c59
 DIST waf-2.0.22.tar.bz2 687244 BLAKE2B feea82e7e6aaba1187f368aa00025f206a7217196de9be7a97ca6aa8882823decd79db38dda4f1f25e81541eaa44edf029eea8d57e28f7d31b94d9ee93201ea9 SHA512 a3a275fd4c81c7b7385c2da001f3924d272105b8f33839265ebbb38708051b7cb13b9b9019e84325707d04513de0c13b032b1ad21458aec6586d10df4ed8d5f5
-DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb
 DIST xmms2-0.8_p20201016.tar.gz 1720185 BLAKE2B e1cad8ed2ece9d8ce905ffe86de53bb4010639d83fd15700eefccf190034577ff8666f3557bfb23741ed8400eba1e6246ef28ff21c4dbbe499239da945befc74 SHA512 0e73771f56c341e5dea15451457426958217de3ac19cad1924c11740f96feb69e385242a27a9cf9258841ed4e6538c12e135492f715bfae6976b31fb358508bf
 DIST xmms2-s4-0.8_p20201016.tar.gz 184231 BLAKE2B 0676f89b743e265af01593c215c609ae48ea368d861fd28b022b4124a00852182686a46ebf90ac44a10343f86ba5c398c47fd85e2688971b2b4445f3c3843af5 SHA512 f510141ca792893feba2c00d9bc437f492fdce7c29b12c9a8432792ca5a1703cc7068e1a9f4641abd50b320fefb5867fb5bc58a58b0b0272cf75828c764f94ed
-EBUILD xmms2-0.8_p20161122-r8.ebuild 8076 BLAKE2B 0f140d493ba41bd33bcaf1e70c8e8483fc72bf88dd42ccc3d181bcbc2509044e5dfd2853194db73796be0eb53bd8c543df22c8f2b401a770489c2172ddd35797 SHA512 db01b170edd8ebc1ed4f8de8302485fed54123884b0527ecc21604d298c6157cf96e5583d8720089dd06fd0ee76130a4fa8015c7f1f251fa9b3c0c4e1a30c7f3
-EBUILD xmms2-0.8_p20201016.ebuild 5866 BLAKE2B 9fb7649ed611191a0b6a036d23518c9a65e52cdcd945840fc2a83d9340da888de99d69c1f84664572776c64f478b2d084beea3627c67678fb9f86eb610e53f77 SHA512 0477e3d22b9499e698cfc14196cb4443d5e8cb9ba2ff7410d6fb93259acef9815689268e2d427794a2c7d1598d9903675dd03b662703305c1275e39964cd3991
-MISC metadata.xml 1619 BLAKE2B bd0c79b7dd4bb6037fb8f8df628a3882a5464e3e2b6547230987d0da6f188e0895d392cc110369aa142c5dab23b554014ce7df344d14d54f04d4c8994a3be509 SHA512 af1936c30bc91f85faeea6b54b3d2bb98172f2f75fabbad669f52bcedbff96f9a6226594114fba1748fbe82cbe0953df2baab03ab3d414a057428ce41346de30
+EBUILD xmms2-0.8_p20201016.ebuild 5873 BLAKE2B 5009cc7bec5f3a4addf40555dc4a43a9f4a044cf309433b37430efa4f2f13073662efd341b89809e89b69cd7dc44c65613ee612c5fdc6034bf73402df992bbb1 SHA512 9380099454cafefb9032d6a366a523591707f4323b14745024bf5cd181ca1d14e7cb9ef49d7a02f96aba2a26b65435911b138fdccb2d2ef48445f9e0a1f196bb
+MISC metadata.xml 1529 BLAKE2B 0f5c762b0325e767ba28410bd6838960e84df8a8f30ceda76833809b21b4e109f01caa2c4c5e234aacd4697f9a0a43d8fc1012f62261b8a1e9e458e2530b9dfe SHA512 be88d429da72efc944841bbb11c85dd6e746201eae90c20cc588bb5c42958315fc23bb9388396e971f0bc2069d4eb6dd9189b9c8f4c7cf4f343ca491f9d744be
diff --git a/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch b/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch
deleted file mode 100644
index 2e9fac380ea0..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: xmms2-0.8DrO_o/src/plugins/avcodec/avcodec.c
-===================================================================
---- xmms2-0.8DrO_o.orig/src/plugins/avcodec/avcodec.c
-+++ xmms2-0.8DrO_o/src/plugins/avcodec/avcodec.c
-@@ -29,6 +29,10 @@
- 
- #define AVCODEC_BUFFER_SIZE 16384
- 
-+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
-+#endif
-+
- typedef struct {
- 	AVCodecContext *codecctx;
- 
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch
deleted file mode 100644
index 5fa43298cf7f..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d97c8b8239e8b3c5ddb951d427b7d78ea7faad25 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 30 Jul 2017 23:08:02 +0100
-Subject: [PATCH] OTHER: _xmmsv_dict_hash: make hash function
- endianness-agnostic
-
-The following code:
-    uint32_t k;
-    memcpy (&k, data, sizeof (k));
-computes different data depending on platform endianness.
-
-That causes test_xmmsv_serialize_coll_match test to fail
-as collection order is serialized in wrong order.
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- src/lib/xmmstypes/xmmsv_dict.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/xmmstypes/xmmsv_dict.c b/src/lib/xmmstypes/xmmsv_dict.c
-index 5ebe4eb3..32533285 100644
---- a/src/lib/xmmstypes/xmmsv_dict.c
-+++ b/src/lib/xmmstypes/xmmsv_dict.c
-@@ -66,8 +66,10 @@ _xmmsv_dict_hash (const void *key, int len)
- 
- 	while (len >= 4)
- 	{
--		uint32_t k;
--		memcpy (&k, data, sizeof (k));
-+		uint32_t k = data [0]
-+			| data [1] << 8
-+			| data [2] << 16
-+			| data [3] << 24;
- 
- 		k *= m;
- 		k ^= k >> r;
--- 
-2.13.3
-
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch
deleted file mode 100644
index 29a8311d2197..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/lib/s4/tests/s4/t_transactions.c
-+++ b/src/lib/s4/tests/s4/t_transactions.c
-@@ -19,7 +19,7 @@
- #include <glib.h>
- #include <glib/gstdio.h>
- 
--s4_t *s4;
-+extern s4_t *s4;
- s4_val_t *val;
- 
- SETUP (Transactions) {
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch
deleted file mode 100644
index eef49b13f16f..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/utils/gen-changelog.py b/utils/gen-changelog.py
-index b539088a..301c0461 100755
---- a/utils/gen-changelog.py
-+++ b/utils/gen-changelog.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- from subprocess import check_output
- import os
- 
-diff --git a/utils/gen-tarball.py b/utils/gen-tarball.py
-index 2ae2a4d1..09ed5074 100755
---- a/utils/gen-tarball.py
-+++ b/utils/gen-tarball.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from subprocess import check_output, call
- import tarfile
- import os
-@@ -40,15 +40,19 @@ def add_files(ball, prefix, template, files):
- 
- VERSION = check_output(["git", "describe"]).strip()
- 
-+# TODO: derive paths from submodule configuration
- TUTORIAL_DIR="doc/tutorial"
-+S4_DIR="src/lib/s4"
- 
- PREFIX="xmms2-%s" % VERSION
- PREFIX_TUTORIAL="%s/%s" % (PREFIX, TUTORIAL_DIR)
-+PREFIX_S4="%s/%s" % (PREFIX, S4_DIR)
- 
- DIST_DIR="dist"
- DIST_XMMS2="%s/xmms2-%s.tar" % (DIST_DIR, VERSION)
- DIST_XMMS2_BZ2="%s/xmms2-%s.tar.bz2" % (DIST_DIR, VERSION)
- DIST_TUTORIAL="%s/xmms2-tutorial-%s.tar" % (DIST_DIR, VERSION)
-+DIST_S4="%s/xmms2-tutorial-%s.tar" % (DIST_DIR, VERSION)
- 
- if not os.path.exists(DIST_DIR):
-     os.mkdir(DIST_DIR)
-@@ -62,6 +66,9 @@ if os.path.exists(DIST_XMMS2_BZ2):
- if os.path.exists(DIST_TUTORIAL):
-     os.unlink(DIST_TUTORIAL)
- 
-+if os.path.exists(DIST_S4):
-+    os.unlink(DIST_S4)
-+
- # Tar up XMMS2
- call("git archive --format=tar --prefix=%s/ HEAD > %s" % (PREFIX, DIST_XMMS2), shell=True)
- 
-@@ -69,9 +76,11 @@ call("git archive --format=tar --prefix=%s/ HEAD > %s" % (PREFIX, DIST_XMMS2), s
- call("git submodule init", shell=True)
- call("git submodule update", shell=True)
- call("git --git-dir=%s/.git archive --format=tar --prefix=%s/ HEAD > %s" % (TUTORIAL_DIR, PREFIX_TUTORIAL, DIST_TUTORIAL), shell=True)
-+call("git --git-dir=%s/.git archive --format=tar --prefix=%s/ HEAD > %s" % (S4_DIR, PREFIX_S4, DIST_S4), shell=True)
- 
--# Append the tutorials to the XMMS2 archive
-+# Append the tutorials and s4 to the XMMS2 archive
- call("tar -Af %s %s" % (DIST_XMMS2, DIST_TUTORIAL), shell=True)
-+call("tar -Af %s %s" % (DIST_XMMS2, DIST_S4), shell=True)
- 
- # Append ChangeLog and a summary of all file hashes."
- add_files(DIST_XMMS2, PREFIX, get_template(DIST_XMMS2, os.path.join(PREFIX, "wscript")), [
-diff --git a/utils/gen-tree-hashes.py b/utils/gen-tree-hashes.py
-index 7f8b9e4f..9d27adb0 100755
---- a/utils/gen-tree-hashes.py
-+++ b/utils/gen-tree-hashes.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from subprocess import check_output
- from operator import itemgetter
- import os
-@@ -21,3 +21,4 @@ def collect_hashes(*paths):
- 
- print check_output("git describe", shell=True)
- print collect_hashes(".", "doc/tutorial")
-+print collect_hashes(".", "src/lib/s4")
diff --git a/media-sound/xmms2/metadata.xml b/media-sound/xmms2/metadata.xml
index 34034fc9473e..7f08040bab7a 100644
--- a/media-sound/xmms2/metadata.xml
+++ b/media-sound/xmms2/metadata.xml
@@ -14,7 +14,6 @@
 		<flag name="mac">Support for Monkey's Audio (APE) format using <pkg>media-sound/mac</pkg></flag>
 		<flag name="mlib-update">Enable building of xmms2-mlib-updater client</flag>
 		<flag name="ofa">Support for Open Fingerprint Architecture (OFA)</flag>
-		<flag name="phonehome">This client sends anonymous usage-statistics to the xmms2</flag>
 		<flag name="server">Build xmms2 player daemon (otherwise only clients are built)</flag>
 		<flag name="sid">Support for C64 SID using <pkg>media-libs/libsidplay</pkg></flag>
 		<flag name="tremor">Support Vorbis using an alternate fixed-point decoder with <pkg>media-libs/tremor</pkg></flag>
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
deleted file mode 100644
index bf8cb66ac17e..000000000000
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit multiprocessing perl-functions python-single-r1 ruby-single toolchain-funcs
-
-# generated as 'python2 ./utils/gen-tarball.py' from clean git tree
-MY_P="${P%_p*}DrO_o-949-gca15e830"
-WAF_VER="2.0.19"
-
-DESCRIPTION="X(cross)platform Music Multiplexing System. Next generation of the XMMS player"
-HOMEPAGE="https://github.com/XMMS2"
-#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2
-	https://waf.io/waf-${WAF_VER}.tar.bz2"
-LICENSE="GPL-2 LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc x86"
-
-IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth ices
-jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss
-perl phonehome pulseaudio python ruby samba +server sid sndfile speex
-test valgrind +vorbis vocoder wavpack xml zeroconf"
-
-RDEPEND="server? (
-		>=dev-db/sqlite-3.3.4
-
-		aac? ( >=media-libs/faad2-2.0 )
-		airplay? ( dev-libs/openssl:0= )
-		alsa? ( media-libs/alsa-lib )
-		ao? ( media-libs/libao )
-		cdda? ( dev-libs/libcdio-paranoia
-			>=media-libs/libdiscid-0.1.1
-			>=media-sound/cdparanoia-3.9.8 )
-		curl? ( >=net-misc/curl-7.15.1 )
-		ffmpeg? ( media-video/ffmpeg )
-		flac? ( media-libs/flac )
-		fluidsynth? ( media-sound/fluidsynth )
-		ices? ( media-libs/libogg
-			media-libs/libshout
-			media-libs/libvorbis )
-		jack? ( virtual/jack )
-		mac? ( media-sound/mac )
-		mms? ( media-video/ffmpeg
-			>=media-libs/libmms-0.3 )
-		modplug? ( media-libs/libmodplug )
-		mad? ( media-libs/libmad )
-		mp3? ( >=media-sound/mpg123-1.5.1 )
-		musepack? ( media-sound/musepack-tools )
-		ofa? ( media-libs/libofa )
-		opus? ( media-libs/opus
-			media-libs/opusfile )
-		pulseaudio? ( media-sound/pulseaudio )
-		samba? ( >=net-fs/samba-4.2 )
-		sid? ( media-sound/sidplay
-			media-libs/resid )
-		sndfile? ( media-libs/libsndfile )
-		speex? ( media-libs/speex
-			media-libs/libogg )
-		vorbis? ( media-libs/libvorbis )
-		vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate )
-		wavpack? ( media-sound/wavpack )
-		xml? ( dev-libs/libxml2 )
-		zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	)
-
-	>=dev-libs/glib-2.12.9
-	cxx? ( >=dev-libs/boost-1.32 )
-	perl? ( >=dev-lang/perl-5.8.8 )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )
-"
-
-DEPEND="${RDEPEND}
-	dev-lang/python
-	virtual/pkgconfig
-	perl? ( dev-perl/Module-Build
-		virtual/perl-Module-Metadata )
-	python? ( >=dev-python/cython-0.15.1 )
-	test? ( dev-util/cunit
-		valgrind? ( dev-util/valgrind ) )
-"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# needs port
-	#epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778
-
-	"${FILESDIR}/${PN}"-0.8-ffmpeg2.patch #536232
-
-	"${FILESDIR}/${PN}"-0.8-rtvg.patch #424377
-
-	# required to build tarball from git tree
-	"${FILESDIR}/${P}"-tarball.patch
-
-	# fix hash to be the same on LE/BE platforms
-	"${FILESDIR}/${P}"-be-hash.patch
-
-	# handle mac-3 -> -4 API change
-	"${FILESDIR}/${P}"-mac-4.patch
-
-	# C++ client dangling reference: https://github.com/xmms2/xmms2-devel/pull/5
-	"${FILESDIR}/${P}"-cpp-client.patch
-
-	# gcc-10 stopped putting globals into common section
-	"${FILESDIR}/${P}"-gcc-10.patch
-
-	# fix required since faad 2.9.0
-	"${FILESDIR}/${P}"-faad.patch
-)
-
-pkg_setup() {
-	# used both for building xmms2 and
-	# optionally linking client library
-	# against python
-	python-single-r1_pkg_setup
-}
-
-# use_enable() is taken as proto
-# ${1} - useflag
-# ${2} - xmms2 option/plugin name (equals to ${1} if not set)
-
-xmms2_flag() {
-	[[ -z ${1} ]] && eerror "!!! empty arg. usage: xmms2_flag <USEFLAG> [<xmms2_flagname>]."
-
-	local UWORD=${2:-${1}}
-
-	case ${1} in
-		ENABLED)
-			echo ",${UWORD}"
-			;;
-		DISABLED)
-			;;
-		*)
-			use ${1} && echo ",${UWORD}"
-			;;
-	esac
-}
-
-src_prepare() {
-	mv "${WORKDIR}/waf-${WAF_VER}"/{waf,waflib/} . || die
-	default
-}
-
-src_configure() {
-	# ./configure alike options.
-	local waf_params=(
-		--prefix=/usr
-		--libdir=/usr/$(get_libdir)
-		--with-target-platform="${CHOST}"
-		--mandir=/usr/share/man
-		--infodir=/usr/share/info
-		--datadir=/usr/share
-		--sysconfdir=/etc
-		--localstatedir=/var/lib
-	)
-
-	local optionals=""
-	local plugins=""
-	if ! use server ; then
-		waf_params+=( --without-xmms2d )
-	else
-		# some fun static mappings:
-		local option_map=(	# USE		# sorted xmms2 option flag (same, as USE if empty)
-					"phonehome	et"
-					"ENABLED	launcher"
-					"mlib-update	medialib-updater"
-					"ENABLED	nycli"
-					"		perl"
-					"ENABLED	pixmaps"
-					"		python"
-					"		ruby"
-					"DISABLED	tests"
-					"DISABLED	vistest"
-					"cxx		xmmsclient++"
-					"cxx		xmmsclient++-glib"
-					"DISABLED	xmmsclient-cf"
-					"DISABLED	xmmsclient-ecore" # not in tree
-
-					"test		tests"
-				)
-
-		local plugin_map=(	# USE		# sorted xmms2 plugin flag (same, as USE if empty)
-					"		alsa"
-					"		airplay"
-					"		ao"
-					"ffmpeg		apefile"
-					"ffmpeg		avcodec"
-					"		asf"
-					"ENABLED	asx"
-					"		cdda"
-					"DISABLED	coreaudio" # MacOS only?
-					"		curl"
-					"ENABLED	cue"
-					"zeroconf	daap"
-					"ENABLED	diskwrite"
-					"ENABLED	equalizer"
-					"aac		faad"
-					"ENABLED	file"
-					"		flac"
-					"		fluidsynth"
-					"ffmpeg		flv"
-					"ffmpeg		tta"
-					"DISABLED	gme" # not in tree
-					"DISABLED	gvfs" # obsolete #647604
-					"ENABLED	html"
-					"		ices"
-					"ENABLED	icymetaint"
-					"ENABLED	id3v2"
-					"		jack"
-					"ENABLED	karaoke"
-					"ENABLED	m3u"
-					"		mac"
-					"		mms"
-					"		mad"
-					"ENABLED	midsquash"
-					"		mp4" # bug #387961 (aac, mp3, ape can sit there)
-					"mp3		mpg123"
-					"		modplug"
-					"		musepack"
-					"DISABLED	nms" # not in tree
-					"ENABLED	normalize"
-					"ENABLED	null"
-					"ENABLED	nulstripper"
-					"		ofa"
-					"		opus"
-					"		oss"
-					"ENABLED	pls"
-					"pulseaudio	pulse"
-					"ENABLED	replaygain"
-					"xml		rss"
-					"		samba"
-					"DISABLED	sc68" #not in tree
-					"		sid"
-					"		sndfile"
-					"		speex"
-					"DISABLED	sun" # {Open,Net}BSD only
-					"DISABLED	tremor" # not in tree
-					"		vorbis"
-					"		vocoder"
-					"ffmpeg		tta"
-					"ENABLED	wave"
-					"DISABLED	waveout" # windows only
-					"		wavpack"
-					"xml		xspf"
-					"ENABLED	xml"
-				)
-
-		local option
-		for option in "${option_map[@]}"; do
-			optionals+=$(xmms2_flag ${option})
-		done
-
-		local plugin
-		for plugin in "${plugin_map[@]}"; do
-			plugins+=$(xmms2_flag ${plugin})
-		done
-
-		if use perl; then
-			perl_set_version
-			waf_params+=( --with-perl-archdir="${ARCH_LIB}" )
-		fi
-	fi # ! server
-
-	# pass them explicitely even if empty as we try to avoid magic deps
-	waf_params+=(
-		--with-optionals="${optionals:1}" # skip first ',' if yet
-		--with-plugins="${plugins:1}"
-		$(use_with valgrind)
-	)
-
-	CC="$(tc-getCC)"         \
-	CPP="$(tc-getCPP)"       \
-	AR="$(tc-getAR)"         \
-	RANLIB="$(tc-getRANLIB)" \
-	CXX="$(tc-getCXX)"       \
-	    ./waf configure "${waf_params[@]}" || die "'waf configure' failed"
-}
-
-src_compile() {
-	# waf is very keen to run tests in build phase (bug #424377) but
-	# it does not bother running tests twice, so the hack below works:
-	./waf --verbose build || ./waf --verbose build || die "waf build failed"
-}
-
-src_test() {
-	# rerun tests
-	./waf --alltests || die "waf --alltests failed"
-}
-
-src_install() {
-	./waf --without-ldconfig --destdir="${D}" install || die "'waf install' failed"
-	dodoc AUTHORS TODO
-
-	python_optimize
-
-	# waftools/man.py always compresses man pages with gzip.
-	# to avoid code changed let's just un-gzip manpages
-	local m
-	for m in "${ED}"/usr/share/man/man1/*.gz; do
-		# For some combination of USEs no mans are installed.
-		if [[ -f ${m} ]]; then
-			einfo "Uncompressing '${m#${ED}}' back."
-			gzip -d "${m}" || die
-		fi
-	done
-}
-
-pkg_postinst() {
-	if use phonehome ; then
-		einfo ""
-		einfo "The phone-home client xmms2-et was activated"
-		einfo "This client sends anonymous usage-statistics to the xmms2"
-		einfo "developers which may help finding bugs"
-		einfo "Disable the phonehome useflag if you don't like that"
-	fi
-}
diff --git a/media-sound/xmms2/xmms2-0.8_p20201016.ebuild b/media-sound/xmms2/xmms2-0.8_p20201016.ebuild
index 6966575236d9..d01c06980c3a 100644
--- a/media-sound/xmms2/xmms2-0.8_p20201016.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20201016.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}-devel-${XMMS2_COMMIT}"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc x86"
 
 # IUSE static map to be passed to --with-{optionals,plugins}=opt1,opt2,...
 # flag:opt = `usev flag opt`, opt = `usev opt`, :opt = `echo opt`
@@ -221,7 +221,7 @@ src_test() {
 }
 
 src_install() {
-	./waf install --destdir="${D}" --without-ldconfig || die
+	./waf install --destdir="${D}" --without-ldconfig --notests || die
 
 	einstalldocs
 
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index e358ed871e04..08207fdd8084 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,5 +1,5 @@
 DIST yoshimi-2.0.2.tar.gz 7017339 BLAKE2B a0e129b3f667dff28e043ab69416992556f4e737e786baa79c361cff9411b849acf815e9d37f1a0338ce81f3014c3f44f0a27c3287cdd9c29d6c453a44c49cc2 SHA512 f83eed05dbe63e1966086ac0d19d02fafabce7ce10c6579ab8a95fd5fec7c040d516a4d979f38181f31c9f7720e92fac3c99c3737ddc4b0d4005bcdc45dea40f
 DIST yoshimi-2.1.0.tar.gz 7471945 BLAKE2B f95fb49ec901e5a513960bfc4c1d27ce1979f3cd664d7ca7ddb723ad41fb06153749db0560a32f41c44c7fb433fde09ee49e898cb8bf55e232536b163d616992 SHA512 d90666ca2599d057d5c22abfc5e64f9a31eb323d13c50f771b92c5f94f7da9049b79dc8a478b3832142a97f8c2f5ea384a26e1543fdd6c063930989e34b146eb
 EBUILD yoshimi-2.0.2.ebuild 1003 BLAKE2B 91bfecb1c3e29de09bebf9f193a34a1a0da8d9b75b8bdb44c0f6da0f9d6e73352a175781e8497c18589a5995567027363ed4173864cb9821b35aa54ca840e807 SHA512 4a888ff968ba8473d2bae1dcc2a26b233a19d38a75be15f94e0bc48863853cdf2932ecd9d7064461a46d999b60d1865d91f64564639627ddc42cb17e7c3aba48
-EBUILD yoshimi-2.1.0.ebuild 1005 BLAKE2B 187ff9d4a64f3f3ceb58b3ea288aa0aa1c58ce72d71a729906060183b22bfac3e6fa60d04d22a3e8542c53657d6c9ca4416476ec2769e60406b375b599d6a18b SHA512 948a96b1b44ef68d759a64114648cf86ad07579d7d4d47cd0e5d3b55379049f7500ece2a347c3bbc72969a4eb15505d1d5bdf567476f0bcddf33037a7622f092
+EBUILD yoshimi-2.1.0-r1.ebuild 1195 BLAKE2B 0d5c2293fd43c238fb68bbbb0cd21f5554d16dccd9ca10de130136ff7813c450cc1ede150b8b278ac2b9e9d8502332cf9032ff433ccab94f9bdbc882af85e295 SHA512 1837120f7c243549b618bb261b46ed0ad6ac3846c3b89a6126b5a73b203a8d9a2b250ae441c6253bbcff61cfd36b2945bf1faaaaf79d2735d16a35c8db930a42
 MISC metadata.xml 1414 BLAKE2B 4dab154682ec4f0dfe9f4ee1f2b1510f020ef9bf8ce8b871c7bae3709a505faff8e07a2af20cedc3de357dd01c5a2bc192b2776153c1fb028894db732e0215dc SHA512 0ae6d64001643cc80c58929a4d28af6c3c4e0433b31567091e495dd34c350f7fa8908bf89d9aea1b3f004b40e7c8b60ec36025d04fa510f93af17f2316833c61
diff --git a/media-sound/yoshimi/yoshimi-2.1.0.ebuild b/media-sound/yoshimi/yoshimi-2.1.0-r1.ebuild
index ae3192e6c50e..23dfc649dc2c 100644
--- a/media-sound/yoshimi/yoshimi-2.1.0.ebuild
+++ b/media-sound/yoshimi/yoshimi-2.1.0-r1.ebuild
@@ -48,3 +48,13 @@ src_configure() {
 	)
 	cmake_src_configure
 }
+
+src_install() {
+	cmake_src_install
+
+	# unpack Histories.tar.bz2 to avoid QA issues
+	pushd "${ED}/usr/share/doc/${PF}" || die
+	tar xvf Histories.tar.bz2 || die
+	rm Histories.tar.bz2
+	popd
+}