gentoo resync : 12.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-12 21:55:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-12 21:55:15 +0000
commit: 7218e1b46bceac05841e90472501742d905fb3fc (patch)
tree: 56fae051db521b8fce8014cbc8b11484885b14b3 /media-sound
parent: 6d691ad5b6239929063441bbd14c489e92e7396e (diff)
56 files changed, 335 insertions, 599 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 2d9d35189dfb..8e58ece43cfc 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index 9fb62b00da20..d20c83b8bee1 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1,3 +1,3 @@
 DIST alsaplayer-0.99.81.tar.bz2 806906 BLAKE2B 6b37aaa65f6426a43483c3fa7e077ca89ce553655587e0f44ac61ade5d4f5467a304e18ef0142336b0cc94311498ccaa16d9ed2d6eb8109474626c6d1a4ca97d SHA512 6723b36837d01f14645bb1d43ec7c54c85e8afed9b020f56dc81b4de64b74e4da2504507fe83954c7b26817e90510c585d09e759fc11e731d4d27e86f3932650
-EBUILD alsaplayer-0.99.81-r1.ebuild 1922 BLAKE2B 8177b37e602cafa2b99228504632cba5a17c051eb109f42cf9cb05ad7152febf0e9b7711434301a50032b0db4ddfaff35a66e523a9da21bf224a96042a866d8a SHA512 c92cb19eb3fe57f57ed93ae6de86cbb01998f4ff9e100ef16eedb6479649ae3153f87e3044c2892b66527ba854b4c1a1bc007a726f273221eea6a652af0bbc68
+EBUILD alsaplayer-0.99.81-r1.ebuild 2008 BLAKE2B 1677ed078faf8dc56bb3a5b7892efae59c320e1d496c137ae45fe4a6d9e1627e7463d33056dab92a15b8b25f8dc1d1d0dba9dec4b455193a664dec97a04ee74d SHA512 278b39e47784db1b3dfd6bab3de0a7ca69a4d4ada4f05009096c350db5a1a38df8404cc9af545e8f8a64681d3b7b183047eb0ed64a9a481a10004ecccd7fb73c
 MISC metadata.xml 337 BLAKE2B 1f60abc42f95db4e9876c4894ddc16175f17d35b53c7d9fcd425e0124d3fdf08978b349cf2364cfc32555408d1e5ec011fc6367ac9d3e4b7260cf0d2d665522e SHA512 eb9f49ef0aaa5f6ec8c8a29f0459cde3fbbcce419217ae9c22ed6f50dea1893e02037b556daa4276de62aa18fd3193d8c213c6b819d701689fea845d64f97f61
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild
index 27659636bbb5..374beb56d611 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.81-r1.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
@@ -48,6 +48,10 @@ src_prepare() {
 		-e 's:-O2 -funroll-loops -finline-functions -ffast-math::' \
 		configure.ac || die
 
+	sed -i \
+		-e "s:/usr/lib:/usr/$(get_libdir):" \
+		configure.ac config.rpath || die
+
 	eautoreconf
 }
 
diff --git a/media-sound/audiotools/Manifest b/media-sound/audiotools/Manifest
index cdf4f90f1ebe..c66f8afd1763 100644
--- a/media-sound/audiotools/Manifest
+++ b/media-sound/audiotools/Manifest
@@ -1,4 +1,4 @@
 AUX audiotools-3.1.1-libcdio-paranoia.patch 1337 BLAKE2B 2594bf98a09df1064009dfa27764f64aeda7d92e43c82aaff3e44f6742db28f6fa2e87bd19d1f7eba8b82ac8ab338c9d7e7e7817817d49985809b927383d218d SHA512 cabc5f86e2977171c6616722640fa271d3c339bb223e229ec31697c81bd2c06c620a4b3d7a9057d7a90e05a2db7e2c7ca4d26403d60612ceebaaca0370845e10
 DIST audiotools-3.1.1.tar.gz 6325408 BLAKE2B 065b5dc23796ea8d1dc72dc581a8929fe26e08180af2f0719470d80d5c82be2455ffda28fe8fd5ca63ae078f7fa5c6b5153e8fae496736da8f97a4eae38c4876 SHA512 dfba0dab8ef1573a12366bb4d46552eeb6c23c4abde34d9df51238fc97f573135b564cc3e5dbcaf7691c4502d8173dc926d8eb5ecd169fe619278ae89ff24c3a
-EBUILD audiotools-3.1.1.ebuild 1889 BLAKE2B 5b5d1c832d25e1b960064bcae7da8cbcb293ed3cc1b29da5c1cd3b9ef65a2450303e5bd7a1ba02fc97436113824c8b1fb8e04959c581e7374749549ead0aa470 SHA512 f407d4c3d55784c946d2d2376bea3e8f1a6002d31adae8c89b4a3a476e7fa618cccdccb5ace23cb08de8170268d1411a4288353a9193783d8c30c8880849bdff
+EBUILD audiotools-3.1.1.ebuild 1895 BLAKE2B 424ac509d1e5bf0140ecd828930e78776b69da181b2ac0806194178b5cc83f0768820584d49e6e27c5b206e1d7678ed643240828e2e0a8859912991bc33ebd40 SHA512 a3a8b877c4cb9383bf340d7fe361c072c457a1459d0f215a180e12c8e8f7ce5b28a564a2eda50ba38898c5e511b534fa5cdc7deb804e266634423cc604279970
 MISC metadata.xml 533 BLAKE2B 6939a9b7aad9be3e1311136836118f5ef36b1b7a84edf2c7e8c5b859de02d46691fa74f1ed2e275e86964978d4da48247b0fd77a8aea0ad42d96293d7d26b7a0 SHA512 c28cd3c4297b399e7ea934b965abecd06dd3150827e7a5976d3ddd22f586c31ed08b1bbd46ac8ede21c362c2df3742ec58f524b0060eb94a4c18f5528abc1cab
diff --git a/media-sound/audiotools/audiotools-3.1.1.ebuild b/media-sound/audiotools/audiotools-3.1.1.ebuild
index 6a3ba0f28b82..b63f0e4b37a6 100644
--- a/media-sound/audiotools/audiotools-3.1.1.ebuild
+++ b/media-sound/audiotools/audiotools-3.1.1.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 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/media-sound/bpmdetect/Manifest b/media-sound/bpmdetect/Manifest
index db58e3d91e79..918945a6c57c 100644
--- a/media-sound/bpmdetect/Manifest
+++ b/media-sound/bpmdetect/Manifest
@@ -1,3 +1,3 @@
 DIST bpmdetect-0.7.0_pre20170810.tar.gz 257777 BLAKE2B 8a6cfa43b70883d3bf03328c9e52a642140c5a25cd72ea5a9515394551e2ae108135b284b788e12a53e79cb0e2fd916d35a27d743558abb996ad5eb5db7beb45 SHA512 a2bbb67c2e5c46b08396e85fd4b91a5fa8622222929a4a67abdcb4587f04f1d8f40414800cb476f7aaa66d95571dd2d65332e48ed639b621a4351f70ab545779
-EBUILD bpmdetect-0.7.0_pre20170810.ebuild 721 BLAKE2B 260d5a4953ae75e44a219911bb9105ef3f835e465e75e10a2449f39da656c520d884134cac96d6383ccd83472f47ecad56340e5c77cd687f9c0cb687e98e6d04 SHA512 d0ca38ba6f3e489576be488c7c946be6116a539771311f55b3635c98316532fc2bef7a73d51d4688e62ef9081ee02c07a4edc8c993d091a07247b2fc41b09bf0
+EBUILD bpmdetect-0.7.0_pre20170810.ebuild 741 BLAKE2B aa0352300404f18fdd9dc91844decb78a1d539d64f075563b07f897a550eff5e18faf409024c6db8e6216cf97a062c2b5fd408123f7c25c0dc185ad3cb092dca SHA512 7cbc6820b5e3ba523d25b59824a45111ca1211de5529a4bdddcf337e8e2a3021c5204c185e72174fc3ea6edd979a62be55fa349be6c812fecb565e0d128914af
 MISC metadata.xml 332 BLAKE2B 85eb37ef9ed0b6efcb8611d66b7d8087424e848bd60b819dc3b095480066de0d64d98fc95de3324542e160bdfd9007c80c6391327681df383c03bac26c83754c SHA512 7a6f93e001d436f33d8ee55b467eb2e398b65193ee0c77c0d087916372cba7a5b9693d15aec27e738ea05d54901c1f4f855722384bb9f86d59e10b7d6b6b17d7
diff --git a/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild b/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild
index 3f77ce8b3634..a94e3a52f961 100644
--- a/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild
+++ b/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 COMMIT=b13aac15904c1f821b1739d00445f49432705387
-inherit cmake-utils vcs-snapshot
+inherit cmake
 
 DESCRIPTION="Automatic BPM detection utility"
 HOMEPAGE="https://github.com/Tatsh/bpmdetect"
 SRC_URI="https://github.com/Tatsh/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,7 +27,8 @@ RDEPEND="
 	media-libs/portaudio
 	media-libs/taglib
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 "
 
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 6fabdad942f1..e16819218fc7 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -5,5 +5,5 @@ DIST Csound6.15.0_manual_html.zip 20674415 BLAKE2B b15b3381f13c7877130dfec60803b
 DIST Csound6.15.0_manual_pdf.zip 9360598 BLAKE2B 898da87eb8b10a75f3f6256eeade7aa180ff5e6dd93de8d2bf462d01d1d1cf5f4c5d7c4ed73402aa019674d597ff3fd1b7ac436059d9df39e0d77a15365d529e SHA512 0eca00951708d7064d789bdd0d98534e815ecc275e09b3020cce89d6f6b1009c0347e7d5fd400ed321bd7e05c89d79644f64c18f47b46013bb6b49c88e42fca0
 DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8 SHA512 a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308
 EBUILD csound-6.15.0-r100.ebuild 7242 BLAKE2B 1bd143e32a403c31a56a60418a081494538ffe642ec17674ecac1f0f9bc88bf21152a1c37e2072cbe658b0e7797e9d4bc2c7ed07c40b69b2b10b9345543cafcd SHA512 fc4835b16a97ba2a78666389361322cfb8b494fd6b992824a6a5e7ca6450ce9ea0a3d56c4460c29831b574689e67eacb5c070dd07667cc180faeddf9aabf2eb9
-EBUILD csound-9999.ebuild 7244 BLAKE2B 0166d4d0ebba238eb91f286970bae7630cd9c4c6fa232620fdbc1f832ab1ffb7f3e39a1b3e6f819cf4c933a7201bbe0188453a3e681d94834bdb67eaa03f8810 SHA512 1f2551193a6947be3cec77452e60db47349c35b4ccc6763925e181f5ac8e9b20f71abd37aadab358909206f8ecd8eb880d982fdbf945916aef07ccf2180d6d41
+EBUILD csound-9999.ebuild 7006 BLAKE2B e04db3e22b004426fe8978a751d81aaac3d25e2930eb1f48e3335801f84afd8a31b7a2f6afe6d63bce836d7e0c1f36ba2164853c6ee92199425c603c5eb9b2d2 SHA512 5312299ffbfc9971c55b479041d5ae2ffdef6138cffcf79e72a7713f1bad11a1ade280118993bd0733770986500c9b03848bdabce9f934e069cd07ad7d2c86ff
 MISC metadata.xml 1295 BLAKE2B 9bfc19eeb1c250b89c6b9d452f5de8a9b0b1283e25bb01ce46c75ef4372844a0605c2384ff17f026e31e10f5670067f8568fe3b3a63675408ac380276d76c65a SHA512 75bfb3c156aaf5b59c6e0291bb4b89f605d9ea6c812eaae2fab6638c74220685835c1b91d436f8f2dfdb90ba625327c4c4e274d7e9dfee6b8fdd6bc3e1679a52
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index bb0ad26e45fb..cdc5d7cf5933 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -30,19 +30,18 @@ HOMEPAGE="https://csound.github.io/"
 
 LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
-# java doesn't work atm as it needs to have some variables specified to work, see src_configure
 IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 +image jack keyboard linear lua mp3 nls osc portaudio
+fltk +fluidsynth hdf5 +image 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 )
 "
-#	java? ( cxx )
 
 BDEPEND="
 	sys-devel/flex
@@ -58,8 +57,6 @@ BDEPEND="
 "
 # linear currently works only with sci-mathematics-gmm-5.1
 #   https://github.com/csound/csound/issues/920
-# currently not used deps due to some issues
-#	java? ( virtual/jdk:* )
 CDEPEND="
 	dev-cpp/eigen:3
 	>=media-libs/libsndfile-1.0.16
@@ -76,6 +73,7 @@ CDEPEND="
 	hdf5? ( sci-libs/hdf5 )
 	image? ( media-libs/libpng:0= )
 	jack? ( virtual/jack )
