gentoo new year resync : 01.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
commit: 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree: 53bf797418ac5e9b99c41ca0382c87b82421e5de /media-sound
parent: 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)
92 files changed, 754 insertions, 573 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 9d1bd333fdd1..0342d28db12b 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcm2ps/Manifest b/media-sound/abcm2ps/Manifest
index bea1e3b92749..0ccac608da47 100644
--- a/media-sound/abcm2ps/Manifest
+++ b/media-sound/abcm2ps/Manifest
@@ -1,5 +1,7 @@
+DIST abcm2ps-8.14.11.tar.gz 259453 BLAKE2B a5b2b4142b9d3190fdedd3b560f8baa582293badd90fd380ddb9991871b2e08050d07c3c97f908529be715bce62b9cda242487f3d6a7885ecf802318a64b7df8 SHA512 b156c84cfa929aa5999a42b23564af5bac399dccbf116342891b5e5ed2e34e81b4658fab9f3c51f5de084cc96d8ea0965a2bdf81de14de6eb324b8998dbb8b98
 DIST abcm2ps-8.14.4.tar.gz 258383 BLAKE2B 7f9163309cb7a31eaecf443b5bd754c7389b4717ed891e2082f618499b4491428ae0fff7b4804d2c21c8ff3d948557c9d649afb0c2a9ae9407aad39545ed66d5 SHA512 7ba5a25ef7ad18a46bdd45393836a0ede2838af2c24822ecf3c1759328619663fe600eaf607de900527f88fa4a9c21d1da8965cafa45f4aa6dc5754b37ae3722
 DIST abcm2ps-8.14.6.tar.gz 258520 BLAKE2B 99aba76df4ee0259d46924f5d37e707d2fcc1872502c475bca52c22353d4a6f7dcb3f52b0639b8d619f2414a6cb1d20b7b8bf6808218f0b99c71eb76b9766bf9 SHA512 f9863480bc757971eacb0a3bb30e046bcafe2f27bb15ac0e9c4d89afa568f23682fca4388523c429a72b01386e44c390efc8c487cae569b59eb6fcca8ad9a98a
+EBUILD abcm2ps-8.14.11.ebuild 880 BLAKE2B 1b3abbe2c30bdaf0a3f48738493e4d745485e87736ae139bf33bd38505e95a1d1de8101801feb2093372323086cc6f0293a7b9c1f39fa20bcd5f35273b461d9d SHA512 d34ceecaf4794c8124167b7922c23b578395ec0ff317970f322567fbd42bf8fdca87aef921aa75478434413b419d3b232969eee40e10700c37a06421d9c4504c
 EBUILD abcm2ps-8.14.4.ebuild 878 BLAKE2B 5fcd6a249f5dd7ae3c476a61fc0c38da2d7490a2162c4e6f0dd1d1dea79e8478d10493e723ba296e3fbf7d9be61b3e7e45868f92182cdb3795641b8fbfe24a95 SHA512 059ad7c4a783a8127701eba3e09f45c770c1b535198a996060038d689f1bbf95b6eda4256962f54a64f7c8930bd614a9e54db518f2f65973940a7757038c2db6
 EBUILD abcm2ps-8.14.6.ebuild 880 BLAKE2B 615b9633bad0a6f8700613f22dd14d7966f799c2dc5ec7169212adc6a7d75f48681608e41ba6a2bc9140e6e7d4f2d2c01ccc7df1d72a5dfac9e37a5e6a3dd2e6 SHA512 b9fd72b73b362d2bfc3ff8aa44a3284ce01745584da9253274ea6bdf4ab8644df5c9d0191911a1b2eb49419b21e6f3ff2c9f8fb2cfd9d586b707eee17970b1e8
-MISC metadata.xml 360 BLAKE2B d590a7cb36ab74b8880f987b711b24df69a96e9a1fb9e7a5e8a0ff08ad65a5646596aeb866af37a2f4a4acd9984a211acbcedffd855ac5b88506e627d02515ed SHA512 7612e5473e6185cac8f54baf6e1bc1bb75e9e6b252d2cd59ed8865c190e0fee1924cbe6e6fc79c03fedfbcf5f9228d45244483b7ec2ccd7a8bd4997c4b6893c9
+MISC metadata.xml 442 BLAKE2B 1644918baf09ce3fbbdfb92858c155cd739f48f0d7b3c52827b900547cb065f93a645203250bc6cb9f40ae9086cd6dd1e92f5b23a06d4cd19139c9f0952626b9 SHA512 b73b1bb4b151438f0328d9371f636d172072ade500c8d055b749a53a10975174f7d4a3a6f61937206e0342202827f7fb968f3d073745bf62fa954f2ffc8c9d0f
diff --git a/media-sound/abcm2ps/abcm2ps-8.14.11.ebuild b/media-sound/abcm2ps/abcm2ps-8.14.11.ebuild
new file mode 100644
index 000000000000..48eee1a8dfd2
--- /dev/null
+++ b/media-sound/abcm2ps/abcm2ps-8.14.11.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Program to convert abc files to Postscript files"
+HOMEPAGE="https://github.com/leesavide/abcm2ps"
+SRC_URI="https://github.com/leesavide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples pango"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	pango? (
+		media-libs/freetype:2
+		x11-libs/pango
+	)"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		--enable-a4 \
+		--enable-deco-is-roll \
+		$(use_enable pango)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin abcm2ps
+
+	insinto /usr/share/${PN}
+	doins *.fmt
+
+	dodoc README.md
+
+	if use examples ; then
+		docinto examples
+		dodoc sample*.*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/media-sound/abcm2ps/metadata.xml b/media-sound/abcm2ps/metadata.xml
index a52c2abde1c3..60d7833c9176 100644
--- a/media-sound/abcm2ps/metadata.xml
+++ b/media-sound/abcm2ps/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="pango">Use the pango library to render fonts with non-latin characters</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">leesavide/abcm2ps</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index e81110c75f46..d221909ff927 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -5,7 +5,7 @@ AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b76
 DIST alsa-utils-1.2.2.tar.bz2 1274821 BLAKE2B 79b6cd719dbf36ca65b186c6682c9617fb89cb76aa530e4f40850004170703990054b5e96f700c652b11781e0086490824ce2433e33b17c03655fea089f59ceb SHA512 30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9
 DIST alsa-utils-1.2.3.tar.bz2 1277105 BLAKE2B 70037123de16d4d267fbe862acba31144e1f060cb01c294cf0691d9378e1f04b108c9f3a5e071979abe9b5c1c15a49facc9e0be73122caaf812047a514e4de4d SHA512 5aeba2e5b7279c62d4df85b61a26b3f41e5465bac5a0b94c7bbe1299f7aa38e8cf2a1f749f618289a63b61f76609fe54169fcbe70792b45adc8957811b672012
 DIST alsa-utils-1.2.4.tar.bz2 1286259 BLAKE2B 41eb0b8186c1956c19d8f8b28863ab54c66ff531b9ec5c48cc6c5ed8ca249d135614112ce412d6adb6f21982235e06a4148591777cce00d17ea537aacbd664ad SHA512 13080abda55269513b3751044dac292d695e273073a62d74ed4a32c68f448a2b015fe16604650821a6398b6ef6a7b6008cb9f0b7fb7f4ee1fa2b4eb2dcf29770
-EBUILD alsa-utils-1.2.2.ebuild 2333 BLAKE2B 7f41b2078071ce6425749c8b61237f6744168a4f143c90d38c22b44dc57ffc0f36eb159fd64a586d22c6846d9bdcaf4b29ff37afcb2194831cf4918846ce25d2 SHA512 77a897f3ea2632b6603e26455dc2a3956fb623fcd0934dd6484ee540edb6fc2f7f3a022717657b8975543e317abc252dc0a1e953deb589a3074e44f74ca04030
-EBUILD alsa-utils-1.2.3.ebuild 2333 BLAKE2B 7f41b2078071ce6425749c8b61237f6744168a4f143c90d38c22b44dc57ffc0f36eb159fd64a586d22c6846d9bdcaf4b29ff37afcb2194831cf4918846ce25d2 SHA512 77a897f3ea2632b6603e26455dc2a3956fb623fcd0934dd6484ee540edb6fc2f7f3a022717657b8975543e317abc252dc0a1e953deb589a3074e44f74ca04030
+EBUILD alsa-utils-1.2.2.ebuild 2334 BLAKE2B e8dceb69a7dde34306d35baaa15b8e986a3b0d9099fc110e2ebcb05f6961e63b643ba80026f35477cc15368f31f7d36eb55f4233b10d194471024a45978170a1 SHA512 a28f3b896110d432768193b5122feff2190334ef0ffdf6f48f393a57b29b4edc289a97ccd8d3e851aa970a72788ea309c5c95331bb38253f95b5221a719a0835
+EBUILD alsa-utils-1.2.3.ebuild 2334 BLAKE2B e8dceb69a7dde34306d35baaa15b8e986a3b0d9099fc110e2ebcb05f6961e63b643ba80026f35477cc15368f31f7d36eb55f4233b10d194471024a45978170a1 SHA512 a28f3b896110d432768193b5122feff2190334ef0ffdf6f48f393a57b29b4edc289a97ccd8d3e851aa970a72788ea309c5c95331bb38253f95b5221a719a0835
 EBUILD alsa-utils-1.2.4.ebuild 2341 BLAKE2B d3634b987e5fe5917a2f5e336ef9603a141fc67b1e7a89d258ffaa7c04d5b674613f7232d8d6b1f00f687a0471ab8bdeb28e7e2eb4164a9f9e5b098cac614b43 SHA512 73cf0447b2e8e97e8d53d518a37a637ae939e6a9640a198847bc7be8e60d13e690ea5ba53691f837cf8e981fdd7b542fc4577f6fafb598285361cb46677ba9c8
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
index 13b172c0891b..0ec8d4c4e195 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
index 13b172c0891b..0ec8d4c4e195 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/alsamixergui/Manifest b/media-sound/alsamixergui/Manifest
index 056735e8c0f0..3ebc814b5202 100644
--- a/media-sound/alsamixergui/Manifest
+++ b/media-sound/alsamixergui/Manifest
@@ -1,6 +1,7 @@
 AUX alsamixergui-0.9.0.1.2-fltk-1.1.patch 481 BLAKE2B f95c1efd41761972fb0d40fd19d6f23e02a277f58ddf52b314137697425de3cd8dabee13c4749895ea393f8ad9d336b9a14692dcd29885588c57699a84944333 SHA512 c4d7ecb6f332b27fc89d2d4693cdeb583374cf2700f523b568f04d0b7d4658cd73dc8e7594fd21dcddd001405fdbde5e69a8548f412131bba9d22a887e4da644
 AUX alsamixergui-0.9.0.1.2-gcc34.patch 338 BLAKE2B 72d991c5ec3c88c0d96031f1feecefbbba365283295bfcd9484b1fb4faa51d3e743e3a63d19c8a143a0ee4a72f38de365f8f983cb1abdea4487cc527d57e5061 SHA512 5fe717ef8dd9fe3e339b1b96ac255950bc93a4e850aba1dbb546cb02e3c2c9cd4a7e2f93dbfb46002da0e90ed3fee89ac7f2024eb2bb8689a50e7cf124f33c19
+AUX alsamixergui-0.9.0.1.2-strsignal.patch 402 BLAKE2B d5b332c18e7a2427df9be1ab66605bb74cb0947b3a369f0e4414f0e3c067a3b1f2b3a15e342a282ef4dfc95731c26b9a25c8410c9da0132ff8813a347c3b87e9 SHA512 021e96627f49a94b3d7fc547951544e1da9f3c0eb7b8594dde1b7543576e01b28c790b290c6fef8172867cfe15089bb07289f2f9cf758dc6c39fc978af0a4439
 AUX segfault-on-exit.patch 325 BLAKE2B 591d498aa051a2f4405a9d068c84218c38caa9ae237db602a1bda6ce57d99e8ca3d9102ca307c3aaaccd3e2cdd93db74585fa8fc01a59d92d78fc517fee2aa38 SHA512 de0795e1220283822c658204b734d45775d4e1c11582920159eb4016a481c15e4a6c1f4b5f39b451c154a7459f8958506127c75403ac2731ea695ea0a28ed56f
 DIST alsamixergui-0.9.0rc1-2.tar.gz 70255 BLAKE2B 6caac083ce8edbd701fdc6f24bf19e1097dc260d92c4dfeb20f4b5cabba606882d3a94542e01567ef403708c29d0ca7933228b51926f4587d935042466c597af SHA512 c1eac24c87e3d3dd8a582312a24e4f517d084845a3a0cd0a7253e3386685d72a691fe138853002b0277361d397271fbc9f445fd5ad0f5d604e5ad022a408d6b7
-EBUILD alsamixergui-0.9.0.1.2-r4.ebuild 934 BLAKE2B 719a34413946dfb116ba2656c5189723628c9977047a30a5dec56f5288bdeef4f69e33254e86f86007667a6c4c395d416766d862e3737aa5da0346b41bcd1a11 SHA512 aabd5c4fcba4b7c0b8c88d8446c2f6027fdf1c7cce70fb30e6c02c0de8c1eafbc6120b904e4ec9f524e341b939340a853a58012949364dc8b8beae489f313325
+EBUILD alsamixergui-0.9.0.1.2-r4.ebuild 970 BLAKE2B 67dc9f74c6779ed5cac6d4513f37d68767c408a60661d8617fdf5108cf241cb32d6331e3eba3daf159e0adae6a82b8b7efa93dd326511e1f2d36bfc3f93512b7 SHA512 df6be6b74c684448e9a870dd456846da119496a4667d4781ceb6d18e88e66903783b2979bc2e31dff53a0f9feff16de5fd20c83fe824b05eef1e047d7979f9bb
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
index 16bb940cc173..1144c94e53b2 100644
--- a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
+++ b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
@@ -27,6 +27,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc34.patch
 	"${FILESDIR}"/segfault-on-exit.patch
 	"${FILESDIR}"/${P}-fltk-1.1.patch
