gentoo resync : 24.07.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-07-24 02:11:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-07-24 02:11:45 +0100
commit: b49088575eb777ced2551f484da86317332d6087 (patch)
tree: bf9a151cf2d61956340d555659ffc098ee1da466 /media-sound
parent: 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (diff)
90 files changed, 994 insertions, 672 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1d754e793b3d..1f87c7f18ef5 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index ab8771b7522f..9f6ac1760e46 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -3,6 +3,6 @@ AUX 1.4.9-0002-Disable-test_completion.patch 2879 BLAKE2B 7f1b21d92ec93e3a2606a4
 AUX 1.4.9-0003-Try-to-work-around-a-Werkzeug-change.patch 698 BLAKE2B f7064a5db51e53d70b6d30332c3f6e039873461931c5e4052136675013728792fbc98f561f6fcf62432f58bc7702e54f34d04c43586d9a07ecdc789019aec040 SHA512 3e3af6d760596a08fac6130912ed5780795975e0ade8c4f27f577453b82cbc588de9d23d9d2c1672841913d5627fe684cd8373670851e59b6fe1e0a57b138009
 AUX 1.4.9-0004-Fix-3608-Replace-discogs-client-with-python3-discogs.patch 4650 BLAKE2B 446977fdf23aeaa1afaa85bb16f8dfddc3e7a00af8253a061afbf78d4667979119653ac16af7dc3e24f92606437bdcc4066907ab3ac053e97712c0dd12819b9f SHA512 8f647eb5b87a91ed9c65f9d819980d1f6da740b76b4265288e5e29d614854062bd5769a1ebb1e0a1428fa7aeabe01f1827364c0639db0d2383c4e5dec7bc64fd
 DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a
-EBUILD beets-1.4.9-r6.ebuild 4532 BLAKE2B 4ade846a90fbe3438a86c7a0c4794e34bf231ccd4c2dd3ef3f0a8978edc6dae17fe23f8bde7bb7e1f738086f10b62b521f881c8ad2601c7c1703918e59d35323 SHA512 db10f1e25109ad3c953ae6d71db8db80733145dddafb782a3bb79bbb7c6c26fccb281dcf565ad131b69d2ef46721d113c0e08a48f37a4ca7aaee6c1a5fb4d99f
-EBUILD beets-9999.ebuild 4447 BLAKE2B 8311aab3da17e5a048b607ac402fad4effe4b68d9c3412e7c7991e775244844b4a7ac8c69ee01f5c91c4492a1e32e57ff37ac28f444aa7ece1e0ea69b611d299 SHA512 b5cfc2d2c25c46037b1d84849a3b3e662206a5adb76f24e74c2b5a6caf0c3e6cf4733a1f4070c9c5d302de744225eb1012f5e20d51cf75b3ff27d4fa8c602955
+EBUILD beets-1.4.9-r6.ebuild 4394 BLAKE2B bf85e77c183218f604cf08a3ad68ab8a6974b3e08e837c94ea3f09ec57c3e540f766ca380825a9b5632d1181eaa23bd7897e96f335ae480a726837620608cff3 SHA512 da1492f8a3c662e43fbdee71d2f9e7cb731a2a1ab203a241f19352576e52c5859a1fdf9c766f07df832bb70c7f5e20a610c70a966a6d903a58249a4d28537227
+EBUILD beets-9999.ebuild 4309 BLAKE2B a2f74c59f961c391a3f6f00e8d88366b7eb48ae69a133de996181bd38f1d47f837ecf43b120f2334c3f09203cb80d9ed95c3b985baf4c57ef3f2a451730e9309 SHA512 fb2135dc3c5b6e87257b7c5f3820688f79ff6018eaa4a3d13eff0fb942e8a6aadbd41a0db0a384dd6179888c55d8edc87abd5bfc024708b72221eb7bce2ee9e7
 MISC metadata.xml 1781 BLAKE2B 25306614dd6eec756d4d593f72b27ad19a2809553642db7c836162c76d7086f29ddd50019dd5160c0ac67e448ce7ededa358d06e5ae91a13c96b9e25e6871e10 SHA512 fb2ca0157b42b86a7065320a14dade86dba95fbb55a3f24d0ca8b40cc5a31fdb5013f9d369e3220d8eaacd994f879c02f419769bf9a1b56d38156b7cc2f7f588
diff --git a/media-sound/beets/beets-1.4.9-r6.ebuild b/media-sound/beets/beets-1.4.9-r6.ebuild
index 4fd12ebc72c4..742f2c162d47 100644
--- a/media-sound/beets/beets-1.4.9-r6.ebuild
+++ b/media-sound/beets/beets-1.4.9-r6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -31,15 +31,15 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-python/jellyfish-0.7.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/munkres[${PYTHON_MULTI_USEDEP}]
-		>=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
-		dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
+		dev-python/munkres[${PYTHON_USEDEP}]
+		>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
+		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9[${PYTHON_USEDEP}]
+		dev-python/unidecode[${PYTHON_USEDEP}]
 	')"
 DEPEND="
 	${RDEPEND}