+	java? ( >=virtual/jdk-1.8:* )
 	keyboard? ( x11-libs/fltk:1[threads?] )
 	linear? ( =sci-mathematics/gmm-5.1* )
 	lua? ( ${LUA_DEPS} )
@@ -142,7 +140,7 @@ src_configure() {
 		-DBUILD_IMAGE_OPCODES=$(usex image)
 		-DBUILD_INSTALLER=OFF
 		-DBUILD_JACK_OPCODES=$(usex jack)
-		-DBUILD_JAVA_INTERFACE=OFF
+		-DBUILD_JAVA_INTERFACE=$(usex java)
 		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
 		-DBUILD_LUA_INTERFACE=$(usex lua)
 		-DBUILD_MP3OUT_OPCODE=$(usex mp3)
@@ -195,13 +193,9 @@ src_configure() {
 
 	)
 
-	#use java && mycmakeargs+=(
-		#-DJAVA_INCLUDE_PATH="${JAVA_HOME}/include"
-		#-DJAVA_AWT_LIBRARY="?"
-		#-DJAVA_JVM_LIBRARY="?"
-		#-DJAVA_INCLUDE_PATH2="?"
-		#-DJAVA_AWT_INCLUDE_PATH="?"
-	#)
+	use java && mycmakeargs+=(
+		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
+	)
 
 	use lua && mycmakeargs+=(
 		-DLUA_H_PATH="$(lua_get_include_dir)"
diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest
index 1fe466b1d16b..071c2778b091 100644
--- a/media-sound/deadbeef/Manifest
+++ b/media-sound/deadbeef/Manifest
@@ -1,4 +1,6 @@
 AUX deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch 492 BLAKE2B d6ed36829d7ed139c43b6aa65c940f07e3f023d0554c258a2557c528d75e85c7dd2ca57eecef56088383a3b7b0b4f12109eb899f2847b86953421e826777c954 SHA512 0cec1ae38cf48b3f2ea53f74a6348d0217b1b3f017b836489d5b520f09ad76b6526cd3add48ed23871bc86feb7f7ed697cf6a62164a202be1ecabfd947e895f6
 DIST deadbeef-1.8.4.tar.gz 13049446 BLAKE2B a6c052b3b0aa1f74b49cf29be94e235d3dfd3d3f07ed9e1d05a4fc32036e591633eaff4ab59329cf6895828c9a674eec86b62e4818784db5f8e47eed089c80eb SHA512 18c54ae2c7931419ea06f3eb581cc8e704fa6eb87d330fc09f7295f4a8ef6e88b6f8c314223c34c321cd2a54f14cb6911add41602250c39c1b1c1edbf64d63b7
-EBUILD deadbeef-1.8.4.ebuild 3643 BLAKE2B a0f2a811f2174b5c9e3c12487eec364e71f7ba02353474f2bd7c6a3197f8e9080dcfdc2dc8bddafeaf79d982436f253aa7f928c36ac70b07a4e7ca09f1d1572d SHA512 f866c587b7cc067d59b675feba821e425e4de180ea850164eff7b10ae7c235632b6007b6684dc3a4dab72448253ce21686da4e62b823d226d43c4d5c531a28b8
+DIST deadbeef-1.8.7.tar.bz2 5029039 BLAKE2B f6ae0d664553435fca566593d715f8f9fab13711bb0e0488c80b9c7ff88a28425d1e3de2ee4c57b87722705c5ede53e0390b81cdbe6ce804d781dfe934dc21e9 SHA512 49a9610f8aa8d9853cd4f9a38d103f9a902993a5ae1990937a3ac5a14a4f8533f4233002893875aedf45f737d1a95c7cea189c61d6387bd8be7f3535d60c96eb
+EBUILD deadbeef-1.8.4.ebuild 3646 BLAKE2B c2c4363e5e6f3e319bb6c69a7d94abdedf4a18edad70a7a0c537184715193f81670ad9e82df87429a7b7a90061f7b639f90447a182da1a231cd6029de57e6c46 SHA512 2abd44b486596e15ca79fcd7b6f7c9fbe1b6f037d5fdfa49afe0e6af771c7d26e36d3d2190b6bf63d6101fc38e21d787a76e9832c3df7d704a051a47cef31662
+EBUILD deadbeef-1.8.7-r1.ebuild 3986 BLAKE2B a11b7425de25d40fd4245d16fb1ad2c98586736c62dad67141b242619724582b63c94b3da03a22acab7f228255abd47b686879007747cb4a9467343d23cb2f73 SHA512 df1b8647ad68e47ece5176ba0238190e0cab779b07709664068244f504a1aab68d49a8267e6d296e217bc1418a9aebed7b6b084b07a18734294c2f922eaec6ad
 MISC metadata.xml 832 BLAKE2B e062743afe851439a7ac29e3547e0296a7a00b6ed93d875f8725de185e5ce6b677432fd039257887b47b294d692de2f0ccb6cf9112a2c843d443ecb528b82cd6 SHA512 96aaed52c8959177be8a6d7ad30266cb8a73475119c27ec734dbab0126d19a139a3d513323d0020c42dae822cb12344959f4b9440c01f8ddd578b8dbd1241aca
diff --git a/media-sound/deadbeef/deadbeef-1.8.4.ebuild b/media-sound/deadbeef/deadbeef-1.8.4.ebuild
index 2df08a6243f2..e9f95c2dcca5 100644
--- a/media-sound/deadbeef/deadbeef-1.8.4.ebuild
+++ b/media-sound/deadbeef/deadbeef-1.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ LICENSE="
 	wavpack? ( BSD )
 "
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio shellexec +supereq threads vorbis wavpack"
 
 REQUIRED_USE="
diff --git a/media-sound/deadbeef/deadbeef-1.8.7-r1.ebuild b/media-sound/deadbeef/deadbeef-1.8.7-r1.ebuild
new file mode 100644
index 000000000000..57149d1c35bf
--- /dev/null
+++ b/media-sound/deadbeef/deadbeef-1.8.7-r1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg l10n flag-o-matic
+
+DESCRIPTION="DeaDBeeF is a modular audio player similar to foobar2000"
+HOMEPAGE="https://deadbeef.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="
+	GPL-2
+	LGPL-2.1
+	wavpack? ( BSD )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio shellexec +supereq threads vorbis wavpack"
+
+REQUIRED_USE="
+	|| ( alsa oss pulseaudio nullout )
+"
+
+DEPEND="
+	x11-libs/gtk+:3
+	net-misc/curl:0=
+	dev-libs/jansson
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	cdda? (
+		dev-libs/libcdio:0=
+		media-libs/libcddb
+		dev-libs/libcdio-paranoia:0=
+	)
+	cover? ( media-libs/imlib2[jpeg,png] )
+	dts? ( media-libs/libdca )
+	ffmpeg? ( media-video/ffmpeg )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	mp3? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	nls? ( virtual/libintl )
+	notify? (
+		sys-apps/dbus
+		dev-libs/libdispatch
+	)
+	opus? ( media-libs/opusfile	)
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	lastfm? ( dev-libs/libdispatch )
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	sys-devel/clang
+	sys-devel/llvm
+"
+
+PATCHES=(
+	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
+)
+
+src_prepare() {
+	default
+
+	drop_from_linguas() {
+		sed "/${1}/d" -i "${S}/po/LINGUAS" || die
+	}
+
+	drop_and_stub() {
+		rm -rf "${1}"
+		mkdir "${1}"
+		cat > "${1}/Makefile.in" <<-EOF
+			all: nothing
+			install: nothing
+			nothing:
+		EOF
+	}
+
+	l10n_for_each_disabled_locale_do drop_from_linguas || die
+
+	eautopoint --force
+	eautoreconf
+
+	# Get rid of bundled gettext.
+	drop_and_stub "${S}/intl"
+
+	# Plugins that are undesired for whatever reason, candidates for unbundling and such.
+	for i in adplug alac dumb ffap mms gme mono2stereo psf sc60 shn sid soundtouch wma; do
+		drop_and_stub "${S}/plugins/${i}"
+	done
+
+	rm -rf "${S}/plugins/rg_scanner/ebur128"
+}
+
+src_configure () {
+	if ! tc-is-clang; then
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+
+		strip-unsupported-flags
+	fi
+
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	local myconf=(
+		"--disable-static"
+		"--disable-staticlink"
+		"--disable-portable"
+		"--disable-rpath"
+
+		"--disable-libmad"
+		"--disable-gtk2"
+		"--disable-adplug"
+		"--disable-coreaudio"
+		"--disable-dumb"
+		"--disable-alac"
+		"--disable-ffap"
+		"--disable-gme"
+		"--disable-mms"
+		"--disable-mono2stereo"
+		"--disable-psf"
+		"--disable-rgscanner"
+		"--disable-sc68"
+		"--disable-shn"
+		"--disable-sid"
+		"--disable-sndfile"
+		"--disable-soundtouch"
+		"--disable-src"
+		"--disable-tta"
+		"--disable-vfs-zip"
+		"--disable-vtx"
+		"--disable-wildmidi"
+		"--disable-wma"
+
+		"$(use_enable alsa)"
+		"$(use_enable oss)"
+		"$(use_enable pulseaudio pulse)"
+		"$(use_enable mp3)"
+		"$(use_enable mp3 libmpg123)"
+		"$(use_enable nls)"
+		"$(use_enable vorbis)"
+		"$(use_enable threads)"
+		"$(use_enable flac)"
+		"$(use_enable supereq)"
+		"$(use_enable cdda)"
+		"$(use_enable cdda cdda-paranoia)"
+		"$(use_enable aac)"
+		"$(use_enable cover artwork)"
+		"$(use_enable cover artwork-imlib2)"
+		"$(use_enable cover artwork-network)"
+		"$(use_enable dts dca)"
+		"$(use_enable ffmpeg)"
+		"$(use_enable converter)"
+		"$(use_enable musepack)"
+		"$(use_enable notify)"
+		"$(use_enable nullout)"
+		"$(use_enable opus)"
+		"$(use_enable pulseaudio pulse)"
+		"$(use_enable shellexec)"
+		"$(use_enable shellexec shellexecui)"
+		"$(use_enable lastfm lfm)"
+		"$(use_enable wavpack)"
+
+		"--enable-gtk3"
+		"--enable-vfs-curl"
+		"--enable-shared"
+		"--enable-m3u"
+		"--enable-pltbrowser"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 636eec7f0c98..184a152f03a4 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-music-3.36.4.1.tar.xz 979064 BLAKE2B e744bee915a48a5d2366350cda7ebb0c43382f46de07d9203d95675cad45d825f2d93cc07be7865eceb5be3554ab478ecf84c52d9b8f5defc198b4f1b6638926 SHA512 8b6b4a8a44158a724de82855ba781dd6ceb53a30a35160f477721a385a841697f9a7c97cdba9a5bcc5b36834d55c034eb4c892907d550205dc5b7f7af56133ca
 DIST gnome-music-3.36.7.tar.xz 971980 BLAKE2B f27d0eb49a1728873ef6d439eead83cc34fb6802afdba3b4e0ef8d15c88d2012634ec0a18a4df4ba18079915d4227f526a93ac7989ce6ea4a807b620722fad1e SHA512 3470563621c17004d0b92451950ebfca203e830cb9ffe481fef7fe4d5187afa36ccb33130695226d4db95a89af9fac592910d2a19e715af4dd0c0ffba081c3a4
 EBUILD gnome-music-3.36.4.1.ebuild 2043 BLAKE2B 2367e9f659fd16175956bca41740517872958137055db48368f139b1cd873ff724a2826a7f991afff24640e7e04df74c98a46ba5052cc13fb23d6976b53bc2ee SHA512 7f1e484112f62e1327e2982aaf230a8d457a24cbab234b6899c5c52607c5df4837a2985c8c79593bdf021c2a077fa35fbfef9f1e2ec929d7360e2c7d9f99d0cb
-EBUILD gnome-music-3.36.7.ebuild 2045 BLAKE2B 761c7b65930b25730b99ce81171345e2863f321198ab87a2b6c07597167627712102c60a4e0222d296959e99502926cdab09d2cd130870a33d3bceb037a77bd6 SHA512 a0b0146f030a01d12d389251e4be700a928e322f14db27e407bb09b304f57d5de58639381746f6845e37b1c8b25de4897050885cd2e51124d5b41224a103120e
+EBUILD gnome-music-3.36.7.ebuild 2044 BLAKE2B 9b348bad9a91b1d1e1f9b01807181a7158a27725d603051def2f6efae054508f8c73dc7a85164c13679539fc868ac0bca6f67836c946cd675ce2249a7e742256 SHA512 109f5eb0dc6857aa34867efb385b828f8c1e7d4efbcf1c3ceb9b177ecf634287a7ab1c178138b2328bfaa62d4e01fb65e0e5397a17823f9ac93dd28c7bab54a4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.36.7.ebuild b/media-sound/gnome-music/gnome-music-3.36.7.ebuild
index e883393fd98a..b845b8cc36ea 100644
--- a/media-sound/gnome-music/gnome-music-3.36.7.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.36.7.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
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.50:2
diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index 022582f5f6d7..7dbe47129ab4 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-sound-recorder-3.34.0.tar.xz 133808 BLAKE2B 2e8b83eb58776324717fcbeb8e0383ef3370e394f26978b1367bff22eaef3d9143eef65cd5c678bc25a67b32ed8d1c9e838ce63b0e2868f2ddb88805a5c43c5c SHA512 cb28f1f93f78cae5cc98750f937f60abb326065cdbbb1ee48146daceb9e34f03bc9bf4d78b7a149e579654673b9879fb249fd5a370a19764f01961c565b901ee
 DIST gnome-sound-recorder-3.38.1.tar.xz 198328 BLAKE2B 80fc581a9aad2d1ee944982f9b0c93eb4de75711d7242a25fdbcdbd6edcf71af337bf6c49806b2265f4d099ac58fb5619964f6d473f291827f026d01fe497461 SHA512 e725b8c0d899680eff767f61360645a4adc2df29db8813d6e799b4affa3d05cffc5a7de4c8ee8eafafbc34314655831d7524963f974a23f472fdbb6f292e6c2c
 EBUILD gnome-sound-recorder-3.34.0.ebuild 910 BLAKE2B ce3df51e9fddb710d0aadc855b5fcb8616f533b3d5d09c0279c70e306dce3314f874cf1b62588b7dafec0c3720aba3eb9e90ac47ecf156d4b1cec8572f5633f3 SHA512 dfe6bcb55c39c6af5f42c88eb0989899b1df6d61d7357635f80d75d5eabe54669efa5d1312f41d72553cca37c0ad0cd442bab7ac835643b9da397fb2b0cc68fd
-EBUILD gnome-sound-recorder-3.38.1.ebuild 944 BLAKE2B dbefbe796fcbb45e628b3801c871db8f66d48b5f661b863615c1f55ad4add21a8b6b68f68468cd0c279dec487479ba69852e72a09e5911d5e33bbc4d041acff7 SHA512 e101e4ccdb1e0974aea7b05088c1376664ac015a213dbcbda60a3327f14bf35ec330653da4e76b46d4ef7de3d311a52cb5078d492598c3f47250ebe1489e2db4
+EBUILD gnome-sound-recorder-3.38.1.ebuild 943 BLAKE2B 4a2c0d34d4638882b37ed30a971382737e2cb555654b142372183d5f0e13b9fb53a93d4aad0c9ee6c69f666dd6ff9976b771721fda1b7bb4857719ec0c0e8d84 SHA512 67d78110c5778456ae88a468ac0bacf1165ae4e3e1dc554d175706a5f1044c2c9ccfbfc5cde2179a5c2bfb75d217f8bae1df9ae7cdbc6377a4c30cb04d8c7d34
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.38.1.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.38.1.ebuild
index c217d400e552..67d8506e4821 100644
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.38.1.ebuild
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.38.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-sound/jack/Manifest b/media-sound/jack/Manifest
index 3952aa8e9824..c89b38ff2e75 100644
--- a/media-sound/jack/Manifest
+++ b/media-sound/jack/Manifest
@@ -1,3 +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
 MISC metadata.xml 481 BLAKE2B 2bf3ebe03e9ab9b81437608a57cdae359c6afd2f083d19bb75a046fe0c2617e8fc7aa2d78d9ba7b190ac0f7749b71bb6498d12d95c6c62a3dd5c031d0a8af425 SHA512 da4b26c98824b1c2798f941ae95e0bcb4cdd6ef654dff4965d28b3fa8f3952a6162e028d793c9a9e9f866d74c22b3ed74cc99779efb84cd0eef5134c89dde8ac
diff --git a/media-sound/jack/jack-4.0.0_pre20201220.ebuild b/media-sound/jack/jack-4.0.0_pre20201220.ebuild
new file mode 100644
index 000000000000..2d00b9187d01
--- /dev/null
+++ b/media-sound/jack/jack-4.0.0_pre20201220.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="ncurses"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A frontend for several cd-rippers and mp3 encoders"
+HOMEPAGE="https://github.com/jack-cli-cd-ripper/jack http://www.home.unix-ag.org/arne/jack/"
+GIT_COMMIT_HASH="5f3e5f43f476b0d506144c103eb8d4edf76fc5de" # branch "python3-mb"
+SRC_URI="https://github.com/jack-cli-cd-ripper/jack/archive/${GIT_COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${GIT_COMMIT_HASH}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/python-discid[${PYTHON_MULTI_USEDEP}]
+		media-libs/mutagen[${PYTHON_MULTI_USEDEP}]
+	')
+	media-libs/flac
+	media-sound/cdparanoia
+	media-sound/lame"
+
+python_install_all() {
+	insinto /etc
+	newins example.etc.jackrc jackrc
+
+	newman jack.man jack.1
+
+	local DOCS=( README.md CHANGELOG.md )
+	local HTML_DOCS=( doc/*.{html,css,gif} )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "${PN} can use the following optional binaries, but currently there"
+	elog "are no gentoo ebuilds available for them:"
+	elog "  fdkaac: encode to M4A format"
+	elog "  oggenc: encode to OGG format"
+	elog "  cdda2wav / dagrab / tosha: cd ripper"
+}
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index dd8543bd7337..cd6a77b64ee1 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -6,9 +6,9 @@ DIST mpd-0.22.3.tar.xz 726356 BLAKE2B a821e9fed56c3ad625d155057867747d2c883dd90d
 DIST mpd-0.22.4.tar.xz 729264 BLAKE2B d8060a205f94fa369ad8aee7a3e12f1389e7587aac7843eeec6ab3e6b39c2e063cfd5413bc7c9738ce6c68c56d3befefd48112c1c93f725a6940ff1889d882e6 SHA512 e169d6656b378d52798e822ffd47f554bd7c076ca8bc5a1119e3b2fad36bee79335dc392aa8d78d854689af62168625698c1777440e08a67075099898ee5fe34
 DIST mpd-0.22.5.tar.xz 730308 BLAKE2B 2c7375af25c1b5d6dd8cf79f71e67842f75dcdb38b1ca90c8dda2661a5bd6d110ad0ebbefc53e0a38cfa6434ee4d2ad99688982588ee6d8d6895b24e15e3f927 SHA512 589516b7ee5820cbeee99042017b411a46857d39547302bce0bedb9c265da2c8465224a6817a1b7e65105f344398bee5fb2a3674064e42507157cdac01416295
 DIST mpd-0.22.6.tar.xz 730524 BLAKE2B 675b876415a343ba387e26ad800b2e562b40a5e3aaacdff31e0ec9d6ad09f0117406f82e519a08ba3187020b482dcd0434267f9e84dd13e9e1bf8565d1967c2c SHA512 5e417204e24d11fa609740ae92bc1d796aad2d63537655f655074d829cd79cadaf1ca025171dcf5486c1e557cc946152c21e299286b1cb74cc342da2b1f41343
-EBUILD mpd-0.21.26.ebuild 7986 BLAKE2B 24b791d8b86389dd6d4eb123e05c1bdc8ded128edf559e6a203220fcbbe043013cb44bbd185458755e5f1a8f225909b90f8a5b0c2ddb53a04b6f5e487dcac795 SHA512 1f385dbe89c5a91960426734f4a23827495afefe71817a09ef170877d546087e87df69e2e58257b1ce670a1d58c835cb0536dd5412d581ea303922e903a5c74c
-EBUILD mpd-0.22.3.ebuild 8043 BLAKE2B 7ad05f2cb5ac56d326c8f5ceee7772346ccfed4650cd4c94df5b572d4963cbf0f0955ed894dacac64c70736285c6bfe83b1eaf2017e1263282ef19c4ce0a3108 SHA512 4aa7fd6aba159d16bc2cbc6a4c2f88b04175e871da2ef48c0ea9cda004102e10308ea7dfba4ca53339c609038ef4f2b40791445d22c8879d07117fcd0212e768
-EBUILD mpd-0.22.4-r1.ebuild 8435 BLAKE2B c57089b82c7f78f9f870d22caa412586289cd2de9f51bf0e435fd695383af578eab9a4d226bafbc198c486047bd36b002f8cd7e19ffe2e2b1a2757bb3a944ec4 SHA512 cad3ae48000a0945c7388a16104ce6e3b5dd2222d0bf9f39e9da18c4a31e3dfd2b56f2caa7b89c68f3ca288efd9cca17801dbfab808e1fe805b6a4fbbb3d170b
-EBUILD mpd-0.22.5.ebuild 8435 BLAKE2B c57089b82c7f78f9f870d22caa412586289cd2de9f51bf0e435fd695383af578eab9a4d226bafbc198c486047bd36b002f8cd7e19ffe2e2b1a2757bb3a944ec4 SHA512 cad3ae48000a0945c7388a16104ce6e3b5dd2222d0bf9f39e9da18c4a31e3dfd2b56f2caa7b89c68f3ca288efd9cca17801dbfab808e1fe805b6a4fbbb3d170b
-EBUILD mpd-0.22.6.ebuild 8435 BLAKE2B c57089b82c7f78f9f870d22caa412586289cd2de9f51bf0e435fd695383af578eab9a4d226bafbc198c486047bd36b002f8cd7e19ffe2e2b1a2757bb3a944ec4 SHA512 cad3ae48000a0945c7388a16104ce6e3b5dd2222d0bf9f39e9da18c4a31e3dfd2b56f2caa7b89c68f3ca288efd9cca17801dbfab808e1fe805b6a4fbbb3d170b
-MISC metadata.xml 2473 BLAKE2B da637e3495141e79aec3a6a1d676c6d98440482e00c57b48efdd9d8a93185d7d093cd2544a2a31beb552ac31f3ea4be897a036b640d630a02f297bde6e2a9f29 SHA512 e7afe6339926473e212cdd9a5be5f4e72c47e78b7ed9839621a09b331c40b4a21312ba4f8fe4154c4cd88908d005af4f3eca17cd6407ea8d10e294775d19299d
+EBUILD mpd-0.21.26.ebuild 8029 BLAKE2B 9d92ab16796b2a34c7e3505ed36ea23657140a9700b170c2931f993d1ef4e81add1c0db85bb946610792dc96e2fbd974b2beb87b6c1bbb6dde510ad357a4e5f2 SHA512 5444629bfb131179c080f812c42b850a0828648074404032e4fbe7a02ef92fe5751d812426464905a223f990bb471beccabc5c1d97ff543e1d376a811a553b5d
+EBUILD mpd-0.22.3.ebuild 8086 BLAKE2B b51face3a7a1bb65ce77b1d947c5665d77976e650f04a19b9eac5cf0565f383f341c27bb8b226c7a3b5ad2f16bd5a8bdb3d84323abea7edd65fa6e3daf25ac0b SHA512 474f928e928ca4d139e31686f5b7b5b55c09d6927bec508a4879bf4c5bfc15935665fff06d02fbfc79eaa4f80dfa01214165a51702af23abdf9176e89c162955
+EBUILD mpd-0.22.4-r1.ebuild 8478 BLAKE2B 8157eb7c510096f5d7be5b158d7e8dcf326b799be79d95d5325b7e69490deefd63f84566ba73acc08a243edf1bda96192cc80794c66612cb9d0a225290eb69ca SHA512 f4d65db5fcd452f7775367a75de4eaaa5799fd5423060c8f119035e1ebfa336a8424845d48b7efd10fa8108ce1112074b96726810edf60ed4a7f6c20f78f72e9
+EBUILD mpd-0.22.5.ebuild 8478 BLAKE2B 8157eb7c510096f5d7be5b158d7e8dcf326b799be79d95d5325b7e69490deefd63f84566ba73acc08a243edf1bda96192cc80794c66612cb9d0a225290eb69ca SHA512 f4d65db5fcd452f7775367a75de4eaaa5799fd5423060c8f119035e1ebfa336a8424845d48b7efd10fa8108ce1112074b96726810edf60ed4a7f6c20f78f72e9
+EBUILD mpd-0.22.6.ebuild 8478 BLAKE2B 8157eb7c510096f5d7be5b158d7e8dcf326b799be79d95d5325b7e69490deefd63f84566ba73acc08a243edf1bda96192cc80794c66612cb9d0a225290eb69ca SHA512 f4d65db5fcd452f7775367a75de4eaaa5799fd5423060c8f119035e1ebfa336a8424845d48b7efd10fa8108ce1112074b96726810edf60ed4a7f6c20f78f72e9
+MISC metadata.xml 2563 BLAKE2B a974514d9226d8ddb4ac85adaaccb4beb5104fc28d68248ac4afe87ab5358e2e7a4214444444419c20c22533ffeb1649308f805958273bce8f603f6f47551884 SHA512 642ecc4d91cfd82db6e4afa9e35f1dd01dd7c4be23576303cc29e266e629463b73491c61d0c0ff5b7dba753ea6c60ec89ccf1f5a895968e9127852b445151a39
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 621b406d3e23..ed7555b3557a 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -28,6 +28,7 @@
     <flag name="recorder">Enables output plugin for recording radio streams</flag>
     <flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
     <flag name="signalfd">Use the signalfd function in MPD's event loop</flag>
+    <flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
     <flag name="soundcloud">Build plugin to access soundcloud</flag>
     <flag name="tidal">Build plugin to access tidal</flag>
     <flag name="systemd">Enable support for systemd socket activation</flag>
diff --git a/media-sound/mpd/mpd-0.21.26.ebuild b/media-sound/mpd/mpd-0.21.26.ebuild
index b658891c0356..c546d9352ef6 100644
--- a/media-sound/mpd/mpd-0.21.26.ebuild
+++ b/media-sound/mpd/mpd-0.21.26.ebuild
@@ -16,11 +16,11 @@ IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
 	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
-	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
+	recorder samba selinux sid signalfd sndfile sndio soundcloud sqlite systemd
 	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
 	zeroconf zip zlib"
 
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio sndio recorder"
 DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
 	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
 ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
@@ -86,6 +86,7 @@ RDEPEND="
 		media-libs/libsidplayfp
 	) )
 	sndfile? ( media-libs/libsndfile )
+	sndio? ( media-sound/sndio )
 	soundcloud? ( >=dev-libs/yajl-2:= )
 	sqlite? ( dev-db/sqlite:3 )
 	systemd? ( sys-apps/systemd )
@@ -185,6 +186,7 @@ src_configure() {
 		-Dpipe=$(usex pipe true false)
 		-Dpulse=$(usex pulseaudio enabled disabled)
 		-Drecorder=$(usex recorder true false)
+		-Dsndio=$(usex sndio enabled disabled)
 	)
 
 	if use samba || use upnp; then
@@ -239,7 +241,6 @@ src_configure() {
 	emesonargs+=(
 		--libdir="/usr/$(get_libdir)"
 		-Ddocumentation=false
-		-Dsndio=disabled #not yet in the tree
 		-Dsolaris_output=disabled
 
 		-Ddatabase=true
diff --git a/media-sound/mpd/mpd-0.22.3.ebuild b/media-sound/mpd/mpd-0.22.3.ebuild
index be1643796e1f..d45d4a1f51a9 100644
--- a/media-sound/mpd/mpd-0.22.3.ebuild
+++ b/media-sound/mpd/mpd-0.22.3.ebuild
@@ -16,11 +16,11 @@ IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
 	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
-	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
+	recorder samba selinux sid signalfd sndfile sndio soundcloud sqlite systemd
 	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
 	zeroconf zip zlib"
 
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio sndio recorder"
 DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
 	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
 ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
@@ -88,6 +88,7 @@ RDEPEND="
 		media-libs/libsidplayfp
 	) )
 	sndfile? ( media-libs/libsndfile )
+	sndio? ( media-sound/sndio )
 	soundcloud? ( >=dev-libs/yajl-2:= )
 	sqlite? ( dev-db/sqlite:3 )
 	systemd? ( sys-apps/systemd )
@@ -186,6 +187,7 @@ src_configure() {
 		-Dpipe=$(usex pipe true false)
 		-Dpulse=$(usex pulseaudio enabled disabled)
 		-Drecorder=$(usex recorder true false)
+		-Dsndio=$(usex sndio enabled disabled)
 	)
 
 	if use samba || use upnp; then
@@ -240,7 +242,6 @@ src_configure() {
 	emesonargs+=(
 		--libdir="/usr/$(get_libdir)"
 		-Ddocumentation=$(usex doc enabled disabled)
-		-Dsndio=disabled #not yet in the tree
 		-Dsolaris_output=disabled
 
 		-Ddatabase=true
diff --git a/media-sound/mpd/mpd-0.22.4-r1.ebuild b/media-sound/mpd/mpd-0.22.4-r1.ebuild
index 2b67f0ccd3dd..9f489726eb47 100644
--- a/media-sound/mpd/mpd-0.22.4-r1.ebuild
+++ b/media-sound/mpd/mpd-0.22.4-r1.ebuild
@@ -16,11 +16,11 @@ IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
 	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
-	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
+	recorder samba selinux sid signalfd sndfile sndio soundcloud sqlite systemd
 	test tidal twolame udisks vorbis wavpack webdav wildmidi upnp
 	zeroconf zip zlib"
 
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio sndio recorder"
 DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
 	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
 ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
@@ -88,6 +88,7 @@ RDEPEND="
 		media-libs/libsidplayfp
 	) )
 	sndfile? ( media-libs/libsndfile )
+	sndio? ( media-sound/sndio )
 	soundcloud? ( >=dev-libs/yajl-2:= )
 	sqlite? ( dev-db/sqlite:3 )
 	systemd? ( sys-apps/systemd )
@@ -193,6 +194,7 @@ src_configure() {
 		-Dpipe=$(usex pipe true false)
 		-Dpulse=$(usex pulseaudio enabled disabled)
 		-Drecorder=$(usex recorder true false)
+		-Dsndio=$(usex sndio enabled disabled)
 	)
 
 	if use samba || use upnp; then
@@ -247,7 +249,6 @@ src_configure() {
 	emesonargs+=(
 		--libdir="/usr/$(get_libdir)"
 		-Ddocumentation=$(usex doc enabled disabled)
-		-Dsndio=disabled #not yet in the tree
 		-Dsolaris_output=disabled
 
 		-Ddatabase=true
diff --git a/media-sound/mpd/mpd-0.22.5.ebuild b/media-sound/mpd/mpd-0.22.5.ebuild
index 2b67f0ccd3dd..9f489726eb47 100644
--- a/media-sound/mpd/mpd-0.22.5.ebuild
+++ b/media-sound/mpd/mpd-0.22.5.ebuild
@@ -16,11 +16,11 @@ IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
 	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
-	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
+	recorder samba selinux sid signalfd sndfile sndio soundcloud sqlite systemd
 	test tidal twolame udisks vorbis wavpack webdav wildmidi upnp
 	zeroconf zip zlib"
 
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio sndio recorder"
 DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
 	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
 ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
@@ -88,6 +88,7 @@ RDEPEND="
 		media-libs/libsidplayfp
 	) )
 	sndfile? ( media-libs/libsndfile )
+	sndio? ( media-sound/sndio )
 	soundcloud? ( >=dev-libs/yajl-2:= )
 	sqlite? ( dev-db/sqlite:3 )
 	systemd? ( sys-apps/systemd )
@@ -193,6 +194,7 @@ src_configure() {
 		-Dpipe=$(usex pipe true false)
 		-Dpulse=$(usex pulseaudio enabled disabled)
 		-Drecorder=$(usex recorder true false)
+		-Dsndio=$(usex sndio enabled disabled)
 	)
 
 	if use samba || use upnp; then
@@ -247,7 +249,6 @@ src_configure() {
 	emesonargs+=(
 		--libdir="/usr/$(get_libdir)"
 		-Ddocumentation=$(usex doc enabled disabled)
-		-Dsndio=disabled #not yet in the tree
 		-Dsolaris_output=disabled
 
 		-Ddatabase=true
diff --git a/media-sound/mpd/mpd-0.22.6.ebuild b/media-sound/mpd/mpd-0.22.6.ebuild
index 2b67f0ccd3dd..9f489726eb47 100644
--- a/media-sound/mpd/mpd-0.22.6.ebuild
+++ b/media-sound/mpd/mpd-0.22.6.ebuild
@@ -16,11 +16,11 @@ IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
 	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
-	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
+	recorder samba selinux sid signalfd sndfile sndio soundcloud sqlite systemd
 	test tidal twolame udisks vorbis wavpack webdav wildmidi upnp
 	zeroconf zip zlib"
 
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio sndio recorder"
 DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
 	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
 ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
@@ -88,6 +88,7 @@ RDEPEND="
 		media-libs/libsidplayfp
 	) )
 	sndfile? ( media-libs/libsndfile )
+	sndio? ( media-sound/sndio )
 	soundcloud? ( >=dev-libs/yajl-2:= )
 	sqlite? ( dev-db/sqlite:3 )
 	systemd? ( sys-apps/systemd )
@@ -193,6 +194,7 @@ src_configure() {
 		-Dpipe=$(usex pipe true false)
 		-Dpulse=$(usex pulseaudio enabled disabled)
 		-Drecorder=$(usex recorder true false)
+		-Dsndio=$(usex sndio enabled disabled)
 	)
 
 	if use samba || use upnp; then
@@ -247,7 +249,6 @@ src_configure() {
 	emesonargs+=(
 		--libdir="/usr/$(get_libdir)"
 		-Ddocumentation=$(usex doc enabled disabled)
-		-Dsndio=disabled #not yet in the tree
 		-Dsolaris_output=disabled
 
 		-Ddatabase=true
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index f7a6fa8a50ca..d6ce0a44006d 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -4,7 +4,7 @@ AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a
 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
 DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
 DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
-EBUILD murmur-1.3.3.ebuild 3688 BLAKE2B 620347f0ed06e982ffa44509581b95706d0860f5b937e25c9afc51d4ae03f3272d2af323575e6234a582d6a4e0cf3a57fcebc5f80ad03392787b1e6b3b694206 SHA512 46bebc6ceadbdf18cb9ca26702da1d853436cd448e64c2dcfe0e51c88ab5314318259264b6f2c0d46c30d5cd1daebd94ad7af4b23145aa2d472cf67798e6fa57
-EBUILD murmur-1.3.4.ebuild 3690 BLAKE2B 217b1750db4ac3e2a86aadd74c1b2e0ee7aae204ba869b3b0bac3217ae3507705efb8c654093ff4fa6d6935d42cc4921eb9ab29688b8946ce39d7c57fec25b5f SHA512 38572cb3fae7ac5a354610f86ff078d073bddd6abe8a48fc1f4c4b32ed6033817dbda4a5dc14c67b7cef48ef55f31da5c5f81a1f01c90a3da86afd2f1ad0cf6e
-EBUILD murmur-9999.ebuild 3748 BLAKE2B 220d4e0fd63cf2464fe0586938525c8c3c8c8b26f3b08c55d5c8e5dd4f9a7a996567fb28f7fb9bef6a602c3f041b743180445f0fd1024583dc68b4a81d472b23 SHA512 0cfb9421a3c7e389ea3dea6a536e49485fd586a6785d0813435165ece1401597b7e7858f6378bf1ca7793ddbdaecdbf9410e0bc5ffbdfcc13d392ba59156c404
+EBUILD murmur-1.3.3.ebuild 3688 BLAKE2B 73d7bc6c7a50a5136736d3e53a2be1ba41a127d1289e13a05acecb0f4c79795e73935b46014d3e7bab08d5a453234fc90e099886a5a06f2a4ee1bfd5bc77f9c3 SHA512 c3e83e80d90b452e0e615b380805b969bbacaa29dc1518c2b3bca622321d6c84dfbb45b494230b4060b5df29d3f15cd53f9db13f6c6eeb71dd3022230569a9ea
+EBUILD murmur-1.3.4.ebuild 3690 BLAKE2B db48dd485b3e307aadf435a74189dfdf87ed76e3b563b8a4d8860869c2ec1c268a0f14b3a6fc81b71d029829d9f899af85d967534b01336d768ff8e690c4a5d2 SHA512 f889b8827df86105812a65275d8dd49fb815dae221a7f5d1ee8883b5f877d80e55d94b1c88b78a8ea52f953b196296cd2cf77bd8991f3092a6149bec50e6d5c8
+EBUILD murmur-9999.ebuild 3748 BLAKE2B aee27d701d61212481ddd4b24ff36b6bfcdf1e1d1439fcbe0cf0cd2d387b638063e2c28c520d63648bbae66bf3744b34ad44b0f3ee50db47d48ce77032869551 SHA512 3436bad5ff84371da14210b759dcc05d3f7bed961cf57098f658e0511e8ab3685bccd6b2866cd70ada32ca8a4c85b5562a00f031daaac93fa49cc52a07c07456
 MISC metadata.xml 530 BLAKE2B a6618cb804deee82cf3f88ee683a5b406eee1317e9ca815f7f4e363a0e14c7c8cc2bcf4400d3a79b62f5652881e46be4405d0ac88afe610187419978ac57c9a6 SHA512 ef162d69805d3262f9f4f1732e9d8a031cac73e130f04013123d8f8e1d8e48132df243653ef2464bda1d8b8c0b88485fd32edaab8b3e62555a6295c676c1f5b5
diff --git a/media-sound/murmur/murmur-1.3.3.ebuild b/media-sound/murmur/murmur-1.3.3.ebuild
index 606e4379065a..2c04f6f334ec 100644
--- a/media-sound/murmur/murmur-1.3.3.ebuild
+++ b/media-sound/murmur/murmur-1.3.3.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 qmake-utils systemd readme.gentoo-r1
+inherit qmake-utils systemd readme.gentoo-r1 tmpfiles
 
 DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
 HOMEPAGE="https://wiki.mumble.info"
@@ -140,7 +140,7 @@ src_install() {
 	newconfd "${FILESDIR}"/murmur.confd murmur
 
 	systemd_dounit scripts/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
+	newtmpfiles "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
 
 	keepdir /var/lib/murmur /var/log/murmur
 	fowners -R murmur /var/lib/murmur /var/log/murmur
diff --git a/media-sound/murmur/murmur-1.3.4.ebuild b/media-sound/murmur/murmur-1.3.4.ebuild
index 7dbaf80197b1..adbc89cd82c7 100644
--- a/media-sound/murmur/murmur-1.3.4.ebuild
+++ b/media-sound/murmur/murmur-1.3.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit qmake-utils systemd readme.gentoo-r1
+inherit qmake-utils systemd readme.gentoo-r1 tmpfiles
 
 DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
 HOMEPAGE="https://wiki.mumble.info"
@@ -140,7 +140,7 @@ src_install() {
 	newconfd "${FILESDIR}"/murmur.confd murmur
 
 	systemd_dounit scripts/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
+	newtmpfiles "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
 
 	keepdir /var/lib/murmur /var/log/murmur
 	fowners -R murmur /var/lib/murmur /var/log/murmur
diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild
index 761b2f65bbb7..5eb4b58cfda9 100644
--- a/media-sound/murmur/murmur-9999.ebuild
+++ b/media-sound/murmur/murmur-9999.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 cmake systemd readme.gentoo-r1
+inherit cmake systemd readme.gentoo-r1 tmpfiles
 
 DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
 HOMEPAGE="https://wiki.mumble.info"
@@ -145,7 +145,7 @@ src_install() {
 	newconfd "${FILESDIR}"/murmur.confd murmur
 
 	systemd_dounit scripts/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
+	newtmpfiles "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
 
 	keepdir /var/lib/murmur /var/log/murmur
 	fowners -R murmur /var/lib/murmur /var/log/murmur
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index f01054c21bac..bb907b0d1ca2 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,9 +1,7 @@
 AUX musescore-3.0.1-man-pages.patch 1779 BLAKE2B 345f06aaad337f0cd51f949bc210ec8efa06929c3c1663696f116c72dfc2fddbd0032bf4070464dc439dd0c6dbdfd39337d146764184aaef0723574fb501aa22 SHA512 64230965d6cd544bdee9ae52682812515bdef17abfc1e31d0a6f887d22c70ca5d82d22c0937e3ddd56ab478009cfc0e4170a9283b2fc7e0da242d84b984616fb
 AUX musescore-3.6.1-rename-audioitem.patch 491 BLAKE2B 9ecdccb1e3aec15c7233baaeb07d1b962b487dfa1c88cbb1c79616e92d36fc8e0d46635b9bda851550145086bfef2bba56a53ed033325b6bd98378a9f6928bb3 SHA512 55cb0187dfe4e590ec47c772d3c820f64324d748a2b95d0529b516cd048f2862477117dd711c335fd7abf8e3693e9e0b8b60cc270aab5a5960a173fa8bd7ad85
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
-DIST musescore-3.6.1.tar.gz 68754499 BLAKE2B 81462d8c1d57af7f58c117cbeda725ab4eb8fb313fb29f95724aaba43bd9879ae7a018c8b5de932ab8b925c4362b855b06508aba28b7c5ae0ca59ec11b2803ad SHA512 8e486ea08f8ad6b8238ca400475b9108955ff200221c9ba694e42e20e373c43f7dfd89933ca3887de26cefa547d0e1d792922c685a9d16eaefc9293f72a6fe2d
 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8 SHA512 04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
-EBUILD musescore-3.6.1.ebuild 2981 BLAKE2B 6533c18a0eef953a7541a087c185eec2d069095bb60bbf8d96c528d4a788dd33d3d0677eaeb99c27a4f0a2a3fecfcdc214b2a3fdfb4bf3a42607a6c99b1e9c28 SHA512 75b5603767cd6631b247545c07c008cbf99555c13c528af34b63776946b1c48492f5bd3fb25e80c96d2d1d84f00932d85100efbbe70e6adbe94492033b0aa322
-EBUILD musescore-3.6.2.ebuild 2990 BLAKE2B 869b5cc0232c59ca95d856d9db12d20d3683f76b676f5e74d7fc692d52062e7d6b524c427cbe93eb9b94e4e70e6d3ee5b703144862387c930fc6d091c06cb634 SHA512 7b25f1b5c0c2afad39927da7220283ad8dae2552dbafefecbaf0acb3b4276844ea627939272105935d3e67de55a83a49edb3a5f8d19b8f9d6979c51ffa47a91c
+EBUILD musescore-3.6.2.ebuild 2988 BLAKE2B 066bc22bc16788b7f54d6e54547f8f633442ed2ea591f188a8bd7994ed1f40376e0ba1365e7d41f0c5764924af449254a7ec55712ee967ad6d3e3ed9b9dbc39c SHA512 667cf575170edbe8e105ba3863df978fa05e0d1216fe18b5572c8fc6bce060c2764b1ff59d6cf632076f7e5bd2d966026aeb2d7c1f163f2b40c1823ed495a65f
 EBUILD musescore-9999.ebuild 2884 BLAKE2B 733677224abc2be6cb04328339392069832574fa48e00fbeac1a0cec8f18add469d34cd9ba3cfd68bd83be88bd1fb8c6d82065d71d3378df4d71e6c89064b220 SHA512 829ed729aaedd2aff35466e4c286ac5274e39a46033ab173c2fff196a36e713a0a834cf01ea4d27d8839118f26fba0c4b8576451f0aa55cb963e189b251affe9
 MISC metadata.xml 881 BLAKE2B 99183973e67c5c36493fd08532288693650a321bd72f864eb2924066462d9a2b58dbcf41778018e1774ac46958ccfc796a71727cc47b5bd6c58926e63bbad021 SHA512 24dd5a79185ca63316656fe63011eceba157ed1d23d6875e5452906215f2151f706265d68979188005172d7e7f32a5d57eeb248c218a20036cbaf73b4983d7aa
diff --git a/media-sound/musescore/musescore-3.6.1.ebuild b/media-sound/musescore/musescore-3.6.1.ebuild
deleted file mode 100644
index db51b9d0df1d..000000000000
--- a/media-sound/musescore/musescore-3.6.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
-else
-	SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S="${WORKDIR}/MuseScore-${PV}"
-fi
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-# MuseScore_General-*.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
-SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols2:5
-	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
-	dev-qt/qtsvg:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/freetype-2.5.2
-	media-libs/libsndfile
-	sys-libs/zlib:=
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	jack? ( virtual/jack )
-	mp3? ( media-sound/lame )
-	omr? ( app-text/poppler )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	sf3? ( media-libs/libvorbis )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-	"${FILESDIR}/${P}-rename-audioitem.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_src_unpack
-		unpack ${A}
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Move soundfonts to the correct directory
-	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAEOLUS=OFF # does not compile
-		-DBUILD_ALSA="$(usex alsa)"
-		-DBUILD_CRASH_REPORTER=OFF
-		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME="$(usex mp3)"
-		-DBUILD_PCH=ON
-		-DBUILD_PORTAUDIO="$(usex portaudio)"
-		-DBUILD_PORTMIDI="$(usex portmidi)"
-		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TELEMETRY_MODULE=ON
-		-DBUILD_WEBENGINE="$(usex webengine)"
-		-DCMAKE_SKIP_RPATH=ON
-		-DDOWNLOAD_SOUNDFONT=OFF
-		-DHAS_AUDIOFILE=ON
-		-DOCR=OFF
-		-DOMR="$(usex omr)"
-		-DSOUNDFONT3=ON
-		-DZERBERUS="$(usex sfz)"
-		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
-		-DUSE_SYSTEM_FREETYPE=ON
-		-DUSE_SYSTEM_POPPLER=ON
-		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake_build -j1 lrelease manpages
-	cmake_src_compile
-}
diff --git a/media-sound/musescore/musescore-3.6.2.ebuild b/media-sound/musescore/musescore-3.6.2.ebuild
index d5a19eb9bdc6..96f936a41a63 100644
--- a/media-sound/musescore/musescore-3.6.2.ebuild
+++ b/media-sound/musescore/musescore-3.6.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
 else
 	SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S="${WORKDIR}/MuseScore-${PV}"
 fi
 
diff --git a/media-sound/playerctl/Manifest b/media-sound/playerctl/Manifest
index 068bb22d905c..914884783ad5 100644
--- a/media-sound/playerctl/Manifest
+++ b/media-sound/playerctl/Manifest
@@ -3,5 +3,5 @@ DIST playerctl-2.2.1.tar.gz 66255 BLAKE2B 76732d8074b17ca958b7efe08d7be8d4bce3ba
 DIST playerctl-2.3.1.tar.gz 73595 BLAKE2B d6d60d82fb0a8951fba4a3de91ff1e3f4bdba7177563b65b2da53525af4ca40f42755c577f652aaa24d2de308f56a495c8f87840ad67d6cda840cba1411abdb0 SHA512 06a10d193c83f60a9a9c50dddfb0a74e00be8cde34ddaa9d75582b7ce487ac564d1ff0675f6cb0c27d968e7d435b6a427818ac14e0cdd94b86af8f5d89661a93
 EBUILD playerctl-2.0.2.ebuild 893 BLAKE2B 4c7298c6c3bd2ea410d2806014a53ca5d116cef4d816d347629ae7a9626a7f39a3bd6b9f2968e4aa15d6f9d86c209c8867e27237a198693a7a9481e3850766cd SHA512 861dd884b243df3975481e2b45e995f8db602705b9ba2be1e01a121cd8bbd0304af39ffe28aa8a6d9651256121b24e9583fd26bc3429b616edc09e67ab75c1e7
 EBUILD playerctl-2.2.1.ebuild 1128 BLAKE2B 3edf328c12029aebf3e1777a3d66d679549f3a1a9014dc3583713d9202d33836cfc2f13de5c7947b97897d8bb0dbcef37542aded0e33624d5cddde8a9c9875e3 SHA512 b8802416fbe90360c78b69ee3e2e4697a1561a9c44d5278279de0a36b4f57fb3282bc5be18ac86d23ca7ade83025d7fcffac00b278f22a924431c4b1b2b1e67d
-EBUILD playerctl-2.3.1.ebuild 1205 BLAKE2B 857fe241b92a6648586928f99aeadad7a7ae2a52417a2706fdff0566c3d42f42ee9b7ad152cdba1827840bba3201ea5b3a4ec7db4ea330ca7412151d984b5836 SHA512 82b8d3e49152ee75b4e53f04c232bade35ba32458756d1a5cc0ee726d76cea3a1073289c4f0b20f411e2eb36f4e249a52beda9cd1ce24c7e6a22396886ee4e66
+EBUILD playerctl-2.3.1.ebuild 1202 BLAKE2B a6aa753d25f13e67f3c07ad2c84eb5a8cfca681fdf79b104697e775495fdcd79834a0f455bf9975713768e15b37c3d895468f897dc58dcb5cb6501f9fc1d7542 SHA512 d542fecca06ef234072c715be3ccca5771864eeb05112750ac30376e95655e4833d6fe1d44f060a4f556b853f1d27f7cfdc956f1179ac1a0f3639a8eba33b418
 MISC metadata.xml 343 BLAKE2B ef2d8052365e3c1907a5f191523ae0abd08d81fe0da46e4429192003a4a8560d7bbe45507b0fcbc1600241e89fa3fd64c84e4c208f501a0fd0be26175c2b0c97 SHA512 8719414c1c680915060a614b3fc30b462562b953c6b5fc227f6525a8870d59010ce0e7c5c5744031ff14d4c8514bb6f451ae697f1adfd1f617de490070ea2c38
diff --git a/media-sound/playerctl/playerctl-2.3.1.ebuild b/media-sound/playerctl/playerctl-2.3.1.ebuild
index 8641a7349d5c..46180922a565 100644
--- a/media-sound/playerctl/playerctl-2.3.1.ebuild
+++ b/media-sound/playerctl/playerctl-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/acrisci/playerctl"
 SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="doc introspection"
 RESTRICT="test" # Requires dbus-next python package that's not in the tree
 
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index f9bb7441c97a..4c9f4f71c535 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -4,6 +4,6 @@ AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
-EBUILD pulseaudio-13.0-r1.ebuild 11355 BLAKE2B e9c69cc1a5a41ecd9823ac1810b54baaf12688adf518b57a55ada96c6c711c253598217f1714cf45913cb3223db06945a48c31af5dadceddb8d601c2eb2a51b1 SHA512 1c43399841da40068a8b943ba3e024bb03de56174deeb07e3154c4ac815afaaaf16db0bc6c5fabea637ea7ef48be0974203dcfc78d1de6a87cc41a62fdadd9dc
-EBUILD pulseaudio-13.0.ebuild 11572 BLAKE2B 1cbf83260874c9af3f16942054fd3f6d49740c45efc917e1df0794bb5d7e39d69cec65eb56954dcf6e6f83c430f4bd65aef1ba07e94c5be8874c5179a082526c SHA512 98e9336312c8f9e2d6f0c715d22d3cfa193ffd6a8cf6e05da03756dfaf9be6aa05293f5554d4d923ad67d7eaeab9718343d156873db62997a97e1dec445de019
+EBUILD pulseaudio-13.0-r1.ebuild 11355 BLAKE2B 956d1444afef24dbc8b796e300d3cc8306dacea009a656c3b05ab00072faf6dd5465a0cfa28bff7b906ac180ac9e28036483e82de5e1d939068b70602482f84b SHA512 b881a2195abca5bcaa914188eaec1f8ac6b449a4001596a7c7c5b2087e8319d64d7ce0bb0d19d3865cbae3289486ad669a8259abd6d14d42d5705e571326d83d
+EBUILD pulseaudio-13.0.ebuild 11572 BLAKE2B ac733b5f99c2895692df59cf66c6835b4b586193470086652ff77952ac7292f9118e51df7e1ed1ffb10802033687184b34a15c3ce28fc5441b44372b2a9059dc SHA512 94497da344670a0d77109b6a85072ef3d379fdf52d9b6d08115bd44d041b6c807ddd36176369db49ea144e1ada5a2686b8599cd0b5afd0dd20f4386621268c04
 MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
index 265a1ec32060..3c5267c13a03 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd toolchain-funcs udev multilib-minimal
+inherit autotools bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd toolchain-funcs udev multilib-minimal tmpfiles
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
@@ -292,7 +292,7 @@ multilib_src_install_all() {
 		systemd_dounit "${FILESDIR}/${PN}.service"
 
 		# We need /var/run/pulse, bug #442852
-		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+		newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
 	else
 		# Prevent warnings when system-wide is not used, bug #447694
 		if use dbus ; then
diff --git a/media-sound/pulseaudio/pulseaudio-13.0.ebuild b/media-sound/pulseaudio/pulseaudio-13.0.ebuild
index 2e67499f79dd..7a2d34759f0e 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0.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=6
-inherit autotools bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd toolchain-funcs user udev multilib-minimal
+inherit autotools bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd toolchain-funcs user udev multilib-minimal tmpfiles
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
@@ -297,7 +297,7 @@ multilib_src_install_all() {
 		systemd_dounit "${FILESDIR}/${PN}.service"
 
 		# We need /var/run/pulse, bug #442852
-		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+		newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
 	else
 		# Prevent warnings when system-wide is not used, bug #447694
 		if use dbus ; then
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 9e90d6659543..dd61a74c313c 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -6,6 +6,6 @@ DIST pulseeffects-5.0.1.tar.gz 2032470 BLAKE2B 8422d4a9dc3f0b6218921389824eda9aa
 EBUILD pulseeffects-4.7.2-r2.ebuild 1905 BLAKE2B 61eaf56d327b9f99b1e337cbbb316e8c191ac6d316929a9ac4049985a421ecbdba229ccd61d773412be3f5eebdcb39fbe121f64e268a4aab0157ec61b9eaa669 SHA512 3fd3c448f9716f943e4c1f5a679f2a0b242e725ec2a8ee11efaa3d98e396d7e7d0bf9d0954eec0276d0df38f781230cafba3d7b34cd9272c6e0d0a67341c2a36
 EBUILD pulseeffects-4.8.4-r1.ebuild 1811 BLAKE2B 58e33cd0dfc818d9ec00fc9b9bb6a48b4eec41262a3904282d770a5d8ed4649a08d9103778e4ebfa6c90e890fe9159dacd0b44634d9024226bb807d63f990607 SHA512 9c7721f01c43a462d9a152423e247f76fe9fd0cffdbbabb4990cfb04436f62369fd490dcf5f41a7e0f2bea83015ebf01fda36303eae5caa8c43e8b2bb037e42d
 EBUILD pulseeffects-5.0.0-r1.ebuild 2132 BLAKE2B a02bde7457326d0dc5702cbcc497c59c966a405254406733cae0535424c4010a7e373ba276d4cee455ff57f6d27d602f0f0518ace3224a1bf24f54abb13c756e SHA512 3140a48ca65adbe8549fdda9750ec97cd34c40a8d1f12b2ac1e9d37a8cc7f751e01b0fccac4455995f932ef42395114ed16cbe37dd5b3c2b9688597d7d5e4b5e
-EBUILD pulseeffects-5.0.1.ebuild 2151 BLAKE2B 9b655d8fa40f30184513180043c3458f1698942060e0ba88467d9ce2348abe84c0347e00fb994880c5c702a2a1ed2d05db632d2cf7eda495bb17f9561f26a80e SHA512 bffa759bb8a224b8b4fd37498a879ddd5fb213b4458fd387732192a8e913f43c720791a88c94843a4e857427491b3eb9fffccf36011f03e266377acfc3e9f161
+EBUILD pulseeffects-5.0.1.ebuild 2156 BLAKE2B 64b331cc21021145fee479356978a95bff6de0e2935ec6802f36518c4ed66f7cc6385fde09e4f63b3da8766cbd7839bd96235e83851fdb29171db7cabdf7d27a SHA512 3d9eea5372e4da48e56256361c34ae24c65f2f11195a58fc73daabffc2a6e71c00a88e50fb1768fc135a43d61912c5e2c178398d3f6a6d3091ecf74769ce93ef
 EBUILD pulseeffects-9999.ebuild 2132 BLAKE2B a02bde7457326d0dc5702cbcc497c59c966a405254406733cae0535424c4010a7e373ba276d4cee455ff57f6d27d602f0f0518ace3224a1bf24f54abb13c756e SHA512 3140a48ca65adbe8549fdda9750ec97cd34c40a8d1f12b2ac1e9d37a8cc7f751e01b0fccac4455995f932ef42395114ed16cbe37dd5b3c2b9688597d7d5e4b5e
 MISC metadata.xml 839 BLAKE2B 9fd1b77bab1361a5c0fe3601b77e772c3a848ef2f347b6668ee2f33791b2ce0c9a6e31886896a4f1c9eb2dbceba28db997ef1d3f4e474cb1c83784850330a846 SHA512 5c15f3253e062813e3f52c5f9dc84bf25cf29e6cd79ec5f37561251b725f5c5f6a49e8e46b935291e08cf46db56258caf18ce2631d859b8f5c3aa7744bd1d5d1
diff --git a/media-sound/pulseeffects/pulseeffects-5.0.1.ebuild b/media-sound/pulseeffects/pulseeffects-5.0.1.ebuild
index 6d09c3207969..2e8da24b5479 100644
--- a/media-sound/pulseeffects/pulseeffects-5.0.1.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-5.0.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	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 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 2bc3ffa5b6de..3b32774b2f70 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,8 +1,6 @@
 AUX qjackctl-0.9.0-disable-git.patch 543 BLAKE2B b4ddd7f6d85b5c93a99f1b7d5a32062a8a45cee77964b151e2aa686ee43fec0afe88e5188eb17f367234872eb555eee3b3a68a0b342622c154ca2d4bf6b614ba SHA512 5e30ab78dae12707615e8db396bd180b958713feeb738f711ab19908a51126bd85ddf733e1be04eb3bac54535bcaff6a20f51706802eb5373c96ab67c6fe8795
 AUX qjackctl-0.9.1-disable-git.patch 543 BLAKE2B 818b22b94d1869ca59545463382f254458d7707b33a8150fe29f607ffca72f54d599ab00904bb05b10ef61a2b461ca9c94160b257dd679fb00b0ce872298d488 SHA512 d8c01bb983df5507676433c0262e03b33e43396f421ce37761927489bd6e350dc7ec3b8fce673108ea02d5b13d2b4317dc476c43bb4e1fac14af31a2867fd570
-DIST qjackctl-0.9.0.tar.gz 1088061 BLAKE2B 3be89091b6efb34d2dffee92fdfda5dabadc8b6e9f9a248cc5cd60df423482dc65342e9758a98f34c5c01bfba74eac64039e3ec2de157df0e03f8bf09a7a14fc SHA512 5aa6f3e86b6a5c528daa5fdb71b5400d5882fea6569d585a86bb6b9fa66b62699472fd82999a6f4eb1a375c70e684a20214240c1fc3b44239c22d182e3ae1b1c
 DIST qjackctl-0.9.1.tar.gz 1092787 BLAKE2B 1ae68d3b61591bb31f7c8c31f35f8a42f0048cf34c49ff0eadca9155c1a770d9880728582f6b7abdaf27a28ccb3d6a20ca87e3a6178b090579b6ead811f091f0 SHA512 7d3a6efdeedff9335897f9d943dd51d13bf7c48d55ee2bf31d53fe685cef88e281133c164cf6cdb95669b9fe394eb06d3544a78b9d760f4420a9acb3c800c612
-EBUILD qjackctl-0.9.0.ebuild 995 BLAKE2B f910da6191b27a80d6029907f39cf3314f8c48041f711c90371ea7c89948b740b71ea3da8fca973227e80f3f9c3e15da15a052d8ba8aa0362b254d57e55d85a0 SHA512 074d7812b57af254f640d693638eebb734eb585e6c1e7156d8b25ee79f037e4a231bde8d45fc58a27fc7f6da8163463c7886f860161733c6b9cef77fae080852
-EBUILD qjackctl-0.9.1.ebuild 971 BLAKE2B 04a7faf6c36d97efa75ec83ef3fee84b462267188ed5c6967ea950de891d78bfe5bbc1c5cf33715656b4e858cbac66b612443d64a0aa9d6e55262b2b81680a91 SHA512 1d2d18668e30da8e46964870361fc1df5cdbf6c3de98f129b536f32f7eb6f91d0d2e28f9aae57074b7be7e644579ee54ad813672c2183ba5e9059c1a3c102145
+EBUILD qjackctl-0.9.1.ebuild 969 BLAKE2B ea4a22964f1f02fd692be5e8ead07bc08b624a9d3605705df84090b8707fa9e602efea6c2216c8630ba51df8211d5aece717055ca1b7b2ca42bd1bac0e7452ab SHA512 8d1c56fb6f13cd30bfd54b05575c0467c3002bd38c852facbc7576c4d4fef7da41f6e08cc48a8a0261e6df31a928ce153e5731ca0a85a781f9517a2af1e0a0c9
 EBUILD qjackctl-9999.ebuild 920 BLAKE2B 33a4fb30c5fa508b6ff4a09c46d275b00b667fcbfcea612e02f1131e30afc0686515c5bbc29e8bc8bca114352d96f71c5ef086c64e31bf1a65958702f5df8b59 SHA512 a43bec74f96732cc57a86579662fb9ce524340fe3284a66a4c4c5c0e1333363a0eeadf7f04c77dbc16befb605ace0ece9e82e9c4a6fed185073adf3b3cfbc4cd
 MISC metadata.xml 337 BLAKE2B 3e5fbbef544d83a92cee554b5704a648f10e326495e2091875d269b362201d2baff179db87cb36b602c474bb8750b63883440f3af8a8e75c71f66043cc39fdb9 SHA512 63b453a4eb2ebea78d8b2ce9d8f9ec8db5706d7605bd5bc8c2259a1179925c2aa7fcae0a221118b39a03030d8bf2a5df772b59d35be9e3ae7d602dc068b3baa9
diff --git a/media-sound/qjackctl/qjackctl-0.9.0.ebuild b/media-sound/qjackctl/qjackctl-0.9.0.ebuild
deleted file mode 100644
index 13ebdc3b69bd..000000000000
--- a/media-sound/qjackctl/qjackctl-0.9.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="https://qjackctl.sourceforge.io/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa dbus debug portaudio"
-
-BDEPEND="dev-qt/linguist-tools:5"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	virtual/jack
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	portaudio? ( media-libs/portaudio )
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-disable-git.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_ALSA_SEQ=$(usex alsa 1 0)
-		-DCONFIG_DBUS=$(usex dbus 1 0)
-		-DCONFIG_DEBUG=$(usex debug 1 0)
-		-DCONFIG_PORTAUDIO=$(usex portaudio 1 0)
-		-DCONFIG_JACK_VERSION=1
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/qjackctl/qjackctl-0.9.1.ebuild b/media-sound/qjackctl/qjackctl-0.9.1.ebuild
index 2a7d2e5c22cd..fde4a1552331 100644
--- a/media-sound/qjackctl/qjackctl-0.9.1.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa dbus debug portaudio"
 
 BDEPEND="dev-qt/linguist-tools:5"
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index f9c3679422b5..be1b622424bc 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,8 +1,6 @@
 AUX qsampler-0.6.3-Makefile.patch 515 BLAKE2B b12882524ac5e0500a6c07804ed8b50ae085ac14873b723ca4ec2a71797da76711c5516ca0f6866994a1172d3f19ae671009d270be4429850e8bff0893044123 SHA512 0d49e0d178e638cddd69677c064368b5e6dc214c173286c3f6f82b1c469a875559bb25538ed8433d4e842d98418d344dc349ac454239983006b7cd4f195b1751
 AUX qsampler-0.9.1-cmake-no-git.patch 543 BLAKE2B db45bba7c2f5e7d3325340568a1163627dc909192bc7721436b34216cdc2672c1134f817367a8783810412e909c6934a45f730f7623787b6819a88cfacd5aa0d SHA512 e5e55ca07bf38627d45a7761027fb49dfb4736b59ad0ad5441bcf1c51fef3678ddb4a6974d6febd2e74fed90a6535d0f4dcd80b4b587b2087c3ec3d1ed18ae3e
-DIST qsampler-0.6.3.tar.gz 284613 BLAKE2B a4ef67014578b4eb7b6f6e7b5da94b04253a40bed0cc413acfde62f4660d2e1d3485d301637d1871e7f20dcdac34ea81511738a4455f8690f40460d7ea4db72b SHA512 55fe16d5cfe0245cfedb228d448235997160471343191cf204347bb13c260be747a06fce2344b36a60c5877f89b32b0f4ac4861ed8a3d555d4cc798f21f5e1ae
 DIST qsampler-0.9.1.tar.gz 283857 BLAKE2B 5d30c64edd4c1792d9e87453af45363ebdac6707ef6f804dc867b4eb23fdd657bbf554cd706ddcaa0c6bbe35deeaa1c8d1ff0f1e5af3cad005ebed94f43fed7d SHA512 5afda874b01ed576522898e04f9d264fccd589da292659eb9947786d3642c80d41629fd5d2268caa53f3ae0a96f0a1c84600a3651e8758d39d5c0220a9bba57d
-EBUILD qsampler-0.6.3.ebuild 999 BLAKE2B 3799e7cf4eb2c7695e532e3e2dbb8790a8715937d74108f4a83367d4a885d965e9f3b2f2beba21b0ca587ba6219f30022807b887a260666e461e22a2580eb03f SHA512 2818e544b0b51e87812f60d0bf02a6033faff016ef2e0ed6574dbc599786329b0fa5ad637def0b1cb1787ac8ee17a39e3c40398ed2e22a8580a9e72473702493
-EBUILD qsampler-0.9.1.ebuild 1143 BLAKE2B cfb8b164c0601860b65d8cf4eea8e92b59e2271c82e2efc408870d946985b880673f6e12891af7a6c8f9f7b567fc854dbc4778674a3b8e0230458ff841050fde SHA512 b166baf3141b9bcd92eb6b069fcf25501d60a84f97e0e70c7fce81d7104d370662fb5f35ae6666da258a2435fdd61b45b38a5cb3863ae64d585b1b867bffb80d
+EBUILD qsampler-0.9.1.ebuild 1142 BLAKE2B 300be269a1d3a1f7fe9de4f005f4e4ad5da41e389785e3ae4f7f9e37d28d4a8e86e87b63670e53b51b43121fc96dbbe8915b54fbff8d1e7187a2cf952894ae2e SHA512 6ec6ea3673602e1c02cc12fab0db591c12519a012503646205369df95ce37bcf5fc8d95cc210524da871f1e7a9a8be7e3c4268ef25f4d11322daeec0a6256d36
 EBUILD qsampler-9999.ebuild 1091 BLAKE2B 0e70c9b8c857bcffd4619e31f8610a4a6d7728ea06319cbf0d25fdf9e6ed7b6b9707f2fe61d73a3d04ea24ea567695137da8f62c0c908c6e1378c336bcb7523e SHA512 0afda6467ac557df22f6988d7150d6eca07e51f98848f7188b1fbcb78bb87c2e02bfad01f1e96a4961904f66ad1f950c20d8529c8882da7cdc9622325ac28220
 MISC metadata.xml 493 BLAKE2B 4df149f56c8c138f3a0037470860cc03040d482a75dfde7d27fa71526003c1fcfd42915cc822dc8d7de93aa73f034cb0c72e8882937770b7872d1db72ab6419d SHA512 1e64ef3cc6a1389548e5c88f676d68567f034cebcfbcdf14c369d5c73d914059fb2a8eff2f7e66b5700400b92560d042097ecf91b39712b8552f74fe1e75e6cd
diff --git a/media-sound/qsampler/qsampler-0.6.3.ebuild b/media-sound/qsampler/qsampler-0.6.3.ebuild
deleted file mode 100644
index 049457c6e582..000000000000
--- a/media-sound/qsampler/qsampler-0.6.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg
-
-DESCRIPTION="Graphical frontend to the LinuxSampler engine"
-HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="debug +libgig"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	>=media-libs/liblscp-0.5.6:=
-	x11-libs/libX11
-	libgig? ( >=media-libs/libgig-3.3.0:= )
-"
-RDEPEND="${DEPEND}
-	>=media-sound/linuxsampler-0.5
-"
-BDEPEND="dev-qt/linguist-tools:5"
-
-DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
-
-PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable libgig)
-	)
-	ac_qmake="$(qt5_get_bindir)/qmake" \
-		econf "${myeconfargs[@]}"
-
-	cd src || die
-	eqmake5 src.pro -o Makefile
-}
diff --git a/media-sound/qsampler/qsampler-0.9.1.ebuild b/media-sound/qsampler/qsampler-0.9.1.ebuild
index c515df058379..045fceca4bd1 100644
--- a/media-sound/qsampler/qsampler-0.9.1.ebuild
+++ b/media-sound/qsampler/qsampler-0.9.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Graphical frontend to the LinuxSampler engine"
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index c879a4148f74..7df24f3cc8bc 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,11 +1,5 @@
-AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
-AUX qsynth-0.9.0-cmake-no-git-version.patch 1328 BLAKE2B 32294aacf7e17696ab4e42e4de642fd47c3fbe0bef093fce9dbee9733ef1994d295c225fba82352885bae78baec2cd1180e5b6aa53aa3a1787d892dad2618221 SHA512 a6295a89bba8d1b5a770c8f7a6f0dc6346750ae0004f772b7d7e1afa6f014a3b9f2f6bbf8252d5109f67bc77ecb42353004934dc652fd27499b03079213f4627
 AUX qsynth-0.9.1-cmake-no-git-version.patch 579 BLAKE2B 561d4fab7495335a9853968820f71508fe0ce340d829a36b74845b76a06c35abb815d40756d080efe9fecf8e8bcd9dfa347dc524aa4af2ccbb892ebc678fc861 SHA512 843467c9c6d13970ae7494a700830860783e48f4e9cc0bd74522921dfc2358e76d2e1b35436e2d04381e9e00c00692357526f3a0fa25c4d9205cd85ce73e97fd
-DIST qsynth-0.6.3.tar.gz 382990 BLAKE2B 37565c86b077602cd681b92aaea20d4aa07db1c4cf51d391562b5226ddde70dad0a3f641f0fcf54f35c6bb1a9e487a779c22237b0c8087666b7a2c1dea8a511e SHA512 7320a355b5fbb347b04b46fdfe86c13ab18b264cff09f2ed133e2b065febac27e58bd709eea284b4d0f98034059647ad6e9b97638fdd75edb1524fd3cf9f07a2
-DIST qsynth-0.9.0.tar.gz 383118 BLAKE2B d9464a2f122d7281ff69171c431fff72d05886ec130d20aae8d8f122e1cefd1180b8bcdc157f324c5cdbc7e2c524c82a9cc7f481efc8b69912ce61912e73ed58 SHA512 5cc0e099cd05f3639ded81642bde80205c8921b65d22dcb32d40ac874107043edeb672e69d7e4734e0fd37a498be2e5b787f0b8c1707be45e39cfab616fd522c
 DIST qsynth-0.9.1.tar.gz 393897 BLAKE2B f63766614d821409cd12e418e36b8dbd739da8e2cd7deae91c2b00dd4f5ba2f447a3ca19c3829de3282e368baa37567333be051641221300d13dd7948d762008 SHA512 70bba332b90963d1c1da18fb3de8f05544fed3406c2144b6ed78cf93720cbcb684ff367d7ef4bc80be94ebea060b38753ae0cb183e85f96f127014c08de701b0
-EBUILD qsynth-0.6.3.ebuild 1356 BLAKE2B 2d396d07ec3843126aa2b5b71a052da811c8fa56629f45990b5b7e3fddbd6282595fce10e1df195964ff5576191fb63941608c50c28c6a611e0eb8a2001b2241 SHA512 17d3439d50c5352298faeb06c0065abb4c306372ebae87d933532c80b09fbe4a789109a7b776006f86319bf9012905c6ddc40303fba06e53cddceb82b7e6177f
-EBUILD qsynth-0.9.0.ebuild 1498 BLAKE2B 65b8adab715e5e13665cbc3c7a3f2007b809ccdd444a8c54707cf1a67b6aca3b181b2c016841a21cf9f178532026c635ed125bc9f86183d9f375510433d51bf1 SHA512 3a3dad1db15066763d3348e26e5ebe00384825c5e42e7729935cb3aee188d9f0affbd96ba7f60b0b86885bf733a8b82660f8d917660c2740b80618496114cb98
-EBUILD qsynth-0.9.1.ebuild 1408 BLAKE2B bbf4bc4e8a0e548846a03c0347ff90421512fc8a3e8f9c029110db4480138b02b89be42860a023efa96e97df33bea41a7f87f5c271ab0ce8f2e8ab218e5ba60a SHA512 a702265c3ab735a706fe0ceb09a39af1b0243fe20c5ea6b640a58673007e2cd6666c8825e342414ec7225d7e3ad13104b82ac7b78b910e18cc1ec81c08c3243a
+EBUILD qsynth-0.9.1.ebuild 1404 BLAKE2B de7309360b92eb8003cd2f875acdf499a9d03e0f89f6761443fc23ad0a0ce9f04d05d70f4813c46be61703e795a8c1c3b7ee435e8d644d6f2e0a72ac9fb9aaef SHA512 b86b7c6e5411ed28ce4795a37df8111d289c27ad2cf0fbcce2de54f6fd6fbd709b1a4e47eaed4be1ed9e466649c72fe730df1ee437f7b75ad6b0a76389666329
 EBUILD qsynth-9999.ebuild 1349 BLAKE2B 618267f9db7c94ad2defb4f0f3893cd4844270c3e9e9448c22738fb203f0e41cd83c47ed88354abf4fa215029953f2500c00b01193454ee2d29ced2ae8ff97bc SHA512 ba6afe5ac54f37fd1d4531b8971dc6272b8fb053209380953e0dfb494a91ed3c3783d3d681959a96d31d4f2aecf1b96c42c500707b48b45b3f8e765577354156
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/files/qsynth-0.4.0-qt5-tagging.patch b/media-sound/qsynth/files/qsynth-0.4.0-qt5-tagging.patch
deleted file mode 100644
index 6b164924aca9..000000000000
--- a/media-sound/qsynth/files/qsynth-0.4.0-qt5-tagging.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru qsynth-0.4.0/configure qsynth-0.4.0-modified/configure
---- qsynth-0.4.0/configure	2015-09-07 16:59:25.083842955 +0200
-+++ qsynth-0.4.0-modified/configure	2016-01-12 15:57:36.673008368 +0100
-@@ -4159,6 +4159,7 @@
- 
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-+#define QT_NO_VERSION_TAGGING
- #include "QtCore/qglobal.h"
- int
- main ()
diff --git a/media-sound/qsynth/files/qsynth-0.9.0-cmake-no-git-version.patch b/media-sound/qsynth/files/qsynth-0.9.0-cmake-no-git-version.patch
deleted file mode 100644
index 11091ba11660..000000000000
--- a/media-sound/qsynth/files/qsynth-0.9.0-cmake-no-git-version.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7ddf562dfc92174f47e3da95a1e18e5b1af83bfc Mon Sep 17 00:00:00 2001
-From: Christoph Karl <pampelmuse@gmx.at>
-Date: Dec 31 2020 15:42:42 +0000
-Subject: Fix version number in about dialog
-
-
----
-
-diff -rupN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt     2020-12-31 16:31:19.395906813 +0100
-+++ b/CMakeLists.txt 2020-12-31 16:37:42.293523588 +0100
-@@ -5,25 +5,6 @@ cmake_minimum_required(VERSION 3.1)
- set (VERSION "0.9.0")
- 
- set (CONFIG_VERSION ${VERSION})
--execute_process (
--  COMMAND git describe --tags --dirty --abbrev=6
--  OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
--  RESULT_VARIABLE GIT_DESCRIBE_RESULT
--  OUTPUT_STRIP_TRAILING_WHITESPACE)
--if (GIT_DESCRIBE_RESULT EQUAL 0)
--  set (VERSION "${GIT_DESCRIBE_OUTPUT}")
--  string (REGEX REPLACE "^[^0-9]+" "" VERSION "${VERSION}")
--  string (REGEX REPLACE "-g"   "git." VERSION "${VERSION}")
--  string (REGEX REPLACE "[_|-]+"  "." VERSION "${VERSION}")
--  execute_process (
--    COMMAND git rev-parse --abbrev-ref HEAD
--    OUTPUT_VARIABLE GIT_REVPARSE_OUTPUT
--    RESULT_VARIABLE GIT_REVPARSE_RESULT
--    OUTPUT_STRIP_TRAILING_WHITESPACE)
--  if (GIT_REVPARSE_RESULT EQUAL 0 AND NOT GIT_REVPARSE_OUTPUT STREQUAL "master")
--    set (VERSION "${VERSION} [${GIT_REVPARSE_OUTPUT}]")
--  endif ()
--endif ()
- 
- set (PACKAGE_NAME "Qsynth")
- set (PACKAGE_VERSION "${VERSION}")
diff --git a/media-sound/qsynth/qsynth-0.6.3.ebuild b/media-sound/qsynth/qsynth-0.6.3.ebuild
deleted file mode 100644
index 2e469dea3b30..000000000000
--- a/media-sound/qsynth/qsynth-0.6.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg-utils
-
-DESCRIPTION="Qt application to control FluidSynth"
-HOMEPAGE="https://qsynth.sourceforge.io/"
-SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa debug jack pulseaudio"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
-
-src_configure() {
-	sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die
-	econf \
-		$(use_enable debug)
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${D}/usr/share/applications/qsynth.desktop" || die
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/qsynth/qsynth-0.9.0.ebuild b/media-sound/qsynth/qsynth-0.9.0.ebuild
deleted file mode 100644
index 70d95bac46aa..000000000000
--- a/media-sound/qsynth/qsynth-0.9.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop qmake-utils xdg-utils
-
-DESCRIPTION="Qt application to control FluidSynth"
-HOMEPAGE="https://qsynth.sourceforge.io/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"
-	inherit git-r3
-else
-	SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa debug jack pulseaudio"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-cmake-no-git-version.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_DEBUG=$(usex debug 1 0)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${D}/usr/share/applications/qsynth.desktop" || die
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/qsynth/qsynth-0.9.1.ebuild b/media-sound/qsynth/qsynth-0.9.1.ebuild
index dac583b64db9..9c902ccb2db4 100644
--- a/media-sound/qsynth/qsynth-0.9.1.ebuild
+++ b/media-sound/qsynth/qsynth-0.9.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/sndfile-tools/Manifest b/media-sound/sndfile-tools/Manifest
index dcbee962f2b3..e1b5a75147e2 100644
--- a/media-sound/sndfile-tools/Manifest
+++ b/media-sound/sndfile-tools/Manifest
@@ -1,6 +1,4 @@
-DIST sndfile-tools-1.04a.tar.bz2 715692 BLAKE2B e65a222bfdd96803293f006c2c5704fd1037d81524559d86c8e3812b91bd90fa0b47d1f589adb303f68e1ffdbebfd8b4ec616c9f1d897ad993768981c83022e3 SHA512 b93fd74386960c986031fd1652335bc34243bd785ccf31480b82f4d76ef86760ca53173aace273a635db70db46c0c1c4066328aef9c21c01c6e76346dbe56390
 DIST sndfile-tools-1.5.tar.bz2 555122 BLAKE2B c273bb655163816dcad81f15b089fa36a227a73b3b331d51bc16f91025afdca4a994b5d3838c5cf61335b5f900e8da3a299f9dd9cf8e34d2c9b2c21987625809 SHA512 04926a6c489634762efaa787e468ab653990762d5b96ba3cdfca595102c1d5eeb86411c9010d5640b1b3ec2b38d8d9d434fb549c52446e4b88d5b2a1d06a2bc6
-EBUILD sndfile-tools-1.04-r1.ebuild 814 BLAKE2B 7bc18f59b0cedaee69f0f7112174f99ae2ac05a8f9633f86f255b920ec31744f4dd7eeaebc3c57af27d2db6e802ff9c4686726db1eb65fe6d53467baa1b67d55 SHA512 4476acf6d5a8cec31fdc033c795b354d1c77e25c4622032188490c3065212a81e35cddb0893656167cbda5ed241cbce7e0259b4c0614968f4485ea6d6baf02fb
 EBUILD sndfile-tools-1.5.ebuild 826 BLAKE2B 1151db8924698735b1d681b7c173c765e38691b8de92f36ce7eba15d5e1a31ee23f58413eebfae3c9417305478b14ad8996d95b103b53ae285c8409b7643947a SHA512 88ee9d0ebe584ceb1f0c125ff617b61db43ad016b66afee173a91f6f95b02f181adb0e9554d3aebd113c259bdb763c8d264c712c3e07e68652abf48c89ec2d66
 EBUILD sndfile-tools-9999.ebuild 826 BLAKE2B 1151db8924698735b1d681b7c173c765e38691b8de92f36ce7eba15d5e1a31ee23f58413eebfae3c9417305478b14ad8996d95b103b53ae285c8409b7643947a SHA512 88ee9d0ebe584ceb1f0c125ff617b61db43ad016b66afee173a91f6f95b02f181adb0e9554d3aebd113c259bdb763c8d264c712c3e07e68652abf48c89ec2d66
 MISC metadata.xml 572 BLAKE2B 473449aba53817e0599e9135148ddf893d438fba7bac2325c923a180c3ef10fb63de920af5e1201117d1130647455e7f57f6e131cffd0ac9d5b82e6750ff014c SHA512 9d91c621d44f3a3bb70ac84f026d746db918ce6ba0c4b6b9b7e2c85811e10f4c7936cbb15368ae1d38bed6a593115ec7a63f6966aae30cc88140c6edf3527ec2
diff --git a/media-sound/sndfile-tools/sndfile-tools-1.04-r1.ebuild b/media-sound/sndfile-tools/sndfile-tools-1.04-r1.ebuild
deleted file mode 100644
index 946196cd2f67..000000000000
--- a/media-sound/sndfile-tools/sndfile-tools-1.04-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Small collection of programs that use libsndfile"
-HOMEPAGE="http://www.mega-nerd.com/libsndfile/tools/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/erikd/sndfile-tools.git"
-else
-	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.bz2 -> ${P}a.tar.bz2"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="jack"
-
-DEPEND="
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	x11-libs/cairo
-	sci-libs/fftw:3.0=
-	jack? ( virtual/jack )
-"
-RDEPEND="${DEPEND}
-	!<media-libs/libsamplerate-0.1.9-r1
-"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable jack)
-}
diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index 36279ac66dd5..f638783baa16 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -1,7 +1,5 @@
 AUX upmpdcli.confd 26 BLAKE2B 840eb6e9353266f3669c00dda2a317a6146780180ff0998641dd258806b8dce0a1c49caca570c2ce1fac97e0bf3a347536c147f1a38092ae745bddd728128a01 SHA512 3dd82c12d66aac4be69a98cf25098fdb9c377c4ad0559d07f99cfb4599b6454a6880486053091d55e30b45ac8d877cfa544b1f3dc617d11c32c058767ae6a64f
 AUX upmpdcli.initd 387 BLAKE2B 1cf2ab80c9447041b2b1d1a921c164a6c0436204909c4857db798ed9930d3c1f6e5957a4382cfa884e9fa296ac8d72cc5e3d4d8025234251b665fb5d85efc12f SHA512 fcbefe70aecd05f4fea6427734933344cd1f537fd187c14f05d809f8cf8bb720241aeddc526e9c5497f76e5e7cdcf14798a160b4e4303d1482b53b646dd2b03f
-DIST upmpdcli-1.5.5.tar.gz 550726 BLAKE2B 1a32f5a3126e037f6663ab60244d7af3fd7aeb79c5878ba1ca4d8029b97917a70f5b06a82e6006fcf14642b96cb5539488b3bba03860a2dd23e6bce0efe54bdc SHA512 90ce69b4ef004e1b5db3229b3bc99637ecba0f5f7e82d0e9f567da163295b4a572d059accbeb679194d1846eb822d48378acc743ee334ffd9859f3e025f6a0f3
 DIST upmpdcli-1.5.7.tar.gz 552203 BLAKE2B fe8e8aa3f4c777925dce2a143aec201462cb2da9e33f604d48848f27acc51fad42e1c626c17b5325918f0d1de1b37c1c456240f811af118b83bc7ce3260e0687 SHA512 ce86b8f9b4e7614433ab542facbf7452426b66bf026bb21ea0e868cde9b492b09a86ee8aa259a9353f2ede6a22d1055987986747aa8e284714c5e60f73a3a55a
-EBUILD upmpdcli-1.5.5.ebuild 1266 BLAKE2B 8e943647e08b7513f9f836a4d8b39a12719722b1480a4ee431c037b424e0b972c6163d99cd7ceafce40adc51d119a2a4988ae6375634766aafaffea5562a40fd SHA512 1357b27d8910b1875da2b1b5957d7b6a5dd1d01b0a8c7444ff12759d96735ebe10963213ce25451da82ccc6a854eec9397ccea70f230b037cf304eecc220a49b
-EBUILD upmpdcli-1.5.7.ebuild 1268 BLAKE2B 9caeb9ba3faef04081a3177d35c651c4e72d083761d001761bd9f9e14a884a42e0edc19cfb6feaa663c9252caa3bce3d57518576bcbddfe2492f67e8606e2643 SHA512 7ef64f8f02d8601877ec933808fca11ce0b12b77fd28c57eba98842d5b2fb35c43c3d885a095a652b6337671c64ec31b124dd7391efd98d2dabe5d8a9a435b45
+EBUILD upmpdcli-1.5.7.ebuild 1266 BLAKE2B 8e943647e08b7513f9f836a4d8b39a12719722b1480a4ee431c037b424e0b972c6163d99cd7ceafce40adc51d119a2a4988ae6375634766aafaffea5562a40fd SHA512 1357b27d8910b1875da2b1b5957d7b6a5dd1d01b0a8c7444ff12759d96735ebe10963213ce25451da82ccc6a854eec9397ccea70f230b037cf304eecc220a49b
 MISC metadata.xml 323 BLAKE2B 3b9aa1c98130517f1e0d458e9e007330fea3b695192f11a02edb51c2845358353367bcc421a70965abed3996450afdac11d80dd7e54e6b115cbb3c0940830106 SHA512 1f004f9123b7924186183899cdd55ae2fb75a61ab59cd01ac077627a18d28c934716a31f1070e5cd1a2ab6faafd9994079bad87178c6e744093cfcd7d6a7673b
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.5.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.5.ebuild
deleted file mode 100644
index 32fbe2a26ccc..000000000000
--- a/media-sound/upmpdcli/upmpdcli-1.5.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
-LICENSE="GPL-2"
-
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="thirdparty"
-
-DEPEND="
-	dev-libs/jsoncpp
-	media-libs/libmpdclient
-	net-libs/libmicrohttpd
-	>=net-libs/libupnpp-0.20.0-r1
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/upmpdcli
-	acct-user/upmpdcli
-	app-misc/recoll
-	thirdparty? ( dev-python/requests )
-"
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit systemd/upmpdcli.service
-}
-
-pkg_postinst() {
-	einfo
-	einfo "This package no longer assumes that upmpdcli is driving an"
-	einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)."
-	einfo "Probably it is though, so be sure your mpd is built with"
-	einfo "USE=curl."
-	einfo
-	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
-	einfo "detects sc2mpd at run-time, capabilities are added"
-	einfo "including internet radio support.  See upstream docs"
-	einfo "for more information."
-}
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.7.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.7.ebuild
index 90bdff1ab338..32fbe2a26ccc 100644
--- a/media-sound/upmpdcli/upmpdcli-1.5.7.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.5.7.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="thirdparty"
 
 DEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-12 21:55:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-12 21:55:15 +0000
commit	7218e1b46bceac05841e90472501742d905fb3fc (patch)
tree	56fae051db521b8fce8014cbc8b11484885b14b3 /media-sound
parent	6d691ad5b6239929063441bbd14c489e92e7396e (diff)