gentoo resync : 17.07.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-07-17 19:04:28 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-07-17 19:04:28 +0100
commit: 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (patch)
tree: 555c194dbeb0fb2ac4ad3cde7c0f6a80fd330ce2 /media-sound
parent: 4df3bf9762850b34cd1ead5c80374d1a0fc3362e (diff)
41 files changed, 457 insertions, 493 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index bc026c990100..1d754e793b3d 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcm2ps/Manifest b/media-sound/abcm2ps/Manifest
index 7bb3cd48f0b3..1c87980c950d 100644
--- a/media-sound/abcm2ps/Manifest
+++ b/media-sound/abcm2ps/Manifest
@@ -1,3 +1,5 @@
 DIST abcm2ps-8.14.11.tar.gz 259453 BLAKE2B a5b2b4142b9d3190fdedd3b560f8baa582293badd90fd380ddb9991871b2e08050d07c3c97f908529be715bce62b9cda242487f3d6a7885ecf802318a64b7df8 SHA512 b156c84cfa929aa5999a42b23564af5bac399dccbf116342891b5e5ed2e34e81b4658fab9f3c51f5de084cc96d8ea0965a2bdf81de14de6eb324b8998dbb8b98
+DIST abcm2ps-8.14.12.tar.gz 259618 BLAKE2B d0efa0b8a624447791a56591b4a2c0d775c3c3f628dab437a0cb02d49614e21e587d13467f7fa72955a2846704dde0a0da28ae6888faa0032edcb6d026365f47 SHA512 a9bd26b21ed057be11f0de6c89e76615820c476b18e521fb7f478e6f685fb768824879d441d616b3de1bbb4a4335ec169aa819a609bea295e0d522d1466e42ed
 EBUILD abcm2ps-8.14.11.ebuild 878 BLAKE2B 36b88fa45779d165602ae5b5805d501e3dda59ebf6d0712e0201b6af0922a8e7cc7a3322d7b9ac0efbaee636f59079caf3fa14b83d28071efb3e50b931139901 SHA512 8d166545f746551422117be43d011fcab1efc2591065a8e599089537c098f39220de25354f7963040d462c6faf203ee13957993bc66d6ca1c7ee0daaec2404eb
+EBUILD abcm2ps-8.14.12.ebuild 880 BLAKE2B 1b3abbe2c30bdaf0a3f48738493e4d745485e87736ae139bf33bd38505e95a1d1de8101801feb2093372323086cc6f0293a7b9c1f39fa20bcd5f35273b461d9d SHA512 d34ceecaf4794c8124167b7922c23b578395ec0ff317970f322567fbd42bf8fdca87aef921aa75478434413b419d3b232969eee40e10700c37a06421d9c4504c
 MISC metadata.xml 442 BLAKE2B 1644918baf09ce3fbbdfb92858c155cd739f48f0d7b3c52827b900547cb065f93a645203250bc6cb9f40ae9086cd6dd1e92f5b23a06d4cd19139c9f0952626b9 SHA512 b73b1bb4b151438f0328d9371f636d172072ade500c8d055b749a53a10975174f7d4a3a6f61937206e0342202827f7fb968f3d073745bf62fa954f2ffc8c9d0f
diff --git a/media-sound/abcm2ps/abcm2ps-8.14.12.ebuild b/media-sound/abcm2ps/abcm2ps-8.14.12.ebuild
new file mode 100644
index 000000000000..48eee1a8dfd2
--- /dev/null
+++ b/media-sound/abcm2ps/abcm2ps-8.14.12.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Program to convert abc files to Postscript files"
+HOMEPAGE="https://github.com/leesavide/abcm2ps"
+SRC_URI="https://github.com/leesavide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples pango"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	pango? (
+		media-libs/freetype:2
+		x11-libs/pango
+	)"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		--enable-a4 \
+		--enable-deco-is-roll \
+		$(use_enable pango)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin abcm2ps
+
+	insinto /usr/share/${PN}
+	doins *.fmt
+
+	dodoc README.md
+
+	if use examples ; then
+		docinto examples
+		dodoc sample*.*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index a595c86ce8d8..b4d9de974db3 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,5 +1,6 @@
+AUX aqualung-1.1-configure-lua-version.patch 1230 BLAKE2B ea7a3f9a5bfaef41e97639e9a417da233cd0b0577abf674ebee2e07141493f6f6207142f9b910e14e765d7fe2c1cdf43ab0b1a68234944f4134b3d8e35a255f1 SHA512 dfdfa42025e7c27cb735129fa0af0c2cd0b29803231bf225daa16c9b46357172eb9a5b6429cffc634dd4c3003de17339df3a4f27fbd0de682291302c63b89b10
 AUX aqualung-1.1-ifp.patch 1445 BLAKE2B 80e4baadf577d17985d657ff3b3a357f30ec027d1c2e81398472226c87f787a37257eecc34ef3c8c435216e8746947d1d87dc9acb62d08d8a1c44f2ba51e8159 SHA512 c20426ff125f9273dc8297a188c768ca64ae57f8a507049ed534b58fb0214ad21477c8375a5c999c5dda5de96dd2f1599fda0c768878441f4ca7190ef75bf90e
 AUX aqualung-1.1-var-collision.patch 1174 BLAKE2B 25ff8f99a38b5d857f3f3175400e535ba9343eec1954b97fc9552101c8581557b9ea3241d3976a6f9dd6d44e41aaaf6e4319469d89d7f68a6bfab5104a63d52c SHA512 d414f1af65466391a4b59e4b2de81b83db9eeddb60fe1b44f9a0fe101aa33453f18ac8c28e5a57ddba8ecb604c4571adfad1f94f12d4b0ef03e4c01c503a2e4d
 DIST aqualung-1.1.tar.gz 1986368 BLAKE2B 2dd367aefe55c1b9243bd5faee2e2d082825f1077326ad05cfe4c2b088ba2f055f5d9af7d14a032bac3603c8e333cffb53357a73e29f22f417e89ad91548eece SHA512 77f6350c1c6c9160da4c6280273812964d58e01227495a87e03e0bee0a2aaf5589d309b9ce7e08421845a357b35dbd08c5de5ecd495ae5ba7877a67d01e4ad01
-EBUILD aqualung-1.1-r101.ebuild 2498 BLAKE2B 23ecf60db98468881ee9c4d338998a7c988bbd2d0c1e50cdeece3213baa84d210f4daf6d8c55dd8aff6d57fb64b3a9ef6d3b495bb4d512973a2f24209163bcf7 SHA512 cb2b8401f75e1a9be4fc9c30d4ab0559c25b01668da23e6d914d31f45783545bc494298968124a8dff9fe173f1a9d597d3f06e88c846f162fa202c210e75a954
+EBUILD aqualung-1.1-r101.ebuild 2645 BLAKE2B 596843f46ed718bd2977782ee9c066efd1462fc907eda1bc593ae247d1fecd761b64591f887d41d3f44bf36e566bc5f02fb22a2cc80873ce338774aef05cddcf SHA512 ba93c99aeb4a5c55fef8a4cfa2f897988d997e36e89b96995682369c9c43d9a1aa49478c844f831e9fa04d2ea5cf346461e0dcac988008b1fe8638bb8abd3df3
 MISC metadata.xml 918 BLAKE2B b095813ec060712043d858b8e1ab6e4b5bcfa9ec2dd8e3b2003310774c4d1bf51d9a97c5335d1403d079e044006c4dd4a70e72258cf21f412bcc54facf57f003 SHA512 734b389036bed628f85a69b992efc5f144121c2edc9cc3f08bf7f00b8cbc73bcdcebc5893f8ceb9188de86a605ad6d4013451f45ba3478baaa5d16dc50643531
diff --git a/media-sound/aqualung/aqualung-1.1-r101.ebuild b/media-sound/aqualung/aqualung-1.1-r101.ebuild
index 87d3f7995f0b..26cd9a923812 100644
--- a/media-sound/aqualung/aqualung-1.1-r101.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r101.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-2 )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit autotools desktop lua-single xdg
 
 DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
-HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
+HOMEPAGE="https://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
 SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -18,6 +18,8 @@ IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
 	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
 	vorbis wavpack"
 
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
 BDEPEND="
 	virtual/pkgconfig
 	sys-devel/gettext
@@ -53,6 +55,7 @@ DEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}/${P}-configure-lua-version.patch"
 	"${FILESDIR}/${P}-ifp.patch"
 	"${FILESDIR}/${P}-var-collision.patch"
 )