@@ -51,23 +51,23 @@ BDEPEND="
 	$(python_gen_cond_dep '
 		test? (
 			dev-db/sqlite[icu]
-			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
-			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
-			dev-python/discogs-client[${PYTHON_MULTI_USEDEP}]
-			dev-python/flask[${PYTHON_MULTI_USEDEP}]
-			dev-python/mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
-			dev-python/pylast[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+			dev-python/beautifulsoup[${PYTHON_USEDEP}]
+			dev-python/bluelet[${PYTHON_USEDEP}]
+			dev-python/discogs-client[${PYTHON_USEDEP}]
+			dev-python/flask[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pyacoustid[${PYTHON_USEDEP}]
+			dev-python/pylast[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			dev-python/python-mpd[${PYTHON_USEDEP}]
+			dev-python/pyxdg[${PYTHON_USEDEP}]
 			|| (
-				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+				dev-python/pillow[${PYTHON_USEDEP}]
 				media-gfx/imagemagick
 			)
-			dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
-			dev-python/responses[${PYTHON_MULTI_USEDEP}]
-			dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+			dev-python/rarfile[${PYTHON_USEDEP}]
+			dev-python/responses[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
 			media-libs/chromaprint[tools]
 			media-libs/flac
 			media-libs/gst-plugins-bad:1.0
diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index cc6a223082b5..c7d2d2175706 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -31,15 +31,15 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-python/jellyfish-0.7.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/munkres[${PYTHON_MULTI_USEDEP}]
-		>=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
-		dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
+		dev-python/munkres[${PYTHON_USEDEP}]
+		>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
+		>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9[${PYTHON_USEDEP}]
+		dev-python/unidecode[${PYTHON_USEDEP}]
 	')"
 DEPEND="
 	${RDEPEND}
@@ -51,23 +51,23 @@ BDEPEND="
 	$(python_gen_cond_dep '
 		test? (
 			dev-db/sqlite[icu]
-			dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
-			dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
-			dev-python/discogs-client[${PYTHON_MULTI_USEDEP}]
-			dev-python/flask[${PYTHON_MULTI_USEDEP}]
-			dev-python/mock[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
-			dev-python/pylast[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+			dev-python/beautifulsoup[${PYTHON_USEDEP}]
+			dev-python/bluelet[${PYTHON_USEDEP}]
+			dev-python/discogs-client[${PYTHON_USEDEP}]
+			dev-python/flask[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pyacoustid[${PYTHON_USEDEP}]
+			dev-python/pylast[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			dev-python/python-mpd[${PYTHON_USEDEP}]
+			dev-python/pyxdg[${PYTHON_USEDEP}]
 			|| (
-				dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+				dev-python/pillow[${PYTHON_USEDEP}]
 				media-gfx/imagemagick
 			)
-			dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
-			dev-python/responses[${PYTHON_MULTI_USEDEP}]
-			dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+			dev-python/rarfile[${PYTHON_USEDEP}]
+			dev-python/responses[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
 			media-libs/chromaprint[tools]
 			media-libs/flac
 			media-libs/gst-plugins-bad:1.0
diff --git a/media-sound/brutefir/Manifest b/media-sound/brutefir/Manifest
index 08a7c5377813..c59f5da351fc 100644
--- a/media-sound/brutefir/Manifest
+++ b/media-sound/brutefir/Manifest
@@ -1,7 +1,4 @@
-AUX brutefir-1.0k-ld.patch 4655 BLAKE2B 56ae2cf653311030e5552e50653082b059baa39bf00d1d9a2692e319b459a88b4bef4e0a1aa01aedd2ec9c97f19de0f03b966d10c6faeeccd6ef907d91b12a59 SHA512 606d32f1b76901e3cb6d106259d19c64e3a6f841fd5d0791623ad824c7264ff3ecd7178073fe488c7f1d26b996b9900f9661406f987f2443e9eb8ef9eeb6491a
 AUX brutefir-1.0o-ld.patch 4226 BLAKE2B 2173740f52c60845e181508619d26b0aa21f52329d6f35ba62fbeaec9ce62f69041fcef84d1e3e999fbd34568116b51716a90b1ea8b4232e20a032efcbbb9f86 SHA512 bf8f736a634b80d40a3880393b9958f78278f83c122e310a8e3848ec83634e6d729754cae22c3e455292be84ba0ce8e794fe1009cb5c9eeb3bdc2efca9037b1e
-DIST brutefir-1.0k.tar.gz 246987 BLAKE2B 3db08c1f51e8febb63b293d1a242342e7d9f4fa4b447b46da37bc3de594bef8a6ee15cd8330ef73673011186dcfe47a5b056ec3c177f3982cd1837a582f050a1 SHA512 5eb81a18935fc3f014613b74c30b2e9a3acfe0ab58b72358f0428b60f0296ab54796b99fa00b12a671935b57589d710dd81b1e0ca675bd2b841c9e932a2c94ef
 DIST brutefir-1.0o.tar.gz 246504 BLAKE2B ab2b3c1d22e45422d01aa45a9e869770cbf017d85c1f7af54562a0972545df1f9ae5aa0d155baa02ee5aeef1c65eccf6bc9c9f75edce0f54882e4095ba2f1493 SHA512 e696948eeabb54a9cea8a9f2629c11c620fd37bc685cf32d3c21b1ea89ae7127f703c04a1f1775b073f5135b9268cc0a387c8087da5828cc2194295f850e8d1f
-EBUILD brutefir-1.0k-r2.ebuild 1066 BLAKE2B efbf3ea427688107fdac99fa6c84d118b39bb6a696f01bab9be1fff2080009a1137872383e46033d2570fa70cf6b52d5e860943f988f84dfcaeeacf34ed65c49 SHA512 044b154d4582ccebc9b76c083fa81742b59432216099ac2d73b41f919afee3d88f9f49d671a23d7d491cc27f7cc0cddf9d2096299fbd3877bb07e063c3e8c6a1
-EBUILD brutefir-1.0o.ebuild 1065 BLAKE2B 7de0cc6545b88c7755912bad73bb524d8556722161e98e12e67c48f5df070e41dc7e5c1443e5e18d98012ac32a2d4e71356238eee7ddf1251ddcc43477b758d0 SHA512 765229b15dae7542fbda5d9a1d0c6d4528e12c7e9d7fcf06bf0ce41d4526c728efd853103542a63b271ec79634a22ae25da245d777fe06357e85a81c02af12f3
+EBUILD brutefir-1.0o.ebuild 1063 BLAKE2B fa81db073894f7d0fbc8140846c9793fb5f1c2e1946803f1946b0ca822293c0b511458fe3d9b25a0a9e1f6e4848e88f34483f5b2dccb7dd6119a4255fb070a11 SHA512 b18c3cd495134c8fd596a6408eb1d4c521b9dc535c93001c4af6f7e380ff37b89552a30dbb6b9d4d0b673cde9f9885f83f379328314ce33adab508ff44902a1c
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/brutefir/brutefir-1.0k-r2.ebuild b/media-sound/brutefir/brutefir-1.0k-r2.ebuild
deleted file mode 100644
index 28ddf46c7b96..000000000000
--- a/media-sound/brutefir/brutefir-1.0k-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Software convolution engine for applying long FIR filters"
-HOMEPAGE="https://torger.se/anders/brutefir.html"
-SRC_URI="https://torger.se/anders/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	media-libs/alsa-lib
-	sci-libs/fftw:3.0
-	virtual/jack"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-ld.patch )
-
-src_compile() {
-	tc-export AS CC
-	emake
-}
-
-src_install() {
-	emake LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" \
-		install
-	dodoc CHANGES README
-
-	insinto /usr/share/${PN}
-	doins xtc_config directpath.txt crosspath.txt massive_config \
-		bench1_config bench2_config bench3_config bench4_config \
-		bench5_config
-}
-
-pkg_postinst() {
-	elog "Brutefir is a complicated piece of software. Please"
-	elog "read the documentation first! You can find"
-	elog "documentation here: http://www.ludd.luth.se/~torger/brutefir.html"
-	elog "Example config files are in /usr/share/brutefir"
-}
diff --git a/media-sound/brutefir/brutefir-1.0o.ebuild b/media-sound/brutefir/brutefir-1.0o.ebuild
index 62520e57bd6b..50944dbbc9bf 100644
--- a/media-sound/brutefir/brutefir-1.0o.ebuild
+++ b/media-sound/brutefir/brutefir-1.0o.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://torger.se/anders/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	media-libs/alsa-lib
diff --git a/media-sound/brutefir/files/brutefir-1.0k-ld.patch b/media-sound/brutefir/files/brutefir-1.0k-ld.patch
deleted file mode 100644
index 6860b5f360b5..000000000000
--- a/media-sound/brutefir/files/brutefir-1.0k-ld.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-The problem is that it passes -fPIC to the linker, and it does not use gcc as
-frontend, it uses ld directly. The problem is that -f on ld that produces a
-DT_AUXILIARY rather than causing any PIC code production. Fix also DESTDIR
-handling and add LIBDIR variable for multilib systems.
-
-See, http://bugs.gentoo.org/252338
-
-diff -ur brutefir-1.0k.orig/Makefile brutefir-1.0k/Makefile
---- brutefir-1.0k.orig/Makefile	2009-03-31 22:36:20.000000000 +0300
-+++ brutefir-1.0k/Makefile	2009-06-21 05:44:03.000000000 +0300
-@@ -1,11 +1,13 @@
- ###################################
- # Where to install
--INSTALL_PREFIX	= $(DESTDIR)/usr/local
-+# PREFIX	= /usr/local
-+PREFIX		= /usr
-+LIBDIR		= $(PREFIX)/lib
- 
- ###################################
- # Where to find libraries, and their header files.
--LIBPATHS	= -L/usr/local/lib
--INCLUDE		= -I/usr/local/include
-+# LIBPATHS	= -L/usr/local/lib
-+# INCLUDE	= -I/usr/local/include
- ifdef FFTW_PATH
- LIBPATHS	+= -L$(FFTW_PATH)/lib
- INCLUDE		+= -I$(FFTW_PATH)/include
-@@ -17,19 +19,15 @@
- 
- ###################################
- # Binaries
--FLEX	= flex
--LD	= ld
--CC	= gcc
--AS	= as
-+FLEX	?= flex
-+CC	?= gcc
-+AS	?= as
- 
- ###################################
- # Flags
--CC_WARN		= -Wall -Wlong-long -Wpointer-arith -Wshadow \
-+CFLAGS		+= -Wall -Wlong-long -Wpointer-arith -Wshadow \
- -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes \
- -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
--CC_FLAGS	= $(DEFINE) -O2
--CC_FPIC		= -fPIC
--LD_SHARED	= -shared
- 
- ###################################
- # Objects and libs for targets
-@@ -74,7 +72,7 @@
- BRUTEFIR_OBJS	+= $(BRUTEFIR_IA32_OBJS)
- endif
- BRUTEFIR_LIBS	+= -ldl
--LDMULTIPLEDEFS	= -Xlinker --allow-multiple-definition
-+LINKFLAGS	= -fPIC -shared -Xlinker --allow-multiple-definition
- # assume that we have alsa, osss and jack
- LIB_TARGETS	+= alsa.bfio
- LIB_TARGETS	+= oss.bfio
-@@ -83,11 +81,11 @@
- 
- # Solaris
- ifeq ($(UNAME),SunOS)
--CC_WARN		= -Wall -Wlong-long -Wpointer-arith -Wshadow \
-+CFLAGS		+= -Wall -Wlong-long -Wpointer-arith -Wshadow \
- -Wcast-qual -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations \
- -Wnested-externs
- ifeq ($(UNAME_P),sparc)
--CC_FLAGS	+= -Wa,-xarch=v8plus
-+CFLAGS		+= -Wa,-xarch=v8plus
- endif
- BRUTEFIR_LIBS	+= -lrt -ldl
- endif
-@@ -112,43 +110,44 @@
- 	$(AS) -o $@			$<
- 
- %.fpic.o: %.c
--	$(CC) -o $@			-c $(INCLUDE) $(CC_FPIC) $(CC_WARN) $(CC_FLAGS) $<
-+	$(CC) -fPIC -shared -o $@	-c $(INCLUDE) $(CFLAGS) $<
- 
- %.o: %.c
--	$(CC) -o $@			-c $(INCLUDE) $(CC_WARN) $(CC_FLAGS) $<
-+	$(CC) -o $@			-c $(INCLUDE) $(CFLAGS) $<
- 
- # special rule to avoid to get warnings from code generated by flex
- bfconf_lexical.o: bfconf_lexical.c
--	$(CC) -o $@			-c $(INCLUDE) $(CC_FLAGS) $<
-+	$(CC) -o $@			-c $(INCLUDE) $(CFLAGS) $<
- 
- %.c: %.lex
- 	$(FLEX) -o$@ $<
- 
- brutefir: $(BRUTEFIR_OBJS)
--	$(CC) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
-+	$(CC) $(LDFLAGS) $(LDMULTIPLEDEFS) $(CFLAGS) $(LIBPATHS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
- 
- alsa.bfio: $(BFIO_ALSA_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
- 
- oss.bfio: $(BFIO_OSS_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
- 
- jack.bfio: $(BFIO_JACK_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
- 
- file.bfio: $(BFIO_FILE_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
- 
- cli.bflogic: $(BFLOGIC_CLI_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
- 
- eq.bflogic: $(BFLOGIC_EQ_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
- 
- install: $(BIN_TARGETS) $(LIB_TARGETS)
--	install -d $(INSTALL_PREFIX)/bin $(INSTALL_PREFIX)/lib/brutefir
--	install $(BIN_TARGETS) $(INSTALL_PREFIX)/bin
--	install $(LIB_TARGETS) $(INSTALL_PREFIX)/lib/brutefir
-+	install -d $(DESTDIR)$(PREFIX)/bin
-+	install $(BIN_TARGETS) $(DESTDIR)$(PREFIX)/bin
-+	install -d $(DESTDIR)$(LIBDIR)/brutefir
-+	install $(LIB_TARGETS) $(DESTDIR)$(LIBDIR)/brutefir
- 
- clean:
- 	rm -f *.core core bfconf_lexical.c $(BRUTEFIR_OBJS) $(BFIO_FILE_OBJS)  \
diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index d23240331274..73138922612b 100644
--- a/media-sound/cadence/Manifest
+++ b/media-sound/cadence/Manifest
@@ -1,6 +1,6 @@
 AUX cadence-0.9.1-fix-clang.patch 424 BLAKE2B 181975de4d015393cfe9406e3e94c3d984a342b9d3d80aa0caa2151ec3825430a9f1210f3c2f3b104a8d90f83f27483b3a4b8bec10ae5107a2846fb629d57695 SHA512 544eb77db3715a9c2990375aaf77515896ba43f67dbb1572428444a1386ed5aa0cdebd6e24fb3f6f20b8ebc0dfd6982709f39178c39759dce1cfe381116db719
 AUX cadence-0.9.1-fix-qt5.15.patch 1251 BLAKE2B 45b85382b8c4507ddf38e9f3f75b89b019ae85348da624730abf93c44bd3031db52387c4ce2937a63a74920e9c8106bd51426764fc29e235b64a6f5df1a37a6c SHA512 fee8febc697da57e049d5cad14a205ba1edd576051d7200abcbabac3cb8133c96dc70a620f2bb6130900cc475cd70c9db34f32b1c8cffca30c6fe23afcb37713
 DIST cadence-0.9.1.tar.gz 2202272 BLAKE2B 0f96a3eadc90540ef455e3b9c9abe1b8dc0d912936642c77e52a3704367f06e870b4cbe0bee78482436b9b099063c66b0b04007e8905b7eaf213d6b2f9aa08d1 SHA512 daa9df947f0198522172451ec3d2a0e138de5245d4fa849c89ae17fc141388467bdb2e5b1ed191d1db372f4d1c02a8f1c32458c20b893d413af8fdce72ee9219
-EBUILD cadence-0.9.1.ebuild 2414 BLAKE2B 32dff6e89a16624af031a3b42ce21b4bc9d8e75747a4c68427b2f2689841a7694d81546ec101cd33accbf3b0fdd0d72b27e3e408d23f1770d83c0dc10bc201f0 SHA512 514fea7a00b8371b10c106121961818f9e8cbbba80be602f1eeedb01c513f897331adf9cd6cf8e0e3b83e29bc69b4674c050d43f425f61ec75a6fdf5968bac5f
-EBUILD cadence-9999.ebuild 2385 BLAKE2B 97e0c262182d80e2bb66039d53ffa7544a29627a17ebc2ef5662188b63ac02a50d2840fbbbc3d1a987456fab837a962fc6edc5bc317a308dfcad5f85f618df24 SHA512 9c66e750c5bc3386c8a60919cca0e6da2ac992c04d12b6565d9952e2825857a6fe344739a943fcbffa76aa4dadf8f93282dbe8910df2474020513d4d40586240
+EBUILD cadence-0.9.1.ebuild 2400 BLAKE2B 1a4ebfc57a21ebb69a4852fdb10767a21f8310d93ccab1aefbf9cabd7936df119a8b13775586c0da35b8697539f406ae8701eb23bcbdb4aa4515b91ab61c3737 SHA512 3ea75d54a08a6e49dc35624cbeafd9681381c118c5bfb3878edd064c8f3ae766133b38939c74a165f708ad9bea4b150c94e89a66f9b0deeb9e4118fc4d312efd
+EBUILD cadence-9999.ebuild 2371 BLAKE2B c3a7f029aed508edd6c101ad37d8c2e4fcb0c31a87b36cc5b72e489b5ffa38c7fde095a089f5c90b9213d673319241a1aec75d74f70c5d36def47fc9de30fb89 SHA512 e2fc0edeb8259fb68cf87c5d2c676db3c3d0d7b600a9ccdf8a73360a13115cc80911218465e84c4ff0223e8963832851a10d10a4f16da2b5440dfd8cbd292f6c
 MISC metadata.xml 479 BLAKE2B 3690ab2ae4302a28f89271af11a205dcfa8cb0b5eafd13e818f603d66c2ac11caf131cef21e6fd5f924ba8ef59e8e3db45d782fe4dde97c63024736a15c33d4f SHA512 6e7b12c1edf9dc3214a3c19e3cc5aaff60abe737b50c91d3160aa81fc45927a93812a76d161db03f4068f06ab765c1f699e73fa85cbef5f7a4035188ea582e8c
diff --git a/media-sound/cadence/cadence-0.9.1.ebuild b/media-sound/cadence/cadence-0.9.1.ebuild
index 7ce406e271d8..b58caa5bcf98 100644
--- a/media-sound/cadence/cadence-0.9.1.ebuild
+++ b/media-sound/cadence/cadence-0.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit python-single-r1 xdg desktop
 
 DESCRIPTION="Collection of tools useful for audio production"
@@ -28,8 +28,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 CDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
 	')
 	media-sound/jack_capture
 	virtual/jack
diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
index 8aa575803de1..d8aac43cc777 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit python-single-r1 xdg desktop
 
 DESCRIPTION="Collection of tools useful for audio production"
@@ -28,8 +28,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 CDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
 	')
 	media-sound/jack_capture
 	virtual/jack
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index 507bfdb4a5ac..ae0b0b62a0df 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,5 +1,5 @@
 AUX cmus-2.9.1-atomic.patch 554 BLAKE2B 1a5e2b4497ed3ccc95bf5345607a8f4efedbff6852cb0abc40d0665180e0e74a25e17ba8bb121e1343f1964cf7523abdf987595c1eefc1486fd459bfb0b6a696 SHA512 9e64c6ff6184862e02c248b9a26cbde785740d622370bf761df949824ed8759825ad9bb208180f0d5d1aacd3c506994561c98690902b25cc34cbb87929e3c886
 DIST cmus-2.9.1.tar.gz 321004 BLAKE2B 1531d9ca8c1fd54ca487eb2b9ce8602f2d448dd80567a04bfc18449d60fbcd5286cd9f0d19983a885b2a532793c44d7dab8c1993ac8d7f5ada4f01ce670404d9 SHA512 b417e58a68c54e97db92b8760a49a3071e81f1594f2144911eed3ccceb68499dedf0699ae313babcb822d71b37add8880dfb2018686cb572e89f8627446d5e05
-EBUILD cmus-2.9.1.ebuild 3706 BLAKE2B 87b99a5d1fa95c12204dfd1e550b622543fa40272633fcf6ffdb08bd3d7faaf72c624b59812c90c4ba8af3f779f80dc916c584d5e2c416d62e10f2de40ee6431 SHA512 47638d4588881af8e245810dc23ea2f15326f4356bde80e582127c80f557dea07640e1281bcf4b860b63c12476e5328e14cccad051256a032a4748c0174bd5a9
-EBUILD cmus-9999.ebuild 3665 BLAKE2B 89772a1e4c3881e11d82700c5b5db08f50dad18e45a9e1f3107b6b56ea76cef167313dc3b16175bdd50574725d5c902d5b0ea28f0cb61bca14da5096261eaa6e SHA512 0de2bc5ccd53eebba4576a7679a40f8afba4089768663477a6f5448fb2efd3cfb208c94fdbbe776c6273b93f2b87d9325f22f7e32dc5d5f6bdb33b638b870ade
+EBUILD cmus-2.9.1-r1.ebuild 3708 BLAKE2B 3d2134bfbc561a3ad29c4bf6a0d9cefb7e38d6e65d619771c0f696e9e48d2d838d0cbe6dafd21feaee09fd75e3ef8617d7b329060e6a885179b6b16021749b64 SHA512 7eb1581f02ea726dadd38e1899f4b2526b18ed2fd895864d35fcab9c7bb255cca0e9df321fbb803aee6c044bb23ee9ca49c2a47f736fd9f05ca2588dd517cb31
+EBUILD cmus-9999.ebuild 3667 BLAKE2B da52cc5e70612f744fa9f4d8d4f86024078d7c796ec53e0449eb4a5e9d8c3e0c041dc55c0b361b84660db872ef33d03d07593b6b033b0a473cfde755868d593f SHA512 2a5e039d01cba09309d8a9de2d4e2ce54e1dffcf330cdfb212e28f13e91952b6a96be424e0230ea60e709e99f152d25b3907288fabd7a02763683cf3940758c5
 MISC metadata.xml 884 BLAKE2B f545c30b4f5c1f497b616e0a14bb26e760d528a36153de4fa8d74a745e2c6ea1207c1a3e4625fb8411261dede9d51239a1ade9b258fa1e95c93c4446548f824f SHA512 5976190ba4ffaa3ba0f9b6774ecfe1922ea4a998759bebcb5d8ae1697b09cc54833b352e171b9f3770800ab0145a0f072e576f25d4799d0a94253c211dcf8962
diff --git a/media-sound/cmus/cmus-2.9.1.ebuild b/media-sound/cmus/cmus-2.9.1-r1.ebuild
index 8b85f4342e55..a6b4ad7154ab 100644
--- a/media-sound/cmus/cmus-2.9.1.ebuild
+++ b/media-sound/cmus/cmus-2.9.1-r1.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 DEPEND="
-	sys-libs/ncurses:0=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 	aac? ( media-libs/faad2 )
 	alsa? ( >=media-libs/alsa-lib-1.0.11 )
 	ao? ( media-libs/libao )
diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild
index dc3b1a64b34e..3a73e7ed9e71 100644
--- a/media-sound/cmus/cmus-9999.ebuild
+++ b/media-sound/cmus/cmus-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
@@ -28,7 +28,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 DEPEND="
-	sys-libs/ncurses:0=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 	aac? ( media-libs/faad2 )
 	alsa? ( >=media-libs/alsa-lib-1.0.11 )
 	ao? ( media-libs/libao )
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index ff3f667fd0aa..b0ff2a38703f 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -9,8 +9,10 @@ DIST Csound6.16.0_manual_pdf.zip 9640644 BLAKE2B 7bb35f806568a80abbd84a4f4988217
 DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8 SHA512 a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308
 DIST csound-6.16.0-distributable.tar.xz 25129496 BLAKE2B cecfe82e9d584ac9e453659b617d54d2f899efd3e65243ba38770e5174baec6f12b0fa6c06c8ef2154f7c80faee8b9992bbe0957892a4ba86e142066aea85578 SHA512 243b23fc7cde3f0348953e88856117355b5b7185314045aad1b6dac236e227c558afd3fd8a73d9d760f3e5a30ee50d02cc7fe3d8b4b84fb63fa82c64972ca1ca
 DIST csound-6.16.1-distributable.tar.xz 25142436 BLAKE2B fe29208afe2cfc9740e68da213f269ca909facd452ffdd595e14a6dc14526bd497e8a2bc1832da28b0bbd6c8b9ac8891f79d819abf64cba0a9e1002c42f8e5dd SHA512 2535f16dab6a682e38b8352cb7bb87a65aedf0550c1705cde8a64b3c0112d7fd97e6c366dad18ef9ef5e1baaf7123f2c0032d9a2ab6979c202692c3a4069117e
+DIST csound-6.16.2-distributable.tar.xz 25169396 BLAKE2B f51c27606f53571d998a62667c55c60a831c076ced993c4eaa8fa24a7e0a8d4872055dc59455b70124f51e2c419018345e2d0e9a33b95d4362f8c6bdecb8310d SHA512 b72c89b2935d92840f5cb7f6d5696e74a3528f5d37858218691f0f6331a69f63b261937a8a8d346d6e182cf8f4a40af85167a4e42fd005cfcf5b4c9daa822f75
 EBUILD csound-6.15.0-r101.ebuild 7400 BLAKE2B 9d711ee4305dbbe74d059f67109aa24a55fa99ec661c20c119cbe3344569904dd4f0888eaafb62bdfff2d178cbbc724bb1222b30a7cfd571a027e2b25f1247a0 SHA512 743d51af0fbc2235cba6968bbee28213b4aebc0b876cf4b820e3034a94b6b7d36b4cbaad1facf5f2a87db1cbdbbd4c6ed634f91f8b5ce3d1406040fca8aedf7c
 EBUILD csound-6.16.0.ebuild 7121 BLAKE2B 37403bd6c1326b4684a43e47d60e01eece0ec35f05b8d883ddec22f2648045388e76afde0f62ae8bc8b3dab5ea1b38a85398c1993a147619e37424ef78398e5a SHA512 1b81cd50e7274ce13f99241915c8070b0918160f9669a6b1cbe9a8a58dfdb62030d5dab990dd9d36f893d1f147fc85d6e906e6813253b7a5e7206cbeee734f4b
 EBUILD csound-6.16.1.ebuild 7134 BLAKE2B db5317b6bee40c4c71beafcfe5a835ed0ca5efdb51ca1ad2efa7bd8ba5d163a2d3b209a6fee0e46e19fdef6c1c758a859372028c83681a26c99e8163fbfad98e SHA512 584f1e398cac005552c18e86bec63e4690eb4282c0f9663c0fac4e632ee2aec737c59d6e24b23d0444eb0b5dc43656cb3b0a5873a708ca51a12606bfdbbdac65
+EBUILD csound-6.16.2.ebuild 7134 BLAKE2B db5317b6bee40c4c71beafcfe5a835ed0ca5efdb51ca1ad2efa7bd8ba5d163a2d3b209a6fee0e46e19fdef6c1c758a859372028c83681a26c99e8163fbfad98e SHA512 584f1e398cac005552c18e86bec63e4690eb4282c0f9663c0fac4e632ee2aec737c59d6e24b23d0444eb0b5dc43656cb3b0a5873a708ca51a12606bfdbbdac65
 EBUILD csound-9999.ebuild 6880 BLAKE2B f07b7aff3c721a0115d1edd7e6389ecc7203ff7bb20c4d114516a96490a29af0005837724a1ddeb5ae3ae362fa8a743757c13b6fe16dfc68346089b4e66d837d SHA512 cb74a9452eda7897f5595491d2c974cba029af4609faaed6fadcb2895b850e5c73b0e54c62172bd50919cb46de20aaa9f1a510c8a43298f750ae93cfd34fa256
 MISC metadata.xml 1295 BLAKE2B 9bfc19eeb1c250b89c6b9d452f5de8a9b0b1283e25bb01ce46c75ef4372844a0605c2384ff17f026e31e10f5670067f8568fe3b3a63675408ac380276d76c65a SHA512 75bfb3c156aaf5b59c6e0291bb4b89f605d9ea6c812eaae2fab6638c74220685835c1b91d436f8f2dfdb90ba625327c4c4e274d7e9dfee6b8fdd6bc3e1679a52
diff --git a/media-sound/csound/csound-6.16.2.ebuild b/media-sound/csound/csound-6.16.2.ebuild
new file mode 100644
index 000000000000..b8549ffc9aab
--- /dev/null
+++ b/media-sound/csound/csound-6.16.2.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# As upstream (and we aswell) are not allowed to redistribute scansyn,
+# we have to repackage the tarball. For that purpose use `bash files/repackage.sh version`
+# Reference: https://github.com/csound/csound/issues/1148
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit cmake lua-single python-single-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/csound/csound.git"
+	inherit git-r3
+else
+	DOC_P="Csound$(ver_cut 1-2).0"
+	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
+		doc? (
+			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
+			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
+		)"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Sound design and signal processing system for composition and performance"
+HOMEPAGE="https://csound.github.io/"
+
+LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
+SLOT="0"
+IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
+fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio
+portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
+vim-syntax websocket"
+
+REQUIRED_USE="
+	alsa? ( threads )
+	java? ( cxx )
+	linear? ( double-precision )
+	lua? ( ${LUA_REQUIRED_USE} cxx )
+	python? ( ${PYTHON_REQUIRED_USE} cxx )
+"
+
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	chua? ( dev-libs/boost )
+	lua? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	nls? ( sys-devel/gettext )
+	test? (
+		dev-util/cunit
+		${PYTHON_DEPS}
+	)
+"
+# linear currently works only with sci-mathematics-gmm-5.1
+#   https://github.com/csound/csound/issues/920
+CDEPEND="
+	dev-cpp/eigen:3
+	>=media-libs/libsndfile-1.0.16
+	media-libs/libsamplerate
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	dssi? (
+		media-libs/dssi
+		media-libs/ladspa-sdk
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fltk? ( x11-libs/fltk:1[threads?] )
+	hdf5? ( sci-libs/hdf5 )
+	jack? ( virtual/jack )
+	java? ( >=virtual/jdk-1.8:* )
+	keyboard? ( x11-libs/fltk:1[threads?] )
+	linear? ( =sci-mathematics/gmm-5.1* )
+	lua? ( ${LUA_DEPS} )
+	mp3? ( >=media-sound/lame-3.100-r3 )
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( ${PYTHON_DEPS} )
+	stk? ( media-libs/stk )
+	utils? ( !media-sound/snd )
+	websocket? ( net-libs/libwebsockets:= )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	dev-libs/boost
+"
+
+if [[ ${PV} != "9999" ]]; then
+	DEPEND+="doc? ( app-arch/unzip )"
+fi
+
+# requires specific alsa settings
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
+	"${FILESDIR}/${PN}-6.15.0-lame.patch"
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+
+	if use python || use test ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
+		-e '/-O3/d' \
+		-i CMakeLists.txt || die
+
+	if use doc; then
+		local png="${WORKDIR}/html/images/delayk.png"
+		pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
+		[[ $? -gt 15 ]] && die "Failed to fix ${png}"
+		mv -f ${png/.png/fixed.png} ${png} || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_BELA=OFF
+		-DBUILD_BUCHLA_OPCODES=ON
+		-DBUILD_CHUA_OPCODES=$(usex chua)
+		-DBUILD_COUNTER_OPCODES=ON
+		-DBUILD_CSBEATS=$(usex beats)
+		-DBUILD_CUDA_OPCODES=OFF
+		-DBUILD_CXX_INTERFACE=$(usex cxx)
+		-DBUILD_DSSI_OPCODES=$(usex dssi)
+		-DBUILD_EMUGENS_OPCODES=ON
+		-DBUILD_EXCITER_OPCODES=ON
+		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
+		-DBUILD_FRAMEBUFFER_OPCODES=ON
+		-DBUILD_HDF5_OPCODES=$(usex hdf5)
+		-DBUILD_INSTALLER=OFF
+		-DBUILD_JACK_OPCODES=$(usex jack)
+		-DBUILD_JAVA_INTERFACE=$(usex java)
+		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
+		-DBUILD_LUA_INTERFACE=$(usex lua)
+		-DBUILD_MP3OUT_OPCODE=$(usex mp3)
+		-DBUILD_MULTI_CORE=$(usex threads)
+		-DBUILD_OPENCL_OPCODES=OFF
+		-DBUILD_OSC_OPCODES=$(usex osc)
+		-DBUILD_P5GLOVE_OPCODES=OFF
+		-DBUILD_PADSYNTH_OPCODES=ON
+		-DBUILD_PLATEREV_OPCODES=ON
+		-DBUILD_PVSGENDY_OPCODE=OFF
+		-DBUILD_PYTHON_INTERFACE=$(usex python)
+		-DBUILD_RELEASE=ON
+		-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148
+		-DBUILD_SELECT_OPCODE=ON
+		-DBUILD_SERIAL_OPCODES=ON
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_STACK_OPCODES=ON
+		-DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
+		-DBUILD_STK_OPCODES=$(usex stk)
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_UTILITIES=$(usex utils)
+		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
+		-DBUILD_VST4CS_OPCODES=OFF
+		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
+		-DBUILD_WIIMOTE_OPCODES=OFF
+		-DBUILD_WINSOUND=OFF
+
+		-DFAIL_MISSING=ON
+		-DNEW_PARSER_DEBUG=$(usex debug)
+		-DREQUIRE_PTHREADS=$(usex threads)
+
+		-DUSE_ALSA=$(usex alsa)
+		-DUSE_ATOMIC_BUILTIN=ON
+		-DUSE_AUDIOUNIT=OFF # Apple specific
+		-DUSE_COMPILER_OPTIMIZATIONS=ON
+		-DUSE_COREMIDI=OFF # Apple specific
+		-DUSE_CURL=$(usex curl)
+		-DUSE_DOUBLE=$(usex double-precision)
+		-DUSE_FLTK=$(usex fltk)
+		-DUSE_GETTEXT=$(usex nls)
+		-DUSE_GIT_COMMIT=ON
+		-DUSE_IPMIDI=ON
+		-DUSE_JACK=$(usex jack)
+		-DUSE_LIB64=$([[ $(get_libdir) == "lib64" ]] && echo "ON" || echo "OFF")
+		-DUSE_LRINT=ON
+		-DUSE_PORTAUDIO=$(usex portaudio)
+		-DUSE_PORTMIDI=$(usex portmidi)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+
+	)
+
+	use java && mycmakeargs+=(
+		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
+	)
+
+	use lua && mycmakeargs+=(
+		-DLUA_H_PATH="$(lua_get_include_dir)"
+		-DLUA_LIBRARY="$(lua_get_shared_lib)"
+		# LUA_MODULE_INSTALL_DIR omitted on purpose, csound Lua module links against liblua
+		# so it must NOT be installed into cmod_dir.
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc -r Release_Notes/.
+
+	# generate env.d file
+	cat > "${T}"/62${PN} <<-_EOF_ || die
+		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
+		CSSTRNGS="${EPREFIX}/usr/share/locale"
+	_EOF_
+	if use stk ; then
+		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
+	fi
+	doenvd "${T}"/62${PN}
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	use samples && dodoc -r samples
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins installer/misc/vim/csound_{csd,orc,sco}.vim
+		insinto /usr/share/vim/vimfiles/plugin
+		doins installer/misc/vim/csound.vim
+	fi
+
+	# rename extract to csound_extract (bug #247394)
+	mv "${ED}"/usr/bin/{,csound_}extract || die
+
+	use python && python_optimize
+
+	use java && (dosym lib_jcsound6.so usr/lib64/lib_jcsound.so.1 || die "Failed to create java lib symlink")
+
+	# install docs
+	if [[ ${PV} != "9999" ]] && use doc ; then
+		dodoc "${WORKDIR}"/*.pdf
+		dodoc -r "${WORKDIR}"/html
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "The extract tool is now installed as csound_extract"
+		elog "due to collisions with many other packages (bug #247394)."
+		elog
+	fi
+}
diff --git a/media-sound/dir2ogg/Manifest b/media-sound/dir2ogg/Manifest
index 5368e7291011..a04c3d30edf1 100644
--- a/media-sound/dir2ogg/Manifest
+++ b/media-sound/dir2ogg/Manifest
@@ -1,3 +1,3 @@
 DIST dir2ogg-0.13.tar.gz 20338 BLAKE2B 4f00c7e587eb7bba349d7024977d0d67ac9424a09649650e923df7100c60a67db78f363ac9d41931e969a5d8131f9461485f120cc4f308b0abcca4d5b570aba2 SHA512 292c35dd20a8e0499b3bd22d89c6ed0ae0abcf2b58f669316a2f39d45092a1c9a14fb168ad9ac893dfdd5138600c8be5e66502141c9dc7376b18e1e8d1ca5054
-EBUILD dir2ogg-0.13-r1.ebuild 1208 BLAKE2B aab3238a9de44908065d0b172fb12cd252c3bb014179fbb65e37e34ea1d1b4bf5a4260f6f3335ba1c2fde10dbb3df28183958815a98c40d4db7e3f7c64d53211 SHA512 c2c3b62ccfedd7643528803b58a9fa9674b6bc9d5a6248cb9c2b382cdb010e5020c4129eb752d59f11438b9466ca432b422a5afa24093a72fbaa68a200238277
+EBUILD dir2ogg-0.13-r1.ebuild 1202 BLAKE2B a6b4511265be4fa7c01c85d85834f54fe9f14e1b6c5bfe0dc04b82164bb614fab4db1ed324d0938068dec02e38f32b26007a20f69d44788aaa356bdc4475e595 SHA512 1fd9148ff3a6c58497271524d3a65bc443cbdf50de7c7771f06ac06ca68c6be11acd31184885cfebfef36842931cbae7e563c66a4132261d8c562766286cc213
 MISC metadata.xml 445 BLAKE2B 4c9df40d55c76b73a306d4545da2f0f9a96eec30eb595f7c3646473ea19d487d3e493f9993a201a49710e6b636a58a7689d32a0bf8d0c9b3e305b3084fbc3438 SHA512 4f334533b08adb0b5e100b7facd73dc45e358f4d22739b26e897ff8fd899f07dba1f1d2b27acf3443b72c0306b644334ea392edc5fb2139252cccf253aa28f9c
diff --git a/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild b/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
index e907dba50b31..0b4c50e8cdbd 100644
--- a/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit python-single-r1
 
@@ -20,7 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		>=media-libs/mutagen-1.11[${PYTHON_MULTI_USEDEP}]
+		>=media-libs/mutagen-1.11[${PYTHON_USEDEP}]
 	')
 	media-sound/vorbis-tools[ogg123]
 	aac? ( || (
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index cecba42c86ae..9fbc43fdef58 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -1,3 +1,7 @@
+AUX easyeffects-5.0.4-meson_no_automagic.patch 1520 BLAKE2B e7eb71a9aacdb80cf45b7314acc80a42c48549047e754f8154fdfd901d0b25ec16e25ca64715d26335b9f2c6f8bd5bec2803b09e62f7e8c618435aff5f97e748 SHA512 db116e3727c497774b702c6537c6cef152c5898034ebd0260df4365d65b1e8465181aefb7b5ff28eab2eb5794ce331326b1cd0f313124f3a33c61f073af15b4c
 DIST easyeffects-5.0.4.tar.gz 2070912 BLAKE2B 848d2fa6fc1290b6fc25e13c4bbe4d8df932af63b8fb7e9642c6e24b29360dd17efba71ae0daae265538cd9cde1d9e33de453b0c469e3d54709a3f337cd583a7 SHA512 78074341c8376a4918d09950fd7db8804346cd2e00d6849da464662643809010eeb1d009c44ca5d3eadd2faf3bb9c43a18a41b7c3e77b883beff44618967b30e
+DIST easyeffects-6.0.3.tar.gz 1905373 BLAKE2B f423cefd0e6124ee1128bf5a07fb23df03df4ca25a6ebcbcd122032e5768ee68ff3464cdb51263d731fee3e9f5fee180858d96ab627771099808b1194adb78b1 SHA512 eb88f0befb6cf86b7da03137cb7ed6ac833f204d17860d9bd508dc8b007b2a0fb941b63a015b1179cb4da28abd0b3d8a8c53d026fd5a22057fee27e02618035c
+EBUILD easyeffects-5.0.4-r1.ebuild 2267 BLAKE2B af9ad6a20cd77d8400ecf0fd91889795044414787ff96e7213d9a9a23f1269ca3936136506175600b45bdb1e046dbc7249eaa172e8c9de3450193bbd132fbfdf SHA512 601783a228252724fdd157fdfb5ffc7e83d40aae0f8f6eae69b53f5bb073d6f3ef45b80ded69618821496bbe037071f4f6b5b359ed1ca5cc52563d6ce19d4b0e
 EBUILD easyeffects-5.0.4.ebuild 1790 BLAKE2B 5be8a0a80e5ee355ab69ae30cf9553de9b0859dcdd9baaff20373c7aa1e89d95730a3a2ab0f552a4ee37209cfed53871a5e423b8d434d0532673e230c1fbbd56 SHA512 18ef1d69d988aa1d5553f97c48be4bed66e8d9859d22a2764593c9cfb3f7b36b1e784b0f7ddf6c206f99f4d2a534b133472ee4461afb5a66b04a20f9ba5ff6f2
-MISC metadata.xml 694 BLAKE2B 0995339a202cfc2134c90d19c18a9efb8be097ff69d996d53470bcc94b3c6ad47376749c95ab94a3da917df33ebf01b993b538f7163224dad04eec01efe10ca2 SHA512 941917bf4e9ee80f56f9b7387028dee554210848e706aabd8fe523a635c7d7c77d192a1fdb751dc54c499627409656fa3a180859498aa4b9c0ace386ae789f35
+EBUILD easyeffects-6.0.3.ebuild 1816 BLAKE2B cbb1e54c3b2b7189b0a061d06001b34f6649b585f372c8517e0ece28032f9e8c86ff5284471709f5541ac521170609f483a230fd546c0efdbd8e24fb1de6c5b0 SHA512 e3aac477fb345dd72fc55cc36a20d2cf4e099ff5868638ec7c65b37efb38764c2e45f13f4a08c099274d4d79de6083b17e1290003fc8cb96cb86e3fd0e1c18bb
+MISC metadata.xml 1098 BLAKE2B a64c34f1ecfabe52d954e6f1b9a3e5137c3b68a169166dae3f5cd0b02e22759b1e5e60e530d137e6460407247c1e4ef5c3de59ad959f9467fa296571aa823910 SHA512 303657f7a638668a65c9e17d39de40f46871b0a916ec39198529ab1270b0234705e819ad95a366a127a79fee5243a935d3f99c9daa0bad19ef7bc27f364a0828
diff --git a/media-sound/easyeffects/easyeffects-5.0.4-r1.ebuild b/media-sound/easyeffects/easyeffects-5.0.4-r1.ebuild
new file mode 100644
index 000000000000..a2d4b3ab7ef2
--- /dev/null
+++ b/media-sound/easyeffects/easyeffects-5.0.4-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
+HOMEPAGE="https://github.com/wwmm/easyeffects/tree/pipewire-gstreamer-legacy"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
+	EGIT_BRANCH="pipewire-gstreamer-legacy"
+else
+	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf rnnoise rubberband webrtc zamaudio"
+
+DEPEND=">=dev-libs/boost-1.72:=
+	>=dev-cpp/glibmm-2.56.0:2
+	>=dev-cpp/gtkmm-3.24:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=media-libs/gstreamer-1.12.5:1.0
+	media-libs/gst-plugins-base
+	>=media-libs/gst-plugins-bad-1.12.5:1.0
+	media-libs/libebur128
+	media-libs/libsndfile
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/zita-convolver-3.0.0
+	>=media-video/pipewire-0.3.24[gstreamer]
+	>=x11-libs/gtk+-3.20:3
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 )
+	rnnoise? ( media-libs/rnnoise )"
+RDEPEND="!media-sound/pulseeffects
+	${DEPEND}
+	gnome-extra/yelp
+	>=media-libs/gst-plugins-good-1.12.5:1.0
+	>=media-libs/lsp-plugins-1.1.24[lv2]
+	>=media-plugins/gst-plugins-ladspa-1.12.5:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.5:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.5:1.0
+	sys-apps/dbus
+	calf? ( >=media-plugins/calf-0.90.1[lv2] )
+	rubberband? ( media-libs/rubberband[ladspa] )
+	webrtc? ( media-plugins/gst-plugins-webrtc )
+	zamaudio? ( media-plugins/zam-plugins )"
+# Only header files are used from libsamplerate so put it here rather than DEPEND
+# to avoid unnecessary cross-compilation.
+BDEPEND="dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	media-libs/libsamplerate
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.4-meson_no_automagic.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature bs2b)
+		$(meson_feature rnnoise)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/media-sound/easyeffects/easyeffects-6.0.3.ebuild b/media-sound/easyeffects/easyeffects-6.0.3.ebuild
new file mode 100644
index 000000000000..226bf5a1acd0
--- /dev/null
+++ b/media-sound/easyeffects/easyeffects-6.0.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils 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 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="calf zamaudio"
+
+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:3
+	media-libs/libbs2b
+	media-libs/libebur128
+	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
+	>=x11-libs/gtk+-4.2.1:4"
+RDEPEND="${DEPEND}
+	gnome-extra/yelp
+	>=media-libs/lsp-plugins-1.1.24[lv2]
+	sys-apps/dbus
+	calf? ( >=media-plugins/calf-0.90.1[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/files/easyeffects-5.0.4-meson_no_automagic.patch b/media-sound/easyeffects/files/easyeffects-5.0.4-meson_no_automagic.patch
new file mode 100644
index 000000000000..4e547d404f80
--- /dev/null
+++ b/media-sound/easyeffects/files/easyeffects-5.0.4-meson_no_automagic.patch
@@ -0,0 +1,55 @@
+--- a/meson.build
++++ b/meson.build
+@@ -4,7 +4,7 @@
+ 	'cpp',
+ 	default_options : ['cpp_std=c++17','buildtype=debugoptimized'],
+ 	version: '5.0.4',
+-	meson_version: '>= 0.40.0'
++	meson_version: '>= 0.47.0'
+ )
+ 
+ add_global_arguments('-DG_LOG_DOMAIN="pulseeffects"', language : 'c')
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -0,0 +1,12 @@
++option(
++        'bs2b',
++        type: 'feature',
++        value: 'auto',
++        description: 'Enable bs2b-based Crossfeed plug-in for improving headphone listening of stereo audio records'
++)
++option(
++        'rnnoise',
++        type: 'feature',
++        value: 'auto',
++        description: 'Enable rnnoise-based Noise Reduction plug-in'
++)
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -108,7 +108,7 @@
+ 	dependency('gstreamer-plugins-bad-1.0', version: '>=1.12.5'),
+ 	dependency('gstreamer-fft-1.0'),
+ 	dependency('lilv-0', version: '>=0.22', required: false),
+-	dependency('libbs2b', required: false),
++	dependency('libbs2b', required: get_option('bs2b')),
+ 	dependency('boost', version: '>=1.72', modules:['filesystem']),
+ 	dependency('sndfile'),
+ 	dependency('threads')
+--- a/src/rnnoise/meson.build
++++ b/src/rnnoise/meson.build
+@@ -1,4 +1,5 @@
+-dep_rnnoise = dependency('rnnoise', required: false)
++opt_rnnoise = get_option('rnnoise')
++dep_rnnoise = dependency('rnnoise', required: opt_rnnoise)
+ 
+ if dep_rnnoise.found()
+ 
+@@ -28,7 +29,7 @@
+   	cpp_args: plugins_cxx_args
+ )
+ 
+-else
++elif opt_rnnoise.auto()
+ 
+ message('could not find the RNNoise library')
+ 
diff --git a/media-sound/easyeffects/metadata.xml b/media-sound/easyeffects/metadata.xml
index e4010fa254cf..76b0b6c7e4c8 100644
--- a/media-sound/easyeffects/metadata.xml
+++ b/media-sound/easyeffects/metadata.xml
@@ -10,9 +10,14 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<use>
-		<flag name="bs2b">Enable use of media-libs/libbs2b</flag>
-		<flag name="calf">Enable use of media-plugins/calf for adding various FX</flag>
-		<flag name="rubberband">Enable usse of media-libs/rubberband for the pitch shifting FX</flag>
+		<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="rnnoise">Enable use of <pkg>media-libs/rnnoise</pkg> for the neural network-based
+			noise-reduction FX</flag>
+		<flag name="rubberband">Enable use of <pkg>media-libs/rubberband</pkg> for the pitch-shifting FX</flag>
+		<flag name="webrtc">Enable use of <pkg>media-plugins/gst-plugins-webrtc</pkg> for various
+			voice-enhancement FX</flag>
+		<flag name="zamaudio">Enable use of <pkg>media-plugins/zam-plugins</pkg> for the maximizer FX</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">wwmm/easyeffects</remote-id>
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index df0247f1dfd6..2e6da8e7634d 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -1,5 +1,5 @@
 AUX exaile-4.1.1-metainfo.patch 1472 BLAKE2B 5c466aa63e8fc4538d53f07fcb5c943bbabfb1f4a7b1037b13f013c3cb9286470ae56007e35772ad015863b0debf684f85fa56e1ba664ac2f2ca5a1afc50936b SHA512 80b642e037335706b24ec907bc7d50e2cfb9505c18bed33deecb7d8aa282d6fbdb9ac1272e49f561a99593e498c5b84ea9298297095910950ef5c0208288120e
 DIST exaile-4.1.1.tar.gz 3641073 BLAKE2B 34222ddba782dd51897c017d7a77da9a796e45dad69983f934e76cc559c2e52f2173ee418004943ca087fd894439bc42a6eff2a5d6146e6189ec1cd478f5d08b SHA512 babf37253054fbeb6dad33aedafe969201860d4f35222d577343256730be943682c1a5f2f7cec7c574695624cb2b7abbdff4e6eaada848d22fea073c2c44bd23
-EBUILD exaile-4.1.1.ebuild 1745 BLAKE2B 1208834f32ceebabba8a497a7a0a1d830ede5905c58c73bf65bedc49665fc2c89196f46da8b8cc1963a428694763ce970744f083947819ca26ab304ee32b0251 SHA512 9413433a313b67ff2240d0539c16172b211c0ef5b567259dc9a54df39fac15cf8981e557e9fcba24e2bd5deaacd05f9c77ca74c3eb5b7242c20481e46bd2527f
-EBUILD exaile-9999.ebuild 1752 BLAKE2B 49f121420c3cbe72fbc917f58f16c6156862a58e865dfe8571c826eff0cd67977f5e2d5fc31db7d9ac4e3da90b5405253dbf52ad4b38f52c34f48f47d1111deb SHA512 253ade14a8f5581a6700fe27d7a9ce1a0c5d16dd9433d084411a25ef48440b4a7fc0d26d11b059af0a6bd2a8e05989d39a96ca409fc0578ab27da3a2b9116f86
+EBUILD exaile-4.1.1.ebuild 1703 BLAKE2B b2dab1ea5dbb7188d1276c95d50cfe5b702f46c6854109f44e4320f27fe8d522e396abbc974e5cf3521c48d14821bc483ba25a71be80efdd63dda181efd7992c SHA512 3e6a8eebee581fb2d5bd25dd09e98fc1a412f4e14d39803e099db275501a5930f59abb3a5460d7588e86e2bc15cd3f382fc8f57c59e518066f734e05b8f04e56
+EBUILD exaile-9999.ebuild 1710 BLAKE2B 58b646c3cbbdaa1bd036dc003feec9489ed67d7f35235127334dc38cef5c23af100c7f0c6d864c05b4c6d64a4f8cd635d5475aa6fb46580d9039546147099c3e SHA512 5977d8d627fdc9c20b0d4219f2e19f9d3d8de6823f42fec0b1f04b41503aa17f4e719b7c83227be51b666479ea36bcab464a5ae93002e89d95fd1a8b8c2d78ae
 MISC metadata.xml 465 BLAKE2B 1524388af85ca2f4b928ad4670fa8cc2a86a69f51d72c0dc0a755ca22a05ec95587bab11cfa9f10c9f65cd9a4b08c91ec1fb445f69f9163f54b4a86e2fb99746 SHA512 4185b5a40189086940aa0139e953f39d0af627af73ef2c34f77727e7b8ce596f6f69350531cc7b85cbea4968b7b4413f923f9eda61738a8e1c1dee3b85809942
diff --git a/media-sound/exaile/exaile-4.1.1.ebuild b/media-sound/exaile/exaile-4.1.1.ebuild
index fa7f552d22f3..de0775df2e39 100644
--- a/media-sound/exaile/exaile-4.1.1.ebuild
+++ b/media-sound/exaile/exaile-4.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit python-single-r1 xdg
 
 if [[ ${PV} == "9999" ]]; then
@@ -36,13 +36,13 @@ RDEPEND="${PYTHON_DEPS}
 	>=x11-libs/gtk+-3.10:3[introspection]
 	libnotify? ( >=x11-libs/libnotify-0.7[introspection] )
 	$(python_gen_cond_dep '
-		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygobject-3.13.2:3[${PYTHON_MULTI_USEDEP}]
-		>=media-libs/mutagen-1.10[${PYTHON_MULTI_USEDEP}]
-		scrobbler? ( dev-python/pylast[${PYTHON_MULTI_USEDEP}] )
+		dev-python/bsddb3[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.13.2:3[${PYTHON_USEDEP}]
+		>=media-libs/mutagen-1.10[${PYTHON_USEDEP}]
+		scrobbler? ( dev-python/pylast[${PYTHON_USEDEP}] )
 	')
 "
 
diff --git a/media-sound/exaile/exaile-9999.ebuild b/media-sound/exaile/exaile-9999.ebuild
index 566fd8c3d201..93bda21f7a3e 100644
--- a/media-sound/exaile/exaile-9999.ebuild
+++ b/media-sound/exaile/exaile-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit python-single-r1 xdg
 
 if [[ ${PV} == "9999" ]]; then
@@ -36,13 +36,13 @@ RDEPEND="${PYTHON_DEPS}
 	>=x11-libs/gtk+-3.10:3[introspection]
 	libnotify? ( >=x11-libs/libnotify-0.7[introspection] )
 	$(python_gen_cond_dep '
-		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygobject-3.13.2:3[${PYTHON_MULTI_USEDEP}]
-		>=media-libs/mutagen-1.10[${PYTHON_MULTI_USEDEP}]
-		scrobbler? ( dev-python/pylast[${PYTHON_MULTI_USEDEP}] )
+		dev-python/bsddb3[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.13.2:3[${PYTHON_USEDEP}]
+		>=media-libs/mutagen-1.10[${PYTHON_USEDEP}]
+		scrobbler? ( dev-python/pylast[${PYTHON_USEDEP}] )
 	')
 "
 
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 69506cd6a677..04085932e3f4 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-music-40.0.tar.xz 977412 BLAKE2B acb1823fce3bb7fc8a319a22125deb2c36f4c5cb18f3ea3d21462c1fc71fb52deeb21ffb52ecd5f57aecc975e21dbcec82122f3d4c6fa10f088280efe314a4b7 SHA512 7b1cecd4afe22439e1ee4975c9f6a98690d7abc3a02914483284c258c9bc265d5b3c75cbc9e216603aaeacdc4fdeeff250f2c4e8eff01b84cfe313004266d93f
 DIST gnome-music-40.1.1.tar.xz 978092 BLAKE2B cf9e41e1d519431c33edbd03eb72565612d127d7f6fd82ca34d46b1b3ed58073b7435d3b5b80b149a5fc47ea549018756914dbef5e512cb036303b64b4882083 SHA512 3095dfd31dc32f831e776055d5c1f8c32af5958be632050f709f5c3991b272769edac09a339638de2accf6aae4bf6e8dd1f377a0136897eade2c21d2ebce5f5e
-EBUILD gnome-music-40.0.ebuild 1929 BLAKE2B a86a4506fc9ab52e31b19183ab6d8a102709dfe0c49474924b485990b2228fffa8c6c61faafee8b361bafd8cc09e70bff5d4799f1b532ccef34dffb0c14b640c SHA512 4ac8aea4cd09634a181429376b3f490dc9aa53caa52bb788de36225dd51da22f91b7bb18a02f17eec53cfdd61bd33c15f8fa50c7fb5b297b9fcd305480812621
-EBUILD gnome-music-40.1.1.ebuild 1929 BLAKE2B a86a4506fc9ab52e31b19183ab6d8a102709dfe0c49474924b485990b2228fffa8c6c61faafee8b361bafd8cc09e70bff5d4799f1b532ccef34dffb0c14b640c SHA512 4ac8aea4cd09634a181429376b3f490dc9aa53caa52bb788de36225dd51da22f91b7bb18a02f17eec53cfdd61bd33c15f8fa50c7fb5b297b9fcd305480812621
+EBUILD gnome-music-40.0.ebuild 1917 BLAKE2B 79a231cea6c2402fec980c995cb8ba06b9c69cac14ac7cb65ee543407225e8eef3d5b1f15249afdcdca82220ef2ec147ca174225235b811ea0fef1b65b8d6e1a SHA512 1c28e3bed07c342b552fe12af83ed1cd96545679a3a1bb039ae3488aaefa958016fddd97dbbcdc1ff9cb9e2492e8ee9c17e0f4d6e118104b3b0f922e69bb9d1c
+EBUILD gnome-music-40.1.1.ebuild 1917 BLAKE2B 79a231cea6c2402fec980c995cb8ba06b9c69cac14ac7cb65ee543407225e8eef3d5b1f15249afdcdca82220ef2ec147ca174225235b811ea0fef1b65b8d6e1a SHA512 1c28e3bed07c342b552fe12af83ed1cd96545679a3a1bb039ae3488aaefa958016fddd97dbbcdc1ff9cb9e2492e8ee9c17e0f4d6e118104b3b0f922e69bb9d1c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-40.0.ebuild b/media-sound/gnome-music/gnome-music-40.0.ebuild
index 21901b881186..9a1f62b03fb6 100644
--- a/media-sound/gnome-music/gnome-music-40.0.ebuild
+++ b/media-sound/gnome-music/gnome-music-40.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
@@ -26,8 +26,8 @@ DEPEND="${PYTHON_DEPS}
 	app-misc/tracker:3=[introspection(+)]
 	>=x11-libs/pango-1.44:=
 	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.36.1:3[cairo,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.36.1:3[cairo,${PYTHON_USEDEP}]
+		>=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
 	')
 	>=media-libs/grilo-0.3.13:0.3[introspection]
 	>=media-plugins/grilo-plugins-0.3.13:0.3
diff --git a/media-sound/gnome-music/gnome-music-40.1.1.ebuild b/media-sound/gnome-music/gnome-music-40.1.1.ebuild
index 21901b881186..9a1f62b03fb6 100644
--- a/media-sound/gnome-music/gnome-music-40.1.1.ebuild
+++ b/media-sound/gnome-music/gnome-music-40.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
@@ -26,8 +26,8 @@ DEPEND="${PYTHON_DEPS}
 	app-misc/tracker:3=[introspection(+)]
 	>=x11-libs/pango-1.44:=
 	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.36.1:3[cairo,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.36.1:3[cairo,${PYTHON_USEDEP}]
+		>=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
 	')
 	>=media-libs/grilo-0.3.13:0.3[introspection]
 	>=media-plugins/grilo-plugins-0.3.13:0.3
diff --git a/media-sound/gpodder/Manifest b/media-sound/gpodder/Manifest
index 84601a8aeaaf..d9c0cdb08a88 100644
--- a/media-sound/gpodder/Manifest
+++ b/media-sound/gpodder/Manifest
@@ -1,5 +1,7 @@
 DIST gpodder-3.10.16.tar.gz 1058386 BLAKE2B d73bc8a9d9d2cfe642a6c1e7ae3e7811e05db8c1ebf566904e669a5f9d029c6bce73599da737d25f42c4740d23537b1c414e7a23cf15076394fb714a2f33c79c SHA512 ce9525864e5a640dd82fb535021d63e1d1ddeb7785774b00c668ff86a279a45e075ab7488120ec93d1a07a0a943daa0abb786f822d74866e0fd8c6713d7f8531
 DIST gpodder-3.10.20.tar.gz 1081171 BLAKE2B b2a07a3d5ce02cc46d7dd5999287b6e0bb96149f2fbf613b0d70b8d3b04d4cd29dcd1b78b4584709d1613c9a5478d39c3cb9be35a274358d56aa593f0196e6b2 SHA512 93cae9cc6d7f3a7754e24f7e962d195788f5f344992a4a3f3be9fd9acf419728b94ce009e1a2e14faa64803ebba098e8199a8d43ed33f5f3e02eabde1fe5c3be
-EBUILD gpodder-3.10.16-r1.ebuild 1673 BLAKE2B 50032f1e8587327b1916e131695104702010320c970bac1b824941108b910cdf626fe64773b9b7dcb1c984abf9a7742c40607d3e1343e7558a0aa0a79b15e119 SHA512 344124d54a1bb16fc0ca739777b976d3b108426a4409c205d8ad7497fbfe3a22bc809adb679b74ab162477b921157c43f46b028e3877d9e8c28bd1b9e810adaa
-EBUILD gpodder-3.10.20.ebuild 1830 BLAKE2B 97adcc414795d43f50b9fc9f94ebbf8f7c43e4854669ea7d671ee0c56b79f01392843a0cd6192d49e219ac4f7a66a5359b4ee841d963a633cd908a71ca5a2874 SHA512 443227193b0f5b211268690346427bd31e44fa17149037b879c6998c71b43f0024e2cb13b5239300646ad262c318e52dedecec9dfd4485758df95251ae61a06a
+DIST gpodder-3.10.21.tar.gz 1105520 BLAKE2B c17905951c14a718e48d1bbded3abc41d62088bb517cda053e9fa71e3a952bb97ac57077d428cd58c3a048ae0cc18ef9385af97dcf8b460f3860674ecdb85c1c SHA512 5311a92469f605e489553e91586b788a8d07812e41c20d1ad0717c09ab6db6da22c356d5c1942293d1e27e25afe24caf3c14c15720250d8f230f2d7738206fec
+EBUILD gpodder-3.10.16-r1.ebuild 1623 BLAKE2B 5c5a48a012f963851856ed53392014b0260d02b6869f1ae1c6f33384f1fa3042cffd1d8224fd258aef76cd31db4818048153d6584e67bc05c2508f718a5180dd SHA512 517442df9abb6ebd96ba79a6c8cf904420d8621b825a8075ea4a684cc698cab4b00b2dfeb95a39caf41f678446d5bfbbb58117d3f68de74cb337a578e686af4a
+EBUILD gpodder-3.10.20.ebuild 1828 BLAKE2B c02cf9b22bc7cc28e7310638aebd5ddbf11c7f555ec75143cecc000aecbcd2749f6ac5013a6abbc5c9561790aea5d5e35445a8c0fad23d81987ef6baf5a3c794 SHA512 2b535457e59e5c1790c1396abc5efc53389c9b84f16823dabad1a1d608c3ba5c87d0f0850f7b78d966c31297d38040bb0a36d262077c27158f9bfd99b046ef2f
+EBUILD gpodder-3.10.21.ebuild 1828 BLAKE2B c02cf9b22bc7cc28e7310638aebd5ddbf11c7f555ec75143cecc000aecbcd2749f6ac5013a6abbc5c9561790aea5d5e35445a8c0fad23d81987ef6baf5a3c794 SHA512 2b535457e59e5c1790c1396abc5efc53389c9b84f16823dabad1a1d608c3ba5c87d0f0850f7b78d966c31297d38040bb0a36d262077c27158f9bfd99b046ef2f
 MISC metadata.xml 357 BLAKE2B e9cb306227c9b0dd894c9c2a54db89c56f343bf5e38c87cf9c5e6843a036e18b123cd0079feed2924ad5c561214d6767c2d6474852cb396e543d6d3a604dfb7e SHA512 29feefe6f7c9d11cb06c3b960e19f48b5b33ff1f3a2b58060e6171d9aa2ec0fea49ba23af47e9c2cbc52c2440628af3e735b1e976af3fef957c194589159dee7
diff --git a/media-sound/gpodder/gpodder-3.10.16-r1.ebuild b/media-sound/gpodder/gpodder-3.10.16-r1.ebuild
index b7421bb06ad9..0d09892acd75 100644
--- a/media-sound/gpodder/gpodder-3.10.16-r1.ebuild
+++ b/media-sound/gpodder/gpodder-3.10.16-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
@@ -19,17 +19,17 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+dbus bluetooth kernel_linux mtp test"
 RESTRICT="!test? ( test )"
 
-# As in Fedora: re-enable >=dev-python/eyeD3-0.7[${PYTHON_MULTI_USEDEP}] and
-# ipod? ( media-libs/libgpod[python,${PYTHON_MULTI_USEDEP}] ) once they
+# As in Fedora: re-enable >=dev-python/eyeD3-0.7[${PYTHON_USEDEP}] and
+# ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] ) once they
 # support python3
 COMMON_DEPEND="
 	$(python_gen_cond_dep '
-		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygobject-3.22.0:3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/podcastparser-0.6.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/mygpoclient-1.8[${PYTHON_MULTI_USEDEP}]
-		dbus? ( dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] )
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+		>=dev-python/podcastparser-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/mygpoclient-1.8[${PYTHON_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
 	')
 	bluetooth? ( net-wireless/bluez )
 	mtp? ( >=media-libs/libmtp-1.0.0:= )
diff --git a/media-sound/gpodder/gpodder-3.10.20.ebuild b/media-sound/gpodder/gpodder-3.10.20.ebuild
index 8bda4c68ffd3..7cff7c80eaa7 100644
--- a/media-sound/gpodder/gpodder-3.10.20.ebuild
+++ b/media-sound/gpodder/gpodder-3.10.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
diff --git a/media-sound/gpodder/gpodder-3.10.21.ebuild b/media-sound/gpodder/gpodder-3.10.21.ebuild
new file mode 100644
index 000000000000..7cff7c80eaa7
--- /dev/null
+++ b/media-sound/gpodder/gpodder-3.10.21.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 optfeature xdg
+
+DESCRIPTION="A free cross-platform podcast aggregator"
+HOMEPAGE="https://gpodder.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+dbus bluetooth kernel_linux mtp test"
+RESTRICT="!test? ( test )"
+
+# As in Fedora: re-enable >=dev-python/eyeD3-0.7[${PYTHON_USEDEP}] and
+# ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] ) once they
+# support python3
+COMMON_DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+		>=dev-python/podcastparser-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/mygpoclient-1.8[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	')
+	bluetooth? ( net-wireless/bluez )
+	mtp? ( >=media-libs/libmtp-1.0.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? ( sys-apps/iproute2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-apps/help2man
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/minimock[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:--cov=gpodder::' makefile || die
+}
+
+src_test() {
+	emake releasetest
+}
+
+src_install() {
+	emake PYTHON=${EPYTHON} DESTDIR="${D}" install
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "for the youtube-dl extension" net-misc/youtube-dl
+}
diff --git a/media-sound/herrie/Manifest b/media-sound/herrie/Manifest
index 78c7fffbca17..df374da07dbb 100644
--- a/media-sound/herrie/Manifest
+++ b/media-sound/herrie/Manifest
@@ -2,5 +2,5 @@ AUX herrie-2.2-fix-buildsystem.patch 1132 BLAKE2B af945efc12c6ab5604fada1e7d123d
 AUX herrie-2.2-libxspf.patch 3025 BLAKE2B 22deefb9b02e26b184e5801ac9543a66e4cf4e140368ec34bfa2bee36c99d72899abfac7c62489f3b2efeb121ec478734952054e9626fbe11644050c37ff30e2 SHA512 35122f8a0f16c54085d0c4ce8f1acf409266618116bbb94a8cae2b35c8856270a023d16d3c863ed3c1d06ea1f89a8f1d3d29e244881fb50bfed72b5ca1960192
 AUX herrie-chost_issue.patch 547 BLAKE2B 2310336da0c3e9af7f7758cfe33293694d5a5c0efbf03a3eae4010c2a3ff1e3d62107e001bdb012a166ae84fe9cb9ab3f08b59d3c737e2bca03e3e2d9a53d5e2 SHA512 09b0720ab8f94fef7533d7e16d2ef086aaad3d306487bca6e2f42d0fba96642ad9672f67183bd58542c3af06af643421be66e3c0afff43f023239d4602c13150
 DIST herrie-2.2.tar.bz2 71596 BLAKE2B 7065711dea83c1ff3bb2ede9b155f032f463dc8f51657adcfc1b46076a241cd9bcb62a80284de93b076b3ab9419a4cac01a9edbb8f76f1b07565b20c93e2c3a8 SHA512 7f89100f1c3376d03ebc5e5e3caadccb063470ab623c7b207e9e6aaa01d7e1885d4234e3a50675bc1ade07f5ab52a34022f4e18c9a5b4f9537baa7318f4ab213
-EBUILD herrie-2.2-r1.ebuild 1845 BLAKE2B dcdb0be2847093b640388237398fabb82fb78be71be1b9346ae69eff613a931232a5d65cc5e972fc977ac529c28704d16c7e4829fecea5d829731ba45fc9103c SHA512 7bf9151d124a66e005dd58b65c1523b58ad6c3a5a5a4dea71b455f1b4adae4f9658bb5fafd493de02acd94d9abef885640c6d960c6dbba4cc969a7bfdfb9024c
+EBUILD herrie-2.2-r2.ebuild 1847 BLAKE2B 4f77a546bfd6214af935016f83747387fcdfc998d8c725aac5cd78a27524d33c7327cf048d2920d599730aa02ec8d7ba598e5f62ff2277bbfdd6570898b12067 SHA512 3c1423ebad9fc096daccda8cd5101fa88bc51a76426581659308a22d7985b2ea8956257b99cf1e73074840153c848b5c03d83ec48f8ac95fbb8119619adb1591
 MISC metadata.xml 1055 BLAKE2B fe6982ef85121180c38c9beaa2699940a56dc68f996d1a49c56ad7d16401b3dd2e23a6101357e577b5f271e8313390a979aabe79c9b8e591543dd81ef3fffd39 SHA512 0a987472d87f237e821363b4c6b4cdafce6a5ce43d31a30f09e7f8e9499a9b7b013a02e2d31cbf61be62ff845dec0c21f6b13f7c64ecf2a72666008450ee7dc3
diff --git a/media-sound/herrie/herrie-2.2-r1.ebuild b/media-sound/herrie/herrie-2.2-r2.ebuild
index d50e37ef8671..3ae36bc01359 100644
--- a/media-sound/herrie/herrie-2.2-r1.ebuild
+++ b/media-sound/herrie/herrie-2.2-r2.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ppc x86"
 IUSE="ao +alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls"
 REQUIRED_USE="|| ( ao alsa pulseaudio oss )"
 
-RDEPEND="sys-libs/ncurses:0=[unicode?]
+RDEPEND="sys-libs/ncurses:=[unicode(+)?]
 	>=dev-libs/glib-2:2
 	ao? ( media-libs/libao )
 	alsa? ( media-libs/alsa-lib )
diff --git a/media-sound/jack/Manifest b/media-sound/jack/Manifest
index 2438d1dc1698..4a9323adb19d 100644
--- a/media-sound/jack/Manifest
+++ b/media-sound/jack/Manifest
@@ -1,5 +1,5 @@
 DIST jack-4.0.0_pre20200706.tar.gz 198987 BLAKE2B e45c2457c82901c5cd63f726be3a6931fdb09e9fd5cb1dbaec13951614a108f07c14f98ef7ba18f4c81a0da48d151f13e5f7250121e80c5e8b163c344ce07b15 SHA512 bcb2e629daf6b015cfcb63bb07eed37cc9a517f6581489846bc9cd236c5e9f7163765959f042cbc9a87160dead36cf023c79ce1e3207b14ff52959ed21989dc4
 DIST jack-4.0.0_pre20201220.tar.gz 199310 BLAKE2B d36f52d0cf1ce0744929c1d3da2e0929d3a0bfcfe3f7088bd4f1b170cafa0989921ac1a5a4d8ffec17a86c6eeca4f233c9ca0a159ec76629a5ba48d1686d22cd SHA512 8ff5b5abcfc39ffa373cd215ae5d1fdc9838e92040621e8455485e1243ec6e4bf0fb1675f3280441b2ecc993f996c30c77871e2ba14020ae76ed50634cff15f9
-EBUILD jack-4.0.0_pre20200706.ebuild 1361 BLAKE2B db3bbff27481d95b0ee9e717bc60125383ff1479ab7c489e17901371e023aa9a306ed7dd6f18510e1d763e1795bc8fa34b87cb0bd0bc0ab4132b717e912b1deb SHA512 85eb8d3084b20cdb7713a0e82bf2c2fa93dcb96993681cd9970f6b541110b783ab81d2288b3c946ebf085c141077c8114a783d1bb26cfed5c214d073a20de871
-EBUILD jack-4.0.0_pre20201220.ebuild 1363 BLAKE2B 8fa5e8bd135066f1da711e3ea8bd1afa56b8161fc4f50c902c9078be64c214401d3403a35539963297b728b9ff809eee3c950f972fda5a08182d386353443011 SHA512 1e0dd639c248d9b6a5942d8888e6b9fc4bbc55c18200a062aa1c3cc1c73cbaa162760d78aa63ea33fd636c5aef47cae651b9ddeb936d597cb1ad418dd908489d
+EBUILD jack-4.0.0_pre20200706.ebuild 1345 BLAKE2B 608439fbf85684f01b9b110380fdc996e5c67b0743ed21970c93ee536f4bf028ae328a6446edd97f3e72226313ca8e11511ab4a3b26f4b1cc20ce4f66f9286c0 SHA512 cd37a5293a4b1873a2af55343fef72038c280e3115493c51328502a4770525f35ca4ad7197b04bb0fa9eac1cf7820a4976b86adf156a726336465dd5e612ba58
+EBUILD jack-4.0.0_pre20201220.ebuild 1349 BLAKE2B 07ed1a94ad78ade5683e0574d4fa0d3206d10051113dc0b65001df3e40ca8e20f80cdf3f2b57524b71bdf236c859de2d3e6ce7c3e4153907e5b77eddd2aa239a SHA512 921d7368a62107d431be6476c54225650e2ea5163cc09908a7ee458ffe1d63fb9b06baff7f45637b380ba92bb0521048fd1ffd9adb3cfefbd117a6019f0d5e6e
 MISC metadata.xml 511 BLAKE2B be22d1c6187e0a7ff31a8a6f423b6b7653a2f7205e5e0a10613ca7c66874e84e15cdf0cbe08dfba3ac6ca147f7d70a3bfb65ba447280fdccb0d14adbe942a60d SHA512 0c3d517ceabe0e8066dc9bef24736a46a61ac64d2e577adc0865a15a16e36dfa0537e8beba1d795c52658057ecb36b959f4840a7b526552c6f38320cd0ef00b8
diff --git a/media-sound/jack/jack-4.0.0_pre20200706.ebuild b/media-sound/jack/jack-4.0.0_pre20200706.ebuild
index 98d04e8d8729..74ca399343ab 100644
--- a/media-sound/jack/jack-4.0.0_pre20200706.ebuild
+++ b/media-sound/jack/jack-4.0.0_pre20200706.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 PYTHON_REQ_USE="ncurses"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
@@ -22,8 +22,8 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/python-discid[${PYTHON_MULTI_USEDEP}]
-		media-libs/mutagen[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-discid[${PYTHON_USEDEP}]
+		media-libs/mutagen[${PYTHON_USEDEP}]
 	')
 	media-libs/flac
 	media-sound/cdparanoia
diff --git a/media-sound/jack/jack-4.0.0_pre20201220.ebuild b/media-sound/jack/jack-4.0.0_pre20201220.ebuild
index 2d00b9187d01..5afae97078b1 100644
--- a/media-sound/jack/jack-4.0.0_pre20201220.ebuild
+++ b/media-sound/jack/jack-4.0.0_pre20201220.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="ncurses"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
@@ -22,8 +22,8 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/python-discid[${PYTHON_MULTI_USEDEP}]
-		media-libs/mutagen[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-discid[${PYTHON_USEDEP}]
+		media-libs/mutagen[${PYTHON_USEDEP}]
 	')
 	media-libs/flac
 	media-sound/cdparanoia
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 5f413e1408f0..2cfc677cb51d 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,7 +1,7 @@
 AUX jack2-1.9.14-fix-doc.patch 468 BLAKE2B 2062c7823ec928eec8374818409621991ef877123a57b717e3a1d91d7943b92dcc776f7e654b5c4fa85e7113c44bc232cf2a0d0ba413f6165e4a861c625ee267 SHA512 e1b65b55098534e3989c53470c3b690eba0bf2e087c1dd1f337332030e6fc8185fd1c2be590ad4b78df663d201a3e86f1b6e448619e93514c5e05311947862d4
 DIST jack2-1.9.18.tar.gz 987166 BLAKE2B e1684d50c26ce45b36133b5e9632e916cd5bdf2a2ffba9257d7d6018d9fab8ade87f2de4c837d3cc3cb37bdda296fbcd8c2da6468676a3a4c74563fb42397879 SHA512 7b9116b8002db88d9df746acf99e523cf9103c1a7955e8174912c8538b2c53bc8e7c34a64d0df4dc1f212e35035392814fdfcfe78597e26bd08ec028876bcb98
 DIST jack2-1.9.19.tar.gz 988780 BLAKE2B 37536e23f97ea8a3bf62fe77e35a4a40c5d88cea1197a2f72c4ab31cbbc689fcf99a1d51bb0ee96122c618464eefe1ca8479dc53ab7de9e6570cb4009cf2a7a1 SHA512 d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d
-EBUILD jack2-1.9.18.ebuild 2452 BLAKE2B 63f95828a08f855d195c9923a71e2cd5a292b24c791f9a6681bfc3794cb4ffdfa80cbfc7e1ef3d05afc845a2ba06cf63d0fa3f699e4f5ad6b5d5f8213246db49 SHA512 0e2241fa26abb4ab1f0bd163bea7e445d71c33adf3c79537a553534ed80e55b65a1a9c6baebdef597fe4a6793ab15e2fc46d9665df95ed1ec8c88d5f2efd43d2
-EBUILD jack2-1.9.19.ebuild 2406 BLAKE2B 80e17fd0792b2cb18c0a53fb134ff8c7161fd80996cb06f4f4adbb5c2666ac8ff855d695a9734ed0f41f3778edd8fffc0c75f5c2b25f9b6e2f0ee66d0c452d53 SHA512 d98dc183de011c5beb79dc646ed339f613a007823d246d74eec9d687359abec120b771c5e0cafcacb846f7bc31af47c740609b7c33e7a073435eab5468f4cd0a
-EBUILD jack2-9999.ebuild 2403 BLAKE2B afac511cd97033be22891584d22fb9cfe9d9891bf94cd3d11f3e21e3a1214ba11d8ba834e9011fcee783a469d301f7edf4170e4ca15f97b5475d8d871c5f095d SHA512 1377402a21cc82a8a1ea9c88d92c20768e352ad15d1f74b3dae89f57e5eeb23ec57c0373bb8ad3331efb82597c8da05221586213876e8827da4b6d60c3d46343
+EBUILD jack2-1.9.18.ebuild 2444 BLAKE2B 0428836a0c60aac26ec8196765fab80a69e80f1051c23204249dee7101b58eeafa89d9ad73930aa1421fa959a59669bee2263b975c3ec015258c301578091ce8 SHA512 22f7c1128b06286f167c2f13b17dcda6d58239d11e80d3e22d14e95f96bd66d470b266d0db7f5124fbc9df20a4598c6e138822d5c07e3867598db0d216fde6a2
+EBUILD jack2-1.9.19.ebuild 2398 BLAKE2B e474d77d45005fc09f9de936d66d6d4fc4884e2514461cea31a2d1bbca955bc59b6eff61ef4360b69e3749a171dbbe044580ca9b7099fcaeeee582ff843e3e89 SHA512 673c1458aa4afaeed280d2cd4d7f66c8006e5737401c02389924531fc0153cd24250ecf8072e2e7894a4f644e3222dd40a2e3bb74c04f312f1397d5af7321fbb
+EBUILD jack2-9999.ebuild 2395 BLAKE2B f663eee6c44cb65f76a12d5b599a887cb0d56be0644dedbfb8e06368510a7ae18522c80bd9c0ef290ceb1af3e1f06eb60b3e4fb18b0c229df83929b155647cec SHA512 bfcfa9479713d773706964daacb266168d7c019da1af2528ee6aa2d1c327443718086536cd28b2fb71cee9da1a66dcb768f798164c0cb551f4e1cd9d829f6aed
 MISC metadata.xml 557 BLAKE2B 76000f6e4bd787a3e2687f9bd3a71c0456cf4fbbd27e7bad1aaae7ee9e3e6832afd0cb44e07a4a23f13e01f7aa732be18e72e711f4148fc65b2b263c5190b49c SHA512 1a0a066f0829cd623672513b5c8950ffd6cb1a4d0921cd48174949af24070d1ef6c3bb0a850749c348d1afa2cdf56bcd94d6937b21163fd0a0667f7cdd1632e6
diff --git a/media-sound/jack2/jack2-1.9.18.ebuild b/media-sound/jack2/jack2-1.9.18.ebuild
index 0e31dae3a2bf..a5ee5eea6fa7 100644
--- a/media-sound/jack2/jack2-1.9.18.ebuild
+++ b/media-sound/jack2/jack2-1.9.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
@@ -48,7 +48,7 @@ DEPEND="${PYTHON_DEPS}
 RDEPEND="${DEPEND}
 	dbus? (
 		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
 		')
 	)
 	pam? ( sys-auth/realtime-base )
diff --git a/media-sound/jack2/jack2-1.9.19.ebuild b/media-sound/jack2/jack2-1.9.19.ebuild
index a696ea21763c..dcce141a31b3 100644
--- a/media-sound/jack2/jack2-1.9.19.ebuild
+++ b/media-sound/jack2/jack2-1.9.19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
@@ -48,7 +48,7 @@ DEPEND="${PYTHON_DEPS}
 RDEPEND="${DEPEND}
 	dbus? (
 		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
 		')
 	)
 	pam? ( sys-auth/realtime-base )
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index 854d309843ca..06fe3cac36bf 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
@@ -48,7 +48,7 @@ DEPEND="${PYTHON_DEPS}
 RDEPEND="${DEPEND}
 	dbus? (
 		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
 		')
 	)
 	pam? ( sys-auth/realtime-base )
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index a33d9415d503..f680753e5435 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,5 +1,3 @@
-DIST kid3-3.8.6.tar.gz 3183673 BLAKE2B c862c1da05ed85ecce8b0c666ddb9e18bdcabafe569f62f3264ebf1e0b7b16c11d25a10e1b1e6cd395442500275f9ee73ef1f6225e049790a09eac68b811df06 SHA512 11613ea72b23a80473699c61141ae2eb9a76b47da87704cd673b70a65bb334bd8232d3a66a7ff2b7f552751145613dbcfb8dcf0746eebb9fa2bd45979f4ba5d4
 DIST kid3-3.8.7.tar.gz 3356781 BLAKE2B 967a7af8f3ca5413716b1f246d07fa1723f57113369f466f853c00106e81648efb19c54abbb27b802ca9dae308c44683764356ebbbc708c7454e9669ae0201f4 SHA512 9d1a2c64d05e19c7a8c33f5447f896043ffd68ec95387dc04502549d59cb0398dd6946d17bfce12ed57ea445e0b39c8b3769918069ee9f1862f2480482bf2a01
-EBUILD kid3-3.8.6.ebuild 2004 BLAKE2B 74400619f98177629513157b8daae32eed7eb73969dbc5bd6142e7403866cc75c881dd95a035fa9bbb2ca970ccd52150f57b72ed0146552a78f3fe2b92be2055 SHA512 7d7e8c90105b77b4ff7f5aa5b7c732be150e4bdadc9dac4d2aa7b423949e3bdcedb89e01545b371051c37a8979c34d85e3e470caf7161d4d9d4245d234bff4ee
-EBUILD kid3-3.8.7.ebuild 2007 BLAKE2B ad104714fb19ea8ef0f442c1ca5836683209daa955c031edd16b0cc7a25c1320b6c252928e3f1f0ebc0d5fca37edb6ae214adeb4e6f41e5d150976b07f5776ee SHA512 134eacfa43418eca65c8d960c378dcae0cf240257d1508875fefc8ba9e1f4d3d32858e1c8800eb6f15dbfd09fea513ed47bbd898ef41b9499dcf47ad7055dedc
+EBUILD kid3-3.8.7.ebuild 2005 BLAKE2B ada62f924eb468088bc94361fff8fc2985a9654a271035890e4680458f76f6bf0ea09fa8bd4e6aa3188602a3f08fa42d61e284189fbe12e8603f810c018b27a8 SHA512 d1f1ddaebcb873bf9d8b344b09a529317a0d9ce8232487e0ab53baecab22b71a083fe3d0302cfb9006c83f994b12b718153450cb2b723bfa7442815a8ec72d27
 MISC metadata.xml 581 BLAKE2B aaf7af21490a043596d92081040312887a687778836e126b6057db01eaf8bae1bb677ebdf2513bf5ab36f7ad95a7327315de3e42384915b7575d45ef1959e148 SHA512 6f4f92be39dd0099d1f762a07407e1fb6a75b9f0a7b01f0b60f7273eb1c04716e999633720b4535a7d42ea0ca447f8080377f00f93686c019baebfbce2cc25d8
diff --git a/media-sound/kid3/kid3-3.8.6.ebuild b/media-sound/kid3/kid3-3.8.6.ebuild
deleted file mode 100644
index d91a129de142..000000000000
--- a/media-sound/kid3/kid3-3.8.6.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake kde.org python-any-r1 xdg
-
-DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="https://kid3.kde.org/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="5"
-IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-RESTRICT+=" !test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/readline:0=
-	acoustid? (
-		media-libs/chromaprint
-		media-video/ffmpeg
-	)
-	flac? (
-		media-libs/flac[cxx]
-		media-libs/libvorbis
-	)
-	kde? (
-		kde-frameworks/kconfig:5
-		kde-frameworks/kconfigwidgets:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwidgetsaddons:5
-		kde-frameworks/kxmlgui:5
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2:0 )
-	mpris? ( dev-qt/qtdbus:5 )
-	taglib? ( >=media-libs/taglib-1.9.1 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# overengineered upstream build system
-	cmake_src_prepare
-	# applies broken python hacks, bug #614950
-	cmake_comment_add_subdirectory doc
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DWITH_CHROMAPRINT=$(usex acoustid)
-		-DWITH_DBUS=$(usex mpris)
-		-DWITH_FLAC=$(usex flac)
-		-DWITH_ID3LIB=$(usex mp3)
-		-DWITH_MP4V2=$(usex mp4)
-		-DWITH_TAGLIB=$(usex taglib)
-		-DBUILD_TESTING=$(usex test)
-		-DWITH_VORBIS=$(usex vorbis)
-	)
-
-	if use kde ; then
-		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
-	else
-		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
-	fi
-
-	cmake_src_configure
-}
diff --git a/media-sound/kid3/kid3-3.8.7.ebuild b/media-sound/kid3/kid3-3.8.7.ebuild
index eb1e87a95e84..752bd1daaff3 100644
--- a/media-sound/kid3/kid3-3.8.7.ebuild
+++ b/media-sound/kid3/kid3-3.8.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://kid3.kde.org/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index ddf83baf0c66..3d4746deb1f0 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,5 +1,5 @@
 DIST lollypop-1.2.35.tar.xz 509916 BLAKE2B 8cf9ea74287b6ac7d4942c2312cc4d6e07d4748d505cc9e45a896129f9e4a43ef5c65c0c18764597d7ce3c4d2fc93804c501f68ea3b67625e200497613077af6 SHA512 179fa5e77482db35de9e30e392e6d07bb5c832d5d1decaee06982570bdcbb809dc99375eeb6fe3dce75829af3570953ce517e3b4eaabceac807b9d5c382bd53e
 DIST lollypop-1.4.18.tar.xz 575120 BLAKE2B 62ff404c0e7c2ac7029ebb45143db35b0b93b30bfc386fb08aa4a2fc10916efb190118f41e40a0f795bef4f8d0b21b0353b9e27bbb75c5471132145028fc8b27 SHA512 17f2db91a56fd140c66c251732eca4b2a6cc1849b5dc72f0a4014c766c64eee475bc9d2305d307e2a54184ab5dd812a5fb27b39acf60a1c468770d1d34307982
-EBUILD lollypop-1.2.35.ebuild 1524 BLAKE2B 360da0031d44177ecf8e0965653d6238080a2360557ff732e60135a599f4f1e25fd647b2ebe60d618af1fd774a0cd82169d400dc1f9a9f5a28613a4b96b909f3 SHA512 d04d122dc72180395082b41c29617167d95735a7461d361f64b304b3f676ad5f1a3c37a290ef43fd840a440dda7dffdbdda4fb8fdc74fd5d929d1b72653dba1a
-EBUILD lollypop-1.4.18.ebuild 1549 BLAKE2B 45fcf42b8f20f04da12381a310a41c376a9214b869bb279fb04702519b76d0d7592e20fa7379624830abf7509a564d4ca50377e9c71c05fefcc23ee1c54218b7 SHA512 6802e58a2799c975d4c5b91992397104e59dbcf0dd1bd7697f484e16faba5ab43df63ebfb8db8abe707d527f339c06aadb280a2c7611e722778a6dd9eeee6745
+EBUILD lollypop-1.2.35.ebuild 1486 BLAKE2B c9a720c44c1b8706fb7a6fa54c2c018cec8888edcb70b463b438d3d209bfd63bcf47b2e354cbdaa8ffe1c172b3d57fae674817122dc0e1a75c3a5cdf8e8e0557 SHA512 5643394a7d28e89e95c374675ea3a1807b708d2082f01ebb7f62cd6822e9af4d123e1a79e9d94f2960aa59b04ca01d25560d421729d1cc194d21b1796ba69a38
+EBUILD lollypop-1.4.18.ebuild 1511 BLAKE2B 4c553f05d9f7fe8059b65f890a0e0189baab5a4b27cf9c7d6852773ff1e70273be88d9a28d81d1a174f2589fec6ad0dd645a559d66c93aec940cb1fe27a2859e SHA512 922162352d0e46fc1e9552c2192fd7eeb979d7a094a99adac1c0a507966af2191b0777741421699009ac6e67a09ca41f0250bc3bdad8fbdf5f1629b121bfcb70
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.2.35.ebuild b/media-sound/lollypop/lollypop-1.2.35.ebuild
index 7f583f5eecab..33ce3a4d44d7 100644
--- a/media-sound/lollypop/lollypop-1.2.35.ebuild
+++ b/media-sound/lollypop/lollypop-1.2.35.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 inherit python-single-r1 gnome2-utils meson xdg
 
@@ -21,15 +21,15 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/glib:2
 	dev-libs/gobject-introspection[cairo(+)]
 	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	gnome-base/gnome-common
 	x11-libs/gtk+:3
 "
 BDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		dev-python/pkgconfig[${PYTHON_MULTI_USEDEP}]
+		dev-python/pkgconfig[${PYTHON_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	dev-util/itstool
@@ -39,10 +39,10 @@ RDEPEND="${DEPEND}
 	app-crypt/libsecret[introspection]
 	dev-libs/totem-pl-parser
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 		dev-python/dbus-python
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pylast-1.0.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		>=dev-python/pylast-1.0.0[${PYTHON_USEDEP}]
 	')
 	media-libs/gst-plugins-base:1.0[introspection]
 "
diff --git a/media-sound/lollypop/lollypop-1.4.18.ebuild b/media-sound/lollypop/lollypop-1.4.18.ebuild
index f643b34105a8..4098e58934c5 100644
--- a/media-sound/lollypop/lollypop-1.4.18.ebuild
+++ b/media-sound/lollypop/lollypop-1.4.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
 inherit python-single-r1 gnome2-utils meson xdg
 
@@ -21,15 +21,15 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/glib:2
 	dev-libs/gobject-introspection[cairo(+)]
 	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	gnome-base/gnome-common
 	x11-libs/gtk+:3
 "
 BDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		dev-python/pkgconfig[${PYTHON_MULTI_USEDEP}]
+		dev-python/pkgconfig[${PYTHON_USEDEP}]
 	')
 	dev-util/desktop-file-utils
 	dev-util/itstool
@@ -39,10 +39,10 @@ RDEPEND="${DEPEND}
 	app-crypt/libsecret[introspection]
 	dev-libs/totem-pl-parser
 	$(python_gen_cond_dep '
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 		dev-python/dbus-python
-		dev-python/gst-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/gst-python[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
 	')
 	gui-libs/libhandy:1
 	media-libs/gst-plugins-base:1.0[introspection]
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 0ccc0495f10e..038221ff9112 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -2,6 +2,6 @@ AUX ffmpeg4.patch 1401 BLAKE2B 116679802c4acb9e843dbb8d656177ae133aefc49a270392e
 AUX moc-2.6_alpha3-stdint_uint_types.patch 1179 BLAKE2B 73dcba135553cd9630cf44e42a4651785d6b9d1cacb554be166a7772c56fbfdc1b4165c6951c810e962a6b4dc24fe714eb739244490b9a975e79b1d67e82dec6 SHA512 642be986fb147aa81251ce9c3f86761ff9f24c61e84fd447e243da34b1e9058a94f27ef632144f01e3c989bc321346bdc543130fd090520fb3064668a8017110
 DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a31d47cb9a3b377ccd04e2be53e57274e76daed29177368c944740fd26cc862fc498f950070f0b83b0acc7a SHA512 992d06809fb52e58dcee63704bde05795b99edbac46edd8381f314c564490013b18e1853926f419c2c3c7f1bb68ff35e97048de03ace3232b800cf4b3b7dbe0f
 DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf
-EBUILD moc-2.5.2-r1.ebuild 2109 BLAKE2B a24ab48ca76fe6a1d062bd2d7e875daad0b833e73687a6c328d21c89f4857fc270f0fb57f79e6554253b6d2ce2ce8ada2d8970f3a325840a5681f89276be9dd4 SHA512 d7b1a37f2a5b162c8637af93a5da4a39e7080904054eb7d6cc3433521a43447b2d670137af09b74d19fa98b8cd647f83045a21bdad5692f81adb898523d0a667
-EBUILD moc-2.6_alpha3-r3.ebuild 2438 BLAKE2B 50bbaaff6f02794b7eb77a56caebc58dd13c19fec125e29a4011b030e03325c4452ed156f1d5d2368665f30af5d81e89f51f9c5a94e273c5d7b76c7b62878633 SHA512 5feca35ca9a9a21ff77558b3dd46d29a0e451e789ce696554eebfa2e9fcbde56d61d72954c6262276762c25702dc1e697467ca47b996c664cc3b8bce004229c3
+EBUILD moc-2.5.2-r2.ebuild 2111 BLAKE2B 1313e13157bcc9d222d9809d80596996a77358866cb7e114153b83833f688482c971cc8e8f32b237f553df1d4cd90bcef82cd4b66812818c913eb65d2a7ed722 SHA512 ab5560f47571e66ee6736915292152ea721fd3d0b541b174653673d1a12c807321b73d4df7d9689a172ff3a4af41499e922565a395c570c0e13473a00e227e48
+EBUILD moc-2.6_alpha3-r4.ebuild 2440 BLAKE2B 7c3b03c5c4e35090af1db15ecef82b8b746f9c2fee53316ce03a77a83414c2205ade1fcab97b4c5de4899ff6b4ee1d1947b62c73ddd51a526e79839b98fd40ef SHA512 b900f9a2fe1838b9973f71d9f6fb99b83d7ad1ff7b7074aa129c96fcc0446d2d56fb121b318dbb50bbc7dd27da0f6afe6fdfec07b460e9bac5734e1d3641aa67
 MISC metadata.xml 620 BLAKE2B f4b43ba546218153ab2e3c980ca4b09e4b82a35dc17755be3904beb7131f22f71b756edc913f0dce4285e779a1b4a75c474577c81095d341c50d45b03f407497 SHA512 fd676e1ee0aba80032597c106ae94a451e9e2762fffe0b7a33119d2701eea37ac400d25849bd668654bcf7ed8d12af91c0bcab4e6006d5cd3bf0f35af098baa2
diff --git a/media-sound/moc/moc-2.5.2-r1.ebuild b/media-sound/moc/moc-2.5.2-r2.ebuild
index c3a79d27a2c9..107d1a0337ad 100644
--- a/media-sound/moc/moc-2.5.2-r1.ebuild
+++ b/media-sound/moc/moc-2.5.2-r2.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=6
@@ -15,7 +15,7 @@ IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modpl
 	oss sid sndfile speex timidity tremor +unicode vorbis wavpack"
 
 RDEPEND=">=dev-libs/libltdl-2:0
-	sys-libs/ncurses:0=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 	aac? ( media-libs/faad2 )
 	alsa? ( media-libs/alsa-lib )
 	cache? ( >=sys-libs/db-4:= )
diff --git a/media-sound/moc/moc-2.6_alpha3-r3.ebuild b/media-sound/moc/moc-2.6_alpha3-r4.ebuild
index 7bad54ab70ab..82c189dc290c 100644
--- a/media-sound/moc/moc-2.6_alpha3-r3.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3-r4.ebuild
@@ -19,7 +19,7 @@ IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modpl
 RDEPEND="
 	>=dev-libs/libltdl-2:0
 	dev-libs/popt
-	sys-libs/ncurses:0=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 	aac? ( media-libs/faad2 )
 	alsa? ( >=media-libs/alsa-lib-1.0.11 )
 	cache? ( >=sys-libs/db-4.1:= )
diff --git a/media-sound/mpfc/Manifest b/media-sound/mpfc/Manifest
index 0deae611edc3..d3094224533e 100644
--- a/media-sound/mpfc/Manifest
+++ b/media-sound/mpfc/Manifest
@@ -1,5 +1,5 @@
 AUX mpfc-1.3.8.1-fix-underlinking.patch 960 BLAKE2B 5eee0cea45c470b6837120cd89fd9dc180a5f295c5fcaa08a640009c51b37c3397e0f2f9755dc1baf7ac1af0f6003895368a333f1b8304b5fa096bb7a99a5e84 SHA512 117c49a7893c95b8b7e592aba76afd4f05f076b88db303a4fcb0efdaad351008bd91d88d06f278586920907c54801df49c7101c8dc2e41475038244cefd6a480
 AUX mpfc-1.3.8.1-qa-implicit-declarations.patch 4938 BLAKE2B 117d2f5aa9290aa49b65bd8cf085fe30068ccdd558a8c18a5e6b94ebd27eeb07924aeb2f0735499cce7d520b5fa86cc69f6f49580d197979162837b4c906f107 SHA512 afd61c08964b237124316a7cad4cecef29d8c269c6e2d0c645d81272167e9f7de2b3c1ef33e2877e1b5f2c0a4021bf2e548a04976142c22e889a6cf769807233
 DIST mpfc-1.3.8.1.tar.gz 1042027 BLAKE2B 2d0e1991397930d8251db4c766705b769e24adf518d963bc56bba92f3aaf9deeedca2331e6fbeab609d4fd0dc49a69a35f3180149b7f35c0d94795e6be22ff59 SHA512 071e12ea784a8610aa6621f5afa1c6ba1e2a3ffe0deac8175b8b43b4446f0c54ff049fd8321aff7551766fe4561a974e39bbf93e30b353b25e27673ea9584573
-EBUILD mpfc-1.3.8.1-r2.ebuild 1173 BLAKE2B 9337f49219eeea0cc1084cd025076ad5656a9921ecf3b89b7c253cfb0b036952a165ca9c8ad786522cc30de00fb05f008b782f3aa0afad5b685b339fa18c32b7 SHA512 a378f57a19825b2898de853b1396429c1dfff1ec3894353a835783e71b222ede8918361e587f910f48942b5b124426c02ceeef0fa1a7838de3fc8d607c3c46e9
+EBUILD mpfc-1.3.8.1-r3.ebuild 1172 BLAKE2B 20c0f9ac49b8f71b994b41254cfa298f15001679616904d8154e72e1e3c27613f5c0be7d4197a72c8c7acf515d123175048013248a2d52227a06c952a82a7037 SHA512 7b47de96cdf26536c184543e8c97f1ed10b93e34ecdac39ef242d7139727480ad4a2d5a90b124339a55e35ad624d010d4b6b47e39c95b01dbbd60cf894a2034d
 MISC metadata.xml 413 BLAKE2B 5ce36b2246ccdaa78683c2964ffb56a1f88956ef6bba4d5582840febeae3d55612a2ec1291b43d6016983763daf23aa7ae325b0a923080a469e520b258d74a1b SHA512 fd972a9e503642f833b6c08bfc662bec020bb9e88959e433e6c20ef582c2b05edd248d2b652cf2b884097fae888ab29413b41efa731399cffb261a10e6435b3a
diff --git a/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild b/media-sound/mpfc/mpfc-1.3.8.1-r3.ebuild
index 0d64bd78bc89..92522b3fda8d 100644
--- a/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
+++ b/media-sound/mpfc/mpfc-1.3.8.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 )
 	gpm? ( >=sys-libs/gpm-1.19.3 )
 	mad? ( media-libs/libmad )
 	vorbis? ( media-libs/libvorbis )
-	sys-libs/ncurses:0=[unicode]
+	sys-libs/ncurses:=[unicode(+)]
 	dev-libs/icu:="
 DEPEND="${RDEPEND}"
 
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index e8249dd856da..6e8161c0fac6 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,3 +1,3 @@
 DIST ncmpc-0.39.tar.xz 242968 BLAKE2B 1b270ed52aa884cecd3e1ce60bb2ed628ef79480697f388b48a09e0f22068dbbb7623b01171e5cfae9556446e404530f93c84ca3c3d5cc481c8431f37786c2f4 SHA512 bfadc58bf8b66bff08608f561f689a50fd412b87975998ce23751fd312fa009eeba4b48b4afe96391b2ecb184c00c366262e9b96e24d2ce2ab2af6a4002721d9
-EBUILD ncmpc-0.39.ebuild 2019 BLAKE2B 1a942892c29244a1ac0fa6122410f37627b49db4e34f82d1822851edb75878c90ec084f082692051c9db4941881975142c123c8daa849a641869d4c327c22774 SHA512 8e62f13dbf38b8c50fe10e6d27a35871e703f6ffbb386d6213d1802516e153223c2cd4269792d61d2d4271fc6dc71d853b8e2448a9a154ac27aa33dfde523b86
+EBUILD ncmpc-0.39-r1.ebuild 2021 BLAKE2B c0ac007d43d06172db4f2bc577dd8e8acd20517b68c63fd207fdcbc92ad83ccfd3c6c952ba0087ad343c9a7dc68672e9394c04962bd16c0210ef0b63fddb9372 SHA512 7737148d61219a7e9cdc9785f3223ab5f0f7b43a0bb85fa38ddad689ffbd5c9d81b58e610f73b831a128eed9f602157f57a4960f62fabdd43c7e86e05970f64f
 MISC metadata.xml 947 BLAKE2B 5f5c24100750fd5a31a9728bebfee746e2a928ba1b5282de5d22775f3e29d882ed326f052898d3d30589eea298ec8160570486b90d3538b3cc5a582c55653d74 SHA512 c06d78db424871c5f3ad42afc476b1c3ccb9cc6621edfe5d496b7e259a973452b9695b07bd52352093d9e315bad95c556be05d2996d761e27ebddad3e43fba67
diff --git a/media-sound/ncmpc/ncmpc-0.39.ebuild b/media-sound/ncmpc/ncmpc-0.39-r1.ebuild
index 41a4ef29b2bf..e20c6b48d5a3 100644
--- a/media-sound/ncmpc/ncmpc-0.39.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.39-r1.ebuild
@@ -20,7 +20,7 @@ BDEPEND="
 "
 RDEPEND="
 	>=media-libs/libmpdclient-2.9
-	sys-libs/ncurses:0=[unicode]
+	sys-libs/ncurses:=[unicode(+)]
 	lirc? ( app-misc/lirc )
 	pcre? ( dev-libs/libpcre )
 "
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 7fc7abb527d9..e69b41186c77 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,4 +1,4 @@
 DIST ncmpcpp-0.9.2.tar.bz2 486266 BLAKE2B 160597493b93bac790b8619881e8a1fcf0efce4a538e35f54f31b06f3ed66691f02b37198cca46b475b7296aebbc864cb62a4398c60bd1e43907f9907a9bc118 SHA512 bbcb3b50233e363412af3c1cf1c0118122733dc376759cd35dee79950f42e098a0402ff670684df91847b990b26022630c9a71192e462bd46e70628e31489742
-EBUILD ncmpcpp-0.9.2-r1.ebuild 1463 BLAKE2B f17750f2337e72bd9fc036df9c02af29a10c025536002c1d91028adc35efffbf6544c5ffc8ba1550729b83a8e30e815930d020e82fe677f659d620707e6f8d41 SHA512 c68019b5c801a55d71ac8282ec3ba4d87d55ca704bcfd8af84c0e755fce8aae16e7c5fca0e6db62e56f8e19556da207e387afb704709195e92ca46ec09ea37b3
-EBUILD ncmpcpp-9999.ebuild 1435 BLAKE2B 2a66a9a4af9a42a8b7721d9826fbd723dcace03d955ea9237bf4052239521f74b7df49ecb1083abd57a6e500822c0f235b3853c00ba789a43b3bd9fdbd0a37eb SHA512 7a5de29eaf7ea34a4b335a10605760759391a2c3479f5bded4ee83ba1cfbc740f08a6cbbf464947071b73338e6d81ab1dbbf97c02de81197fed2e92d5e5e956c
+EBUILD ncmpcpp-0.9.2-r2.ebuild 1466 BLAKE2B 93b3370036e014ae19c9817bdd254656163beb878082ddfa0663d481baa8f7125aa6eb2d084650bb278d8bc664902d361087a0c13f6ecb0047b21c02f99d7936 SHA512 702cb99da9e7ab62a40a76a84c719f7d23f4dd5c9193e5b55cff0148d62c641e4b0591236340794ee009aceb26802a45c40e3128d45de730d8803b3064c1eb8e
+EBUILD ncmpcpp-9999.ebuild 1438 BLAKE2B 3a0ad5a34a4ecccc795caaf6a3d13354f83cac438270b3cf4d5d23191e6e1c24b93de018af55ef77c3d5c0721d39bcf9dbde34b17dc7843f715598d08c507b1a SHA512 7221353d0dd221054147d2619a29cb59b3b60f970f50c1738dd2d39db471e26c69c691d3e93e369912fc48f1e88c5b5ea10e1236915498a05eb1337cf10e3862
 MISC metadata.xml 1154 BLAKE2B 9ff9271cd1c5345641c83009c7db03a381c9653f3bfcecd4b7018029d9f89795297cf1138ce0e04632f9adeb68eb01281e04d5559cf0780b3b416330b2551cc2 SHA512 7021e28e39780017c7b4bf58a4ddd94f7142120a68c36ff7e1656698a0f4135204a50a43e108601a51d86c4eed22fdde5a9498884dcd89ffe2547090a7581c9b
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.9.2-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.9.2-r2.ebuild
index 0e795bc998c7..a24cab355e66 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.9.2-r1.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.9.2-r2.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-libs/boost:=[icu,nls,threads(+)]
 	dev-libs/icu:=
 	net-misc/curl
-	sys-libs/ncurses:=[unicode]
+	sys-libs/ncurses:=[unicode(+)]
 	sys-libs/readline:=
 	taglib? ( media-libs/taglib )
 	visualizer? ( sci-libs/fftw:3.0= )
diff --git a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
index 51f91e31a802..9076b2c0e372 100644
--- a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-libs/boost:=[icu,nls,threads(+)]
 	dev-libs/icu:=
 	net-misc/curl
-	sys-libs/ncurses:=[unicode]
+	sys-libs/ncurses:=[unicode(+)]
 	sys-libs/readline:=
 	taglib? ( media-libs/taglib )
 	visualizer? ( sci-libs/fftw:3.0= )
diff --git a/media-sound/pamix/Manifest b/media-sound/pamix/Manifest
index 52c081fd9d96..0aaa39d28309 100644
--- a/media-sound/pamix/Manifest
+++ b/media-sound/pamix/Manifest
@@ -3,6 +3,6 @@ AUX pamix-1.6-fix-output-scrolling.patch 742 BLAKE2B 23d14840500c9f535a68e5f4391
 AUX pamix-1.6-ncurses_pkgconfig.patch 1022 BLAKE2B f5ffa8a58e49fb8bf7c14c1764ddd2509fc9236cfdc898084434c378c3b1b78db941f05e9634de3ab585322371af89c3d47f98942f8cab1a4f8a462a544ad0e3 SHA512 b910fb3cd2f5c82f50dedd06f076d93b78fc9008b884434bda6854e3340ac357144bd75207f5ba490d1752d5dd013a413d3510570e47f60fd667ff6a1bda4bb0
 AUX pamix-1.6-xdgconfigdir.patch 1390 BLAKE2B f64950f335b03aaeed20298ee66bc769d575cbe1fd4b17682742d6d87cf8f5ad06432dd23147ebdd3f0c35d815a296f9cbbc1ddac7a33a8706cb0074b8aea0ec SHA512 e90c2ea1b02b4b74fe231740d09a266c4e91128b67353ffbc92e66897c8b08a8b131d43e01b1462542f289b0f1e2633851681d6a5ec514f29e266d8868849281
 DIST pamix-1.6.tar.gz 18552 BLAKE2B 35cc2844cf0d5824c961a226f1b857b3ac070dc5c4fc802a9aa21a3317f9afdc42fb87e18d9e9a61276ace66a93d42c256e7811e946e3f9fba19f645ab8f07ef SHA512 53f3a892b41418cdbfff28d29636997e777ab9e1042f002e1df47735941e5a34f0391866939c539594d22f0b3f0cbd1ad5342dc5663d816e12354ae9e744d5f8
-EBUILD pamix-1.6-r1.ebuild 1115 BLAKE2B 73596bfae44aa4e79d48800c20e314f02a0cad69ebaf585443956cde44a6434a9c37b655befe52e1560e351e6f141d93842a17bbe6acd2121bbfda8db1e7788e SHA512 79e244a374f346f5496321eba4ce35a7f244f6b8190b68e87631b2b4da8cac4819fd10f49ae80672ab98281a98e1692f679e9123a483ebe6eb550c859d7f8af4
-EBUILD pamix-9999.ebuild 927 BLAKE2B d8d49375ae2f78a08d47bb82656da43d2d7922bb3aaed738871142d26a15dee6149be0d1b21bb45c4bba145e38573ca0f9bd9cd765dfdb3372a811a119b2b1cf SHA512 f083f2a75297e6b9e7f344404f2d8b1d7233fe029dd89066568593343d5c73e403af732c03141ed1dea7c8ff952f47fbe44064c4723e3ccba48810e2bed939c5
+EBUILD pamix-1.6-r2.ebuild 1117 BLAKE2B 9652a02b76a0ca664220efd8f237f6a66d9f42d42d3eb62f65058f2e7d508ae4d2e3b2f632f3a9eba97040c26d6dcceec0f1234ee493b7e9e070a5a190446433 SHA512 c512eaab37042e5372316feb118e5b316f356d91c8bf59c0bebba350c9dfb7c7d7e66153e8b14a41eb5519e35c6c28535e29d1b15188d8d1c119d631b7fa72ab
+EBUILD pamix-9999.ebuild 929 BLAKE2B a9e978ab8768699329eebe4c312051251c66874d405f9abd171c4b2cc0f7496c5ebce85d1bee0e1e7f14c057d6e24510dcb73c9e805afd7a231ffa94119c9d9f SHA512 d5fa8e724910a62c18fec7f8901dec1254ac88ea2da31ad3d32d19c0665646919f566ad94a26d8db3eadeaa4e997505c14cd212f9f58470db3b15f90e412f7c6
 MISC metadata.xml 341 BLAKE2B 370b3031b7775e1c96f7d275f0e662594ff091d5d621dd51548af9153ec7a40eb821055573d6b53a742b1ee777b72067c49d900a6dec47b8f7bce09457e89f3b SHA512 8ca39f3e12bac0db8cd11f2ef8707d06fe1008f265bc99b0757650e98d4c2e36c4693cc46c7e657b26f7737e29479ac64a22e305171072bbbc74ab48ea67b5cf
diff --git a/media-sound/pamix/pamix-1.6-r1.ebuild b/media-sound/pamix/pamix-1.6-r2.ebuild
index 1d436b930237..d0c727991818 100644
--- a/media-sound/pamix/pamix-1.6-r1.ebuild
+++ b/media-sound/pamix/pamix-1.6-r2.ebuild
@@ -23,7 +23,7 @@ IUSE="+unicode"
 
 RDEPEND="
 	media-sound/pulseaudio
-	sys-libs/ncurses:0=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/media-sound/pamix/pamix-9999.ebuild b/media-sound/pamix/pamix-9999.ebuild
index aac3dbb67cf9..a8baa4c57b38 100644
--- a/media-sound/pamix/pamix-9999.ebuild
+++ b/media-sound/pamix/pamix-9999.ebuild
@@ -23,7 +23,7 @@ IUSE="+unicode"
 
 RDEPEND="
 	media-sound/pulseaudio
-	sys-libs/ncurses:0=[unicode?]
+	sys-libs/ncurses:=[unicode(+)?]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index b1d3fda587a8..3827a879d5d8 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,4 +1,4 @@
 DIST picard-2.6.2.tar.gz 4318817 BLAKE2B 9b4b9837fc7703368f28f2451c230ee9cb4826b61a970c514162bf615461d942512764661295bba98499000e781662e3a001c5fc91571abbafce8d7bc7418a63 SHA512 01fc8f49b273edbd020e3c9f91d622e60a84421b6de9dfd584d086224897b81f5e7c3f94616341c56f952774af7d912a8369d8fff4e47f19e00324c4f6944225
-EBUILD picard-2.6.2.ebuild 1672 BLAKE2B 5de4147997d5b24cd1b4e68b5c4dbcb045c86ce0d8e0dc9d1345f9875bdf12ccc19ce858312dfa0a03e7bc2bfdef77ddc196b679c4bff8f6308536d17a41b03a SHA512 8338bdaad722e5e1ea204fe194bd836230abab39e8bde5ec0ff5142ecf5fce46e7ed0eaac768dfc207b92c912b5fcb98915ebb31ec35cfec513cd593b7aa29a5
-EBUILD picard-9999.ebuild 1627 BLAKE2B 4472b2464100cc9493cb7e2abaef8d679d114d25be7ccd6beb6ca5e1a0f59c1e5ee908ba879e3bb71456a96db4e670a48eb1362a85b07d7d5ed531fc2e0119b4 SHA512 7e5e7198a0a4364e9d475f614be644718c5fef09213eb14131f6e544186b4aeda8f4c0156659ddd3962c3fd4ed24052d35e83228f43c98e8f44df8a60ed6392d
+EBUILD picard-2.6.2.ebuild 1652 BLAKE2B 77a92058a85fba2fa76637a7df2caa92937b29d83663212813a670d47045b3b84b363b7f48d2f3f0147bc12965708f451cb7ce3e6167864524cee37a35633d68 SHA512 7868878920aa000779f26bbf97b30123179bda3dec0aa62e998e0b9272009c8f4ac5713414fa78f6c3900a1d99fa9877d5654044d7fee252b7e302702c10e555
+EBUILD picard-9999.ebuild 1613 BLAKE2B 4ff23b9d59442edc13fe54d2ee7458784cde55dbf26c0f6c7d9ecd4112645e012e638a1e01de6228f558a8fa8cdc1241bb7ff23b179d4f3770c719b3a7eee043 SHA512 ecf0a0ddeee0af56497477bfe47fba323e21b07cce0210f84eac335f6b87ff970347af96bebfdbf1ea9de577c15bcdf4d4cb6c8cf2244ca2ff62325102fe8c52
 MISC metadata.xml 739 BLAKE2B 1b941561bb90cc463005e0e706bf53c9d8973aa1961a93e30ffda627922dfc4f05840392893c44767363588d729f7bdd6bea77a7540bead1b3a77a2306006f1c SHA512 94e546f23ab99e5a75e15e18d3f4b1aff2c02099b2202c1d566f92fe6043891c9c2609832bf8fdb48c330fd954555e574dd84be50591a6cfb571ea81e7c20fc5
diff --git a/media-sound/picard/picard-2.6.2.ebuild b/media-sound/picard/picard-2.6.2.ebuild
index d04919b37454..69225481a3ad 100644
--- a/media-sound/picard/picard-2.6.2.ebuild
+++ b/media-sound/picard/picard-2.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_SINGLE_IMPL=1
 DISABLE_AUTOFORMATTING=true
 inherit distutils-r1 xdg
@@ -29,9 +29,9 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/fasteners[${PYTHON_MULTI_USEDEP}]
-		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+		dev-python/fasteners[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
 	')
 	dev-qt/qtgui:5
 	media-libs/mutagen
diff --git a/media-sound/picard/picard-9999.ebuild b/media-sound/picard/picard-9999.ebuild
index d95b1702956b..7592c9ab3a2e 100644
--- a/media-sound/picard/picard-9999.ebuild
+++ b/media-sound/picard/picard-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_SINGLE_IMPL=1
 DISABLE_AUTOFORMATTING=true
 inherit distutils-r1 xdg
@@ -29,8 +29,8 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
 	')
 	dev-qt/qtgui:5
 	media-libs/mutagen
diff --git a/media-sound/pms/Manifest b/media-sound/pms/Manifest
index 81daab6356c1..4000797fdafe 100644
--- a/media-sound/pms/Manifest
+++ b/media-sound/pms/Manifest
@@ -1,4 +1,4 @@
 DIST pms-0.42_p20170508.tar.gz 140157 BLAKE2B c4c3ff916a9aa36522f48636cca97f22069219ebfc25e219d4aff3d0ca5bf20d80d343d224996db82fb6e8fb13cd9f38f7fc860683bc574124aaf0315d3f2dcb SHA512 686a5e265ebad418a153b9888cc213bbf8cca5aa2d398206848823105edac16e298431c288dc0a74adb23d327c75845cdec1680a6a2a2ae40bc7b41c55ca163c
-EBUILD pms-0.42_p20170508.ebuild 749 BLAKE2B 325998faf7d0881c250168b421f751c7781867310019012233537f155b68d34c7b05e554716bacb85423008ab6185d3923bee7dd5f14fe625e58242291220335 SHA512 11659f220e1253e23b02d760ef77959e0cfbd770831ac14628d24087582794ad448462a181ece145702d12b55e857b480c836ef6e56f09b576919b941ff66566
-EBUILD pms-9999.ebuild 713 BLAKE2B eadbbca9f443e79c5c6bacfa846b98c7764cdbd36de972dcc673f147521ff895eae5916a8f90a4f707ac575f3115f1b4aa721097f41b7b9732cd535053c256c0 SHA512 b2be07fb6ef262c353727df6a4fb87f2bc78b7bfb39c31bf9cc2ff34e9b27b16a8fe6f97e4c2b1cf4cbb9641fe128bd1e7b29c1672208cae97cf1a82ed837b47
+EBUILD pms-0.42_p20170508-r1.ebuild 751 BLAKE2B e14ec3a1e8b554617f67e9420a2dcfeadb5f307f6ab4bde827ac5da35005d4c4a39af0a25a64466f734dd06e3cbe33d6a4e62ecb05a6dfb5cf4ce7259ae40370 SHA512 ef2a2c3938d541f4d4128235df7c9888fc38629854e17702e85c217a42ce59f5ed3abac918f8e51cb9a09d4757c2353ceb0f248c3659e62651e305f15714cfdd
+EBUILD pms-9999.ebuild 715 BLAKE2B 15cf04f0719ace386e49cd6e3849640739da21f6f3b004d590988e191f2348bd7f8b7684e9fbfc7b69bd7026cad04b2b3ed7e768f8a1aac76c12aa9a1f82edc4 SHA512 916e8be3e74d785c3b814edd8477b1cf90a0c6fd3bfae523e3d6b0027a549a85dd405f3d093c0093b14d6e2f69d9da45337719f13f831670fa06fa0e63856586
 MISC metadata.xml 326 BLAKE2B 46ebd520822a0ddd4ac8dafee3358ce36fee3c07654ab135a36713172eb1978c7320e8f86538175a840e3c46d4c30148e105f1d8d7d83ee360dd414f868bd4e4 SHA512 7aa51dedca6dc6308866e597aa169a5714559e3c25c13c40ad11356ee0dcc13042ddc4a3388d4a7687a43a7847cd8f37b36f1a8ed3ee3c4b4e125a8f4d0abf48
diff --git a/media-sound/pms/pms-0.42_p20170508.ebuild b/media-sound/pms/pms-0.42_p20170508-r1.ebuild
index 5fff6b4dc85c..9f0546f7b158 100644
--- a/media-sound/pms/pms-0.42_p20170508.ebuild
+++ b/media-sound/pms/pms-0.42_p20170508-r1.ebuild
@@ -20,7 +20,7 @@ BDEPEND="
 	doc? ( app-text/pandoc )
 "
 RDEPEND="
-	sys-libs/ncurses:0=[unicode]
+	sys-libs/ncurses:=[unicode(+)]
 	media-libs/libmpdclient
 "
 DEPEND="${RDEPEND}"
diff --git a/media-sound/pms/pms-9999.ebuild b/media-sound/pms/pms-9999.ebuild
index 4260a7d72b3a..c1e5c9adb459 100644
--- a/media-sound/pms/pms-9999.ebuild
+++ b/media-sound/pms/pms-9999.ebuild
@@ -21,7 +21,7 @@ BDEPEND="
 	doc? ( app-text/pandoc )
 "
 RDEPEND="
-	sys-libs/ncurses:0=[unicode]
+	sys-libs/ncurses:=[unicode(+)]
 	media-libs/libmpdclient
 "
 DEPEND="${RDEPEND}"
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index e5556c25e67f..d6e2f8d6db42 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,5 +1,5 @@
+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
-DIST pulseeffects-5.0.4.tar.gz 2070799 BLAKE2B f059926672b690cce71ac2a26a8cb2e3e1b97e99b462418494516de54e33906d52a40ccf807d50fb133500270ae6468d1a4ab9c12b4bf2b15348752a7622c8d4 SHA512 db40291351e6da79d87d372b06734e0129df7640da90ccf3cb3564f58130c9d8d35cbb854d53878773c37811649f17141e2a40b2ba670fdaf1b2e12138f694a6
+EBUILD pulseeffects-4.8.5-r1.ebuild 2224 BLAKE2B 558ade35e7e7f58891a1a2fb1814b052089a2b5c9c3bedf5c869ed6b0d45b29ad7f424053e20b855e87fa073aec96b9aca904b43e0a42512d2280c904745f8d6 SHA512 9de12241a62ce26c3e229b2b5f08171ae47a6b09a785f16fd4211e5ed1724148a515b74824ebe414159c0d7dc5c984bd0a0b268f4b33f00cc6faaf0b6b794e59
 EBUILD pulseeffects-4.8.5.ebuild 1824 BLAKE2B 1e68075519cb839026d230d2757fe7699b6cdc54f78e5c83222d2edf15dd64f0e50f32a4b73eedd5d57bb8773b920b01de058c8fc2ca85d15d98aab1bf794ced SHA512 46efcb59bba3e32bed6a8605b22021383be739351aeacc87fc7ff692d7f1d1bf8762187ca85064a32eedecd06b0cdc3793bb53e12bb9e729a67a2c88b72b7904
-EBUILD pulseeffects-5.0.4.ebuild 2186 BLAKE2B b2c0a8af9a3192375adfa3a5e348a4e334c8963dd5cbff988b4023f5daebddb1bcc4662da03bd837aae9746263448c7e73b1ea561db35f236106ceadb5593a2e SHA512 977047459cd27236be7221103fc5e9ae552d46de3b4e18e1ed7f4c360112a344b88d7ffdee37cd70456c33610ffe2056c76b0dc2de8c22faf77c7296cc51bb54
-MISC metadata.xml 859 BLAKE2B 0d60e8c3843a433bb589037c34988b9a1304f1a8a5b5e6c4dceaf16891da91aaf1e65ae37787636f3d84a34b06403e2267e963e13751b07cd6d030361a297a44 SHA512 5fea2819ca87bf3eec5c5b430fd448df160b47370002448b879ca1e10e0732e09e047756c107162b50617c7cb427bf07daf2f23f2293b734e367587d4f66723a
+MISC metadata.xml 1263 BLAKE2B aba139ad030533b2d9c6fa8046ab69c2719a9aae6eacd7ead3761661332b6459fa8ebe591b338cd6048f244ed313a7c457043ab6f1f4f535142716dd8722a2cf SHA512 41cb031e5240fc6db96e04cfb16b303c1e63340fac00957056a360a890fae00fc59526056e8d13be8844d30ca2303c8e27ca5f6a3b43fc6a1a9dce82a35546ae
diff --git a/media-sound/pulseeffects/files/pulseeffects-4.8.5-meson_no_automagic.patch b/media-sound/pulseeffects/files/pulseeffects-4.8.5-meson_no_automagic.patch
new file mode 100644
index 000000000000..2ad89e629771
--- /dev/null
+++ b/media-sound/pulseeffects/files/pulseeffects-4.8.5-meson_no_automagic.patch
@@ -0,0 +1,55 @@
+--- a/meson.build
++++ b/meson.build
+@@ -4,7 +4,7 @@
+ 	'cpp',
+ 	default_options : ['cpp_std=c++17','buildtype=debugoptimized'],
+ 	version: '4.8.5',
+-	meson_version: '>= 0.40.0'
++	meson_version: '>= 0.47.0'
+ )
+ 
+ add_global_arguments('-DG_LOG_DOMAIN="pulseeffects"', language : 'c')
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -0,0 +1,12 @@
++option(
++        'bs2b',
++        type: 'feature',
++        value: 'auto',
++        description: 'Enable bs2b-based Crossfeed plug-in for improving headphone listening of stereo audio records'
++)
++option(
++        'rnnoise',
++        type: 'feature',
++        value: 'auto',
++        description: 'Enable rnnoise-based Noise Reduction plug-in'
++)
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -108,7 +108,7 @@
+ 	dependency('gstreamer-plugins-bad-1.0', version: '>=1.12.5'),
+ 	dependency('gstreamer-fft-1.0'),
+ 	dependency('lilv-0', version: '>=0.22', required: false),
+-	dependency('libbs2b', required: false),
++	dependency('libbs2b', required: get_option('bs2b')),
+ 	dependency('boost', version: '>=1.72', modules:['system','filesystem']),
+ 	dependency('sndfile'),
+ 	dependency('threads')
+--- a/src/rnnoise/meson.build
++++ b/src/rnnoise/meson.build
+@@ -1,4 +1,5 @@
+-dep_rnnoise = dependency('rnnoise', required: false)
++opt_rnnoise = get_option('rnnoise')
++dep_rnnoise = dependency('rnnoise', required: opt_rnnoise)
+ 
+ if dep_rnnoise.found()
+ 
+@@ -28,7 +29,7 @@
+   	cpp_args: plugins_cxx_args
+ )
+ 
+-else
++elif opt_rnnoise.auto()
+ 
+ message('could not find the RNNoise library')
+ 
diff --git a/media-sound/pulseeffects/metadata.xml b/media-sound/pulseeffects/metadata.xml
index 9f7e8c81b246..bf9b9deed237 100644
--- a/media-sound/pulseeffects/metadata.xml
+++ b/media-sound/pulseeffects/metadata.xml
@@ -10,9 +10,14 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<use>
-		<flag name="bs2b">Enable use of media-libs/libbs2b</flag>
-		<flag name="calf">Enable use of media-plugins/calf for adding various FX</flag>
-		<flag name="rubberband">Enable usse of media-libs/rubberband for the pitch shifting FX</flag>
+		<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="rnnoise">Enable use of <pkg>media-libs/rnnoise</pkg> for the neural network-based
+			noise-reduction FX</flag>
+		<flag name="rubberband">Enable use of <pkg>media-libs/rubberband</pkg> for the pitch-shifting FX</flag>
+		<flag name="webrtc">Enable use of <pkg>media-plugins/gst-plugins-webrtc</pkg> for various
+			voice-enhancement FX</flag>
+		<flag name="zamaudio">Enable use of <pkg>media-plugins/zam-plugins</pkg> for the maximizer FX</flag>
 	</use>
 	<longdescription lang="en">
 		GUI to manage audio effects for Pulseaudio applications, giving full control over the effects order to the user.
diff --git a/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild
new file mode 100644
index 000000000000..2e1e07edfc11
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/easyeffects/tree/pulseaudio-legacy"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
+	EGIT_BRANCH="pulseaudio-legacy"
+else
+	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf rnnoise rubberband webrtc zamaudio"
+
+DEPEND=">=dev-libs/boost-1.72:=
+	>=dev-cpp/glibmm-2.56.0:2
+	>=dev-cpp/gtkmm-3.24:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=media-libs/gstreamer-1.12.5:1.0
+	media-libs/gst-plugins-base
+	>=media-libs/gst-plugins-bad-1.12.5:1.0
+	media-libs/libebur128
+	media-libs/libsndfile
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/zita-convolver-3.0.0
+	media-sound/pulseaudio
+	>=x11-libs/gtk+-3.20:3
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 )
+	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
+	>=media-plugins/gst-plugins-lv2-1.12.5:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.5:1.0
+	sys-apps/dbus
+	calf? ( >=media-plugins/calf-0.90.1[lv2] )
+	rubberband? ( media-libs/rubberband[ladspa] )
+	webrtc? ( media-plugins/gst-plugins-webrtc )
+	zamaudio? ( media-plugins/zam-plugins )"
+# Only header files are used from libsamplerate so put it here rather than DEPEND
+# to avoid unnecessary cross-compilation.
+BDEPEND="dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	media-libs/libsamplerate
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.5-meson_no_automagic.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature bs2b)
+		$(meson_feature rnnoise)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/media-sound/pulseeffects/pulseeffects-5.0.4.ebuild b/media-sound/pulseeffects/pulseeffects-5.0.4.ebuild
deleted file mode 100644
index 749f06d01a61..000000000000
--- a/media-sound/pulseeffects/pulseeffects-5.0.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/easyeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
-else
-	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="!media-sound/easyeffects
-	>=dev-libs/boost-1.41:=
-	>=dev-cpp/glibmm-2.56.0:2
-	>=dev-cpp/gtkmm-3.24:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.18:3
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/lsp-plugins-1.1.24[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	rubberband? ( media-libs/rubberband )
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	>=media-video/pipewire-0.3.24[gstreamer]
-	sys-apps/dbus"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
-	${RDEPEND}
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-BDEPEND="
-	>=sys-devel/gcc-7.3.0
-	dev-util/itstool
-	media-libs/libsamplerate
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_icon_cache_update
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt "5.0.0"; then
-				if ver_test ${REPLACED_BY_VERSION} -ge "5.0.0"; then
-					elog "PulseEffects has switched to pipewire as it's audio backend"
-					elog "See https://wiki.gentoo.org/wiki/Pipewire for how to use the new backend"
-				fi
-			fi
-		done
-	fi
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index f496c2f2a7d6..d45ed48012ec 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 3328 BLAKE2B beb9f8c12afd9435bb73288146c13e4044cff9a93dd7061dbbbb73567c150b3c047c14e0aeed00f803543de87c35bab582d511244b724cb4ad98538f4d0821ac SHA512 fde8d2f9ff81c606e06dade8af2b00abc0f7f8207c80eeb96fa3ed24b760f1abc80df362f9f95501a28b47e05a229b9964cb348489e9f133e2d83703d638b40c
+EBUILD rhythmbox-3.4.4.ebuild 3322 BLAKE2B a175033a5d2bf703671b4bf8414e8771810fe11629f63898788336e8ee2da73dc5cf872207cf9b91689c080511e46c97ec2d1fcbad0afd3702d9f038808083ad SHA512 c4350649c225a42413ab6c400998145df0500d87f5d9d1f724206b7cc99c8ff5f3685eb219bc88c80d87c7aaa1e40624e2b2ef229429bb5ff6eb111975eff89c
 MISC metadata.xml 545 BLAKE2B 541f660e1607a2e02779487edf290dbd8d8262184c2b0f245eabea4490165a0b019b1a989ad9a27acea26a15edc1ba39b4669756a9b17464b9592191e4498a99 SHA512 a734430876806e8bc114e3058c6b5cdabe87372af71a478f333dd7449faa63af011dc2c7115293049e74da8df742ed6a03f03c8e2a56a2d56b2aa4c547bd6065
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
index 7f44193b8aea..817f3a7425e4 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="xml"
 
 inherit gnome2 python-single-r1 multilib virtualx
@@ -49,7 +49,7 @@ COMMON_DEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
 		')
 	)
 	udev? (
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 26f56ecf7731..e68f03fcc042 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,3 +1,5 @@
+DIST rosegarden-21.06.1.tar.bz2 6479487 BLAKE2B c18e1b6d14c2caac1ac7a2ddba2d40fb5a19d8a6468b81c696267ac984875db58943ec0fd46afe4b5d511afa1f5cb1ada93205b6088effcaf75adf234beaa516 SHA512 a0214d95c26e01c5c0ce671bf23f4ebe7f63e54cecf6471226768aae5b4ce8dcf9f03a1970c26317d734a16a0d741d83ce684a53f115db656538522b373ef7a6
 DIST rosegarden-21.06.tar.bz2 6477323 BLAKE2B f5bb9a471122857666edf033d4e760cbf81b0bbcf255e1248a1f865825677c41fb1a55a64835a168174b420793367214e8dfcedea25dc857e1ec847fae87770d SHA512 9cadfed3caba203ea6db78c3600600b9c5ed0e2963228dd6e8129291618e3b7c617b0d6dfaccce0dd753ce229dfaa8c65d1354f591e2923185fb76dcbe48d840
+EBUILD rosegarden-21.06.1.ebuild 1135 BLAKE2B 350774d8cd0f82e86e09db77fb81eb338cfafdad02b74afcd8cca5677bd65eb517bce08f8fdc1389836d0bddf75ce412cfcacd318281dfa7f3a5837c79a00159 SHA512 06d439b37e18cb255f3c0d591e71fab48e3646ff645ff01630c9a6e509bb7baf70dd1012da4c19251ef999f922b3a2dea7d01da0104a4ce1cfcad404fba66cd7
 EBUILD rosegarden-21.06.ebuild 1133 BLAKE2B 923da829748128bc080fad7299d0fca0549c8a265e966bb74daae240cccc057da58efbb7b3faaff769e7be7cef564dc46e79315237f1f372bff5c4710be5cd11 SHA512 3f9f4d9cd5754368ef5d1f09abea4c395ea05a48b8c8c695669d51acb823ebca074bfff81c0f37685f62c8c05406f27bfc878a733008fc9e910386b4d3de34a2
 MISC metadata.xml 349 BLAKE2B 0f31b6c7f0aef5e0b487ddcdf963c1701cc3429870464de30409dd788422964adbf05172089315a6543ac858f4d5ae64773c52728f24da4dc06dfe9b1dcabf9e SHA512 1790ba05a4f13f358de6890c908b2f1eb0581143063b7237220dd05aba31d16d68f2cf6c4712a08894909b7de5306d592807e9f3171b66b72fd867bd339a0cee
diff --git a/media-sound/rosegarden/rosegarden-21.06.1.ebuild b/media-sound/rosegarden/rosegarden-21.06.1.ebuild
new file mode 100644
index 000000000000..6cc3ac2b875d
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-21.06.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg virtualx
+
+DESCRIPTION="MIDI and audio sequencer and notation editor"
+HOMEPAGE="https://www.rosegardenmusic.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="lirc"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/alsa-lib:=
+	>=media-libs/dssi-1.0.0:=
+	media-libs/ladspa-sdk:=
+	media-libs/liblo:=
+	media-libs/liblrdf:=
+	media-libs/libsamplerate:=
+	media-libs/libsndfile:=
+	sci-libs/fftw:3.0
+	sys-libs/zlib:=
+	virtual/jack
+	x11-libs/libSM:=
+	lirc? ( app-misc/lirc:= )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_LIRC=$(usex !lirc)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# bug 701682, tries to open network socket and fails.
+	local myctestargs=(
+		-E "(test_notationview_selection)"
+	)
+	virtx cmake_src_test
+}
diff --git a/media-sound/solfege/Manifest b/media-sound/solfege/Manifest
index 6b15047bbbdc..dd2b15d9093f 100644
--- a/media-sound/solfege/Manifest
+++ b/media-sound/solfege/Manifest
@@ -4,5 +4,5 @@ AUX solfege-3.23.4-itstool.patch 6767 BLAKE2B 0f0fe564fea7ab8396fb597257bccf90ca
 AUX solfege-3.23.4-no-xmllint.patch 448 BLAKE2B bbc9b1247f68f36ab2a426972255dee4fa6c2531919df090133c9daf59e964eb6be93bac04f99e88c0d1184f10429b2b3d63b8b7a6eeb8acb089628f25295832 SHA512 3eda0a2c845d6f4e82b79542835a9a20658a522c86b162821b0b0a61187505c811710660ee1fa5395709f14607fbd8e95b542263c155284e47950b5178a1854d
 AUX solfege-3.23.4-topdocs-encodings.patch 1347 BLAKE2B 40211d4dada0e2d3d9185f299ab2ad7e8b4e3afeab24a6c35d9c5bdd8685f35bea157d3f6ab916aa6a347c96f5a35495c7e61682b118513e3a2a35833334a712 SHA512 550f1ad9a01fb27e3d3a5e6b8b99a2126b8607cf72bcaef2d8f039c28c77e0f11e0e41da3f01907f4fdc430cb97b114135b9c1a64317fdbff106d9377cfeed8d
 DIST solfege-3.23.4.tar.gz 5148412 BLAKE2B 8543aaa659f753af87f7b911401ee38713aa51afcf3dc33d4bfacbc880c8088aff78a81ce03369ba0b58d14a4b6965d78d97486ac2c3481f066591db0f29743d SHA512 e489dec514b4f387ebac7627d83d1a7766718d10a26c3ec6257d3f4b27a082501df16a27c8a16023b34a06cd4832fabaa1c73bcded52c502fc68ab57b303eeea
-EBUILD solfege-3.23.4.ebuild 1743 BLAKE2B e24c8702ddaf919d6b19b22ecaa067f6ba29e5ff328610d3de9b8b2e7f2067f44226d2f62547554c00077f1a69aacc22fb94d50de00929c1c1872ab52a9e8f8d SHA512 07ddc4fc3541c0cb72061e90b1017ee65aa31e83714459e763164c4f424c8eb4eaa5c780c8a2d9359873046146746cf2d72268c048b9efc086987ba495e65cb0
+EBUILD solfege-3.23.4.ebuild 1731 BLAKE2B a88a6776a852a028bc0f545cedfb98b9aa2c75becc311547dce745a2c6326217d288b484a6d067980eab171851c33e3cbd30c0e00e768c548f689bb4bcf3d616 SHA512 654d0189d6b8ff3997841b3728a15deaa3683ccf92c9a53f7375736c3014634b204ceb2d50793b82f4c45abe8f380ac28fc8f5e47e5f55a58c3cf6861817975d
 MISC metadata.xml 330 BLAKE2B 7b72c052aeabd90cb225ca7ccc8ba50caceacccc2d2265dfbcc9c99e535753c5413cc6428b159c62b7bc7aeae0107e8f583371a8f813190f7085c16a43936bb4 SHA512 8b9ec04258e5d3437339d00e9ce5e565b865b7f80230d78bd39cafcea569a4d5f413d0f251899842adbfc7583c77041aaa50e9ee101f2a0496b01393b0740c86
diff --git a/media-sound/solfege/solfege-3.23.4.ebuild b/media-sound/solfege/solfege-3.23.4.ebuild
index afac9800dc52..71a32e160ee9 100644
--- a/media-sound/solfege/solfege-3.23.4.ebuild
+++ b/media-sound/solfege/solfege-3.23.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 inherit autotools python-single-r1
 
@@ -30,8 +30,8 @@ BDEPEND="${PYTHON_DEPS}
 "
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	x11-libs/gtk+:3
 	alsa? ( dev-python/pyalsa )
diff --git a/media-sound/sonata/Manifest b/media-sound/sonata/Manifest
index cd3fcb3c7f49..4c91d244b35b 100644
--- a/media-sound/sonata/Manifest
+++ b/media-sound/sonata/Manifest
@@ -1,5 +1,5 @@
 DIST sonata-1.7.0.tar.gz 2258617 BLAKE2B 704f673737095351f88f64bc858db465b26d8e0fdb34cbb4d3917abe65ec276ec3e6419edd41d9e8b193a886c8dfd178b5fc94daa4a178aae817c2d3024c266b SHA512 c60c16b6cca439c2063069ceea62afdb9f09c9735d36ba42e2b5b1caf07506f15d722d75c68e355db4615b937a728679aeae1619527ac8267feec111635c27f5
 DIST sonata-1.7_beta1_p20200212.tar.gz 2259353 BLAKE2B 78befe6896d75033649e4f7333bc1487cc7462a66564860d93b4770cb7e86a6cc4656377b6e13defb07591b0a81cbd22653f01c5e9f20d75fcbf28a84551f7fb SHA512 bdff3ee3ec4d94a18604409efbca398f94633a510780f33d449921b69787521ad5d68285aa0fe7252191c1227435c42cf60bca0fe7764e1a8b3d887ff4be4ae6
-EBUILD sonata-1.7.0.ebuild 965 BLAKE2B 282eea69d9b7877c70eabfa84f163721ba65e40c445854efe240074dec06e695e207d2e44db6249fd3475f27958346e07270c42ebb7225c675864b12afd987ef SHA512 68e023e450cd7293a0c126d3a4cc9abcabd76d95be1a381ac6d4365a18bea5a5eb9c33c4eafc7f92e7cca141724fc0bbf20e32a6e8679b4c0fb33507c99d8e31
-EBUILD sonata-1.7_beta1_p20200212.ebuild 1031 BLAKE2B 8bd11ba89b430e07e3d4cba805cf6d6b17ddc68acbffcbdb570bb261a58a2ef3f614ea16fd81e93a90882f903c62f112d3560dc38457feb77ad6d46f5fe72a42 SHA512 2ca3fc5410eaff075649921b472d19e354d509f3d4c0594a857edf779f1e4fe84fd430fa2d925abfd9ed2ade3f3f0168e927c1a9932a19a64336ada4596f3c86
+EBUILD sonata-1.7.0.ebuild 941 BLAKE2B 532c451b552ec687b9ba102c8da6ad41272ad12313a7f0dd664f11bfdc8cb4dcb450e320ca2465caf74082eb12d322d098bbf5b2bae2ff804838f53372ce1084 SHA512 646bbb618a5bd8e377d3bcdffbd5ca1b4fa8727b3274204f1f8f2aa5e6347c1bebfa430141c1eb1c542467f6f385afcd78023ed490c5b21824fb45fb4f6b8f0e
+EBUILD sonata-1.7_beta1_p20200212.ebuild 1007 BLAKE2B d1faef4d6484419399278b7994fa46e153308a616f9aec55003a2eb41f059d5202136ebe00698ee45300cc9b3da3217a7ecee3f93f534b35daa42a0c314a39dd SHA512 07adc1677a39c9c35b2343b616282c037bbc404620e7e859af41e7404fa1bdc345a90283ce240385686f8020b37e5abc7d5381cde9b0f8e6a11a0188a16e8b20
 MISC metadata.xml 478 BLAKE2B f93c58977de74be7b3fcbaa3d2ca22e2d8394b6899d6c07072270418380cc50ce99f426ce3668e5a663939769eb7e6a4871d1a7c96afb81c5c89d0aebc1c3ad2 SHA512 5c7dc2feb0594f52ebcf8e579a9292e157b673e358ea80cf8111cb72a62bb2551725d4f3f738daec430ae4f66ff80e48330b0d8aa23a3ac508a0c202f209170a
diff --git a/media-sound/sonata/sonata-1.7.0.ebuild b/media-sound/sonata/sonata-1.7.0.ebuild
index f655eca0a200..ec586b8a631b 100644
--- a/media-sound/sonata/sonata-1.7.0.ebuild
+++ b/media-sound/sonata/sonata-1.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_SINGLE_IMPL="true"
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 inherit desktop distutils-r1 xdg
@@ -21,10 +21,10 @@ BDEPEND="
 	virtual/pkgconfig"
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
-		dbus? ( dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] )
-		taglib? ( dev-python/tagpy[${PYTHON_MULTI_USEDEP}] )
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-mpd[${PYTHON_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+		taglib? ( dev-python/tagpy[${PYTHON_USEDEP}] )
 	')
 "
 
diff --git a/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild b/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild
index 2c394b59693c..5a0ee03e22ac 100644
--- a/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild
+++ b/media-sound/sonata/sonata-1.7_beta1_p20200212.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 COMMIT=0c807e593f7571a654ad055cb126652d7f3a698d
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_SINGLE_IMPL="true"
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 inherit desktop distutils-r1
@@ -22,10 +22,10 @@ BDEPEND="
 	virtual/pkgconfig"
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
-		dbus? ( dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] )
-		taglib? ( dev-python/tagpy[${PYTHON_MULTI_USEDEP}] )
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-mpd[${PYTHON_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+		taglib? ( dev-python/tagpy[${PYTHON_USEDEP}] )
 	')
 "
 
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index 44ad704733a1..260928d69c8b 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,3 +1,3 @@
 DIST soundconverter-3.0.2.tar.xz 208440 BLAKE2B e7817648fe27b2083629ea718b0479f7b9e2607a017868b1e1ce3fb0407a84a548bd007647e73a1d4163a7f51b162a89e3914419ccdbfd07586c2a94a23f4af2 SHA512 0746395de412a4d845e3df4d6cce0dbcba266c9efc8db71663dd1c751d2a5de5b0dc266f24bbfe6c00f69428801ce5f9558fc8e5e2f5d5e6be8562085cd7fe92
-EBUILD soundconverter-3.0.2-r1.ebuild 1833 BLAKE2B 4400c68cd041783e68fc65cff37a0a88cade077bda96c172b1eba24f69f7a9d780cc3d5aff2621dad52c944eff357d3bd15cc1838afd3ebe2dc7c72ed6d8da51 SHA512 c036a073ffdfb53610b4c27e41dd99f3c9b10212f1e12ef21ec5152cbdcaf1e9f160729097f468e5ea27cf5f7112eb0df110fdb78c7e1d4181daa87188058378
+EBUILD soundconverter-3.0.2-r1.ebuild 1825 BLAKE2B dfad0e7f1e681fee074bcbf0503d6b9e36b5c219e591a24cb0e436ba34f2bf3eb391cbffccce51225d5eaa447e9c9ffc4d2bebb0587603f51c757fd4f071dcb5 SHA512 6e8c1754f91e7dfb132cefed59b508014658552aa68a15f3c4de6ef1ce287bcb2390e7549f920f19c3e8f4bf1101f4c5dc084b76cc4ea3053d1df896303c10c4
 MISC metadata.xml 348 BLAKE2B ca79913ada8d48522d7f0f593caff90549704f518c13f1ca79f34a1f885ffa1500d498be6fe4f70b301a3ff168235ca9e6a2642ff4c4d5a0565ad3bc8de99050 SHA512 a9daf27ee0eeb8342f28e7089b3ff3fdfafb1e19f517efc0d56f5eaae09f05b5b7309368af53fba1f46b8810349ca1f6f82aa3c14369144b22970f488c6ae1b5
diff --git a/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild b/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
index cfb00ad24e9e..dceecba8d9c3 100644
--- a/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
+++ b/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit gnome2 python-single-r1
 
@@ -31,7 +31,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 RDEPEND="${COMMON_DEPEND}
 	x11-libs/pango[introspection]
 	$(python_gen_cond_dep '
-		dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
 	')
 	libnotify? ( x11-libs/libnotify[introspection] )
 
diff --git a/media-sound/subsonic-bin/Manifest b/media-sound/subsonic-bin/Manifest
index 3f4eed5e3081..d278e6f66553 100644
--- a/media-sound/subsonic-bin/Manifest
+++ b/media-sound/subsonic-bin/Manifest
@@ -1,5 +1,5 @@
 AUX subsonic.confd 420 BLAKE2B e7e1b0b6bd33ec62924a015036f3197581749ed74e07359f8ceca68fb6aceb8c63b80e0d195e28345f1f22ff84c826cc5ed362dec75c5c6c36f97fb6de036279 SHA512 2e79c5a6fb12d0b8d4c5107175da8ca65bcc10e42c385b056ba5c5bb4c98c7d9995c391a5bddd726237a1f13bf37d1cbdc48f7fa7b9d3dd1e3aab20a212b00be
 AUX subsonic.initd 1194 BLAKE2B 018257ead2e8c620715404b3ba91ecce53913b7aa554670d1af495b2e1d17abf4ef5b140c62ada2eba0f01589bb43d08320c81c6c93f55f5510b8bcefb02dcff SHA512 7e99eaf2663d346d42e883f3501017e4da565f7b07ef390e370e097d13f4fd039ddccaa761562c2f43c28dbf3ad5c355dbfcef7b4e67ecccf3cd31819c86b14b
 DIST subsonic-5.2.1-standalone.tar.gz 43671795 BLAKE2B 2cf2ff67aaac7dd2ce405d832bfbd1f7dd0a87f4e5698092048891778ebbcac35e70c535a1e2af012655bc49e555ffdcbcfaffea62ad16cd987458e0d30a0135 SHA512 1251b77cfbee80224d3e332945fecec981c79b27c129cb47f5880a82344db15d1f8d17b11dd272a4ad3d9794f4e3055d4a59826623d543b676de73fe1c83b936
-EBUILD subsonic-bin-5.2.1-r2.ebuild 1424 BLAKE2B 0894f8cd433ed48a9b69e72fec36de291b570bb85089396b24bfcbacff54106613ba0aac76172dc43948c4aa5f75100cdd594506d446bcf2bd763fc81551ede9 SHA512 2a45bb020927858a549d76d8ff798dc4c500cd0b6783a01c403abbaf0212a153c5d457d4d0fa3dd706a4cf36c47783189476a4d92b20161ab30911b9da100f9a
+EBUILD subsonic-bin-5.2.1-r3.ebuild 1250 BLAKE2B 02fa4ed7389c08b4cec83c223223d76840ae7e57a6434572ab964eb10c887a86cb7b22db8de8adeb59273d5a0ef33c6d9453aa577c9167dcbaee335a32a3240f SHA512 0be6bc89617df7056cedaf4468a773a93ae21ccbeca9a41449c1ebbabae41207a730ea033de7e597bb405d57292e14c7ac317a7f8aaa106f9cee2f64c29facf3
 MISC metadata.xml 325 BLAKE2B 031eefbb5a58dcfdeca52016a4db3ffee06a097db0604cf95079f00e5897f13f25b12d6e9d5cb7d6e25bda3a41a230fa98d40d18c6a4acc5eaffe69423d25529 SHA512 f6fe0547df26e6c4f94b6b1e915a51731fa3d6f565c71adc64f2fc3d858dc67d4664e46fbb654fa982bf0ba5915d673e0891f20aabfaadc84c0df2c44df46865
diff --git a/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild b/media-sound/subsonic-bin/subsonic-bin-5.2.1-r3.ebuild
index 8aee2ef491d5..4aaf33bdd807 100644
--- a/media-sound/subsonic-bin/subsonic-bin-5.2.1-r2.ebuild
+++ b/media-sound/subsonic-bin/subsonic-bin-5.2.1-r3.ebuild
@@ -1,35 +1,30 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit wrapper user
+inherit wrapper
 
 MY_PN="${PN//-bin}"
 
 DESCRIPTION="Subsonic is a complete, personal media streaming solution"
 HOMEPAGE="http://www.subsonic.org/"
 SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_PN}-${PV}-standalone.tar.gz"
+S="${WORKDIR}/"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ffmpeg lame selinux"
 
-DEPEND=""
-RDEPEND="virtual/jre
+RDEPEND="
+	acct-group/subsonic
+	acct-user/subsonic
+	virtual/jre
 	lame? ( media-sound/lame )
 	ffmpeg? ( media-video/ffmpeg )
-	selinux? ( sec-policy/selinux-subsonic )"
-
-S="${WORKDIR}/"
-SUBSONIC_HOME="/var/lib/${MY_PN}"
-USER_GROUP="subsonic"
-
-pkg_setup() {
-	enewgroup "${USER_GROUP}"
-	enewuser "${USER_GROUP}" -1 -1 ${SUBSONIC_HOME} "${USER_GROUP}"
-}
+	selinux? ( sec-policy/selinux-subsonic )
+"
 
 src_install() {
 	local dir="/usr/libexec/${MY_PN}"
@@ -42,21 +37,18 @@ src_install() {
 	exeinto ${dir}
 	doexe subsonic.sh
 
-	keepdir ${SUBSONIC_HOME}
-	fowners ${USER_GROUP}:${USER_GROUP} ${SUBSONIC_HOME}
-
 	newinitd "${FILESDIR}/subsonic.initd" subsonic
 	newconfd "${FILESDIR}/subsonic.confd" subsonic
 
 	make_wrapper ${MY_PN} "${dir}/subsonic.sh"
 
 	if use ffmpeg; then
-		dodir ${SUBSONIC_HOME}/transcode
-		dosym ../../../../usr/bin/ffmpeg ${SUBSONIC_HOME}/transcode/ffmpeg
+		keepdir /var/lib/subsonic/transcode
+		dosym ../../../../../usr/bin/ffmpeg /var/lib/subsonic/transcode/transcode/ffmpeg
 	fi
 
 	if use lame; then
-		dodir ${SUBSONIC_HOME}/transcode
-		dosym ../../../../usr/bin/lame ${SUBSONIC_HOME}/transcode/lame
+		keepdir /var/lib/subsonic/transcode/transcode
+		dosym ../../../../../usr/bin/lame /var/lib/subsonic/transcode/transcode/lame
 	fi
 }
diff --git a/media-sound/volwheel/Manifest b/media-sound/volwheel/Manifest
index 7752ca3993dd..44fc4923f042 100644
--- a/media-sound/volwheel/Manifest
+++ b/media-sound/volwheel/Manifest
@@ -1,7 +1,3 @@
-AUX volwheel-0.2.8-desktop-QA.patch 183 BLAKE2B 59e4701d0ddeaa73b27407c49948685a04d5e39b826de4239a3f9307f8373a5093b0f24712332fe9f1f9954ac49cf096f9cd66965d661d49e54d4bd1c9a9c845 SHA512 924a95990df5780981bc416c4af3f5f743148df4e695414f699606cafdf80022d232a3f3577d031f69044a12e6202c363807e1245d296e5ad3d76a9e6e8741f5
-AUX volwheel-0.2.8-perl516.patch 1090 BLAKE2B f4ebc18d9635e66e021e6dfb941405cedcb6136a8c4b9267056d29351d3186b454ddb0c1af00323d8307e472010b43437f02ec28fe18c718a011082f057963bf SHA512 4867253ec1bd5f8efe3bd1833298d9bf1db6825df539496f7e6ef957c4a850a6cc9b640499617537702c192b25073ad2025626aed423500aa117067d703a18a4
-DIST volwheel-0.2.8.tar.gz 43140 BLAKE2B 87e23aa333485f31b2d21d79825d61aa421283d7ef62fc20e30e21cd11a2c379f5ae536cdba08883ced2a112a4ef0f8de9e719908afdcf5cd94d0431ce92f8b6 SHA512 ee2d121d2a9e2c987407a30187a313db128f1557932d003421e0fbda683cf80d52b5fb3c4c4ab2d07b642e86bb580bb3764a1c091ea57f5068660a035e78721b
 DIST volwheel-0.2.9.tar.gz 43921 BLAKE2B 9f555d8666373127de8a02cb4f83b12a2f6dab4c78087c3cef711fc6c59343d69af2f36e68a9354390bd820aff5ea41405b5cf5eef8d196da010efaf5d878b80 SHA512 9a16a9813953d2acfe7bae25c366094f244f34b6031e8d75761468590e76d63005580c26b0f27f26ac6e6537a179d15fdaa4348d94c84d0bb1fb7ec97e092e5d
-EBUILD volwheel-0.2.8-r1.ebuild 632 BLAKE2B d296fd1cf6111518f69f095e1fbf3392ef80792a7e67939b8abc1b795d1f8cae6e2248effa6b4797d2d6e5e12408851d2d3724c68f00878bcebd36de28b103bd SHA512 b4d9c921cd7612121a89a884ff020ac990a790e75dbb7542e1d9ab530a1733264788f761a466b9ac2da9820ed27ec35ffc7582f10e179f970a87adcdfb79580e
-EBUILD volwheel-0.2.9.ebuild 579 BLAKE2B 929abad87ae5d00300c6133cca6e2120884247e4d73dd9f3c38bc4b8909a223baf5332c0ebc1627806fc06755b95a432b01c0313a1f4ae931982d641f182fe99 SHA512 0a95f2452a8e2ddee6074187ed8119770151f2fff436109eca10433d5ff2b7a353cf5a78b6691fd1dcb97d339601cef08d658f52ca911ad6f2d4f9ef749ca2a1
+EBUILD volwheel-0.2.9.ebuild 577 BLAKE2B 6968ce0f280257663d35b576435e39803c6725dd32cc6249f2b605a19a0f818acc6c13ebc219619e1c169ce0a2c650b5ffad8142befdb5b921e487a43014a9f8 SHA512 95033efa4415be8723ec244d0ecc0d38806d4e14856e51538fbd4fb42ab474d3859bfef0e5846602177dacea7fc1029206e6693fc28b6505835c82567a748bf2
 MISC metadata.xml 331 BLAKE2B 3524bb7c1202728614805cd0c286d8417387cf15d871f108da38f0fb015811600a05a275e2685e47f0225d7bdd684e4c7bbca4a5e4d71074084830d606582b49 SHA512 4a10f6540d114212e21102d1daca1e58043e637300573475be33369de01373e64041be84cecea9138bf2cebb39a5c26242a05820bfa58673e90698a4dca45fea
diff --git a/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch b/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch
deleted file mode 100644
index 11af8697af6a..000000000000
--- a/media-sound/volwheel/files/volwheel-0.2.8-desktop-QA.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/volwheel.desktop
-+++ b/volwheel.desktop
-@@ -1,6 +1,5 @@
- [Desktop Entry]
- Version=1.0
--Encoding=UTF-8
- Name=VolWheel
- GenericName=VolWheel
- Comment=Easy sound volume adjustment
diff --git a/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch b/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch
deleted file mode 100644
index 4a801cf5192f..000000000000
--- a/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-http://code.google.com/p/olwtools/issues/detail?id=8
-
---- a/install.pl
-+++ b/install.pl
-@@ -2,7 +2,6 @@
- 
- use strict;
- use warnings;
--use Shell qw(install cp);
- 
- my $package = "volwheel";
- 
-@@ -33,17 +32,17 @@
- 	system("sed -i 's|/usr/local|$prefix|g\' volwheel");
- }
- 
--my $output = install ("-v -d {$bindir,$libdir,$datadir,$hicolor,$desktop}");
-+my $output = qx|install -v -d {$bindir,$libdir,$datadir,$hicolor,$desktop}|;
- print $output;
--$output = install ("-v -m755 volwheel $bindir");
-+$output = qx|install -v -m755 volwheel $bindir|;
- print $output;
--$output = install ("-v -m644 lib/* $libdir");
-+$output = qx|install -v -m644 lib/* $libdir|;
- print $output;
--$output = cp      ("-v -r icons $datadir/");
-+$output = qx|cp -v -r icons $datadir/|;
- print $output;
--$output = install ("-v -m644 icons/volwheel.svg $hicolor");
-+$output = qx|install -v -m644 icons/volwheel.svg $hicolor|;
- print $output;
--$output = install ("-v -m644 volwheel.desktop $desktop");
-+$output = qx|install -v -m644 volwheel.desktop $desktop|;
- 
- print "\nVolWheel has been succesfully installed.\n\n";
- 
diff --git a/media-sound/volwheel/volwheel-0.2.8-r1.ebuild b/media-sound/volwheel/volwheel-0.2.8-r1.ebuild
deleted file mode 100644
index 49e02ece502f..000000000000
--- a/media-sound/volwheel/volwheel-0.2.8-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="A volume control trayicon with mouse wheel support"
-HOMEPAGE="https://oliwer.net/b/volwheel.html"
-SRC_URI="https://olwtools.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="alsa"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-perl/Gtk2
-	alsa? ( media-sound/alsa-utils )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-perl516.patch
-	"${FILESDIR}"/${P}-desktop-QA.patch
-)
-
-src_install() {
-	./install.pl prefix="${EPREFIX}"/usr destdir="${D}" || die
-	einstalldocs
-}
diff --git a/media-sound/volwheel/volwheel-0.2.9.ebuild b/media-sound/volwheel/volwheel-0.2.9.ebuild
index ceb00500135f..128246afb82c 100644
--- a/media-sound/volwheel/volwheel-0.2.9.ebuild
+++ b/media-sound/volwheel/volwheel-0.2.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/oliwer/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="amd64 ~mips x86"
 IUSE="alsa"
 
 DEPEND="dev-lang/perl"
author	V3n3RiX <venerix@redcorelinux.org>	2021-07-24 02:11:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-07-24 02:11:45 +0100
commit	b49088575eb777ced2551f484da86317332d6087 (patch)
tree	bf9a151cf2d61956340d555659ffc098ee1da466 /media-sound
parent	514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (diff)