+	"${FILESDIR}"/${P}-strsignal.patch
 )
 
 src_prepare() {
diff --git a/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-strsignal.patch b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-strsignal.patch
new file mode 100644
index 000000000000..cd72309f9a0e
--- /dev/null
+++ b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-strsignal.patch
@@ -0,0 +1,13 @@
+diff --git a/src/alsamixer.cxx b/src/alsamixer.cxx
+index c7fda51..0d17e21 100644
+--- a/src/alsamixer.cxx
++++ b/src/alsamixer.cxx
+@@ -2081,7 +2081,7 @@ static void
+ mixer_signal_handler (int signal)
+ {
+   if (signal != SIGSEGV)
+-    mixer_abort (ERR_SIGNAL, sys_siglist[signal], 0);
++    mixer_abort (ERR_SIGNAL, strsignal(signal), 0);
+   else
+     {
+       fprintf (stderr, "\nSegmentation fault.\n");
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 069467807534..6c57b33ef901 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,6 +1,7 @@
 DIST Ardour-6.3.0.tar.bz2 11863993 BLAKE2B 6b50d0e4b1effc8893cf555098f51458920db6c26a2db8f3c75a5eed56a4d8dafa1565717da2a75577f3068cbce4777f502eaf96f275ed3fd042c6388b842487 SHA512 ce1a6f1b92adb2df0c8863ead9b5f3d8c62a810b224262bda75bca4c09b11826266794260c63bb40ec8d75fbba6fb746a0dff4526311ab1035a3a8ebf0de2dd0
 DIST Ardour-6.5.0.tar.bz2 12000901 BLAKE2B a44ba0b6b071e6b0c9b4bad86c1454584e4f1ee360de490e176af022d5862d57bde97edbe5f8d0ed2fbc5597ab6d8d1ef7f4a2691e7183d59b38d5a143c2d5e7 SHA512 28bb0939c12b687e136de7a8b1ce28f1065d4040bdc171e228c648586bd5d3bd25ab00c677aa55f835e060cc8cbd0a1d1c283c018e4ab0d72d8bde0eb0a26f2a
 EBUILD ardour-6.3.ebuild 4419 BLAKE2B d8ec8546041eb45e1aef45b41139af34e427d06094cf2cb852188e362f694283e24ccdb9d54d1a9767325755c5d243935eae05aaec1e1021decf3fd8107bf83c SHA512 8bfa2d6eec80d481544abd581ccbd8295d980a13569e2263534e412b25a83f70dd5908f099558844e13340d287d14432433a273cb9239b31388ebc45b6ea80eb
-EBUILD ardour-6.5.ebuild 4310 BLAKE2B b225682af4b2313a1b19d1783213e697db309087035342badbb16a859182a2dce8f2552ba1cc5aaccae230a28513e14050701a7bcdbb62a274c351be1b0a035e SHA512 ffc827acc249c59c0d9db99e0043ec4aeb99fb9caafc47f13e7a24d8fea0cce3375efba72ccc321f3e5a92f19309557c83a09ae7a9c3916507a47af8b0f52e6a
-EBUILD ardour-9999.ebuild 4090 BLAKE2B c3da061eefaee34c10f45e19c8d52be1a1de40fd2cc56f8668aabf932d7f18807dbc16885307548f77dc5c5007e6a30810636473d92f9c7d625c229675abbbcc SHA512 f527f0fce3f64cabf7be4555cb9bac3cb346eec8b25125c6a15449486b8449e30ac476fb315edf00d2cf4284aab7953f7df42e3d944a3b5d84736063b8b517eb
+EBUILD ardour-6.5-r1.ebuild 4778 BLAKE2B 936077b146fde6bce25de65c7b0a3f9c7a9a0f47455cc96657273ca7d88b1b20f1b7596938e38b53d638a2661c39d76d967e27be06f943b95dd385e3d9e00878 SHA512 c910db0ef73eebe05de80aa5cc013aed4a0f2cc4766f7a41933e42c5bc934cc1ab4cd0e38063a710dbe440f81ebd95b85c3b7cddcbf9f2bdcc53b1d57a413e04
+EBUILD ardour-6.5.ebuild 4309 BLAKE2B fb248e3568cbbe3bef26a4913814251a191586afa60bf032c95239aea33469ecd005f0b1fb2df4dbc8e5fb0c784fac943ffd30db4fa4b2a5e9f5bfc397ddfcdd SHA512 b2aeec9bf7afce73229840bf556cfb1d18ef79d31ca6f3e97abade00e7d24fc32bc90b84ed5a57a7c93ab50be889e25fa63be6e4cb5917f0c74c47d95bcc0206
+EBUILD ardour-9999.ebuild 4778 BLAKE2B 936077b146fde6bce25de65c7b0a3f9c7a9a0f47455cc96657273ca7d88b1b20f1b7596938e38b53d638a2661c39d76d967e27be06f943b95dd385e3d9e00878 SHA512 c910db0ef73eebe05de80aa5cc013aed4a0f2cc4766f7a41933e42c5bc934cc1ab4cd0e38063a710dbe440f81ebd95b85c3b7cddcbf9f2bdcc53b1d57a413e04
 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e
diff --git a/media-sound/ardour/ardour-6.5-r1.ebuild b/media-sound/ardour/ardour-6.5-r1.ebuild
new file mode 100644
index 000000000000..225b16116073
--- /dev/null
+++ b/media-sound/ardour/ardour-6.5-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+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 xdg
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="https://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="6"
+IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	dev-cpp/glibmm
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm:2.6
+	dev-libs/boost:=
+	dev-libs/glib:2
+	dev-libs/libsigc++:2
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
+	media-libs/libart_lgpl
+	media-libs/liblo
+	media-libs/liblrdf
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/libsoundtouch
+	media-libs/raptor:2
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	net-misc/curl
+	sys-libs/readline:0=
+	sci-libs/fftw:3.0[threads]
+	virtual/libusb:1
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	media-libs/suil
+	media-libs/lv2"
+#	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	jack? ( virtual/jack )"
+
+pkg_pretend() {
+	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
+		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
+}
+
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_src_prepare
+
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+	MARCH=$(get-flag march)
+	OPTFLAGS=""
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+		    elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+		-i "${S}"/wscript || die
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+	append-flags "-lboost_system"
+	python_fix_shebang "${S}"/wscript
+	python_fix_shebang "${S}"/waf
+	my_lcmsg() {
+		rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
+	}
+	l10n_for_each_disabled_locale_do my_lcmsg
+}
+
+src_configure() {
+	local backends="alsa"
+	use jack && backends+=",jack"
+	use pulseaudio && backends+=",pulseaudio"
+
+	tc-export CC CXX
+	mkdir -p "${D}"
+	local myconf=(
+		--configdir=/etc
+		--freedesktop
+		--noconfirm
+		--optimize
+		--with-backends=${backends}
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+		$(usex doc "--docs" '')
+		$(usex nls "--nls" "--no-nls")
+		$(usex phonehome "--phone-home" "--no-phone-home")
+		# not possible right now  --use-external-libs
+	)
+
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	waf-utils_src_compile
+	use nls && waf-utils_src_compile i18n
+}
+
+src_install() {
+	local s
+
+	waf-utils_src_install
+
+	mv ${PN}.1 ${PN}${SLOT}.1 || die
+	doman ${PN}${SLOT}.1
+
+	for s in 16 22 32 48 256 512; do
+		newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
+	done
+
+	sed -i \
+		-e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
+		-e 's/;AudioEditing;/;X-AudioEditing;/' \
+		build/gtk2_ardour/ardour${SLOT}.desktop || die
+	domenu build/gtk2_ardour/ardour${SLOT}.desktop
+
+	insinto /usr/share/mime/packages
+	newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
+
+	insinto /usr/share/metainfo
+	doins build/gtk2_ardour/ardour${SLOT}.appdata.xml
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Please do _not_ report problems with the package to ${PN} upstream."
+	elog "If you think you've found a bug, check the upstream binary package"
+	elog "before you report anything to upstream."
+}
diff --git a/media-sound/ardour/ardour-6.5.ebuild b/media-sound/ardour/ardour-6.5.ebuild
index 1630d2192905..5d07fea09b03 100644
--- a/media-sound/ardour/ardour-6.5.ebuild
+++ b/media-sound/ardour/ardour-6.5.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-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index b4637a515b8a..225b16116073 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 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
+inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils xdg
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="https://ardour.org/"
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://community.ardour.org/src/Ardour-${PV}.0.tar.bz2"
+	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
@@ -65,10 +65,16 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	jack? ( virtual/jack )
+	dev-util/itstool
 	sys-devel/gettext
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
+	doc? ( app-doc/doxygen[dot] )
+	jack? ( virtual/jack )"
+
+pkg_pretend() {
+	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
+		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
+}
 
 pkg_setup() {
 	if has_version \>=dev-libs/libsigc++-2.6 ; then
@@ -78,7 +84,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	eapply_user
+	default
+	xdg_src_prepare
+
 	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
 	MARCH=$(get-flag march)
 	OPTFLAGS=""
@@ -117,30 +125,55 @@ src_configure() {
 
 	tc-export CC CXX
 	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--configdir=/etc \
-		--optimize \
-		--with-backends=${backends} \
-		$(usex doc "--docs" '') \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(usex phonehome "--phone-home" "--no-phone-home") \
+	local myconf=(
+		--configdir=/etc
+		--freedesktop
+		--noconfirm
+		--optimize
+		--with-backends=${backends}
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+		$(usex doc "--docs" '')
 		$(usex nls "--nls" "--no-nls")
-#not possible right now		--use-external-libs
+		$(usex phonehome "--phone-home" "--no-phone-home")
+		# not possible right now  --use-external-libs
+	)
+
+	waf-utils_src_configure "${myconf[@]}"
 }
+
 src_compile() {
 	waf-utils_src_compile
 	use nls && waf-utils_src_compile i18n
 }
+
 src_install() {
+	local s
+
 	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
+
+	mv ${PN}.1 ${PN}${SLOT}.1 || die
 	doman ${PN}${SLOT}.1
-	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
-	make_desktop_entry ardour6 ardour6 ardour6 AudioVideo
+
+	for s in 16 22 32 48 256 512; do
+		newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
+	done
+
+	sed -i \
+		-e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
+		-e 's/;AudioEditing;/;X-AudioEditing;/' \
+		build/gtk2_ardour/ardour${SLOT}.desktop || die
+	domenu build/gtk2_ardour/ardour${SLOT}.desktop
+
+	insinto /usr/share/mime/packages
+	newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
+
+	insinto /usr/share/metainfo
+	doins build/gtk2_ardour/ardour${SLOT}.appdata.xml
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
+
 	elog "Please do _not_ report problems with the package to ${PN} upstream."
 	elog "If you think you've found a bug, check the upstream binary package"
 	elog "before you report anything to upstream."
diff --git a/media-sound/aumix/Manifest b/media-sound/aumix/Manifest
index 07b689da15dd..78934f1ebd71 100644
--- a/media-sound/aumix/Manifest
+++ b/media-sound/aumix/Manifest
@@ -2,5 +2,5 @@ AUX aumix-2.9.1-fno-common.patch 5798 BLAKE2B 1d3c6bf6b501b3daf4b96e1b2093b9a3d9
 AUX aumix-2.9.1-tinfo.patch 737 BLAKE2B faae7740cbdf0af61df2febed5a7901822b73682b3e294a46b901b033c87e1900e7256b073cf0e5257ec3db32218e106cf350059a0f62ba7d29992179ea98d64 SHA512 9a2e68378d7bf7920ae2004ecefb2bcffdd829cab0c09340796de4d1617f0959e2b68432c9e29f748179abcfef87c22b8a3698615eef6485e1d7e17383d3d7eb
 AUX aumix.rc6 1037 BLAKE2B ba9842705caa5e78c7d5886afa6c8408a50169ec79a788d49ca04a8c90bcf581dcb96f4b11c8b6004370143ee6a92d9e0b660132826b2b9e167a07a6dfe73001 SHA512 8960c6c5e61e15e981bfafff7b03aded627971c11d6c21ce9e0d953737f440885fb5dda6a9f942112697c344b4f3ad9f222e2a7cfa493a504dc75a8f4c8cf1c9
 DIST aumix-2.9.1.tar.bz2 231622 BLAKE2B b96075d310b1d04bfc697a9097fd656d85705f68f1b06b1e6ee5bc0ca2b2a3614df67980d0f6e293c4d99adb9d12fae3608ac446eefd1cdf4f04de7f4a5fd1db SHA512 bd063dc9dab8455f467fbe9e4ea1baa5cef914923e66ab5a8fca1e6964cac7851e3755f054bfe41657371e221920fe9a52f9807457996244f4bcd5db4659b21d
-EBUILD aumix-2.9.1.ebuild 1033 BLAKE2B 018bf631c1a68ddd3561cb9e65ec2b8198f08c4bed769b7254d5c859f7567db2aad38b85c587635aab852586657bd02832730453edfc31e7b38da8d1290bbbd3 SHA512 30da0c21889ce0a30e6ec950dc3d6a2d7c936d238981c002fef4b36fc182088d65641e7b357716d9792c757ce9289087c6e37dadaf4192cf96589418dc7120cc
+EBUILD aumix-2.9.1.ebuild 1034 BLAKE2B 3ef8823898ecc12e9d1fee96864cef780ba2c078c7bb37213f6e01ab4c6c87ff36c1f16bd0ab116a149334c6ae0736efbeb1b1fb56e63e169157741aa5760000 SHA512 c1bdb50e7c39d330086bc208b80f80021d9bd2f1d5c8af36fd75b0a7bb31819c5abfc407a44132d9a2546b3725e5e56ff80893762cab07109aa222e3c1601283
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/aumix/aumix-2.9.1.ebuild b/media-sound/aumix/aumix-2.9.1.ebuild
index 76cdbdadc38d..0ba7907dfef2 100644
--- a/media-sound/aumix/aumix-2.9.1.ebuild
+++ b/media-sound/aumix/aumix-2.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://jpj.net/~trevor/aumix/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="gpm gtk nls"
 
 RDEPEND="sys-libs/ncurses:0=
diff --git a/media-sound/bplay/Manifest b/media-sound/bplay/Manifest
index 1c2f267419e9..51f806f97421 100644
--- a/media-sound/bplay/Manifest
+++ b/media-sound/bplay/Manifest
@@ -1,3 +1,3 @@
 DIST bplay-0.991.tar.gz 18920 BLAKE2B b5a749db4d67c82361d2f1c2fd4fb209c959e782071516c739d6711dc069ee8ed925b7310b819eeca6bca381176ee22c8efdf183a5c624a00282a19e75e2e29a SHA512 95f1dbecf97aa9ca96c56220a96873ba3895b61e70b6873665fd054617a9d46b9fb973115efc906116d477db4a665a13c8d50157f6bfb6581d080ec27c853971
-EBUILD bplay-0.991.ebuild 624 BLAKE2B 0c9d29753aa6143f6e3e27318e9e6769302d11542213983eedaf7838a97c0f0c4456eb7bc1f52723118ddc753fe5902a02d0f64fdda8a510b942af4757b1488e SHA512 3840854bc7e54667b5dd27797dfdb8d4bb8e70fa1257b2d587b7f60cac0179e4d9f598f398cbd7140c36842fd99b9a15ed43f6d5898897a293742b3a9366abe9
+EBUILD bplay-0.991.ebuild 625 BLAKE2B 2ea40a1deec0564afdab223f485fb241becb5397ce1242e972d35c192d28a49f7efac89dc8bc37c85073b76db28d897371b4f04cb1ded2b3f16e9225db18b771 SHA512 12ceb9a807c5be9a51236a9c2e9190a7e4a2f13a92cd905552c33d313f93b96fbe013347dcbe940f205ece9342c4e622be044abaa6b4c49e43bfd27539965737
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/bplay/bplay-0.991.ebuild b/media-sound/bplay/bplay-0.991.ebuild
index e4fbbb9e3c7a..2180202c8582 100644
--- a/media-sound/bplay/bplay-0.991.ebuild
+++ b/media-sound/bplay/bplay-0.991.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.amberdata.demon.co.uk/bplay/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc sparc x86"
+KEYWORDS="amd64 ~hppa ~ppc sparc x86"
 
 src_compile() {
 	emake \
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index 0ceeed1418ff..e13ce3129c41 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -1,5 +1,5 @@
 AUX cdparanoia-missing-sys_types_h.patch 876 BLAKE2B 4624baa06a6d9c4d233104267b35e90431c56405398f985292980dd416809fc8f015e7bd8b3575bb4fd4fe0fa03c1167e0c849a9d30523e1fc1b6e8c31b0993b SHA512 a124c74e7ecfc0238d7e5581063d51fd7aa18df6dae5709fe38662c33f0c9dd0706cbd834681d09f84f2ee2aa0914662740754d181f448b593288382eab68627
 DIST cdparanoia-3.10.2-patches.tar.xz 12228 BLAKE2B 0a78bf713807ed738110543c0e4a8fb5af8add5c77b93b3cf219b1dd19d1317d0bf0197c9bf1cc2217b37c08ab1ff576982a0408d2c0adf6be79f25e35e0b36c SHA512 48ef57334f48d8b7449ea5ca361666d1a618529bf2e78182026fa09a94cd55865d18f4925369bf9de2c251d9420c0edfae17eb8726c157bb6eafd8b4fd410a5a
 DIST cdparanoia-III-10.2.src.tgz 183236 BLAKE2B 295065388e45371329ea7b04bac03c90fd854478d34eb46fa95db03054a1a21effe7863e5065a9148e558796c352d5087b6ef1c3c4c20342e66abd7d2c9eef85 SHA512 4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4eeddb9e8baea675fe51c06138d913342afc8bed167d9fa55672fa25a2763ce21f7e24c1232e4739aff20733a7
-EBUILD cdparanoia-3.10.2-r7.ebuild 1439 BLAKE2B f381f68873658497ec66917e288b906094f393f8b9a868c781d92e7b193f847195e67c7a16c3bdedbb72ba4cdf7321e19538905d5b6df31b91e8bfb1ce714fcf SHA512 57b0c6e44eb66ade975a7d027e0017a303a24de702ef1ebe0682f59f895a9d87475963010ba86667b8196f8f660a5db8d67a12cdba7bbf3b8d351161cea9715b
+EBUILD cdparanoia-3.10.2-r7.ebuild 1440 BLAKE2B afd0b075ecd7548e47ab12c914ee82203a788feb08c0a066d57aa4e28ee0917a3fcd8804a548e5894c51d04aa5a0a5793efa685bf0c09524b5f52460b109e2d0 SHA512 c5f3498fb90096a2a534a1797d4659ffb90c16de247ac195c1e4ad3d1919385f39c54ccf0e86986383f6b1494d13a6a4e28bfce5cf02545d8992ba4d8d7796ff
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild
index afbbe92e3f8d..b0138601ccc8 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${MY_P}.src.tgz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-eselect/eselect-cdparanoia"
diff --git a/media-sound/dvda-author/Manifest b/media-sound/dvda-author/Manifest
index aabcf89db97d..1f0e03485ee7 100644
--- a/media-sound/dvda-author/Manifest
+++ b/media-sound/dvda-author/Manifest
@@ -1,3 +1,5 @@
+AUX dvda-author-10.06-desktop-QA.patch 301 BLAKE2B 5ea771cf5da1b5ad4faedcf7aa4a101cadedfc8789383839214f080d8281bf810c90485c313f6cf532ddd2677ab295a17e30bd270df9074cdb0506f31eb35a57 SHA512 e603dc660918350ccf3bdec2e1833459a2042d2a901e620c43ec0ad3750689f39c99c5b6f12105e8364995156b5b47969f4814550a54949a63d3320b2435bcfb
+AUX dvda-author-10.06-fno-common.patch 618 BLAKE2B e07e84500c6725ed7c7f2d9ff5d1733645b0dc4b0b7d46bb14c7b7c63053031ac2c2f39f36c543c2005117220c24b603039a79d227a5d4db9f0ae8119d10c4ac SHA512 556f8c3256e14233a6030b31e01c0d1d2304fe9884e9ed9d235fda7d3cf015d1cc51c0ee276fdbc05f4d27f393b0ba4aaffce29c8ea3a0f5f32c1cb56968198f
 DIST dvda-author-10.06-300.tar.gz 828028 BLAKE2B bb1000024a4879989980246443c2ac7a7f795140b7c6165422793829c927c16fa8603c3a44a2f08e6e677e21871bffca6a5c330878688bcffa1b0fa2862290f0 SHA512 619215e5e9ac4a3e55d2bef0222a931412946f129927f1042807ee25541d64609a5a9189c843fdc30d34bb0e41e0779d821d8c32a16cf89c6227d9925ea07024
-EBUILD dvda-author-10.06-r1.ebuild 1272 BLAKE2B 1218f54db522eea1d3201d3193be825a191cce16fff72cee21db3be77a2fadca0c776872af57477e71cee26303eeffeb3e1dfa780c093c8e334238fe84acb02f SHA512 386b340c4bc8b999ea78d0e084ea9b70cb45126959ea58a2616a7de5db64c081a569ab6af6408455e9d2db1c5f3535e4ed6cf661eaafc46dfe8eb2f818f72890
+EBUILD dvda-author-10.06-r1.ebuild 1292 BLAKE2B fcf8f5caea44c858874cf63a20b7e5727c17602cc5aa99159af5e921691dc2ab0cc6dc7061dfdf452448a402646b5639125993ed35a6f105c5959b7877cd69ff SHA512 23ded05b1854991d3ee7ecfe013960b5e0693fca626e675c4b02a2283532047796dfecab53998de2afd5259d25137edbe54594707813462f2662133c4a632e1f
 MISC metadata.xml 332 BLAKE2B 1501e697062fd49d3cdce60850f04ffbb77f94c547751b9f8f3075cd598cc0dfb291638d8f5f1c356911f78fa3a285eff8cd2acc326fe16cee821682f150bab2 SHA512 85c9b13baabe446a5c74613084fb53f83071219d872dccef40b946c2f36c4df4f0cbc1e964779fe9c989d8081c483d82c10ad454e5d225b00361a851b5e0400c
diff --git a/media-sound/dvda-author/dvda-author-10.06-r1.ebuild b/media-sound/dvda-author/dvda-author-10.06-r1.ebuild
index 965f73db2aae..811fbf5d248c 100644
--- a/media-sound/dvda-author/dvda-author-10.06-r1.ebuild
+++ b/media-sound/dvda-author/dvda-author-10.06-r1.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Author a DVD-Audio DVD"
 HOMEPAGE="http://dvd-audio.sourceforge.net"
@@ -12,12 +14,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-RDEPEND=">=media-sound/sox-14.1[png]
-	>=media-libs/flac-1.2.1[ogg]"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2"
+RDEPEND="
+	media-sound/sox[png]
+	media-libs/flac[ogg]"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/libtool"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-desktop-QA.patch
+)
 
 src_prepare() {
+	default
+
 	# Fix parallel make
 	sed -i -e 's:^\(\tcd ${MAYBE_CDRTOOLS}\):@HAVE_CDRTOOLS_BUILD_TRUE@\1:' \
 		Makefile.in || die "sed failed"
@@ -33,19 +43,17 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--with-config=/etc \
+		--with-config="${EPREFIX}/etc" \
 		$(use_with debug debug full)
 }
 
 src_compile() {
-	# make[1]: warning: jobserver unavailable: using -j1.
-	#                   Add '+' to parent make rule.
-	emake -j1
+	emake AR="$(tc-getAR)" all
 }
 
 src_install() {
-	newbin src/dvda ${PN}
-	insinto /etc
-	doins ${PN}.conf
-	dodoc AUTHORS BUGS ChangeLog EXAMPLES HOWTO.conf LIMITATIONS NEWS TODO
+	default
+
+	domenu "${ED}"/etc/dvda-author.desktop
+	rm -r "${ED}"/etc/{menu,dvda-author.desktop} || die
 }
diff --git a/media-sound/dvda-author/files/dvda-author-10.06-desktop-QA.patch b/media-sound/dvda-author/files/dvda-author-10.06-desktop-QA.patch
new file mode 100644
index 000000000000..adb2d1c53b0b
--- /dev/null
+++ b/media-sound/dvda-author/files/dvda-author-10.06-desktop-QA.patch
@@ -0,0 +1,11 @@
+--- a/dvda-author.desktop.in
++++ b/dvda-author.desktop.in
+@@ -7,7 +7,5 @@
+ Icon=@prefix@/share/pixmaps/dvda-author.png
+ Terminal=false
+ Type=Application
+-Categories=Application;AudioVideo;Audio
+-GenericName[en_EN]=Terminal Program
++Categories=AudioVideo;Audio
+ StartupNotify=true
+-GenericName[fr_FR]=
diff --git a/media-sound/dvda-author/files/dvda-author-10.06-fno-common.patch b/media-sound/dvda-author/files/dvda-author-10.06-fno-common.patch
new file mode 100644
index 000000000000..2f549f02ddbb
--- /dev/null
+++ b/media-sound/dvda-author/files/dvda-author-10.06-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/src/command_line_parsing.c
++++ b/src/command_line_parsing.c
+@@ -33,7 +33,7 @@
+ /*  #define _GNU_SOURCE must appear before <string.h> and <getopt.h> for strndup  and getopt_long*/
+ 
+ 
+-globalData globals;
++extern globalData globals;
+ unsigned int startsector;
+ extern char* OUTDIR, *LOGFILE, *WORKDIR, *TEMPDIR;
+ static fileinfo_t ** files;
+--- a/src/menu.c
++++ b/src/menu.c
+@@ -30,7 +30,7 @@ extern globalData globals;
+ 
+ uint16_t norm_x=PAL_X, norm_y=PAL_Y;  // TODO: adjust for ntsc #define NTSC_Y 480
+ extern uint16_t totntracks;
+-uint8_t maxbuttons, resbuttons;
++extern uint8_t maxbuttons, resbuttons;
+ 
+ 
+ 
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index f4b0741548dd..cb146bc9092c 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,7 +1,7 @@
 DIST fluidsynth-2.1.0.tar.gz 1356096 BLAKE2B f1dcf05a3d776d3e8be15330e2177e59c10da25063cba577b734aed2af98955c18b7184ee73866503c0cc9c5374c14a8a0030f630be98c9319680a34d8cab117 SHA512 d7af4047ebde49ef48098ae9dbab5d90422a4536acf28a2de32d8da67a50ebbbcf30e06833b630bd54e441040be0e432b377e3b63bf666e63106e69cd408ea0d
 DIST fluidsynth-2.1.4.tar.gz 1363975 BLAKE2B 068a8a1722036a5a409331b1bdcf566cb9a1e7b4a27c78adec51c6d82f7c53cba9178c87013f1a9c0ef62d26b1ba876fad567e4c8bb41b8d478632699876e41d SHA512 22e8d2f8b144f96a334aff1f7d183b91e6c5418482bd61553028ff571836b0ca13fff89e7e3cc1c2d08e106a430331d179e607d78b00e218baec433b6d140190
 DIST fluidsynth-2.1.5.tar.gz 1364924 BLAKE2B f5669f49db481ded6d953ee2cdaa8c59bb751f79210d993b69967cca1b71dce12b50fbf258512c144b1578441e78cc5299d96004da5fed44a40fc33858254bc0 SHA512 171ee6b1983ab9636086fb414ae464508f7a9a412cd2c1e7800a19a84d3dff21bbd86d1971f9bb5985e977f808b60e0d0cfbde4551b85fcc4aae4928a1abadbc
-EBUILD fluidsynth-2.1.0.ebuild 3304 BLAKE2B 8ec259e373d03e5fe66892dec0b0c5d97a8454007fce7d5c9b3b4099829d4dc38ce3c943e85e8b54d2aed26a2d0d90c5ef380a9bd163772eb3d3e60fa01efec6 SHA512 9ef42039f11d1262ad04428cf5aa9ecd4727822c63e1e10e5e72293a873e1b260012348b15a2b6c4e955e1e98c0423b103a8792c0e46f706aa0dcb09097dcfa1
+EBUILD fluidsynth-2.1.0.ebuild 3305 BLAKE2B 1f9639e9454da96e7c09ca17d3b456293b5c405d47231851b1c1f549e24edcafc8ae4c98f1e60bb1e6962a98e46305241f7a9a3df6119b19d47e9f4b03468539 SHA512 6e897cbb09f4e42f67ebe34eec8059fccbde7d58b2cd442c5042903ec1b2d6ea38f5d5a38c98ac867a8d742630753fddc9707cbd5156a094ce938996aae6cb4e
 EBUILD fluidsynth-2.1.4.ebuild 3312 BLAKE2B 1c8a6afa7230da8a6873b141fd8d8e04c1bc028fa554e8fbb7ec0e22dcac7e4bc54f061276aa00d5ad68d95036ce45d17749b6158f6de6a0209d7eb448f9d46e SHA512 28eed5a1a2dc075479633380c28f4be8f46270b7244cb900b37a9d922e4e014da67aa690671a593b174f013799d9145281cabb9ac44c23cc34a7fda1700172bb
 EBUILD fluidsynth-2.1.5.ebuild 3312 BLAKE2B 1c8a6afa7230da8a6873b141fd8d8e04c1bc028fa554e8fbb7ec0e22dcac7e4bc54f061276aa00d5ad68d95036ce45d17749b6158f6de6a0209d7eb448f9d46e SHA512 28eed5a1a2dc075479633380c28f4be8f46270b7244cb900b37a9d922e4e014da67aa690671a593b174f013799d9145281cabb9ac44c23cc34a7fda1700172bb
 MISC metadata.xml 430 BLAKE2B cef06a37f27e4ef3a555000188873f0f36a89dc90a3576dc15fb384a8f3c8f5bd38ccb79f56704ec7031823d3057eda17ac975a3ea1e265133e5ff81afc141d8 SHA512 c702d31a98e905d95f95f6cdfc16d8a71de5a5a55628e59e56d408a6599cdf6ab005642ee064217d88e0061c2856692e1446e340a3e80f2bc17ed1d3c2a14e9a
diff --git a/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild b/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
index 32c05e73684b..ad79a07d4339 100644
--- a/media-sound/fluidsynth/fluidsynth-2.1.0.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.1.0.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/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest
index b3884faac2ba..09379332baf8 100644
--- a/media-sound/gsm/Manifest
+++ b/media-sound/gsm/Manifest
@@ -2,5 +2,5 @@ AUX gsm-1.0.12-64bit.patch 591 BLAKE2B f72688a27c9e52bd3e0b40018f2e035da4284c40e
 AUX gsm-1.0.12-memcpy.patch 301 BLAKE2B 887d9dd0c9220284f1ef69bad73e5e311994fb020bc06742cd931fead416937ae25d0e3364432be5c4cc408c57fad80bb524fddf7db75bf53e70158da4a8f089 SHA512 922999a35a5d8f646ebe61d7b7aacadbd75848a5446462a8173e040f7d4b0748c55196c1be0653752f076a01d7eb07e5bfce3fe23b81a38f1ee9f97d61cd6200
 AUX gsm-1.0.13-shared.patch 3750 BLAKE2B 62fda4c22ab90ab5c77211b9c6966eb8286e6c938f5c4b883b3b6efb6e787a0a84f2f5f9b5f124cf10d4ab3055c3c0e6f8ffb81998654720dd621353fe7b80c9 SHA512 b18273436158dc410e7c40a9a290d365f8bf89977663f35f38d783d46d858163cf0b6f73e88e57d928eafc5de7489643ac7194f72fc7a604ef7cba95e8bf6285
 DIST gsm-1.0.13.tar.gz 65318 BLAKE2B 22bb79e3afd9a2e99041693288342b55969207223486200d4aebc61908930040b6b766a9bf673ec6b484eeb95833684c79f34c95d32da17cfb4c36d025004858 SHA512 0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa
-EBUILD gsm-1.0.13-r1.ebuild 1603 BLAKE2B c4c95c893e2273ca95b61446b7d0d71d6bd10b036bc26e807866c21c5e649a4bcc007de257fff245dc4f9175235717d701e545cc28cd76456bf1b86751051322 SHA512 572d3b59a980fd1bfb2994493876d11ec7ada6599d45750dba12f077e936790c8b5aa49d9bd362875b455e409c03c4f8e523018daadbd360ac036a0335fda77d
+EBUILD gsm-1.0.13-r1.ebuild 1604 BLAKE2B b725530e4e1d1b38d3e41dba07994de34395b8df7370e1c3ffc7ff543159f77e014f187c84cdd9e5af34e0db02fbd7b3d1d70b8efac84504ada52c470be00edc SHA512 840328bc0b5b1bb7b0b8229b66493a00872889b815539f2c17065446821e16168bd512bb8bd4d8ce1af3921df5e37d99dd9b185368643ced28f60f6c01a12e91
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gsm/gsm-1.0.13-r1.ebuild b/media-sound/gsm/gsm-1.0.13-r1.ebuild
index 7f0c2275a725..17031a42b832 100644
--- a/media-sound/gsm/gsm-1.0.13-r1.ebuild
+++ b/media-sound/gsm/gsm-1.0.13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="gsm"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 S="${WORKDIR}/${PN}-$(ver_rs 2 '-pl' )"
 
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index 94b5d41f31f6..ae40ea00eae3 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,5 +1,7 @@
 AUX guitarix-0.41.0-nostrip.patch 1601 BLAKE2B dbfbcb84635fed192ef5d3fdfe97f6d30891cd0f7877cccff3cb9125d756ce3a30206ed67b1c4a30f85e7689245c8ec7fd2b12a5894f07756ed6bdb31a4ad492 SHA512 5002b05fa2fe13bb9f28e1b6d8f9cce518550b58e77e8d56fa278fa16232ab94c06618733364b5271667e77700809136333e55db1215ca7b9436f48590b6a297
 DIST guitarix2-0.41.0.tar.xz 70865716 BLAKE2B d3caa51f297153c16df624ababaffc1405ddb10f04ae01672720bb2229d4be3426b33f75021b1862f996fb09466eaad008f748b42cb8382f08d14e23758cfc9b SHA512 27fe6f2b87c8913feafae1c17472150d37df46ed3437b033cd22f509edf67420fb8f4024e404d5bec901a687dbe948acda702bf37cb0c738feb5b3b8e5ebb8aa
+DIST guitarix2-0.42.1.tar.xz 71825372 BLAKE2B 06b2a19d68e77c622eea222e3f0658d9f89c6c8377e9b0442d581e14342f82f97948ca0ebb7ff40f4abd6cab0c9ba582fa6f43f74cad5e112d2e762445f2ab43 SHA512 66a71b4d66e0cbcff7feeceae6317c016e497626c9fde3ca44e1f06e42d9021b2857151660c1c49832cc8e6f2aa27de68dfea67d4e896c7e89f84865f8ba1eb0
 EBUILD guitarix-0.41.0.ebuild 1822 BLAKE2B a970ec4c6f688c4949f3ea3d4dd49764f7d27607135b27b78f6ffe79c42ee71a28c840dac9737187907a5b17dd5b9db4541555113a9f126d29d76b550473f6da SHA512 85992e50d2a78ced1d41116c1023f3960c2d938f1ce2336090f15aec6143b3f480dd6ae445cc11fe1575148633b0f05b08029736257d1108cdeedd1446484c53
-EBUILD guitarix-9999.ebuild 1794 BLAKE2B f0e2ea5236e0a460125fbaf455c75436f689098fbf424de42c5edf3f2410c6a7e027dfcfbf089bb6dbdb90ac9709887350c9542e8863fde0fa0a3930f708c179 SHA512 e19797d623d28ee9a5ba40d100a59b476c1906919e0c088c0a5eea95b95557febaa66235800c5c2ee78653037d935e452338892546dffe510f797666c9ab3cf3
+EBUILD guitarix-0.42.1.ebuild 1831 BLAKE2B ecf9a8f4c9c3e99b3f5030f6a7047b08973898bff8cfa12a4e4e3f9beb68c4e2407716f74d064e141fa580351a64fdbea6363f5fc0b8763971fea218f56dbe7f SHA512 9e46f59f6da98bdfce4f35fc63747073f21d15459d35ec677be3cd8df9780aef0666025ad2731ace7b99be7f1066b216ee22e36a7b4a9a6a897ec5debaf3ee12
+EBUILD guitarix-9999.ebuild 1794 BLAKE2B 21a4d0f0ad5261f2b1a7ec912cb67eb7e6fc88e69992ba5dbc3547fbd27f92c61386d9390145c20b4c136cd2385781441a6c9dcd1132ee1b237f45624aac8485 SHA512 d8732c88dc4afce4742a234f9fe6018d91de10da18df4cf066a670bdf22d6ff9bb68b8ac844faf7d215423ce87cdf98cd11c56aad4cf51121c9f3d30d9b5cfdf
 MISC metadata.xml 661 BLAKE2B b68ff384f8ed21006ee3f7722a481b3b0060729786386ca7f6804dc38481f998a66e714800801417f5b0b429ca42cfb562f9bd289e899365a5d9a4ff53a6e489 SHA512 087467e4dc44968f8ae3ed95daf1da4ef6c39e0af8c58e1bb280ae08c46a568b672a7bd7022ad1a81e86fc6c7a15a13e4cfd61d2eb95ccd019b132a4386d2c28
diff --git a/media-sound/guitarix/guitarix-0.42.1.ebuild b/media-sound/guitarix/guitarix-0.42.1.ebuild
new file mode 100644
index 000000000000..2c8d5e6f5a0f
--- /dev/null
+++ b/media-sound/guitarix/guitarix-0.42.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils xdg
+
+MY_P="${PN}2-${PV}"
+
+DESCRIPTION="Virtual guitar amplifier for Linux"
+HOMEPAGE="https://guitarix.org/"
+SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf"
+REQUIRED_USE="|| ( lv2 standalone )"
+
+DEPEND="
+	dev-cpp/eigen:3
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:3.0
+	dev-libs/glib:2
+	>=media-libs/libsndfile-1.0.17
+	>=media-libs/zita-convolver-3:=
+	media-libs/zita-resampler
+	>=net-misc/curl-7.26.0
+	>=sci-libs/fftw-3.3.8:3.0=
+	x11-libs/gtk+:3
+	lv2? ( media-libs/lv2 )
+	standalone? (
+		dev-libs/boost:=
+		media-libs/liblrdf
+		media-libs/lilv
+		virtual/jack
+		bluetooth? ( net-wireless/bluez )
+		nsm? ( media-libs/liblo )
+		zeroconf? ( net-dns/avahi )
+	)
+"
+# roboto fonts are required for correct ui rendering
+RDEPEND="
+	${DEPEND}
+	standalone? (
+		media-fonts/roboto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	standalone? (
+		dev-lang/sassc
+		nls? (
+			dev-util/intltool
+			sys-devel/gettext
+		)
+	)
+"
+
+DOCS=( changelog README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.41.0-nostrip.patch
+)
+
+src_configure() {
+	local myconf=(
+		--cxxflags-debug=""
+		--cxxflags-release="-DNDEBUG"
+		--ldflags="${LDFLAGS}"
+		--enable-lfs
+		--lib-dev
+		--no-desktop-update
+		--no-faust
+		--no-ldconfig
+		--shared-lib
+		$(use_enable nls)
+		$(usex bluetooth "" "--no-bluez")
+		$(usex debug "--debug" "")
+		$(usex lv2 "--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2" "--no-lv2 --no-lv2-gui")
+		$(usex nsm "" "--no-nsm")
+		$(usex standalone "" "--no-standalone")
+		$(usex zeroconf "" "--no-avahi")
+	)
+	waf-utils_src_configure "${myconf[@]}"
+}
diff --git a/media-sound/guitarix/guitarix-9999.ebuild b/media-sound/guitarix/guitarix-9999.ebuild
index 1f66e9647b1f..5bd6d0e7b8af 100644
--- a/media-sound/guitarix/guitarix-9999.ebuild
+++ b/media-sound/guitarix/guitarix-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-any-r1 waf-utils xdg git-r3
@@ -21,7 +21,8 @@ KEYWORDS=""
 IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf"
 REQUIRED_USE="|| ( lv2 standalone )"
 
-COMMON_DEPEND="dev-cpp/eigen:3
+DEPEND="
+	dev-cpp/eigen:3
 	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:3.0
 	dev-libs/glib:2
@@ -29,7 +30,7 @@ COMMON_DEPEND="dev-cpp/eigen:3
 	>=media-libs/zita-convolver-3:=
 	media-libs/zita-resampler
 	>=net-misc/curl-7.26.0
-	>=sci-libs/fftw-3.1.2:3.0=
+	>=sci-libs/fftw-3.3.8:3.0=
 	x11-libs/gtk+:3
 	lv2? ( media-libs/lv2 )
 	standalone? (
@@ -43,18 +44,21 @@ COMMON_DEPEND="dev-cpp/eigen:3
 	)
 "
 # roboto fonts are required for correct ui rendering
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	${DEPEND}
 	standalone? (
 		media-fonts/roboto
 	)
 "
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	${PYTHON_DEPS}
-	dev-lang/sassc
 	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
+	standalone? (
+		dev-lang/sassc
+		nls? (
+			dev-util/intltool
+			sys-devel/gettext
+		)
 	)
 "
 
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index 8338f0c7b263..190f98b19afd 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -5,5 +5,5 @@ AUX lame-3.98-gtk-path.patch 8523 BLAKE2B 9b5231402293a61f8366383a704056e60edbcb
 AUX lame-3.99.5-msse.patch 557 BLAKE2B 76b1201e0909ee408a9556ffeb3d41b4bd749407b17ab0dc98582c01b027d492ac6e2f09c8758a59a6bb2649fa1c7a55e96fccab0525b0dcb70b6ea44a034dc0 SHA512 9bf5a1b0f8955aeedff6effcab7f657961ad60ce00b5f455c05ce39ad5b03c2a809ba7225a3a33b61b84a36665fafac53e35b14e0d357289e66194a4f0ef9807
 AUX lame-3.99.5-tinfo.patch 768 BLAKE2B 3fbbd31b0b5752ee4c2dad573d053edcbfb80d24b68a876c2092cae37d3450ac6044ec14d26b180a46197093151d614be8400f33ff7b1f6968130412daacefa5 SHA512 504428e0a0b43c467848296c219ac855ffc9bd83fadb54107e8f6b99290b91bc36457635a092fc121972a3c89918f2d81b42f98f6d007f9b571c7bc3f9c2895e
 DIST lame-3.100.tar.gz 1524133 BLAKE2B 6954d30cfd3951ea07762ba5dd7ff27038b78455f423099a225ebf748abddf9970e444456ca5a6179bd381e2205b32293392cb757c203901674860710fe2c183 SHA512 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b
-EBUILD lame-3.100-r3.ebuild 2257 BLAKE2B 56ca48dcfb1bcd7b6a04fa400ade8a75a0dcd92822386dff71573b035da7e4ce9f26fb6fd67140aa5e30e77917e1b9a4d7dd76f562589fd583884a2cfc5c0b04 SHA512 3b2f46092145b0645235089b6755d30cf89dc2d74a83fe9a3011debf99a5d4010d4af7b3c727a9c38964141a4410e18783bd51b18a5ef93ef072820eaf46bc66
+EBUILD lame-3.100-r3.ebuild 2258 BLAKE2B 1887873bff2605c8cf72a48373306a8be8bb5660bfb321a764c131981969581bd00eaac787be88d81db91effef28f336a6f38e55ce801e4c6ae4a3ed0f210d2b SHA512 945142ac3fdae5dc7a17bcd40a6f84c5af1112a597a3fa6747d3a482e3e25dd57a93f7e94ae2b9b182dcad326b40512ab1a2084d04bda23ed8df3747abef463a
 MISC metadata.xml 542 BLAKE2B 726f3dfefda9c1905739448f1a3124e05ddc90e261d147da12a7839185ef3eeb440678d185510a6bdd4bb71ab987b7a24f52ed108f7c646ca6b651434f9fade1 SHA512 8fc2e2658ae34d146894786f1c66800eecf818e2bd9bb807c6b32a8e132340c1568e9f47220be3daaabce2ab6e1e1d5aa817157f2c0131ed01944abbab6593fb
diff --git a/media-sound/lame/lame-3.100-r3.ebuild b/media-sound/lame/lame-3.100-r3.ebuild
index d751b3e1e29a..8217e424a4ba 100644
--- a/media-sound/lame/lame-3.100-r3.ebuild
+++ b/media-sound/lame/lame-3.100-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
 
 # These deps are without MULTILIB_USEDEP and are correct since we only build
diff --git a/media-sound/madplay/Manifest b/media-sound/madplay/Manifest
index 2d770010f3fe..71e354f2e3ae 100644
--- a/media-sound/madplay/Manifest
+++ b/media-sound/madplay/Manifest
@@ -1,5 +1,5 @@
 AUX madplay-0.15.2b-fix-autoconf.patch 3680 BLAKE2B 43f6c7ea82daf816bd6df38f51c808efff962b62edafe8af59cf643632de8ed075ccde4c109368de75df0afa80eec5dd803f36d9ce36d99a519118c4fa0bf48e SHA512 232758235370d5280bd8ca8980edc503d92d0a18edceffff06a2683152b12b9a8fce3a8656284e6d58a91b251978b7a5f88d368452cdf4e9c2bcbbc73514e265
 AUX madplay-macos.patch 593 BLAKE2B 306d4013251f9abf1791c8115f1ccdaf06c706ebae4ec073ff1a6f8f09086c80fc5b3a64d923f9818967f01f2793916ea301b7a078fac5bb879b8d0627180ae4 SHA512 d8989ed522212e984f0173dbb346ed624a2e8664a4c06d2186238018baf20c1f67d4109baa866ccb13cec6695db751be9ab6ac81466e3c786b13a89de4e066a0
 DIST madplay-0.15.2b.tar.gz 590929 BLAKE2B 93a62d04a36247ae8e1f4a63fe183735a2b5a7cd75fcde1ff2261222fad08ec96069b3fe5b7f06ad78a37d5060cff1d233d8139d7d0ff02c5231d2c384fb1a22 SHA512 0e79cdf0c32f48599083ec7a0716d816e3f03254705b7225b1ea9008d53eefd48342dd687b0507f0ff15942218fc07ad1e38c4172508c27755f3e9a0e5412f34
-EBUILD madplay-0.15.2b-r1.ebuild 778 BLAKE2B b5b26b0c18879c070d7e6b14caa135b93cda949c1fa635fcb851abdb2a61c69733c0f94f4655e810bbba4729eb52ed21e28193e08e36484216b915723298fb69 SHA512 fcf4d4c7ce5f03129b0316bc912c6885af63f49c9b8a967bcfcb49e8e764cf72db2e940ee6a2cef6cf1c694d2e8afc02d093d64a2b533bfc14773bd1f94d5f01
+EBUILD madplay-0.15.2b-r1.ebuild 779 BLAKE2B 14a2ed6996f72ae46bf268dc77a6ae50f6048c7e32790eae94d64dca622cfdb688e3f813307b2922fbd070ed7c8d482db9869935f53ea09d248288b44b2c7bfc SHA512 e66e1f37fc26a5c98141c8b374c09e3bbfe5baaa06c1fbff5fc92b9d5aa621e4a11e25e3a03b192a2fe524a8cfe91b7ea997c8aff368b13a4aa21bf219c95e86
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-sound/madplay/madplay-0.15.2b-r1.ebuild b/media-sound/madplay/madplay-0.15.2b-r1.ebuild
index 8b00f0ac9387..e65827d1cec3 100644
--- a/media-sound/madplay/madplay-0.15.2b-r1.ebuild
+++ b/media-sound/madplay/madplay-0.15.2b-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="alsa nls"
 
 RDEPEND="
diff --git a/media-sound/mikmod/Manifest b/media-sound/mikmod/Manifest
index ef98fb5cca69..9a5f82761f10 100644
--- a/media-sound/mikmod/Manifest
+++ b/media-sound/mikmod/Manifest
@@ -1,3 +1,3 @@
 DIST mikmod-3.2.8.tar.gz 279763 BLAKE2B 27731a143d3483289ed0d6809c3ecf0ce504f8c4271e20d4405a99c39e605dc6c0b50c3cd4e689f7c417646f51141b2a8634e74cd55164e9b0e88be750db1a27 SHA512 fbccfd31c49fc1faa159e7174fb0886dc3742ef935b596176fafeb953498ceb04475bebf9b0a948f1e2de1b11a01b130d2f11f4f034199b501ca08823a3ea620
-EBUILD mikmod-3.2.8.ebuild 467 BLAKE2B 667402a4acf573d386b919cb7338a901c647ffa78847e7fc4cc01e0ae2328b11015229a11053ef3d2b047b5182bb8b4efec66a8dac26825420a241462c777590 SHA512 b0c6b564d21c3df27c3b6cbe87e5d225f9724a83ab7f37e40387481bb77095983b993f998fd68c21ced9d218d2ab1cd58e96ebd7eb0aa0a5870447ad9e31f23d
+EBUILD mikmod-3.2.8.ebuild 468 BLAKE2B ce607f9ef7281cf67e83613937e8e457f7980ace5b11cd71082e7bf8fb09de88c2ed37ac56330c6c8554c12fb4ef683cdc7c629e91ced5741dc0af7d0966922b SHA512 da2419c35eec0c6cf8d2aa894a9b8f460690b74a3292dd1596f65587a3a34c299c30e750c36d84a61540ca87d5f56b35772b725aabe1800780e024d0ebe92719
 MISC metadata.xml 329 BLAKE2B f5950a51c451bd95614667a932e0799427831bed04505850b99dc77173b773cb8c158b50053b6c3a41755c8a1bb87077fb538207d56fbcf94fdce44ea0709093 SHA512 5deced2e8ecff6e1098f1ff339281cebfb8027bb052af10c9d95c7ae1eb80db0448cf5b350d40e5d5f76ed9948ffb5e4f8802f200f9b7f139a40992311eedb55
diff --git a/media-sound/mikmod/mikmod-3.2.8.ebuild b/media-sound/mikmod/mikmod-3.2.8.ebuild
index fb6bcae7fbc2..aa4da6360bd3 100644
--- a/media-sound/mikmod/mikmod-3.2.8.ebuild
+++ b/media-sound/mikmod/mikmod-3.2.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
index de720277869d..5d87147d61d3 100644
--- a/media-sound/milkytracker/Manifest
+++ b/media-sound/milkytracker/Manifest
@@ -5,5 +5,7 @@ AUX milkytracker-1.02.00-clang.patch 2346 BLAKE2B 4e957fbc69e4b5aa9ee5f93292df62
 AUX milkytracker-1.02.00-fix-hard-dependency-on-rtmidi.patch 2570 BLAKE2B fe0a454e34c9b7b88125ccdfb6f77e1cc014013a8f054f00c6330e733ba54154bc1d96ef256cf5befc8329c169e57f29062652f0ff84dc55201572d0201111fc SHA512 0112a805d61204ff31ad0b1b31cbc9ff60f91f5ada275a839f0c258c3f5302239fd9b00ba7d8387b5865ad2ea86abedc32630ff2f1b58c0a74bfa67895a5676a
 DIST milkytracker-1.02.00-cmake.patch 40073 BLAKE2B cef8fc7efff9324c1d628026d650c79e11950b53481686e5dd35ace483839fbdd6b2b1f8ccce2f688beec2c7c28b0fe3b60d0e8d540d6cd163927f4bacf9d396 SHA512 bd4ca0d092229722ca81addaf9eec3ff1b176061da7b44fe3f02fbe020c3820778ed973dde95588b4c9f918728e2c69c24ac23083a2f48c0cbad2e854eeff5ba
 DIST milkytracker-1.02.00.tar.gz 3753882 BLAKE2B e9bb4341e016d2a9c518835e8b4620f748da60bca7205302e7500f14f3294e7fa9a20fef203226fffbe22a11a3b4978ea928f0f544eb70e99b5998ecc7c45611 SHA512 479a7b3198d97c68dca4fa772a2aa64d7f740957f5d8038fabfb303e724c85aec0865746a0a5c3ef6b9599b78892dcda22727ab2bb80ae38764bcf81b249e134
+DIST milkytracker-1.03.00.tar.gz 3705395 BLAKE2B f14a7112de39748121933d242d89dc6efb71a73c3591fedb92785814e2edc788edfb6608e9237cdfed19ee7337d5920d0232eed5d85f692dbef5d4cb43a27cd0 SHA512 d5489994d9c5d24552073afcbd787c20720096dd81d640356fc13b2e2b8a49713b798066d54f2b589f3819c14279142e295e4d6317ed325537069faad47abbe6
 EBUILD milkytracker-1.02.00-r1.ebuild 1527 BLAKE2B ad59c3aec2f8c6875131d84463a76a586af11f2222a073728ec26f7117362d1e0f8447b7b41d5fb56cf9f03816f1e10e9ad0430a26529ef0c0cdeabd67f83557 SHA512 cf999b71b395b7d42575f374ac4e5b21d3e18db0c749cba2811d63c16a926e3c1103bbcc96c46faa3c91bc18bb056fafd66ed96a2a774b39facac3bc80828c23
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
+EBUILD milkytracker-1.03.00.ebuild 978 BLAKE2B f803f07e825564a84dce1bd856580cb1748694dc5ea1d5d79730a720102ebb45890b21a5e225335d61646038396777aef8602a06aa7a761b10661d658626056c SHA512 483809ebac9d84f9b5e7459ecd2158ed725cf043bc26f7b65c5df2afd67804e75d80292573300b4fa0c82927a1b7ff70bdca20bc1295749f1b77a86baa1bf35b
+MISC metadata.xml 336 BLAKE2B 25e72a4e6699474f9a932ab2f4a7a360165e399b59086d719d4edcbedf4d5a1c08f2b8e790fd7eacddf4e0c3a444fbe640df7fd14b50169b8c92ecc8e0d78410 SHA512 0490c225b35946c04189594aa9d1855b9391ace1ac83914536317df7d7615a33dd1467a45dfb1b3e75a6a677fcd8c460bb6be197ff5d8010f9bf6e4c1ee4e916
diff --git a/media-sound/milkytracker/metadata.xml b/media-sound/milkytracker/metadata.xml
index c870d0eef0ab..a2dc0870f775 100644
--- a/media-sound/milkytracker/metadata.xml
+++ b/media-sound/milkytracker/metadata.xml
@@ -5,4 +5,7 @@
 	<email>sound@gentoo.org</email>
 	<name>Gentoo Sound project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">milkytracker/MilkyTracker</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/media-sound/milkytracker/milkytracker-1.03.00.ebuild b/media-sound/milkytracker/milkytracker-1.03.00.ebuild
new file mode 100644
index 000000000000..7497b79d44be
--- /dev/null
+++ b/media-sound/milkytracker/milkytracker-1.03.00.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg
+
+DESCRIPTION="FastTracker 2 inspired music tracker"
+HOMEPAGE="https://milkytracker.titandemo.org/"
+SRC_URI="https://github.com/milkytracker/MilkyTracker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/MilkyTracker-${PV}"
+
+LICENSE="|| ( GPL-3 MPL-1.1 ) AIFFWriter.m BSD GPL-3 GPL-3+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa jack"
+
+RDEPEND="
+	dev-libs/zziplib
+	media-libs/libsdl2[X]
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package alsa ALSA)
+		$(cmake_use_find_package jack JACK)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newicon resources/pictures/carton.png ${PN}.png
+	make_desktop_entry ${PN} MilkyTracker ${PN} \
+		"AudioVideo;Audio;Sequencer"
+}
diff --git a/media-sound/mp3info/Manifest b/media-sound/mp3info/Manifest
index 1925874eb20e..62744e64a0ce 100644
--- a/media-sound/mp3info/Manifest
+++ b/media-sound/mp3info/Manifest
@@ -2,5 +2,5 @@ AUX mp3info-0.8.5a-format-security.patch 507 BLAKE2B e3a26ec3df15f24436d7c463f69
 AUX mp3info-0.8.5a-ldflags.patch 466 BLAKE2B 77cd382d37bd35cf4cb06996946cd61c98918395eb7cbba021a98084db90ae1024f8729413c1073e619e2de72de5b7f70706280e2d75b1f3eb100021c12b5ca8 SHA512 868b62dd4565e1f59a057bb4af06ba6618ba320f1a28104b936ae889ca851c344c3a221afedcb309bf11287079c86f44d5f92b6cfcdd8a6ef2e4a72508ed052c
 AUX mp3info-0.8.5a-tinfo.patch 195 BLAKE2B b8b25093c6b320d5f635d35b958699072d13498e93921dd7221aa0c5454deaf3ae77fb4a7d5fd7aeaea0a27b2d1737c22749c8a326fd8d9af52aeb5fb1584e92 SHA512 3e2deb03559afa3029c673a7c9bb165c6c3419b19a629f9b55e20f96e49b8132c2d454274a8f5c64e20330c148351c4ef51e92164d230124b9d3a6d90d2b2653
 DIST mp3info-0.8.5a.tgz 127482 BLAKE2B 303b7fb798604693c58e6412e5e282fbfb1ae126166a7c3d12c335953669c6e8482fb287313d6f44fb802545d728a58ae5f58c4e25bcea1d530879fe87910577 SHA512 30e0ef62deaa090fc115317f6c372f408077dfceed7e05faa6744b8516291e38d21f1742732f6532585f0c3d8c705d8c7026c2bed84c97e1f497d433637affd2
-EBUILD mp3info-0.8.5a-r1.ebuild 916 BLAKE2B 4ec37f8814852d8c3a45fb75efbac2f2858971e9e5db495020e435eeea563bb851f899172e453038585e72eb8764a105851467732abddf065edb0d01a4e8218e SHA512 b00a8e80c520bb2d57530d13debc452a256fe69fc87189bdbdd3e93534de29215b73cb59fec42768727d77187fc479e6e7e6a631e064c92db9bb8027f3f79e53
+EBUILD mp3info-0.8.5a-r1.ebuild 917 BLAKE2B 53d8c6ae848de8edb81054a2adebb9050523bc2cb74f582f4b5219832724fe3708e1663ae4ebb4cd35e6debcd8718ea3dd373a4e34a5b850cccce14e966d2263 SHA512 54777c0f8cf123c56ac7096f51895613de74a30fe536415a512ed3b993a65618a3ca4d3a50602857e1c834dfc91e03f0f756207114ca7f601a3a2c0cb73c7694
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild b/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
index 33b63ff7b710..becd6166d685 100644
--- a/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
+++ b/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ibiblio.org/pub/linux/apps/sound/mp3-utils/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="gtk"
 
 BDEPEND="
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 7f1f34be3fa0..e5734eed5206 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,7 +1,7 @@
 DIST mpg123-1.25.13.tar.bz2 910176 BLAKE2B c7881fdfda1d2b5acf27c2bd8b2a25329708b481a500a29b4a6ca89d2fc849c05fa25d35b85782b0d430437853013dba23c3b1519f9e299106317c31786302ba SHA512 2308a899f47eb0d17a603cb8a19ea07b1f338d85d9c2f798fb55732d77c603802e18b6ca0215cc59ccdd70fe89816c09fd16a6a91b1d1cd3834bd7877239cb39
 DIST mpg123-1.26.3.tar.bz2 1046915 BLAKE2B 791fbeb1638b5df8c7c8c6aaa5bf534ff05fac684d10f0f70e5fb1d4bcd59e906c7023926e3a1c1ac5c5622aab7cc50349b24fb6781c79a9d013f38dce77938e SHA512 7574331afaecf3f867455df4b7012e90686ad6ac8c5b5e820244204ea7088bf2b02c3e75f53fe71c205f9eca81fef93f1d969c8d0d1ee9775dc05482290f7b2d
 DIST mpg123-1.26.4.tar.bz2 1050563 BLAKE2B 1a057f8bf6171f78a2041637b8351ef124f58f160ca237f775ae1aeeee1eeb6e1898b113ca5958acb74d818e706b2825af0b1f93312073742a18134aacb6d5e9 SHA512 425162227aafb99b8723428fe9bd403739a2dd68828b86a2cff7f9928a9f0ab3f67420e56c0abe7c9deeb94bce6c6acd59acaa0606ce24c01716465640564785
-EBUILD mpg123-1.25.13.ebuild 2882 BLAKE2B 6df742a1cda39743d832103757aa2792896122bf9aeb32b9ed057f7aa633069fe561cf07b1758ddbc82cb5894bcb5aa1252ac149a9d92560b653423ef7173ab2 SHA512 d5ee996bc7d276f9fc9440b85a9c8dc3a46b8b36b9b4ad3244ed89e10dc3b38dee78caa692c05d3ee81ba9c7762fbf7d8abbcc5ada6f318d3a335278d2159347
+EBUILD mpg123-1.25.13.ebuild 2883 BLAKE2B a4ad4f83a516e57cf4181987fa4d59ca0680fe609b9477085e514a4227f82a819476489178db12e4caee26144416e6f73b3841f8741476a74135f61ff4e22e29 SHA512 1f9ded3f159a9bd6fbc85e1871d410d6919fde7c6cae3f069ec77c9dad3043f866cd74ab5ebd60868bbe2043f3e95f095154461821b7fb159a22125018f1bfde
 EBUILD mpg123-1.26.3.ebuild 2890 BLAKE2B 7a3c28e701250569588b10a9bab6ad3f07d6cb49a63f9daed89d690d80f49bf8a38978a8a7afe30e3575edef046d32695043debdc9bdcf96d66332a4064bf24a SHA512 43d3327264a67f9be02c5b33aca99fa6a00084fd9fe167594465643a6ebd6c380da688ae3d75f14e07eb1d57b61fc00c20ba6b0e9d88eacd74a3aa18155131c2
 EBUILD mpg123-1.26.4.ebuild 2890 BLAKE2B 7a3c28e701250569588b10a9bab6ad3f07d6cb49a63f9daed89d690d80f49bf8a38978a8a7afe30e3575edef046d32695043debdc9bdcf96d66332a4064bf24a SHA512 43d3327264a67f9be02c5b33aca99fa6a00084fd9fe167594465643a6ebd6c380da688ae3d75f14e07eb1d57b61fc00c20ba6b0e9d88eacd74a3aa18155131c2
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.25.13.ebuild b/media-sound/mpg123/mpg123-1.25.13.ebuild
index a3bb45a165b6..6476f6e637a5 100644
--- a/media-sound/mpg123/mpg123-1.25.13.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/mpg321/Manifest b/media-sound/mpg321/Manifest
index 6f7e606c69c8..47ad1857e3d2 100644
--- a/media-sound/mpg321/Manifest
+++ b/media-sound/mpg321/Manifest
@@ -3,5 +3,5 @@ AUX mpg321-0.3.2-CVE-2019-14247.patch 931 BLAKE2B 5ef376d165a61771241389a9c165be
 AUX mpg321-0.3.2-format-security.patch 1154 BLAKE2B be54674f59b5f98118573828b73942fc7f312e02058e358b3c853318021e30cd5062721c568e83317504770c9f44c052289c32007822a7d99a30df7cef20afc3 SHA512 4184e415f7338d35e2169d663ef24d2d4c0acfc7fac9dc40e184538aaf1c6aaaddd3adce6f54755043dc94b0ee90f74fe287abf6c010f677639dd58b814a4fd1
 AUX mpg321-0.3.2-gcc10.patch 2218 BLAKE2B b78e85d6ec04b6b76471bfe48df31ebd312d97c938f30b823f364dffcfa9101ac2033c4710173902fb42767d664f1bc89e0401b725084a062a35d89a01d14cbd SHA512 079cec28a4ce9aa54a7952e548d24804c266e397b2109eb7cbc42396b88a7f6e4ba5112219d645972d293e90ba12e5f696d606c803cff9225888cac1ba0cea79
 DIST mpg321-0.3.2.tar.gz 151139 BLAKE2B d1b043316aca07e61ab61698f1d9e56fd221c4024e69b5262906b280dcb4f67bd32f3ff72b1758ba26cc0fa7d1c5c4052fc6fc87ae9ceec9d0bf77b1d35a868f SHA512 f1bead2c11e4cde0f1a87e1b2e3d216ef80c9a5dd8b219841961688d44a5fc63a54b7af07359766fde0b2712ddc5d0a90b20149c3228cb2d70e830e15c8ab234
-EBUILD mpg321-0.3.2.ebuild 1263 BLAKE2B 7638dc346137e269e038217499a25538151a63b6a71639fe762bed5af19ddd71f6801ff7f95ef8c50d36afa4b74b6554a30b9ebc916b4cdd7aacd78d005b2ddf SHA512 08aad7e63cd5e125843e619c70c1902c16feba7453cee8bf9a9371f63690b70ec2d983d6f7792b7e4f95e858923fa015889772b9db8919ee2b0924ca3d0849f8
+EBUILD mpg321-0.3.2.ebuild 1264 BLAKE2B a187afadd9d7f70861a0ba54a292abde14bd83770209b05c1dd83ff7d55c73c019d4d85d44c2e9b5d70566f54c866b6a9c5d340f5c2b244ffc409cc4139d59e8 SHA512 377a2899a5ffa451cf6df0d67808f2c301a958f90baa3ed8a6226b040f926fd046ca3f42c0ffa55741a38fa79193b9429999983ffdffa172c5ac096b5e27e678
 MISC metadata.xml 329 BLAKE2B d54fd85110b067a080ba1be242f8ee2e5c76b503e7fd6852fba8b1af20873244666fe5d46a1cbdce2a555c44dd057e99801f7974ceac78076c0189976c125960 SHA512 7f66ba87cde258577f41f82b9056b613d1da1741a3dbefe2185562549cf53050d5073b24f07f2b7de25f06b55cdde55653cb8de03d97806a2c47224b8e100764
diff --git a/media-sound/mpg321/mpg321-0.3.2.ebuild b/media-sound/mpg321/mpg321-0.3.2.ebuild
index 390abffdec04..a8fabc342582 100644
--- a/media-sound/mpg321/mpg321-0.3.2.ebuild
+++ b/media-sound/mpg321/mpg321-0.3.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.orig.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="alsa ipv6"
 
 RDEPEND="app-eselect/eselect-mpg123
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index 9b89cf4051ed..7c82863f908b 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,5 +1,5 @@
 AUX musepack-tools-465-fno-common.patch 659 BLAKE2B 603213fe4c979b4a79b9a2103117eb63e3b90933119cbefef32c18c3523d24c6f0eca8beea685d1ef6effb3bec82e53004bdaeed2062a2a14f4a1e7bb398fd97 SHA512 239b353380d534f09fb381520eb29b919cb3f69ac51be8a813e67338de928c91c99c249b6a5b27f297cd0a741b7c10e7c61171b4bd42b5016402b52efa00cca0
 AUX musepack-tools-465-gentoo.patch 2982 BLAKE2B 0783de2ac04e77d8ff337e3ed52b09174e6268aaa9a1c2709b65343753880437b42af8fd17fbf1361811bdeb5caed625f78fa8440c7ccbddbdf80b827da3374e SHA512 5eee2985b4a3201e6d93d24e7cd9244d7e7f64208ae80656cdd6932d3adee2403e14e17ede45a83071a5c5bf21aa938e4786267a2c4b3118053c900aa18b2105
 DIST musepack-tools-465.tar.bz2 167612 BLAKE2B 0748cbfaecec396a4bf054aac5a451f16386becae75cdbb63821c28f7b7d378723df180d909eb3b9e0c7eafa79996dbe7aaab251721fd139b81755e7f59249f1 SHA512 ce933376bc127f6f4acc8500e50b6318a6bc5bf8443547fc0e25b4e8e5881fd7a73aff155560ffbc5161b5d7d03522c73bfbc31e14e1531fe511036a0f657d54
-EBUILD musepack-tools-465-r1.ebuild 857 BLAKE2B 33b98c1579e40beb7b48cdd2060fc18059f0f2b5144d8e4bfcd5aec1abec5e0fbdd29749e92ab8e6d1099a6e8ce010ca02537da63ec3a98f7e9679dbcda6596b SHA512 2c9315102a948846f8b4d5014f5923175c704a6c447cdb16603b8f18b1c552f124e7af9ee86ce393e3fabf20abb5d4ec2cbd6386271b15831bc29759398507ad
+EBUILD musepack-tools-465-r1.ebuild 858 BLAKE2B 234eab95022baf50e4e2039da5238387be129f539dd8de3aa1176a49b6f70f695670303712a713f219af37387e8281f85a988b2d86fa62a36b44c6da32c6fa86 SHA512 681b899dc128a0c5433571673e7352a131bac6a28d16b1c2c7047cfbb41c28bee48d8c31808812c84e038b88281d710a532ab78b0cde860acb5ae8be11e87604
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
index e7f1c0e71931..184c953698c0 100644
--- a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 DEPEND="
 	>=media-libs/libcuefile-${PV}[${MULTILIB_USEDEP}]
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 4259ea8ddf8a..3133a7b1e17b 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,7 +1,7 @@
 AUX ncmpcpp-0.8.2-gcc10.patch 717 BLAKE2B 3edd29e89df2665b44e5b065aeca18c610c6ec1f4c7bd3d0f5f70af51103d40e1f42302277a6bc8013e0c26b17d1d7aa4fc868f9f96a3163cd7affd29aa4c634 SHA512 99298d813391c03fc70ab16ffe8dd57c6151b87f4cd84f25a1747691d8f9f41e5f647b59c0d2ca25808acb995c7df6c99f386a4cc1f3f133b722731ef99a8a3b
-DIST ncmpcpp-0.7.7.tar.bz2 443801 BLAKE2B b0bf1f6264f94fc1d0dce5b7ec8d85607427e5bf8955914fddffd8dec94850e6dd20dd83a966a25353d6ec23a61e92751d83fddec8202d9a843e0ed9e3b32077 SHA512 a0bbe85f154c40513d41e85810de86ed21109b72fb0f2bdb0b78dcbddb3770aff5422b5bb7fbac2b76634c5b9aaf843bed5fc16fc672fcd71bbae911f65c0034
 DIST ncmpcpp-0.8.2.tar.bz2 465713 BLAKE2B 0d07477b3473e1ac7362175cef4bfb085ebdb4c8b1e77f7bb68d8bf4c645fdcccd067d12e2080a740ade18c57dd055f270d2e50096f0ad3afaa40175e19259cf SHA512 9384edd162f40af23e4f26f437356520f117e4e2ab513ed3de132d2f11e597082d1cb7f0dd3696660d0c9bb85ad03e31fb921c97a11c7b28b32c5907fdbb8e8f
-EBUILD ncmpcpp-0.7.7.ebuild 1540 BLAKE2B 72f2e5ade800c373fe544ef0dea32e4cf4fd6d316fb047a7ddc645f0d43543656a7f55fe698ec371ea621a22577c491901e64d4a9450100e65e6786cfb72e1da SHA512 956131ca17f644a5c7666a8bc2f5326c93e95531930ffdfff812783624ccfe539eee1a84a232a6f50a024b49f181c324bf89870fa92f69d559421311bf06567d
+DIST ncmpcpp-0.9.1.tar.bz2 474436 BLAKE2B 89f6a6d68baf54b0a0eca6d3df96dcd5bcd1346e6f93d0a580f2fbbe4b4246218b62e5332f3db2567c9a91ee30ceb367039a328fa7f491c2a756c2c03fed76c3 SHA512 8fa9f512ac09c144eab4e4721a9c54f3f411593fe13c26db12fbaa3ccf6b08d7cd54923e1e4148b2db45dc69431280611b2be2d153513c0d38eaf92af8ceb9fb
 EBUILD ncmpcpp-0.8.2-r1.ebuild 1460 BLAKE2B c8b146f78c34b24fc9daf1f236c9dbbe2f9c02c2da1f758dee18cdf010c7af7c8482d52516af87c843a809ede79dc4395becc57669d31be6c402c2b0430f32f2 SHA512 c781f50146bc50994010e116a9697ddd47efd13afd5ecc5c772530fce3f7308f14a3cfeb53979ba4fe5905109c6fa591422320873b54b8a5dfeded7c826c3d77
+EBUILD ncmpcpp-0.9.1.ebuild 1418 BLAKE2B 9088316711d5675c2e95d4f8755ca832a3a3487ccf84c40e7fdf219c51eb70fdcbf1cee7758f13f9163895e4ddbbfc4c8b4bb581e1fa306388ff6655b6e9cb2b SHA512 785451382a490c876f25bf5351fb5bbd1a0b62519522d491d7cf85cb3e887bc57e4a79f6100d09eb03a9e53ebff1885822c9d0f01b4cd51340c60f09289df815
 EBUILD ncmpcpp-9999.ebuild 1396 BLAKE2B 02aa9bc5abdba9b6464e55f95fafee07937954523c0ecd8c39a03c1fbef6c371c477e6a4d0c0d5b3d71bc51e38d5d141973733de796721f219484a01422cd072 SHA512 bd3d7d50ff46bce31d075372002f9de5a2f977c25d4e68c06c8c1a4110fd9db8d0543542133f90eb279d20e7c36f461aab982cc4ad4e4238cf512b245a8af352
 MISC metadata.xml 1094 BLAKE2B 03f876dd9fec08222052e01b13575058faea3ed2a0295e6fa09a3975d0490b205b4f7ef11444d236a37ad05dac2ed13956417379fa553f699865a583fda8457f SHA512 7736907dab3e73de891816987b8254d41013ec44641ac0f206cee5c3d12d7312d94a32dab44ca072c0fa1a770a702c29ed535eecadb39cdd1b34c5ba4802bec7
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.9.1.ebuild
index 74e3b10a67fc..b5189ed27301 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.9.1.ebuild
@@ -9,26 +9,22 @@ SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
-IUSE="clock curl outputs taglib visualizer"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clock outputs taglib visualizer"
 
 RDEPEND="
 	!dev-libs/boost:0/1.57.0
 	>=media-libs/libmpdclient-2.1
-	dev-libs/boost:=[icu]
-	dev-libs/boost:=[nls,threads]
+	dev-libs/boost:=[icu,nls,threads]
 	dev-libs/icu:=
+	net-misc/curl
 	sys-libs/ncurses:=[unicode]
 	sys-libs/readline:*
-	curl? ( net-misc/curl )
 	taglib? ( media-libs/taglib )
 	visualizer? ( sci-libs/fftw:3.0= )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.2-gcc10.patch
-)
 
 src_prepare() {
 	default
@@ -42,10 +38,8 @@ src_configure() {
 		$(use_enable clock) \
 		$(use_enable outputs) \
 		$(use_enable visualizer) \
-		$(use_with curl) \
 		$(use_with taglib) \
-		$(use_with visualizer fftw) \
-		--enable-unicode
+		$(use_with visualizer fftw)
 }
 
 src_install() {
diff --git a/media-sound/oggtst/Manifest b/media-sound/oggtst/Manifest
index de7154127e8e..ef2e3aeac0c3 100644
--- a/media-sound/oggtst/Manifest
+++ b/media-sound/oggtst/Manifest
@@ -1,3 +1,3 @@
 DIST oggtst-0.0.tgz 19382 BLAKE2B 6af2e7db89e27c5e13d3bc53712631fce2eef78702689b37af3a7a54e32825f95a8b054b82b808f27a2099554c232921ef1f5cefaac962a4bce5dbdf679a6018 SHA512 6ee73f4ff1a0160135583997664eeba75857d1e76ed2e1b5a9be2d30feea064fe6bdd105edd58ad358ee8d9db20f1f3a64fe4b31c6c9dc5bce5241c5ceb2ef26
-EBUILD oggtst-0.0.ebuild 610 BLAKE2B 4ea0e545bacdb06a84a6256fd9492a3be10e6934cbc20a6d37bf6aa887454dec3e7f3a69cadb67022f3b3014d20620af597fc02796259a1f8d29ac5b7e723998 SHA512 8003635cf838344ef1a1071b91c131687bbe84328cf6a6a724df7e88898a00496a7d55df8da1a7644da479323f4ac5598afa2f27f8702892d452e51790ebdc86
+EBUILD oggtst-0.0.ebuild 611 BLAKE2B 5e21cfac5c31f065a37067f06500b3172546aa57e0bf5d6321991e0738da3b7f11cc6243f4ec04b5a427b9c906cac46686792652969f0750e293d0f69b2b9351 SHA512 76efcb7ed16ee377973428ea10f84aa15090fd899cc476e5cf75955887adc677aebe1705bb2f4945cf962f51c7f3956e0c5d1609e42b01555058f80f6e2d4b06
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/oggtst/oggtst-0.0.ebuild b/media-sound/oggtst/oggtst-0.0.ebuild
index a21769303815..788cacb8587d 100644
--- a/media-sound/oggtst/oggtst-0.0.ebuild
+++ b/media-sound/oggtst/oggtst-0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
 
 RDEPEND="
 	media-libs/libao:=
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 2d48837e6514..9f5c81f46be4 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,4 +1,6 @@
 AUX qtractor-0.9.17-dont-compress-manpages.patch 701 BLAKE2B 2d36699ef29e21dc80bb51b4530bb06f039b35006106e5f88bae29e1a813529cc70d861cef134e680036964c034c9f8c9f2b9bf11e115df5c213489e27890de5 SHA512 95d1c8135ceb2afa1b92410ec26a0b6586bd5bb419e4d91f83944d39fa3a877519e60e8c0bda9e4365fa358e9e2fecbd80a61bddded22a745265bc6ada95bbc5
 DIST qtractor-0.9.18.tar.gz 1937478 BLAKE2B 269d2fd9cdb3171155ba32d7af5d6c0ad0037287311d2e77efb706820071fde353c84ba6958c0c0fb75f3ecc22eea5e5f7204018d1503bbfb424f48aefc60150 SHA512 e488f95becde10117fc675a5b20b66378e8ae1f8c388fb12042cafa1f4434292d4156f5fe613b93e0c7409c414df9bf0e614afce843e0a42e4a1bce7c9ee9125
+DIST qtractor-0.9.19.tar.gz 1943040 BLAKE2B 33ccb2e4002a8a666dc9f325dd7f14e66a2f624e0dda9eb916f8b958d01e2a8f72b5e8390946482e6170de9e2fcc28a4efcf8447b6610b21003288e7c7b9f9b7 SHA512 cab7ef6dc259ba570645a7f20efd6816377ae9707e004370f24745e00e20df90be9316543c5cb5ddbdc6bb1c749053bfb964e53ac97dc8ae2dd468e371274bfc
 EBUILD qtractor-0.9.18.ebuild 1553 BLAKE2B b12af248379fdad5200cac3e15f5083d4c26e23957302f940d1ac08bf7375732c97c5fcea6430ba16da74811a91c454803925a2f6977ab9d0176cfbab42aa315 SHA512 f730533f9d39018116e8ea7e9348ffb4e8f3b8df7d0765b2e9320907a668c480f3b05c9a91f1fa125bc0b1eb054bdf2e2e2439a5cefaedf94ae7f9b4e50bcd91
+EBUILD qtractor-0.9.19.ebuild 1546 BLAKE2B 1b0cd7afc0467fdaabcb3a147ad2038b3fb2a45204edc6542880f857dfdf10852d1ed11d93300298bce6706c3a0d742cbf13006b9c556e1a7b5cb2a9c508d006 SHA512 3628da5c441676af9cca53f10ad9e803b4d6b4ebd5873d2b0f157d6a4f0964bdcd8a9a99fadb32a02da0fcfd52374cb557ee6a15bbc5948863e3c2dda26c5ee6
 MISC metadata.xml 860 BLAKE2B aa27e27262c24903643b09cced6d78b2e460d030ecfc420ea4f2feeb1056600e64a08ad4b750925a67a18fcb44929169cb2461f2a277713a5bc56948b83e28e3 SHA512 fe3eb53d21b4595741f6c7f8dd8b290012db53ad843727fde8df513b5c0b599f1964b6e0603c9ba152e683a0df68a332ccff4c2274409c17a1c0fe1e74949249
diff --git a/media-sound/qtractor/qtractor-0.9.19.ebuild b/media-sound/qtractor/qtractor-0.9.19.ebuild
new file mode 100644
index 000000000000..41b62db5a499
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.9.19.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic qmake-utils xdg
+
+DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
+HOMEPAGE="https://qtractor.sourceforge.io"
+SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	media-libs/ladspa-sdk
+	media-libs/libsndfile
+	media-libs/lilv
+	media-libs/lv2
+	media-libs/suil
+	virtual/jack
+	aubio? ( media-libs/aubio )
+	dssi? ( media-libs/dssi )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )
+	vorbis? ( media-libs/libvorbis )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.17-dont-compress-manpages.patch"
+)
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		--enable-ladspa \
+		--enable-liblilv \
+		$(use_enable debug) \
+		$(use_enable aubio libaubio) \
+		$(use_enable dssi) \
+		$(use_enable libsamplerate) \
+		$(use_enable mad libmad) \
+		$(use_enable osc liblo) \
+		$(use_enable rubberband librubberband) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable vorbis libvorbis) \
+		$(use_enable zlib libz)
+
+	eqmake5 ${PN}.pro -o ${PN}.mak
+}
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index c9c6d20c9235..c7a23f97ed19 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -1,5 +1,3 @@
-DIST quodlibet-4.2.1.tar.gz 4908102 BLAKE2B 0c1535e925842d42aafd5ff819b33a5d4527995977dd5d56b84b26462c677d81fcfb6d1de60ce50004a4b4a3eaa69896e430d36d31d904175c38f9deb23c044b SHA512 3817611c887b7c1878ccf852311020ded0a813feec1067f861d1157de6331760166c34992a6e4fe225552ae6ed4472000585fe58a3397faf277ae250f6f3c138
 DIST quodlibet-4.3.0.tar.gz 5061542 BLAKE2B 31ec24f43a1750d065e14fe69d90a1646382ead13362633c08c9c44b17cb1dca02da37612bd30e1737212098fd26947cf637501ed79b34f03167b85cc11cbdc8 SHA512 6e3cd8bebb8abeb6acde6effb08a439479e293fed18633240a1508a015c083c814fb98722c36d3970917970259095499efeb27e323ab788252940714cae2fddc
