gentoo resync : 03.07.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-07-03 22:39:47 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-07-03 22:39:47 +0100
commit: 7f0ccc917c7abe6223784c703d86cd14755691fb (patch)
tree: 8c6793f68896b341e22f33d7e6cef88e481f4a8b /media-sound
parent: 9aa80713372911cec499b3adb2cd746790920916 (diff)
52 files changed, 610 insertions, 394 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index bf0ce29c9f63..779753b2ad82 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/a2jmidid/Manifest b/media-sound/a2jmidid/Manifest
index 031766a2947e..ff683c1fb8a1 100644
--- a/media-sound/a2jmidid/Manifest
+++ b/media-sound/a2jmidid/Manifest
@@ -1,4 +1,4 @@
 DIST a2jmidid-9.tar.gz 47925 BLAKE2B ad079e76a54f56ee8f82150c306f91aead52f86632978ea6f3376a0bf163744379210b34701b39da4ee14fc4d8a1c6be82d1052abeb8ccf79410bc242d174d62 SHA512 5bd13b6904ed68c5bfe40ca516fd49b7eb4d4a946b9908ee04687265848734c8e1a81579f0f1a5bd0752595be8858dc748da10487b7f366394c09a5ffc7d5e5c
-EBUILD a2jmidid-9.ebuild 726 BLAKE2B 8df6a6897e2e92626e2b23f9ae76012b4830857dbd48f2612acb90abbeb665cb0dc7ef5c8c8d02d7b3a602f732d94d3cca2a14028ab0453463037e87e1efd03b SHA512 3a27404d187163998bd58840ec30937054e912f0a02c5b512e704787fd30a7368d40ae00dac5a06182363d21e0943e3db74629bd8252962ec02b23c501109062
-EBUILD a2jmidid-9999.ebuild 696 BLAKE2B dd6e045e6c9e3de4077fc5b460d327b690e144e5d34690bccb8371b87ba82ae76cc5801eb9198e9881c3c1d6f3e1a640fc29f6755b029c503cdf21b955ae51c1 SHA512 3a8bb0cf20126b77dca5accc82540e43e5bc5e4a4c930e7b7efe48bba59b7cc92664ad468ceb3c8bf0afd0851098819da6c7ca6a6cdb8a813f3da7cc413fdc03
+EBUILD a2jmidid-9.ebuild 1030 BLAKE2B 19ef7a61136e4d6551e0eff8e9263529ca4d6428bafdda5e2dd8756fe3c08f278211ae5317ae85168fc848d427b8b53bf991139dd520199dece99f9f4a00854b SHA512 a7ae1e32129f5605c79aab5b614b7607dc9ee85fa0a2ec7ac37810769729761245e0b0d034cf248ee74c9212364ab6ffe9e9b29b4277681352d9f72d2d01bfaf
+EBUILD a2jmidid-9999.ebuild 1000 BLAKE2B 822efe0aab56a66ea32d32fa562359941bf6d94b43001e5ed128a17c9742964b9caaff37bbafc726aaf9d8c0cdc6b4d1a026bcd720aea42f60bdf4e165e6e75c SHA512 a9b52f3c48dd4448819beb8b348125620006f0f99c948211c9db48f43206a23e3feef52e8eb7984182dc4901daf75550bf2892452c0f9e130e9c39990cb1c6c1
 MISC metadata.xml 369 BLAKE2B bd88b29130a3c698de0abb7984ebcc130c84c55de1e53c69a74279874a350d10651d9a312dfcc76de17e64e5af43f79b31a663247430cbc60ee87def0845fcd9 SHA512 7d8b83bedfbc2cf55cbab1475e7e04c835ef5a49e7500de000a032cc256551a26a73aa6a3a3989dabd4e7f69a4d4a1ac4bbd2d806d5b3d22cdb230793ff91096