@@ -61,6 +64,11 @@ pkg_setup() {
 	use lua && lua-single_pkg_setup
 }
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--disable-rpath \
diff --git a/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch b/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch
new file mode 100644
index 000000000000..a88839728c53
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch
@@ -0,0 +1,31 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -401,24 +401,11 @@
+ ])
+ 
+ AQUALUNG_DETECT([lua], [Lua Extension],
+-    [PKG_CHECK_MODULES([lua], [lua5.2],
++    [PKG_CHECK_MODULES([lua], [lua],
+         [AQUALUNG_FOUND([lua])],
+-        [PKG_CHECK_MODULES([lua], [lua-5.2],
+-            [AQUALUNG_FOUND([lua])],
+-            [PKG_CHECK_MODULES([lua], [lua52],
+-                [AQUALUNG_FOUND([lua])],
+-                [PKG_CHECK_MODULES([lua], [lua5.1],
+-                    [AQUALUNG_FOUND([lua])],
+-                    [PKG_CHECK_MODULES([lua], [lua-5.1],
+-                        [AQUALUNG_FOUND([lua])],
+-                        [PKG_CHECK_MODULES([lua], [lua51],
+-                            [AQUALUNG_FOUND([lua])],
+-                            [PKG_CHECK_MODULES([lua], [lua >= 5.2],
+-                                [AQUALUNG_FOUND([lua])],
+-                                    [PKG_CHECK_MODULES([lua], [lua >= 5.1],
+-                                    [AQUALUNG_FOUND([lua])],
+-                                [AQUALUNG_MISSING([lua], [$lua_PKG_ERRORS])])])])])])])])])])
+-
++        [AQUALUNG_MISSING([lua], [$lua_PKG_ERRORS])]
++    )]
++)
+ 
+ # Compiler and linker variables.
+ AS_VAR_IF([GCC], [yes], [CFLAGS="-Wall $CFLAGS"])
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 0f022e9ff4f5..ff3f667fd0aa 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -10,7 +10,7 @@ DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B f944385256b423d95da2df8
 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
 EBUILD csound-6.15.0-r101.ebuild 7400 BLAKE2B 9d711ee4305dbbe74d059f67109aa24a55fa99ec661c20c119cbe3344569904dd4f0888eaafb62bdfff2d178cbbc724bb1222b30a7cfd571a027e2b25f1247a0 SHA512 743d51af0fbc2235cba6968bbee28213b4aebc0b876cf4b820e3034a94b6b7d36b4cbaad1facf5f2a87db1cbdbbd4c6ed634f91f8b5ce3d1406040fca8aedf7c
-EBUILD csound-6.16.0.ebuild 7123 BLAKE2B 207820801b2d07d69253ad9113ca973ecfac3b70a5674697888178aaadab541553b2f9d87546e4141c17c8b8fcc53fde977e3cfea758c6a9523a4bcd8155af84 SHA512 6eb96c1b9be8e48846560dc368aa5305134ff447ed49413a04a878c70d310070cfee7dbec91471a1c17697126d214fc0cdb63d80297476a3304cf9c3f615f9b8
+EBUILD csound-6.16.0.ebuild 7121 BLAKE2B 37403bd6c1326b4684a43e47d60e01eece0ec35f05b8d883ddec22f2648045388e76afde0f62ae8bc8b3dab5ea1b38a85398c1993a147619e37424ef78398e5a SHA512 1b81cd50e7274ce13f99241915c8070b0918160f9669a6b1cbe9a8a58dfdb62030d5dab990dd9d36f893d1f147fc85d6e906e6813253b7a5e7206cbeee734f4b
 EBUILD csound-6.16.1.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.0.ebuild b/media-sound/csound/csound-6.16.0.ebuild
index 27e5f4a83d43..c21367e524e4 100644
--- a/media-sound/csound/csound-6.16.0.ebuild
+++ b/media-sound/csound/csound-6.16.0.ebuild
@@ -22,7 +22,7 @@ else
 			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"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and performance"
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
new file mode 100644
index 000000000000..cecba42c86ae
--- /dev/null
+++ b/media-sound/easyeffects/Manifest
@@ -0,0 +1,3 @@
+DIST easyeffects-5.0.4.tar.gz 2070912 BLAKE2B 848d2fa6fc1290b6fc25e13c4bbe4d8df932af63b8fb7e9642c6e24b29360dd17efba71ae0daae265538cd9cde1d9e33de453b0c469e3d54709a3f337cd583a7 SHA512 78074341c8376a4918d09950fd7db8804346cd2e00d6849da464662643809010eeb1d009c44ca5d3eadd2faf3bb9c43a18a41b7c3e77b883beff44618967b30e
+EBUILD easyeffects-5.0.4.ebuild 1790 BLAKE2B 5be8a0a80e5ee355ab69ae30cf9553de9b0859dcdd9baaff20373c7aa1e89d95730a3a2ab0f552a4ee37209cfed53871a5e423b8d434d0532673e230c1fbbd56 SHA512 18ef1d69d988aa1d5553f97c48be4bed66e8d9859d22a2764593c9cfb3f7b36b1e784b0f7ddf6c206f99f4d2a534b133472ee4461afb5a66b04a20f9ba5ff6f2
+MISC metadata.xml 694 BLAKE2B 0995339a202cfc2134c90d19c18a9efb8be097ff69d996d53470bcc94b3c6ad47376749c95ab94a3da917df33ebf01b993b538f7163224dad04eec01efe10ca2 SHA512 941917bf4e9ee80f56f9b7387028dee554210848e706aabd8fe523a635c7d7c77d192a1fdb751dc54c499627409656fa3a180859498aa4b9c0ace386ae789f35
diff --git a/media-sound/pulseeffects/pulseeffects-5.0.3.ebuild b/media-sound/easyeffects/easyeffects-5.0.4.ebuild
index e9dde9ba03b9..e050d932ceae 100644
--- a/media-sound/pulseeffects/pulseeffects-5.0.3.ebuild
+++ b/media-sound/easyeffects/easyeffects-5.0.4.ebuild
@@ -5,15 +5,15 @@ EAPI=7
 
 inherit gnome2-utils meson
 
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
+DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
+HOMEPAGE="https://github.com/wwmm/easyeffects"
 
 if [[ ${PV} == *9999 ]];then
 	inherit git-r3
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
+	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
 else
-	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE="bs2b calf rubberband"
 
 #TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
+RDEPEND="!media-sound/pulseeffects
 	>=dev-libs/boost-1.41:=
 	>=dev-cpp/glibmm-2.56.0:2
 	>=dev-cpp/gtkmm-3.24:3.0
@@ -34,44 +34,28 @@ RDEPEND="
 	>=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"
+	sys-apps/dbus
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
+	calf? ( >=media-plugins/calf-0.90.0[lv2] )
+	rubberband? ( media-libs/rubberband )"
 # see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
 # and sys-devel/gettext depends reasoning
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-BDEPEND="
-	>=sys-devel/gcc-7.3.0
-	dev-util/itstool
+	sys-devel/gettext"
+BDEPEND="dev-util/itstool
 	media-libs/libsamplerate
-	virtual/pkgconfig
-"
+	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() {
diff --git a/media-sound/easyeffects/metadata.xml b/media-sound/easyeffects/metadata.xml
new file mode 100644
index 000000000000..e4010fa254cf
--- /dev/null
+++ b/media-sound/easyeffects/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<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>
+	</use>
+	<upstream>
+		<remote-id type="github">wwmm/easyeffects</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 4b211bca5c40..4322492155de 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,7 +1,5 @@
 DIST elisa-20.12.3.tar.xz 1661968 BLAKE2B 17f7bf9bf589f19d010fa644c54d941647b3ed267c84ffb60b47ffcba27f28f0e639df3211d92ca27556e8887a9e83db3efa92739959c38e2051db79de6b2f4f SHA512 8fcf91c5421596a90e52329ab9d0f47cd5d4432f28ed1cede9f5e0e46f77124dd2cf6e2485fd184437034d3fb0820daeda3f8ad488e24637b97482ac3586c4ee
-DIST elisa-21.04.2.tar.xz 1724456 BLAKE2B f2c78a98168131bf6b6bc3a085ed43d6c65dcd3801c9dd5f4001906fa18441cddab098b73a1b056265854b951f9a4cbd8c1386f9fd1b5c7844e90a3493e39ff5 SHA512 69c9f605c1c15bf5d8a076f9851fee99655bff78a5da628c0b767f63ef5efd36df53112cdc523fe988afb56f62786b5f8c670a3c996b7827e8f6df58b76274d6
 DIST elisa-21.04.3.tar.xz 1725896 BLAKE2B 4937403cb1e58c23979ec5525232f227a92f4cfded11127af2cbf62b1f0a72163f39f1a02bec5e9d5acb9c78659f66bb3519a7ab322aaf3a5be7f855975cf365 SHA512 12a83267332f3d36d4906cd9dbc6c46558cd5a3efbf67ccdcfc53156e4e6b3cf334cd05033bc299105ce72df3625852ba8b9dc1438c0b50b7e29798796699ecc
 EBUILD elisa-20.12.3.ebuild 1658 BLAKE2B 4351d92ef0d8902ff9ff6435161f79580327b31a21add05d8a90978a4724e8bc5d6e6720772f46f14c0f0fdb6076ae9f2d86f23e1a21327dd7617481e2ecac52 SHA512 2ff5520e1c11115a4ccdecfbacadefdae94be53155f742e03c579ce1a9daaafc34ac22dd8a898183403788250e9076debdbba82defbdb9a2d69475352a002979
-EBUILD elisa-21.04.2.ebuild 1650 BLAKE2B 452bc1f0bdcd1a345678b2d73cf7e1e9d71f53047d43751a453c9d55339f2ec743c110d251456d2bf0092700387b2ee4e325018fd1f748c20f591acf6cd71b9c SHA512 84f615203f30d22624e476db0db3eebd211475cd6ce06382e31f9b8e4b90de01a529c5bf2789068b7f17b70f53a22facc2afe3a0e32655575b9f12f0b47cb2ff
 EBUILD elisa-21.04.3.ebuild 1650 BLAKE2B 452bc1f0bdcd1a345678b2d73cf7e1e9d71f53047d43751a453c9d55339f2ec743c110d251456d2bf0092700387b2ee4e325018fd1f748c20f591acf6cd71b9c SHA512 84f615203f30d22624e476db0db3eebd211475cd6ce06382e31f9b8e4b90de01a529c5bf2789068b7f17b70f53a22facc2afe3a0e32655575b9f12f0b47cb2ff
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-21.04.2.ebuild b/media-sound/elisa/elisa-21.04.2.ebuild
deleted file mode 100644
index b7ac1e0751d2..000000000000
--- a/media-sound/elisa/elisa-21.04.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KDE_GEAR="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://elisa.kde.org/ https://apps.kde.org/elisa/"
-
-LICENSE="LGPL-3+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="mpris semantic-desktop +vlc"
-
-RESTRICT+=" test"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5[taglib]
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	mpris? (
-		>=dev-qt/qtdbus-${QTMIN}:5
-		>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	)
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	vlc? ( media-video/vlc:= )
-	!vlc? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer] )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package mpris KF5DBusAddons)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package vlc LIBVLC)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index f69da860a6b9..8ab1201398fd 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,7 @@
 DIST fluidsynth-2.2.0.tar.gz 1507709 BLAKE2B 4ec162ecf461f3fbc80d1b5c1a4bc0624d8274dedcfa32addfd79d7270811e532bccee46b90181bca504183e092176652f6c9d0ae8eccfb5617b9176b8bc511e SHA512 fa08c6d6914accbb5a99bb912066d97ded26ab3c706e663e76a4f1b024f610f676d2e1f7c30872d00e0fe86b5c494dcea581ecd0770977d235962a845c074bd6
 DIST fluidsynth-2.2.1.tar.gz 1594153 BLAKE2B 9a297859ae90e3dba21a3923059c081596d2a5ff107219b829f75e2067bea315364c9b4a9a4e6563c5a9f9ded92efff2c58d1aef9840b308fe69f546797c83ae SHA512 a42728f179fd2583a292d18d9b7d98498b42574aff6559e8e3762329893dd18c451b5611517aa9aa7ee6ba9fc0db3c83e127d097c68769c5d8562a49dc427ee9