-EBUILD quodlibet-4.2.1.ebuild 1488 BLAKE2B 12368ad1f061a35589b734acf5555f44dbaf9c27789564ddd68774e1029ea16dc611646af441f36c7e4a23f0918aa96891e9b04b8c86f09854e55653b12a0222 SHA512 ef978a8dca79a18844be64fb9ac87f2cf51755b1c91b7e09a6a5f1a084f008555f198c0ec7f95b9fd2acad74838a82ac2674d5c23b39642c65ecb4437253ca26
 EBUILD quodlibet-4.3.0.ebuild 1508 BLAKE2B 6582acb906dfc807f8c12550f9461be9d24748996b8cbf232fef6303ba4f35e9d2376d4a83cae26e85fb4b2d06e59d1ee4bc819e065daee49f64b71c15386aa7 SHA512 f99235c676241169e62de97145e40b92930ee4a28044a02d07c27b4f4677b2e75a8a3bb5fa620aaf58437abbb6eca6d2b122c3e008255d9e36939e39b7e5fe23
 MISC metadata.xml 1136 BLAKE2B 372295e43337120cabfa3a28f260fa3feff8cce235240be1c65fc0a54922b294cc94124690fdb923d82f78c5866e82bc7becfad334c8e1ca3797b6602a9d0d80 SHA512 1466590147ca42dda2b5c11fe781a39e6d25d205b69fdba20663f1d1bfc2e251123c99990810727a36fbbd7a0c868bf1ddc51e94a38985719cef1bea71f07feb