diff --git a/media-sound/a2jmidid/a2jmidid-9.ebuild b/media-sound/a2jmidid/a2jmidid-9.ebuild
index 62228ef8c0d6..1d5c181d312a 100644
--- a/media-sound/a2jmidid/a2jmidid-9.ebuild
+++ b/media-sound/a2jmidid/a2jmidid-9.ebuild
@@ -1,9 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit meson
+PYTHON_COMPAT=( python3_{6..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit meson python-single-r1
 
 DESCRIPTION="Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"
 HOMEPAGE="https://github.com/linuxaudio/a2jmidid"
@@ -12,7 +15,8 @@ SRC_URI="https://github.com/linuxaudio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
-IUSE="dbus"
+IUSE="dbus python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="
 	virtual/pkgconfig
@@ -21,6 +25,7 @@ CDEPEND="
 	media-libs/alsa-lib
 	virtual/jack
 	dbus? ( sys-apps/dbus )
+	python? ( ${PYTHON_DEPS} )
 "
 RDEPEND="${CDEPEND}"
 DEPEND="${RDEPEND}"
@@ -34,3 +39,13 @@ src_configure() {
 
 	meson_src_configure
 }
+
+src_install() {
+	meson_src_install
+
+	if use python; then
+		python_fix_shebang "${ED}"
+	else
+		rm "${ED}/usr/bin/a2j_control" || die
+	fi
+}
diff --git a/media-sound/a2jmidid/a2jmidid-9999.ebuild b/media-sound/a2jmidid/a2jmidid-9999.ebuild
index 7609deb0eba6..eeb15605c52f 100644
--- a/media-sound/a2jmidid/a2jmidid-9999.ebuild
+++ b/media-sound/a2jmidid/a2jmidid-9999.ebuild
@@ -1,9 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit meson git-r3
+PYTHON_COMPAT=( python3_{6..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit meson python-single-r1 git-r3
 
 DESCRIPTION="Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"
 HOMEPAGE="https://github.com/linuxaudio/a2jmidid"
@@ -12,7 +15,8 @@ EGIT_REPO_URI="https://github.com/linuxaudio/a2jmidid.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="dbus"
+IUSE="dbus python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="
 	virtual/pkgconfig
@@ -21,6 +25,7 @@ CDEPEND="
 	media-libs/alsa-lib
 	virtual/jack
 	dbus? ( sys-apps/dbus )
+	python? ( ${PYTHON_DEPS} )
 "
 RDEPEND="${CDEPEND}"
 DEPEND="${RDEPEND}"
@@ -34,3 +39,13 @@ src_configure() {
 
 	meson_src_configure
 }
+
+src_install() {
+	meson_src_install
+
+	if use python; then
+		python_fix_shebang "${ED}"
+	else
+		rm "${ED}/usr/bin/a2j_control" || die
+	fi
+}
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index d2128678fac2..2480e5c5569e 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,11 +1,5 @@
-AUX abcmidi-2016.05.05-docs.patch 614 BLAKE2B f9071f832d49d8dcb679843c5724c3a554df5f8f1ac6b545be637c2db6a37096b26c5b80f0b366d4e66f33230431de3b50b1198e2b9fe939e5231321ee1aeb27 SHA512 c06436cab7dbc4eb4bf8595e561402428bd1d45be653fa652841c3378e4b78f246ae5c862addf7bffbcb21d994f11151d464837f20915e91eef31d4f66618213
-AUX abcmidi-2016.05.05-fno-common.patch 745 BLAKE2B 8e6cb17df225b21261e42abda4f8073c4493ea41eaf833fcf2f4616a6a828afc03e116de6c1807ee2436c9f385bf39527406e93c628b07dda2c16b3f5d51a0be SHA512 33c72c178812f527b7c2ce27635368a8f6531369025d36ab4d760f8ee19391027029de0b3d8698454b5eb35a1227b5d6efc1602fc5d5b6f58967ecf89579aada
-DIST abcMIDI-2020.01.22.zip 569060 BLAKE2B 078ba04a614c253266a5239b5b3f133e94c1d44e2cf91c65195f85229892cd4b8d05527124741477decb8eae83d38777b27bf1135e4ad96779c0c6b68bb46747 SHA512 5897e1344ef8e88f7ae81622c18bc8144fb95e928482c8f63cd897397ce5a5d2a5f7e5a8f13a62c6f40387f875d2f3827e74dc703ccc3c9dd81cfff018efb1de
-DIST abcMIDI-2020.06.07.zip 571242 BLAKE2B 94a54ca3eb5110f74e3cb6ce3cba16e65230a202c5e33d735a3d98f2dc7fe03c997819acd065e08eaed5ad2e6f8882159ae21b2984673508c9a0842425ef5820 SHA512 d363d7148c2bd29b300f03ff70a3a4f75110d7416efe29d605f89d02c8922f227ab2dbb78a6f55fab530779af323b49a3824f609cb4e03ff6dfa4d15e3cf7969
 DIST abcMIDI-2021.05.25.zip 604797 BLAKE2B 78b2d43bb7569aa2eece63f319352aa71b77e9c5219c5f806384f007ffe026741a0852ffffe1e6b6c15b60f69f54e143cb26aa47b54baca41bc2fc231fa5b66a SHA512 57975f7c131855a713fc399c7aa1c7bd94775e7a257f2412d321aa51d0bf95cf9e1410e0819d2ad5cabde9ef996512ccca16058f7267baabc5702a926c173b3f
 DIST abcMIDI-2021.06.27.zip 605658 BLAKE2B b522c96b7f8990f297cc13a3334872763fb2879f5893f09e630d66ab425d1772e0eee64273249d26e8118c6d341dad84129e140d8c309adab160f3120b5a18a2 SHA512 b1e4a7a9b93e6633abe211258995cfa84bb8eaed3870ed20e244aa12353c6cc351ea7e1c842e4e410dad9dd91b2e8c918826138bec39503c56e95062f4a99f37
-EBUILD abcmidi-2020.01.22.ebuild 836 BLAKE2B 40f9d16d5c10a2897d1395ca2334e8ec58ea32a8e126ce5bf9e570c3e0fe8a5081737e3c83d71d522abaae6e7b7eaa2a3a3c875690e62e8bf88cc9351af9d4e6 SHA512 a64b2ce08d7968f332b9d617274ff0c08af97f554f375808608baa7c7687ff8a1ffcf1f4e264fa55346863aa853955e652f9243c5aca4536360bbea7068ae892
-EBUILD abcmidi-2020.06.07.ebuild 678 BLAKE2B d93bc531703f192645a2ad0dcb2609079e2582413c0091d7b2159689add101121039dc83e730573c75e108bb9d70633a020a9db1c0de4bbe7c541bf1895a68d2 SHA512 7139e646e3b903d6636ac931e12e59b9b09f22e88c456465ba6288a4091bf957f1c46fd2126d6cbc079b342c9021685e82a8bc6054b8b7683e6f743065a0c1ba
-EBUILD abcmidi-2021.05.25.ebuild 678 BLAKE2B d93bc531703f192645a2ad0dcb2609079e2582413c0091d7b2159689add101121039dc83e730573c75e108bb9d70633a020a9db1c0de4bbe7c541bf1895a68d2 SHA512 7139e646e3b903d6636ac931e12e59b9b09f22e88c456465ba6288a4091bf957f1c46fd2126d6cbc079b342c9021685e82a8bc6054b8b7683e6f743065a0c1ba
+EBUILD abcmidi-2021.05.25.ebuild 676 BLAKE2B 916e0595b5c1cbf9dad1ba1c9fd7fdba8010898e12ebbc95ef02bcc725cb22a44e8608bf07ec3dd253128aafa3af728ae3709bb9a8bef786b3e6124cd32ae7c5 SHA512 3f000a5a47de4dcc3da9279dee49e962f526833ec4f85dd7f2d749d54b4c08057a99b53deef3c978f7dd1840ffd96b97d3db875d7bf559e27e18042eb8dc8bc6
 EBUILD abcmidi-2021.06.27.ebuild 678 BLAKE2B d93bc531703f192645a2ad0dcb2609079e2582413c0091d7b2159689add101121039dc83e730573c75e108bb9d70633a020a9db1c0de4bbe7c541bf1895a68d2 SHA512 7139e646e3b903d6636ac931e12e59b9b09f22e88c456465ba6288a4091bf957f1c46fd2126d6cbc079b342c9021685e82a8bc6054b8b7683e6f743065a0c1ba
 MISC metadata.xml 326 BLAKE2B eff21376d5e8fdf74ead04fc307726b50c8d86faaaebdbb8aa748c9fc0025ed9ccbdbf90f6bbafb515d576cd837f72f44991b329eb56f003cfbe3b0ee9cac7d5 SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a
diff --git a/media-sound/abcmidi/abcmidi-2020.01.22.ebuild b/media-sound/abcmidi/abcmidi-2020.01.22.ebuild
deleted file mode 100644
index 893a32ea9da0..000000000000
--- a/media-sound/abcmidi/abcmidi-2020.01.22.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="abcMIDI-${PV}"
-
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
-SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2016.05.05-docs.patch
-	"${FILESDIR}"/${PN}-2016.05.05-fno-common.patch
-)
-
-src_prepare() {
-	default
-
-	rm configure Makefile || die
-	sed -i "s:-O2::" configure.ac || die
-
-	eautoreconf
-}
-
-src_install() {
-	default
-	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
-
-	docinto examples
-	dodoc samples/*.abc
-	docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/media-sound/abcmidi/abcmidi-2020.06.07.ebuild b/media-sound/abcmidi/abcmidi-2020.06.07.ebuild
deleted file mode 100644
index 10c98f2d31f4..000000000000
--- a/media-sound/abcmidi/abcmidi-2020.06.07.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="abcMIDI-${PV}"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
-SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
-S="${WORKDIR}"/${PN}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-BDEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	sed -i "s:-O2::" configure.ac || die
-	sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.abc
-	fi
-}
diff --git a/media-sound/abcmidi/abcmidi-2021.05.25.ebuild b/media-sound/abcmidi/abcmidi-2021.05.25.ebuild
index 10c98f2d31f4..0245e20b7e80 100644
--- a/media-sound/abcmidi/abcmidi-2021.05.25.ebuild
+++ b/media-sound/abcmidi/abcmidi-2021.05.25.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-sound/abcmidi/files/abcmidi-2016.05.05-docs.patch b/media-sound/abcmidi/files/abcmidi-2016.05.05-docs.patch
deleted file mode 100644
index bc36b260bd34..000000000000
--- a/media-sound/abcmidi/files/abcmidi-2016.05.05-docs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Install docs via Gentoo mechanisms instead of the build system.
-
---- abcmidi/Makefile.in
-+++ abcmidi/Makefile.in
-@@ -143,13 +143,6 @@
- 	$(INSTALL) -d $(DESTDIR)$(bindir)
- 	$(INSTALL) -m 755 ${binaries} $(DESTDIR)$(bindir)
- 
--	# install documentation
--	$(INSTALL) -d $(DESTDIR)${docdir}
--	$(INSTALL)  -m 644 doc/*.txt $(DESTDIR)$(docdir)
--	$(INSTALL)  -m 644 doc/AUTHORS $(DESTDIR)$(docdir)
--	$(INSTALL)  -m 644 doc/CHANGES $(DESTDIR)$(docdir)
--	$(INSTALL)  -m 644 VERSION $(DESTDIR)$(docdir)
--
- 	# install manpages
- 	$(INSTALL)  -d $(DESTDIR)${mandir}
- 	$(INSTALL)  -m 644 doc/*.1 $(DESTDIR)$(mandir)
diff --git a/media-sound/abcmidi/files/abcmidi-2016.05.05-fno-common.patch b/media-sound/abcmidi/files/abcmidi-2016.05.05-fno-common.patch
deleted file mode 100644
index e8ed8bec37ee..000000000000
--- a/media-sound/abcmidi/files/abcmidi-2016.05.05-fno-common.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drawtune.c
-+++ b/drawtune.c
-@@ -75,7 +75,8 @@
- int rootstem;
- int fontsize, fontnum;
- int donemeter;
--int ingrace, inchord;
-+extern int ingrace;
-+int inchord;
- int chordcount;
- struct feature* chordhead;
- 
---- a/toabc.c
-+++ b/toabc.c
-@@ -85,7 +85,7 @@
- int new_key_number;  /* used for gchord transposition */
- int oldtable[7], newtable[7]; /* for handling transposition */
- int inchord; /* are we in a chord [ ] ? */
--int ingrace; /* are we in a grace note set { } ? */
-+extern int ingrace; /* are we in a grace note set { } ? */
- int chordcount; /* number of notes or rests in current chord */
- int inlinefield; /* boolean - are we in [<field>: ] ? */
- int cleanup; /* boolean to indicate -u option (update notation) */
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index dcb4a17e28bf..08ba88eb7a52 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -9,5 +9,5 @@ DIST alsa-utils-1.2.5.1.tar.bz2 1326965 BLAKE2B 79f96fd3ba1d92e72dc634dc01439acd
 DIST alsa-utils-1.2.5.tar.bz2 1326676 BLAKE2B 52cbe978390e1b5600bf7422e67ece1d24a946d99acddbc059bf6eb3a0b8dfe37cc573167013296e923bf1597973eb55b2580eaf849e088822ba7b2afc14279f SHA512 0e319e553c9c209a46f5c83c50007bd82acf1c9cf78649978b3ab6fbb4349f51c1c7c6a975a8c24d25ba07ad5325e74d2c34dc5c89180998a0f63d1326fde8b1
 EBUILD alsa-utils-1.2.4.ebuild 2348 BLAKE2B 0b51fb69c74f99f97c623fd16bed5cbe310aa16a3e1801206b2fb4ee1b66aaa67e9cfa5fd23457b700adc2eb7d337f429007ab9166db0a63f39a8916baf99d37 SHA512 ab75b6e5a55e3488bc436d293354edbd6f135047be7871123ab408f0fabdbd46bb0e0c60594e55bec69b914bb26d1805a7174e1891c530dc63a7a8f04a4eb0d8
 EBUILD alsa-utils-1.2.5-r1.ebuild 2513 BLAKE2B 8ed803654a0a5918ae83774e65f07159ff0ea14324c937c3f6452ab526241db10dc5c5c3486b9ad9f33b765fcebea6eaeb9324f5f0d5fe14be30677969322250 SHA512 ac76c3dbef7dca7fb2da0ad8c93a862393712bb5ce638083adb7c2eea9e63167981117f5a91193b0b6cc5aeb66590ddf9b0d91b752e3792812608f2cb18a001f
-EBUILD alsa-utils-1.2.5.1.ebuild 2355 BLAKE2B 8b47f02095f958701942e6f628da8fe13b2a4f84c47fa05ea4238a387320e67eaa805eb30ad2ccac4e0fbc1c656251a0a3a09cba8a70db7b06e1c633b9793d43 SHA512 0905aca80c695c563c0154616afb6a02e7af46e433d4fbbddcf79ba1172798416633f7395c97fa011cef56d33ddad1b69c7eee28c88ad90e62400ba488e393a6
+EBUILD alsa-utils-1.2.5.1.ebuild 2362 BLAKE2B 7acbdbc09430867420509a8d1eec1bfe99384e7c063d5409844ff320a784a7a1621799c78f5c0368f41eb0b17438d6389f4fbe6d581955f4dff6e45920f467f7 SHA512 5089297682395c41c7aec121853425d0c5acf9232e4cbd6b83a0b4bedc6ca3e6e3ebd4b5a8926fd0d22e1a4d5b3f5d2fb858b5a30aab3ca144416e1c17cfafa8
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.5.1.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.5.1.ebuild
index ecab802cde40..19b3f1451fbe 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.5.1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.5.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index ff6ae93c7a2d..9b8302a2730b 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,7 +1,6 @@
-DIST Ardour-6.6.0.tar.bz2 12046173 BLAKE2B d3a61ebe97fc26d89eee3f7a43c1ac47f5fda28251b76dcd635bba8c794541436a48fa288f40d1e156f01841e085588b60c8fa962b958c2f4bc6d7cdb4b1af75 SHA512 e175100bc03921865c5b387de68e30c21dd3e65dbf3868783092d165d5106a883aa4fca74e71b2e267e50b3c2f5c7b707a73967bbc93e66808d25aa3065b425f
 DIST Ardour-6.7.0.tar.bz2 12135868 BLAKE2B 3b217340187e16d3da9302e3505c499c3bba8da7e3be82ff12e8aa99e1c934d42e71c62ae357d7a1265e668293c933a2192ae2f6d6b97f21a2f7c379caf5e9be SHA512 73cf6fff40c838c42c3b29842e15d2e2b991f1e92d57ef0a8e68ef75b39ec8075906ac3ded322b521f2c5fd9fa9d1b7f9c7770b4cc6deee9efe1796889aeffe2
-DIST ardour-6.6-volatile-atomic-glib-2.68.patch.gz 22322 BLAKE2B cd113f721d0c6c63c85372873cd43782e3a43b8963c4f9222e771039c4b397585582ffd4cb77d4928bcdc656ef533e4a4b40799ff0c32355985c592589766466 SHA512 3fa2ede8b943881b9c77b233892f146e354c4722265f6599417d55fdf69961d65f6d54ed2c74f53f1f835d006ee99e44adcb03ee117ba44a7be3bedbae2c8efc
-EBUILD ardour-6.6-r1.ebuild 4945 BLAKE2B dda6893230c2d51602a747fb457112a7936bf9a2e2a655704e4f63ebc8dfa9733b432350a2ae68aabc4b16332777d35eebc0ac802e2239a1e90c39bfa795b3da SHA512 7e1e73686843a064bfcf6721e833f149b1fed9e31db00e67da6408bb2c9b8839c2bd909c22dccbc89043769deadb843bfbcdf4273857c5f40bc0dde4683a9414
-EBUILD ardour-6.7.ebuild 4794 BLAKE2B 1099ee8ee97ee53d0f0408c90856091ba21bdee97c6300268259a98af4600639742cb69cfdbd7d0951895e84225f2d41b6243d4ec90e60034289f7245345fb3d SHA512 cb9cc699ff26a81c7d9bbb4e20cdecbd5885c83f9c414545c46a988e65995f733d212bce011f5c6a4e103e5d4502c045f663c128b330f7e83f13e357aac2438d
+DIST Ardour-6.8.0.tar.bz2 12152361 BLAKE2B 9f00a0eeae40fcb1f24e3138a639d1063a9cdbaecae2f17425bce133edee5e34ce4d0a1455be4da00725e52389bc1f9d829825b7ef5c591df2c5b0ce5538f463 SHA512 9f829df99fd6d857d54491e18a5c936b4a9b5e55715d71618454dc7c23fb3aaaaa2878a0ec87035c226a69da604111e27ddb00cd28087e34a46e24810c0ff403
+EBUILD ardour-6.7.ebuild 4793 BLAKE2B 5502f6941eece806d813e91f4087f6afcb26129ef622277462c25aa1127c5bd8b26bced148e4160cc3976021bf873fca11dbd5fe89ab167ac1cbed731015082b SHA512 5b4a2e012226844c8fd1821be9c58a4883ff919c76c463061cae1f178af2853a570a6a6a9a192a5d5fcb133ac4c5f9377c9d02c763bc2e371eaa646541711edd
+EBUILD ardour-6.8.ebuild 4795 BLAKE2B 33705f54a881e4d8274296ed6d0521bbf10156c42623f6f4122be5f0f5d95e60ce9cd0a2fb5b96c90a656293c9ff56b773b4f22641817018d3b7901c10ce007d SHA512 eea973718a53f4a40d4fb89ebd16467e601b93ea528a6dcf3f74a79e5e73cc7e3be31987a402f4ac23c2f4fdf6f693ff68c838065beedc544a0e8bfaf761d97f
 EBUILD ardour-9999.ebuild 4795 BLAKE2B 33705f54a881e4d8274296ed6d0521bbf10156c42623f6f4122be5f0f5d95e60ce9cd0a2fb5b96c90a656293c9ff56b773b4f22641817018d3b7901c10ce007d SHA512 eea973718a53f4a40d4fb89ebd16467e601b93ea528a6dcf3f74a79e5e73cc7e3be31987a402f4ac23c2f4fdf6f693ff68c838065beedc544a0e8bfaf761d97f
 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e
diff --git a/media-sound/ardour/ardour-6.7.ebuild b/media-sound/ardour/ardour-6.7.ebuild
index 9480507f8e06..b596036aa4ad 100644
--- a/media-sound/ardour/ardour-6.7.ebuild
+++ b/media-sound/ardour/ardour-6.7.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
diff --git a/media-sound/ardour/ardour-6.6-r1.ebuild b/media-sound/ardour/ardour-6.8.ebuild
index fd67dc625453..c275eb05302b 100644
--- a/media-sound/ardour/ardour-6.6-r1.ebuild
+++ b/media-sound/ardour/ardour-6.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 PYTHON_REQ_USE='threads(+)'
 PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
 inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils desktop xdg
@@ -14,9 +14,8 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
-	SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${P}-volatile-atomic-glib-2.68.patch.gz"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
@@ -88,8 +87,6 @@ src_prepare() {
 	default
 	xdg_src_prepare
 
-	eapply "${WORKDIR}/${P}-volatile-atomic-glib-2.68.patch"
-
 	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
 	MARCH=$(get-flag march)
 	OPTFLAGS=""
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index fa8abc3a53a2..0f6c788b83f6 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,5 +1,6 @@
 AUX clementine-1.4.0_rc1-QPainterPath_include.patch 1395 BLAKE2B e95d24a03e8a7ce2ff2465d37615a1b7a5ce2d435af4795a7e22f3550807dd939f21993b3c2fd69318326ab4a07ce9a8125177958d0e5ac307cead3a707db5c5 SHA512 ca8125e10712d06ffdbb28311eca33c914dff0fc34e1edc8be4b06778443d4097aad86315360e9915bcb6829f70e33c652ff0745754e02ef4e44860660beac54
+AUX clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch 3349 BLAKE2B dcea69040e8de44746e7e83d9d8024d1133e68915c110e397b262294239b9a8151784ec13d3d5871553c6ba5e5b43d4638dcd3f69a5599ba22696c4ab8fd42f8 SHA512 60dfe7f5e28ede7e1cc5c91fffb2690cd17407e8a4f59e29008d6025e36e38d8f80eb67d49c1c3f4c982c4eea5821c11bd9760cc8d1dadc4706ae7bcc9232d79
 DIST clementine-1.4.0rc1.tar.xz 5593564 BLAKE2B 894d86903df1ba43fca2f07c83d92bcb5d65a0103a4ecd1b321d44259534930c977f0caeaf0c93446dbec4422937f2ddc7f665daa7cb41e5c183fa7f16571809 SHA512 c74102a3ca4a99c3627b718389478e5ca79ba71ce45eccd232ca2eb3fb60a1632afa62908a2831244d6c35154ad6a8b4fa2b2485b4440b9685a0521bfacaabdb
-EBUILD clementine-1.4.0_rc1.ebuild 4917 BLAKE2B 9232e336c94c4e0cfcb2b9240890cc790d69edb4c1ea35df7ec8b0b8469f3a322bacc867612991f9fa3a16fe447d4f54a5572bbb3d267d8299c2e4ba8188431a SHA512 8756bb1915b72f201eeddb5a214127ad6eb2a9342e5a7077011b1a8c3047c65c8d5979ac92aa60a4446150b6dfafb077ae8184210da8fe9eba325d754efb88f3
+EBUILD clementine-1.4.0_rc1.ebuild 4986 BLAKE2B c842a8226afd0aeb0c0f4a0bce747ff1fbfb8e8da62cebea8290d4b0e639085d0bfac68eec48c8e2e63c5286a810193b90d1396ca592f3d2fc1a0140728a68fa SHA512 9396b90dd827ccdae00c0b3d155cc4fe94602faaa2df116f71f02d0b02f477313f582aee7d0eda6b3227c89fc769f43587640fc3bbeea13e369575388d7371bd
 EBUILD clementine-9999.ebuild 4820 BLAKE2B 2fe724b22cc8b7b60e6b71a82fc39c9975e722690905b223f19d910f35ddcd238987dfd5a6cebc63169ee952cd1214e68e1e11768ff281b0ae230a11d0eaf373 SHA512 969c6a71948ce2d59b3074fbe481853ef269168f59a1f9dc74cc1f4cf1508b6c6b726f0b64e4f8c55fdbab14f6c3201064be4033aa4641afd9b1fa53f621a495
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-1.4.0_rc1.ebuild b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
index ef72ab5c0af0..620d245f5d3a 100644
--- a/media-sound/clementine/clementine-1.4.0_rc1.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
@@ -108,6 +108,7 @@ DOCS=( Changelog README.md )
 
 PATCHES=(
 	"${FILESDIR}/${P}-QPainterPath_include.patch" #725678
+	"${FILESDIR}/${P}-gcc11-fix-static-assertion-failure.patch" #788607
 )
 
 src_prepare() {
diff --git a/media-sound/clementine/files/clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch b/media-sound/clementine/files/clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch
new file mode 100644
index 000000000000..1a492fe5664c
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch
@@ -0,0 +1,70 @@
+From cfcd0a956e6758624fab0ff20aee9eb08b3df0b3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
+Date: Wed, 16 Dec 2020 20:03:26 +0100
+Subject: [PATCH] Drop -std=c++0x and -U__STRICT_ANSI__
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This was causing compilation failures, static assertion failed, with GCC 11.
+
+Fix #6865
+
+Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
+---
+ ext/clementine-spotifyblob/CMakeLists.txt | 2 +-
+ ext/clementine-tagreader/CMakeLists.txt   | 2 +-
+ src/CMakeLists.txt                        | 2 +-
+ tests/CMakeLists.txt                      | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/ext/clementine-spotifyblob/CMakeLists.txt b/ext/clementine-spotifyblob/CMakeLists.txt
+index e5342ee5b..6fd551d57 100644
+--- a/ext/clementine-spotifyblob/CMakeLists.txt
++++ b/ext/clementine-spotifyblob/CMakeLists.txt
+@@ -7,7 +7,7 @@ include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-spotifyblob)
+ include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-common)
+ include_directories(${CMAKE_SOURCE_DIR}/src)
+ 
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option --std=c++0x -U__STRICT_ANSI__")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option")
+ 
+ link_directories(${SPOTIFY_LIBRARY_DIRS})
+ 
+diff --git a/ext/clementine-tagreader/CMakeLists.txt b/ext/clementine-tagreader/CMakeLists.txt
+index 855e390cf..a48b01450 100644
+--- a/ext/clementine-tagreader/CMakeLists.txt
++++ b/ext/clementine-tagreader/CMakeLists.txt
+@@ -7,7 +7,7 @@ include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-tagreader)
+ include_directories(${CMAKE_SOURCE_DIR}/src)
+ include_directories(${CMAKE_BINARY_DIR}/src)
+ 
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x -U__STRICT_ANSI__")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ 
+ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 627b2e7cb..0bbc775ba 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ 
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option --std=c++0x -U__STRICT_ANSI__")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option")
+ 
+ option(BUILD_WERROR "Build with -Werror" ON)
+ 
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 4474e7be5..ff571fc19 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ cmake_minimum_required(VERSION 2.8.11)
+ 
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fpermissive -Wno-c++11-narrowing -U__STRICT_ANSI__")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -Wno-c++11-narrowing")
+ 
+ if(USE_SYSTEM_GMOCK)
+   include_directories(${GMOCK_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS})
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 2871b3fba369..0f022e9ff4f5 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -8,7 +8,9 @@ DIST Csound6.16.0_manual_html.zip 24765630 BLAKE2B 3bf6e2202a42dfa826d39ef41282e
 DIST Csound6.16.0_manual_pdf.zip 9640644 BLAKE2B 7bb35f806568a80abbd84a4f4988217bea09f3174881d802f6d61505f044c8a26b59036dcb61ead5315e756a4512eb1fb56b2824f27f09899a8fe1664a386754 SHA512 18347ce7080ca7997e98f8addffcc492c7ec5d8e037e71a33bb46fdbc5b58ec26ee42f370689fc228d4150bd9dedc31c7824ec4c19f3243d512977f4380f9490
 DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8 SHA512 a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308
 DIST csound-6.16.0-distributable.tar.xz 25129496 BLAKE2B cecfe82e9d584ac9e453659b617d54d2f899efd3e65243ba38770e5174baec6f12b0fa6c06c8ef2154f7c80faee8b9992bbe0957892a4ba86e142066aea85578 SHA512 243b23fc7cde3f0348953e88856117355b5b7185314045aad1b6dac236e227c558afd3fd8a73d9d760f3e5a30ee50d02cc7fe3d8b4b84fb63fa82c64972ca1ca