+DIST fluidsynth-2.2.2.tar.gz 1741567 BLAKE2B 78fe02ae37db70e7aa92071aa609ff6f3dc6217827f89091ded1a8e2d30e84f3d7a095e101fcccfe720e9c3445f58e15da588cfcd7063388ab642649536b8fa0 SHA512 208956e367725de4b1faeba7d4125a6a85bb4191ef0354a7087809e93d93b8986cdc30b78c135a743104851d15f3bb09776855fa02a686de0810dd14c97851c3
 EBUILD fluidsynth-2.2.0-r1.ebuild 3314 BLAKE2B 1170bc2979a36dcbe5b84ca2ef8e4c34256c9da3514833bd23d1e0edd7753f876a943be534630a8ec0637024ca0a4a34ec06bcf83a42ee4f3f0948cd716cf29b SHA512 6de4ee1f429768af858bc9bedf365e4977ef8f2d04a815ba0fb6c5649b2989c56bb56951cd1647e3c6f3a1a93d1daf99783532aa4e32512db4273df4091b235f
-EBUILD fluidsynth-2.2.1.ebuild 3357 BLAKE2B cef1dd162fa1c63d1b12e2b34821cb3afb341ee80e1237bb5844ecc3f40a0026d1dafcbbb49b35fa021f2959e5cf89dcc0e93b4868c3a8f1dce20c5db8c29ec1 SHA512 d85b312be9ccbc4e363d834b49a52f2b77f89195f76d608bede59a8f865bc8341f48d83503799fffddaccbe9115b9c3b7a6e94913210c8f4a1d596a4b5332437
+EBUILD fluidsynth-2.2.1.ebuild 3356 BLAKE2B db78921d090a791457306485639b42d424d8c4695b8b55c2a00a66c1aa706fa65d14289072127ad96a49edbc1f437efb40dde003e44861f6b8a80b1d01a2f7d1 SHA512 c78089e8fe83cbd8f922814b3d797fe0a618feedd15c0cef0708c32f0cc24ee0b969b1f756d3f13b6637a0ee312bb09ae695e4a497a982ac76df234aa75497a2
+EBUILD fluidsynth-2.2.2.ebuild 3360 BLAKE2B 2f0caa610b00d7ac09122ab8dfae6390864240cff2272232f1ebd582f5d3e30d4460ab0ce0a33ba3fb14694a119017aafb96defabe36acb34b58db35709a4b1d SHA512 1f35e5811cb12736c6ee7790a507298bf2a78aa2c0263c4f510381cbe1ecc52a5b2e3d12b723978b25909cdd2288d3a90cb3ffc3ff9dd4708da8370f02c63245
 MISC metadata.xml 430 BLAKE2B cef06a37f27e4ef3a555000188873f0f36a89dc90a3576dc15fb384a8f3c8f5bd38ccb79f56704ec7031823d3057eda17ac975a3ea1e265133e5ff81afc141d8 SHA512 c702d31a98e905d95f95f6cdfc16d8a71de5a5a55628e59e56d408a6599cdf6ab005642ee064217d88e0061c2856692e1446e340a3e80f2bc17ed1d3c2a14e9a
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild
index c7eb8de786ca..b066b19eae1b 100644
--- a/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.2.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.2.ebuild
new file mode 100644
index 000000000000..aca45d6ed7a1
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-2.2.2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib systemd
+
+DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
+HOMEPAGE="https://www.fluidsynth.org"
+SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	alsa? (
+		media-libs/alsa-lib[${MULTILIB_USEDEP}]
+		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	ladspa? (
+		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
+		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
+	)
+	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-Denable-alsa=$(usex alsa)
+		-Denable-aufile=ON
+		-Denable-dbus=$(usex dbus)
+		-Denable-debug=$(usex debug)
+		-Denable-dsound=OFF # Windows
+		-Denable-floats=OFF # loat instead of double for DSP samples
+		-Denable-fpe-check=$(usex debug)
+		-Denable-ipv6=$(usex ipv6)
+		-Denable-jack=$(usex jack)
+		-Denable-ladspa=$(usex ladspa)
+		-Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
+		-Denable-midishare=OFF # http://midishare.sourceforge.net/
+		-Denable-network=$(usex network)
+		-Denable-opensles=OFF
+		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
+		-Denable-oss=$(usex oss)
+		-Denable-libsndfile=$(usex sndfile)
+		-Denable-pkgconfig=ON
+		-Denable-portaudio=$(usex portaudio)
+		-Denable-profiling=$(usex debug)
+		-Denable-pulseaudio=$(usex pulseaudio)
+		-Denable-readline=$(usex readline)
+		-Denable-sdl2=$(usex sdl)
+		-Denable-systemd=$(usex systemd)
+		-Denable-threads=$(usex threads)
+		-Denable-trap-on-fpe=$(usex debug)
+		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
+		-Denable-waveout=OFF # Windows
+		-Denable-winmidi=OFF # Windows
+	)
+
+	if use alsa; then
+		mycmakeargs+=( -Denable-lash=$(usex lash) )
+	else
+		mycmakeargs+=( -Denable-lash=OFF )
+	fi
+
+	if use systemd; then
+		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
+	fi
+
+	cmake-multilib_src_configure
+}
+
+install_systemd_files() {
+	if multilib_is_native_abi; then
+		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
+		insinto /etc
+		doins "${BUILD_DIR}/fluidsynth.conf"
+	fi
+}
+
+multilib_src_test() {
+	eninja check
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	docinto pdf
+	dodoc doc/*.pdf
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+
+	if use systemd; then
+		multilib_foreach_abi install_systemd_files
+
+		elog "When using fluidsynth as a systemd service, make sure"
+		elog "to configure your fluidsynth settings globally in "
+		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
+	fi
+}
diff --git a/media-sound/gnump3d/Manifest b/media-sound/gnump3d/Manifest
index 9ca4741ba56e..837582b765e0 100644
--- a/media-sound/gnump3d/Manifest
+++ b/media-sound/gnump3d/Manifest
@@ -1,5 +1,5 @@
 AUX gnump3d.conf.d 159 BLAKE2B d03de16b977c8c892be3dcd6ec7b45414dac9694a777fde5775f30ad94552349263563316c7e48517c60947e5751ef1f7d9eff4648c7a0cc720b845df32ee8cf SHA512 33c87ac067be3ae4f3dac690e38eecf8400ac393e47cea8f6b5b1238cc41b08dfe684ee33a7bf3bcb24cd6f9a8ff3861caed12c0d9d7f0df61a757cee5910e33
-AUX gnump3d.init.d 724 BLAKE2B 734bfb5daddea0894aff9254874d7135ad7a01bb46d2b6a2515ee359e98ada5ec328c31342dde936fdfeb051a8a8731b4a4a07f356b3566398dd7e0cc833bc53 SHA512 86f43db016e4dd1d2cb75b68ed1a11ea7b7f9ab1d78d18d0e6cf47c3380c466251f733d7aa73ef0354c3f63b78f18b966f583ea0aa328773442270c2aa0867d0
+AUX gnump3d.init.d-r1 826 BLAKE2B 37e9ea5403584881c2a4d87460fa058464eac1a1342af0decec37149f682b4946bb9cf34dc8eff21e6cd83c03aa2a334a8fbe2d9f7c9afd77194897b914dec20 SHA512 c54609e031615cf84328e52ed44d2744391abc580c19df512a62ff8e9091f52eea3741748559fe22f995cedc7d47bb12ea5bd0f5851bf4706327a8fd24d17309
 DIST gnump3d-3.0.tar.bz2 633215 BLAKE2B aec3e2e95ebcbf2b9465f8f7e5cf579fe64e9e48d3b1757f78d3102f3a02f92970cbccc5986741013505e1b2f0e54e0d7a7c3871837c6169898e763f23e7fcca SHA512 23778604b557346e42f5cd2045cc394c7d6f7044479c74cd635dfdbbfd6835c8e3ad761d54c5cba239cc5e020b049ac11d64eb463272fc4134b7645226e2524b
-EBUILD gnump3d-3.0-r2.ebuild 1966 BLAKE2B b390a0ca69dec14cf56720913ba3b848a46466288048f05c7c5b3246f6b249a6460fd4d245ca03b972ab8b3eff001d7b23cbeb430be08df56cb198c25e6616e6 SHA512 322875a08047fdf344a2c92efb957af4c6b70b2d9ee2c50a873fcf011df1debb2f56b16ab089234be2fd1c983422f87b16ea937c59c7aa9d3b3e85688e7ab7ad
+EBUILD gnump3d-3.0-r4.ebuild 1907 BLAKE2B 0e8b43a98ae2cf32071aa48b95bf35b041af4a218cd44d5303dc052296e891389a91ee5b693d95e71389137dced0739eaac3ebca23ed92ccf3e519a871d40c13 SHA512 11431e8a2e3b56cf068132662236debb247390ae5aff1608ff9268c8aa07ff7480d3b098d9f071aa0ca35bcf8fb135f369f3ed30b039a1f7d84cbf61b77cc67f
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gnump3d/files/gnump3d.init.d b/media-sound/gnump3d/files/gnump3d.init.d-r1
index 730fc0cdb2db..2ead467d7882 100644
--- a/media-sound/gnump3d/files/gnump3d.init.d
+++ b/media-sound/gnump3d/files/gnump3d.init.d-r1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="index"
@@ -34,3 +34,7 @@ index() {
 	/usr/bin/gnump3d-index
 	eend $?
 }
+
+start_pre() {
+	checkpath -d -o "gnump3d:gnump3d" -q "/var/cache/gnump3d" "/var/cache/gnump3d/serving"
+}
diff --git a/media-sound/gnump3d/gnump3d-3.0-r2.ebuild b/media-sound/gnump3d/gnump3d-3.0-r4.ebuild
index 63c211a36959..fc1a65587ece 100644
--- a/media-sound/gnump3d/gnump3d-3.0-r2.ebuild
+++ b/media-sound/gnump3d/gnump3d-3.0-r4.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PERL_EXPORT_PHASE_FUNCTIONS=no
-inherit multilib user perl-module
+inherit multilib perl-module
 
 DESCRIPTION="A streaming server for MP3, OGG vorbis and other streamable files"
 HOMEPAGE="https://www.gnu.org/software/gnump3d/"
@@ -15,12 +14,19 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~ppc ppc64 sparc x86"
 IUSE="sox"
 
-RDEPEND="sox? ( media-sound/sox )"
+DEPEND="
+	acct-group/gnump3d
+	acct-user/gnump3d
+"
+
+RDEPEND="
+	${DEPEND}
+	sox? ( media-sound/sox )
+"
 
 RESTRICT="test"
 
 pkg_setup() {
-	enewuser gnump3d '' '' '' nogroup
 	LIBDIR=/usr/$(get_libdir)
 }
 
@@ -50,13 +56,11 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog DOWNSAMPLING PLUGINS README SUPPORT TODO
 
-	newinitd "${FILESDIR}"/${PN}.init.d gnump3d
+	newinitd "${FILESDIR}"/${PN}.init.d-r1 gnump3d
 	newconfd "${FILESDIR}"/${PN}.conf.d gnump3d
 
 	keepdir /var/log/gnump3d
-	keepdir /var/cache/gnump3d/serving
-
-	fowners gnump3d:nogroup /var/log/gnump3d /var/cache/gnump3d
+	fowners gnump3d:gnump3d /var/log/gnump3d
 }
 
 pkg_postinst() {
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 0cf4f3d2b291..5f413e1408f0 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,5 +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
 MISC metadata.xml 557 BLAKE2B 76000f6e4bd787a3e2687f9bd3a71c0456cf4fbbd27e7bad1aaae7ee9e3e6832afd0cb44e07a4a23f13e01f7aa732be18e72e711f4148fc65b2b263c5190b49c SHA512 1a0a066f0829cd623672513b5c8950ffd6cb1a4d0921cd48174949af24070d1ef6c3bb0a850749c348d1afa2cdf56bcd94d6937b21163fd0a0667f7cdd1632e6
diff --git a/media-sound/jack2/jack2-1.9.19.ebuild b/media-sound/jack2/jack2-1.9.19.ebuild
new file mode 100644
index 000000000000..a696ea21763c
--- /dev/null
+++ b/media-sound/jack2/jack2-1.9.19.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+inherit python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="https://jackaudio.org/"
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
+else
+	MY_PV="${PV/_rc/-RC}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/jackaudio/jack2/archive/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( classic dbus )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+DEPEND="${PYTHON_DEPS}
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	sys-libs/readline:0=
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	dbus? (
+		dev-libs/expat[${MULTILIB_USEDEP}]
+		sys-apps/dbus[${MULTILIB_USEDEP}]
+	)
+	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
+	metadata? ( sys-libs/db:* )
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	dbus? (
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	pam? ( sys-auth/realtime-base )
+	!media-sound/jack-audio-connection-kit:0"
+
+DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 )
+
+src_prepare() {
+	default
+	python_fix_shebang waf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local mywafconfargs=(
+		--htmldir=/usr/share/doc/${PF}/html
+		$(usex dbus --dbus "")
+		$(usex classic --classic "")
+		--alsa=$(usex alsa yes no)
+		--celt=no
+		--db=$(usex metadata yes no)
+		--doxygen=$(multilib_native_usex doc yes no)
+		--firewire=$(usex ieee1394 yes no)
+		--iio=no
+		--opus=$(usex opus yes no)
+		--portaudio=no
+		--readline=$(multilib_native_usex readline yes no)
+		--samplerate=$(multilib_native_usex libsamplerate yes no)
+		--sndfile=$(multilib_native_usex sndfile yes no)
+		--winmme=no
+	)
+
+	waf-utils_src_configure ${mywafconfargs[@]}
+}
+
+multilib_src_compile() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
+}
+
+multilib_src_install() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+}
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index dcdd3b1fea31..cfd1687e49b8 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,8 +1,7 @@
-DIST mpg123-1.27.2.tar.bz2 1067102 BLAKE2B 14da616ffd9e798f07f8eaa00080a1a5ff8cf3c3c7436cc83c8f2264317a30a88ee98ddd0ac077c43672887daff447bf10d287be72a5c7d1a4d5580c90e68298 SHA512 b1c7de0c1b1d14cce3b3ba72e7454b7ce392443a3eaace0431381f1871e2fda1470b8efd07176057f8bf76d88f14c2b7ffae470ba34a3271c7e779277b86d6c0
 DIST mpg123-1.28.0.tar.bz2 1063321 BLAKE2B a4fa37ac9c3aca867ac4f18eea9c2d39ed80c7e86908b2f5399da8ae82c2e4b57c1a041f17427702da14af9902051ce4de5a85497f7236963ae390ef8715327a SHA512 4e333ee4f3bbebcfff280cf286265e969a8da93b9043d03c0189e22cd40918b07bf12181bd06141d4479c78bc0d0ed472e0d3bb61b2fdb96fe9f7cd48f9a6b77
 DIST mpg123-1.28.1.tar.bz2 1066558 BLAKE2B 4516ed6cafda21aaaf132266b91ae235ca0b911a79c4514c0588c030f4f5f2f3923153729f1fc3354cb5fa982ca8dc27ba6cb58fa884da379a8913c8119e8bd2 SHA512 af1fb96878a7b57f62f06445e9b888cbecc569a91fe118459c71415f62287f9d9de9b0d0663522cb181e1a21692d64d0a810d8aebfa6e085eb76926d7a2186f9
-EBUILD mpg123-1.27.2.ebuild 2753 BLAKE2B 129900b38d6e5464f19aec88b4b2894feff3d8c6023230f93c63e1fa5954658de8c9aafc10f1fa1b1dc2c70347667557576d9ecc0ef9e612aed17190ce31317e SHA512 67a19b872805005f14f719468c97ade3b94a2220e95dcced877e79b807dbf4826acf3c5f3673e9ffd644261d4cb28e4decb35be50de3d94bab71a77f444f698f
-EBUILD mpg123-1.28.0-r1.ebuild 2764 BLAKE2B bcc28d43dc1a60fa5e3cded8c387e35cb0e960ef52acb602956ce714bb3a2690815ec80948e9966b301bb07acda4309318fce8b74c46b738c247ddffd00f527d SHA512 ba5345fd2f5c3147cde4dc39250ae15c09f399a06489cddcdfcc3213e13ed20255be2605b71060ee558e455f62563101e93bc735c2a6b94e796304d0bdff5d06
-EBUILD mpg123-1.28.0.ebuild 2760 BLAKE2B 71996cbe978df08d7a2eaa45ed95a71649eef62dd1ee89b878e44fadbfef173718f3ddbdba8e98109cb5cee4d46ad8dbeb144a1b90197af68c131f543f086745 SHA512 3031dc355f017f04dbe2bdc9337e7d1db250ea0fc09dd92e1816ef08615e679edee70e8f8b2dc54ebb42a953ea97200e72e6841525616831f97431c7411419b6
+DIST mpg123-1.28.2.tar.bz2 1065867 BLAKE2B 2fc585598e49334b608c2a8487b40b599dc1a57afc53249975a339dbc381b968cc099d4274fb74872d3c4c54d1a6ee1858c4b00c78feb93809c823cc56398661 SHA512 45ac11c5997d13f80917e135a40d2fb4448703dad56271dfe8ce7c8dea339cbac7727ec121779040bd7a07fc4ea79086860ea4a8ec879eda3bdcbf7d57348cda
+EBUILD mpg123-1.28.0-r1.ebuild 2762 BLAKE2B d04be49750a688f21f4696b5649f5330b0832a09375475537072675473bb59d8a3a424b5c3e68141d8f21815e3ed019b3d1048b6a8d2aa005ca6511fe2a9bde3 SHA512 b9b74309aed772b7bb4984786c7c0635b6d5dec56033a1fc176549be55b7b36d24abbc21d3e69dca8417a99da56b23d36000489fa2e6951f266af21103342114
 EBUILD mpg123-1.28.1.ebuild 2769 BLAKE2B fa730d6ba2f282f774b3de5e0fcb61ae4ec04c7431c61a02fc38da1496032c49fd7bbab296801a6778954ee91bf88625c803022c62ca4aabb199ad91410fc82d SHA512 76bbbe89ffd5f8d0cbcd7ce8f07acff4ec19e9ead7ca3130372e75719595c68de2c1adf8b529018200c6f9a6f8b052b102b996bf7560676d293e469a98aa7eb3
+EBUILD mpg123-1.28.2.ebuild 2769 BLAKE2B fa730d6ba2f282f774b3de5e0fcb61ae4ec04c7431c61a02fc38da1496032c49fd7bbab296801a6778954ee91bf88625c803022c62ca4aabb199ad91410fc82d SHA512 76bbbe89ffd5f8d0cbcd7ce8f07acff4ec19e9ead7ca3130372e75719595c68de2c1adf8b529018200c6f9a6f8b052b102b996bf7560676d293e469a98aa7eb3
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.27.2.ebuild b/media-sound/mpg123/mpg123-1.27.2.ebuild
deleted file mode 100644
index 4d8fe02781d3..000000000000
--- a/media-sound/mpg123/mpg123-1.27.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs libtool multilib-minimal
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="https://www.mpg123.org/"
-SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
-
-# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
-RDEPEND="
-	app-eselect/eselect-mpg123
-	dev-libs/libltdl:0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	nas? ( media-libs/nas )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
-
-src_prepare() {
-	default
-	elibtoolize # for Darwin bundles
-}
-
-multilib_src_configure() {
-	local _audio=dummy
-	local _output=dummy
-	local _cpu=generic_fpu
-
-	# Build fails without -D_GNU_SOURCE like this:
-	# error: ‘struct hostent’ has no member named ‘h_addr’
-	append-cflags -D_GNU_SOURCE
-
-	if $(multilib_is_native_abi) ; then
-		local flag
-		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
-			if use ${flag}; then
-				_audio+=" ${flag/pulseaudio/pulse}"
-				_output=${flag/pulseaudio/pulse}
-			fi
-		done
-	fi
-
-	use cpu_flags_ppc_altivec && _cpu=altivec
-
-	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use cpu_flags_x86_sse && _cpu=x86-64
-	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext
-		# bug #164504
-		_cpu=generic_fpu
-	else
-		use cpu_flags_x86_mmx && _cpu=mmx
-		use cpu_flags_x86_3dnow && _cpu=3dnow
-		use cpu_flags_x86_sse && _cpu=x86
-		use cpu_flags_x86_3dnowext && _cpu=x86
-	fi
-
-	local myconf=(
-		--with-optimization=0
-		--with-audio="${_audio}"
-		--with-default-audio=${_output}
-		--with-cpu=${_cpu}
-		--enable-network
-		$(use_enable ipv6)
-		--enable-int-quality=$(usex int-quality)
-	)
-
-	multilib_is_native_abi || myconf+=( --disable-modules )
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if ! $(multilib_is_native_abi) ; then
-		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	mv "${ED}"/usr/bin/mpg123{,-mpg123}
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	eselect mpg123 update ifunset
-}
-
-pkg_postrm() {
-	eselect mpg123 update ifunset
-}
diff --git a/media-sound/mpg123/mpg123-1.28.0-r1.ebuild b/media-sound/mpg123/mpg123-1.28.0-r1.ebuild
index 5ea1d218bc53..b43f88f17c22 100644
--- a/media-sound/mpg123/mpg123-1.28.0-r1.ebuild
+++ b/media-sound/mpg123/mpg123-1.28.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/mpg123/mpg123-1.28.0.ebuild b/media-sound/mpg123/mpg123-1.28.2.ebuild
index b8286510b25f..9d14cfb3dbb9 100644
--- a/media-sound/mpg123/mpg123-1.28.0.ebuild
+++ b/media-sound/mpg123/mpg123-1.28.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic toolchain-funcs libtool multilib-minimal
 
@@ -16,7 +16,6 @@ IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa core
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
 RDEPEND="
-	app-eselect/eselect-mpg123
 	dev-libs/libltdl:0
 	alsa? ( media-libs/alsa-lib )
 	jack? ( virtual/jack )
@@ -29,6 +28,7 @@ BDEPEND="
 	sys-devel/libtool
 	virtual/pkgconfig
 "
+IDEPEND="app-eselect/eselect-mpg123"
 
 DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
 
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index ab62fdaeb7ec..e5556c25e67f 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,11 +1,5 @@
-AUX patch-4.7.2-gcc10.patch 1083 BLAKE2B 216c71658161024a8ea8992813f5627ee39d5404aab1af91fe5c88af916ab91a16c9c527053beac018de0e1e2231b7df26e7d2271baf7be33db8f6af6955af1b SHA512 07c95e025e43f2c0a2bef0a5b1ca6eb7977bfb5a34c70f7c4d99a9a4d18d3192383ed82784a7548d6fe263b2860a361128c2cae008e41737d383f30fd324a581
-DIST pulseeffects-4.7.2.tar.gz 1998420 BLAKE2B 6ac9d4b416ffac73f874fafcfd07b990ead7a2645832fd35eae23b3c9e9acb8663718b9cbb5fd0c1066c1f75272d0473257e711602d2646742785fe2c6ca5ea9 SHA512 f235504ca6edddf7a18f2c909ba58578a3d70e6fdab5ad0882f831c9d148f4fd35d0e55617305d787feefdba7a7544e1a72dac3dbc0e03bb9183e0937cdeaef2
 DIST pulseeffects-4.8.5.tar.gz 2028531 BLAKE2B 0ba68c90d4eb25e3b22c4f39f989bef428c970f0dcfa0b301c500928f835d76c31cd1d7692d1a853b3121d4e8fbee8102c1f538b06cb15933509719a6da5d8a0 SHA512 b72f4d5356af1308d997f01ac2efc5eefb569e9a1253f0a19918aec5f9c2d386ab5c293a5aa6a28e8d15200289f32d34c8f3d524bc50874c750afdee61bc0820
-DIST pulseeffects-5.0.3.tar.gz 2052473 BLAKE2B f313abae0f432f767ea4c91350207c97c261845fe64dbb32b0aebab4792b33a993c5ee4084f8b14116058bc989965380c8acb393d10f59a3243ad676c9916f33 SHA512 e9a969b7661e8daca84f5406dafba59a3cbf036f3b8a8893320574ed56465537454d2c854a7053c7f425728342776e9156ebcae8fa2b07bc5bfca04d04356dfd
 DIST pulseeffects-5.0.4.tar.gz 2070799 BLAKE2B f059926672b690cce71ac2a26a8cb2e3e1b97e99b462418494516de54e33906d52a40ccf807d50fb133500270ae6468d1a4ab9c12b4bf2b15348752a7622c8d4 SHA512 db40291351e6da79d87d372b06734e0129df7640da90ccf3cb3564f58130c9d8d35cbb854d53878773c37811649f17141e2a40b2ba670fdaf1b2e12138f694a6
-EBUILD pulseeffects-4.7.2-r2.ebuild 1905 BLAKE2B 61eaf56d327b9f99b1e337cbbb316e8c191ac6d316929a9ac4049985a421ecbdba229ccd61d773412be3f5eebdcb39fbe121f64e268a4aab0157ec61b9eaa669 SHA512 3fd3c448f9716f943e4c1f5a679f2a0b242e725ec2a8ee11efaa3d98e396d7e7d0bf9d0954eec0276d0df38f781230cafba3d7b34cd9272c6e0d0a67341c2a36
-EBUILD pulseeffects-4.8.5.ebuild 1812 BLAKE2B 8993a53c15218aea86a546d78285e12d236377a6a5cdebd7370ef16ee55b1842455705fbeff4b9ce67c234c544496ce83e8c7bd5aebea00081ede8a99282449d SHA512 ef5d2c3af4a3168db6cb85119af7a9ab9b773c78170261dace79cd0bc52f1c963dae5fe0d718974efa4adab5705926a8d76aa0978c5b662b04f3adca45c45c42
-EBUILD pulseeffects-5.0.3.ebuild 2165 BLAKE2B 645812419b880942134baa3ffbf87fdf9b8d9e5f0d27c094852023b997e83e2605814f554641174b4b9ddb140f346e63d1d7cc0145968d7bc9c9a5b7b6400c4f SHA512 6689a5859227ae8292262abb20649422e58eb0d1422e0438fd7d60d384dadeec0ae2599df5e21d139b53b545bb390cd0212b8e0c0ac71e3699dc3357c5069aea
-EBUILD pulseeffects-5.0.4.ebuild 2165 BLAKE2B 645812419b880942134baa3ffbf87fdf9b8d9e5f0d27c094852023b997e83e2605814f554641174b4b9ddb140f346e63d1d7cc0145968d7bc9c9a5b7b6400c4f SHA512 6689a5859227ae8292262abb20649422e58eb0d1422e0438fd7d60d384dadeec0ae2599df5e21d139b53b545bb390cd0212b8e0c0ac71e3699dc3357c5069aea
-EBUILD pulseeffects-9999.ebuild 2237 BLAKE2B 2857391a14ea9cbe8918b178e5bbde379c8bfe1ac8b2e78b6611c076c9d2e1ae23c3664840af30af367431c1d50a52142640661c1fc242a96c59f78e33801e89 SHA512 b91c4f542cf98b447099e7d5649c7a689760b37523a046c653950be7ceda61df2b1aa4e99b436231adc08e4b5c978815d42e4bd124786962770ebb9df8e5cffe
-MISC metadata.xml 839 BLAKE2B 9fd1b77bab1361a5c0fe3601b77e772c3a848ef2f347b6668ee2f33791b2ce0c9a6e31886896a4f1c9eb2dbceba28db997ef1d3f4e474cb1c83784850330a846 SHA512 5c15f3253e062813e3f52c5f9dc84bf25cf29e6cd79ec5f37561251b725f5c5f6a49e8e46b935291e08cf46db56258caf18ce2631d859b8f5c3aa7744bd1d5d1
+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
diff --git a/media-sound/pulseeffects/files/patch-4.7.2-gcc10.patch b/media-sound/pulseeffects/files/patch-4.7.2-gcc10.patch
deleted file mode 100644
index fb8080dd823a..000000000000
--- a/media-sound/pulseeffects/files/patch-4.7.2-gcc10.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From dbaea05da683f7bfcd7960c88b1b7d13379435c0 Mon Sep 17 00:00:00 2001
-From: Vasiliy Glazov <vascom2@gmail.com>
-Date: Tue, 24 Mar 2020 10:54:09 +0300
-Subject: [PATCH] Fix build with GCC 10
-
-This fix build error:
-```
-../include/plugin_base.hpp:10:25: error: expected ')' before 'tag'
-   10 |   PluginBase(std::string tag, std::string plugin_name, const std::string& schema);
-      |             ~           ^~~~
-      |                         )
-../include/plugin_base.hpp:17:8: error: 'string' in namespace 'std' does not name a type
-   17 |   std::string log_tag, name;
-      |        ^~~~~~
-../include/plugin_base.hpp:7:1: note: 'std::string' is defined in header '<string>'; did you forget to '#include <string>'?
-```
----
- include/plugin_base.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/plugin_base.hpp b/include/plugin_base.hpp
-index a2356fbf..79fd5452 100644
---- a/include/plugin_base.hpp
-+++ b/include/plugin_base.hpp
-@@ -4,6 +4,7 @@
- #include <gio/gio.h>
- #include <gst/gst.h>
- #include <sigc++/sigc++.h>
-+#include <string>
- 
- class PluginBase {
-  public:
diff --git a/media-sound/pulseeffects/metadata.xml b/media-sound/pulseeffects/metadata.xml
index c0da3601cd32..9f7e8c81b246 100644
--- a/media-sound/pulseeffects/metadata.xml
+++ b/media-sound/pulseeffects/metadata.xml
@@ -2,13 +2,16 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>prometheanfire@gentoo.org</email>
 		<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="mda-lv2">Enable use of media-plugins/mda-lv2 for the loudness FX</flag>
 		<flag name="rubberband">Enable usse of media-libs/rubberband for the pitch shifting FX</flag>
 	</use>
 	<longdescription lang="en">
diff --git a/media-sound/pulseeffects/pulseeffects-4.7.2-r2.ebuild b/media-sound/pulseeffects/pulseeffects-4.7.2-r2.ebuild
deleted file mode 100644
index 6f046476075a..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.7.2-r2.ebuild
+++ /dev/null
@@ -1,76 +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/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
-else
-	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf mda-lv2 rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41:=
-	>=dev-cpp/glibmm-2.56.0:2
-	>=dev-cpp/gtkmm-3.20: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.7[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
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	rubberband? ( media-libs/rubberband )
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	media-sound/pulseaudio
-	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
-"
-
-PATCHES=(
-	"${FILESDIR}/patch-4.7.2-gcc10.patch"
-)
-
-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-4.8.5.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.5.ebuild
index 47bbfaf9b5fe..532f5ba39c14 100644
--- a/media-sound/pulseeffects/pulseeffects-4.8.5.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.8.5.ebuild
@@ -6,44 +6,44 @@ EAPI=7
 inherit gnome2-utils meson
 
 DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
+HOMEPAGE="https://github.com/wwmm/easyeffects/tree/pulseaudio-legacy"
 
 if [[ ${PV} == *9999 ]];then
 	inherit git-r3
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
+	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
+	EGIT_BRANCH="pulseaudio-legacy"
 else
-	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	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 rubberband"
 
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41:=
+RDEPEND="!media-sound/easyeffects
+	>=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
-	>=x11-libs/gtk+-3.18:3
+	>=x11-libs/gtk+-3.20: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
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	rubberband? ( media-libs/rubberband )
+	>=media-libs/gstreamer-1.12.5:1.0
+	>=media-libs/gst-plugins-good-1.12.5:1.0
+	>=media-libs/gst-plugins-bad-1.12.5:1.0
+	>=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
 	>=media-libs/zita-convolver-3.0.0
 	media-libs/libebur128
 	media-sound/pulseaudio
-	sys-apps/dbus"
+	sys-apps/dbus
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 )
+	calf? ( >=media-plugins/calf-0.90.0[lv2] )
+	rubberband? ( media-libs/rubberband )"
 # see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
 # and sys-devel/gettext depends reasoning
 DEPEND="
diff --git a/media-sound/pulseeffects/pulseeffects-5.0.4.ebuild b/media-sound/pulseeffects/pulseeffects-5.0.4.ebuild
index e9dde9ba03b9..749f06d01a61 100644
--- a/media-sound/pulseeffects/pulseeffects-5.0.4.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-5.0.4.ebuild
@@ -6,14 +6,14 @@ EAPI=7
 inherit gnome2-utils meson
 
 DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
+HOMEPAGE="https://github.com/wwmm/easyeffects"
 
 if [[ ${PV} == *9999 ]];then
 	inherit git-r3
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
+	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
 else
-	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE="bs2b calf rubberband"
 
 #TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
+RDEPEND="!media-sound/easyeffects
 	>=dev-libs/boost-1.41:=
 	>=dev-cpp/glibmm-2.56.0:2
 	>=dev-cpp/gtkmm-3.24:3.0
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
deleted file mode 100644
index 1d89fa03f254..000000000000
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ /dev/null
@@ -1,83 +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/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
-else
-	SRC_URI="https://github.com/wwmm/pulseeffects/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="
-	>=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
-	gnome-extra/yelp"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-# gnome-extra/yelp needed for help docs link from app
-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/qmmp/Manifest b/media-sound/qmmp/Manifest
index f631ecb48baa..5941e40ebb1e 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,6 +1,6 @@
-DIST qmmp-1.4.6.tar.bz2 1297295 BLAKE2B ec0b27c5faf2c76c15ff8594eecad8b6f73bb5fefd60e4916751a297ff055b252762c8e1ff6d6fc75535bc299159fc595e95767977958a8e94ff2d13218e6fb1 SHA512 dca9d06763be6ded45db14a5e8967e9bd8eebc14e5ec7b077171417e942d61a904ecd1944b8d80deecfb642248663739c3e1784449a10466475deb6e575ea7dc
 DIST qmmp-1.5.0.tar.bz2 1337043 BLAKE2B 71da332bb125ddcc37cdc159e155af2e185cfef8f70348484ca6099666a4715258fadb8a7db68329a009e0d727b1d7b000553e34eb56552c229b6cc1a5f3dd45 SHA512 b8a29bf6b2f6da08e1ff2801c973821663570de436562ba79b40212b8b8522f0e25ea79c941bfacf252904851ed477cbfa66d7f145b172f93a105127894d5e04
-EBUILD qmmp-1.4.6.ebuild 4049 BLAKE2B bdb6ba0a6ad610e92d46d42371c66ef1a965e85bd565fce5e2f2295fd3ade3cb063414a29e523599250b0a743510459876f63bf1b8973e9449fbb06698eaa0f8 SHA512 67657e3a6f89c33c166f1aa34d33446c58ad3d77b18dad4b05560d228effa93603d9f4421621bc1bbd785a8ae3f9099daa0d9a78dbef277f75f3c34d691283e5
-EBUILD qmmp-1.5.0.ebuild 4132 BLAKE2B e56d49d4e6676bf1894261f53f71d031c858cb5b7ded275a93813a1b19aa5120aae22fc0433ed9c177bf1cc8832002e22325afdd7cda8676acfad72ac756c2f4 SHA512 cc252dbd29a703a5d8b5aa11c1a0a9ebe5ee7c4fd21df9acb4ebc1ec2c7267cedaeac82cde25c3c5b274cdc1f4fbcb01bb551872544b5b5dc25311b0f916625f
+DIST qmmp-1.5.1.tar.bz2 1363593 BLAKE2B 7c344ce2d9c1bc419b17c8d3727afa6f95273e7487f539b0e2f8cb5328f0185a7aab184d9df01a023f896e8b516135fd58ebe0e2204fb1f5ca283f4e0c04d78f SHA512 4b866e7b53ea1757a94e028730dd99bab3b56917e6835b46284cce148e779e00a5fe0a396667283aa13c980a9ee33d0fe76df0198320f1897ec3b73bcd1f275e
+EBUILD qmmp-1.5.0.ebuild 4131 BLAKE2B 9a1ad81f31602acdefc2e9c3a30d3953c61d19edc5186f796399bbb5a24e7e078d9deebb35d09594b66a56a9e396c4f141832b259c7739c8a06ca8299c78a224 SHA512 6f39f9ee519e07872d6c73eb51f78bb4c71fb1c1665d905cc511064ab86e8cf0c541e8cd4a6440682e57371bfbc30b51dba98ac309bb65fa19af7e50ffbd55b3
+EBUILD qmmp-1.5.1.ebuild 4133 BLAKE2B 7d65727a5858560cea4992734486ef6d080c64673ff65509a6883f05dc0f21b125f84635203b2f06f4d2baebddd2b769141b7db2ac9768fe23ffa46a7f888d30 SHA512 12d3d0b02a7a221a7f6edc82e0da2d3f7c60b77013f34c734f38155abbd924a4f53c98554a58317fc71dd30be06ad158eb34e387aa9439af778f75570bdc5736
 EBUILD qmmp-9999.ebuild 4133 BLAKE2B 7d65727a5858560cea4992734486ef6d080c64673ff65509a6883f05dc0f21b125f84635203b2f06f4d2baebddd2b769141b7db2ac9768fe23ffa46a7f888d30 SHA512 12d3d0b02a7a221a7f6edc82e0da2d3f7c60b77013f34c734f38155abbd924a4f53c98554a58317fc71dd30be06ad158eb34e387aa9439af778f75570bdc5736
 MISC metadata.xml 1882 BLAKE2B 05e4092242842436df6f1dfcd82ab4b7a08675668d6ff5817dc7901bafdeb1725ef26fe7529cf38ca7a5f3edcded04cbee82c3d2bc44644e902b29c238a671f9 SHA512 790c2d0d07117a51a9f33f4575a871e839d1fc403309d765888f98aa532292d8e7dcfc23ba127037babc48272927aab9aae37781b9264991606115690eeb875c
diff --git a/media-sound/qmmp/qmmp-1.5.0.ebuild b/media-sound/qmmp/qmmp-1.5.0.ebuild
index b5d8a08df439..3f6f68e35de6 100644
--- a/media-sound/qmmp/qmmp-1.5.0.ebuild
+++ b/media-sound/qmmp/qmmp-1.5.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://qmmp.ylsoftware.com"
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
 		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 else
 	QMMP_DEV_BRANCH="1.3"
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
diff --git a/media-sound/qmmp/qmmp-1.4.6.ebuild b/media-sound/qmmp/qmmp-1.5.1.ebuild
index 2170cb945e31..2fe547a222c2 100644
--- a/media-sound/qmmp/qmmp-1.4.6.ebuild
+++ b/media-sound/qmmp/qmmp-1.5.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://qmmp.ylsoftware.com"
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
 		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 else
 	QMMP_DEV_BRANCH="1.3"
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
@@ -20,9 +20,10 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
-IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca
+ffmpeg flac game gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack
+notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
+sndfile soxr stereo tray udisks +vorbis wavpack"
 
 REQUIRED_USE="
 	gnome? ( dbus )
@@ -68,6 +69,7 @@ RDEPEND="
 	mplayer? ( media-video/mplayer )
 	musepack? ( >=media-sound/musepack-tools-444 )
 	opus? ( media-libs/opusfile )
+	pipewire? ( media-video/pipewire )
 	projectm? (
 		dev-qt/qtgui:5[-gles2-only]
 		dev-qt/qtopengl:5
@@ -94,7 +96,7 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS ChangeLog README )
 
 src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
+	if has_version dev-libs/libcdio-paranoia ; then
 		sed -i \
 			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
 			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
@@ -136,6 +138,7 @@ src_configure() {
 		-DUSE_NOTIFIER="$(usex notifier)"
 		-DUSE_OPUS="$(usex opus)"
 		-DUSE_OSS="$(usex oss)"
+		-DUSE_PIPEWIRE="$(usex pipewire)"
 		-DUSE_PROJECTM="$(usex projectm)"
 		-DUSE_PULSE="$(usex pulseaudio)"
 		-DUSE_QSUI="$(usex qsui)"
diff --git a/media-sound/rplay/Manifest b/media-sound/rplay/Manifest
index 375ba6a0a4c9..87490546826a 100644
--- a/media-sound/rplay/Manifest
+++ b/media-sound/rplay/Manifest
@@ -1,5 +1,5 @@
 AUX rplay-3.3.2-built-in_function_exit-r1.patch 366 BLAKE2B 104e722c7da8a97b5fc8abe58a9efe8b6cb7fbfbebe3493eaa094ac9580ac982eb32dcdfedd1ed11a972a665514788db6c2c29ac51839fa979692aaa56eb3f60 SHA512 6c5f358a6ef89b7338ae5bf2e485a3996e143fdab0c73455d97bdb2e07729464323992d72424d29c954f2537acef2c45ebd744db6a2e26b99ffd97be2f44957d
 DIST rplay-3.3.2.tar.gz 480015 BLAKE2B 5f506e81a5c9bad175c8906cb3104564ec9c8c6f4496382a428d77dff6264d0f39d3ab9af7cb83b0ef34bccc14f15978e399d428c62f6dafe46ee8ad70d32d37 SHA512 b0683de0f5dc1483d22ac68c0502fe66e89ba1c25300fdca9486df1cb6ea96393b18b783f918f18dba0ba0fbfd20410448e3e03df06fc4afba1b63024d82a713
 DIST rplay_3.3.2-16.debian.tar.xz 25456 BLAKE2B 34c69d95c964465a04681d7cb4c1a66b34d486e540486d1b47d9590fb893e574381405c15a48bfec272f3b566f5b3ab6ce88806497f8d1533f441cbf9481a3a8 SHA512 8d5db7862267fd0ec7f27896b6a76708304e54b9f2c8a52621c0a92c4688511e07a7820b2468c93032dab15f27f5dda1f8931e35d95e724501e2586a5851486b
-EBUILD rplay-3.3.2-r3.ebuild 1257 BLAKE2B 14f2171510d46e77fa291aa516a8e5c53238831f19f413533907bc34caf7c32697c97aacb41f27a53b6baeb9b91dcaa3664ee36412b0c09df7754f208f724cdd SHA512 4ccd8861af5760ebd0a9067a38f924deaa019ae79ccb8dc7f5ae7b01703a0df25159e9ab0b33d76e3ead9b5ca6e628dda0e5f785356a28596d27f9d3178028a8
+EBUILD rplay-3.3.2-r4.ebuild 1217 BLAKE2B 53483168d478bcbbfc49ab4157d457ddf38f01c73439d096a76a1330a9c9a00c178f71cdb90728a6a227b4c5c7c37d24c18c5fdfbf1a86a073685ac588873191 SHA512 ee6d8d6b95133f4ba46a17b1127c6acf09ed882dbcf60309c2eea5e97d129d3fc107d263d057058ca5895bf06c0f0b58d694b26e76f719c7a90f080a6ad20ef4
 MISC metadata.xml 602 BLAKE2B 12db89459ab4cc0696d1c6ede006c6f0365854801e2a67ae060fe0a807fc8021d5d4c0b992ee1adc21951bba7aaf5734aa7c4742feff563d8b009322f58cc5d7 SHA512 2133c5096ee010c0470667238f9d600c4617b9659615b3302abd81eb7b4b84107cfe9efa2070d5536d91aa11a90be1865703cdd5f92d0ea1f8718336a65cb272
diff --git a/media-sound/rplay/rplay-3.3.2-r3.ebuild b/media-sound/rplay/rplay-3.3.2-r4.ebuild
index b0daba33d9a6..0cbf1cbc4a6d 100644
--- a/media-sound/rplay/rplay-3.3.2-r3.ebuild
+++ b/media-sound/rplay/rplay-3.3.2-r4.ebuild
@@ -2,19 +2,25 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools user
+
+inherit autotools
 
 DESCRIPTION="Play sounds on remote Unix systems without data transfer"
 HOMEPAGE="http://rplay.doit.org/"
-SRC_URI="http://rplay.doit.org/dist/${P}.tar.gz
-	mirror://debian/pool/main/r/${PN}/${PN}_${PV}-16.debian.tar.xz"
+SRC_URI="
+	http://rplay.doit.org/dist/${P}.tar.gz
+	mirror://debian/pool/main/r/${PN}/${PN}_${PV}-16.debian.tar.xz
+"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
-RDEPEND="media-sound/gsm"
+RDEPEND="
+	acct-group/rplayd
+	acct-user/rplayd
+	media-sound/gsm
+"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -22,11 +28,6 @@ PATCHES=(
 	"${FILESDIR}/${P}-built-in_function_exit-r1.patch"
 )
 
-pkg_setup() {
-	enewgroup rplayd ""
-	enewuser rplayd "" "" "" rplayd
-}
-
 src_prepare() {
 	default
 	mv configure.{in,ac} || die
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 6623986c824c..bd4db0d9427f 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -12,5 +12,5 @@ AUX timidity.desktop.2 257 BLAKE2B 6c7f88a3ccd9fc4ea90cd228e6d04d799430a78361d6d
 AUX timidity.service 190 BLAKE2B 909311fae666b9970a8b4d56e1848f907ffeff1fc9e0cacc7a89027ec1ce6a555ea01570328d75425b006752d6332cf278642ec9a7c27b9c9adb2cb7621e241e SHA512 1022c1e37e2a97fba414673860ec89bc146da208981dd50d9486c525b47c74ae146acef2d75ceec26335c3ab98b2c928ce480a161637990ecd737507a6c21b49
 AUX timidity.xpm 1522 BLAKE2B 9aee528dbf843d992d548adc923f817373013760128ae96df7becb6bc844a95ddc056b072dbaea1528d9db5c2d4836b09f8316b740c75033fc23a0bb76186fab SHA512 1630fc235e450e5420c598357ad98eed6f04b1d1035fd6284dfeb2e633ce5d80135f89ea593d58b4eac2b9405383787e4d891b9c22ff8b5ac3ece64e9abe7d4e
 DIST TiMidity++-2.15.0.tar.xz 1363040 BLAKE2B 63612dc96ddef9b24ca35a8fa24c22fee8b0573efb09543e6017070b2d0a68494bc34afe8ffc50b5f7fe2d95397a971d5dc7afd4c9adbb524b119012e716b7f7 SHA512 36c3c79d941903109d5d6d529963d12e8192a857e80402ad5ab0d1e223451a7cf5dc8fdd046b22ae7da96f413d68db8587a8fce348635838eba2f30f7019192f
-EBUILD timidity++-2.15.0.ebuild 5199 BLAKE2B c18bd5a8f2af423325659a37db88cbd3382fe6e7644ee282d202646e72409ad3120fb54e858d0cd754bf3c27dc670e42d2d46621790069d91ab218a186b01174 SHA512 da54b66c4e9341d0be7f680e46fa82e32a9f0e21b1059449a2f2c413f15fa600900c2e810f49e8dde74cd83a355ef720ccbd3a81a0c169fd6b73d59a0b636157
+EBUILD timidity++-2.15.0-r1.ebuild 5080 BLAKE2B a3b9385287ae0c3f441affbbb051efb3ce7e0d496d488f49aa339a75e55bf49fabc848318b41c4b8c4a33eba04208e3847e1f2ea57f4817ababf91eeac28a85a SHA512 da5f5eb0696cff423569685d4e54e0fd2e6ea6797f0becb4310cb68fa78d304808ee41c6c383b4209810459dfd0ab59adc51bd64e21404515b116cf3854fda0a
 MISC metadata.xml 331 BLAKE2B 0e52df0230422381a5982f075e39f00e982f9948a3d3309d183bbac93569d908fe3603082f11943fc35e3b8bd1c76bc131e7525c91e3aac5b7d9461093686f71 SHA512 b4559e92a59ba70b25863304bbdc59225c6ccbf3ee9ab8516db6987a19e8b5b7b6ea95f40c9ff55ed33c194ab174360d5f8fd6bfafa43290bb97a3a2093289e3
diff --git a/media-sound/timidity++/timidity++-2.15.0.ebuild b/media-sound/timidity++/timidity++-2.15.0-r1.ebuild
index fdf335c638f8..efa232bbc9d3 100644
--- a/media-sound/timidity++/timidity++-2.15.0.ebuild
+++ b/media-sound/timidity++/timidity++-2.15.0-r1.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=7
 
-inherit autotools desktop elisp-common systemd toolchain-funcs user xdg
+inherit autotools desktop elisp-common systemd toolchain-funcs xdg
 
-MY_PV=${PV/_/-}
-MY_P=TiMidity++-${MY_PV}
-S=${WORKDIR}/${MY_P}
+MY_PV="${PV/_/-}"
+MY_P="TiMidity++-${MY_PV}"
 
 DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
 HOMEPAGE="http://timidity.sourceforge.net/"
 SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -40,7 +40,12 @@ DEPEND="
 		x11-libs/libXext
 	)
 "
-RDEPEND="${DEPEND}
+
+RDEPEND="
+	${DEPEND}
+	acct-group/audio
+	acct-group/nobody
+	acct-user/timidity
 	app-eselect/eselect-timidity
 	alsa? ( media-sound/alsa-utils )
 	selinux? ( sec-policy/selinux-timidity )
@@ -50,11 +55,6 @@ PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )"
 
 SITEFILE=50${PN}-gentoo.el
 
-pkg_setup() {
-	enewgroup audio 18 # Just make sure it exists
-	enewuser timidity -1 -1 /var/lib/timidity audio
-}
-
 DOCS=( AUTHORS ChangeLog NEWS README "${FILESDIR}"/timidity.cfg-r1 )
 
 PATCHES=(
@@ -158,9 +158,6 @@ src_install() {
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 
-	diropts -o timidity -g nobody -m 0700
-	keepdir /var/lib/timidity
-
 	doicon "${FILESDIR}"/timidity.xpm
 	newmenu "${FILESDIR}"/timidity.desktop.2 timidity.desktop
 
diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
index 980bb1972c87..a9702e4400d8 100644
--- a/media-sound/xwax/Manifest
+++ b/media-sound/xwax/Manifest
@@ -1,4 +1,4 @@
 AUX xwax-etc-security-limits.conf 18 BLAKE2B 7056521164d62b76e2cba2b7a128a160364ac191af87185e99d5ecaa951c125938b66d4f1928d3b13794e5f1be4446b0b8ee8eed1e2a0c92e25edc0582b38264 SHA512 fab914f078597e9c4ba4ffa289f559106d62354d5f97c0847855c08cd8a9a1bdfd9db3f74d9b3868e6150d39fadc4c2c8d51b4815bb6b19ccdbee1fb6ddf72e2
 DIST xwax-1.7.tar.gz 80745 BLAKE2B b431951651b66899b5bcceadfadc546c564123e47632aa9b395c26d706fc37cda4b5bf4f8695538e1a5e2bb0a690f125ca89705259d11df580f6a833e5d114b6 SHA512 ab0fcaf32f1fd1d6b38323095524f1932a067a3d04d40e4b043993e360411fed0c4b78bb71662581b438cb1e3005bc21659db4521a6ec704994b2e8e1b7e62d4
-EBUILD xwax-1.7.ebuild 1992 BLAKE2B 47073b5d08b53f0e3e7c430ad860692dea7dcda19cdff22925a2f0199f27a69b42774cffb158b248576bc9071bf7bf88ccc5f6536525eb30a85740cbb1c58ef3 SHA512 24430fb03f7185db5f3ac6b0d411c950af3870bb41f4c192e104066fce46a7f575287296fc4f932cf7ef0d519fd77dbb875e74c388ecb7df8e6692070f9b84c7
+EBUILD xwax-1.7-r1.ebuild 1977 BLAKE2B 1d54913f2c3e018371d8a4b2b5c9a19d5e9fd044e256b4fb8273666f66200ed6796c431a831c856b3aeb548c3b7e8b26a1118b77218f5c644eb487c2227af319 SHA512 c6c989d648d059aa011a031842c7d3a007b2d139a83165c5f82df7c960fe00c33a1e48bfad32bce549c4ff4c63e6f7853e79e1772696fdae91a219b679709dd9
 MISC metadata.xml 705 BLAKE2B 0c5c6a1538fbe0faef37eac4c62ac8e806041e1dc2883b4341981e75e8829da8af4588f371215794e40a452b7178a538489abd4a1b211233370b85cdded4d9eb SHA512 39e87e361947199009b2b9c0d722418d21181d330f503e9fae493c6b7300e5ef287b78a2ef609e3084719c51de57cfe536e7ae726eae257b967871422639c54c
diff --git a/media-sound/xwax/xwax-1.7.ebuild b/media-sound/xwax/xwax-1.7-r1.ebuild
index 20b519759a8b..ecde10ea92a6 100644
--- a/media-sound/xwax/xwax-1.7.ebuild
+++ b/media-sound/xwax/xwax-1.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs user
+inherit toolchain-funcs
 
 DESCRIPTION="Digital vinyl emulation software"
 HOMEPAGE="https://xwax.org/"
@@ -14,8 +14,10 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="alsa jack oss cdda mp3 +fallback"
 
-REQUIRED_USE="|| ( cdda mp3 fallback )
-	|| ( alsa jack oss )"
+REQUIRED_USE="
+	|| ( cdda mp3 fallback )
+	|| ( alsa jack oss )
+"
 
 DEPEND="
 	media-fonts/dejavu
@@ -29,7 +31,11 @@ DEPEND="
 	jack? ( virtual/jack )
 	mp3? ( media-sound/mpg123 )
 "
-RDEPEND="${DEPEND}"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/xwax
+"
 
 DOCS=( README CHANGES )
 
@@ -47,7 +53,7 @@ src_prepare() {
 src_configure() {
 	tc-export CC
 	econf \
-		--prefix "${EROOT}/usr" \
+		--prefix "${EPREFIX}/usr" \
 		$(use_enable alsa) \
 		$(use_enable jack) \
 		$(use_enable oss)
@@ -59,10 +65,6 @@ src_compile() {
 	emake EXECDIR="\$(BINDIR)" VERSION="${PV}" xwax
 }
 
-pkg_preinst() {
-	enewgroup ${PN}
-}
-
 src_install() {
 	# This is easier than setting all the environment variables
 	# needed, running the sed script required to get the man directory
author	V3n3RiX <venerix@redcorelinux.org>	2021-07-17 19:04:28 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-07-17 19:04:28 +0100
commit	514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (patch)
tree	555c194dbeb0fb2ac4ad3cde7c0f6a80fd330ce2 /media-sound
parent	4df3bf9762850b34cd1ead5c80374d1a0fc3362e (diff)