diff --git a/media-sound/quodlibet/quodlibet-4.2.1.ebuild b/media-sound/quodlibet/quodlibet-4.2.1.ebuild
deleted file mode 100644
index a2e4c41b5038..000000000000
--- a/media-sound/quodlibet/quodlibet-4.2.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="audio library tagger, manager, and player for GTK+"
-HOMEPAGE="https://quodlibet.readthedocs.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+dbus gstreamer +udev"
-
-RDEPEND="dev-libs/keybinder:3[introspection]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.32[${PYTHON_USEDEP}]
-	net-libs/libsoup[introspection]
-	x11-libs/gtk+[introspection]
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		media-plugins/gst-plugins-meta:1.0
-		)
-	!gstreamer? ( media-libs/xine-lib )
-	dbus? (
-		app-misc/media-player-info
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		)
-	udev? ( virtual/udev )"
-DEPEND="dev-util/intltool"
-
-S="${WORKDIR}/${PN}-release-${PV}/${PN}"
-
-src_prepare() {
-	local qlconfig=${PN}/config.py
-
-	if ! use gstreamer; then
-		sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die
-	fi
-
-	sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc NEWS README
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/rip/Manifest b/media-sound/rip/Manifest
index 0d4393d24d1e..50452e5f8319 100644
--- a/media-sound/rip/Manifest
+++ b/media-sound/rip/Manifest
@@ -1,3 +1,4 @@
+AUX rip-1.07-change-to-gnudb-org.patch 1080 BLAKE2B 5a2af422e44dff3a4641a0f51979fe3b9c3c4aa7ffd88756df0080d778c84ae6f4245037da25ea0db05ea75ef70744983eb14e260a6b4b25354ed0479c0383eb SHA512 6cf3bf8221484dcab061f3fa6ba0db3bd6c1531715b87f58492e6185518e62632478ac5e9a614f652a1cc027c8e6d686a7a20d2a3dfd2f5e64c578bd99f5bc7c
 DIST rip-1.07.tar.gz 110261 BLAKE2B 93ef85bf4b50e577180d343f033e6f8765ebe7f17992626b8f7e6ecac13be692edf5bab79fbe0a17b9dd64dbc19886323bc769be6edafcb8e133f58888ea80d8 SHA512 4a89b945cb917d07459f1765bd6e19bb20b84d45e762b01a25374e0a80fced79996440ab85e01fc2fb1bf87175eb9407745294e3099b396d2e4dfc6ee652cc87
-EBUILD rip-1.07.ebuild 586 BLAKE2B ef942642a67323892f4d7bd46b7479595b2048af67c470cddc5d94ed48938fdc7e636a92f01eea2247b080ec6e80c8c7332253e067a1ff922afb76499b2200a6 SHA512 f780ebb27c807191742239963efd6de4a41e31359d0579e9acf2dfbe42edc8ada543d85e2fdfcff310007a3795d916deed0d99b0ba60c2a6ff6ea0cac39d4107
+EBUILD rip-1.07-r1.ebuild 645 BLAKE2B 8f91fe9eb0d1863d4e1af8cc033673dc91b9c7c8a20d70124298a71e47f1703cd19e6d2dbca8d3f23150bf8eeaaaa3705390802f8b5e5a7ccb3a5778827034d3 SHA512 9ea6bc21e46a385d14afaaabcdd0f7fd424619e94d4a77af513d6cb5636f377fdb52b86816c58788bbeeb17de67f831a5c734e3474eb937211e63fc74cae9d68
 MISC metadata.xml 326 BLAKE2B 14293ba2c8d9da5e7eef3dff49ec33c4f7c816d2df9b75ecf0f1d5dc6adc8f88028fba7bde542f4b5439890d1c225555a4b3243a2d88433a825851ba2a123003 SHA512 9be190109b6b10f56e73609510a59a349a3f4c2e841eb64fabcbbcb35535047f8806fc33a3ebaffd8ead47b1c1057e93e435b9db79ba4eef9e16e6325846c13e
diff --git a/media-sound/rip/files/rip-1.07-change-to-gnudb-org.patch b/media-sound/rip/files/rip-1.07-change-to-gnudb-org.patch
new file mode 100644
index 000000000000..faf3d762d2a0
--- /dev/null
+++ b/media-sound/rip/files/rip-1.07-change-to-gnudb-org.patch
@@ -0,0 +1,15 @@
+--- rip-1.07/rip	2003-01-16 06:51:14.000000000 +0000
++++ rip-1.07/rip	2020-12-26 01:19:08.093961072 +0000
+@@ -130,9 +130,9 @@
+ my %config;                                       # Configuration passed to CDDB/CDDB_get
+ my $dev             = "/dev/cdrom";               # CDROM device to read (used by -d/--dev)
+ $config{CD_DEVICE}  = $dev;                       # Device that has the audio CD
+-$config{CDDB_HOST}  = "freedb.freedb.org";        # CDDB host to find the server on
+-$config{CDDB_PORT}  = 888;                        # CDDB port the CDDB server is using
+-$config{CDDB_MODE}  = "http";                     # CDDB mode can be: cddb, http
++$config{CDDB_HOST}  = "gnudb.gnudb.org";        # CDDB host to find the server on
++$config{CDDB_PORT}  = 8880;                        # CDDB port the CDDB server is using
++$config{CDDB_MODE}  = "cddb";                     # CDDB mode can be: cddb, http
+ $config{input}      = 1;                          # User interaction: 1 = true, 0 = false
+ $config{HELLO_ID}   = "greg my.net rip $version"; # HELLO string to give CDDB server
+ 
diff --git a/media-sound/rip/rip-1.07.ebuild b/media-sound/rip/rip-1.07-r1.ebuild
index 68ad2fb0382c..c84749041b37 100644
--- a/media-sound/rip/rip-1.07.ebuild
+++ b/media-sound/rip/rip-1.07-r1.ebuild
@@ -18,6 +18,10 @@ RDEPEND="media-sound/cdparanoia
 	>=dev-perl/MP3-Info-0.91
 	|| ( media-sound/vorbis-tools media-sound/lame media-libs/flac media-sound/bladeenc )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-change-to-gnudb-org.patch"
+)
+
 src_install() {
 	dobin rip
 	einstalldocs
diff --git a/media-sound/rplay/Manifest b/media-sound/rplay/Manifest
index 145d67f5326c..cbc55da5e021 100644
--- a/media-sound/rplay/Manifest
+++ b/media-sound/rplay/Manifest
@@ -1,5 +1,5 @@
 AUX rplay-3.3.2-built-in_function_exit-r1.patch 366 BLAKE2B 104e722c7da8a97b5fc8abe58a9efe8b6cb7fbfbebe3493eaa094ac9580ac982eb32dcdfedd1ed11a972a665514788db6c2c29ac51839fa979692aaa56eb3f60 SHA512 6c5f358a6ef89b7338ae5bf2e485a3996e143fdab0c73455d97bdb2e07729464323992d72424d29c954f2537acef2c45ebd744db6a2e26b99ffd97be2f44957d
 DIST rplay-3.3.2.tar.gz 480015 BLAKE2B 5f506e81a5c9bad175c8906cb3104564ec9c8c6f4496382a428d77dff6264d0f39d3ab9af7cb83b0ef34bccc14f15978e399d428c62f6dafe46ee8ad70d32d37 SHA512 b0683de0f5dc1483d22ac68c0502fe66e89ba1c25300fdca9486df1cb6ea96393b18b783f918f18dba0ba0fbfd20410448e3e03df06fc4afba1b63024d82a713
 DIST rplay_3.3.2-16.debian.tar.xz 25456 BLAKE2B 34c69d95c964465a04681d7cb4c1a66b34d486e540486d1b47d9590fb893e574381405c15a48bfec272f3b566f5b3ab6ce88806497f8d1533f441cbf9481a3a8 SHA512 8d5db7862267fd0ec7f27896b6a76708304e54b9f2c8a52621c0a92c4688511e07a7820b2468c93032dab15f27f5dda1f8931e35d95e724501e2586a5851486b
-EBUILD rplay-3.3.2-r3.ebuild 1255 BLAKE2B 6df3b36be8b0b7cc731b517cf4f2a4d26b8175f0c0e61e048a6f259a253098411bd5c22442e0342173612391d43366305d5212afdf56799adcdcd2cd5dc03d75 SHA512 0008d3553d9f059f313ae539e0f3f5b51b97eae9102c9a4ad778de5c0e00b0a69bcada9c083bd751fbcd9c6da090608e506c634e3c1af2ba53387148623bf86b
+EBUILD rplay-3.3.2-r3.ebuild 1256 BLAKE2B 5ab61ff8403c869a0d24480d85b1d0fdc0868979b4abe870d4de26d95e5ed09b6d9a9edb2116446bd753f5c000ef7805bcdcdaf88ebb739687c62be424af8e56 SHA512 9c5f1ed7f5dbc96185d740d10aea279fef3eedcb496b2da2bf340307217493707665e253b58dbb35d0fa2d736a737b206f390e48158a7ef4626a9e0f9e5ffc2a
 MISC metadata.xml 602 BLAKE2B 12db89459ab4cc0696d1c6ede006c6f0365854801e2a67ae060fe0a807fc8021d5d4c0b992ee1adc21951bba7aaf5734aa7c4742feff563d8b009322f58cc5d7 SHA512 2133c5096ee010c0470667238f9d600c4617b9659615b3302abd81eb7b4b84107cfe9efa2070d5536d91aa11a90be1865703cdd5f92d0ea1f8718336a65cb272
diff --git a/media-sound/rplay/rplay-3.3.2-r3.ebuild b/media-sound/rplay/rplay-3.3.2-r3.ebuild
index faf1dd2c8545..0daa2f8a38d4 100644
--- a/media-sound/rplay/rplay-3.3.2-r3.ebuild
+++ b/media-sound/rplay/rplay-3.3.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://rplay.doit.org/dist/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="media-sound/gsm"
diff --git a/media-sound/smixer/Manifest b/media-sound/smixer/Manifest
index 1d463de2c718..bb97534ca7c3 100644
--- a/media-sound/smixer/Manifest
+++ b/media-sound/smixer/Manifest
@@ -1,3 +1,3 @@
 DIST smixer1.0.4.tgz 11245 BLAKE2B 292deb588716abdf41d9daf48421741bba03e3ea77fec33c02560a685844245f85256483a0c12a4052cd03206a569f9f721b67b076d7fb2bc27f53c39069abe2 SHA512 3c589487cfd246b68d54abe9ce9dbddd9aae539b96a0d464f3194f5931819c85923e13b4fd5b947bab35d32403bd7609fef33ff966a1d20d3fb465eb0bb184aa
-EBUILD smixer-1.0.4.ebuild 591 BLAKE2B 81693c680f31e441924845d348f4b8c76e12a59cf2a15098e575bab81585650f5fbc83a5e0dcdc3926184255b1347c55d5e6e5a0b8af5cf091097eb1e2d45725 SHA512 7a0c4a72152aa3725a70e9919a9b3de22e612ddf321fc0cd68cf5dfb34de567d22a793c069acb47878d306e03b5e630e090743f22fb781ffac211754139f1b62
+EBUILD smixer-1.0.4.ebuild 592 BLAKE2B 02dc81185bbbedb0f7537342499a93382ba0179d968267504ba200b15d9501fcbe73563f26a78d6a138081ed603395bfa16963021167aed29699496b8fc68907 SHA512 0f700ee7002bdbbf8d8191a25369086d704ef446cc99ef6c4be4fed29393963dd0e4a309e120041630422e9872714c6d8d281a9e7dba43be5ee271abe345a275
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/smixer/smixer-1.0.4.ebuild b/media-sound/smixer/smixer-1.0.4.ebuild
index 0b5bc7d65560..4234c69cbbed 100644
--- a/media-sound/smixer/smixer-1.0.4.ebuild
+++ b/media-sound/smixer/smixer-1.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://centerclick.org/programs/${PN}/${PN}${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
+KEYWORDS="amd64 ~hppa ppc x86"
 IUSE=""
 
 S="${WORKDIR}/${PN}"
diff --git a/media-sound/streamripper/Manifest b/media-sound/streamripper/Manifest
index 5c4aa412c942..d3fd851e8093 100644
--- a/media-sound/streamripper/Manifest
+++ b/media-sound/streamripper/Manifest
@@ -1,4 +1,4 @@
 AUX streamripper-1.64.6-fix-autotools.patch 260 BLAKE2B b216a7a62c3c1ec53e98b85f47c7e3b07746dbb3483de7de0b1f9face420395abc10f1205624e92eede1247e4c75785b3797a6ec373ada26f876d6a8cb45acbb SHA512 49714d3ea1db143771a2ebcfd3ddd08a60e6eb63fd1e2a0b676b2d0c359b25ebd9dd40510c0137e24ef7c44c718cc83843535fae00325a098f4f1542e18e6f67
 DIST streamripper-1.64.6.tar.gz 900205 BLAKE2B b316565c786b2005802b24cb441d6ee73c2548a4ac7515633fd92faba143a4708bc49c9de7c3eb9985de14a43ac1f86935ac2c353e3d14a7cbf28e334fa21338 SHA512 8477086d0099f6de861f1c47112476c427073b6e8127bbaaa2dd3e7930fe9a5c6d9b2c68d4a317f1bc0b20c625e665d5c245189049d35468aa83cf51828d4428
-EBUILD streamripper-1.64.6.ebuild 863 BLAKE2B 1e05f8a08fdd595d2c8245186e6ab74e7149039101d6d730eecd083405d96f22be920b063debf550c4715ce0d757ecee5d601201b920b3fe5f82cb6f33119367 SHA512 dc83ee9df6e5147f12a9b9a3509973fc8ec4ad6815bf5abbae523e8224d33e87cc3466cb370cd19ca8aabbfe9dc2c2df0f13bebe57f57c8ebe9181497f51f48b
+EBUILD streamripper-1.64.6.ebuild 864 BLAKE2B c5288705cdd4884e047ca1d261430f901ecef1641cc1a8a72220f07120fdf0a9012054eec57f675fc7916de35c2a8e155c9d28a6806ca6efde8572c830414448 SHA512 103cf45878337898bb4e7b475c056377658ba1ed2b51273071e7e9b64aef56ed9b08dbd85d6e4551860a7d0d6fa1cf5d3ec4d5d2a7dfadb4de7a5ac69df681a2
 MISC metadata.xml 345 BLAKE2B caf6bf6724c60fd86ad8983db7d4a38472aae47ba7bcc0d50f2796d81ef2c1b38cda0a1cb048b7af88dcf82bbde900c289cc6c803dc121404a6f0c19cb97cfc1 SHA512 6830a4fe1eedf9577237eb166dd97594bfe9e19a5d95578992ba2f90de46ec62679dde5a60fb9abc5887e5e7374b0742676b63e25db0106ec4f84cdac85629f0
diff --git a/media-sound/streamripper/streamripper-1.64.6.ebuild b/media-sound/streamripper/streamripper-1.64.6.ebuild
index 23969844b457..ac6875b44c8e 100644
--- a/media-sound/streamripper/streamripper-1.64.6.ebuild
+++ b/media-sound/streamripper/streamripper-1.64.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="vorbis"
 
 RDEPEND="
diff --git a/media-sound/tap-reverbed/Manifest b/media-sound/tap-reverbed/Manifest
index 0c9b90a4b15b..6a7a9533570a 100644
--- a/media-sound/tap-reverbed/Manifest
+++ b/media-sound/tap-reverbed/Manifest
@@ -1,4 +1,5 @@
+AUX tap-reverbed-0-fno-common.patch 1379 BLAKE2B 107a0172c782e775b081abb2a6bab43a5c9a22518dfd4a7a372ec53b43f4ed1230ef7671c95a45a972400bbeb0443a6ef0d0f17162e50836c52e2506d68ea084 SHA512 5f932d010a25633f37833c0808ab585a256b14ea611accfd5005212b05b0ff07a479052e88e486326f2101f8404254e9753638be96bb0e6dea8cdb46ea4d6f37
 AUX tap-reverbed-flags.patch 1549 BLAKE2B 710b8a2276cd7ca79623e65f9aecaf80c9856a4cf26730c8891deb6894d4c3a357aed0b7359d3672f80d66e5934c0b75693d4ab45550b995e9e431084e3d6577 SHA512 8bd6781d1dbe61231916f0294557b724532baefcbd04317e7483617482f640bc0b4a05e2b3d2b4062c4fb964347602dcb426df9dae96368f384b84e1970780e8
 DIST tap-reverbed-r0.tar.gz 90703 BLAKE2B 7230220b93a5015be790873dec288149cd7d30253a2f4847bbe5c555328a3fff65195bbf6485be71afb91638fb267a3d6cdf351b6edbff4589044f0fba061df5 SHA512 72b3f1257cf5a7076a35afa92604b8df96051e6727f49b9b01192873e6cb3b21e3daaa9e70796966faa13d2e94b9fdf34cdb41b3e91805dbc9787897a7882cda
-EBUILD tap-reverbed-0-r1.ebuild 956 BLAKE2B 0bdf95350a3dd2d09105b6ffe14ea029a80c8e358507465969c47b600bcd543c41bc2f535c50a726472bad29cd79afc96ce901f003c41252eb663aef17882616 SHA512 9ab24ff89673a090eeb72ef3ef3da925fc10043acef46629637103aad80befd2182326b00df28681cfcd1daa80e524116700f205d2575d50165888ee1fd25301
+EBUILD tap-reverbed-0-r1.ebuild 997 BLAKE2B 4a1b3d9d709a24a730296a218c898119676ec38e1691bc6f21a49ece3ddb3ea7749e74b51848bd24707946644a812e23d403882cf605c1f39607bc5862b45726 SHA512 75f77d12af5e4976e58a54adfdcf7dc662a701ec62de13d41d9bf1cc400fadf038bcf1d9d2796568676e50be1ca6bf25cf08b9612d669f77230cc90c281f5d2c
 MISC metadata.xml 340 BLAKE2B 46e1eef9a17d36dcfdee59018c25fd271b5bb6f34f76c54803eb009345d1daaa67e2ea8127c43c7a071040e6bd41ca324d6bbcf006fb42b37ff62771a43b9fe5 SHA512 b9c58d0b65d68884a4945054cde9176b0ee6db20ff5d22cac318373c13b9b6b23d5c2cef3cd057ae1b244ec59c00ab1dd3e15f38adb0c577dc48d8aeaa7f722a
diff --git a/media-sound/tap-reverbed/files/tap-reverbed-0-fno-common.patch b/media-sound/tap-reverbed/files/tap-reverbed-0-fno-common.patch
new file mode 100644
index 000000000000..c01461f62f09
--- /dev/null
+++ b/media-sound/tap-reverbed/files/tap-reverbed-0-fno-common.patch
@@ -0,0 +1,65 @@
+--- a/src/ports.c
++++ b/src/ports.c
+@@ -37,6 +37,16 @@
+ #define LIST_WIDTH 200
+ #define LIST_HEIGHT 100
+ 
++extern unsigned long sample_rate;
++extern jack_client_t * client;
++extern const char ** ports_in;
++extern const char ** ports_out;
++
++extern jack_port_t * in_L_port;
++extern jack_port_t * in_R_port;
++extern jack_port_t * out_L_port;
++extern jack_port_t * out_R_port;
++
+ 
+ extern GtkWidget * ports_button;
+ 
+--- a/src/sound.c
++++ b/src/sound.c
+@@ -44,6 +44,16 @@
+  */
+ /* #define REVERBED_CALC_FLOAT */
+ 
++unsigned long sample_rate;
++jack_client_t * client;
++const char ** ports_in;
++const char ** ports_out;
++
++jack_port_t * in_L_port;
++jack_port_t * in_R_port;
++jack_port_t * out_L_port;
++jack_port_t * out_R_port;
++
+ 
+ extern int client_running;
+ extern REVTYPE * curr;
+--- a/src/sound.h
++++ b/src/sound.h
+@@ -24,15 +24,15 @@
+ 
+ 
+ 
+-unsigned long sample_rate;
+-jack_client_t * client;
+-const char ** ports_in;
+-const char ** ports_out;
+-
+-jack_port_t * in_L_port;
+-jack_port_t * in_R_port;
+-jack_port_t * out_L_port;
+-jack_port_t * out_R_port;
++extern unsigned long sample_rate;
++extern jack_client_t * client;
++extern const char ** ports_in;
++extern const char ** ports_out;
++
++extern jack_port_t * in_L_port;
++extern jack_port_t * in_R_port;
++extern jack_port_t * out_L_port;
++extern jack_port_t * out_R_port;
+ 
+ void comp_coeffs(void);
+ void load_revtype_data(void);
diff --git a/media-sound/tap-reverbed/tap-reverbed-0-r1.ebuild b/media-sound/tap-reverbed/tap-reverbed-0-r1.ebuild
index cb0e9050ffb5..94d080247bed 100644
--- a/media-sound/tap-reverbed/tap-reverbed-0-r1.ebuild
+++ b/media-sound/tap-reverbed/tap-reverbed-0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -13,17 +13,21 @@ SRC_URI="mirror://sourceforge/tap-plugins/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-RDEPEND="media-libs/ladspa-sdk
+RDEPEND="
+	media-libs/ladspa-sdk
 	media-plugins/tap-plugins
-	x11-libs/gtk+:2
-	media-sound/jack-audio-connection-kit"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	media-sound/jack-audio-connection-kit
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-S=${WORKDIR}/${MY_P}
-PATCHES=( "${FILESDIR}/${PN}-flags.patch" )
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-flags.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_prepare() {
 	default
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index 0aaf63fac5a0..c928d8444883 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,10 +1,7 @@
 AUX ts3client-bin-r2 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
-DIST TeamSpeak3-Client-linux_amd64-3.5.3.run 97454216 BLAKE2B 228542b7b5169bd4bc86f320f7d9b4e099d088db9bb5c944b7b1e9d029b8c505a50447468fb02bb2b5e34c0f3a4e088a1af2bab466a7ec71e128541fabe9b562 SHA512 8b0ea835b179596ec16c092790383691650f6cb92b97d4ab2012872edc2f4d82e0b3a3ea4551651c4824703b9ef01ba9c95a50ee262d5f279151d780dc3faef6
 DIST TeamSpeak3-Client-linux_amd64-3.5.6.run 100152301 BLAKE2B 9fbaa32ac000c9e29e09dcb1c932acea45265d5cf464308d6f27063fb3095690f3cb96abb061ce947438a4b919dcbaf8f3f0189048b470b09bb2b8285e426e39 SHA512 fe1b41773d2b2de8198fdaf189c6665994eeaf6a0255485f7d342a3e77702f5515d5c5c685410a0b5844b4ad5c395d57b68e57c7b1f46bd1211ef813ce1e0030
-DIST TeamSpeak3-Client-linux_x86-3.5.3.run 95939656 BLAKE2B 5aec52b4461d45cd19947e3f87729a40bca23bc78d45565bad59a1f11b437e253f0bf073ad32ca1a43396b8bcf47794d0efb0673ec0b7314e3dd5c2a0dcdb140 SHA512 54a6d7ad03a357a78be71710e7878b9b5c0a54d175bf4242a35ba82df1abfa692dc4d4c921099677c5d163caf18b68db73a87b8637b216ef5c72eaa25b6deab7
 DIST TeamSpeak3-Client-linux_x86-3.5.6.run 98637555 BLAKE2B 6f891e6846f8f899edb8ef107b7ea6518f413488525b7696863292d99d73614cae40631f5ed2341cce75ea62ffd94c60968ff6b5d587446d7469271835c01202 SHA512 dfc5ed3e2a92ed9f1cea2fdde5e40cf73e4a999ea782c434b26072ac0e7ac37d6305c06ae2d39c104eeee10639f325c7b96f538082e60224a68c0553fab0d12c
 DIST teamspeak-client-5.0.0_beta32.tar.gz 111368604 BLAKE2B 85771c2e7078bf4a25073b66295a8629911a7ed6fcfce17840130abe26e79565df306756928edd7439e0bc8800071a126187cc184b7f9beda15334af2e14acc7 SHA512 ac806deb1c001da01d76ddb07babc8bbde45bebaa5fab0cf2359ccc043036f1d882bfbd973be2cd184451681c297224f3437c89f72212ce10112a42bb46a823b
-EBUILD teamspeak-client-3.5.3-r1.ebuild 3043 BLAKE2B c11d9e2fa4c0dc7609db979a3efe2066fd5c9eab0fc104ca6009026a8f2566e4e9abade67968d6a9bfe8ece59ddb356c26c5198dc0a1a6405d603f3497ed7c3a SHA512 22ecee625ce5b934108f117d156714178e4909f623984733f1176f000fbfe041f0b264ed9c95dbdc2a3838d75c37cce67d61c5148f7cf1a802557812434f8902
-EBUILD teamspeak-client-3.5.6-r1.ebuild 3045 BLAKE2B 3ddc924fb2b3ac71b97f750d0f400ecc9d84f218b4d61254e59f27d5c74f810b53ac0413f4e334e0a93fd8859da73ecc80caf04932805fda96ed0d8457e438ed SHA512 af9c529b550a5dc0fe2d4172c17514d1a8f2eb4fe1da067ada8d498f537f276bf94d207c60d425bae3b99aebc944a6746d3d72e75e5b4a556c501a8e9eaf6ee3
+EBUILD teamspeak-client-3.5.6-r1.ebuild 3043 BLAKE2B c11d9e2fa4c0dc7609db979a3efe2066fd5c9eab0fc104ca6009026a8f2566e4e9abade67968d6a9bfe8ece59ddb356c26c5198dc0a1a6405d603f3497ed7c3a SHA512 22ecee625ce5b934108f117d156714178e4909f623984733f1176f000fbfe041f0b264ed9c95dbdc2a3838d75c37cce67d61c5148f7cf1a802557812434f8902
 EBUILD teamspeak-client-5.0.0_beta32.ebuild 2076 BLAKE2B 1d950c346137e1bd0014b7e8d8f2f25a714b7baff2e60791b848ac4193b6daa832bc5e47b4d27cada76e80d970fe9e596b0e47dfa5593b9e212d735e49fd7a73 SHA512 02e62e1afa719556090692e9cc14753b292050b5fa3b5a27e3dbfced651b1c7bd058463fb9c030039bd8f7ebc400fd08b4848b661c84d474014cac8238faca66
 MISC metadata.xml 744 BLAKE2B e5a883b78a951de65c5a0ac3ef23674fc120339531a8e10225f5049a67d42f206fce5296f41bbb329105386b2138c83385c0b3293199409ac76b92c10dd17696 SHA512 6e8688c9c36c34625b8bf8b0e2870b88a8f7df4986f2a2579c089260058022cc5177e5108e8f4616cebfcfc1c132277eff74b9d45054b6d61f87c8966dff9156
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.5.3-r1.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.5.3-r1.ebuild
deleted file mode 100644
index 7a9b41fc5fc1..000000000000
--- a/media-sound/teamspeak-client/teamspeak-client-3.5.3-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs unpacker xdg-utils
-
-MY_PV="${PV/_/-}"
-
-DESCRIPTION="A client software for quality voice communication via the internet"
-HOMEPAGE="https://www.teamspeak.com/"
-SRC_URI="
-	amd64? ( https://files.teamspeak-services.com/releases/client/${PV}/TeamSpeak3-Client-linux_amd64-${MY_PV}.run )
-	x86? ( https://files.teamspeak-services.com/releases/client/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run )
-"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="teamspeak3 || ( GPL-2 GPL-3 LGPL-3 )"
-SLOT="3"
-IUSE="+alsa pulseaudio system-libcxx"
-REQUIRED_USE="|| ( alsa pulseaudio )"
-
-BDEPEND=">=dev-util/patchelf-0.10"
-
-RDEPEND="
-	app-arch/snappy:0/1
-	dev-libs/openssl:0
-	dev-libs/quazip
-	dev-qt/qtcore:5
-	|| (
-		dev-qt/qtgui:5[accessibility,dbus,X(-)]
-		dev-qt/qtgui:5[accessibility,dbus,xcb(-)]
-	)
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwebchannel:5
-	dev-qt/qtwebengine:5[geolocation(+),widgets]
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-	net-libs/libsrtp:0
-	sys-libs/zlib:0/1
-	virtual/udev
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
-	system-libcxx? ( sys-libs/libcxx[libcxxabi] )
-"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="
-	opt/teamspeak3-client/libc++.so.1
-	opt/teamspeak3-client/libc++abi.so.1
-	opt/teamspeak3-client/error_report
-	opt/teamspeak3-client/package_inst
-	opt/teamspeak3-client/soundbackends/libalsa_linux_*.so
-	opt/teamspeak3-client/soundbackends/libpulseaudio_linux_*.so
-	opt/teamspeak3-client/ts3client
-	opt/teamspeak3-client/update
-"
-
-src_prepare() {
-	default
-
-	if ! use alsa; then
-		rm -f soundbackends/libalsa_linux_*.so || die
-	fi
-
-	if ! use pulseaudio ; then
-		rm -f soundbackends/libpulseaudio_linux_*.so || die
-	fi
-
-	mv ts3client_linux_* ts3client || die
-
-	# Fixes QA Notice: Unresolved soname dependencies.
-	# Since this is a binary only package, it must be patched.
-	local soname_files=( "error_report" "ts3client" )
-	for soname_file in ${soname_files[@]}; do
-		patchelf --replace-needed libquazip.so libquazip5.so.1 "${soname_file}" || die
-	done
-
-	tc-export CXX
-}
-
-src_install() {
-	exeinto /opt/teamspeak3-client
-	doexe error_report package_inst ts3client update
-	newexe "${FILESDIR}"/ts3client-bin-r2 ts3client-bin
-	! use system-libcxx && doexe libc++{,abi}.so.1
-
-	exeinto /opt/teamspeak3-client/soundbackends
-	doexe soundbackends/*.so
-
-	insinto /opt/teamspeak3-client
-	doins -r gfx html resources sound styles translations
-
-	dosym ../../usr/$(get_libdir)/qt5/libexec/QtWebEngineProcess /opt/teamspeak3-client/QtWebEngineProcess
-
-	dodir /opt/bin
-	dosym ../teamspeak3-client/ts3client-bin /opt/bin/ts3client
-
-	make_desktop_entry /opt/bin/ts3client "Teamspeak 3 Client" /opt/teamspeak3-client/styles/default/logo-128x128.png "Audio;AudioVideo;Network"
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.5.6-r1.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.5.6-r1.ebuild
index f85207cfb1aa..7a9b41fc5fc1 100644
--- a/media-sound/teamspeak-client/teamspeak-client-3.5.6-r1.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-3.5.6-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 	x86? ( https://files.teamspeak-services.com/releases/client/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run )
 "
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 LICENSE="teamspeak3 || ( GPL-2 GPL-3 LGPL-3 )"
 SLOT="3"
 IUSE="+alsa pulseaudio system-libcxx"
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 90fa02e11a4b..b108a94c7796 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -17,6 +17,6 @@ AUX timidity.service 190 BLAKE2B 909311fae666b9970a8b4d56e1848f907ffeff1fc9e0cac
 AUX timidity.xpm 1522 BLAKE2B 9aee528dbf843d992d548adc923f817373013760128ae96df7becb6bc844a95ddc056b072dbaea1528d9db5c2d4836b09f8316b740c75033fc23a0bb76186fab SHA512 1630fc235e450e5420c598357ad98eed6f04b1d1035fd6284dfeb2e633ce5d80135f89ea593d58b4eac2b9405383787e4d891b9c22ff8b5ac3ece64e9abe7d4e
 DIST TiMidity++-2.14.0.tar.xz 1356476 BLAKE2B 8d4a360d1c16b250f3bef7c010e1e263fdda13446437ff2454dc2c2a717246c4d27836a3b40586b12b33e175bc54ee211a3a1798005733461cf5833eda11811a SHA512 d8fc06fa36e4dd42de80c61943da4cd9aec5f8aaf31057a9ededa633d2d48e64c4e53391378d82a7a46ffe4f96c756b010ea9727270f80b134ae1f8bad535bd3
 DIST TiMidity++-2.15.0.tar.xz 1363040 BLAKE2B 63612dc96ddef9b24ca35a8fa24c22fee8b0573efb09543e6017070b2d0a68494bc34afe8ffc50b5f7fe2d95397a971d5dc7afd4c9adbb524b119012e716b7f7 SHA512 36c3c79d941903109d5d6d529963d12e8192a857e80402ad5ab0d1e223451a7cf5dc8fdd046b22ae7da96f413d68db8587a8fce348635838eba2f30f7019192f
-EBUILD timidity++-2.14.0-r3.ebuild 5314 BLAKE2B 78f1c18ab9c918f6a1909d73274df8fc3adf539524bceb1c17a1f5ea9d3a7b196da86c3527135d06bc960c8443203d3c2ac26cb4a2da2e953a0daafb747c97e0 SHA512 7de7da1ac55bcb4d83b3869daeb942aabddaa989ac29d2595d66d6e60b6b8deb877552b2abb99043f479cbd9284b76159b50b8e7f8997fc6b16f506befdd47cf
-EBUILD timidity++-2.15.0.ebuild 5206 BLAKE2B e726e7354e4f46122794ad9432ab6c9b304282cf8c08f8dd997d0e46c6cc01b6b2543b0e5a71386e1cd1a1a4a5f8005e8442ea3155cce1ee1219077ef1c10a6a SHA512 13198dd6881e8ce3f0a159ef8ca2354e31484e8bfa3888c583423da3cf71165e9435aeb82daef1202e26791be4a27c4d87c76bd0e10e879ab4bcc948a9794161
+EBUILD timidity++-2.14.0-r3.ebuild 5315 BLAKE2B a1b395ebe1a733bd0eeebade1ee5e03a113c05d5afdcf5e5cb903a77f2e20fea730d5d4a989ef7d61dfee786af59fc46a3113f98fb8c6cea5e94b6875e2d644a SHA512 1fed33b633ce857bd813d404e3485efab67792404b99da7727e7c40014b5c658cbed887d3a222f633cc7f9423afcf642d01c7a38afb1da3f700cd4ae57c7d4ef
+EBUILD timidity++-2.15.0.ebuild 5202 BLAKE2B 21cc641ce89b10ccdbbe95e83570933e09fdf821bca230fa4fcf2f877f7949b4d01ff515600a3982bee96b3e54fc082b270f270f6a30437c5a2d950a9ff6e2ce SHA512 6a6f867216ab6ec240b1ea040bf6cb0a53049bd0541297dc706ef3edd1c4a5552d4f9b2e0c88ac408e69774d4dd2dfa98aec1b659651dd1e57db69f7bc6a3543
 MISC metadata.xml 331 BLAKE2B 0e52df0230422381a5982f075e39f00e982f9948a3d3309d183bbac93569d908fe3603082f11943fc35e3b8bd1c76bc131e7525c91e3aac5b7d9461093686f71 SHA512 b4559e92a59ba70b25863304bbdc59225c6ccbf3ee9ab8516db6987a19e8b5b7b6ea95f40c9ff55ed33c194ab174360d5f8fd6bfafa43290bb97a3a2093289e3
diff --git a/media-sound/timidity++/timidity++-2.14.0-r3.ebuild b/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
index b2272da476b3..647057fac1e7 100644
--- a/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
+++ b/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X"
 
 REQUIRED_USE="tk? ( X )"
diff --git a/media-sound/timidity++/timidity++-2.15.0.ebuild b/media-sound/timidity++/timidity++-2.15.0.ebuild
index e0407f9c9533..ad2957733f15 100644
--- a/media-sound/timidity++/timidity++-2.15.0.ebuild
+++ b/media-sound/timidity++/timidity++-2.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 sparc ~x86"
 IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X"
 
 REQUIRED_USE="tk? ( X )"
diff --git a/media-sound/timidity-eawpatches/Manifest b/media-sound/timidity-eawpatches/Manifest
index 2dec7f0c6a31..59d807daf496 100644
--- a/media-sound/timidity-eawpatches/Manifest
+++ b/media-sound/timidity-eawpatches/Manifest
@@ -1,4 +1,4 @@
 AUX timidity-eawpatches-12-fix-dir.patch 251 BLAKE2B 40efdb10eaadd4d4430fdcc5f0f2b9cacb5976b4068537f012227919c853d3264fddfbea0d362d1d7e32de593b3d40a49105a1ba08f0b627ca3637afea13749e SHA512 fe5ef5ab981a9430bcecd5a7c00094daccc45f0e9e580830cde3a9e9f8c75bb15519f99771c89768efca74aca41ea582bf4a99edc7597ad0526368c8de5ec514
 DIST eawpats12_full.tar.gz 32047230 BLAKE2B e2711c59e95b29f77d07dc7465e1eee717007759328ce03c85ae4897d6507ad6801ca7040b1b08d26fcefae5afaba1d6415b6fe152920b58a77947682a9bfb08 SHA512 fb5532c85653e624ed310cd5607d1e24231bcaa9bf966548e9383daf463b9221b21945d2786db0bc44dbabc5342b224a4cbb6c9329f1eee1ee8137d56b3cf71a
-EBUILD timidity-eawpatches-12-r5.ebuild 1102 BLAKE2B 1689382d809e3f0f7148f41db4a30bc0bd869037de87a7e63acbdc8c3dad7a908e0bc5c7fd8777ee0485e69957fe050810ed1de91fade722e45fd10504f929bc SHA512 cabd9258913a006b3a6fd6ef8474f4c4ae85db1d1dd6d1f3085d7d206f83ba7b82d403c39d3e5a98b0424b43a26578dd98afe635589a0b1aa2c3546066cbfc4d
+EBUILD timidity-eawpatches-12-r5.ebuild 1103 BLAKE2B 93f1d98b9373724c75c254c769df0dccd9da3a9098aeb6e2bdc67e15a1457b3b26a3efeaa4556ec92cfbe18a1558d8857fc8ab57b0e4545ddf7a99d8bbd19d8f SHA512 a87bfa47ce54c297a0eccaa0c95558fe709871996b345a8aa4127ecbcdf522e198bc01bd86794d41b1e95129de6d6105266f810c2b4ea4e5d0ed1d5f1211036f
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild b/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild
index 634ecd53fc06..345c08d2f1c7 100644
--- a/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild
+++ b/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://5hdumat.samizdat.net/music/eawpats${PV}_full.tar.gz"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 RESTRICT="binchecks strip"
 
 # These can be used for libmodplug too, so don't depend on timidity++
diff --git a/media-sound/timidity-freepats/Manifest b/media-sound/timidity-freepats/Manifest
index 364fa5664fbd..35bbc1c54351 100644
--- a/media-sound/timidity-freepats/Manifest
+++ b/media-sound/timidity-freepats/Manifest
@@ -1,3 +1,3 @@
 DIST freepats-20060219.tar.bz2 25791733 BLAKE2B fcf512bf85bca61e29a32640a45e3dbb6132cdf4246baa54c7ed4540c955451b47d2e3d7f01219dfb1be5837dbe0d7e332583ce5b29918229718b22b237a6026 SHA512 6b24bf387a52fac9906906cb52fd5f9d02decdfcecb8d88acea136b200db962ba9beeb3e78bccdd6024b47453d7f093980b01cb0661e1b8d29fedc45ed61cb4f
-EBUILD timidity-freepats-20060219-r1.ebuild 784 BLAKE2B 15b219508c08fbfdaac76b48071bfdd6717a239ae343b575e5049c81ac32aeabebc32f089f13eb3524c1ff7610bc78a0087d1f79e99861600ba28f0467e193f5 SHA512 671c2cfb9270521865933393da1a9b203a620c7835ece88aeed0d918d0e9afb516d1ff4b4f8bf4c1528cd1e0f1cf898ca071efacaedc146797c92bf5318706d3
+EBUILD timidity-freepats-20060219-r1.ebuild 785 BLAKE2B 7e87c4fb847fa8c07af71b61d7e7e6c3cc3e5069270807baa2faa927878c7c0d261f4b651fc3b8d701e209be8849f0b463e1dd7fc7fcf5c60d9166eadf557f43 SHA512 a76d8f4734251ef2c7f614cf560abe56c05102bc2eb20a92b0e69d2198457b6873bbb28d98ddaf08f7d7a2272441d439533b3906e2fdb9bb11597f21668bef2b
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild b/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
index a03901c51b53..ae79013f2cb2 100644
--- a/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
+++ b/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://freepats.opensrc.org/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
 RESTRICT="binchecks strip"
 
 RDEPEND="app-eselect/eselect-timidity"
diff --git a/media-sound/toolame/Manifest b/media-sound/toolame/Manifest
index 803e86e7f54f..7d0a7e10fe8c 100644
--- a/media-sound/toolame/Manifest
+++ b/media-sound/toolame/Manifest
@@ -3,5 +3,5 @@ AUX toolame-02l-fno-common.patch 389 BLAKE2B 2dc0b94bb4fcd1b7692d6922dd62b7a4353
 AUX toolame-02l-uint.patch 950 BLAKE2B 6f689e4ff7eb5aa8b6f9f5603813882e2a2fe80b4b37b2a88876b770f6d25c40437b378c7a5df03a57e2f49ba9f7460e7268c90af33a878104edff26be14c2b9 SHA512 ef81fd06b5371ab9fa16037a3cb06ae4dbc9cf7f74c2c1553a06d40a9974ee509ec4f63f6dd5c7b21edb6763c5ea8e43273e98699c73013df430d7e008049f1d
 AUX toolame-02l-uint32_t.patch 624 BLAKE2B 9a07c69bc91f4a90c6169d5c820ceda37dcbad90cb964025c786e8b8d4081434f76f8d0fdf2532abba6ab0a88ee07e07266a9fb0eab8617a0f76bc3c753566aa SHA512 cfde68fe55830f97caf38defc186aa6e95ee3c513e22af4aa06c89e1e071d2caadf22479e260c631442647c43b733aa13bedfca885f68cccf1187fad8aeccb05
 DIST toolame-02l.tgz 127493 BLAKE2B eaa20e1bdc966003401b6fe720bcb6d81aa1c9bf3f8a7aa4f05732ca3c43a71cc55f979a65536197e236e536ada445cfb0c31e3296307100f6d43f64cfb5d16a SHA512 b88c524e1ad65ef30cfcffb53ab0d3552c916714dbde447d714e90ddf048e481d3b1a33f64081c4accc64a776b009d2737c7ab0863695652f2b0743f44a8055e
-EBUILD toolame-02l-r4.ebuild 674 BLAKE2B 253ac81fbdfff8181240703f8da5e30e46cc59b72cf0fd8ed941e8db88d60a7b197e2a2620556c8ccefa0980f3255711cfcef7196b33ce02be729fe33983b099 SHA512 001419e4bf9e973c072e9eabb067346ce5c1cb5fd12e829fbec33ef211661c5cae570b12a2535951b1b41965601be0013cd1d2e87f57bdfffcb75cefda175bbf
+EBUILD toolame-02l-r4.ebuild 675 BLAKE2B ea73660b31d79d796c984a1fd1f102aa5774657770add015ce53629fa38700f81aec2a9bc7045e823cae58aab094668c89d23121d50f6241f7f6912c87dc18d0 SHA512 aaa9139eb12498f0ba47eea3a840519d496851f075524e75da39e9af5540bc32eada5f86f20a7715c74e1d27c3ba37ae47ef98fad8298b2764fec352bdb0ac0d
 MISC metadata.xml 330 BLAKE2B 632691c8ef2f3340e3d9f7e55ee85d64d73aed0286c654e60b3abf674fe79231b85b7d606f36d6c799fb2206ba1074eb1b15960c72124b2d589fe471eb793976 SHA512 e4b6308fa4241c592a768a0a21629e0b0de427c39c8d0ef9c26e093e029de51e55a28ae547b93a584c373a1f29034069198cff2667d647238e20bd4b4f7b8b2e
diff --git a/media-sound/toolame/toolame-02l-r4.ebuild b/media-sound/toolame/toolame-02l-r4.ebuild
index 659ebf40b047..45c946562688 100644
--- a/media-sound/toolame/toolame-02l-r4.ebuild
+++ b/media-sound/toolame/toolame-02l-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-Makefile.patch
diff --git a/media-sound/twolame/Manifest b/media-sound/twolame/Manifest
index f01499a3ea54..f84e714b0995 100644
--- a/media-sound/twolame/Manifest
+++ b/media-sound/twolame/Manifest
@@ -1,6 +1,6 @@
 AUX 0.3.13-perl-tests.patch 779 BLAKE2B eba221a58a16dc22ec7e6a10388045db6a2b2535a9f0a55e47a01315aa0c0121c1473aa6ff9f53b7bcf4b70a849a0b19bfe3125213f558c17ecb1d4fd1349376 SHA512 1c483daf75991fa6d390360d9108803f65fa894745140d3955f73ce8e87eb813a068efa810988ac462ed22ae0bf3d0f95b63feb5c823ce3bfa3a0dc9b9a8f413
 DIST twolame-0.3.13.tar.gz 660415 BLAKE2B 741e91983546241b984ce95ef3b1c3b00ff2c1e84f496961749b13b932a1c3fdcd44a3fde3a24e44d9a3ff9e859e64780ad60949f827d986608c51c1afe44912 SHA512 241ae5faebf05cb919959bb0545cb89e9b71cfb07f92a7118d864499ea4f0065ddaa646ab1482ffbcbca427d52c2436764074bd67fd19a1eb9979987f23163f7
 DIST twolame-0.4.0.tar.gz 890908 BLAKE2B f61a49aed06dcd2a60744dd758b480670f14f0eece0586b62a0b21fe2d9ff8280f8f7324b7daf88e85675c6200a1c68815ddd6bafa308b503a52df4552031bb1 SHA512 cc594bc8d2322922280f915a3c0aa52540cca0350d6498bc96f3f60fd6e53f951e775ea015a44bdb29ec883b46b31a0e5483f6a5c188b02e30008289273c7d03
-EBUILD twolame-0.3.13-r2.ebuild 1246 BLAKE2B 16e43d7796cb506a1173f6ea691474227745f4f89b07068b093df9816b88b4f39cf04ec4ab07148c7425acfe155a70285bc3af2f2836eb70450556e4bbfeab3d SHA512 9b91fb852268aa8cfeeba8a38530a3f1d9b057c269a5d687ece955fa445c5cd5cc5dcd0a850f2341872290939d78324d826ee01ba0fde032136d97ef528b049f
-EBUILD twolame-0.4.0.ebuild 1329 BLAKE2B b81660a096872a09db3ffea95db207d7cb21cdab6eeb3977c282c1e8db4a5c0c3aff8465738b1ea117a3eae2f496c55aaf230b9170dd67cf7847fa6e6b3ee0d1 SHA512 34dff4b8b54d510c3c346610a09ab79297e278bd015df5c541748f44d5c19c4e871deaeedb14cf4885e47d6b73ea39d9e445dd07d1d90beda969f105b19b9256
+EBUILD twolame-0.3.13-r2.ebuild 1247 BLAKE2B 350aff37751d3974c0863debb9c6e90a783cfe7c12391d5feffbe60a553dbea37635dd6780e9374df5c8ad21519b80c36d2c5643784e92ef70513461e715b092 SHA512 78eea332e15a3d368be9ea6183afdc7a2945ba44e026a057febb7fc1ed9dd726216bf654559a326ef0a542d1fda43634354ef3cb61f09c2a49774ba0fb1e60b2
+EBUILD twolame-0.4.0.ebuild 1330 BLAKE2B f0ed068163f749f0a32bf5aab5b6006f785afba0715138c007892e63297a28a418848437a3f02081b696fde0d1d670a2f2d7473fc50b9f8cc87f8afc7983a044 SHA512 47d0de42790e9456387ad0efd5d50208d7e5d7a705f11f18308488f21d2f58a135011b9033b7a0ba3d2d5182f93922dccb69d3d3ba14508a09ca43ade1568219
 MISC metadata.xml 330 BLAKE2B 71d39da341e5e41047c01d3b77c1090a4d1304c7ae915832d6cebe103c52cee3d0d27dd0b09c66d775efb4ee3bec3696bd6f27ca5cb78acc2a563f3992a26fc2 SHA512 4ef98f0ddd18034ac0ea2e93a84560e62b02c3ee6186f980b20733d88f68e36f3724f2b2b8c138393f9c6da1b4b943f318fcc85b5f57817fbaac33d68e4b6ea8
diff --git a/media-sound/twolame/twolame-0.3.13-r2.ebuild b/media-sound/twolame/twolame-0.3.13-r2.ebuild
index fa766464fb55..1646cbb02f35 100644
--- a/media-sound/twolame/twolame-0.3.13-r2.ebuild
+++ b/media-sound/twolame/twolame-0.3.13-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]"
diff --git a/media-sound/twolame/twolame-0.4.0.ebuild b/media-sound/twolame/twolame-0.4.0.ebuild
index 628c6942148e..de159b95abd5 100644
--- a/media-sound/twolame/twolame-0.4.0.ebuild
+++ b/media-sound/twolame/twolame-0.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+sndfile static-libs test"
 
 RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}] )"
diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index 5e299048bc05..c20626cedf9c 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -3,6 +3,6 @@ AUX umurmurd.confd 64 BLAKE2B d98d616da50acabd055333c36699ab0dd060193fc450752837
 AUX umurmurd.initd 458 BLAKE2B e1f8dc704fa6237edfcfbb936e9d1c679e0f1a57ec862ec7215c3f263de0582baf70a0b822a1712c2423d753dda9e2602ff404d11f2f0d02df02116cdfb3729d SHA512 d60c700bf0bb54c904faff658e09dc37a6cd79edb69e4aa54f46872f474c8f673a91ebe022a47dc0d6b4f624a86f70be99f661a1e80a672b04dff6af3328b28d
 AUX umurmurd.service 363 BLAKE2B 373b02c3d2d9f80e3b1a44dc98032f68310e8c5b82682efc1001cf130bef21f6f925f4b535d0d02209617c92b4d4a3dad4a7b459c8dbbcf6f97b050bab933de0 SHA512 3366dc2b35623daf4704e30bc6207cf795e31cb4c9cd0c7e19f64fa9d92da772fcc309e5799261b6c07c95cfeacd2d9b898ec4a4be7b5acc46efda7a98308913
 DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 92fc7d63dc0eed228c3fbcb0d18861cd49967f44378d980e856f8fb24fe7abc3429a4ca8e811eda6096727b76780724c909c46c04975b5edef70d848b7511618 SHA512 a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15
-EBUILD umurmur-0.2.17-r3.ebuild 2625 BLAKE2B 4f2bbe73490e7afd848df792a4c3f24b261c212c37aaaf370bee1cc72f9cee236607c01a749d3d6d6231bd69d58cde0fca62405849f5f971b051ebe37b7e6cc8 SHA512 18db243228400f66dc3dc1de5603d27e7426b03f515d168a0d95f0c5e15aa049cd1fdce2c4c924a87c2b6362e5bae9575092d4de8a4d11e1c9ffcfe3e824ff7d
+EBUILD umurmur-0.2.17-r4.ebuild 2627 BLAKE2B 2639fc46de9a3aa7e088d5e907d19852097f242dc51cee53d1dfeaaf048bed056d1e9c6a163109ae0148655946a0ceb1814676366295fd4700bea99c3e9e29ad SHA512 49a20fa88def3399de9ecc3aa266bd76ce150fcefd9b2db7710678c9343c084fcca42d7c57a8e0528e9925047f8d3d11aac0209ac9728001ecf373e8fb5f9353
 EBUILD umurmur-9999.ebuild 2627 BLAKE2B 68faaf508f2c97cbe131e411a8197941b5cd63c488f9788946ea55362cef527107b102a9cfeab4d7be730d65a5e74682962c74ee2e48a75346b995d79ead4885 SHA512 21ec179a9000930e220a6a16f54a67bcf958342a87f303a703aa9e0cd38a9b7ec9b705751673962a6c82e9cbbd5040d69e1aaf47e311ae629f8e5b41738254f8
 MISC metadata.xml 1091 BLAKE2B fc7db1a6e1f3d32e9e579a8ba870b1d0322042cc2e9b723d0dcc120a4a714cb9d3a9e2e5da51e73c7d45e41976ae13b6566aaf0da856e0ef692d997f2ddf17bb SHA512 3e45f70e658253e9eb2fda16e3c054c0a670083142cb699247f47aac208ae67249fa66588a07730588e0ce64677a90e77dcd7015eb9d5478aef8b70933855831
diff --git a/media-sound/umurmur/umurmur-0.2.17-r3.ebuild b/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
index 49866ba51ee8..9bc2d4e0ca0f 100644
--- a/media-sound/umurmur/umurmur-0.2.17-r3.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
@@ -21,7 +21,7 @@ IUSE="gnutls libressl mbedtls shm"
 # ssl-provider precendence: gnutls, mbedtls, libressl
 # and openssl if none specified
 DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
-	dev-libs/libconfig
+	dev-libs/libconfig:=
 	gnutls? (
 		dev-libs/nettle:=
 		>=net-libs/gnutls-3.0.0
diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index 4ce8615f4981..e11ecbf6aa3c 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -1,16 +1,7 @@
 AUX upmpdcli.confd 26 BLAKE2B 840eb6e9353266f3669c00dda2a317a6146780180ff0998641dd258806b8dce0a1c49caca570c2ce1fac97e0bf3a347536c147f1a38092ae745bddd728128a01 SHA512 3dd82c12d66aac4be69a98cf25098fdb9c377c4ad0559d07f99cfb4599b6454a6880486053091d55e30b45ac8d877cfa544b1f3dc617d11c32c058767ae6a64f
 AUX upmpdcli.initd 387 BLAKE2B 1cf2ab80c9447041b2b1d1a921c164a6c0436204909c4857db798ed9930d3c1f6e5957a4382cfa884e9fa296ac8d72cc5e3d4d8025234251b665fb5d85efc12f SHA512 fcbefe70aecd05f4fea6427734933344cd1f537fd187c14f05d809f8cf8bb720241aeddc526e9c5497f76e5e7cdcf14798a160b4e4303d1482b53b646dd2b03f
-DIST upmpdcli-1.4.0.tar.gz 469357 BLAKE2B edd46e86f367ff2f88346cfb4cb249dae4463095553bb220fbd9a4078315044ec7591f58c30a0f20840a9f217230e46bc3b3569989a0ae2c05a44aa140c234c4 SHA512 1ed1f0a89a02610d70fb9e380dcbdbd8d636bc4a0964a16d27bd7c04126674f7f14e50e5fe521a430a06ea04ecef1275c7ad5f1c276daae1c285b73cceba9dec
-DIST upmpdcli-1.4.14.tar.gz 552026 BLAKE2B 0e9722d9a3c278b085416df240d3256ae1eff136f3897b181a59ce9d3edcdfd70ed7e568d8d345b1d0b13a9906f877776d9816ba3e8797c41c1684933aa326e6 SHA512 9084f60a4551fb94be915e6539d59a9ac070d55745c383b1f201c0c83262634c9e6fb353f66bb2232c493752805671b19057cbcec00c5ed128e19e1d0a037976
-DIST upmpdcli-1.4.2.tar.gz 477650 BLAKE2B 8bc2f86e8821aaee29f969e6031553f29e3224fdaf4b9c7d443f55bda5f321f36607dbb7dc0af15f0d1e7b006e93595cd1d668f9d1975e8673a80b218ea7f570 SHA512 be855214b55686422689ce786103ff50748a9f9e7e556c8dbeaa7e39e0229a3e0b56502bdbeb7071771706416cd2ff36592cb5245b505d8438f0ba75c200e9c2
-DIST upmpdcli-1.5.0.tar.gz 550268 BLAKE2B 8c9c7c3c4d3bdeb7a3a0c4ff506970d8e8ddfa8dffaf7fff525e263817088d599087843707c5154a6fb5441bccbadbee28a80a0bb85561a1418235af3ebc931f SHA512 a04e4b039d72ac8e8b6769bd4794f995f31978f2807aa8f938183cbf0d07f7b16cf9289c9f8c55efea8fa6ba54883cd87135683e524143c7cf0759decc7390ad
 DIST upmpdcli-1.5.2.tar.gz 550460 BLAKE2B e9905fb2f6c07d7374651fd0a9d7ec821d6ea25d4debe1b6e69bbf7def8b75d0b35b245a5e4ca2477832f71a9fe950f7f7635d1b6fc29add0e59405c0c69b338 SHA512 4d6cd44b64637c5a07996a416f0cf15e27e24b84aa04ee3ee9f6f5eda3164a5b964915587a4342cc0a8f95fa175dd106b99242de5c50d3cb603e48450694009e
 DIST upmpdcli-1.5.5.tar.gz 550726 BLAKE2B 1a32f5a3126e037f6663ab60244d7af3fd7aeb79c5878ba1ca4d8029b97917a70f5b06a82e6006fcf14642b96cb5539488b3bba03860a2dd23e6bce0efe54bdc SHA512 90ce69b4ef004e1b5db3229b3bc99637ecba0f5f7e82d0e9f567da163295b4a572d059accbeb679194d1846eb822d48378acc743ee334ffd9859f3e025f6a0f3
-EBUILD upmpdcli-1.4.0.ebuild 1259 BLAKE2B f62c3642b43df9d6d6d78001d0c45aec8b3fc1e5be2fbf5843ec3a6c20f4c500a18f367c6c5abd687482d88a5e39f86d98c30f635e3d8508cc21bc6123a0f81b SHA512 6e97ea302f73f8a3f7ce05d92f06cfe5d7f0fbf9a6b872e271000392d0bd8dd8fdb4cfa96c72beec1c56f94fa7fd31531d393b77f71ab8920c4fc578ec4d9fb1
-EBUILD upmpdcli-1.4.14.ebuild 1243 BLAKE2B 4946da31fe9803e50daaa738189e4cd2ea16c40709d63273d7b1a22613dfa96d22844ca27f9f9f8502c0024c3315d8636972d69b128a3049dc67632765d1fd76 SHA512 affcd83fed4cabbe769dfab4353ed92cea177dd4a90ec05e41989ea7b611e414c768017537c096b91d9d76782f2413bbace7e9c856be1d84d622fe12ad7793fd
-EBUILD upmpdcli-1.4.2.ebuild 1270 BLAKE2B 07b16ba743c24de6ef481f8e1c519f2a082c33dbe0d537595d550be4a45fece35d162ce0c1fa11bf701628c455522cfaf46fd4ce2cf22657325f3f802bbf9c00 SHA512 1f6424cb78e18f8f36aa647c252e3321c3ed8431ab54dec916f201b0afcf50fd72abb10f8bcb19b929d37be80502dd0a9cdd5edec95fcaa103c9ddb2c6e3a9a6
-EBUILD upmpdcli-1.5.0-r1.ebuild 1268 BLAKE2B 6458a9fb1875e490e8ee5fb45a748c176c9fac2812b46b4239da1e50ccd7383471a19fe761c40a29b37289c293e9047d26ef46a2feb9fb8a8f16b4043e25e6b9 SHA512 86c8c689450786448bfe7576601e50765b73d7e8c109c7a6377e9978951a110616d7cc5d060c6e55a4b1f4622e9f0e1ae3f909c906f152ef050c98c1a2c0157e
-EBUILD upmpdcli-1.5.0.ebuild 1260 BLAKE2B f66e40d7fc617c24832fcb034ed5a12edb5314cbbf9b67204150c22602ba11288c7ffa264d914eaf859efb74e7b2f76ea487df7d96a3bf0712fbd0163f943da4 SHA512 6370ffc1419420a757a0bc1cafdb79466c6a6af3aedb682d8f15573ba4549f792c2ee41f2259b77287027e324687d3dfcaecf6e8ec6815973a88a023a4d049f6
-EBUILD upmpdcli-1.5.2.ebuild 1268 BLAKE2B 6458a9fb1875e490e8ee5fb45a748c176c9fac2812b46b4239da1e50ccd7383471a19fe761c40a29b37289c293e9047d26ef46a2feb9fb8a8f16b4043e25e6b9 SHA512 86c8c689450786448bfe7576601e50765b73d7e8c109c7a6377e9978951a110616d7cc5d060c6e55a4b1f4622e9f0e1ae3f909c906f152ef050c98c1a2c0157e
+EBUILD upmpdcli-1.5.2.ebuild 1266 BLAKE2B 544ab7167dbec8e99e5256895c697a80fae5799f22dc410524cd20a9717397fbc296b87602279693276f298739a49de07543d331a86612e141fe09b1fa806a53 SHA512 6c7287599db7529da5840a90cfe0ce4cbd17c20588ddc0a4aba343fed2f65448c70e1d053a53cfeb9d134adad9b40bbf9693c8545bc2e0be1acb79f957b9e008
 EBUILD upmpdcli-1.5.5.ebuild 1268 BLAKE2B 6458a9fb1875e490e8ee5fb45a748c176c9fac2812b46b4239da1e50ccd7383471a19fe761c40a29b37289c293e9047d26ef46a2feb9fb8a8f16b4043e25e6b9 SHA512 86c8c689450786448bfe7576601e50765b73d7e8c109c7a6377e9978951a110616d7cc5d060c6e55a4b1f4622e9f0e1ae3f909c906f152ef050c98c1a2c0157e
 MISC metadata.xml 323 BLAKE2B 3b9aa1c98130517f1e0d458e9e007330fea3b695192f11a02edb51c2845358353367bcc421a70965abed3996450afdac11d80dd7e54e6b115cbb3c0940830106 SHA512 1f004f9123b7924186183899cdd55ae2fb75a61ab59cd01ac077627a18d28c934716a31f1070e5cd1a2ab6faafd9994079bad87178c6e744093cfcd7d6a7673b
diff --git a/media-sound/upmpdcli/upmpdcli-1.4.0.ebuild b/media-sound/upmpdcli/upmpdcli-1.4.0.ebuild
deleted file mode 100644
index a5f87fad529c..000000000000
--- a/media-sound/upmpdcli/upmpdcli-1.4.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd user
-
-DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
-LICENSE="GPL-2"
-
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="thirdparty"
-
-DEPEND="
-	dev-libs/jsoncpp
-	media-libs/libmpdclient
-	net-libs/libmicrohttpd
-	>=net-libs/libupnpp-0.17.0
-"
-RDEPEND="
-	${DEPEND}
-	thirdparty? ( dev-python/requests )
-"
-
-pkg_setup() {
-	enewuser "${PN}"
-	enewgroup "${PN}"
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit systemd/upmpdcli.service
-}
-
-pkg_postinst() {
-	einfo
-	einfo "This package no longer assumes that upmpdcli is driving an"
-	einfo "mpdinstance on the same host (https://bugs.gentoo.org/670130)."
-	einfo "Probably it is though, so be sure your mpd is built with"
-	einfo "USE=curl."
-	einfo
-	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
-	einfo "detects sc2mpd at run-time, capabilities are added"
-	einfo "including internet radio support.  See upstream docs"
-	einfo "for more information."
-}
diff --git a/media-sound/upmpdcli/upmpdcli-1.4.14.ebuild b/media-sound/upmpdcli/upmpdcli-1.4.14.ebuild
deleted file mode 100644
index 405d3053766d..000000000000
--- a/media-sound/upmpdcli/upmpdcli-1.4.14.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
-LICENSE="GPL-2"
-
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="thirdparty"
-
-DEPEND="
-	dev-libs/jsoncpp
-	media-libs/libmpdclient
-	net-libs/libmicrohttpd
-	>=net-libs/libupnpp-0.19.0
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/upmpdcli
-	acct-user/upmpdcli
-	thirdparty? ( dev-python/requests )
-"
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit systemd/upmpdcli.service
-}
-
-pkg_postinst() {
-	einfo
-	einfo "This package no longer assumes that upmpdcli is driving an"
-	einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)."
-	einfo "Probably it is though, so be sure your mpd is built with"
-	einfo "USE=curl."
-	einfo
-	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
-	einfo "detects sc2mpd at run-time, capabilities are added"
-	einfo "including internet radio support.  See upstream docs"
-	einfo "for more information."
-}
diff --git a/media-sound/upmpdcli/upmpdcli-1.4.2.ebuild b/media-sound/upmpdcli/upmpdcli-1.4.2.ebuild
deleted file mode 100644
index de1899cbdaf3..000000000000
--- a/media-sound/upmpdcli/upmpdcli-1.4.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd user
-
-DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
-LICENSE="GPL-2"
-
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="thirdparty"
-
-DEPEND="
-	dev-libs/jsoncpp
-	media-libs/libmpdclient
-	<=net-libs/libmicrohttpd-0.9.70
-	>=net-libs/libupnpp-0.17.0
-"
-RDEPEND="
-	${DEPEND}
-	thirdparty? ( dev-python/requests )
-"
-
-pkg_setup() {
-	enewuser "${PN}"
-	enewgroup "${PN}"
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit systemd/upmpdcli.service
-}
-
-pkg_postinst() {
-	einfo
-	einfo "This package no longer assumes that upmpdcli is driving an"
-	einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)."
-	einfo "Probably it is though, so be sure your mpd is built with"
-	einfo "USE=curl."
-	einfo
-	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
-	einfo "detects sc2mpd at run-time, capabilities are added"
-	einfo "including internet radio support.  See upstream docs"
-	einfo "for more information."
-}
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.0-r1.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.0-r1.ebuild
deleted file mode 100644
index 0eb2b288b4ea..000000000000
--- a/media-sound/upmpdcli/upmpdcli-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
-LICENSE="GPL-2"
-
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="thirdparty"
-
-DEPEND="
-	dev-libs/jsoncpp
-	media-libs/libmpdclient
-	net-libs/libmicrohttpd
-	>=net-libs/libupnpp-0.20.0-r1
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/upmpdcli
-	acct-user/upmpdcli
-	app-misc/recoll
-	thirdparty? ( dev-python/requests )
-"
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit systemd/upmpdcli.service
-}
-
-pkg_postinst() {
-	einfo
-	einfo "This package no longer assumes that upmpdcli is driving an"
-	einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)."
-	einfo "Probably it is though, so be sure your mpd is built with"
-	einfo "USE=curl."
-	einfo
-	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
-	einfo "detects sc2mpd at run-time, capabilities are added"
-	einfo "including internet radio support.  See upstream docs"
-	einfo "for more information."
-}
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.0.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.0.ebuild
deleted file mode 100644
index 5c2fe3e85607..000000000000
--- a/media-sound/upmpdcli/upmpdcli-1.5.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
-LICENSE="GPL-2"
-
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="thirdparty"
-
-DEPEND="
-	dev-libs/jsoncpp
-	media-libs/libmpdclient
-	net-libs/libmicrohttpd
-	>=net-libs/libupnpp-0.19.0
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/upmpdcli
-	acct-user/upmpdcli
-	app-misc/recoll
-	thirdparty? ( dev-python/requests )
-"
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit systemd/upmpdcli.service
-}
-
-pkg_postinst() {
-	einfo
-	einfo "This package no longer assumes that upmpdcli is driving an"
-	einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)."
-	einfo "Probably it is though, so be sure your mpd is built with"
-	einfo "USE=curl."
-	einfo
-	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
-	einfo "detects sc2mpd at run-time, capabilities are added"
-	einfo "including internet radio support.  See upstream docs"
-	einfo "for more information."
-}
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.2.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.2.ebuild
index 0eb2b288b4ea..a3c936e6337c 100644
--- a/media-sound/upmpdcli/upmpdcli-1.5.2.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.5.2.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="thirdparty"
 
 DEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
commit	129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree	53bf797418ac5e9b99c41ca0382c87b82421e5de /media-sound
parent	441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)