+DIST csound-6.16.1-distributable.tar.xz 25142436 BLAKE2B fe29208afe2cfc9740e68da213f269ca909facd452ffdd595e14a6dc14526bd497e8a2bc1832da28b0bbd6c8b9ac8891f79d819abf64cba0a9e1002c42f8e5dd SHA512 2535f16dab6a682e38b8352cb7bb87a65aedf0550c1705cde8a64b3c0112d7fd97e6c366dad18ef9ef5e1baaf7123f2c0032d9a2ab6979c202692c3a4069117e
 EBUILD csound-6.15.0-r101.ebuild 7400 BLAKE2B 9d711ee4305dbbe74d059f67109aa24a55fa99ec661c20c119cbe3344569904dd4f0888eaafb62bdfff2d178cbbc724bb1222b30a7cfd571a027e2b25f1247a0 SHA512 743d51af0fbc2235cba6968bbee28213b4aebc0b876cf4b820e3034a94b6b7d36b4cbaad1facf5f2a87db1cbdbbd4c6ed634f91f8b5ce3d1406040fca8aedf7c
 EBUILD csound-6.16.0.ebuild 7123 BLAKE2B 207820801b2d07d69253ad9113ca973ecfac3b70a5674697888178aaadab541553b2f9d87546e4141c17c8b8fcc53fde977e3cfea758c6a9523a4bcd8155af84 SHA512 6eb96c1b9be8e48846560dc368aa5305134ff447ed49413a04a878c70d310070cfee7dbec91471a1c17697126d214fc0cdb63d80297476a3304cf9c3f615f9b8
+EBUILD csound-6.16.1.ebuild 7134 BLAKE2B db5317b6bee40c4c71beafcfe5a835ed0ca5efdb51ca1ad2efa7bd8ba5d163a2d3b209a6fee0e46e19fdef6c1c758a859372028c83681a26c99e8163fbfad98e SHA512 584f1e398cac005552c18e86bec63e4690eb4282c0f9663c0fac4e632ee2aec737c59d6e24b23d0444eb0b5dc43656cb3b0a5873a708ca51a12606bfdbbdac65
 EBUILD csound-9999.ebuild 6880 BLAKE2B f07b7aff3c721a0115d1edd7e6389ecc7203ff7bb20c4d114516a96490a29af0005837724a1ddeb5ae3ae362fa8a743757c13b6fe16dfc68346089b4e66d837d SHA512 cb74a9452eda7897f5595491d2c974cba029af4609faaed6fadcb2895b850e5c73b0e54c62172bd50919cb46de20aaa9f1a510c8a43298f750ae93cfd34fa256
 MISC metadata.xml 1295 BLAKE2B 9bfc19eeb1c250b89c6b9d452f5de8a9b0b1283e25bb01ce46c75ef4372844a0605c2384ff17f026e31e10f5670067f8568fe3b3a63675408ac380276d76c65a SHA512 75bfb3c156aaf5b59c6e0291bb4b89f605d9ea6c812eaae2fab6638c74220685835c1b91d436f8f2dfdb90ba625327c4c4e274d7e9dfee6b8fdd6bc3e1679a52
diff --git a/media-sound/csound/csound-6.16.1.ebuild b/media-sound/csound/csound-6.16.1.ebuild
new file mode 100644
index 000000000000..b8549ffc9aab
--- /dev/null
+++ b/media-sound/csound/csound-6.16.1.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# As upstream (and we aswell) are not allowed to redistribute scansyn,
+# we have to repackage the tarball. For that purpose use `bash files/repackage.sh version`
+# Reference: https://github.com/csound/csound/issues/1148
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit cmake lua-single python-single-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/csound/csound.git"
+	inherit git-r3
+else
+	DOC_P="Csound$(ver_cut 1-2).0"
+	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
+		doc? (
+			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
+			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
+		)"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Sound design and signal processing system for composition and performance"
+HOMEPAGE="https://csound.github.io/"
+
+LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
+SLOT="0"
+IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
+fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio
+portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
+vim-syntax websocket"
+
+REQUIRED_USE="
+	alsa? ( threads )
+	java? ( cxx )
+	linear? ( double-precision )
+	lua? ( ${LUA_REQUIRED_USE} cxx )
+	python? ( ${PYTHON_REQUIRED_USE} cxx )
+"
+
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	chua? ( dev-libs/boost )
+	lua? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	nls? ( sys-devel/gettext )
+	test? (
+		dev-util/cunit
+		${PYTHON_DEPS}
+	)
+"
+# linear currently works only with sci-mathematics-gmm-5.1
+#   https://github.com/csound/csound/issues/920
+CDEPEND="
+	dev-cpp/eigen:3
+	>=media-libs/libsndfile-1.0.16
+	media-libs/libsamplerate
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	dssi? (
+		media-libs/dssi
+		media-libs/ladspa-sdk
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fltk? ( x11-libs/fltk:1[threads?] )
+	hdf5? ( sci-libs/hdf5 )
+	jack? ( virtual/jack )
+	java? ( >=virtual/jdk-1.8:* )
+	keyboard? ( x11-libs/fltk:1[threads?] )
+	linear? ( =sci-mathematics/gmm-5.1* )
+	lua? ( ${LUA_DEPS} )
+	mp3? ( >=media-sound/lame-3.100-r3 )
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( ${PYTHON_DEPS} )
+	stk? ( media-libs/stk )
+	utils? ( !media-sound/snd )
+	websocket? ( net-libs/libwebsockets:= )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	dev-libs/boost
+"
+
+if [[ ${PV} != "9999" ]]; then
+	DEPEND+="doc? ( app-arch/unzip )"
+fi
+
+# requires specific alsa settings
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
+	"${FILESDIR}/${PN}-6.15.0-lame.patch"
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+
+	if use python || use test ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
+		-e '/-O3/d' \
+		-i CMakeLists.txt || die
+
+	if use doc; then
+		local png="${WORKDIR}/html/images/delayk.png"
+		pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
+		[[ $? -gt 15 ]] && die "Failed to fix ${png}"
+		mv -f ${png/.png/fixed.png} ${png} || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_BELA=OFF
+		-DBUILD_BUCHLA_OPCODES=ON
+		-DBUILD_CHUA_OPCODES=$(usex chua)
+		-DBUILD_COUNTER_OPCODES=ON
+		-DBUILD_CSBEATS=$(usex beats)
+		-DBUILD_CUDA_OPCODES=OFF
+		-DBUILD_CXX_INTERFACE=$(usex cxx)
+		-DBUILD_DSSI_OPCODES=$(usex dssi)
+		-DBUILD_EMUGENS_OPCODES=ON
+		-DBUILD_EXCITER_OPCODES=ON
+		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
+		-DBUILD_FRAMEBUFFER_OPCODES=ON
+		-DBUILD_HDF5_OPCODES=$(usex hdf5)
+		-DBUILD_INSTALLER=OFF
+		-DBUILD_JACK_OPCODES=$(usex jack)
+		-DBUILD_JAVA_INTERFACE=$(usex java)
+		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
+		-DBUILD_LUA_INTERFACE=$(usex lua)
+		-DBUILD_MP3OUT_OPCODE=$(usex mp3)
+		-DBUILD_MULTI_CORE=$(usex threads)
+		-DBUILD_OPENCL_OPCODES=OFF
+		-DBUILD_OSC_OPCODES=$(usex osc)
+		-DBUILD_P5GLOVE_OPCODES=OFF
+		-DBUILD_PADSYNTH_OPCODES=ON
+		-DBUILD_PLATEREV_OPCODES=ON
+		-DBUILD_PVSGENDY_OPCODE=OFF
+		-DBUILD_PYTHON_INTERFACE=$(usex python)
+		-DBUILD_RELEASE=ON
+		-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148
+		-DBUILD_SELECT_OPCODE=ON
+		-DBUILD_SERIAL_OPCODES=ON
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_STACK_OPCODES=ON
+		-DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
+		-DBUILD_STK_OPCODES=$(usex stk)
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_UTILITIES=$(usex utils)
+		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
+		-DBUILD_VST4CS_OPCODES=OFF
+		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
+		-DBUILD_WIIMOTE_OPCODES=OFF
+		-DBUILD_WINSOUND=OFF
+
+		-DFAIL_MISSING=ON
+		-DNEW_PARSER_DEBUG=$(usex debug)
+		-DREQUIRE_PTHREADS=$(usex threads)
+
+		-DUSE_ALSA=$(usex alsa)
+		-DUSE_ATOMIC_BUILTIN=ON
+		-DUSE_AUDIOUNIT=OFF # Apple specific
+		-DUSE_COMPILER_OPTIMIZATIONS=ON
+		-DUSE_COREMIDI=OFF # Apple specific
+		-DUSE_CURL=$(usex curl)
+		-DUSE_DOUBLE=$(usex double-precision)
+		-DUSE_FLTK=$(usex fltk)
+		-DUSE_GETTEXT=$(usex nls)
+		-DUSE_GIT_COMMIT=ON
+		-DUSE_IPMIDI=ON
+		-DUSE_JACK=$(usex jack)
+		-DUSE_LIB64=$([[ $(get_libdir) == "lib64" ]] && echo "ON" || echo "OFF")
+		-DUSE_LRINT=ON
+		-DUSE_PORTAUDIO=$(usex portaudio)
+		-DUSE_PORTMIDI=$(usex portmidi)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+
+	)
+
+	use java && mycmakeargs+=(
+		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
+	)
+
+	use lua && mycmakeargs+=(
+		-DLUA_H_PATH="$(lua_get_include_dir)"
+		-DLUA_LIBRARY="$(lua_get_shared_lib)"
+		# LUA_MODULE_INSTALL_DIR omitted on purpose, csound Lua module links against liblua
+		# so it must NOT be installed into cmod_dir.
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc -r Release_Notes/.
+
+	# generate env.d file
+	cat > "${T}"/62${PN} <<-_EOF_ || die
+		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
+		CSSTRNGS="${EPREFIX}/usr/share/locale"
+	_EOF_
+	if use stk ; then
+		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
+	fi
+	doenvd "${T}"/62${PN}
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	use samples && dodoc -r samples
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins installer/misc/vim/csound_{csd,orc,sco}.vim
+		insinto /usr/share/vim/vimfiles/plugin
+		doins installer/misc/vim/csound.vim
+	fi
+
+	# rename extract to csound_extract (bug #247394)
+	mv "${ED}"/usr/bin/{,csound_}extract || die
+
+	use python && python_optimize
+
+	use java && (dosym lib_jcsound6.so usr/lib64/lib_jcsound.so.1 || die "Failed to create java lib symlink")
+
+	# install docs
+	if [[ ${PV} != "9999" ]] && use doc ; then
+		dodoc "${WORKDIR}"/*.pdf
+		dodoc -r "${WORKDIR}"/html
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "The extract tool is now installed as csound_extract"
+		elog "due to collisions with many other packages (bug #247394)."
+		elog
+	fi
+}
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index 9c2b64c5abea..cc4c0fba0a3f 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,5 +1,5 @@
-DIST drumstick-2.2.0.tar.gz 1965327 BLAKE2B 1fbb97c031af319999c7fb707523c3522afff61dfba3c1c0123619ed738a4996b4b835df9f60b3bb3b27b6d13616f11619160f43cf36c8429947f43dee62a840 SHA512 eff261ae0fbb620673eaa4d12e168b8ed0cfffb3e605ad8ebbc10a444d18eb0d6aecad7bad3b0c3a639df1cfee96bece3a870139bb818a278d6f51e13418a0a9
 DIST drumstick-2.2.1.tar.gz 1976813 BLAKE2B ac27fbcfb92fff2b7d69c70f9ec677343e8d66164997a29f319fbe94e6d12582cb4af67f0ff36126a6102e48bcbe4d4620e9442fdecf07aaaeecf37e9458c590 SHA512 d99c774f33db9d8555efd83adc8968d6d244e56e7976d68f0f90ff89cfda1143b2e07eece6b465fffba354073d4616c5a767f09f2ba282e252ca0955723cadc7
-EBUILD drumstick-2.2.0.ebuild 1474 BLAKE2B 07193c21cb0472ca1c4a2dd7c7f5aa61000f8c8355a30250fdc02b5dd618db289b74b88bda95fa0f9eff5a182e92b67b5c57891d0cd2b265fc7d968f915674b8 SHA512 e88f66b0013ebf2e6bca1cdbac194a8f8b5363503119bd782b862bbbf7430892f8ed428822220764925a0528c5b4f03f5dec245c93e89d1243bca919a02170da
-EBUILD drumstick-2.2.1.ebuild 1476 BLAKE2B bd05362b139984277adfd03d982c2cb61bf95d34b2e85291c92ae42b0220c74066b8adcf0cd88287b7fda2a18a69783c4409684956e3b09a852023008c0bd438 SHA512 624cb7035c87f78c225d282bec57887d6bea741732d7b758f5f4a8e8781ada342ae4d0599fcea1476c66fe27b59befd98f0c0a7916ca2ab5ebb3d8283e68c9eb
-MISC metadata.xml 543 BLAKE2B ab65d693031858992d6015da0dd074b2fe2975d50136fb105674c9f51b694d6b41e3d0b6f93e2b0928dac68aabd32cf1b4b3081d460639cbe6bd3e8b3a045c46 SHA512 b91230be7ae7d1cce86bba1b2706d88fb4beab8a37f1faef5d4ce79627bea14798d508269c6fe0b132450be6698a9466987b6d71d12006e09f58dc25404e784f
+DIST drumstick-2.3.0.tar.gz 1978608 BLAKE2B ab05030d402c03053bfcf315e8c4e54b73975f0059719cf5e58db64ddac394555b898e3e0008b892901d7395c89a160631ae8eeb9d1cd52c3abd0533c5fdafdb SHA512 b12a39153600b37ef61a31255721466bdae5896b562276860688f9e22259ba4747086abeb828dcfef24c8e1fb7bd371dea1c6d51098cf5e1797e212cde70f46a
+EBUILD drumstick-2.2.1.ebuild 1474 BLAKE2B 07193c21cb0472ca1c4a2dd7c7f5aa61000f8c8355a30250fdc02b5dd618db289b74b88bda95fa0f9eff5a182e92b67b5c57891d0cd2b265fc7d968f915674b8 SHA512 e88f66b0013ebf2e6bca1cdbac194a8f8b5363503119bd782b862bbbf7430892f8ed428822220764925a0528c5b4f03f5dec245c93e89d1243bca919a02170da
+EBUILD drumstick-2.3.0.ebuild 1320 BLAKE2B a07f4a8af466bb54ebbb2d77da55503386a0717dd0dfe9d4b63ee2eff1418edad5056092c516e73dc3d6fe40e208e58d612c3ee5a3b26d1de71daa119f8f75be SHA512 4b51e3f56701a6fa8fd5f5f0af28213680c6fa1fd16680381e6a3862c829cd31ec3d771bc7a5daa2e3f0b5b4654c5b1ab8e31da68e64cec116227a24fcf41b38
+MISC metadata.xml 598 BLAKE2B 099351919e92e9d8197fe31f09336761f9d886b67582b6dde4ce5b387a44f496e562de9456482d6651d63429955870b8ef8aadc178417d847da2d2e999a4add1 SHA512 16a287bd1c3039970522c09ab0dae6018924a34577692ccfdcde6d80476338eb4cc6576f155882cf96d44bb87d5523ff8df17f3ee8a86b3d1cf2a28c7543b089
diff --git a/media-sound/drumstick/drumstick-2.2.1.ebuild b/media-sound/drumstick/drumstick-2.2.1.ebuild
index 1459d1b265ae..dd7730300b59 100644
--- a/media-sound/drumstick/drumstick-2.2.1.ebuild
+++ b/media-sound/drumstick/drumstick-2.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc fluidsynth pulseaudio"
 
 BDEPEND="
diff --git a/media-sound/drumstick/drumstick-2.2.0.ebuild b/media-sound/drumstick/drumstick-2.3.0.ebuild
index dd7730300b59..8b2d865ce0f9 100644
--- a/media-sound/drumstick/drumstick-2.2.0.ebuild
+++ b/media-sound/drumstick/drumstick-2.3.0.ebuild
@@ -11,8 +11,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc fluidsynth pulseaudio"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fluidsynth network pulseaudio"
 
 BDEPEND="
 	dev-libs/libxslt
@@ -29,11 +29,11 @@ DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	media-libs/alsa-lib
 	fluidsynth? ( media-sound/fluidsynth )
+	network? ( dev-qt/qtnetwork:5 )
 	pulseaudio? ( media-sound/pulseaudio )
 "
 RDEPEND="${DEPEND}"
@@ -44,22 +44,15 @@ RESTRICT="test"
 
 src_prepare() {
 	cmake_src_prepare
-
-	if ! use fluidsynth ; then
-		sed -e "/pkg_check_modules(FLUIDSYNTH/s/^/# disabled by -fluidsynth/" \
-			-i library/rt-backends/CMakeLists.txt || die
-	fi
-
-	if ! use pulseaudio ; then
-		sed -e "/pkg_check_modules(PULSE/s/^/# disabled by -pulseaudio/" \
-			-i CMakeLists.txt || die
-	fi
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=OFF
 		-DUSE_DBUS=ON
+		-DUSE_FLUIDSYNTH=$(usex fluidsynth)
+		-DUSE_NETWORK=$(usex network)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
 		-DBUILD_DOCS=$(usex doc)
 	)
 	cmake_src_configure
diff --git a/media-sound/drumstick/metadata.xml b/media-sound/drumstick/metadata.xml
index ffb8a67c8158..29bffa307045 100644
--- a/media-sound/drumstick/metadata.xml
+++ b/media-sound/drumstick/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="fluidsynth">Enable support for <pkg>media-sound/fluidsynth</pkg></flag>
+		<flag name="network">Build Network RT backend</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">drumstick</remote-id>
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 305eb6bcf370..7c447926360f 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,5 @@
 DIST fluidsynth-2.2.0.tar.gz 1507709 BLAKE2B 4ec162ecf461f3fbc80d1b5c1a4bc0624d8274dedcfa32addfd79d7270811e532bccee46b90181bca504183e092176652f6c9d0ae8eccfb5617b9176b8bc511e SHA512 fa08c6d6914accbb5a99bb912066d97ded26ab3c706e663e76a4f1b024f610f676d2e1f7c30872d00e0fe86b5c494dcea581ecd0770977d235962a845c074bd6
 DIST fluidsynth-2.2.1.tar.gz 1594153 BLAKE2B 9a297859ae90e3dba21a3923059c081596d2a5ff107219b829f75e2067bea315364c9b4a9a4e6563c5a9f9ded92efff2c58d1aef9840b308fe69f546797c83ae SHA512 a42728f179fd2583a292d18d9b7d98498b42574aff6559e8e3762329893dd18c451b5611517aa9aa7ee6ba9fc0db3c83e127d097c68769c5d8562a49dc427ee9
 EBUILD fluidsynth-2.2.0-r1.ebuild 3314 BLAKE2B 1170bc2979a36dcbe5b84ca2ef8e4c34256c9da3514833bd23d1e0edd7753f876a943be534630a8ec0637024ca0a4a34ec06bcf83a42ee4f3f0948cd716cf29b SHA512 6de4ee1f429768af858bc9bedf365e4977ef8f2d04a815ba0fb6c5649b2989c56bb56951cd1647e3c6f3a1a93d1daf99783532aa4e32512db4273df4091b235f
-EBUILD fluidsynth-2.2.1.ebuild 3321 BLAKE2B bb22fcff64287a4d5e9ac3a56821627974fb6c65aa252ebf935c9243e49d3bbd858ee7847c1797892ac8f3c02541e880a677801baeb51b089064ce89c3b01265 SHA512 3fd862663ab056ffb93a46b297f505958384e33aa786110cbcb63574bf3dded6aee123f98edeff2cc625a00fdf7f72b29048a33a1fb466d9fbccfd9de1cf163a
+EBUILD fluidsynth-2.2.1.ebuild 3358 BLAKE2B bbaadff62dff4c07279182def2d0f398cc1b358b51d189a00f88b67c8f27d4abaa367b83906e7d2440900c4922815f8e06b00f7c935b408765203cd6932b8fcc SHA512 c8526904e9353688e715a78601b84bac55cb722dfb8b8ae1ef584a71cd020334796bdb2eaa814fff9dd0138b649f1e7d90462199e358ec9cab59703a25001bbb
 MISC metadata.xml 430 BLAKE2B cef06a37f27e4ef3a555000188873f0f36a89dc90a3576dc15fb384a8f3c8f5bd38ccb79f56704ec7031823d3057eda17ac975a3ea1e265133e5ff81afc141d8 SHA512 c702d31a98e905d95f95f6cdfc16d8a71de5a5a55628e59e56d408a6599cdf6ab005642ee064217d88e0061c2856692e1446e340a3e80f2bc17ed1d3c2a14e9a
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild
index 781c4e52a80f..ba0d73a00569 100644
--- a/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
@@ -94,6 +94,10 @@ install_systemd_files() {
 	fi
 }
 
+multilib_src_test() {
+	eninja check
+}
+
 src_install() {
 	cmake-multilib_src_install
 
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 822f3c63d0a6..0cf4f3d2b291 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,5 +1,5 @@
 AUX jack2-1.9.14-fix-doc.patch 468 BLAKE2B 2062c7823ec928eec8374818409621991ef877123a57b717e3a1d91d7943b92dcc776f7e654b5c4fa85e7113c44bc232cf2a0d0ba413f6165e4a861c625ee267 SHA512 e1b65b55098534e3989c53470c3b690eba0bf2e087c1dd1f337332030e6fc8185fd1c2be590ad4b78df663d201a3e86f1b6e448619e93514c5e05311947862d4
 DIST jack2-1.9.18.tar.gz 987166 BLAKE2B e1684d50c26ce45b36133b5e9632e916cd5bdf2a2ffba9257d7d6018d9fab8ade87f2de4c837d3cc3cb37bdda296fbcd8c2da6468676a3a4c74563fb42397879 SHA512 7b9116b8002db88d9df746acf99e523cf9103c1a7955e8174912c8538b2c53bc8e7c34a64d0df4dc1f212e35035392814fdfcfe78597e26bd08ec028876bcb98
 EBUILD jack2-1.9.18.ebuild 2452 BLAKE2B 63f95828a08f855d195c9923a71e2cd5a292b24c791f9a6681bfc3794cb4ffdfa80cbfc7e1ef3d05afc845a2ba06cf63d0fa3f699e4f5ad6b5d5f8213246db49 SHA512 0e2241fa26abb4ab1f0bd163bea7e445d71c33adf3c79537a553534ed80e55b65a1a9c6baebdef597fe4a6793ab15e2fc46d9665df95ed1ec8c88d5f2efd43d2
-EBUILD jack2-9999.ebuild 2458 BLAKE2B 64ffbe6a0a75249ecd490a6b2c7725a47b5f7cf6e3899f79f8d53e2150071ff843e1c7fc3948f85e6dd2cd71727875f49bb7395c935eb60ada95c549a3920ec9 SHA512 a229b00cfea8ef17c46a7871cff59624cbe96a3516ef1bb7dbb958a3a42ed2ebead98629cc67392d2e7bbeec5264d8587f8c00359ed07e980463fa7e4ea0c889
+EBUILD jack2-9999.ebuild 2403 BLAKE2B afac511cd97033be22891584d22fb9cfe9d9891bf94cd3d11f3e21e3a1214ba11d8ba834e9011fcee783a469d301f7edf4170e4ca15f97b5475d8d871c5f095d SHA512 1377402a21cc82a8a1ea9c88d92c20768e352ad15d1f74b3dae89f57e5eeb23ec57c0373bb8ad3331efb82597c8da05221586213876e8827da4b6d60c3d46343
 MISC metadata.xml 557 BLAKE2B 76000f6e4bd787a3e2687f9bd3a71c0456cf4fbbd27e7bad1aaae7ee9e3e6832afd0cb44e07a4a23f13e01f7aa732be18e72e711f4148fc65b2b263c5190b49c SHA512 1a0a066f0829cd623672513b5c8950ffd6cb1a4d0921cd48174949af24070d1ef6c3bb0a850749c348d1afa2cdf56bcd94d6937b21163fd0a0667f7cdd1632e6
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index 3001f60267b3..854d309843ca 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -56,10 +56,6 @@ RDEPEND="${DEPEND}
 
 DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 )
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.9.14-fix-doc.patch"
-)
-
 src_prepare() {
 	default
 	python_fix_shebang waf
diff --git a/media-sound/mangler/Manifest b/media-sound/mangler/Manifest
index 2d9675124ac0..c2eeb9e2f38e 100644
--- a/media-sound/mangler/Manifest
+++ b/media-sound/mangler/Manifest
@@ -1,5 +1,5 @@
 AUX fix_ftbfs_narrowing_conversion.patch 709 BLAKE2B d58fcc3a241a0d35e73509ac01922035f47ca9b13791c90decef9f0e7c52214d2bfbd11fb713eaadb441e4d629ce3f07b8162d8bd633672c180dbabf965b8d0c SHA512 7c83c998db7523a8704ae98c14c8f62a2804b6b60caddc9aa01fd3c2b9c07c69f028d4debb306c784f8c4eeeb076afca8fa19dfef40379384d1ef7709130dfbd
 AUX mangler-version-info.patch 610 BLAKE2B 2ecee647ca16da9a807cbc5aac964f1495a5519c6d70213a4aade73ac073e0e6d3e82959f155250efd442221a56fa96af770d9f96b1c8182f3634da769eff83d SHA512 877822f936ed7f1aeca17cf02a105c15195b77ec3fa73df63928d7449eee7306719d10b5592bdd17823285bc72ae3950bc6b748755df91b7ed9bee37787b4d4e
 DIST mangler-1.2.5.tar.bz2 5390985 BLAKE2B b2b61d49683b356be5bcaf111d0e75cc0ff30cbb131b0de360128e2973a415eb87736b55a965fb30651e5d3580a2274754ddb8a44b345c55fc6ba0caa26de0a5 SHA512 e72eb2f408ba925d10563c6821e08406007bd0b7586f9ee054a1de421a6195351140a2df9656a45389f5f568ebf44f53fb719fbf6fb113695f230dd4bad21e38
-EBUILD mangler-1.2.5-r2.ebuild 1380 BLAKE2B 3fdd53a0092910b46833990b49fbbc352c13822c6d800db6af6532b128238d5031cb1dfc16d3bd5ad358b731ea35b1caede0d6782ba652c6a7f6d58c3b5f2e2f SHA512 623097a18c82fd2a62d9fcb3dd1e77586528de6ff3e9fb73e51dd3a6aeff09f54a87835b64649e0186774687b49d04ab97c070c7910cb96de7dc56b0e5198ae5
+EBUILD mangler-1.2.5-r3.ebuild 1431 BLAKE2B 56a120bc1052edafbfce780f48dabbada8ed70ce65252b35b25608c34295efe83b96649a0d166dc34df6f805bd9601d57ba861c30e1d834671efb834a881e220 SHA512 a3d279e41f38c1c815374c8d255510d14f5551570810ad167400ac590ecbb3d5136503dc13268422e28b5394d5631b7bef91ceb4380694ea8f4b79ef7a50b6db
 MISC metadata.xml 472 BLAKE2B 4fe3d0cd01024a5d02e189adf6e42bd15180c39734db8b5e1cae8f9369e4df9834c7eabaa80c8b9945624f3a5877e7a9cb1f3f4a8bb01157aeae76cbf736cee5 SHA512 e527083dd60ac548ee6e1acadddcf7de55c7b8d6b58d10c4c34750c7bfee839d8b4a1c4a65dc732b1d3587f058b2a037de212ab583f240993223990608546f23
diff --git a/media-sound/mangler/mangler-1.2.5-r2.ebuild b/media-sound/mangler/mangler-1.2.5-r3.ebuild
index 38b754f7ff44..8241de78acc2 100644
--- a/media-sound/mangler/mangler-1.2.5-r2.ebuild
+++ b/media-sound/mangler/mangler-1.2.5-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Open source VOIP client capable of connecting to Ventrilo 3.x servers"
 HOMEPAGE="http://www.mangler.org/"
@@ -38,6 +38,11 @@ PATCHES=(
 	"${FILESDIR}/fix_ftbfs_narrowing_conversion.patch"
 )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	tc-export CC
 
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index a2f92ceded78..679661f34c59 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,5 +1,6 @@
 DIST mpg123-1.27.2.tar.bz2 1067102 BLAKE2B 14da616ffd9e798f07f8eaa00080a1a5ff8cf3c3c7436cc83c8f2264317a30a88ee98ddd0ac077c43672887daff447bf10d287be72a5c7d1a4d5580c90e68298 SHA512 b1c7de0c1b1d14cce3b3ba72e7454b7ce392443a3eaace0431381f1871e2fda1470b8efd07176057f8bf76d88f14c2b7ffae470ba34a3271c7e779277b86d6c0
 DIST mpg123-1.28.0.tar.bz2 1063321 BLAKE2B a4fa37ac9c3aca867ac4f18eea9c2d39ed80c7e86908b2f5399da8ae82c2e4b57c1a041f17427702da14af9902051ce4de5a85497f7236963ae390ef8715327a SHA512 4e333ee4f3bbebcfff280cf286265e969a8da93b9043d03c0189e22cd40918b07bf12181bd06141d4479c78bc0d0ed472e0d3bb61b2fdb96fe9f7cd48f9a6b77
 EBUILD mpg123-1.27.2.ebuild 2753 BLAKE2B 129900b38d6e5464f19aec88b4b2894feff3d8c6023230f93c63e1fa5954658de8c9aafc10f1fa1b1dc2c70347667557576d9ecc0ef9e612aed17190ce31317e SHA512 67a19b872805005f14f719468c97ade3b94a2220e95dcced877e79b807dbf4826acf3c5f3673e9ffd644261d4cb28e4decb35be50de3d94bab71a77f444f698f
+EBUILD mpg123-1.28.0-r1.ebuild 2769 BLAKE2B fa730d6ba2f282f774b3de5e0fcb61ae4ec04c7431c61a02fc38da1496032c49fd7bbab296801a6778954ee91bf88625c803022c62ca4aabb199ad91410fc82d SHA512 76bbbe89ffd5f8d0cbcd7ce8f07acff4ec19e9ead7ca3130372e75719595c68de2c1adf8b529018200c6f9a6f8b052b102b996bf7560676d293e469a98aa7eb3
 EBUILD mpg123-1.28.0.ebuild 2760 BLAKE2B 71996cbe978df08d7a2eaa45ed95a71649eef62dd1ee89b878e44fadbfef173718f3ddbdba8e98109cb5cee4d46ad8dbeb144a1b90197af68c131f543f086745 SHA512 3031dc355f017f04dbe2bdc9337e7d1db250ea0fc09dd92e1816ef08615e679edee70e8f8b2dc54ebb42a953ea97200e72e6841525616831f97431c7411419b6
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.28.0-r1.ebuild b/media-sound/mpg123/mpg123-1.28.0-r1.ebuild
new file mode 100644
index 000000000000..9d14cfb3dbb9
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.28.0-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="https://www.mpg123.org/"
+SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+RDEPEND="
+	dev-libs/libltdl:0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+IDEPEND="app-eselect/eselect-mpg123"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+
+	if $(multilib_is_native_abi) ; then
+		local flag
+		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+			if use ${flag}; then
+				_audio+=" ${flag/pulseaudio/pulse}"
+				_output=${flag/pulseaudio/pulse}
+			fi
+		done
+	fi
+
+	use cpu_flags_ppc_altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use cpu_flags_x86_sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext
+		# bug #164504
+		_cpu=generic_fpu
+	else
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
+	fi
+
+	local myconf=(
+		--with-optimization=0
+		--with-audio="${_audio}"
+		--with-default-audio=${_output}
+		--with-cpu=${_cpu}
+		--enable-network
+		$(use_enable ipv6)
+		--enable-int-quality=$(usex int-quality)
+	)
+
+	multilib_is_native_abi || myconf+=( --disable-modules )
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! $(multilib_is_native_abi) ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 7a299a6a5171..1e78e1c29cf9 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -9,5 +9,5 @@ AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f90
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
 DIST pulseaudio-14.99.2.tar.xz 1518460 BLAKE2B 66150756ca64aa3b0c8f689131e294ea67b48ae682ef7446bb4934a29a4e90d5944025b0a4701b623f53f07d7bfb790d64185e6d5ba0ec1012eaa0a3e9e2f9ba SHA512 fe8c1e5fe74d78d7f7155be2ea65a90909547841a717921ad526c05e4c4dbe4e810c3bb6d1fbae705a109c70cef627b87a2b16d948bb6d714f72f5e22e4a6b5f
 EBUILD pulseaudio-13.0-r1.ebuild 11418 BLAKE2B 9a656044d67e37951ce61533a7b10a6830256aca510ef86b6893af4227565d76c4402894b68bf41456aff9de9fc9b33505aa90044f59a55be639645df1cbe4bc SHA512 fd88106961566905f2826630f6044816569414d0276a4a61582b39b96bbad22f5ccb73f51e8bf0a02b2de5dcf297e62c081abd69ecbee80f28591d3c0a19307b
-EBUILD pulseaudio-14.99.2_pre1.ebuild 10652 BLAKE2B 71f67b9e47c6e72c96976c477937f816709debb82ad7d0da705330bc68660867d8db97bc3db9fa135e9acef82c382590498abdc5c69d5008e741d20f4add4aa0 SHA512 0628da30cfeb3099a77a8e88ce0ea419c3af5430b01ea41a7a5f4d2b830107c4c55609605da1fc66237818cafea1822dccc682aeea6b41c4b95fef23da0b1d1b
+EBUILD pulseaudio-14.99.2_pre1.ebuild 10652 BLAKE2B 120175db0a68493ba56f19fba5f5dba610220062eb2ea56a274f9b227043ef9887ff025815c94026021c02637b6400bd89903d33d1ba99c0f600eebc25a7e3a2 SHA512 d346796390d60ee262ef7a238b18edc3b92d7207f131534bd94c6fee915aae648f52f8e56d7020e66d52a51927b195b6f113ae9984842aa41c0137bd7d4d265a
 MISC metadata.xml 3542 BLAKE2B 219478a02cb996393839789ad8b79196754bb52a2168f243e88bb7c3ec8e6bfbfce96de9cb26cd93fef84a63c1397854e4b3028d5fc55e30f09d67b86769044b SHA512 9509fc630c2bf7fb9a089163198d326ac1d16e48bd22113b21a27e98ad68ed0da042fd6bacbf2dfaff7706cf64d39270c6a2a564418fb498872f2d1ae67fc3fc
diff --git a/media-sound/pulseaudio/pulseaudio-14.99.2_pre1.ebuild b/media-sound/pulseaudio/pulseaudio-14.99.2_pre1.ebuild
index 00a444fc3ada..71b0e7e4ba69 100644
--- a/media-sound/pulseaudio/pulseaudio-14.99.2_pre1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-14.99.2_pre1.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 MY_PV="${PV/_pre*}"
 MY_P="${PN}-${MY_PV}"
 
-inherit bash-completion-r1 gnome2-utils meson-multilib optfeature systemd udev
+inherit bash-completion-r1 gnome2-utils meson-multilib optfeature systemd tmpfiles udev
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
@@ -287,7 +287,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 && use daemon; then
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 7de6b709c2e0..ab62fdaeb7ec 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -7,5 +7,5 @@ EBUILD pulseeffects-4.7.2-r2.ebuild 1905 BLAKE2B 61eaf56d327b9f99b1e337cbbb316e8
 EBUILD pulseeffects-4.8.5.ebuild 1812 BLAKE2B 8993a53c15218aea86a546d78285e12d236377a6a5cdebd7370ef16ee55b1842455705fbeff4b9ce67c234c544496ce83e8c7bd5aebea00081ede8a99282449d SHA512 ef5d2c3af4a3168db6cb85119af7a9ab9b773c78170261dace79cd0bc52f1c963dae5fe0d718974efa4adab5705926a8d76aa0978c5b662b04f3adca45c45c42
 EBUILD pulseeffects-5.0.3.ebuild 2165 BLAKE2B 645812419b880942134baa3ffbf87fdf9b8d9e5f0d27c094852023b997e83e2605814f554641174b4b9ddb140f346e63d1d7cc0145968d7bc9c9a5b7b6400c4f SHA512 6689a5859227ae8292262abb20649422e58eb0d1422e0438fd7d60d384dadeec0ae2599df5e21d139b53b545bb390cd0212b8e0c0ac71e3699dc3357c5069aea
 EBUILD pulseeffects-5.0.4.ebuild 2165 BLAKE2B 645812419b880942134baa3ffbf87fdf9b8d9e5f0d27c094852023b997e83e2605814f554641174b4b9ddb140f346e63d1d7cc0145968d7bc9c9a5b7b6400c4f SHA512 6689a5859227ae8292262abb20649422e58eb0d1422e0438fd7d60d384dadeec0ae2599df5e21d139b53b545bb390cd0212b8e0c0ac71e3699dc3357c5069aea
-EBUILD pulseeffects-9999.ebuild 2165 BLAKE2B 645812419b880942134baa3ffbf87fdf9b8d9e5f0d27c094852023b997e83e2605814f554641174b4b9ddb140f346e63d1d7cc0145968d7bc9c9a5b7b6400c4f SHA512 6689a5859227ae8292262abb20649422e58eb0d1422e0438fd7d60d384dadeec0ae2599df5e21d139b53b545bb390cd0212b8e0c0ac71e3699dc3357c5069aea
+EBUILD pulseeffects-9999.ebuild 2237 BLAKE2B 2857391a14ea9cbe8918b178e5bbde379c8bfe1ac8b2e78b6611c076c9d2e1ae23c3664840af30af367431c1d50a52142640661c1fc242a96c59f78e33801e89 SHA512 b91c4f542cf98b447099e7d5649c7a689760b37523a046c653950be7ceda61df2b1aa4e99b436231adc08e4b5c978815d42e4bd124786962770ebb9df8e5cffe
 MISC metadata.xml 839 BLAKE2B 9fd1b77bab1361a5c0fe3601b77e772c3a848ef2f347b6668ee2f33791b2ce0c9a6e31886896a4f1c9eb2dbceba28db997ef1d3f4e474cb1c83784850330a846 SHA512 5c15f3253e062813e3f52c5f9dc84bf25cf29e6cd79ec5f37561251b725f5c5f6a49e8e46b935291e08cf46db56258caf18ce2631d859b8f5c3aa7744bd1d5d1
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
index e9dde9ba03b9..1d89fa03f254 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild
@@ -42,9 +42,11 @@ RDEPEND="
 	>=media-libs/zita-convolver-3.0.0
 	media-libs/libebur128
 	>=media-video/pipewire-0.3.24[gstreamer]
-	sys-apps/dbus"
+	sys-apps/dbus
+	gnome-extra/yelp"
 # see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
 # and sys-devel/gettext depends reasoning
+# gnome-extra/yelp needed for help docs link from app
 DEPEND="
 	${RDEPEND}
 	dev-libs/appstream-glib
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index 3736cfb98b02..679af352db6e 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,5 +1,3 @@
-DIST schismtracker-20200412.tar.gz 1308056 BLAKE2B 8c104d92889982310d895b9d432ee8bf6da75f583d38490d6796718411298aa0627cc268e070f8c679de4341c910507f78e394b5ba8aeb5b71b3410f2919aa35 SHA512 f4c55ad7d47c9e90aecd8fbe9be399e0b82cd8a815ba1df9c1e23141b0c8a8bb80c9256ce5530327f52b3a34bf84b918d4e1f093ab19d47c180435a63ee6f23b
 DIST schismtracker-20210525.tar.gz 1309489 BLAKE2B acc295bed4236d3161fd67a8c97ddadaa07d6d6319a0ad75710fb4d3c7ea251edd2648932533e9181b512fd78b54db929b07e3472ff754220f16cca2bd610932 SHA512 1f20535e4e3b5175ceea803a45b7286a99cab248829c39d11bc85780bc63e0e26c49ad78997a13e290fb4ad2c292d15eeb494a975d53fbe25dec80499e675b16
-EBUILD schismtracker-20200412.ebuild 1430 BLAKE2B f183a48a46eac6350da059dbdfe7231de6c8e3fb0b261f6d2fc2ef27d4c0cfd8da4dd528523fc41e453c2065b21ef432fdc65a339bac529966609f2a8a5d8ffe SHA512 2376ef542792a18e8b80e1429992226c5a709a28e174de759dbf81d220eb7ad2975b74c49e66cbd76e8b74c79b927fd10afad450f8f14ce9cffed25380cd3bae
-EBUILD schismtracker-20210525.ebuild 1432 BLAKE2B d529ac8fa07d6936c58679da0ffff537684dc7119a2305dadb9bd80d7e10f22c3eed3b5be5a2aa0e63450a7f354a2cc773814ddba76d7b6d17a9e02c449d3cb9 SHA512 66dc02371d2b792d0783dfa926d86345397ad7326cabec423422327620daeb81984a28e7e446992c344742c1b375c85de90c981fb4123f38369d8f7c4937a698
+EBUILD schismtracker-20210525.ebuild 1430 BLAKE2B f183a48a46eac6350da059dbdfe7231de6c8e3fb0b261f6d2fc2ef27d4c0cfd8da4dd528523fc41e453c2065b21ef432fdc65a339bac529966609f2a8a5d8ffe SHA512 2376ef542792a18e8b80e1429992226c5a709a28e174de759dbf81d220eb7ad2975b74c49e66cbd76e8b74c79b927fd10afad450f8f14ce9cffed25380cd3bae
 MISC metadata.xml 355 BLAKE2B 90bb7342fbf7defe952aaaa3a65ad1e1144455314d8a2af7219805450a9e3a3df9b0fb9b334c8eec07af7f4f1296e49cf2c9fd3ae750b77f4a5325efa5524337 SHA512 98760ffd7921d91711f3293f3650270ee8de44f7d143066e9d6861b020dd4fe06fa4083ec1a4022846aaa47187151dab2847cd2fe9c571a5c251fa917effea9d
diff --git a/media-sound/schismtracker/schismtracker-20200412.ebuild b/media-sound/schismtracker/schismtracker-20200412.ebuild
deleted file mode 100644
index 1c2988cf91b2..000000000000
--- a/media-sound/schismtracker/schismtracker-20200412.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop xdg
-
-DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
-HOMEPAGE="http://schismtracker.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2 public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/alsa-lib
-	media-libs/libsdl[X]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXv
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-	eautoreconf
-
-	sed -e "/^Categories/ s/Audio/AudioVideo;Audio/" -i sys/fd.org/schism.desktop || die
-
-	# workaround for temporary files (missing directory). Fixes:
-	# sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
-	# /bin/sh: auto/default-font.c: No such file or directory
-	mkdir auto
-
-	#   sys-devel/binutils[multitarget] provides ${CHOST}-windres
-	#   wine provides /usr/bin/windres
-	# and schismtracker fails to use it properly:
-	# sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
-	[[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
-}
-
-src_install() {
-	default
-
-	domenu sys/fd.org/*.desktop
-	doicon icons/schism{,-itf}-icon-128.png
-}
diff --git a/media-sound/schismtracker/schismtracker-20210525.ebuild b/media-sound/schismtracker/schismtracker-20210525.ebuild
index 68df087a73c5..1c2988cf91b2 100644
--- a/media-sound/schismtracker/schismtracker-20210525.ebuild
+++ b/media-sound/schismtracker/schismtracker-20210525.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 196d0ed737ba..81ba513b1428 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -2,9 +2,9 @@ DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b
 DIST spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb 120102446 BLAKE2B 481686c9e1f7e8d7b68059ec5aad5f71ae1e59af80fa91903941afc2e0a91e2f957860bf96ce3ce4b19884f2548426269a9a2043c2985b4bbc82c5f091f5f2b8 SHA512 af9f1beafe0e4d2313326d1a55675550e8c3fcd5cd2dc0954127094c563048b98f74f669d99a10f0ef6e3b3405856bb9d6a2561644a434ab6bade9c812296963
 DIST spotify-client_1.1.55.498.gf9a83c60_amd64.deb 133771326 BLAKE2B b4f17f3008e23cfc9b1cd7ecd806ae97b846f22b39be5ee25515111e6641b31b1cd6525f0cc6b5540d3bce03adbcc23940db26992642ec3884b46f919f499179 SHA512 395806fc064706cc6b005054ec0f5e0a9b0cebfa073ccb771b7e8cb2f6c8aa300efe9164e492f90f4c83d047a898f6553c44722562d8f3e1462947d811a2e599
 DIST spotify-client_1.1.56.595.g2d2da0de_amd64.deb 134092920 BLAKE2B a1b836a8c7627254203326c6168dd8351d1c0e527a94e26ec96f9437b72196a717e2cc460b4c89da4098d19d5de4c6f7df150b039a32240b9edc978253590d16 SHA512 4a270461d07c339a3fdf49cd0a8728d4fc7300be001a1ba59c74f05bf273b79a61bde6d046c27a6af38dfb6af58963fbd8b8cd7468c91b91e48b0d32b3dcc2b5
-EBUILD spotify-1.0.72-r1.ebuild 3217 BLAKE2B 83f0aac50e11c914b2e63f0dbfb6245019cccd1a4a3307bc71e7ca897d890c9119a4a0df1d1bd5fa28156cf86b4eb56f4aeefbfc07d03ddbb4c0626e8c201aee SHA512 329198467357064fc1a556437928f2d59ab0b6262c82c0435638338b8b94adac031f94a9dc4f7cad4b11345ca5f0a5e1caa13168dcdd2d1224883f6a3aa42422
-EBUILD spotify-1.1.26-r1.ebuild 3133 BLAKE2B 0cb705233a3c73afb3199e47d96a97e53eacf2c6cb190c421a3412d6783f6c966de1089b147cb086a3e0228862d392ded5ac4ec1117eda21c4bf1a84617bc91d SHA512 8f0ed03641ffa16d447925f24e9f53c01507cea74b860d3c8f5dff2b3df1895cdbd47c2484fb8c316b9e3fe2723d00cafe1934d57eff17f217d28a6bc06aca53
-EBUILD spotify-1.1.26-r2.ebuild 3389 BLAKE2B a54b9a095c1e17dd5f20f1c3c4c44a687551c06553724d795527c1399cc4a4456676a856d27da6dcb01fef36fbf611f3bf1cd4c794c032322dac6b368b367262 SHA512 5fc0016a01a26641c56155ca516fb4f42b6c9a2d88143c335da7f8bea28d8ab36abd11c411867ec9e7bcca794a4d360e18b92a929d4d0aa57435008a4c7369b5
-EBUILD spotify-1.1.55.ebuild 3452 BLAKE2B deb0bcd9286a1f9c1021f4d3d8277568da170cd7a48250f21a48354158125d9a187038b4366260d4765d3730957cb185dc62060a615dce7ba11bc530a4cc06fc SHA512 8a7b3d41dc2f3be099aa9ba3fab6b84dee0a95f06776995ae11c7ca52f058eba83d7afa769dcab70ce8490f57f25bcc957d6e28075d87e3069f15275800736d3
-EBUILD spotify-1.1.56.ebuild 3475 BLAKE2B ee53be64dac9d6fb2ecc65ebb8e27a2b67cc1eb21048899ceb83d813a63099ab8d8846ce20de8207a6dc55df7bf8c2adfb79e40e132b745412e048f551fd965b SHA512 b10f6790dd0fa49812bb31ea58df3255ea9c9bbbca7a21bbbaf5ff24978aa831fae84561e6ccd486e11396df6d9e22cd0b60ac6a4339f8c9286860487080e4e2
-MISC metadata.xml 632 BLAKE2B 4c68e175f8bfe81df9c89a76d97ea02c71cdb7a7fe1737d95ae20a49840f734372953fbcfaa8af5ecd918ee1444fabacff223487707e9d0e76993d94f6878b8d SHA512 2947ed146739cec0abed1142356d5fc2d8d32251fe117cb7f999b1e83e65223b93700106913db90a41718ca7a88f3a42661af3617ae1bde2e695907e746638ae
+EBUILD spotify-1.0.72-r1.ebuild 3208 BLAKE2B dbe0adc8f45c8c83d2a6734b36439ac0ce67b48ea518ae9153a5006c1ef4e923cd768a983495c35bac8d1469d4e7f5b5c26e73284f43ff9d5d84dd23e80c6740 SHA512 8955f11f24a1a50827b2dc9c37e03ac0c24ad8d352cf91598a3d39c65679f54cd3b8660f21e5a8f1347e408ec1fea8e23a962fd7e2c93b64f034d74a9304ae26
+EBUILD spotify-1.1.26-r1.ebuild 3124 BLAKE2B 72405957d9f30e9d90a4181979eb07700c4765a6c41fbe1ff68a758f74cf5f5cd7d656d11a4958ea420a93487126f0e4181a02a0a7d2170200ff467e0b9c7f95 SHA512 dbccc4571bc39ad80f09ee5e0d5bf966493f6571b5fd690fbc482d3c70d414e27f26cc65dfb65eaf4d16315ed5ba45eada7daad4786471882588d0f96391d816
+EBUILD spotify-1.1.26-r2.ebuild 3380 BLAKE2B 5c196268dfb75eb9acdc558ea0a0e21da0f5549ec6f5ff8f065033e44d1dc60ae101943ff7330dc18822334065bf772d6366b005a6f69a656f6f4cb6990b0b3b SHA512 d2da46d144409a993880a863eba0e7101b1a7b40d446d9a5b7163f572f852b08f1926cc0d5a4ccfbc0d25ad79d9f26149de1d142f497468c2e5660d8bc95b8c3
+EBUILD spotify-1.1.55.ebuild 3443 BLAKE2B 1f860e103bf6b4df1552121bdbeb862a7187368b19900ea3aae2d5f472dcc6db741c0a318f45fcdf2eeb2f195a8319af674f035df1de4ec2958a58dab8ddc044 SHA512 f9ed0da5e0c9e96dc74a971db0544b8ed2d86f708af1d694c51535ffe7ffec56b8cdc1391cbeffc44cd7e67036ad3f19f994d0d0b6938c6f1baec033006fa937
+EBUILD spotify-1.1.56.ebuild 3466 BLAKE2B d3e436afa8307ec887e1527aadeeac902629c8f73628dd63b148ecd68a83cacd82f447c329804683a3879b436efe3c4129d12ac76e6f987f0617f53e30826a80 SHA512 e7fdec76de1a95e89328f1de5f9472bd6c064957a2bdcd70a202642b41c5be5f406e1a624eae83c8345abbf0b868cc5e264841470bb6d07c3ebb719bd5341b74
+MISC metadata.xml 632 BLAKE2B 48e631444ca05aa703c62720ca7f04e57095f32dcf134a1d8dfbab5276a71efebe3fa9d4ec211cd7a5b0b261186af61f78ecf3512fbb8c6da77d2b3c4e97038c SHA512 64f9f4f073b9f48436b4ea62a4d3d0cfba3057dddaffa986bdaa3ad56cfacfec21ef59618b06389f71d85ed1255bf639a755134dfea111b24e4cb7719d21dd80
diff --git a/media-sound/spotify/metadata.xml b/media-sound/spotify/metadata.xml
index 5f4cc456b934..3542c29a74b6 100644
--- a/media-sound/spotify/metadata.xml
+++ b/media-sound/spotify/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <use>
     <flag name="local-playback">Allows playing local files with the Spotify client</flag>
-    <flag name="pax_kernel">Triggers a paxmarking of the main Spotify binary</flag>
+    <flag name="pax-kernel">Triggers a paxmarking of the main Spotify binary</flag>
     <flag name="pulseaudio">Controls the dependency on pulseaudio or apulse</flag>
     <flag name="systray">Pulls in dependencies needed for systray support on some desktop environments</flag>
   </use>
diff --git a/media-sound/spotify/spotify-1.0.72-r1.ebuild b/media-sound/spotify/spotify-1.0.72-r1.ebuild
index 0f511f48f5dc..5bc8a509cbd9 100644
--- a/media-sound/spotify/spotify-1.0.72-r1.ebuild
+++ b/media-sound/spotify/spotify-1.0.72-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit eutils gnome2-utils pax-utils unpacker xdg-utils
 
 DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+HOMEPAGE="https://www.spotify.com/download/linux/"
 SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
 #BUILD_ID_AMD64="117.g6bd7cc73-35"
 BUILD_ID_X86="117.g6bd7cc73-35"
@@ -15,7 +15,7 @@ SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb"
 LICENSE="Spotify"
 SLOT="0"
 KEYWORDS="x86"
-IUSE="libnotify systray pax_kernel pulseaudio"
+IUSE="libnotify systray pax-kernel pulseaudio"
 RESTRICT="mirror strip"
 
 DEPEND=""
@@ -82,12 +82,12 @@ src_install() {
 			"spotify-client.png"
 	done
 	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
+	if use pax-kernel; then
 		#create the headers, reset them to default, then paxmark -m them
 		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "You have set USE=pax-kernel meaning that you intend to run"
 		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
 		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
 		eqawarn "you suspect that ${PN} is being broken by this modification,"
diff --git a/media-sound/spotify/spotify-1.1.26-r1.ebuild b/media-sound/spotify/spotify-1.1.26-r1.ebuild
index 797be7b82c17..3aa9bba22f4f 100644
--- a/media-sound/spotify/spotify-1.1.26-r1.ebuild
+++ b/media-sound/spotify/spotify-1.1.26-r1.ebuild
@@ -5,14 +5,14 @@ EAPI=7
 inherit desktop pax-utils unpacker xdg
 
 DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+HOMEPAGE="https://www.spotify.com/download/linux/"
 SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
 BUILD_ID_AMD64="501.gbe11e53b-15"
 SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
 LICENSE="Spotify"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libnotify systray pax_kernel pulseaudio"
+IUSE="libnotify systray pax-kernel pulseaudio"
 RESTRICT="mirror strip"
 
 BDEPEND=">=dev-util/patchelf-0.10"
@@ -84,12 +84,12 @@ src_install() {
 			"spotify-client.png"
 	done
 	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
+	if use pax-kernel; then
 		#create the headers, reset them to default, then paxmark -m them
 		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "You have set USE=pax-kernel meaning that you intend to run"
 		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
 		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
 		eqawarn "you suspect that ${PN} is being broken by this modification,"
diff --git a/media-sound/spotify/spotify-1.1.26-r2.ebuild b/media-sound/spotify/spotify-1.1.26-r2.ebuild
index f15f00faf70f..ece161410aa8 100644
--- a/media-sound/spotify/spotify-1.1.26-r2.ebuild
+++ b/media-sound/spotify/spotify-1.1.26-r2.ebuild
@@ -5,14 +5,14 @@ EAPI=7
 inherit desktop pax-utils unpacker xdg
 
 DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+HOMEPAGE="https://www.spotify.com/download/linux/"
 SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
 BUILD_ID_AMD64="501.gbe11e53b-15"
 SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
 LICENSE="Spotify"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libnotify systray pax_kernel pulseaudio"
+IUSE="libnotify systray pax-kernel pulseaudio"
 RESTRICT="mirror strip"
 
 BDEPEND=">=dev-util/patchelf-0.10"
@@ -93,12 +93,12 @@ src_install() {
 			"spotify-client.png"
 	done
 	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
+	if use pax-kernel; then
 		#create the headers, reset them to default, then paxmark -m them
 		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "You have set USE=pax-kernel meaning that you intend to run"
 		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
 		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
 		eqawarn "you suspect that ${PN} is being broken by this modification,"
diff --git a/media-sound/spotify/spotify-1.1.55.ebuild b/media-sound/spotify/spotify-1.1.55.ebuild
index 22aa11bb8591..34ff427eb99a 100644
--- a/media-sound/spotify/spotify-1.1.55.ebuild
+++ b/media-sound/spotify/spotify-1.1.55.ebuild
@@ -5,14 +5,14 @@ EAPI=7
 inherit desktop pax-utils unpacker xdg
 
 DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+HOMEPAGE="https://www.spotify.com/download/linux/"
 SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
 BUILD_ID_AMD64="498.gf9a83c60"
 SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
 LICENSE="Spotify"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libnotify local-playback pax_kernel pulseaudio systray"
+IUSE="libnotify local-playback pax-kernel pulseaudio systray"
 RESTRICT="mirror strip"
 
 BDEPEND=">=dev-util/patchelf-0.10"
@@ -94,12 +94,12 @@ src_install() {
 			"spotify-client.png"
 	done
 	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
+	if use pax-kernel; then
 		#create the headers, reset them to default, then paxmark -m them
 		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "You have set USE=pax-kernel meaning that you intend to run"
 		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
 		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
 		eqawarn "you suspect that ${PN} is being broken by this modification,"
diff --git a/media-sound/spotify/spotify-1.1.56.ebuild b/media-sound/spotify/spotify-1.1.56.ebuild
index 52c323401ad5..2ec7cf64b054 100644
--- a/media-sound/spotify/spotify-1.1.56.ebuild
+++ b/media-sound/spotify/spotify-1.1.56.ebuild
@@ -5,14 +5,14 @@ EAPI=7
 inherit desktop pax-utils unpacker xdg
 
 DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+HOMEPAGE="https://www.spotify.com/download/linux/"
 SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
 BUILD_ID_AMD64="595.g2d2da0de"
 SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
 LICENSE="Spotify"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libnotify local-playback pax_kernel pulseaudio systray"
+IUSE="libnotify local-playback pax-kernel pulseaudio systray"
 RESTRICT="mirror strip"
 
 BDEPEND=">=dev-util/patchelf-0.10"
@@ -95,12 +95,12 @@ src_install() {
 			"spotify-client.png"
 	done
 	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
+	if use pax-kernel; then
 		#create the headers, reset them to default, then paxmark -m them
 		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "You have set USE=pax-kernel meaning that you intend to run"
 		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
 		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
 		eqawarn "you suspect that ${PN} is being broken by this modification,"
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 459d8499b619..17dd1bb5c678 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,6 +1,4 @@
-DIST strawberry-0.9.2.tar.xz 9956324 BLAKE2B 0b5ccfa76aa98c0d7cf5ca0f79465948c34d6c7e7f51264b1fb8623099a4de2d0548464f51d813a4b75b8e524c653a32e8682410741a3c3fbc604ccaa4816204 SHA512 2ce22e7bed5832dc33191f5ff6f0f656861f4e574ad5ae2d2987a0c75274490dad2723579fcc5766f398654600a0819c5d0fa956dce12a54d5aab505a2f1ea30
 DIST strawberry-0.9.3.tar.xz 10928116 BLAKE2B 3edb80065876d63b79292c6b75660aaaeaa6ea294bb84011124fa8aee3163717b8ab4f0e8d6e7aff321466d3cfbc214b5e8b987c9ae9b0823f8d3c681aae6e9e SHA512 d253ffaa6cf0412eb135bc792c31458816fc0a1ae7070d6885487da4fb4855ffeeeeddd285b853fd10220c797c3beb73a91059514d76b1b1638350fdff17107c
-EBUILD strawberry-0.9.2.ebuild 2936 BLAKE2B 696328255c443ede4eb118a09edb84f8818307cc2c4288ab5513d01377af86a5e9a1ef452550e328a471ce61b87a9326d7417f92efcfb08a8627bfc80378a63a SHA512 58357aa926039d93c1bacbe435350fee3cf23287024ad89a5cf08c9f5b1e8eb0c296edff64add7beec37529c3fa7ea2f7bb67dc1fdd76b3bb68308bb8e37e427
 EBUILD strawberry-0.9.3.ebuild 2936 BLAKE2B 696328255c443ede4eb118a09edb84f8818307cc2c4288ab5513d01377af86a5e9a1ef452550e328a471ce61b87a9326d7417f92efcfb08a8627bfc80378a63a SHA512 58357aa926039d93c1bacbe435350fee3cf23287024ad89a5cf08c9f5b1e8eb0c296edff64add7beec37529c3fa7ea2f7bb67dc1fdd76b3bb68308bb8e37e427
 EBUILD strawberry-9999.ebuild 2938 BLAKE2B b0c616bf39d4161c62a8e6cdf268976a9c2c76e6d36bb159807dcc9accbc01b4e6cb87cd06df4b29ea212f2b75819d21952684664ecaf2333f150d2663815dc4 SHA512 19c81894d095c42d63554f8290160d9ddde1eeab99b06d3d99c82c699839983c91c4157e3fca024a158613983a6a88c11c7e5fcd8420746d9c3c0d367809871a
 MISC metadata.xml 531 BLAKE2B 1bf5ffc07a64de7716ead9a8f53cd82dd713b243cef24b9782d782887d4d1644585c21d0eacb4cba6768a2807a2823f60bd1457ce992ca0b4fafaab8a1054079 SHA512 c8febfcdf8dfbf0857e2ccdaf3d27606a2a05f2365e4ee0d9634452e4274e7e57d5688a8b97de8833a06f2dddffb07707f523abc9bc5b0a5850f1fc84d00081a
diff --git a/media-sound/strawberry/strawberry-0.9.2.ebuild b/media-sound/strawberry/strawberry-0.9.2.ebuild
deleted file mode 100644
index d3fdeec4bd47..000000000000
--- a/media-sound/strawberry/strawberry-0.9.2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic l10n virtualx xdg
-
-PLOCALES="cs de es fr hu id it ko nb pl ru sv"
-
-DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
-HOMEPAGE="https://www.strawbs.org/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/jonaski/strawberry.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cdda debug +gstreamer ipod mtp pulseaudio +udisks vlc"
-
-REQUIRED_USE="
-	udisks? ( dbus )
-"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
-	dev-db/sqlite:=
-	dev-libs/glib:2
-	dev-libs/libxml2
-	dev-libs/protobuf:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	media-libs/chromaprint:=
-	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
-	>=media-libs/taglib-1.11.1_p20181028
-	sys-libs/zlib
-	virtual/glu
-	x11-libs/libX11
-	cdda? ( dev-libs/libcdio:= )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	ipod? ( >=media-libs/libgpod-0.8.0 )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	pulseaudio? ( media-sound/pulseaudio )
-	vlc? ( media-video/vlc )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-RDEPEND="${COMMON_DEPEND}
-	gstreamer? (
-		media-plugins/gst-plugins-meta:1.0
-		media-plugins/gst-plugins-soup:1.0
-		media-plugins/gst-plugins-taglib:1.0
-	)
-	mtp? ( gnome-base/gvfs[mtp] )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-cpp/gtest-1.8.0
-	dev-libs/boost
-	dev-qt/qtopengl:5
-	dev-qt/qttest:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-"
-
-DOCS=( Changelog README.md )
-
-REQUIRED_USE="
-	|| ( gstreamer vlc )
-"
-
-src_prepare() {
-	l10n_find_plocales_changes "src/translations" "" ".po"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_GIO=ON
-		-DLINGUAS="$(l10n_get_locales)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DENABLE_GSTREAMER="$(usex gstreamer)"
-		-DENABLE_LIBGPOD="$(usex ipod)"
-		-DENABLE_LIBMTP="$(usex mtp)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DENABLE_VLC="$(usex vlc)"
-		-DWITH_QT6=OFF
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use gstreamer ; then
-		elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
-		elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
-		elog "depending on your preferences"
-	fi
-}
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index d1315a8b99ce..df2d3c1e6236 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -6,9 +6,9 @@ AUX ts3server.ini-r2 721 BLAKE2B 8427ffb88e2856b0807fe3c3ed2411039fe330f65322cca
 AUX ts3server_mariadb.ini.sample-r2 762 BLAKE2B c70d4c7e375a9ab43ca9c1c4cadea9843009e7004f38734f7f2d8da3e3e86d83a2301d713b6bffee4e14ad04ef08c05bdae5e7daec4a8678ef3b9b5348824d2b SHA512 c2a4468288251e39e4061363016f6146aceae4c7f19c0e962341748ada5127e0b80380c75d217b1a2d1716c6e53c669aed34d75258b22f32c7f0ffb50b759288
 AUX ts3server_postgresql.ini.sample 768 BLAKE2B a8a8e9255012dda70d2096c793c44f22978cab1e2a632f3abbb81f288d9d8716e76727c6edde33146ff4e7dc08da43c7996565c8c05a27ca4f17e1bb02f095d3 SHA512 293917b6310d456e51fc72cf967cb2a0f99ec38b7a62550f2358d1996841d1aa15c0169945884a10799fb72f9831d9d12d4f2a535d1480f8fbaa6b23c9f4cf21
 DIST teamspeak3-server_linux_amd64-3.13.3.tar.bz2 9945408 BLAKE2B d714a046279c8cac11ff373a66ba41010e5839704030ae29f8d7f429759126dff8675b8b0b37b584115ad44d9e216cb5449d4b159dae53ece72f9e5bbe119f84 SHA512 39ad3a00f5e38a0601ed9e9df4227a7f00b4cb9bdaed6562ccf05e0fce22ed040cfd5a2ea36e9e97a18a74c335e90c0c080106cdaf5c0b32859819286727cb58
-DIST teamspeak3-server_linux_amd64-3.13.5.tar.bz2 9950540 BLAKE2B 0ba97317364a2b219d98d7c9590355a8ce62a91f1e6b1b647d5a00643c79fe197fefb548c872f54ac2b67612eef4d97e36c7bbdb59647ab061520ad2295344ab SHA512 c190ff1fccea71d90fae70e5786a4b6d269161a073f4a10abf24c9c75e694eae2b49e8aabf3dcb1afbcbc4242e1a8c6616e39b950c719ccebb47ad49d8a4f8ae
+DIST teamspeak3-server_linux_amd64-3.13.6.tar.bz2 9948972 BLAKE2B 397e96751e6688b5579ff7828e4998e3b26183b0b10980e89748d51207428059e7d8cfa6f2f6fb961b77f735f61e1ba00ac13a077c76b5d22a7b2abb28d67e48 SHA512 dc007cdc924fd284da4a206cf615816b53c2f03ccb2573a29aa2bce6874e09ce5764a3953f8e84de8a3cc02aee306b1505d8c7edf8d48713bbf5f172c3be3422
 DIST teamspeak3-server_linux_x86-3.13.3.tar.bz2 9779788 BLAKE2B 1ddb466dfc6a7d19dacfa05a0608487a8b086963186eb48e2480b83fb9eaa408ca45bc80bfc6fbfd1623c21caeb27e516f6d893ab84e442ba75c9f59daf4fa79 SHA512 9b14e1fd8b969c32ca63e3b9665e0941c3d1e67b3e49d5f2d6cc701aa4ee10a80f1c10428ef2d59bb3767cd03ad5503a527c47b1db11ea525cca8c7e07787621
-DIST teamspeak3-server_linux_x86-3.13.5.tar.bz2 9784415 BLAKE2B 54fa526f2fa4ebade068faf1c7e6becdf34fd70bc12771f90b454c9adfdefb5fd61ee4cc9e59c20041cd2387871598c7bd900845cdffbb822b2ce238a826d861 SHA512 05a5440dd7a18f9af1023f9ed98626f0e68a31375a7d5debfa401601a743546a44ff2162e92a18bfacccf5a1b9f5c4218bd5ea82ca5700133c30be70ffb0aea0
+DIST teamspeak3-server_linux_x86-3.13.6.tar.bz2 9785491 BLAKE2B f0d196a72e9a4283006c4dfd9a1d86e96a3b435d8bf14dfca178ea0240e94b88bcf3b9e20b6c99638e04019065fa79d28ac2d9ad452e306c4c27966e32464c69 SHA512 ef124964590c106bacd3bc98847a5e8f64fbbf69ccb2a216f9af6548f5f2d200c0bd307d283f48cb08c254fddb92fe03f6cff2c3c87e7ca593edf3023b053bee
 EBUILD teamspeak-server-3.13.3.ebuild 3510 BLAKE2B 8b7c969ca30aa7683c506f730e135ba127ecb6b7d0eac50dcd7b6286e445c8bdeabacf96cd79cb1a591e00aa29193eb29d98e7816da386c426afe97309166a44 SHA512 a6d75c808865c5f8a48ce3a17671ff242b34e82bf83672be8dc779945db8f02816a0d55c28900b1a96e77e1e067db0c375bd9d6082d21b3ba8b1c927148fa551
-EBUILD teamspeak-server-3.13.5.ebuild 3512 BLAKE2B 9d4f0b1f7a231d27ecf678ddaab6289c4a9042169f0602257e339f07e5ad2c7e4b2b788f789f93a98751b5081a3bd5a47753f9b649f638069e12f37dbc658ee3 SHA512 108c890aa92790ea077bb03733beb1806ce0c0d651efdba042106e6029b7fe81912e7abdfb97e5cb84cd737088bb2cb9e0cc94db0b1718b4a3759da87a3de681
+EBUILD teamspeak-server-3.13.6.ebuild 3512 BLAKE2B 9d4f0b1f7a231d27ecf678ddaab6289c4a9042169f0602257e339f07e5ad2c7e4b2b788f789f93a98751b5081a3bd5a47753f9b649f638069e12f37dbc658ee3 SHA512 108c890aa92790ea077bb03733beb1806ce0c0d651efdba042106e6029b7fe81912e7abdfb97e5cb84cd737088bb2cb9e0cc94db0b1718b4a3759da87a3de681
 MISC metadata.xml 703 BLAKE2B 854016d14783720f4467dead33469909e5777915947a72a03d0c2789fe37633cd93db11fdf2c59429e7a58f44825ecde3094c1dab7dd765634f46b80894b5af6 SHA512 959deb886af18a0260a0a0530eb914a42a21acac711cfd3ca6c2724ee78e3b697786e85a387ce7c9dae34b1922d3d96953265c80497602a4e94b05988d776a9c
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.13.5.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.13.6.ebuild
index bd2a13a829c1..bd2a13a829c1 100644
--- a/media-sound/teamspeak-server/teamspeak-server-3.13.5.ebuild
+++ b/media-sound/teamspeak-server/teamspeak-server-3.13.6.ebuild
diff --git a/media-sound/vmpk/Manifest b/media-sound/vmpk/Manifest
index 1ed422cc4dc3..b6b7a5afeee1 100644
--- a/media-sound/vmpk/Manifest
+++ b/media-sound/vmpk/Manifest
@@ -1,3 +1,5 @@
 DIST vmpk-0.8.3.tar.bz2 481537 BLAKE2B 985609c3a9ac69b29ac40dd6a71132d0f429d7961d306caf1f77e9e5b510e8b5af8f996febf87df8dfde02ee486cecbb1ef412dd3ba718dc3f793771230e5988 SHA512 829121a9f7bbbe73a9882c9f569204e4096c57c1c7dc7ba22949a35d3fe104028ba7e259fc2163d2711f31f8adfd52c4ec95bfc78ae9b35574835c1b404183ca
+DIST vmpk-0.8.4.tar.bz2 483243 BLAKE2B 12deda1ce752db4a0723e0b54e96a734cfcc11cbd2974a5957d315f1080d7d8b8ab3adf9203c8a25514f708ff6cadec69ab560239cb0f7d1b6859032ff6b976d SHA512 1704d8d39a2750549b524202e46e51507e25aeed00fe5c36202148661af2fc98613d937b2ea36f958706f371608d50ce82a6633b56e344e9cdcfed223892cb9d
 EBUILD vmpk-0.8.3.ebuild 900 BLAKE2B 9cf7402d7127f2a41f0785feb47d4d8b487687433b9c282bbb153a8b9f3b53a7295f8a1d1086c869cde5f1e3b375949f32ec7524098451462f49413317ef53e3 SHA512 c102fcb617f4031687bc89a32fac8fb9328583c3b8b2649b1364891a59ae0c9411237a49601918963b6c7030ab2a32169c9fb53972030fa542e8c1ffccc8fa3b
+EBUILD vmpk-0.8.4.ebuild 908 BLAKE2B 5cd7b39f929e94b44c8160c05de5fc2e192bb38baade70eb883e9f9c54fc4c2d5d43f0eb1ae3baf59c4651fb594e37cc2f1a30ac96bcf9aa6549d0cc595b7c93 SHA512 32770303f4f0f0f5d18895b2b61cf7983e6f960ee5de773a2a0d186e20e8c843f93939e596f2463132f00a9a5e3bea2ad9bc78f42e6d4dc0cd516d607eaadc40
 MISC metadata.xml 856 BLAKE2B 53282a0d72578eb72aa6d3ae3704e915626f12b88315be54f0342cd9b97312fed2c3628871fe7c1215d29b6984c9b829b0718d124effa46eeaf52dd6509e35be SHA512 2186fd4b256c33f617fef45833bacba660d536141b77e520ad811c02363d1238765c13ec8bd125cf12b0e77589ad7c4f189747553c956ff9d2590e8a84b345d0
diff --git a/media-sound/vmpk/vmpk-0.8.4.ebuild b/media-sound/vmpk/vmpk-0.8.4.ebuild
new file mode 100644
index 000000000000..83f0e30a0b6e
--- /dev/null
+++ b/media-sound/vmpk/vmpk-0.8.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Virtual MIDI Piano Keyboard"
+HOMEPAGE="https://vmpk.sourceforge.io/"
+SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus"
+
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=media-sound/drumstick-2.3
+	x11-libs/libxcb
+	dbus? ( dev-qt/qtdbus:5 )
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DBUS=$(usex dbus)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodir /usr/share/doc/${PF}/html
+	mv "${D}"/usr/share/vmpk/*.html "${D}"/usr/share/doc/${PF}/html/ || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-07-03 22:39:47 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-07-03 22:39:47 +0100
commit	7f0ccc917c7abe6223784c703d86cd14755691fb (patch)
tree	8c6793f68896b341e22f33d7e6cef88e481f4a8b /media-sound
parent	9aa80713372911cec499b3adb2cd746790920916 (diff)