gentoo resync : 05.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
commit: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree: ab466b4dfa7abecb401b2f8039d08af4689306bb /media-sound
parent: d42200bec37eef2a7478d88988ff00addd0a9202 (diff)
137 files changed, 537 insertions, 1359 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 9fbb6e60145b..2bde50fc7559 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index ed032a3f3927..ed78db5cb106 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -3,6 +3,6 @@ DIST alsa-tools-1.1.0.tar.bz2 1715113 BLAKE2B 9b64f3a78e0cff212663c716c189591cd2
 DIST alsa-tools-1.1.6.tar.bz2 1778330 BLAKE2B 256ffaef47f78c07f1d8cd86df57b2f75cb6838c407586b52144963350d51271fb500e627e152d05d1c586c337c70fc839072094e0492a0a1b160d6876ccedeb SHA512 33617ec6726ca11f66849c893a8dd9bf9faa8832374788819d9280159ac358c83443331faac24881df593cfd0b24b22769a41cbcb0af3c1fd781baab0c802d17
 DIST alsa-tools-1.1.7.tar.bz2 1782642 BLAKE2B 1b2235c3471595c17836b376e5c87194b798f39d2ab52398c634b430c55a4d10482af2aef9568c6694ac4f5a58c4b2f4601cc6a7a80b4e1a3e87dd8d86d8e67a SHA512 d715fa5b909fb33ffce252b4ae9f027dc7c1a509253d52bda6ecbc5e0a38e7d30ab8486b14114b226424217812a0edf66e7ec11f7674e44c77a14e4dfb16889c
 EBUILD alsa-tools-1.1.0.ebuild 3509 BLAKE2B d82ab3d9c125cd4617706efe528e0329dccbadf5d82d72462c34b81f7f48aa9574f989399849a93173533596a6d7e69b619b1baf27a6f634dea3e13c51ac4a18 SHA512 c51185818a2e3cba8d8d78879ef20f4cecccc69ebbd1e6f39683bba3eb537d041f773bf43af0a92872ee1a9158720dd3e8b9de6cd23ece3cbdac91b839608a11
-EBUILD alsa-tools-1.1.6.ebuild 3569 BLAKE2B ebfb9fa84e07a45372088119ac8d49fc5933600874fe5187f3c6ab9b5a8eb4df9f066204d0aad1061d5354cb247fc9e11a3faeb871e68cf8584fc67e180a05d9 SHA512 631bc96a57be0e78bdabc6c0b6a9a2a244aac8179313048c9482a1f6141f29989b3e3dee0c8685f405e45ec6831f686c371fc6318a0187eb32d8ac4da6a71a87
-EBUILD alsa-tools-1.1.7.ebuild 3580 BLAKE2B a4ac6835474572cc9a3999d450a5a28a8afa69381a5258dd2c343f4e40c5bd64a7dd924afd498e32aa5a019c7fc7ab0172182878ac03c1161ee15d70ad9b2618 SHA512 98711596f571eff25588b818d637dbd45943b37b6ee076be61210e4a893cf26ee88b9c693c55c2db9435f987e4bf861684942ad211609eb40a7d5876ab4cb86c
+EBUILD alsa-tools-1.1.6.ebuild 3570 BLAKE2B 5f27740820696fb9041b3c5c886208b2bfb13167d20ff60a812e5677026edfc29a14a27cdf06895ce559046cd30ece2da663848b7cbda1d39244d677396241d0 SHA512 43ea6ae98e8c2d56bc39ac4491568b1d4beaa33ee00df2779e50c1763647597666c5db6cca5a07205062bfc1aa065e48ac053049e13c848dbddd1489f4a371fe
+EBUILD alsa-tools-1.1.7.ebuild 3581 BLAKE2B aeee6dd181d7a15d3474a453366e0a75c2deca2e8732931947fc46b06375678193377db8412d8abcf813ba2f014d0d41e531d58cf45be23ed82a408fb252c9ef SHA512 f6b75d47dd56fbda46fa667b3904bfff5c24ea1a26094248f01af8c28d25c5b7e605865f254e8a3e8bdf4c42489682ff52bba864055cfccd46257fee64d04c15
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild
index c853b373050a..c22f9833e1b5 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="alpha amd64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~mips ppc ppc64 sparc x86"
 
 IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
 alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
index 686cdd3fbbbf..257c21c2a923 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 
 IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
 alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index f2142ceb31ba..426373bfdbcd 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -10,9 +10,9 @@ DIST alsa-utils-1.1.6.tar.bz2 1203722 BLAKE2B e098ecbc5835c8ecd311a4df1ab51a7092
 DIST alsa-utils-1.1.8.tar.bz2 1262174 BLAKE2B 643017f8f31d88356a2a55b5b1249d5b705daa7bd38e6d5e8835a21a9aefeca2fb1a7444c5709516ace0eecdfd5b410b5b24008abebb7ca917763108637bbcca SHA512 f877b491840126420dd9847347d0af865b6d03eccac2e2c3853cdbc76e91899f5a5139753cc41a4db942e7999c8d53cf9bd57d2fd5e1d32c872871b2d25146d9
 DIST alsa-utils-1.1.9.tar.bz2 1268833 BLAKE2B 56fe00bd7dce21969f9f91d1d82a6644da338208bfa646fc2a46d38f2d1d937b55b90acc5f75bb630aa288dee458c9f555a5727990c5cd7a59b627cb1ecf1e2c SHA512 92fa689ea5897150972d5376e7999ff060cad09cb0b06991d81c87b61a243ecec944e2a4c7ad38878596cd8b4246e44c5a3a35e5bc6452c02ebf35c9bed91970
 DIST alsa-utils-1.2.1.tar.bz2 1270194 BLAKE2B e5cb4d6c94f09f1eb9044a7f34904bc662ac2eb9ae734f333cf22271b4add1de1032ac38cf064807146095edc2eae452c197b98b4dd63f0004e1705f8e322e4f SHA512 b7729659cd9809197dc30042f522f5103ff41ddc047f13f9c733c93f7e91a26f90cd864c70e654d12ef7a552b1d9ebe2727a24ec9fad03560cb7cdea906662ec
-EBUILD alsa-utils-1.1.2.ebuild 2217 BLAKE2B 2b0293d7f3acf6bae13cd1aaa341509b9fc47fd54425c675aeb2f44b84057a211c0a27e7f72140ff7e53a99a564b5d2e09f4536c66c6af536628235573c6d7aa SHA512 81906644eba293211f1ab2eb440edd572b675f159051468e53a3ad21d503bfcf4c031492c80952a19b6950bb1bf85571c68df29c410986a40e4131d89daa6570
-EBUILD alsa-utils-1.1.6.ebuild 2267 BLAKE2B 62b70e332647004bb076720a4fbe6ffcb62cf5cf681d928bfd774bcccdf27aeb9360ec57f1bf40e2054b8214e45fcc865a9c954ef819e8754052b03cb8858e17 SHA512 d2df64e3857c67b5a144af362aa3986346c379b0e2b8530688f10fafc8ffe2e8d81c33cd416bdfe36c2102e3651d09c77b61d1ca12b07a465e38275215654a39
-EBUILD alsa-utils-1.1.8.ebuild 2338 BLAKE2B 3618d6e3a8983cdac336f7c68e2c20e7ac0aaddc535ca83f7f8a0f4e2eb4acb6cc0931184fc8d23756b509f819581555c361ec2b3d6a41b6023f359ae66476f0 SHA512 89fc70da32aa126e27a76468adaf91dd05509a0347abc934d87945a618a1e1749f032e7b63d82cc1dbc2c9b5755b98abe1d7ad17fb0e14aedfc937021abed028
+EBUILD alsa-utils-1.1.2.ebuild 2218 BLAKE2B 8eaace4cf6d675988c76ef1ad983e4c009a9060309ea890a986a0c892574abac65a468503015fea0069f17a5276def0d96ec3ddd0fdcb0e0189dbc10ca5b3464 SHA512 f37bb1b77730f09d053205cf431db7c4601122446b1cb3d4722b64830cfc46666abfb0806787ad4f146602d3b62b1638cc7f0c89cbd2bc0bf034138b53ddc3c3
+EBUILD alsa-utils-1.1.6.ebuild 2268 BLAKE2B de4e179a4c128917b6693705ce05c7906c7c6d7f79518871cec851fc1b03c41516bcb414f5644bc34ded0a91293d0b75524d6cf983c081a7e0d94a758417ac7b SHA512 4acf87ae7149014817cccd3f65fc87ce3bae76b947f40c2b6364fcccabd6797fabe9b64e0ec13814e56389f563d28485242af73dcd9c2d04a1f516924ceb9102
+EBUILD alsa-utils-1.1.8.ebuild 2339 BLAKE2B 24c2a4c6847ebe215755bbbaa24687966949df9accbad985f5c763421c2b2e0f1b56a3ddf9ee24ffef33eb1b00c13cb283c283919291538e44a89d153edef6ce SHA512 305103876116a82fdd95563da46e73ade699157bbfaea0eb163f8c7611067eaa6dec089b1b690fadc11e817be96f706f66550d32c335a04b8c2d012584b443cb
 EBUILD alsa-utils-1.1.9.ebuild 2423 BLAKE2B 27a87cd73011e680060fa04173aaff943b6b7674a0b937588c6421ae2f25bdd5ac1b37a15ec5a80a5d1ece1548275c6892e12a79564a8e3953aaa8ab596ee676 SHA512 38c1fd5cd8463d2cf4dabd3b509ff2270ad33f0c6fc3afba73560563767c8432baaf03bb315876f54ea0c2ebc6dbff23b8ae90599ac2f4cb1d8088f2d72711e2
-EBUILD alsa-utils-1.2.1.ebuild 2341 BLAKE2B 9b278cb091d2dbe63651b3440fee69e2f9baa44dcae94db1c7b915da70c2e62f13edddfd46c06d8ab491f8f95873e61ecb3c49c639e96edc794a8a8825d0912a SHA512 ef99e681e8b2f669380195d82892acc218feb3c947597eaa9a4e49b44f34feb807aa941a54cfce6255a85092c043db61c87f8c2ed7057cb05503ac4af8fbaff8
+EBUILD alsa-utils-1.2.1.ebuild 2340 BLAKE2B c3aacb5956c91e4f57edbad2bdeb772aa16c1582f274a3ec3fb223836eb9d4681d11447898c79caaba32957a5b9af625010ccc8e047a82a24c2edf6155a5bb8b SHA512 9d23e5e734bb72735e36aac722835f20f0378eea4371c306456dc900e4a76d13f39fde6f73239dd9fedccd89407089f1ab3c609649e588fb589e4df86263dccf
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild
index ff8d38adbc19..5f777c08c699 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh 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.1.6.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
index 94c2d33c3127..d0d681959024 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.6.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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh 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.1.8.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
index 27b0fc51dfe2..4e1881d711a5 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.8.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 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~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.1.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
index 82d637ad6d51..7229b722fb42 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/ario/Manifest b/media-sound/ario/Manifest
index ae9cff76efa0..1e52e42bd56f 100644
--- a/media-sound/ario/Manifest
+++ b/media-sound/ario/Manifest
@@ -1,6 +1,3 @@
-AUX ario-1.5.1-single-includes2.patch 16062 BLAKE2B 1cacda4c7fcf04de122d3a0b960605b384239de7fb779b593f9de3dc13d5aa32cbae0018ca60f32ab003cc282f1d3800e08e6d4efd759d77367a0cea19646b90 SHA512 f832498f2445f2f937a1b9636ba6c75fce3a75e706296a315e0c33c3a852140ba829f6972d8cc2ade3fa4a45f21a964eef8134b315fdfe1155cd221e9ee0cbb2
-DIST ario-1.5.1.tar.gz 1135444 BLAKE2B 2d91a7b8ce9c6c6069ec7230e10e7c358a146272474d0dbb298e038a3fb31d524c6ad7a8428af12f580853bbc6ea484ce3ffa6919cd454060d19e9f4cde42200 SHA512 78c3d881d51c3109b73252da0742da2a77bcc24ec21ff2ff02fd3527d62d49a75e412bf092051a9035863d645cba73e6cd2fc674d97629909b931ae9d3ec002b
 DIST ario-1.6.tar.gz 1151747 BLAKE2B 2a9a5d9c9e528f92a198270a4715a225d254a8fd6800004928ef39c4ed792bda2a82eefaa45824d5422598f9fe242b6b621768780655b009043cc3447d8d5643 SHA512 93057da62616e79f6ba6f7204fabac37417fb34c350b53eeea61508f4c65322fabaef7a9fdbe7beb8dcbf92c8f86f0d33caf1ffa0ad76de8050fe72d57408ec0
-EBUILD ario-1.5.1-r1.ebuild 1554 BLAKE2B 124e80d5a4714b1251775ae82ad6b6c19864ddfcd39f29e56644e02a141a1b305a51aecceeeaffd47f668ebc52f9d338d51c26121d6db74576dca5ff9ed8b723 SHA512 6d2a5d70b2974412b2fb9f1d3bc365e8b4eac81fa72da6d192ec2a03969e27a4bc24dd9d2cbadfa6dbf6e2baa4aa8fbb6b543c61abacbc61b627191738e87e31
-EBUILD ario-1.6.ebuild 1205 BLAKE2B 9eebd899e75d6d4086a42e545927249f08877d871256b52ae067c3959d5f621bfc742f7bce689197ce092b388d92cde4f2c75db6aa4adf1de89579b86da9bc39 SHA512 d6326705e40c0a8795f636feb69047608a63784c8a3c0e10ecd036de66078c2f71b1460a58289c15b042f0f79954e1b842e0aed644155d2d0b33d3ca318def37
-MISC metadata.xml 694 BLAKE2B 2e67dc03a24d5593d24d1170d27c406036e82502df12e29b020b0d5932ab09606da3f5f2502c14f453d2415bf4df0d641ee4a634c0ebda2bd45e9e6a0dfef4b9 SHA512 fdf6358cc5ceff526d31e9f1ae43e7b9a5b2d449c4f9bc9011f37675536d99d22edaec439bf5a32dcc66ee24ec4ffcf20206e80afb83235887e500efca18f613
+EBUILD ario-1.6.ebuild 1203 BLAKE2B 0f77060a6fe417ac70cfe7ae51e3fbf8d997f2910740880bdb43661ae25a75ac1795c3c21d19cdff8f556fe3394b80642d8626d1ea2c180156d44802e18b6fcb SHA512 7b7e5f39b7b811d27e5c819ab1ffe7f3ced6ced7cd98a48bf363fd97cead49032fc7e6b56c9f96783f2db25ffee4f64589a9b8d9e829533bb7daae2257bdfa46
+MISC metadata.xml 596 BLAKE2B 2de1c54642e0228e54445c0036d60f652fe1b4f8fb8e3917761819ae2918714646ecae8b9c33f94fdf99feee342d5959eb2ccde95c07c29cb20894efbe8f540b SHA512 aa1a8084967904d6cc2a2b46a87ab39281d562814e28f1dfa2720ed0b6ad185b6b382c41554414415cb08644f0c5393d76bf48f39265cb9935dc28d878c05666
diff --git a/media-sound/ario/ario-1.5.1-r1.ebuild b/media-sound/ario/ario-1.5.1-r1.ebuild
deleted file mode 100644
index 0d303e6f0e3d..000000000000
--- a/media-sound/ario/ario-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools gnome2 python-any-r1
-
-DESCRIPTION="GTK2 MPD (Music Player Daemon) client inspired by Rythmbox"
-HOMEPAGE="http://ario-player.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}-player/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus debug +idle libnotify nls python scrobbler taglib zeroconf"
-
-RDEPEND=">=dev-libs/glib-2.14:2
-	dev-libs/libgcrypt:0=
-	dev-libs/libunique:1
-	dev-libs/libxml2:2
-	media-libs/libmpdclient
-	net-misc/curl
-	net-libs/gnutls
-	>=x11-libs/gtk+-2.16:2
-	dbus? ( dev-libs/dbus-glib )
-	libnotify? ( x11-libs/libnotify )
-	python? ( dev-python/pygtk:2
-		dev-python/pygobject:2 )
-	scrobbler? ( net-libs/libsoup:2.4 )
-	taglib? ( media-libs/taglib )
-	zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-DOCS=( AUTHORS )
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-single-includes2.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--disable-xmms2 \
-		--enable-libmpdclient2 \
-		--enable-search \
-		--enable-playlists \
-		--disable-deprecations \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable idle mpdidle) \
-		$(use_enable libnotify notify) \
-		$(use_enable nls) \
-		$(use_enable python) \
-		$(use_enable scrobbler audioscrobbler) \
-		$(use_enable taglib) \
-		$(use_enable zeroconf avahi)
-}
diff --git a/media-sound/ario/ario-1.6.ebuild b/media-sound/ario/ario-1.6.ebuild
index a909b0299b6b..c67e1c768eb8 100644
--- a/media-sound/ario/ario-1.6.ebuild
+++ b/media-sound/ario/ario-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}-player/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dbus debug +idle nls taglib zeroconf"
 
 RDEPEND="dev-libs/glib:2
diff --git a/media-sound/ario/files/ario-1.5.1-single-includes2.patch b/media-sound/ario/files/ario-1.5.1-single-includes2.patch
deleted file mode 100644
index e5936cfbe2c1..000000000000
--- a/media-sound/ario/files/ario-1.5.1-single-includes2.patch
+++ /dev/null
@@ -1,557 +0,0 @@
-Index: plugins/radios/ario-radio.h
-===================================================================
---- plugins/radios/ario-radio.h	(revision 772)
-+++ plugins/radios/ario-radio.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_RADIO_H
- #define __ARIO_RADIO_H
- 
--#include <gtk/gtkhbox.h>
-+#include <gtk/gtk.h>
- #include <config.h>
- #include "widgets/ario-playlist.h"
- #include "sources/ario-source.h"
-Index: plugins/filesystem/ario-filesystem.h
-===================================================================
---- plugins/filesystem/ario-filesystem.h	(revision 772)
-+++ plugins/filesystem/ario-filesystem.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_FILESYSTEM_H
- #define __ARIO_FILESYSTEM_H
- 
--#include <gtk/gtkhpaned.h>
-+#include <gtk/gtk.h>
- #include <config.h>
- #include "widgets/ario-playlist.h"
- #include "sources/ario-source.h"
-Index: plugins/information/ario-information.h
-===================================================================
---- plugins/information/ario-information.h	(revision 772)
-+++ plugins/information/ario-information.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_INFORMATION_H
- #define __ARIO_INFORMATION_H
- 
--#include <gtk/gtkhbox.h>
-+#include <gtk/gtk.h>
- #include <config.h>
- #include "sources/ario-source.h"
- 
-Index: src/plugins/ario-plugin-info.c
-===================================================================
---- src/plugins/ario-plugin-info.c	(revision 772)
-+++ src/plugins/ario-plugin-info.c	(revision 774)
-@@ -27,7 +27,7 @@
- 
- #include <string.h>
- #include <glib/gi18n.h>
--#include <glib/gkeyfile.h>
-+#include <glib.h>
- 
- #include "plugins/ario-plugin-info-priv.h"
- #include "ario-debug.h"
-Index: src/sources/ario-search.h
-===================================================================
---- src/sources/ario-search.h	(revision 772)
-+++ src/sources/ario-search.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_SEARCH_H
- #define __ARIO_SEARCH_H
- 
--#include <gtk/gtkhbox.h>
-+#include <gtk/gtk.h>
- #include <config.h>
- #include "sources/ario-source.h"
- 
-Index: src/sources/ario-storedplaylists.h
-===================================================================
---- src/sources/ario-storedplaylists.h	(revision 772)
-+++ src/sources/ario-storedplaylists.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_STOREDPLAYLISTS_H
- #define __ARIO_STOREDPLAYLISTS_H
- 
--#include <gtk/gtkhpaned.h>
-+#include <gtk/gtk.h>
- #include <config.h>
- #include "sources/ario-source.h"
- 
-Index: src/sources/ario-source-manager.h
-===================================================================
---- src/sources/ario-source-manager.h	(revision 772)
-+++ src/sources/ario-source-manager.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_SOURCE_MANAGER_H
- #define __ARIO_SOURCE_MANAGER_H
- 
--#include <gtk/gtknotebook.h>
-+#include <gtk/gtk.h>
- #include "sources/ario-source.h"
- 
- G_BEGIN_DECLS
-Index: src/sources/ario-browser.h
-===================================================================
---- src/sources/ario-browser.h	(revision 772)
-+++ src/sources/ario-browser.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_BROWSER_H
- #define __ARIO_BROWSER_H
- 
--#include <gtk/gtkhbox.h>
-+#include <gtk/gtk.h>
- #include "sources/ario-source.h"
- 
- #define MAX_TREE_NB 5
-Index: src/sources/ario-tree.h
-===================================================================
---- src/sources/ario-tree.h	(revision 772)
-+++ src/sources/ario-tree.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_TREE_H
- #define __ARIO_TREE_H
- 
--#include <gtk/gtkhbox.h>
-+#include <gtk/gtk.h>
- #include "servers/ario-server.h"
- #include "sources/ario-source.h"
- #include "shell/ario-shell-coverdownloader.h"
-Index: src/ario-util.h
-===================================================================
---- src/ario-util.h	(revision 772)
-+++ src/ario-util.h	(revision 774)
-@@ -18,8 +18,8 @@
-  */
- 
- #include "servers/ario-server.h"
--#include "glib/gslist.h"
--#include "gdk/gdkpixbuf.h"
-+#include <glib.h>
-+#include <gdk/gdk.h>
- 
- /* Number of covers used to generate the drag & drop image */
- #define MAX_COVERS_IN_DRAG 3
-Index: src/ario-main.c
-===================================================================
---- src/ario-main.c	(revision 772)
-+++ src/ario-main.c	(revision 774)
-@@ -21,7 +21,7 @@
- #include <locale.h>
- #include <libintl.h>
- #include <gtk/gtk.h>
--#include <gdk/gdkkeysyms.h>
-+#include <gdk/gdk.h>
- #include <curl/curl.h>
- #include <libxml/parser.h>
- #include <glib/gi18n.h>
-Index: src/ario-profiles.h
-===================================================================
---- src/ario-profiles.h	(revision 772)
-+++ src/ario-profiles.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_PROFILES_H
- #define __ARIO_PROFILES_H
- 
--#include <glib/gslist.h>
-+#include <glib.h>
- #include "servers/ario-server.h"
- 
- G_BEGIN_DECLS
-Index: src/covers/ario-cover-handler.h
-===================================================================
---- src/covers/ario-cover-handler.h	(revision 772)
-+++ src/covers/ario-cover-handler.h	(revision 774)
-@@ -17,7 +17,7 @@
-  *
-  */
- 
--#include <gtk/gtkdialog.h>
-+#include <gtk/gtk.h>
- 
- #ifndef __ARIO_COVER_HANDLER_H
- #define __ARIO_COVER_HANDLER_H
-Index: src/covers/ario-cover.c
-===================================================================
---- src/covers/ario-cover.c	(revision 772)
-+++ src/covers/ario-cover.c	(revision 774)
-@@ -19,8 +19,7 @@
- 
- #include "covers/ario-cover.h"
- #include <glib.h>
--#include <gtk/gtkdialog.h>
--#include <gtk/gtkmessagedialog.h>
-+#include <gtk/gtk.h>
- #include <string.h>
- #include <glib/gi18n.h>
- #include "ario-util.h"
-Index: src/preferences/ario-others-preferences.h
-===================================================================
---- src/preferences/ario-others-preferences.h	(revision 772)
-+++ src/preferences/ario-others-preferences.h	(revision 774)
-@@ -21,7 +21,7 @@
- #define __ARIO_OTHERS_PREFERENCES_H
- 
- #include <glib.h>
--#include <gtk/gtkvbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/preferences/ario-lyrics-preferences.h
-===================================================================
---- src/preferences/ario-lyrics-preferences.h	(revision 772)
-+++ src/preferences/ario-lyrics-preferences.h	(revision 774)
-@@ -21,7 +21,7 @@
- #define __ARIO_LYRICS_PREFERENCES_H
- 
- #include <glib.h>
--#include <gtk/gtkvbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/preferences/ario-server-preferences.h
-===================================================================
---- src/preferences/ario-server-preferences.h	(revision 772)
-+++ src/preferences/ario-server-preferences.h	(revision 774)
-@@ -21,7 +21,7 @@
- #define __ARIO_SERVER_PREFERENCES_H
- 
- #include <glib.h>
--#include <gtk/gtkvbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/preferences/ario-cover-preferences.h
-===================================================================
---- src/preferences/ario-cover-preferences.h	(revision 772)
-+++ src/preferences/ario-cover-preferences.h	(revision 774)
-@@ -21,7 +21,7 @@
- #define __ARIO_COVER_PREFERENCES_H
- 
- #include <glib.h>
--#include <gtk/gtkvbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/preferences/ario-browser-preferences.h
-===================================================================
---- src/preferences/ario-browser-preferences.h	(revision 772)
-+++ src/preferences/ario-browser-preferences.h	(revision 774)
-@@ -17,7 +17,7 @@
-  *
-  */
- 
--#include <gtk/gtkdialog.h>
-+#include <gtk/gtk.h>
- 
- #ifndef __ARIO_BROWSER_PREFERENCES_H
- #define __ARIO_BROWSER_PREFERENCES_H
-Index: src/preferences/ario-taskbar-preferences.h
-===================================================================
---- src/preferences/ario-taskbar-preferences.h	(revision 772)
-+++ src/preferences/ario-taskbar-preferences.h	(revision 774)
-@@ -21,7 +21,7 @@
- #define __ARIO_TASKBAR_PREFERENCES_H
- 
- #include <glib.h>
--#include <gtk/gtkvbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/preferences/ario-stats-preferences.h
-===================================================================
---- src/preferences/ario-stats-preferences.h	(revision 772)
-+++ src/preferences/ario-stats-preferences.h	(revision 774)
-@@ -21,7 +21,7 @@
- #define __ARIO_STATS_PREFERENCES_H
- 
- #include <glib.h>
--#include <gtk/gtkvbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/preferences/ario-connection-preferences.h
-===================================================================
---- src/preferences/ario-connection-preferences.h	(revision 772)
-+++ src/preferences/ario-connection-preferences.h	(revision 774)
-@@ -21,7 +21,7 @@
- #define __ARIO_CONNECTION_PREFERENCES_H
- 
- #include <glib.h>
--#include <gtk/gtkvbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/preferences/ario-playlist-preferences.h
-===================================================================
---- src/preferences/ario-playlist-preferences.h	(revision 772)
-+++ src/preferences/ario-playlist-preferences.h	(revision 774)
-@@ -21,7 +21,7 @@
- #define __ARIO_PLAYLIST_PREFERENCES_H
- 
- #include <glib.h>
--#include <gtk/gtkvbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/lib/gtk-builder-helpers.h
-===================================================================
---- src/lib/gtk-builder-helpers.h	(revision 772)
-+++ src/lib/gtk-builder-helpers.h	(revision 774)
-@@ -17,7 +17,7 @@
-  *
-  */
- 
--#include <gtk/gtkbuilder.h>
-+#include <gtk/gtk.h>
- 
- #ifndef __GTK_BUILDER_HELPERS_H
- #define __GTK_BUILDER_HELPERS_H
-Index: src/widgets/ario-dnd-tree.h
-===================================================================
---- src/widgets/ario-dnd-tree.h	(revision 772)
-+++ src/widgets/ario-dnd-tree.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_DND_TREE_H
- #define __ARIO_DND_TREE_H
- 
--#include <gtk/gtktreeview.h>
-+#include <gtk/gtk.h>
- #include <config.h>
- 
- G_BEGIN_DECLS
-Index: src/widgets/ario-songlist.h
-===================================================================
---- src/widgets/ario-songlist.h	(revision 772)
-+++ src/widgets/ario-songlist.h	(revision 774)
-@@ -21,10 +21,7 @@
- #define __ARIO_SONGLIST_H
- 
- #include <glib.h>
--#include <gtk/gtkscrolledwindow.h>
--#include <gtk/gtkliststore.h>
--#include <gtk/gtktreeview.h>
--#include <gtk/gtkuimanager.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/widgets/ario-tray-icon.h
-===================================================================
---- src/widgets/ario-tray-icon.h	(revision 772)
-+++ src/widgets/ario-tray-icon.h	(revision 774)
-@@ -26,8 +26,7 @@
- 
- #include <config.h>
- #include "shell/ario-shell.h"
--#include <gtk/gtkuimanager.h>
--#include <gtk/gtkstatusicon.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/widgets/ario-volume.h
-===================================================================
---- src/widgets/ario-volume.h	(revision 772)
-+++ src/widgets/ario-volume.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_VOLUME_H
- #define __ARIO_VOLUME_H
- 
--#include <gtk/gtkeventbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/widgets/ario-connection-widget.h
-===================================================================
---- src/widgets/ario-connection-widget.h	(revision 772)
-+++ src/widgets/ario-connection-widget.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_CONNECTION_WIDGET_H
- #define __ARIO_CONNECTION_WIDGET_H
- 
--#include <gtk/gtkvbox.h>
-+#include <gtk/gtk.h>
- 
- #define ARIO_DEFAULT_TIMEOUT 5000
- 
-Index: src/widgets/ario-firstlaunch.h
-===================================================================
---- src/widgets/ario-firstlaunch.h	(revision 772)
-+++ src/widgets/ario-firstlaunch.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_FIRSTLAUNCH_H
- #define __ARIO_FIRSTLAUNCH_H
- 
--#include <gtk/gtkassistant.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/widgets/ario-header.h
-===================================================================
---- src/widgets/ario-header.h	(revision 772)
-+++ src/widgets/ario-header.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_HEADER_H
- #define __ARIO_HEADER_H
- 
--#include <gtk/gtkhbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/widgets/ario-lyrics-editor.h
-===================================================================
---- src/widgets/ario-lyrics-editor.h	(revision 772)
-+++ src/widgets/ario-lyrics-editor.h	(revision 774)
-@@ -17,7 +17,7 @@
-  *
-  */
- 
--#include <gtk/gtkvbox.h>
-+#include <gtk/gtk.h>
- #include "lyrics/ario-lyrics-provider.h"
- 
- #ifndef __ARIO_LYRICS_EDITOR_H
-Index: src/widgets/ario-tooltip.h
-===================================================================
---- src/widgets/ario-tooltip.h	(revision 772)
-+++ src/widgets/ario-tooltip.h	(revision 774)
-@@ -21,7 +21,7 @@
- #define __ARIO_TOOLTIP_H
- 
- #include <config.h>
--#include <gtk/gtkhbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/shell/ario-shell-coverdownloader.h
-===================================================================
---- src/shell/ario-shell-coverdownloader.h	(revision 772)
-+++ src/shell/ario-shell-coverdownloader.h	(revision 774)
-@@ -21,7 +21,7 @@
- #define __ARIO_SHELL_COVERDOWNLOADER_H
- 
- #include <glib.h>
--#include <gtk/gtkwindow.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/shell/ario-shell-preferences.h
-===================================================================
---- src/shell/ario-shell-preferences.h	(revision 772)
-+++ src/shell/ario-shell-preferences.h	(revision 774)
-@@ -17,7 +17,7 @@
-  *
-  */
- 
--#include <gtk/gtkdialog.h>
-+#include <gtk/gtk.h>
- 
- #ifndef __ARIO_SHELL_PREFERENCES_H
- #define __ARIO_SHELL_PREFERENCES_H
-Index: src/shell/ario-shell.h
-===================================================================
---- src/shell/ario-shell.h	(revision 772)
-+++ src/shell/ario-shell.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_SHELL_H
- #define __ARIO_SHELL_H
- 
--#include <gtk/gtkwindow.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/shell/ario-shell-lyrics.h
-===================================================================
---- src/shell/ario-shell-lyrics.h	(revision 772)
-+++ src/shell/ario-shell-lyrics.h	(revision 774)
-@@ -17,7 +17,7 @@
-  *
-  */
- 
--#include <gtk/gtkwindow.h>
-+#include <gtk/gtk.h>
- 
- #ifndef __ARIO_SHELL_LYRICS_H
- #define __ARIO_SHELL_LYRICS_H
-Index: src/shell/ario-shell-lyricsselect.h
-===================================================================
---- src/shell/ario-shell-lyricsselect.h	(revision 772)
-+++ src/shell/ario-shell-lyricsselect.h	(revision 774)
-@@ -22,7 +22,7 @@
- #define __ARIO_SHELL_LYRICSSELECT_H
- 
- #include <glib.h>
--#include <gtk/gtkdialog.h>
-+#include <gtk/gtk.h>
- #include "lyrics/ario-lyrics.h"
- 
- G_BEGIN_DECLS
-Index: src/shell/ario-shell-songinfos.h
-===================================================================
---- src/shell/ario-shell-songinfos.h	(revision 772)
-+++ src/shell/ario-shell-songinfos.h	(revision 774)
-@@ -17,7 +17,7 @@
-  *
-  */
- 
--#include <gtk/gtkdialog.h>
-+#include <gtk/gtk.h>
- 
- #ifndef __ARIO_SHELL_SONGINFOS_H
- #define __ARIO_SHELL_SONGINFOS_H
-Index: src/shell/ario-shell-similarartists.h
-===================================================================
---- src/shell/ario-shell-similarartists.h	(revision 772)
-+++ src/shell/ario-shell-similarartists.h	(revision 774)
-@@ -17,7 +17,7 @@
-  *
-  */
- 
--#include <gtk/gtkwindow.h>
-+#include <gtk/gtk.h>
- 
- #ifndef __ARIO_SHELL_SIMILARARTISTS_H
- #define __ARIO_SHELL_SIMILARARTISTS_H
-Index: src/shell/ario-shell-coverselect.h
-===================================================================
---- src/shell/ario-shell-coverselect.h	(revision 772)
-+++ src/shell/ario-shell-coverselect.h	(revision 774)
-@@ -22,7 +22,7 @@
- #define __ARIO_SHELL_COVERSELECT_H
- 
- #include <glib.h>
--#include <gtk/gtkdialog.h>
-+#include <gtk/gtk.h>
- #include "servers/ario-server.h"
- 
- G_BEGIN_DECLS
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 772)
-+++ configure.ac	(revision 774)
-@@ -298,9 +298,11 @@
- if test x"$enable_deprecations" = xyes; then
-         WARNINGS="$WARNINGS -DG_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED \
-+-DGTK_DISABLE_SINGLE_INCLUDES \
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
---DGSEAL_ENABLE"
-+-DGSEAL_ENABLE \
-+-DG_DISABLE_SINGLE_INCLUDES"
- fi
- AC_SUBST(WARNINGS)
- 
diff --git a/media-sound/ario/metadata.xml b/media-sound/ario/metadata.xml
index 8d7f9eb01e64..948969c65670 100644
--- a/media-sound/ario/metadata.xml
+++ b/media-sound/ario/metadata.xml
@@ -11,7 +11,6 @@
 	</maintainer>
 	<use>
 		<flag name="idle">Enable experimental support for MPD's idle command to reduce bandwidth and cpu usage, requires MPD 0.14</flag>
-		<flag name="scrobbler">Enable audioscrobbler/last.fm support <pkg>net-libs/libsoup</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">ario-player</remote-id>
diff --git a/media-sound/aumix/Manifest b/media-sound/aumix/Manifest
index 42a3076727dc..c8f16c1f1d58 100644
--- a/media-sound/aumix/Manifest
+++ b/media-sound/aumix/Manifest
@@ -1,5 +1,5 @@
 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 997 BLAKE2B f61e38c06cdb32cac7ffa212fd938c1ea383826d39fcbaeeb8589f3e22a5ec1790bcb5e191b204a9bcf6b7211683dfbbf20b7ac4dfd353dfbddb81c52941e877 SHA512 7bdcb6e6bf892acb276be89f228cb4c214e367e7372ca65b2bb3928790ef1ce61e7d2c916cc727ba78b7b687ac4ba7a047df1b69efd1bf896fe5efe851a7f934
+EBUILD aumix-2.9.1.ebuild 998 BLAKE2B d81613711d39b26d79c692a2dc52034cae37b1f08f90606401763abce96b7bafb1ccda56c583c349b380bd239c4bc7481104537a122672a278fb3fd3d75d0faa SHA512 1c5623280568c272814b3349f6e71f1b876f7da8eced92ae9714421c0d82eadf168df5d33d38625161360cc3eee453c4864cdf323527906091fbed79445643fe
 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 deffad3e7208..55ec80f9297e 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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
 IUSE="gpm gtk nls"
 
 RDEPEND="sys-libs/ncurses:0=
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index 43cc0ac89127..f0143bafc5dd 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -1,10 +1,9 @@
 AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fce5cade63163376f9b6400a1a4aaed90a09b8c87650e90f1c84f98199844e32f05b0d387ba3db4971e SHA512 6ddf5c4e82d30c1c56cdcdd0207d353dca4398d2e7e5e514b9dc1dd55bf1053876d0c12b3fd77dd7dff2c348b60bcf6f215f57f0c72aaf1b29e735e86f060406
 AUX bluealsa-init.d 368 BLAKE2B 62558866adfed1fffafa47f15d0704d228d31e38529c542093b21dc1e82d459068a545e3e033cec32ec2ac9c8185459365846ce97a4f1264535533a6e55a186f SHA512 d0ffcd77d6aa7fd97d72b3cdb4b938c98a59344c8e710e6063adcf46091a9c33077edc913caecd65443ff5e9062998b1299b20b5c3866825640f33f662d8c88d
 AUX bluealsa.service 184 BLAKE2B 94d33842a6d677b6e6078e2159e13198daede77be2e5ac435836f5b20056deac75cbfd9828bd2fe22ea30e544e2846f61be1194c555a166303514bbb48e4107a SHA512 108a86070b215d16e092c0f8fb869c969bc99b6aa479cb81c894fc6ae0c9e16655b14da27ee49c7f50549e4de7aa43a855954cc0dfe7430cdcf8822a97a4d889
-AUX bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch 988 BLAKE2B e8a038a794a6ec4b8f78943d8371931ed110672b543d4e14d7e6c29baab7f658c6e02a6e7d8a2a9ab2caa73be9255f45b1923cb6ff5ae110bc0c924026c2bfc6 SHA512 32badb733ec3d7f7af07e03ae9f5c224b482fee7910ba9fe9067938d48c6b0d58d3535f1ba10609ecebb7df2b91a6af1048f2d19b4b48435e552800979ed0878
-DIST bluez-alsa-1.4.0.tar.gz 102539 BLAKE2B 8e640ba5c0cadfa5478885dc6affef790bd50fe04821602156a598082efc8733f0917a91240af7881f980e89ec0e36801e537feedec3ce357087b040f852eeb0 SHA512 fa4ad21c7b9ac200cdc7628bf0276bbb0beac94066a6c5e69c47a5286f6e13a7dc61caab23acbb14a37c2b97894c425052a09adb8f967038f6fd99557208629f
 DIST bluez-alsa-2.0.0.tar.gz 116895 BLAKE2B 97dfd3364259e8a633de0259c84efe4dc4a80a9f388620200c44136844af6f3e101bf6d49931e1b5cd466d4b1ff13b2a7b9284d4599db72039ee3c5afa5800ba SHA512 21152be594421cd00056e94065dcf767ca01f7b040117974315f97aab45db020264e33dabddac7fee12834a4ada9073b9ff680c25d8775b47604cb0bec638a7b
-EBUILD bluez-alsa-1.4.0.ebuild 1670 BLAKE2B cb789ef1012c5c5c05e24c17ab0dbea9fa6e690b1524ed1591182a8b760952087b2d07b8d94cf925705f5777ea53dc9e7b2a354acae9452351d4fc5cabb7d359 SHA512 6d827de99d82bba9eee711bcaa6363ff75bbc2ea891d4314115b636e3b64a157366a2bf355933b339ff1de448cc3e51638c54615f029c09ee37b701009b8b4ac
-EBUILD bluez-alsa-2.0.0.ebuild 1657 BLAKE2B 54511c7b9c053bccbf7723fc8c3f90197e54350a8e4b62125d5c1e13339a99f2f24c266d848f0dcca557000f59b31b250813a18381a297358e25a3b9fb8d97d5 SHA512 7bfaac39bd31c04ad7972f711c7664d064f36d53cea669eaedf9de18cbf37f36dd1932013640728ae1bf209a5bd4530b5c34318c6ca953d830b414a52f158ca5
-EBUILD bluez-alsa-9999.ebuild 1657 BLAKE2B 54511c7b9c053bccbf7723fc8c3f90197e54350a8e4b62125d5c1e13339a99f2f24c266d848f0dcca557000f59b31b250813a18381a297358e25a3b9fb8d97d5 SHA512 7bfaac39bd31c04ad7972f711c7664d064f36d53cea669eaedf9de18cbf37f36dd1932013640728ae1bf209a5bd4530b5c34318c6ca953d830b414a52f158ca5
+DIST bluez-alsa-2.1.0.tar.gz 129650 BLAKE2B 6ab1b618828b5ad6f35c62a711cd24a51536ae4e013227addff8193bb522e0e7322d054fa8e688b5322ec59f6d08a654760ebb5792a637fa11536afc41c5dba5 SHA512 8b6d520f5733799b1c509052ac527377cbe5e0106b75180f783f83071246937b5dc7a22c2d27f3e9e331c52c74be59f3bc6d78caab97b41f06cfd6ed5191b584
+EBUILD bluez-alsa-2.0.0.ebuild 1692 BLAKE2B 05aec99d39b34f4ba0d372a9dad95e91c2850f77044190abf3956e173b91af9b89b747757537765d5ca55d0aede612584f024b28cd59234b1ab15d9702cdf865 SHA512 769fd153bb7496a9c49c8336d69aa9d2f506c241383aafb06bc9e5fa04d6e95ff0c3f696b1707eee109fc6b593c5bd478a550bedd964479e90b1734e72a57716
+EBUILD bluez-alsa-2.1.0.ebuild 1877 BLAKE2B f499f35e7e189820ea2554c576ea2ebae05c5fadf7386d76e4abbbbb2ffa057544cc6b12af313ae3ec48331d4bcdc98d087adc93323dd7adccc5cd64b59bb57e SHA512 a1e2c29746fdc1701b8ae6d7c0384466fd21a44e052d08e8be46b9d93de2eeaee71fb931babc1ef472e4480fbd6e6bea82fe46c7787c7bc7f472d84bbacae479
+EBUILD bluez-alsa-9999.ebuild 1877 BLAKE2B f499f35e7e189820ea2554c576ea2ebae05c5fadf7386d76e4abbbbb2ffa057544cc6b12af313ae3ec48331d4bcdc98d087adc93323dd7adccc5cd64b59bb57e SHA512 a1e2c29746fdc1701b8ae6d7c0384466fd21a44e052d08e8be46b9d93de2eeaee71fb931babc1ef472e4480fbd6e6bea82fe46c7787c7bc7f472d84bbacae479
 MISC metadata.xml 583 BLAKE2B 169737f9ae65bf26204a56b0fbcd1479911895ccfc20433c01a8ea1711ceb75939531f395f7e882149ffde427f43d8410d19392040e5288f5dbca2e4f86fa71f SHA512 b767355e099b5c60ad8d439ba7db224a11638a3fca4a7cd7b3efaa3152a0660ca96176a08d8e352fece334e7a48cebcce555fe12cf9959749491eed360772054
diff --git a/media-sound/bluez-alsa/bluez-alsa-2.0.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-2.0.0.ebuild
index 32e9eef4fbc0..336fe7f1b8a6 100644
--- a/media-sound/bluez-alsa/bluez-alsa-2.0.0.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,6 +24,7 @@ RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
 	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
 	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
 	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
+	sys-apps/dbus[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
 	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
 	hcitop? (
diff --git a/media-sound/bluez-alsa/bluez-alsa-1.4.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-2.1.0.ebuild
index ebcf1d253247..fc03fb3b79e0 100644
--- a/media-sound/bluez-alsa/bluez-alsa-1.4.0.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-2.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools multilib-minimal
+inherit autotools multilib-minimal systemd
 
 DESCRIPTION="Bluetooth Audio ALSA Backend"
 HOMEPAGE="https://github.com/Arkq/bluez-alsa"
@@ -17,27 +17,29 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="aac debug hcitop ldac ofono static-libs test"
+IUSE="aac debug hcitop ldac ofono static-libs test upower"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
+# bluez-alsa does not directly link to upower but
+# is using the upower interface via dbus calls.
+RDEPEND="
+	>=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
 	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
 	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
 	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
+	sys-apps/dbus[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
 	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
 	hcitop? (
 		dev-libs/libbsd
 		sys-libs/ncurses:0=
 	)
-	ldac? ( >=media-libs/libldac-2.0.0 )"
+	ldac? ( >=media-libs/libldac-2.0.0 )
+	upower? ( sys-power/upower )
+"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-ldac_pkgconfig_checks.patch
-)
-
 src_prepare() {
 	default
 	eautoreconf
@@ -53,16 +55,18 @@ multilib_src_configure() {
 		$(use_enable test)
 		$(multilib_native_use_enable hcitop)
 		$(multilib_native_use_enable ldac)
+		$(multilib_native_use_enable upower)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
 	default
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 
 	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
 	newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
+	systemd_dounit "${FILESDIR}"/bluealsa.service
 }
 
 pkg_postinst() {
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index 32e9eef4fbc0..fc03fb3b79e0 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,20 +17,26 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="aac debug hcitop ldac ofono static-libs test"
+IUSE="aac debug hcitop ldac ofono static-libs test upower"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
+# bluez-alsa does not directly link to upower but
+# is using the upower interface via dbus calls.
+RDEPEND="
+	>=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
 	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
 	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
 	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
+	sys-apps/dbus[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
 	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
 	hcitop? (
 		dev-libs/libbsd
 		sys-libs/ncurses:0=
 	)
-	ldac? ( >=media-libs/libldac-2.0.0 )"
+	ldac? ( >=media-libs/libldac-2.0.0 )
+	upower? ( sys-power/upower )
+"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
@@ -49,13 +55,14 @@ multilib_src_configure() {
 		$(use_enable test)
 		$(multilib_native_use_enable hcitop)
 		$(multilib_native_use_enable ldac)
+		$(multilib_native_use_enable upower)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
 	default
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 
 	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
 	newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
diff --git a/media-sound/bluez-alsa/files/bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch b/media-sound/bluez-alsa/files/bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch
deleted file mode 100644
index 55530ea8b831..000000000000
--- a/media-sound/bluez-alsa/files/bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 52b08766b08ec7ef8393343553934ca148c175af Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sun, 24 Mar 2019 13:04:24 +0100
-Subject: [PATCH] configure.ac: Fix pkg-config checks for libldac
-
-libldac actually provides the following two pkgconfig files:
-
-ldacBT-enc.pc
-ldacBT-abr.pc
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 270a74c..6f0b04b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -81,8 +81,8 @@ AC_ARG_ENABLE([ldac],
- 	[AS_HELP_STRING([--enable-ldac], [enable LDAC support])])
- AM_CONDITIONAL([ENABLE_LDAC], [test "x$enable_ldac" = "xyes"])
- AM_COND_IF([ENABLE_LDAC], [
--	PKG_CHECK_MODULES([LDAC], [libldacBT >= 2.0.0])
--	PKG_CHECK_MODULES([LDAC_ABR], [libldacBT_abr >= 2.0.0])
-+	PKG_CHECK_MODULES([LDAC], [ldacBT-enc >= 2.0.0])
-+	PKG_CHECK_MODULES([LDAC_ABR], [ldacBT-abr >= 2.0.0])
- 	AC_DEFINE([ENABLE_LDAC], [1], [Define to 1 if LDAC is enabled.])
- ])
- 
--- 
-2.21.0
-
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index d372d5e550e4..ccf1e81c21d1 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -1,6 +1,6 @@
 DIST cdparanoia-3.10.2-patches.tar.xz 12228 BLAKE2B 0a78bf713807ed738110543c0e4a8fb5af8add5c77b93b3cf219b1dd19d1317d0bf0197c9bf1cc2217b37c08ab1ff576982a0408d2c0adf6be79f25e35e0b36c SHA512 48ef57334f48d8b7449ea5ca361666d1a618529bf2e78182026fa09a94cd55865d18f4925369bf9de2c251d9420c0edfae17eb8726c157bb6eafd8b4fd410a5a
 DIST cdparanoia-III-10.2-patches-2.tbz2 6242 BLAKE2B 6eb0f3c3a331421497e406df969de61d42590f4e8ffff13ffc212ec4a03170b1e02e00322c5c4f2042e5cc4be2cffff58ec8b9b57d851d5df8bebc3fb88ac913 SHA512 523a9ef9f3de263236aad6da102b807a6620cde8767e297e54dcd552f59077d959a89187bc82ad71c577fa66c4862d7c651e922b8b8b8369dd63685cbda9cb74
 DIST cdparanoia-III-10.2.src.tgz 183236 BLAKE2B 295065388e45371329ea7b04bac03c90fd854478d34eb46fa95db03054a1a21effe7863e5065a9148e558796c352d5087b6ef1c3c4c20342e66abd7d2c9eef85 SHA512 4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4eeddb9e8baea675fe51c06138d913342afc8bed167d9fa55672fa25a2763ce21f7e24c1232e4739aff20733a7
-EBUILD cdparanoia-3.10.2-r6.ebuild 1321 BLAKE2B 30833fc15e666cd3268bc6c93119e664eb2b70735f86d151411700094675ad5bd9665d74ac446dcd0fe668d4e6249a3b67a0dcfc9d05d9ec3d3e778c2896c1c1 SHA512 669c340b310ad79f0fb659d36bfaf06d27df486cea58bb9aaa2b5a312eea3399a95f07ff7e25a9719f041adf378f49d1fb7f2891b398d416e2e9e9bb3ccce41d
+EBUILD cdparanoia-3.10.2-r6.ebuild 1322 BLAKE2B faff704b119627f65985e04cdc555af1b3eee2af270e92a92f3b25134e999ac9d889d714ba6a56c76713cf0b4dab263dc4a5e35dbf1f2cee03c2140a34dd081b SHA512 0822881e9784b1bddc9f27bfa5af5c9a057cf729510e97e0d4e757e0c75d050b6bffc067e85f8b3196968f108ea41f1d199337b269b1ed8aec841b30d79567d9
 EBUILD cdparanoia-3.10.2-r7.ebuild 1375 BLAKE2B bdaf0f434270474fb1ce3b24c05efaea4cc29781bdc25161517e07744355e21827b66d6fc53bb53027ff585fc130732afebef856b80235146ce635dc4d5e16d5 SHA512 b7c5715cea664e4b9909933318f145ad6ca274553e0d56fad7ae17be891db8dd76477e014cfc1d96922adcbfa4faec5fcdc1d02100a3676413459086f3dee72d
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
index ccff9a911ad1..21082c44d0cc 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.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/cdplay/Manifest b/media-sound/cdplay/Manifest
index 101ef2306ed1..be7e935c545d 100644
--- a/media-sound/cdplay/Manifest
+++ b/media-sound/cdplay/Manifest
@@ -1,3 +1,3 @@
 DIST cdplay-1.0.tar.gz 12779 BLAKE2B 3a78c125ba2b60bbddbe6a4e1e17ed9d9e36f1c2fdff80df804453e9d81013f5c83310c1e9c04d7c35c271cfe0de555d2d70c0de75454a81f217728d15601cdb SHA512 545f2f6b5fbb8f5c27b4140f805875d7923d7fdc9fb5c77ba7f702c934d9f22540b3d9153424bed3040375965bc30ef065924070eac7d06c31c3be7c185508e6
-EBUILD cdplay-1.0.ebuild 527 BLAKE2B a3793cea182542bc38e1b0e6e5e24f27fa353384126b367b7913e9be3b9432d2dbf9c65a5a10bbe7168342b1d90d976b0df47c6e7221faaa15d0081892d4b1c1 SHA512 bd6901b6a13a6f4cff9b0590ea1af178f723e0b49cf60801787b1564c8a778f8f35e148e83603f117f73ed5cbd6285e3846e185562a217b63249b4d00953cd95
+EBUILD cdplay-1.0.ebuild 528 BLAKE2B 29b14815ff32aedfd69f13e9d8e3cb2178250f71a488014e2e9a59c1623060d812d331072da3bc67935c6fa04e01f4833f370123097dfb09d1f0577a14b300b7 SHA512 3c3672baf463a503da9aebdb57c53612132129df0fc9042bf5cdb103e865a15fca53845411058f4ce80f057e662fe2f72dbe65952245b288657c78ae7219e1de
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/cdplay/cdplay-1.0.ebuild b/media-sound/cdplay/cdplay-1.0.ebuild
index 2f69fdc3dd03..b33541177387 100644
--- a/media-sound/cdplay/cdplay-1.0.ebuild
+++ b/media-sound/cdplay/cdplay-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ta-sa.org/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 
 DEPEND="!media-sound/cdtool"
 
diff --git a/media-sound/dcd/Manifest b/media-sound/dcd/Manifest
index 29b373e46c26..8e0a7b36e7ff 100644
--- a/media-sound/dcd/Manifest
+++ b/media-sound/dcd/Manifest
@@ -1,5 +1,5 @@
 AUX dcd-0.95-Wimplicit-function-declaration.patch 367 BLAKE2B 20eb9c178131f22c59c456ff1e4c61ef511bface4316e9dbbcec6d91e7677368a9db9fc5114e238d3d70ff30d0f0e3359b84097c1f9809c1731db4446c7a2582 SHA512 b6b97901432756424062aceea37160b74300117cdec2c8b47e6c728d91c9245c9fa52ce56e7db7fa5e4105ecc09df99d035b8bb528b96e2b23dc4e1b22d88296
 AUX dcd-0.95-makefile.patch 281 BLAKE2B fe9d98c496747d6cd257421aba127c4853a9dd7df024bd24db021cc21d0cb38b51cc4546082917f17be766731cd4eeb854ebb8d0680fee0507b12785f722ce29 SHA512 7762a5f076f48ff5aed005528e242149db25d67cc165f233be8918821ae58127165d920be00121b1a3cf9985dce5aa2064c4b9e0884db99bb221f9ebf0a9e873
 DIST dcd-0.95.tar.bz2 33620 BLAKE2B fe5ee6ad882457c4af21740b1667e78e5081841cf31a4c6c5477921ecaa361eb69315b0735200dff9543f2d0c2af5b129f027798f4ac90a795facd8e4a9f632b SHA512 12e9af435ba857e6b3f65881303ff72b349f0645b2649ffb39b17ffa4ab7f16e0f84d385f24cfd32e386185d78abc575cf326a05febfe0acc56b286a64ac6ff2
-EBUILD dcd-0.95.ebuild 624 BLAKE2B ae9edd66089ea3febbc7f8fa4413a77dd44c85018e20950296ec88c41c7326a27ac1fbfdbd7d663726450e424b4decd4e5e83b63c8a9f8d0a23b6f8c6dd60613 SHA512 5d05281ee0a27196961c5efa0a8086db8b11d7228eaf18f47aa92ebfe539689dd1d8fec225037df532f1178513978f1b697f257bda24538438b6de4705e0e373
+EBUILD dcd-0.95.ebuild 625 BLAKE2B a57e84709ffb368c1a60de0669a3bf34c4a5d32806284fe556bcadfe914e36fa79887852b15d07e043601a0b21829fa2a79f23ed9839b4331f725253c84eff86 SHA512 6a682845666c9d2c995cdfc0b1d8e48930955397b43fa42b09c485b5cd93fdc572985e25dc2ff7d33481ba3d683c4e55c72c969eeddd467d9b7bea75c9fac745
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/dcd/dcd-0.95.ebuild b/media-sound/dcd/dcd-0.95.ebuild
index 0f9f329da3ff..a8944f625ee5 100644
--- a/media-sound/dcd/dcd-0.95.ebuild
+++ b/media-sound/dcd/dcd-0.95.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.technopagan.org/dcd/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-makefile.patch
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index b3dd721e54aa..d69c9ef77914 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,4 +1,4 @@
 AUX easytag-2.4.3-ogg-corruption.patch 7233 BLAKE2B e0123a9d195a85d80136fc831cdfe1a870346a2f0cf0213a53e0ef51bc82e72db390898df0c8d02ba8865c3571e5d2f8b8faafe0b3750b6cd123e3fe065cc65f SHA512 f25cedb0f09edf987317f395133195f115549503a6c02edfce7e49f1f24d2e5d01920c9b48f41addb2b632d68bb329cbdefc25aec4e56239daa4f7980d33bd10
 DIST easytag-2.4.3.tar.xz 1381084 BLAKE2B 22358cd15e53a51f2786ad2a62e5d9eea78e9c8b8127d2820dbd5657d734a9a0e694a6d180ad730b87c8c236e3d3396c9ea4c651df4080d0f4b4dc0e212b945c SHA512 ef596341772ce7da3b7feec2c82a20ca29d25c2496074c469be5b8dd75d2b2718e689310e0d61de53bc29a4f54ce9f853a336e1a35076046fd107afd28699087
-EBUILD easytag-2.4.3-r1.ebuild 1800 BLAKE2B 89fd4d5d2cf8a5edc8cf75dfdaec2c4ba14f1fddafd8e2c99702026f32933aa0037042ee78f625dffaff6bbc24da97054b8173dada441d691382ca46cc3357a6 SHA512 20a79dd7f1c3f239c7431a070b546ff03c659f4e2da6c59a330294b523bb0959b3ca56bb42809ce5a018e0a9bab397e49a54163ffa5d88965fe7de4bce7319cf
+EBUILD easytag-2.4.3-r1.ebuild 1801 BLAKE2B f3ff7a8d3d560b5649644757e8a219aa922f68fbe962f9a2da99c3d8fa6a04392dc37332cc268e384ff096881cadcacd8c13f74ba882365448c04765bd298280 SHA512 94ee48b2c57ee907718595ab5aa5ff1620af8cd354c50ea82c9f3d3f0538d8476a966d3a82982e9321c390c53a33db45a95f52d076318ed47af6a7ee727a0242
 MISC metadata.xml 514 BLAKE2B b5fdb67baedcef2a155492cf00b63b35ae13c7fe214ba657722043bf824e607dfdf3d50deeb24c4ebb2cc704b7deb41d66c8ea8aa2f3b5911a72cb833b9e05a4 SHA512 eb53f395ef50eb4a86865629809332930907f459cd3b7b2d052727e4c25a27fd9e1acd9660fc354eb16ce7f6ff41e323689548e8b8a671e0878344cc0eb9ddc9
diff --git a/media-sound/easytag/easytag-2.4.3-r1.ebuild b/media-sound/easytag/easytag-2.4.3-r1.ebuild
index 7736f4dd65ab..3dd2d70b7e1c 100644
--- a/media-sound/easytag/easytag-2.4.3-r1.ebuild
+++ b/media-sound/easytag/easytag-2.4.3-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="flac mp3 mp4 nautilus opus speex test vorbis wavpack"
 RESTRICT="!test? ( test )"
diff --git a/media-sound/edna/Manifest b/media-sound/edna/Manifest
index 50b387b16f51..907032103445 100644
--- a/media-sound/edna/Manifest
+++ b/media-sound/edna/Manifest
@@ -4,5 +4,5 @@ AUX edna-0.6-flac.patch 1989 BLAKE2B 5697b0637e21345a71dcae40593804dc7e5a0e7c9e2
 AUX edna-0.6-syslog.patch 2455 BLAKE2B a75e3624386e518286d963403ab87e7a4c0aba18eda3f127aa5d8d9a66a942d5c6b75232573bf1fdf6997f6a9c42d1db9c3a895cfc5efec1875fd2a0f2c49729 SHA512 458e3170c7b1dc556474811c6786576e6b6b72ad3a887f96f91a1a7f1563274f72b5e717e1e650f3ddff63a6dee41bd51893a2f5a856401f286f7a9b52af153d
 AUX edna.gentoo 595 BLAKE2B b0a4cf3b56c2a47ca5e0bbe8878237c8cfd7514d7d84fb6f871b3a48e12a669011ebf7e93a12a044e79de6563abb93bf365f7d9a08e4cb0237f4c5539fe10ac2 SHA512 9a005074cb39fa2669405fe60b633d388d47d92c73fb4f6ac1c8b384f62a7681604e62dfab57fcdc491076da7fd03b9d41797bf57fd6c4cb4a073b5a8cdf5b04
 DIST edna-0.6.tar.gz 50303 BLAKE2B 754017434722f5f6b0be508785b137ae1051a7566c39922b46732177b8cb61ceb509577bf167c7fb1a19f6cdb81cb45469009134d0dc18f8bf7c900326be18dd SHA512 d48786829c127b0a1e24116524b8b95a91990c8952882ef00d7761fc6c1dd9b4b0037af2b176dbfd066b6d80670bad7a0c724af984b24c6b4bde93c884c3b76b
-EBUILD edna-0.6.ebuild 1817 BLAKE2B d47798aaeb366cea8cd3dafcd476bd772b02ca927bbc7577d52f5f3cd25dd128380a4c9adf19fa04a4397ef2ee857feaa4ad1c789787fd22334142852f1abe35 SHA512 55b7d4dd43ead18d580013bd16e9655b7fc0714f0fbec5582f18a71b2a604fbf283034546c8323b2fe6b6859cb4aa8f95e5c47b0d033ba67635e94681f0f8389
+EBUILD edna-0.6.ebuild 1818 BLAKE2B 2f4ca8e2b727a9fdcd82a4bb472d8c2bd7f9a76343080d8d35ec8b99aed0bdd6e358b8f327241fde6b579fba9cfadfaa49f162282814c5b32c81d7e148b12f23 SHA512 08d2f5a03100184e096752c8f8ffc8b408c561d96789b566b842adaf97394f739140622d359a8009e1960bffc790984a2d90b8d973d06dc2c4ab95112e8c9cc0
 MISC metadata.xml 450 BLAKE2B bc3b852390304e3855c28dbdd9becb314c7e5e84c0661d2e70b4a91768ee43ce823ab80e66d4134abba90738f7698b9da5e5e375f02aa8367d37d95bf36d7321 SHA512 8598429fe8407b3522d408ed0de58310bb3902d6f27f78c980adc9ca43992a7010f43d059bd7b85849465ba60b019f7b858405d7d5f950b86bdb4f0ed3d1dbfd
diff --git a/media-sound/edna/edna-0.6.ebuild b/media-sound/edna/edna-0.6.ebuild
index 4e8485623966..1649bb836b31 100644
--- a/media-sound/edna/edna-0.6.ebuild
+++ b/media-sound/edna/edna-0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/edna/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 sparc x86"
 IUSE="flac ogg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 4d7c4516714e..f8ceacc82e6a 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,3 +1,3 @@
 DIST elisa-19.12.1.tar.xz 1385248 BLAKE2B 3c3aa474e58abc5e5a379c7eedef8064e77cf62c183ab01adf5d4023d73ba906ad8c3ec8ef1fe9c1e717b578150f06f55a8ef7bba0cc3d7a5e5e5535f8310393 SHA512 5ce68c523ae6406dda0e8a04c520a7b4a0c7c8085fec95e24a69021eddd5d57a62cb300e22416d0e0184a52d7000328da072c640f867bb8ad1612adf12b32d2f
-EBUILD elisa-19.12.1.ebuild 1621 BLAKE2B 9c963d5c2519b2d0c49fc8f42db788d10313bf565a165d0310ad4d4ddd1ff2f5742db5f2fad009d735d0cb9f92b89a87c1417f8b92e59c70517c6b2bf6a106dd SHA512 a287195025775ef5044acabc671e50d9fa6a3ce06a0241aba21ab06758f48082f0db6382cb4ac60d67deea3963cab886209e51febe0db208d11a7b80a2c7e4e2
+EBUILD elisa-19.12.1.ebuild 1626 BLAKE2B 014e9201c209bbcb28a238d1a8b085bddef7f98703a4a7a808d9d06269d34f7f41522deceab9b51c7fd3db10ede41c401add42d9f5d5d33665f604022b28c256 SHA512 bc9fdfb50dd0a032517d37b6c3322858156dfd08fb1d5757d519806b7ad9dafad270efec39403309428c1a57eaf1311b10e6528764a4416ca182f5903e17859e
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-19.12.1.ebuild b/media-sound/elisa/elisa-19.12.1.ebuild
index 59056aeac442..5f27760cd150 100644
--- a/media-sound/elisa/elisa-19.12.1.ebuild
+++ b/media-sound/elisa/elisa-19.12.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://community.kde.org/Elisa"
 
 LICENSE="LGPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="mpris semantic-desktop vlc"
 
 BDEPEND="sys-devel/gettext"
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 27d883f0d9a3..dec25d0d5bd5 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,7 +1,7 @@
 DIST fluidsynth-2.0.4.tar.gz 1378042 BLAKE2B 0fc75ea68169c47d64bdf727b8d78e311b36cb04509832f449a52d05e085908bd1ef837dd4c5e23edc25286b8ff3fdf69a9d042520c8eb2a3234fb929bed8de5 SHA512 d58ddc5f4da9bb5954a82749617548ef32edd25f6ca5c6d5c2b06d23090784ec175d2422553a66776f543c6b253f037a6cf1e717a853344ffb899fa53752eec0
 DIST fluidsynth-2.0.7.tar.gz 1315250 BLAKE2B 13186522b3eea6bdd9f4893fabe9d06e67061647c83cb9479630333b0bbc5878682d5d19d9050403875ac49f66f756947d48928e3367efef537408e86c4c4a00 SHA512 c939c77277767541b90ae8bc24687cd9cd11b375264e6b5017658f5fd9c5637a3ce09bc4ad837a349e4a63883fe5ecbe80e65dd91d2cbf71072bcbcfc068614e
 DIST fluidsynth-2.1.0.tar.gz 1356096 BLAKE2B f1dcf05a3d776d3e8be15330e2177e59c10da25063cba577b734aed2af98955c18b7184ee73866503c0cc9c5374c14a8a0030f630be98c9319680a34d8cab117 SHA512 d7af4047ebde49ef48098ae9dbab5d90422a4536acf28a2de32d8da67a50ebbbcf30e06833b630bd54e441040be0e432b377e3b63bf666e63106e69cd408ea0d
-EBUILD fluidsynth-2.0.4.ebuild 1960 BLAKE2B 3c837ac65f448c3706e9e12e34c39c6bace524b33e521e36a2d8c86c34a57e6d6361ec4fec27c585418b91e399ba502cf076e6f45442673db9b793f11b47bc6f SHA512 6d092fedb5994a354d0002412775d3ef5729394692ee944248d2e89e0bc15d76dd17259b7391bece108a11cd956808573c3d68a44dd0529b555cca6ff4269a44
+EBUILD fluidsynth-2.0.4.ebuild 1961 BLAKE2B 1a00c294af234851e06b359662882847718e5fcafb62de0f0dad20dd5596d252f67bc68d32264252d46530979ae45842acffded7c7c9028e08f99c3311cd4039 SHA512 4ccafb3721c1ec1e7fb6da3e94069df4ea8400d4f8fcf30c3f398f666cf8708a96c579ca3581ffb84b9b8cc3dd9c8e26253982d3d35f943ab1eb8a67cbb42c94
 EBUILD fluidsynth-2.0.7.ebuild 2538 BLAKE2B ce7275797d9a3fb38ff3b95e753d4ba81d5c11f3cb84c9213cf96847d2c6dd408f3039eb928218e999b9e358f2e92c2b79f3f12dd85174eb53ae6eaf5ed9822b SHA512 9529008829a8d0829404d1ef85aa622cd833d034bafba538d527a9c0a380513ef8483eb8c8d4e40b096ecc16841ec70381546e0f0f06e165240ba8f5d93e15a1
 EBUILD fluidsynth-2.1.0.ebuild 3323 BLAKE2B 4a9572ecf61630814035fbb6106becf333dfb58b76078acb8a3c2dfb4c8135f62360b5045e6fdf886b398da34af02ca7065caa9c7802a4e4ad48ee2d55fef941 SHA512 2da4bad58fe2d78fda897b009b7dc93756ff5bb61219c9aac9122a7e68020dc042574f4a95dd88c91b838685d9e3f42045060d7a4a4233d9287eafd90483e7be
 MISC metadata.xml 430 BLAKE2B cef06a37f27e4ef3a555000188873f0f36a89dc90a3576dc15fb384a8f3c8f5bd38ccb79f56704ec7031823d3057eda17ac975a3ea1e265133e5ff81afc141d8 SHA512 c702d31a98e905d95f95f6cdfc16d8a71de5a5a55628e59e56d408a6599cdf6ab005642ee064217d88e0061c2856692e1446e340a3e80f2bc17ed1d3c2a14e9a
diff --git a/media-sound/fluidsynth/fluidsynth-2.0.4.ebuild b/media-sound/fluidsynth/fluidsynth-2.0.4.ebuild
index 3cca69735a46..89ad8d02a318 100644
--- a/media-sound/fluidsynth/fluidsynth-2.0.4.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/FluidSynth/fluidsynth/archive/v${PV}.tar.gz -> ${P}.
 
 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 oss portaudio pulseaudio +readline +sndfile"
 
 BDEPEND="
diff --git a/media-sound/gmusicbrowser/Manifest b/media-sound/gmusicbrowser/Manifest
index aac6966d4d3c..549a2a90109b 100644
--- a/media-sound/gmusicbrowser/Manifest
+++ b/media-sound/gmusicbrowser/Manifest
@@ -1,6 +1,4 @@
-DIST gmusicbrowser-1.1.15_p20160530.tar.gz 1305616 BLAKE2B e67d239a4483624d298814c75442ecdbe6f243549e77ac73e511a123aa038c78dc1c7bd6a707df6a4085d66e6ffe720fc518babe29d382f960e95fb47cd56f29 SHA512 980446a873fab39c5b880e289e2ff61df112f5336dfd19b0ac3b3b6a346ddebaaca8718f169926404f38cc518817f115a38ab210ae7f4eab05962506d70d3f3b
 DIST gmusicbrowser-1.1.15_p20190315.tar.gz 1306390 BLAKE2B e74a3ce80e031c64e381e226d2905ebc5e6826758e984edaf6ad71b414438091f21eb068ce248f3a954bdac34d3027f88a36abaea07265904a5ae40a8da01bf5 SHA512 d9d92c670724daf3ccec5445bcafa9616a8995d1416c0d1a671a42ea14c4d74c4475546e45bb55c6c5015ecf770ed4a7cf1a0e8801d281096818758483c14e2e
-EBUILD gmusicbrowser-1.1.15_p20160530.ebuild 1739 BLAKE2B 013e8256f27e0b9f4ddd9640d85d87a50a10d9f92cd14636bbda07e370cb4a08daca6658005a1fb1bb9f49aad5a7a2f933a3540cce86fd47bcae8aa0baaed956 SHA512 b52b905916fbed1875c74222626150f8a2bcee8552aee9515d2e854cc4898015312d3520c14b78696d6d09b5b3fc57817848dac77911f4ee85399a8bbb83bb6f
-EBUILD gmusicbrowser-1.1.15_p20190315.ebuild 1453 BLAKE2B 8350e2a87669cbc53ff9aa29860d2ffc876ac28e9454bb0b023382870a570bd0832d1099466c4e3c88f63173b58e40e9515124c574c0e34074cead10c3d34077 SHA512 1a6bca106241c1361228586cf13b229d2cfc34cf27f993ac1872e0e60675673f7ca68998266d747b6675e147b7391bd0d411ccbafde6af067358d8d2e54c6a92
+EBUILD gmusicbrowser-1.1.15_p20190315.ebuild 1460 BLAKE2B 61d893f39f746a5b747f161f25a42b836794938a7c11ff7e06bc60e5613cd002d4b914bfc95420aadc3f9dd65af31dc3ecdeb2df566927527fbed7e4d53cc5ff SHA512 d4a5ae531738f10d6c955937dfc5508d02e40630fad0817d7ee17f4b7710c7a7a9ce09075e8bbd41d19c9f3bc5aa25497f77601a0dda02f0d3e1991ad43c3f74
 EBUILD gmusicbrowser-9999.ebuild 1453 BLAKE2B 8350e2a87669cbc53ff9aa29860d2ffc876ac28e9454bb0b023382870a570bd0832d1099466c4e3c88f63173b58e40e9515124c574c0e34074cead10c3d34077 SHA512 1a6bca106241c1361228586cf13b229d2cfc34cf27f993ac1872e0e60675673f7ca68998266d747b6675e147b7391bd0d411ccbafde6af067358d8d2e54c6a92
 MISC metadata.xml 465 BLAKE2B 53caced65e537cd80208bd2dad2853b72efb79925ddbf4009153483207f17bc7337312870d47e65ea971b3c944286875882d06d1bfc7b7e9c0bb88695d5f8ce3 SHA512 ff760d056bb2f67c021cfca327ad1f7f5be33264a6f03ec657e83a4ea7c14800d6f51340cb6ecad895bf2dfb8db38767982e63b030a9923de16820b7558f8497
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild
deleted file mode 100644
index 6e832b7bc9fa..000000000000
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
-	inherit git-r3
-	SRC_URI=""
-	KEYWORDS="amd64 x86"
-else
-	GIT_COMMIT="853840eb9dad0b59ad2dac5d303f5929b2f09f21"
-	SRC_URI="https://github.com/squentin/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
-fi
-
-DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
-HOMEPAGE="https://gmusicbrowser.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="dbus doc extras gstreamer libnotify mplayer"
-
-GSTREAMER_DEPEND="dev-perl/Glib-Object-Introspection"
-MPLAYER_DEPEND="media-video/mplayer"
-MPV_DEPEND="media-video/mpv"
-OTHER_DEPEND="
-	media-sound/alsa-utils
-	media-sound/flac123
-	|| ( media-sound/mpg123 media-sound/mpg321 )
-	media-sound/vorbis-tools"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Gtk2
-	virtual/perl-MIME-Base64
-	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
-	dbus? ( dev-perl/Net-DBus )
-	gstreamer? ( ${GSTREAMER_DEPEND} )
-	mplayer? ( || ( ${MPLAYER_DEPEND} ${MPV_DEPEND} ) )
-	!gstreamer? ( !mplayer? ( ${OTHER_DEPEND} ) )
-	extras? ( dev-perl/gnome2-wnck )
-	libnotify? ( dev-perl/Gtk2-Notify )"
-DEPEND="sys-devel/gettext
-	doc? ( dev-perl/Text-Markdown )"
-
-src_compile() {
-	emake MARKDOWN=$(usex doc "Markdown.pl" "echo")
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		iconsdir="${D%/}/usr/share/icons/hicolor" \
-		install
-
-	use doc && local HTML_DOCS=( layout_doc.html )
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild
index e3ecb295b17b..ae1b59c0d9a5 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,11 +9,11 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
 	inherit git-r3
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="amd64 x86"
 else
 	GIT_COMMIT="4538a5af5fb6c11f07bd7a9c50d6fd73b18c840d"
 	SRC_URI="https://github.com/squentin/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
 fi
 
diff --git a/media-sound/gnump3d/Manifest b/media-sound/gnump3d/Manifest
index 37f8254af0ef..98281dc18560 100644
--- a/media-sound/gnump3d/Manifest
+++ b/media-sound/gnump3d/Manifest
@@ -1,5 +1,5 @@
 AUX gnump3d.conf.d 159 BLAKE2B d03de16b977c8c892be3dcd6ec7b45414dac9694a777fde5775f30ad94552349263563316c7e48517c60947e5751ef1f7d9eff4648c7a0cc720b845df32ee8cf SHA512 33c87ac067be3ae4f3dac690e38eecf8400ac393e47cea8f6b5b1238cc41b08dfe684ee33a7bf3bcb24cd6f9a8ff3861caed12c0d9d7f0df61a757cee5910e33
 AUX gnump3d.init.d 724 BLAKE2B 734bfb5daddea0894aff9254874d7135ad7a01bb46d2b6a2515ee359e98ada5ec328c31342dde936fdfeb051a8a8731b4a4a07f356b3566398dd7e0cc833bc53 SHA512 86f43db016e4dd1d2cb75b68ed1a11ea7b7f9ab1d78d18d0e6cf47c3380c466251f733d7aa73ef0354c3f63b78f18b966f583ea0aa328773442270c2aa0867d0
 DIST gnump3d-3.0.tar.bz2 633215 BLAKE2B aec3e2e95ebcbf2b9465f8f7e5cf579fe64e9e48d3b1757f78d3102f3a02f92970cbccc5986741013505e1b2f0e54e0d7a7c3871837c6169898e763f23e7fcca SHA512 23778604b557346e42f5cd2045cc394c7d6f7044479c74cd635dfdbbfd6835c8e3ad761d54c5cba239cc5e020b049ac11d64eb463272fc4134b7645226e2524b
-EBUILD gnump3d-3.0-r2.ebuild 1997 BLAKE2B a44f01ce47de98ce1a17fdeb4cfc82a4a6bf7bcdbcb09d67c45ccdba40483d5f8a475308f4bc329e2da9b89f5ae312ca82ccf30504335a0a397011d7721aa925 SHA512 72326d3790db09ddf6590b8167218d12da18de668307256908d9d6795e52816ae92b4a0c3dde4a1a3d3145403899706d27d3406aa0a48122c3cacd9c0320a411
+EBUILD gnump3d-3.0-r2.ebuild 1998 BLAKE2B 345c8397cba4df8812c354006ac64fedb48a4e40d749460a1f7cbd2c6a3f9efa862e41ae08886ae6e3fc04d5241fc68817640f79599124d11aec70aa1d52341b SHA512 d6cf0e3d741758c8c4263f03107824b170d0b3f82369973ceab97fb3bc8eb1bc3da2cf7195afe088273b638d398d81ab503041b8b85cd9ffac2b2c14e0e0721e
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gnump3d/gnump3d-3.0-r2.ebuild b/media-sound/gnump3d/gnump3d-3.0-r2.ebuild
index 544be3a05642..964c7d412d76 100644
--- a/media-sound/gnump3d/gnump3d-3.0-r2.ebuild
+++ b/media-sound/gnump3d/gnump3d-3.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://savannah.gnu.org/download/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc x86"
 IUSE="sox"
 
 RDEPEND="sox? ( media-sound/sox )"
diff --git a/media-sound/gpodder/Manifest b/media-sound/gpodder/Manifest
index 43a06ef8bbf1..ea4d248d1c3b 100644
--- a/media-sound/gpodder/Manifest
+++ b/media-sound/gpodder/Manifest
@@ -1,5 +1,3 @@
 DIST gpodder-3.10.5.tar.gz 1000492 BLAKE2B d3c1381fa613e018c79995a5b5d95958096dab49d4b4d9012e8741efe754f7f9db82e7fc46527e1fb837ce8fbfd3c14d58f8af64f96e51c5750b56402767ddca SHA512 056375d7a21f64e691bd62676d575dfaa8a32e715dc4f7ddf7b0c1cb9e99f07cef5972de812765874afd5a8e8adf220eb7b969afcc8dea1e2e3a76be8886c9cc
-DIST gpodder-3.9.1.tar.gz 996497 BLAKE2B ac50cba8d5bf459361c592e579cc9e5deafa3a1a7517f0f5e1f07faa1eaea6456b35451ba2c21def390f85c38f4a95c46cb17a7db4ae4e56c58f79fae6413b11 SHA512 d32405ac1d0aa7943b58d73f806a0d28e68bce541a1947c08d9cb69a763eda311816c059019e43eb3dea6ce08fc1cb4f0bd39cc44933114e51a036cb603d3be3
 EBUILD gpodder-3.10.5.ebuild 1590 BLAKE2B 260a65e14435dd8439f83293f51c4524ea782267716e6bb370b61b0a72e3992856bd7dd305573704ce772125da0f20500a20cf3cf8470022b928ed7b4c575263 SHA512 a6f5934545a29a8c2b80c8726bcf42ed4ef468f2d625ae4fd2e9ee390cc015b10e67eced4525eba49c579f0bbece7d461e0253d2f7520b36d8ff5bfe3c6af9e2
-EBUILD gpodder-3.9.1.ebuild 1519 BLAKE2B b71fa22df771e3fc33b0810c123c5665b298f976b30075319d1865064fd4f333de14b9bd9717ba009853ab35eede7312630d50769382b4776b6b2b7b75b1b318 SHA512 c9419bb149270a6c04edb7699705bf638b63997cc24a1f8c05bb08c96ca7e2b4bf0f346549bdf88ca583d5be9c8a3aadf95239ecf69c35e172c0fe82748d738f
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/gpodder/gpodder-3.9.1.ebuild b/media-sound/gpodder/gpodder-3.9.1.ebuild
deleted file mode 100644
index 851a7af6e50e..000000000000
--- a/media-sound/gpodder/gpodder-3.9.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-# Required for python_fix_shebang:
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A free cross-platform podcast aggregator"
-HOMEPAGE="http://gpodder.org/"
-SRC_URI="http://gpodder.org/src/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+dbus bluetooth ipod kernel_linux mtp test"
-RESTRICT="!test? ( test )"
-
-#TODO: Make pygtk optional, see README
-COMMON_DEPEND="
-	>=dev-python/eyeD3-0.7
-	>=dev-python/feedparser-5.1.2
-	dev-python/html5lib
-	>=dev-python/mygpoclient-1.7
-	>=dev-python/pygtk-2.16:2
-	dbus? ( dev-python/dbus-python )
-	bluetooth? ( net-wireless/bluez )
-	ipod? ( media-libs/libgpod[python] )
-	mtp? ( >=media-libs/libmtp-1.0.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/iproute2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/desktop-file-utils
-	dev-util/intltool
-	sys-apps/help2man
-	test? (
-		dev-python/minimock
-		dev-python/coverage
-	)
-"
-
-src_prepare() {
-	default
-	sed -i -e '/setup.py.*install/d' makefile || die
-	# Fix for "AttributeError: 'gPodder' object has no attribute 'toolbar'":
-	python_fix_shebang .
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	distutils-r1_src_install
-}
-
-src_test() {
-	emake releasetest
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 14d12ea967b7..ab0a297accc3 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,5 +1,5 @@
 DIST grip-3.9.0.tar.gz 968706 BLAKE2B 9d530b1e7c93239d4298a57a784eec38d98fe57e2c964018a04a8646ce5f1f4734b21103f31612bac4cc45c8c03eeca2080ba88d60a2cfe51d161ef61758639b SHA512 748821f59c90d7239bb711a4a7e1df4e9f2b67ff7bd5c635a2c49389efc7836cca6672cdd93e727f8b97c4e2221f895cc7b4110aa0d3419a5fbe56530ca1b1d0
 DIST grip-4.0.1.tar.gz 1004917 BLAKE2B 0102d21570c5716283354cda65c694b3be708e7718535f2f3c806187edcd5ebceb834fec9f73908780d23e33f973b60e223a8d7d60e0f61f2bbe0e5340792f16 SHA512 3c5d13e83ae5b0ac03f887fd96b254700f25850ec8794daf4ff454efea0bd59e6a201e0104ffb72c5cc07fee67efe13d0891354faf09452a667131e04d9e1ac3
-EBUILD grip-3.9.0-r1.ebuild 1123 BLAKE2B 2ad0f72c98b3fa5a1502d0e3cc2d2a9df3f27b8ac4717fe4d611ecc7885f41d77d9fa38b0549660250898aefa0395e96e7cc76f56f6b6e52d076f75089f11bb5 SHA512 ca61062df0ebc206a5ecf9ac8fde50d9a6b884b709d221f6448055452c94c2b6f2149fc2df52becfe99a1044852a320a92a48c17c3065545bdd46f25b962d0dd
-EBUILD grip-4.0.1-r1.ebuild 1139 BLAKE2B 56d000454b17a2f3f67cd1213055eaa22e0a147be5655fcf2ca1a46a51a53759a2c607ff726150d0e0eafaf15c9d194ff7e2b2616363adc71c899094d6c10139 SHA512 beeb53ea39155fc7e1426e731b67bbcde7dd516b1e7e8625d1cacee7b1c8914ff4343b1fa613f29cf8a97eae30b17563861e25d23a1c79d84974e17deb64275c
+EBUILD grip-3.9.0-r1.ebuild 1124 BLAKE2B e633705cc9d607ffa9ffcfe7d34ad36cd366d0cbec773d454ec6b7c56c86837112b3edbbd2d769c534c18b320a4265844e8e434d8a9cbe14068ea70c3a4a1c88 SHA512 5585c26442a7c379313964ac351b2097023fedc92e434312a14baf57e93d62443e3b4a9a01b9fba0cd7fec3ea66a8aaee4a1506b03821656ff180d38d0d9df59
+EBUILD grip-4.0.1-r1.ebuild 1137 BLAKE2B 9714bdcf0b96c4dedc8eeef0c9ad8f1ac2d42f3a6eb34b9375ee0e2b2443e5a8228d81c2989abcf3e9f7239065b11ecc2b1a19219e07c659f8630e83f1dbb72f SHA512 d25736c87d8a8c463834c6340b473cd55a64f86b5a7801aa4f851de8058204a522ae864e881fe304c46914b0289aa47188be6a3910f5cf4592a8c6bb72cd116b
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.9.0-r1.ebuild b/media-sound/grip/grip-3.9.0-r1.ebuild
index 07771797ceba..a4f672fef19d 100644
--- a/media-sound/grip/grip-3.9.0-r1.ebuild
+++ b/media-sound/grip/grip-3.9.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE="vorbis"
 
 # lame and vorbis-tools are no real RDEPENDs. But without them
diff --git a/media-sound/grip/grip-4.0.1-r1.ebuild b/media-sound/grip/grip-4.0.1-r1.ebuild
index e5b048598f1c..4a2a041dcddc 100644
--- a/media-sound/grip/grip-4.0.1-r1.ebuild
+++ b/media-sound/grip/grip-4.0.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE="vorbis"
 
 # lame and vorbis-tools are no real RDEPENDs. But without them
diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest
index cb1e41c33a91..3c0f33bd8c37 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 3723 BLAKE2B 4bd926e470d7c120560fe2378dd87496e47760efe293db5e9b1b61cf5075cb737425ca1e7c6b7a92068c95416603b3a5c46741e04f30a477c8d39b0b0c33e63f SHA512 0872ddb6c93ab6f7082f4a999a39439ceaa8337bf72c0a690ebbf1561a605d2664ceec14eba81a36ab244c3cfe3f3edafe3ee76869a68aeffe6fcc3f12026957
 DIST gsm-1.0.13.tar.gz 65318 BLAKE2B 22bb79e3afd9a2e99041693288342b55969207223486200d4aebc61908930040b6b766a9bf673ec6b484eeb95833684c79f34c95d32da17cfb4c36d025004858 SHA512 0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa
-EBUILD gsm-1.0.13-r1.ebuild 1551 BLAKE2B 3e9f4a7845d5a6d4a27e6a6ff760972d5a57da05657ad1a275a3219cdb11b443eb2f58c91fca2ce226dd6421308bad4c98294d23ebb316e4fd0647c0619d84da SHA512 2666baee74b43ea893c0e398a978f13d1dd5cab5a4778eb0f1c86b7adca6cd7db0428581cbc0771be6a5c3ed60a55c8119702299ddc3a67982dee05f3241a670
+EBUILD gsm-1.0.13-r1.ebuild 1552 BLAKE2B 9cc560cac44a8a9aa8c0eaf8ecf3321b6f5587165b6070c69b963a049d6faa270782df4863cda57b1f3295adf87d96317448259e7cf1245f3c7704d3357206ff SHA512 8c93f7703c13ec1ef8a55cc84d52f986757e42075e3193346b748a77b31f1911f39b5c634c3edb71ca61fa3211dc2693782e3774d18ae515f96313fe2014129b
 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 47621630dd40..89cc6c321b5b 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 55565b0038e9..7e4d98adbf1f 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,4 +1,6 @@
 DIST guitarix2-0.38.1.tar.xz 80768608 BLAKE2B fd745955d8b44da72c669e69c36294d4a2131f2b5868e7e254a0b33768852ba9fcf9302f2a7ebd962c8a6dc02a543f70574466c51341a371c9fb988989123e50 SHA512 54d08b4ed20b9df4c69d0c86e4d668c53fffde8919f5570f376cee903926bd01945169d177d0d45976569ea55b28f8dca7884ac6dfe2f063df6583467559c5b7
+DIST guitarix2-0.39.0.tar.xz 80769472 BLAKE2B a699545b7e4a9992ed11a17ee9f82170c1891a95a0543c3b847ff2a02ab4e6597c28cbb4708f85022b1e94f0184b6dc712c271729bdda07373101ea9e8a1323f SHA512 5eb799498385ab9aa865e3f5a7e79d77f7f62c9bd7ad6875ec32bdec85829ed5b84bed3b0eab786ce74088fe2e1d53080f70afcb25ab1ef8d8f78a676b4947df
 EBUILD guitarix-0.38.1-r1.ebuild 1713 BLAKE2B 3ad1114341e087c23c93c6e2254c5a421db7b70bb142d4d21c9785baedadabc8e1c107eafc7b8e762c6fb4e3364590b6f2ccf8d0ee62a39d01d8b0dd02e85be6 SHA512 c50aa18d3ee47b2c865415c259f925a7bf3d0a78737e779f2c9790ab62c099a40826cb82254456b00379486e45c5c20c7643d62bfe4b8c4962183c2421f523e9
+EBUILD guitarix-0.39.0.ebuild 1725 BLAKE2B bc8b07d52d1ca21cd2e0108ee760aa086ea389b2c01d06d404b9d264ad25e549c288a60a13aeab11474055937dbe37da1a2045b98bd287ebde7eeade1ee88470 SHA512 43f1d52c476823e3513aff1d5456b4dc97d7d048826f4d5cf1f538b61b6ae24b2b14a5ce9afc53e4575fbbfd59a13bb3eb93d167155be3fd66a26cb5459b0389
 EBUILD guitarix-9999.ebuild 1739 BLAKE2B 852d66f82f19f896a39b2353a6421ac2de9b8ac4887554dd35c9f585ace40e11809d1fee8f6a1f9a2d1377bc1754c35be27875f7f58bc40a319dd2c9155fb3c6 SHA512 bd525153a675570d3d08922cb8434c8dedfdca76ba4be39296488d06ddabd90ac943b840c3544aef05181e4e5b2fe016cb2452393944afeee5261758fded390a
-MISC metadata.xml 622 BLAKE2B 390ed1150f373c73c5bbcd5e5193e8465ac348bebae4a5f8484fb214172717d5166c0a17be6afb4e5091c4318cd3a3e30bcc05c70fff78423347298acbc64c61 SHA512 b18db16b6af5381331418267660822972be42997065eed2182c6305ce84bd61fb6d3ee01de195f3f8f01570deed7f97b93ca31916986609a374c1f5962c45dce
+MISC metadata.xml 595 BLAKE2B 22b392d194412eb045a3892e77a79f809215cdfc7e7afa42da59284f88975bd6d789a5a8e215c1137093266ba19e0be463d7b51b7b6506ff38f8591fd7b5cefb SHA512 5ccc8bcc15cf8fd7a5a4e18cb805765d6cc1b735c08b3194f3b4bc20d94e4d00d1db4fb9869bd58c82bcd39951d7421647811f61f7add2733e6719e6b5d78c3d
diff --git a/media-sound/guitarix/guitarix-0.39.0.ebuild b/media-sound/guitarix/guitarix-0.39.0.ebuild
new file mode 100644
index 000000000000..275c99ec7948
--- /dev/null
+++ b/media-sound/guitarix/guitarix-0.39.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils xdg
+
+MY_P="${PN}2-${PV}"
+
+DESCRIPTION="Virtual guitar amplifier for Linux"
+HOMEPAGE="http://guitarix.org/"
+SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="bluetooth debug lv2 nls +standalone zeroconf"
+REQUIRED_USE="|| ( lv2 standalone )"
+
+COMMON_DEPEND="dev-cpp/eigen:3
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	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.1.2:3.0=
+	x11-libs/gtk+:2
+	lv2? ( media-libs/lv2 )
+	standalone? (
+		dev-libs/boost:=
+		media-libs/liblrdf
+		media-libs/lilv
+		virtual/jack
+		bluetooth? ( net-wireless/bluez )
+		zeroconf? ( net-dns/avahi )
+	)
+"
+# clearlooks gtk engine and roboto fonts are required for correct ui rendering
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/gtk-engines
+	standalone? (
+		media-fonts/roboto
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )
+"
+
+DOCS=( changelog README )
+
+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 standalone "" "--no-standalone")
+		$(usex zeroconf "" "--no-avahi")
+	)
+	waf-utils_src_configure "${myconf[@]}"
+}
diff --git a/media-sound/guitarix/metadata.xml b/media-sound/guitarix/metadata.xml
index 567aa7cf7675..73245221dba8 100644
--- a/media-sound/guitarix/metadata.xml
+++ b/media-sound/guitarix/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>fordfrog@gentoo.org</email>
+		<name>Miroslav Šulc</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>alexander@tsoy.me</email>
 		<name>Alexander Tsoy</name>
 	</maintainer>
@@ -9,9 +13,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription lang="en">
-		guitarix is a virtual guitar amplifier for Linux running on Jack Audio Connection Kit
-	</longdescription>
 	<use>
 		<flag name="lv2">Build lv2 plugins</flag>
 		<flag name="standalone">Build standalone application</flag>
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index b8eadeb6c096..2bec04770f59 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -1,4 +1,4 @@
 AUX jack-audio-connection-kit-0.125.0-freebsd.patch 533 BLAKE2B 1e99c1a0f722a2aa94ea5862026b3493a89beb7cb76b444f269c56c47f98d297f15842cf468e81a28014664eb09007e4adb93a4636e955cd690ccc8ac28b140c SHA512 23ff3f34b7891d0725b32faf515a138fd1220199bba6aceebc232a9647be99658f922c6d4a42f1c3b6f98bb9619cf470e2ec213fe906a9189b43163d21f47316
 DIST jack-audio-connection-kit-0.125.0.tar.gz 1217977 BLAKE2B 4037b76a5a6814f30adb4145282e2295bd7b2502934ec7b3cc41ed9bc1a1319855a60d739d72641c0e18a3ee1d8bcb829a637fabf7df7a4525271bff8933f09c SHA512 acdac0588c8a6b79763177677885b6e7bfa8ee3cd9556b33bfe09512bc1191414bb4f97eed62c3c71567b13b4eb69d95ec6b438e5a9d2e22a956c073d500c46f
-EBUILD jack-audio-connection-kit-0.125.0.ebuild 2056 BLAKE2B 7648b7056d21db6378d038cf4e9d3b3b80f952ce36415b89de15de9003f497ca4eb6e7e2177109e927d0829e09af4da27ffc1a736af5ea923f2e91b1c13f8242 SHA512 129ab15a0eb8a12de21b2407916e5749b400466f78774d2e65b1975ffd254db53b3d83801bdac735a0881b421cd273386456bf5364b00eb01af35b696009fbcc
+EBUILD jack-audio-connection-kit-0.125.0.ebuild 2057 BLAKE2B 58b44eedfbc9da539479da8198b02cfbcb240dfad84274e17388688520a1acff74f08b87d95bd4a5b088dd40f79f2f24c388626be25f400de38909cb9942ba42 SHA512 4396d24026e8298a00d1f04f67428f4c4e8f49c5d6fde8f3d138952cd5e1761eec8ab6bc984e08a1c23e3b1b0052d672183752e8a60f93f90fd2ce9ed246a88c
 MISC metadata.xml 371 BLAKE2B 2fa3a14e38f42ff31b9d3e502fc2762d77ba396dd80af4b4453f4a84ce29e9d6af5da4303c8dea26490b50ff8426a253d64107a605829f8301f9bde45cba4eee SHA512 0b7621340dacce1e798cf7452398200e7d1c6a808ec634d5fb9a6936e4bc6298c0059601074150a26dc92631e5d127c7357f8cf8821afefb121a40219788bb21
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
index 57c9b767b21d..5f2eb8e0a334 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86"
 IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam"
 
 # readline: only used for jack_transport -> useless for non native ABIs
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 5f36603193d3..90c3afe47237 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,5 +1,7 @@
 DIST kid3-3.7.1.tar.gz 1486532 BLAKE2B aec19ca9792ab5a3ae975d64b581074f6505507027bc52483a95b8570fdf7484fadd63a5cc740b59817b6b2b7227f02637aeb3e9611d206a536138c6db083198 SHA512 68b1d4978e5e984d180981d02df5efa247d50da79e5c6a41010eb3c5369b6cdc023042333865f4730e47814c4b4b69dc2f1bcbe1566396b72637fd576f5e543c
 DIST kid3-3.8.1.tar.gz 1516211 BLAKE2B ab07ffddd5c8b2780d910eefdf71a4f290d1d354b1d73faead0d268a6d795a6963ec678a4dcefbd8aa18ce8b8bfecb84f949f63a5adea950d4cccb2de5647bdf SHA512 b625753a40f3290b5aa26fda5c20270b5e428c5b383ddb06e81d515f016f475c41bad92fff3fdfd5f6228c017ba18f547515bd8e948832831f9daa501222168f
+DIST kid3-3.8.2.tar.gz 2218360 BLAKE2B 26b1c0bffa6972f085538323b8836917ed4384aec5c0374bd0dbec35a150ad62912c6fd08e94fe66bfaa43928619a73a41286baa28edac2eb3da4ae8dc7aa0e9 SHA512 323806ed9af067760403d2e8c6262222640f40e76819fa31a96e34fd4e0e745dbe3c9e516540df71022d3deb03499b8529c436e7a1fda254c56b5425aa993ecf
 EBUILD kid3-3.7.1.ebuild 1660 BLAKE2B 981b960e888c8072870b68a397180149beed99440cb17df12181609f838b750ac73c3ca72ad29448da48a7b040e428e97f7f1fa5be67b2d3e511bbe7c7ef46fc SHA512 7aa3b748afd9e1f3b4b468a6c8fceec462a2190eebfa64c8de24dd51ba747433746cf40bd24cb7ca6c60c01d04bc929c6424f583d9fb287ee4a241d5084f42c8
 EBUILD kid3-3.8.1.ebuild 1709 BLAKE2B 3d32fc69b9340e7729d43d687e46c97d60a39a4272986b48b2b1890abc3f933585f9c014fa4a9df3bdee982f82cd1afc886df7e5933f4c75d2f52f520f6e72e2 SHA512 9924e8068ef9e79853f343b0bdc57320ff6e9edd5f6ca13a24a99343feacb2529dd6078ce928a9a3da4baefe8ff900ad48734802506488d16b562269138cb9b2
+EBUILD kid3-3.8.2.ebuild 1764 BLAKE2B 5f174c6604c26969d320ccc994b614c9e7d730bc6216240fbcc68db153adce84f7ed5b0156bb79714b88e4f0104b7a1a9eaa3c1cb9851f94566e448478f406c0 SHA512 873487e09b70931e85c9397d80dd8bdc05b880e6ee08ea86b9d6af619bbf66d6e4dd0bc6fc81d789eeebfdad504469abb9de861e6cabc0323c493d1d8c4aae4b
 MISC metadata.xml 737 BLAKE2B eec3a25f3041a1174f4d43780344e5dcee09313461e18ecc7ad94400858d84e406934ee5924318539547ead7ad0dfc98af87e333cc62b2653a675598c15d9694 SHA512 6d4dc69756971b2db5d12116db5644b9cda51ea44f06b6e840246ca1d1cc0f53ed37240a1b71e6bd8b3cf6f31975ed9b5ec2a4f7d6a9d0d3dc5130259fce98b1
diff --git a/media-sound/kid3/kid3-3.8.2.ebuild b/media-sound/kid3/kid3-3.8.2.ebuild
new file mode 100644
index 000000000000..1ef20213b0af
--- /dev/null
+++ b/media-sound/kid3/kid3-3.8.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kde.org cmake xdg
+
+DESCRIPTION="Simple tag editor based on Qt"
+HOMEPAGE="https://kid3.sourceforge.io/"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="5"
+IUSE="acoustid flac kde mp3 mp4 +mpris +taglib vorbis"
+
+REQUIRED_USE="flac? ( vorbis )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	kde? ( kde-frameworks/extra-cmake-modules:5 )
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/readline:0=
+	acoustid? (
+		media-libs/chromaprint
+		virtual/ffmpeg
+	)
+	flac? (
+		media-libs/flac[cxx]
+		media-libs/libvorbis
+	)
+	kde? (
+		kde-frameworks/kconfig:5
+		kde-frameworks/kconfigwidgets:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kwidgetsaddons:5
+		kde-frameworks/kxmlgui:5
+	)
+	mp3? ( media-libs/id3lib )
+	mp4? ( media-libs/libmp4v2:0 )
+	mpris? ( dev-qt/qtdbus:5 )
+	taglib? ( >=media-libs/taglib-1.9.1 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+RDEPEND="${DEPEND}
+	!media-sound/kid3:4
+"
+
+src_prepare() {
+	# overengineered upstream build system
+	cmake_src_prepare
+	# applies broken python hacks, bug #614950
+	cmake_comment_add_subdirectory doc
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CHROMAPRINT=$(usex acoustid)
+		-DWITH_DBUS=$(usex mpris)
+		-DWITH_FLAC=$(usex flac)
+		-DWITH_ID3LIB=$(usex mp3)
+		-DWITH_MP4V2=$(usex mp4)
+		-DWITH_TAGLIB=$(usex taglib)
+		-DWITH_VORBIS=$(usex vorbis)
+	)
+
+	if use kde ; then
+		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
+	else
+		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index a33c6957853a..93cb57b98bb0 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -4,6 +4,6 @@ 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-r1.ebuild 2105 BLAKE2B e4531b3ab55b89738a81c2fd62f202134ef55929395de7612df961cda81b8e680fb5be002bacb9dc11722d5168a1b5975cf629bbbcb675aa2e7227c26a944056 SHA512 2c5e77d2fe681c742d5da11dec93ae688d29acfb9280a87513989b8100f2e586c6f4daa8662b2da9959b0c6f612daa99333c4bd36308547cf5400f592d84e070
+EBUILD lame-3.100-r1.ebuild 2106 BLAKE2B cf808492d49c7207e3ef0aa7d5115a4664cf5952074af83718c451ae52a3e0b3cfeb340e29a5a244425db1809b69953252a02d66e2b5395fdcc8ed60f56bcef1 SHA512 0909fc3122097705f22d37065c2cfd1b985bd2dfa82f319eabb64383e21d0e354f4a2679a27ee9add6ebf40e40701f44a54b5ea5e279c07232c813838d40ff21
 EBUILD lame-3.100-r2.ebuild 2219 BLAKE2B 60a544f3c3c0e0ab98e7f622addf77b2ccdebaab4c2d178d9bc014d667e479b5fb01196e35f18b10ca4300ab41e0ab3bb3b7948685878a9e17e79aec93873294 SHA512 ba39cd70dcf721defcefb4649daa7722e90fd06f4cd0a30868cbf8f12a2a6027d09c2829f49980c03ea9f2e9fb3b891018697f6dc4744177ecf8d50f1b947992
 MISC metadata.xml 542 BLAKE2B 726f3dfefda9c1905739448f1a3124e05ddc90e261d147da12a7839185ef3eeb440678d185510a6bdd4bb71ab987b7a24f52ed108f7c646ca6b651434f9fade1 SHA512 8fc2e2658ae34d146894786f1c66800eecf818e2bd9bb807c6b32a8e132340c1568e9f47220be3daaabce2ab6e1e1d5aa817157f2c0131ed01944abbab6593fb
diff --git a/media-sound/lame/lame-3.100-r1.ebuild b/media-sound/lame/lame-3.100-r1.ebuild
index 49e49c648a67..b14c1a93d096 100644
--- a/media-sound/lame/lame-3.100-r1.ebuild
+++ b/media-sound/lame/lame-3.100-r1.ebuild
@@ -11,7 +11,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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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/lash/Manifest b/media-sound/lash/Manifest
index 20e62c27ec2c..2726b00b303d 100644
--- a/media-sound/lash/Manifest
+++ b/media-sound/lash/Manifest
@@ -4,5 +4,5 @@ AUX lash-0.5.4-strcmp.patch 278 BLAKE2B f6381f1c792c39b006e4e25134c07a3fb5f5cc97
 AUX lash-0.5.4-swig_version_comparison.patch 1124 BLAKE2B 12a4f3787c25ca8bd4b87ebe739486dbed52ad3f112c4a9237e4b3c4c76032c2804ea5ae23455b31a2804678af8c85f058f0acc44e1fc40beea400d217520397 SHA512 43e4bf0de6ee9eb5c010a317251ebc903569fe3d1b94f9c5c4c43ba1163088c5fb8df6d861d052184fd93baea61ac5c86f33a618f186cacaa74e27dd12cf0890
 AUX lash-0.5.4-underlinking.patch 457 BLAKE2B 0d21073bafc8ac50aa9b4a117c1268485ad131716b72fc0e2cb73b95ad8c3531c22bc6dacb420a54c68cad2185841911b238556a125395a7bc34b0879bbcb176 SHA512 09519a9b2fb2da9cd716c1460d503bba64265b26025bf987fa7a0eac2edbce5e88a59bccc2d39617c4c3ab62d4dba1e86c400922f5312c1904b1f5746f5a1fb6
 DIST lash-0.5.4.tar.gz 623469 BLAKE2B 463931a9fcacf806631746c69ccb2e2b795b8983e796835abce6036ed98571c41253fb8236a33c0a8bd1b5d3a910229d4e95f99257c1d82c64495201c64c6414 SHA512 93193dd585738b8c3432b3f75864d287f874b5618100a84f0a1b2bda2df15403203cfc66e7a0298adab7ef95bfdded81697614ca5ef8eaf5cebdde5860f47e3c
-EBUILD lash-0.5.4-r3.ebuild 2595 BLAKE2B e9ad2285ffd1b2df33e5fa56596315efb0b83865a055f0492402e36991dbbd964311c334a999246700661424846f7b94f2c8edb337c2877a289f7153eafb9fc7 SHA512 42fcfe4da0031af7e1800d592fd2b6fd4b48d4cfe8affbf92940b6b6bfed0600d03c357d6eca48485af6c1b3cca8d03433dbb60eab95fe99fa916f7220eb0172
+EBUILD lash-0.5.4-r3.ebuild 2596 BLAKE2B 72656e87d87bc2efc801adca39c69e2942da6efb4efb2615df382a4094f2365d28bbac5c2240072a7072c32e41f8dbe3160fe9ed363089451b426b876c54c691 SHA512 b4da24f3f3e6316487a20152dcb63bfa90dbfc80fc22417b15ac108b6284a6d50866ef8bf931d71235eb5d9fcb987abfff9587f0a2b7db83ee59e668a3d39a7e
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/lash/lash-0.5.4-r3.ebuild b/media-sound/lash/lash-0.5.4-r3.ebuild
index 3d15cd2a7ed7..b077579131c0 100644
--- a/media-sound/lash/lash-0.5.4-r3.ebuild
+++ b/media-sound/lash/lash-0.5.4-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 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"
 IUSE="alsa debug gtk python static-libs" # doc
 
 RDEPEND="dev-libs/libxml2
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 1137c410c33f..2801ac32cec0 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -3,10 +3,9 @@ AUX lilypond-2.17.2-tex-docs.patch 608 BLAKE2B 7cf73d59a6ebadbc34952c199ba1085e6
 AUX lilypond-2.18.2-fontforge.patch 924 BLAKE2B 5f128e65357033c2b2ae33d5f00cccd7237b59354342d33f958170e5f22d904a47aeb18dcb12b7f7c8846d3689ed7d39459b4995c99834603dc22f3b2c893fda SHA512 f4a45a1ed601c114df24e9e20aa083cd30d5b77955e19cac309508af2f59c808a629bc82bc181e5325d0534d29d3fe4de53029d2db317ed447e306e11150ef7f
 AUX lilypond-2.19.80-fontforge-version.patch 503 BLAKE2B ff0565562e2156aa833d0de1fda31cce3901999c6fc1f5ec05fcc1dad5a60b4df4823eb9e5e809e4bfd863eef7088627e8dbab38fc1b2fe10152d9c26965c934 SHA512 0098b5f7fae77bd39f08397b460efc43bed8ea90feb2afd5349cb3459209720111bba657ca04be9781d5ad2731476887b6a9414690842d455e22f3c9ed6faeed
 AUX lilypond-2.19.80-remove-ly-protect.patch 1534 BLAKE2B fbb07b254ac8c41ac3db4c00203efd46fa48b0d3157d0ac57f60587bacae6d0cee6d1694f7a1a74b4fc1d31b338f31dd55daf294872cf8cd85d090683853cbcb SHA512 ec74abc959b569ef43eae0709ea62f012d41700dcebcb9cb4ece551b0095e593e6ac579520a3be3bef648e04ee69b3549f9152158c705ebb615ecb66f0f4d0fd
-AUX lilypond-9999-programming_error.patch 479 BLAKE2B f5375c71b2a82340dcda7ca24b8f1a5f106642c9edff2dd35ccb5793e88cd5bc512bbc47ce9636d2536cef18b76bbf5e38325c635377405a277ac405d741c6ed SHA512 4ef02c68b919792199142e83607409f6e3037367e090540a257d611ce7ebe1620c586bbeaaef2d5a953e71074ecbf92cef9710bd4bda9ebfee0ab93ca6f59c9d
 DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
 DIST lilypond-2.19.83.tar.gz 17996428 BLAKE2B d6048bfa0dbfbb08c25c5c11287f971936e82d30d88d80deb7fca8fe8d7c8d3d517c37a24b1d52e592c15e166e04eb79d99b4c64ddd4b7f392ec69bff0259d89 SHA512 c8a6acbff055196aba015ecd4786bed25934f04f3718ae9dd9a0dc49d2954f348806874cfe350903cd8bb2b25a0d05700ef5947cac180b20a8a355033ff98604
 EBUILD lilypond-2.18.2-r3.ebuild 3221 BLAKE2B 6fcd41c3be787631614fbe2c28853235059eb7924bdb32cea1ffa674469b3186d3448c99a37d8c7276e17061445f7d694678974266b1b6100fa7b65664ffcd93 SHA512 735e1a2c43d913b382336e9da1fe548965c5bdf70e88104d2a0c431f4a35c76e4d6fc902ae03a3cb9f83604a737c5e17c9f65dcaa5e9e620e3adb1a21ea8cce1
 EBUILD lilypond-2.19.83.ebuild 3390 BLAKE2B de7d56199884ff98ab4dde65d786e96716dfb6f9d96adf501d7784d5d673484f163f22811622249fe87f402d6e3438e300b37f552ff2460464b2c050d038beef SHA512 a68323e25fc7d06a3c153989148e64ef22e65960feb5e7ea0429598a7c07a87988972d58e452d35e437b9c1ddd858bccdcedb8299aab60694d67b64c94547b31
-EBUILD lilypond-9999.ebuild 3534 BLAKE2B be1e58df24af25dc1b92c0e5739376be422dfef14a3519ec23d440b89ad261e1633e61ffb3c9bf229ef4222cfdf4ac86669c6389aef194ab73f0d1d27b206ea3 SHA512 f73f8e3c5dc948e0ba7d3bc78aef948afe684bccccf533fc351b23e6c05fc57afdc69327ecac5f5a185b7d9717029541fe05623ee8b567d8bca34e8b81652280
+EBUILD lilypond-9999.ebuild 3498 BLAKE2B b859d47f0f2cb99a95b17a47477a021df5565eb8c4d53c8acb732e0b8d74bb4516ad16f70b41870e71f7dcdec445d1ac9cab01f518600cc870ea4b250c6b7296 SHA512 c90a3e08058e4683d4f6c66d9e1d9be1653c6995b3a05c1660738950401cfbe737bdcbba2b2ff9203504983e3aa9b915556ad833cd332a03ebb4c8107e5c6517
 MISC metadata.xml 526 BLAKE2B ce52e2b93fd4d25cded4c75feef562383276aa429f8ffe083b967377193e81ff1b0d4479d1c1a0d7bb23923f7771cdde0f93bd266ef72fb3e050fb4263d48955 SHA512 1c75ebaa028d19162a24635c978d5723541212e0fed095feda44a2b96d3ad715bc7b2425da544c61e4f3c8dbfeb26b0ccfe030233e116ee75f91a224ec118f1e
diff --git a/media-sound/lilypond/files/lilypond-9999-programming_error.patch b/media-sound/lilypond/files/lilypond-9999-programming_error.patch
deleted file mode 100644
index f2b85164a6e5..000000000000
--- a/media-sound/lilypond/files/lilypond-9999-programming_error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
-index d25e6c9ef8..2fd2e4a4fa 100644
---- a/lily/general-scheme.cc
-+++ b/lily/general-scheme.cc
-@@ -275,7 +275,7 @@ LY_DEFINE (ly_protects, "ly:protects",
- #if SCM_MAJOR_VERSION < 2 || SCM_MAJOR_VERSION == 2 && SCM_MINOR_VERSION < 1
-   return scm_protects;
- #else
--  return programming_error ("ly:protects is not supported in Guile 2.1");
-+  programming_error ("ly:protects is not supported in Guile 2.1");
- #endif
- }
- 
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 2ae50f180475..ccdde5e349ab 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 [[ "${PV}" = "9999" ]] && inherit git-r3
 inherit elisp-common autotools python-single-r1 xdg-utils
@@ -23,7 +23,6 @@ LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
 IUSE="debug emacs guile2 profile vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 PATCHES=(
-	"${FILESDIR}"/$P-programming_error.patch
 	"${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch
 )
 
diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest
index 929b077f58e7..51d4e4641d77 100644
--- a/media-sound/mac/Manifest
+++ b/media-sound/mac/Manifest
@@ -2,5 +2,5 @@ AUX mac-4.11.4.5.7-gcc6.patch 10119 BLAKE2B d6a363f26c7a08c6bdb0e14fea6bb2955342
 AUX mac-4.11.4.5.7-null.patch 406 BLAKE2B 8e8c38cebd040bc9728de64c994ee422ee6ab6f403773ff69ea26b85c38ceb4b15ced1b3b6343b36ebc7e380bde54eddf2c13e6c00e8f33cfac99955f6b44920 SHA512 d8fc2ed994b627176f78796980a9d8f4ce386c97aa05ce68085f642f3feb62a0994f88c8586f60a4a1f1116bc42e57d3881deb967e81a887eed800589d61c867
 AUX mac-4.11.4.5.7-output.patch 1498 BLAKE2B 7016b28d4c9a71d02471de1f4a5e5f1ade7db75d53f096916d3f87b154d82fcb4c3e6fd3891f909e0eebef512795ad2072d332241d69315b9e1ab959f7f895ad SHA512 c96874817ea5389ea2af46c634cd548733e614274b43c9395e146c9151dd9e7a03bbb8c82f36807cc2178070f8a87b886c6db94c27cb4369dbfcb874074db490
 DIST monkeys-audio_4.11-u4-b5-s7.orig.tar.gz 511190 BLAKE2B 28b5a3aadd9dae410c93cfc43c40c07fe207036f27cf60d59d8fa137a0327f90a78746c14930b7d3becb7f5fa69a454a6855aae1553dc74cd5168a9a523bb8f0 SHA512 7e73b35c86d6007ab2a94a2d8b7449bb4ac505bbba53e40373a279dc83a9cad5f62a51419a6375335576cf325c88ed7d317b0ef3039b8a497100cb74a63c25d0
-EBUILD mac-4.11.4.5.7-r1.ebuild 1316 BLAKE2B 8a5529d3e35d0e0855e8e3e80d11b0c8370f9aa47ad05159d4cb916a091ca5a39663019ba949565df1e340e8c4ce8caf55c115def2924a4f1bb37f160f84b772 SHA512 97d88167ac7a4a4e2cfb46042e0405500db22356595d6a225bd221dac638b05509fab89a3e982cb7f5efbbac69edd6d7e014dbb1e39f1ebf21c2164474dd57fb
+EBUILD mac-4.11.4.5.7-r1.ebuild 1317 BLAKE2B f79a904f9b8caee6810c5ebf3fe51b54296ffc31ef690f1b859d3bbfffec53c4e8f2c7a55ea57f8763a3c4190de8ef41ea95ac8d2403795c875826f2f0023b90 SHA512 10269b244873c47cb2dff9725bc25b23035dcb4149c1e435c841b7e40500a89dfc4af4450f0cc55bca7ede7769ad8c04d2b873a14b7f5bc260409781472d8123
 MISC metadata.xml 373 BLAKE2B e341287ecf4d69b3a6401db4ee2a465749e63a57fc0bb462928156eee49c89441eeb9dc2943fb7b0209ecbc966d6df0c6de9cf16a3ae9cb1c0dfa893a540458a SHA512 398ca3b9a13eede72e283f90a215d1e05a518f6b3eee9d8f6a74e3eba1e1f0f501443399906f09771ef1c7441667b5e991f98d9cabd9c6b8395af334312f02a9
diff --git a/media-sound/mac/mac-4.11.4.5.7-r1.ebuild b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
index 04eb73b53285..0f0018a5279b 100644
--- a/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
+++ b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.deb-multimedia.org/pool/main/m/monkeys-audio/${MY_P}.orig.ta
 
 LICENSE="mac"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 IUSE="cpu_flags_x86_mmx static-libs"
 
 RDEPEND=""
diff --git a/media-sound/madplay/Manifest b/media-sound/madplay/Manifest
index 5cbb0ed7c6ff..39fb3c7a7476 100644
--- a/media-sound/madplay/Manifest
+++ b/media-sound/madplay/Manifest
@@ -1,4 +1,4 @@
 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 776 BLAKE2B bee4f8a6721338cdb5e5f26242089f62f987d6715df831f2a9188894695d7c6ae56bc578a6f9613099c7147b3d9c09650d15c7f3a8cd6a7810afa12a9eb3be49 SHA512 6c94d8442b3dbe94aa26c205d9006256db132028736a10188a1de9590052321843972b93724a51aab33a3bc4505576816a980ee22b6097836392154cceb08575
+EBUILD madplay-0.15.2b-r1.ebuild 777 BLAKE2B 2575eda28669e297ff8ef6d0ae9053f242b81959230929628e6bf22dda3fa8a9336b97bd610724b29d3e195ef0cd7fb2e2b28a99f75a7d879e20175037d4ec36 SHA512 a15c668a654bad1fb19e33557012a5647495206bc677d1db8d9009cf5b2c84ca8ed67382ded81dc6d378bbc77770e5baa84c07d6f862d30c25be4e07af911982
 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 742c63d7d8a4..f71a5548d2ab 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 debug nls"
 
 RDEPEND="
diff --git a/media-sound/mikmod/Manifest b/media-sound/mikmod/Manifest
index 589c0808e170..e9400f4bed00 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 466 BLAKE2B be42d643a18c25ca4304d771761310e792da729f772a0de2cdeeace9b43a8a7ed64e108c06268f81b7ca0eb6ea11814ea9d787e64f74b7475e35cb0f7e84f6e3 SHA512 f505bddf24d79d70962e087a9447bfd473a9b0d740497bc6bdf1e4cf066f0677da700296fa365d20ce895acd49abcc0c2ca7a69a9fd1f640ddcc450d072147d8
+EBUILD mikmod-3.2.8.ebuild 467 BLAKE2B 2a232ffac4aa4c1f33644b42b830ff433822bcddc7c035ed55a75bf1f605f68576172bb1a8aea64afc48f95afea2b190513a2be96a7fe2d1dbc05520254faae9 SHA512 16aa6f6119bd2bbfc25f558929e7e1f7efa7eb2de9c5ef9cec1f273e5c2d06a5868ac56dfd67677abe7d6d84f584b7bfc525c426be870fc88028af2f9943aacf
 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 40972c329f96..0f9fc49769db 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/moc/Manifest b/media-sound/moc/Manifest
index 37f96ed653ec..e887a93a80e8 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1,6 +1,6 @@
 AUX ffmpeg4.patch 1401 BLAKE2B 116679802c4acb9e843dbb8d656177ae133aefc49a270392eededdae662d7ead518fa4301e1c7d231acfd4a7fd3053d807611737add6a1746ec119e400a1f199 SHA512 c29db5f40e7a206fcdb05958c0dc3a479f3e9d0ebd02703c26049162b8cc7d88875f508f29eee387270c96cb381ea93366498faa79d62bf21686e24a1142f608
 DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a31d47cb9a3b377ccd04e2be53e57274e76daed29177368c944740fd26cc862fc498f950070f0b83b0acc7a SHA512 992d06809fb52e58dcee63704bde05795b99edbac46edd8381f314c564490013b18e1853926f419c2c3c7f1bb68ff35e97048de03ace3232b800cf4b3b7dbe0f
 DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf
-EBUILD moc-2.5.2.ebuild 2148 BLAKE2B 3039de5a7faa6b92c6b9c836a5268896eec61657dc9ce98075f39096df8b3b21494b2bcc1fe7b3178d6870be7505bd8db5aec1b9e08118ded7c315f4dcfec172 SHA512 9680c784f3dcf4a1ceb57c5df5b6c92e27bd3f144ff49d3805fbe8a3afb614b72c40160da15f3a204738a935d6fb84aa16dd329002c59a461e0550c15a80ed5b
-EBUILD moc-2.6_alpha3.ebuild 2311 BLAKE2B a33ac63830fb03ebeb5fe6938546e9e8ead84bd6ac6861b52fb51e0c53d0d7558ba9535fc6f852cb50f4eaabb411f2cab9d8334419f6cc1dca99490293aebd7e SHA512 b6c43e2a0be7d2eb7357f942070d875962fd4a91057db291e35a8c56df5f9886116484729ded2cf5f7d2b58dfcac266fb37fb17a00d3387232354a040c62c026
+EBUILD moc-2.5.2.ebuild 2149 BLAKE2B 16d1c8658d29c359e0c72f8a6b3bd9697fd6ce172731c17a8d885f1d22d4b85111f0b9c62b5244d2a4ff474ecf48caa7e25ef40b2cc517f20382f628bd7b98c5 SHA512 4701aa7e50061790ad4ae565d454860c76a3b0bd8120d978ccf6d07e76e925c5ebfc85df1b8b9914a5146f9fd08d227c4b89adee4dd07705b9cac829b078e982
+EBUILD moc-2.6_alpha3.ebuild 2312 BLAKE2B c3be1d7ad371910c080e3c2c2b51fc903e807876a5105514ef8bd82b7e67ccce923db60d0aacfc001fe91b1d0ead7dd0fa100170c65b341fa5e4c3dd08b93c24 SHA512 481a4743d9abb5ca9346f9fa77de7d17a7d849f04b56e7dbdb2b03a5313a463e7751a635cb4cad0b090deb0ab00bbcc2830daf4102ef8cc6b9fde8f4b8d7063c
 MISC metadata.xml 532 BLAKE2B 79a7280e9bb412be2a57f13259d34ff2d2501bd3a34bc74c6fe5ce2529842dae5f199a674224b0b13883af8536fea947e98c6054c3039141a60dbc436ad4a5e2 SHA512 62746eb7250465ef0099c8b9c8e906e932d1bb5c9ac41b1a0192ee3cd4fa79698342b6fac2e7646d65197ebc9f7a504ab733eb2b889b7e84d1a8a9fadfc2ac57
diff --git a/media-sound/moc/moc-2.5.2.ebuild b/media-sound/moc/moc-2.5.2.ebuild
index 957a0cb595e6..11d3bcbe5a2c 100644
--- a/media-sound/moc/moc-2.5.2.ebuild
+++ b/media-sound/moc/moc-2.5.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.daper.net/pub/soft/moc/stable/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
 	oss sid sndfile speex timidity tremor +unicode vorbis wavpack"
 
diff --git a/media-sound/moc/moc-2.6_alpha3.ebuild b/media-sound/moc/moc-2.6_alpha3.ebuild
index 90a44f09e95d..a2abbe7a4316 100644
--- a/media-sound/moc/moc-2.6_alpha3.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.daper.net/pub/soft/moc/unstable/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
 IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
 	oss sid sndfile speex timidity tremor +unicode vorbis wavpack"
 
diff --git a/media-sound/mp3blaster/Manifest b/media-sound/mp3blaster/Manifest
index 50cfc23c2b37..519fc2354a5e 100644
--- a/media-sound/mp3blaster/Manifest
+++ b/media-sound/mp3blaster/Manifest
@@ -1,5 +1,5 @@
 AUX mp3blaster-3.2.5-fix-build-system.patch 2785 BLAKE2B 85f48a92691a538f01cf36c472d9d94e41a45bc0556e50b5f0375ef31c5aa2d2a44356ab2d732e11c135fac1a58b9e5c4e69a218f2d65663ea098319ad6964a8 SHA512 307796e8967b942f1b8133c271eb2a4a24ac9ce3ef2d3ed144197d615ba801198b4af115439f4306c5b84c5c3b7b4025475ed1dbae992d2731f646636ce8df8f
 AUX mp3blaster-3.2.5-fix-c++14.patch 1206 BLAKE2B 2f007e1af876c70bab2202e628824a7b80ac1d1fddefb805849f7089d342690f4654e67829794bd17eea23c64a60b0a511dcc14d23987f577d69d57ce1d900bf SHA512 cf0fe93ad0e6a75a58a855aae87222de923709a775552138ad95754ced9812a62c3a1cdc4d7091e1b727c0425cec40d223a9533ad4a735efed24d5a62db4e8e4
 DIST mp3blaster-3.2.6.tar.gz 354019 BLAKE2B 7fcb9011c436015c2f81a1a28b19896dffdba578969edb8cc29ed20fef7f222be3c23a1409c5c0a4c2ecb5b10432178c5581837938ede23ee76fe3205eecbb51 SHA512 eb977eb46b86449c6d433b1740aa08580e5b8f3d55d82d6f2623cd5fd103d73b7df127fb9ac650a21da61ad4948eb569a812e15d9adc9424d491fa625e198e0d
-EBUILD mp3blaster-3.2.6.ebuild 1554 BLAKE2B 92b83163089fd0c6ad3d5051a948051aedea7109295782f15c175ddb92ef980b1cbb346992e86a91d460deea0c132ac399c307e39b97c7e978a2a6015c79bb57 SHA512 f2d8d0be9f81a355bdbd1e6ead538270037464f8f52ac6163d423b22b1f62d21c568b17a81cdf0dd3bd0de186fae73c81de9da61b7239c7fac8b46b10a025f73
+EBUILD mp3blaster-3.2.6.ebuild 1555 BLAKE2B e264b17bf0cbeec19cfc83d3e02dda5661852875c956879be9b9ea31b8b6f5f63c29b00d2323abf8f6f0efa49d8856ca8bba641f80205f5ecf248f8248342e90 SHA512 7aa8ba2973bab42722dc1b73d8e727fe40a5060ba3005de6fa103107fb5b803fc3fde8a6c5b3142bed4c08e94788ece7329e4ef6237a0c6ac2f3da49954e4d43
 MISC metadata.xml 432 BLAKE2B 61a314b3ec47b80456e1e82bcdb198e073188f7e2f7f75d2156c6826754dbf47748f552a8ecb08577527bdcf2f97739583dac6db5c5bb5f14e2e61e676a6ea0e SHA512 e59462dc17d0e050f0876eb74334ddb5c980900a8b4268c281f92e30545a7cf7a3589dc1961640cba9a01d3ce01ec210904dd7033e42d9b3d237740f6820f375
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
index ca1ba984a0f1..d06af0e13555 100644
--- a/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
 IUSE="lirc oss +sdl sid vorbis"
 
 RDEPEND="
diff --git a/media-sound/mp3gain/Manifest b/media-sound/mp3gain/Manifest
index dd3c79c3320a..1d0dd021e8af 100644
--- a/media-sound/mp3gain/Manifest
+++ b/media-sound/mp3gain/Manifest
@@ -1,4 +1,4 @@
 AUX mp3gain-1.6.1-CVE-2017-12911.patch 2804 BLAKE2B 71d410abe4196cb47d4f006af7d8fd73a0308280ce57aaa955434c9f7b1bb8bf3363eb1ad8dbe0da3b5dd79e4ac5a355b796cdc253608c5bf2ba7c03527c3b32 SHA512 b5b093f18160cd4205870952d8f092c300f66d6fa025ac09114f55b1e5b37af6ab8ea1b505e33446f6c7153a5ffad04c001b67f9a069db8d3418c6fae3e73002
 DIST mp3gain-1_6_1-src.zip 68932 BLAKE2B 8c1ed35123f1613e189ec7bd74ee9f6176404a1b79c660f8f1a6df461cdfd3c6bb505daa09b8cc4756e1755d0923fe473a45c3ae171fcf35df22daaa08a7717a SHA512 6d26a7716a1901c80caff9d7fb03a454a452c06c6a57a7a921d5979727e112ba139690d8a287dde7a6e5a09b022d3c6f57193b4756a9c25caa177cef65f9e375
-EBUILD mp3gain-1.6.1.ebuild 673 BLAKE2B c319bf9335ba1a7ead43e9ed85d67ad8d941be8689031ecd9467eb111b59564d9d3dbfcdb42db3a94bc653a713bfe63157da0b2170ef4e5dcf248a6638cdb0a9 SHA512 9afdbbfd439edfb4edded5b815029f8a4e6a9c1be12e03fbe9177c6ebf501fd751bcc507c05b0df4ddecbd5ce39bad6a47b9dd5420a0f9906951e07d8d824cb9
+EBUILD mp3gain-1.6.1.ebuild 674 BLAKE2B 37badf40965a754120dc29fa5ebfa66d012c0743802dff465fd6fa788beb111d8e155c317ac1a592ad5cd04bfe17163dbe10681fb44081d5491eaa75a864cc7c SHA512 94778d6292599cc52158d9bb23f588cbc2a15538adc9ca4b05c6c170998aed5dfed2baa546142eada34e473d569354b8243778163f8d7377548eef64c626779e
 MISC metadata.xml 452 BLAKE2B c0b22d81f8e91934b834281f256b67e4e61a86fe9cfee08ace713baa8ff28221393594e9199aa631889c2b7e25b50bc108876b3f991ea7bef7575e486d5b206a SHA512 8ab00c2369fea3ed2ae75f5d04939ac81f4f227236215556157c3616ce1d72636c94af0988f06c995a08dd95c3774635c5d954e6992a077c20c7472be907a119
diff --git a/media-sound/mp3gain/mp3gain-1.6.1.ebuild b/media-sound/mp3gain/mp3gain-1.6.1.ebuild
index ac0cf8381c3d..30452bfd828d 100644
--- a/media-sound/mp3gain/mp3gain-1.6.1.ebuild
+++ b/media-sound/mp3gain/mp3gain-1.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/mp3splt/Manifest b/media-sound/mp3splt/Manifest
index c0b26491e14b..ca120e6c9f57 100644
--- a/media-sound/mp3splt/Manifest
+++ b/media-sound/mp3splt/Manifest
@@ -1,3 +1,3 @@
 DIST mp3splt-2.6.2.tar.gz 260901 BLAKE2B 49b45f53fd1a646993aadb6c18fb0cf7530b61f3ab5ddcf7bf220a6cdbde9844dfa048f22c10c1c89ceff2a5f77744b17c70e1aae7120300c606316b0a48eb0a SHA512 c1cbdc905d4f19e8e20afeadf02a2967049d86e69613312c8855e03afc5b190a569ac63f970171384853961cbe6bf248fae47e5116c4fe9deb7a0787f299918b
-EBUILD mp3splt-2.6.2.ebuild 702 BLAKE2B 32a97ee587e8832835daf376e587407ac470f2bd3838ba221aff0ac9588275847369ccbf0be261e3b0fa504c7ce7ff63b3a9d1c0c5a3cb578b23f24b1d2a3584 SHA512 88c1cb4dd85be55d5e8fca859875fc234dcb6b9e9dac8db5edaf191caf9d89b75e917827ffc8c80955e2da9bc49a6819bbbb1145b23ccf12078c437508b1e9f2
+EBUILD mp3splt-2.6.2.ebuild 703 BLAKE2B 024cf079e3d18c00960a66e9b01c6b78b10e4a7bcf2e98c73692e0fc38f01591dc6132830e40a7d271273e74bbfcfd8ffbd5a3a566f897170ebd2f3a33436bbd SHA512 1b7942fb26a7b2d0ff2f449d506a4f88d1b4fc664f2aecf640a507f058d3c8df03a115010355049d76d25e23f0270e47ea85c4179b7926a3fd7824eb5d21f190
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-sound/mp3splt/mp3splt-2.6.2.ebuild b/media-sound/mp3splt/mp3splt-2.6.2.ebuild
index 267738aeb643..00392c2e4b67 100644
--- a/media-sound/mp3splt/mp3splt-2.6.2.ebuild
+++ b/media-sound/mp3splt/mp3splt-2.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="flac"
 
 RDEPEND=">=media-libs/libmp3splt-0.9.2-r1[flac?]"
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index eaef22b427b6..4ff7f86d61dc 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -3,6 +3,6 @@ AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba
 AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57e4614727d7425e9323836db997a6876ae4b8266182f34cbb72199f8db5ef8aed79f5beb4fb5ea483 SHA512 ad67bee1e614b2901e977e0a7a9bfea7ec9bdf3af9546664f42c1d1426eb5e7990028546390219912e724eeca8ad063a2ac39a048be281527b19b0a79e819961
 DIST mpd-0.21.18.tar.xz 676084 BLAKE2B f55ea278da4b50bf24da476ed9e3ff50a8130215702fb5c4a0accdbfeb00ed734983034ce6ee0542623e42d488555b1c709acefbba026f0e01f17f25f749b833 SHA512 68b4d9dc4be8454d7ef92df2a7b42513dc2d97bfd6b11ba99bce6709fc58ccbeab05419863bacb7a3427f1325bc88da74f9f4b48206222349085f02d0135e1a8
 DIST mpd-0.21.19.tar.xz 676020 BLAKE2B 295dd9067b8517739334fa09d4afc95f1167f291441bc34c4e5c4177bda66ef60eb3f4184f9192242faf64997b05d1c0a13736d1d6a3f343317271acc24a0e70 SHA512 50609b104b84b37dbb297fb40e8f4b352f13de7be5791b8d48c3af3459bfa0f0f88d1d37dcbb0d2409aaee881bca7a7bf6f871b82418ddade19829b02a2bde6a
-EBUILD mpd-0.21.18.ebuild 8088 BLAKE2B 76779df1a6f51cb008d111e1d230677f76e17ce61f925896adf0dae5af20cb60227fa925b5071c3edc46cebcc9b658e5483d7b63fe7d7a8a91b2b51ade346b4a SHA512 3d594032c1f2528cec910228c05981fad36b687590f6d5b28ae3c02fc5e19defcfd5a041e276b445199f910b69c9a44ed38cae863d586941a89bfb7596059aec
-EBUILD mpd-0.21.19.ebuild 8091 BLAKE2B 1151108b573e5e86959425cbba158b070c99519ffff96070e4391542cf54dc3f9fbe22cef40f5cd3b98625b8f82184830afb082e0fed5fa029bef66c3838f204 SHA512 9514b4368f5f5d018b20c657fc1d11b420e673af89d0e7243e6c1eef026f92915888711ec44a2df73216941ceb5cf5e32a783e73f03be5231168eba941994670
-MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
+EBUILD mpd-0.21.18-r1.ebuild 8066 BLAKE2B c4e60bfb097f6aa97503bba0c7d86e33eceb1e0b87c88ea293a948ff59937b1311d350e429ed2e2c21a41141d9a2a148a16b83eda9a2f8be9c114281a579d5de SHA512 904cef84394f2b315cab7b9b354514286c19217d4525aed7c3f3e7ca8cec372e610dbaf2a81780dbaf0e7aecf10c00f63a5a2f2185de49e5164415a28c2a716b
+EBUILD mpd-0.21.19-r1.ebuild 8068 BLAKE2B 5c4a14d78ac4b26adcbcee75f664adc52e1706987c173157e75947a9b736c24ece135f851fdbd82c0f4acc653517b66335139522ae25e5fe7b0ea2dbce226a5d SHA512 fa9d4080a221fa1d253c4b63377786abdb40f148f39720d7d30c29c44496a4830fb9f07f8ac336630114ae430fadbcda9c76d872d1bc45c9836789a7589cf0c2
+MISC metadata.xml 2473 BLAKE2B da637e3495141e79aec3a6a1d676c6d98440482e00c57b48efdd9d8a93185d7d093cd2544a2a31beb552ac31f3ea4be897a036b640d630a02f297bde6e2a9f29 SHA512 e7afe6339926473e212cdd9a5be5f4e72c47e78b7ed9839621a09b331c40b4a21312ba4f8fe4154c4cd88908d005af4f3eca17cd6407ea8d10e294775d19299d
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index a0ce86018108..621b406d3e23 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -6,7 +6,6 @@
     <name>Mikle Kolyada</name>
   </maintainer>
   <use>
-    <flag name="adplug">Enable the AdPlug decoder plugin</flag>
     <flag name="cdio">Use libcdio for ISO9660 parsing support</flag>
     <flag name="chromaprint">Enable ChromaPrint / AcoustID support</flag>
     <flag name="cue">Enable CUE sheet support</flag>
diff --git a/media-sound/mpd/mpd-0.21.18.ebuild b/media-sound/mpd/mpd-0.21.18-r1.ebuild
index db09890f55c3..9194a171c2c3 100644
--- a/media-sound/mpd/mpd-0.21.18.ebuild
+++ b/media-sound/mpd/mpd-0.21.18-r1.ebuild
@@ -11,8 +11,8 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~x64-macos"
+IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
 	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
@@ -21,7 +21,7 @@ IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	zeroconf zip zlib"
 
 OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
 	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
 ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
 
@@ -38,7 +38,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/mpd
-	adplug? ( media-libs/adplug:= )
 	alsa? (
 		media-libs/alsa-lib
 		media-sound/alsa-utils
@@ -214,7 +213,8 @@ src_configure() {
 	fi
 
 	emesonargs+=(
-		-Dadplug=$(usex adplug enabled disabled)
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
 		-Daudiofile=$(usex audiofile enabled disabled)
 		-Dfaad=$(usex faad enabled disabled)
 		-Dffmpeg=$(usex ffmpeg enabled disabled)
diff --git a/media-sound/mpd/mpd-0.21.19.ebuild b/media-sound/mpd/mpd-0.21.19-r1.ebuild
index 3395216d6d39..8ef1c4dc8826 100644
--- a/media-sound/mpd/mpd-0.21.19.ebuild
+++ b/media-sound/mpd/mpd-0.21.19-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
 	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
@@ -21,7 +21,7 @@ IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	zeroconf zip zlib"
 
 OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
 	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
 ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
 
@@ -38,7 +38,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/mpd
-	adplug? ( media-libs/adplug:= )
 	alsa? (
 		media-libs/alsa-lib
 		media-sound/alsa-utils
@@ -214,7 +213,8 @@ src_configure() {
 	fi
 
 	emesonargs+=(
-		-Dadplug=$(usex adplug enabled disabled)
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
 		-Daudiofile=$(usex audiofile enabled disabled)
 		-Dfaad=$(usex faad enabled disabled)
 		-Dffmpeg=$(usex ffmpeg enabled disabled)
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index a93dfeb1e879..0356dee17a5f 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,7 +1,7 @@
 DIST mpg123-1.25.10.tar.bz2 921219 BLAKE2B 04bfbe8915e3943ed42cc2d3597b0bd9c4686f77ee699f5845e7d1e905022206724cf23d6b0420a36e64b232f840dd9367f46f3c00dc2fe6256f44e8b83fa5b2 SHA512 a33666ae4aca7e7c1a93a6414d8c525ec19044c54f712d578180147d88e63033f7af2370b9ad22960cc3a0b454f15967b7a831cccc97e034c8855f70cdf1ab09
 DIST mpg123-1.25.12.tar.bz2 910149 BLAKE2B 4e1b6329fafb4d1e018c6f5fc0846480ef8cfb6811f92d745f7e88d45fa6a8704ad707d110b12709763ac79fe095603c8ece0bbecb54cc2cde4de819083a2078 SHA512 fa3c719c68dbe45b265fd7677d0932b07f6a14e7ffe365ede965ff1637e655c4b57c86f7e4cd60cace7df5fcc93d48e0d44f082931394b7c6ef19f5d11638eff
 DIST mpg123-1.25.13.tar.bz2 910176 BLAKE2B c7881fdfda1d2b5acf27c2bd8b2a25329708b481a500a29b4a6ca89d2fc849c05fa25d35b85782b0d430437853013dba23c3b1519f9e299106317c31786302ba SHA512 2308a899f47eb0d17a603cb8a19ea07b1f338d85d9c2f798fb55732d77c603802e18b6ca0215cc59ccdd70fe89816c09fd16a6a91b1d1cd3834bd7877239cb39
-EBUILD mpg123-1.25.10-r1.ebuild 2838 BLAKE2B 36665cddd86d7d0d206cb5555b11224f54c1fb3905f5d077cad8960fc29a3e76b0df5f6b953d5e037abe06eae5df5a281a670152589715136ceaa28c82064893 SHA512 ce2b633f7332c9923bcffbf84d141b6e65e915fc4485b05d9b44c022ae05ddcdd09027510e5cd2f18feb71c54dc51430a250de84da66bbf830a31967653396f5
+EBUILD mpg123-1.25.10-r1.ebuild 2839 BLAKE2B 544c2866de701c433472f5d31858f81fc42cd2624a8ab077b22c5273b8704666bed0da75c8ddd7278640de35c1b0555f5f9e7a1f50b9a53d8271d4dc51e3fc01 SHA512 b60451a70c872aa2ab27ab5d9ba992de0c6e4bd86f6e329ae173189d7f96b05eec9b7026b9a691951c7d360d2853cd2c793613e08f0cc435b91555783eedda5c
 EBUILD mpg123-1.25.12.ebuild 2862 BLAKE2B 5784ece87b256c16378b409bf3a502d99f4eb0810f2cb883b2cce54f3baddcfc653c628c2b3dfb8b95109cb75b0a8c7845003b075df8db7400389d4bd7670db7 SHA512 cd6f6fb1d82b8320fdba5e0a5e47241c380052b84f060665b63758318848c5cdf8c3f9cd01087999c7806c9c026c8336c6b54c2c988c642bb62c0307f00fa593
 EBUILD mpg123-1.25.13.ebuild 2862 BLAKE2B 5784ece87b256c16378b409bf3a502d99f4eb0810f2cb883b2cce54f3baddcfc653c628c2b3dfb8b95109cb75b0a8c7845003b075df8db7400389d4bd7670db7 SHA512 cd6f6fb1d82b8320fdba5e0a5e47241c380052b84f060665b63758318848c5cdf8c3f9cd01087999c7806c9c026c8336c6b54c2c988c642bb62c0307f00fa593
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.25.10-r1.ebuild b/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
index b8e1965b5919..a2c53293aa59 100644
--- a/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 alsa altivec 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 685c0dbe5504..2d6fdb4f6656 100644
--- a/media-sound/mpg321/Manifest
+++ b/media-sound/mpg321/Manifest
@@ -1,5 +1,5 @@
 AUX mpg321-0.2.12-check-for-lround.patch 670 BLAKE2B e41184968df73dbb3eef1b6149cd569bc40590d5bd1262ede84356ad975498db3533f443aede6afc0c223650cd3e8fd877bceb702c6e645cafef45eb7e273b6d SHA512 391a98bdf102d3016e98005ddc84b6b303e1fd5653ddcaa13cda0b09b84952bee99f3ebbb6ad763a21965c47692a7011e167b7f990cea760ecf88dbaa34de3a2
 AUX mpg321-0.3.2-format-security.patch 1188 BLAKE2B 31ce7e13160c48c53ebb1010a069d0fe6693fab58e12c525dbf3fea6c294bb1f26be703143cd9a3ce10808238017a41f49c8e53ad2029c80d1ad5f346a98690a SHA512 2296934348c898704558f2dac9b7cbd90126d58804df834540688d0c3b35231f488aed036cec200464309cddc2c1adf43759ce87e99d5c370527c552b8e59089
 DIST mpg321-0.3.2.tar.gz 151139 BLAKE2B d1b043316aca07e61ab61698f1d9e56fd221c4024e69b5262906b280dcb4f67bd32f3ff72b1758ba26cc0fa7d1c5c4052fc6fc87ae9ceec9d0bf77b1d35a868f SHA512 f1bead2c11e4cde0f1a87e1b2e3d216ef80c9a5dd8b219841961688d44a5fc63a54b7af07359766fde0b2712ddc5d0a90b20149c3228cb2d70e830e15c8ab234
-EBUILD mpg321-0.3.2.ebuild 1179 BLAKE2B b077d50153e0f2c6dfdb331dba631a7143d194e5b29d2b60a930a265b13619d582fafd70c5355e0b4e13636c6884b7c2a4c09539834d735c13a6541e03aa0269 SHA512 4bd2e733c799ec2b2b334c30c85ad641e1816e1ea46e5b30b111a340c21ef1790f8778ddd616b549b356bfbfdd6e0b408b9697229b729c6a8c157b2219616a23
+EBUILD mpg321-0.3.2.ebuild 1180 BLAKE2B fc1250804686cfd118f4fe8880d65c6602e91d40ce77ef4b256f890ee026c6969e52ce9e181c5265c1daeff64e5bc9970094b315191e0e5ac3f4b5749598e3b3 SHA512 7c9e435264ef5fb7d43351532e9858cfc618c817fbc8dc455da27c31b88d98f39c3722380453bf9c478c6373058025ca56d8d1e254fa7266b4f77e12057e0c2e
 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 e19f449b16cd..886b3137318b 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/mps-youtube/Manifest b/media-sound/mps-youtube/Manifest
index 8e1cf75f69f8..f8b38b57c997 100644
--- a/media-sound/mps-youtube/Manifest
+++ b/media-sound/mps-youtube/Manifest
@@ -1,6 +1,4 @@
-DIST mps-youtube-0.2.7.1.tar.gz 78128 BLAKE2B 1883ac93ec06b657f72463291d4844b4cf5c1edfb14088769d32bb7590ea676c06a1022724c40b94230ee5469864b402a07c56e535ac3001d57c87cf6937d370 SHA512 760bd6ef6c04606e6e70e4d7f985482c5d5f1f33481a69398d20c2518ae7a1b0371501e31b6d0bcb46e702c53d8b2311e4556700c7d2ae4011006ffe9582de9b
 DIST mps-youtube-0.2.8.tar.gz 95542 BLAKE2B 67aa7db4e26325ef35b6c263ad1020bfc76ee683314c4e49b5f850d9c49c3795b5e9f3ee042772d9ce1c682fd04cd21ac24975cb3b7b7a2c4834bbd51b0726cb SHA512 7d4e092225652b5b63a2f94e7fa7cf07ff8f7797bc412de9388883ca9f95e87a14ff59276f28d208c5fd2e74315b1d7f275937f7c4cc86134ae5778d880d2620
-EBUILD mps-youtube-0.2.7.1.ebuild 579 BLAKE2B a3210425b8599a12ab92e086edf779acd016e83aad5cdbceb7277fc554b6532bbe83df309ae02798c728d1b5237c09fdce3b8aaf34a18e49323b0b1423fc8b95 SHA512 a416bf9b5d239bc44ac9a8a7681dd9ae4d194f4780691394d37fa3874937e7b6c2b3edbd60422d0bd0b159793e209102f86a09471f565aad391bc05f65b33f73
-EBUILD mps-youtube-0.2.8.ebuild 702 BLAKE2B 07d8d988d0e340ba83d5e28cecba61aa7c16b15df60ab93fa6b56907fbe655340bad89490eb3f12369be79fa09967f86b85b6d2197f0d737a98e3bd54c602f4a SHA512 6a601bb8c461af327696de09d6d70a8b1018706a48a84c3c26303de795996abcaa399bdc1aa084dfffd9f2e58185b4dff21ddd590aa7257c0383c96f3f6b04c8
-EBUILD mps-youtube-9999.ebuild 702 BLAKE2B 07d8d988d0e340ba83d5e28cecba61aa7c16b15df60ab93fa6b56907fbe655340bad89490eb3f12369be79fa09967f86b85b6d2197f0d737a98e3bd54c602f4a SHA512 6a601bb8c461af327696de09d6d70a8b1018706a48a84c3c26303de795996abcaa399bdc1aa084dfffd9f2e58185b4dff21ddd590aa7257c0383c96f3f6b04c8
+EBUILD mps-youtube-0.2.8-r1.ebuild 684 BLAKE2B 485b39f0956bdffe2f9b2c25add43109e7fb2ba465b7a47bdb9fc84316c3464e12c9acf70b7015d971c0a76447f2c88b7e7878297dad641d96158b2a85f53ad4 SHA512 49084753b453935c218e0a74f6d498d45589730044a11c42269e3b2ca7ca4b12a8aede492cbabf58d06abd3893056f05bb9d4d46dcb86ac617ea784406fa83b9
+EBUILD mps-youtube-9999.ebuild 684 BLAKE2B 485b39f0956bdffe2f9b2c25add43109e7fb2ba465b7a47bdb9fc84316c3464e12c9acf70b7015d971c0a76447f2c88b7e7878297dad641d96158b2a85f53ad4 SHA512 49084753b453935c218e0a74f6d498d45589730044a11c42269e3b2ca7ca4b12a8aede492cbabf58d06abd3893056f05bb9d4d46dcb86ac617ea784406fa83b9
 MISC metadata.xml 390 BLAKE2B a451cde37ad9b1809005675d0dc8233c760f0ee1678474d60c74990a4ef07da572947498a0da14577072a4f14e57da7b008251ff551f4bcb9ee966957344bf83 SHA512 22e8eee2d28b36f19350ef791ff5a5d705da83b4dafb9b0e959b5cfe4ea6cb5f4e4a47c29eda531e189a253f7d26d58f1be127896cfc2d4fa08bd4e142c61e70
diff --git a/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
deleted file mode 100644
index fd0ea3a2ed5a..000000000000
--- a/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Terminal-based YouTube player and downloader"
-HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/pafy[${PYTHON_USEDEP}]
-	virtual/ffmpeg
-	|| ( media-video/mplayer media-video/mpv )"
diff --git a/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.8-r1.ebuild
index 7f9ca71d825c..a86ede03c873 100644
--- a/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-0.2.8-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 if [[ ${PV} == "9999" ]] ; then
@@ -19,8 +20,8 @@ HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mp
 LICENSE="GPL-3"
 SLOT="0"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
+RDEPEND="
 	dev-python/pafy[${PYTHON_USEDEP}]
 	virtual/ffmpeg
-	|| ( media-video/mplayer media-video/mpv )"
+	|| ( media-video/mpv media-video/mplayer )
+"
diff --git a/media-sound/mps-youtube/mps-youtube-9999.ebuild b/media-sound/mps-youtube/mps-youtube-9999.ebuild
index 7f9ca71d825c..a86ede03c873 100644
--- a/media-sound/mps-youtube/mps-youtube-9999.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-9999.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 if [[ ${PV} == "9999" ]] ; then
@@ -19,8 +20,8 @@ HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mp
 LICENSE="GPL-3"
 SLOT="0"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
+RDEPEND="
 	dev-python/pafy[${PYTHON_USEDEP}]
 	virtual/ffmpeg
-	|| ( media-video/mplayer media-video/mpv )"
+	|| ( media-video/mpv media-video/mplayer )
+"
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index 40da75493f75..4dd1e62adf62 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,4 +1,4 @@
 AUX musepack-tools-465-gentoo.patch 1558 BLAKE2B 292111fc2b795a98cc2c1926b63799114e4b6ea2c11aa9ddee78c24332181ac9d5c4ab403398470014b5f33cf246def98214026d0def5979e11df2a1e2747050 SHA512 c260e1f96fa4ab79f09d78f16ede4522a802f703d565cf6db974b918e8db48233211a561ce64e0e8bc7cbd177ebf2986c46e5c9811ac15515f8126458c15b0af
 DIST musepack-tools-465.tar.bz2 167612 BLAKE2B 0748cbfaecec396a4bf054aac5a451f16386becae75cdbb63821c28f7b7d378723df180d909eb3b9e0c7eafa79996dbe7aaab251721fd139b81755e7f59249f1 SHA512 ce933376bc127f6f4acc8500e50b6318a6bc5bf8443547fc0e25b4e8e5881fd7a73aff155560ffbc5161b5d7d03522c73bfbc31e14e1531fe511036a0f657d54
-EBUILD musepack-tools-465-r1.ebuild 809 BLAKE2B 91b93bf13256b0586c2ca6c89aa61fada8be7a6f8c5dd4fa136180bc16e6de8b46725f5712d3ec8c2e3ec951539d34c6066e2fe0a9040a959aeb993b5999e006 SHA512 0f7aa71dd989f1419399d243b399831189d6db0656eb314d5f9b06a35ff076d2e3d5ec481e7714af00fe64cb6008246000f89751ad40e7eaef66f4bab717b4f6
+EBUILD musepack-tools-465-r1.ebuild 810 BLAKE2B 5fc1ccbd3be8d59c94124eb5dad062d879871a0f476dda81eeb75cde6f559310f765b9eb9ea1f6749dfe673a4c0e97f6d4060ed320470ffe057ba52516f6b995 SHA512 0f05d6082a8d623360ff2684c24ab078df4fbf2066211b110f58b6c7f8b7ebb7560735732102ad7d6c4aaa95558c4a0498ffb48ad4cfccc4d39645ed1f64e67a
 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 55e1e0b22907..dabee1eff2c9 100644
--- a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
@@ -14,7 +14,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"
 IUSE=""
 
 DEPEND="
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index f5afbd09d7eb..e6fa862a52f3 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -4,7 +4,9 @@ DIST MuseScore_General-0.1.6.tar.bz2 35109226 BLAKE2B 62a22e50d4c10ab08f0affd728
 DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32 SHA512 bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
 DIST musescore-3.3.4.tar.gz 62827836 BLAKE2B 55e4c14539ac6227f0cc2dfb50adae920e63f9cf054a90a4c39f92c608a3ccb17c395070f77380997b367b48db72d96104117e02f486dcad26c0ea08aedce329 SHA512 c224e391daadf8d33cbf9d42e6a055290d7821abe7141e4927a77f1c7df6a57cbcbe5277248deb39d368547f17423ee9a4b5bc6cde8f27bc5646e83c6c4ff082
 DIST musescore-3.3.tar.gz 64453809 BLAKE2B 278ca68e3a2432750356902360ac6882abaf763d3e512aa588e2b0eb7c58f8ffdab111ec3edaa9bf058a41ab5bce26f05a9a618def0c094376a6a4dbea7340ef SHA512 b7d228d957d674868474ae6a94afbeaa530d2d2e7688b9be91b77237066071920034a3b5e2241399543b4fe8d73d97ba605584cb0c0f67d2026ca212a13dbaea
+DIST musescore-3.4.1.tar.gz 62951880 BLAKE2B fd15545a6bd5632650654a86063a8152b3ade7148ec4c4986ed501397f74e4a9f7db6574f1cd0ee1d512b0cb4e5b90e890ef028f3acf7a9a55989bda05bfe178 SHA512 4d76d6990595a77db55801d7ec3c4790718e8633e173daa34a2b2e8477384cbbce84257a797b2e9652ba8d8a8705a41d9e33a2882225415964061e57a1a82861
 EBUILD musescore-3.3.4.ebuild 2449 BLAKE2B 93b00e73bb9e230a1fa5be81fb504fa18b092960136b6921bfc85bfe693a41c39061c72286b5367911a922faf84fd1c8dd3ebeea255f690e4e41be78cb4b281b SHA512 c72fc45cb8999c50a07fec94d953526948f9ed8e2ce2a2286e0ee9543c80cc8d8dee02b2c55c98c943c1b606f0eb598ad4875467c9bc70ccd702fa2713e378a1
 EBUILD musescore-3.3.ebuild 2421 BLAKE2B 71b05ee46489698fa8b8e723360f886f372d900a8bf18a7a8a1deaf9e0c91bc14c6b8a377b00f0122a426e057e070fd35678b492040e6dc57e0cabd17a5514cd SHA512 ae93fd993c1315310f08536a4a822a1fb755332ca09d867cd0053536c98403954832e420168159c8888e69c0a75aa60ce32f5027a08140b6a893ddbb7351e77b
-EBUILD musescore-9999.ebuild 2415 BLAKE2B 01288251aa9647b9eba9a23bee1679ce016611691b487ce57ccf5445e687711844a8ce7d943749226b9306adeb32645776010c5411e7eb16ee2b88d165c6a554 SHA512 05b779c77f3253c2f4ccdeb6682615899e17ca1ba8bd9039e896c3aa220af068798bbdc99af3e1be123b727147828ffeca5788c7dceac981c37c360981e22f8a
-MISC metadata.xml 685 BLAKE2B 1ab11b407c05d18fa7fea53e4965f37dad96d2845fefc0ead84dab785a8c7684866e6455e500035d88a26ab3a59d18509e85811a5cc5a291bb033a78b55455b0 SHA512 3c9ad5c65edfafa2019ffeeabe13df04bbf5ef3dcee206284cf7e8b79543782da1312f7f443e4ab569248216410c4ac302ded74e074606f6ed8a3930344f483b
+EBUILD musescore-3.4.1.ebuild 2686 BLAKE2B 2e05fdaea69cd0afc4275272f9c125cf409dca4f3aec36189cc051a6505e93974887c6a8ff54da6074001c1c53cb408251b8800717b6fa0e3810ae4a75e70ecc SHA512 2dc3514c8aaca961ef7e748df718a626ca6f5dc241eb736f6c155e59650f8a548f6dd470a29e0b94fa2719fd657c1d4395c780a56236686b86b3d47934cedf1f
+EBUILD musescore-9999.ebuild 2678 BLAKE2B f52b7a6305e4f6d8866da7af899a13044b924f0a7aca26832042d6afbc14f3fef741c5ba11532db21763ad3c2a1b43fc3d10e134b65e7a6949fc1c35ae5bfcd2 SHA512 be0d219e8b6ae945aaa99c92afa8e1e04f82a30179c3eb2e34699224421b192e5d8a66338697e9affeb59a28013af30be6a612fae3784b10c357f756966b55af
+MISC metadata.xml 881 BLAKE2B 99183973e67c5c36493fd08532288693650a321bd72f864eb2924066462d9a2b58dbcf41778018e1774ac46958ccfc796a71727cc47b5bd6c58926e63bbad021 SHA512 24dd5a79185ca63316656fe63011eceba157ed1d23d6875e5452906215f2151f706265d68979188005172d7e7f32a5d57eeb248c218a20036cbaf73b4983d7aa
diff --git a/media-sound/musescore/metadata.xml b/media-sound/musescore/metadata.xml
index f0d90452cf33..0a5292967923 100644
--- a/media-sound/musescore/metadata.xml
+++ b/media-sound/musescore/metadata.xml
@@ -10,8 +10,11 @@
 		<remote-id type="github">musescore/MuseScore</remote-id>
 	</upstream>
 	<use>
+		<flag name="osc">Enable OSC remote control protocol</flag>
+		<flag name="omr">Enable PDF import (OMR - optical music recognition)</flag>
 		<flag name="portmidi">Enable support for building against <pkg>media-libs/portmidi</pkg></flag>
-		<flag name="vorbis">Enable SoundFont support using  <pkg>media-libs/libvorbis</pkg></flag>
+		<flag name="sf3">Enable SoundFont 3 support using  <pkg>media-libs/libvorbis</pkg></flag>
+		<flag name="sfz">Enable experimental SFZ sampler</flag>
 		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for embedded web browser</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/musescore/musescore-3.4.1.ebuild b/media-sound/musescore/musescore-3.4.1.ebuild
new file mode 100644
index 000000000000..fb4ff90af180
--- /dev/null
+++ b/media-sound/musescore/musescore-3.4.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+inherit cmake xdg check-reqs
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/"
+# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
+SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
+REQUIRED_USE="portmidi? ( portaudio )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols2:5
+	>=dev-qt/qtsingleapplication-2.6.1_p20171024
+	dev-qt/qtsvg:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/freetype-2.5.2
+	media-libs/libsndfile
+	sys-libs/zlib:=
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	jack? ( virtual/jack )
+	mp3? ( media-sound/lame )
+	omr? ( app-text/poppler )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+	sf3? ( media-libs/libvorbis )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+)
+
+S="${WORKDIR}/MuseScore-${PV}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Move soundfonts to the correct directory
+	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAEOLUS=OFF # does not compile
+		-DBUILD_ALSA="$(usex alsa)"
+		-DBUILD_CRASH_REPORTER=OFF
+		-DBUILD_JACK="$(usex jack)"
+		-DBUILD_LAME="$(usex mp3)"
+		-DBUILD_PCH=ON
+		-DBUILD_PORTAUDIO="$(usex portaudio)"
+		-DBUILD_PORTMIDI="$(usex portmidi)"
+		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TELEMETRY_MODULE=ON
+		-DBUILD_WEBENGINE="$(usex webengine)"
+		-DCMAKE_SKIP_RPATH=ON
+		-DDOWNLOAD_SOUNDFONT=OFF
+		-DHAS_AUDIOFILE=ON
+		-DOCR=OFF
+		-DOMR="$(usex omr)"
+		-DSOUNDFONT3=ON
+		-DZERBERUS="$(usex sfz)"
+		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
+		-DUSE_SYSTEM_FREETYPE=ON
+		-DUSE_SYSTEM_POPPLER=ON
+		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cd "${BUILD_DIR}" || die
+	cmake_build -j1 lrelease manpages
+	cmake_src_compile
+}
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 5d3ba673cd37..6157b14ce4af 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -17,7 +17,7 @@ EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
+IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 
 BDEPEND="
@@ -44,10 +44,11 @@ DEPEND="
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
 	jack? ( virtual/jack )
 	mp3? ( media-sound/lame )
+	omr? ( app-text/poppler )
 	portaudio? ( media-libs/portaudio )
 	portmidi? ( media-libs/portmidi )
 	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
+	sf3? ( media-libs/libvorbis )
 	webengine? ( dev-qt/qtwebengine:5[widgets] )
 "
 RDEPEND="${DEPEND}"
@@ -70,19 +71,29 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DDOWNLOAD_SOUNDFONT=OFF
-		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
-		-DUSE_SYSTEM_FREETYPE=ON
+		-DAEOLUS=OFF # does not compile
 		-DBUILD_ALSA="$(usex alsa)"
+		-DBUILD_CRASH_REPORTER=OFF
 		-DBUILD_JACK="$(usex jack)"
 		-DBUILD_LAME="$(usex mp3)"
+		-DBUILD_PCH=ON
 		-DBUILD_PORTAUDIO="$(usex portaudio)"
 		-DBUILD_PORTMIDI="$(usex portmidi)"
 		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-		-DSOUNDFONT3="$(usex vorbis)"
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TELEMETRY_MODULE=ON
 		-DBUILD_WEBENGINE="$(usex webengine)"
+		-DCMAKE_SKIP_RPATH=ON
+		-DDOWNLOAD_SOUNDFONT=OFF
+		-DHAS_AUDIOFILE=ON
+		-DOCR=OFF
+		-DOMR="$(usex omr)"
+		-DSOUNDFONT3=ON
+		-DZERBERUS="$(usex sfz)"
+		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
+		-DUSE_SYSTEM_FREETYPE=ON
+		-DUSE_SYSTEM_POPPLER=ON
+		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
 	)
 	cmake_src_configure
 }
diff --git a/media-sound/orpheus/Manifest b/media-sound/orpheus/Manifest
index 16b8e0d4550e..4ced1df41b83 100644
--- a/media-sound/orpheus/Manifest
+++ b/media-sound/orpheus/Manifest
@@ -3,8 +3,8 @@ AUX 101_fix-buffer-overflow.diff 614 BLAKE2B a41edfc4a29b45adeb67923eeb5fe386e17
 AUX orpheus-1.6-bufsize.patch 590 BLAKE2B bd1748e80d5133f16d7394b7286a30047c245a81f38c30f2f3f2f897e7dc953d30e0259e5c6d20cb6cfa5a20d2ac5255b9f0d793770893332ea677ee907ee8cc SHA512 47e166074a585657bf49c7b3af33c2849dacbc737872ee6abd70891fddd7e8c63cf293e1180cd0f04077dcd6def495203103e92ca78a87564dcec56c0ea2f4e3
 AUX orpheus-1.6-constify.patch 2123 BLAKE2B 9842e55e4b0418f77e7f88f045e55eb953533f4a4cdeac3e49fd5d2f9369b3c328b0905555c8a0bc6acb9ac10f762230e17b25d0479247a9a119382eee2e7af4 SHA512 9e4ba5e66f65994462098f1b20208bb668e97acab3e95262ddf814879130bf3ff3caaee829631354784326b276ac23ff68dfa62374d43c8679c8beeebcd4d21b
 AUX orpheus-1.6-cppflags.patch 830 BLAKE2B a5a4d8ca2633fe31bf1b3917e7004578187ef8677a99cecb870e9e181276a2f9a03518989caf2816c52dd07c168cc6d2104b59b9d326786dd0d895a1a4633181 SHA512 4a8d51eb3ef9cadfa78c0d11ae264166589dc0a63f084f904bb7a698fda6aa570cfb940b3ad50b0fbff201d21df049369d92b7ed5452cff473ee2d7b60fda43f
-AUX orpheus-1.6-fix-buildsystem.patch 4231 BLAKE2B 4492870937746e814fc4784cbf4c6c71659c058d1547f87d298a9bb358f50172aa12c41c387d7c2bd32840552878becf1e6cf1b3305cb05f1fbf300f2884280c SHA512 829048f8d327751e78e23fb4304a0b1a9308521bcd47b23dc15015c9ce4a2d36533a6fff18d8903a107c63131bffdb89851088c53bb28ade769245c1dd25e225
+AUX orpheus-1.6-fix-buildsystem.patch 4346 BLAKE2B 30fd0a668a6903c1b6f285c096caa096efcd187c138a2d304e591f3543d13ff5112949852c1ffc23043a3f2f98fd1c397baeec1555506a70973125a03d86fdca SHA512 fa05fec6ec5280a2a0289c55eaac5ca84286731cff2ceb294e645a0b69415fee785ad203169a455019dbebe89e700314821779c1d81d13dc21d6ccac7109ba63
 AUX orpheus-1.6-gcc47.patch 275 BLAKE2B 90f817ffe97c0f32865ed2b87a9ec7a044045fe478ace3d290ce0fdd5446e01ab496e0e57d5ff86e6039397c2e797d086485f8c3f3f8ec85aa1592ef294c2c16 SHA512 d502efb94e6cc1e1cb452a5c7f4ed4f662353ef1bb953117d725f8125a4c7f43713071089ce5df2ab9d8adb3f2b62b178e8869b2cf2b52681ba9f9510aa313d7
 DIST orpheus-1.6.tar.gz 440553 BLAKE2B de5621aaf6962668bceebb35a95df7ab543b517cfe208346cdccab4f73f458611b65e4fef515c4f284d2fa83e8fc24aa77e8e6e1808fab489d056f10de7f7a99 SHA512 40f4ac7533449940370f29d4a14281d7f235ce711166e0e979f3e2a5ca37f792dc74b5267ee2a4f51af6c20f346c543d0d9f1fc88f47670971ad32f7c2856abb
-EBUILD orpheus-1.6-r3.ebuild 981 BLAKE2B 2294c1ad4f7e5cd8e14096b6448b8bcbcff6799c74dbbe77c41b5b30d011d8c6b1bbb6c11aec558ced3c401994758b24fad3743cd0ba1558fc71d162b86834df SHA512 a88c4f1fbab4be4c78a390e949ab1ec22a20104c2a3436e448b41c7c1eae64f7c4ea166b7871717733fa9b3440a64b09552d84ea8b96ee968de23f1dddb02176
+EBUILD orpheus-1.6-r3.ebuild 913 BLAKE2B 6f068cca608943190a12e37d6adac09095d333478a8b90ed8d4269f056d35a84852b432b551bd8a31d51ba2352b929128733303be95a26b947147bfe6167db73 SHA512 add3909c566097b196e57335934889565d0a451c9c6513bd79a04798ced53a1dc4177e764568b3f62528fedc1ac840aeeab86f77c08be1d734b8e430a3fd604a
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch b/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch
index 5819fe9a053c..35f229ed3cfe 100644
--- a/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch
+++ b/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch
@@ -1,5 +1,5 @@
---- orpheus-1.6/configure.ac
-+++ orpheus-1.6/configure.ac
+--- a/configure.in
++++ b/configure.in
 @@ -1,5 +1,5 @@
 -AC_INIT(aclocal.m4)
 -AM_INIT_AUTOMAKE(orpheus, 1.6)
@@ -18,7 +18,7 @@
  
  ###     use option --enable-locales-fix to fix problems with double-byte
  ###     encodings on systems with broken locale, iscntrl()
-@@ -20,30 +20,21 @@
+@@ -20,30 +21,21 @@
  
  AC_CHECK_HEADERS(sys/soundcard.h soundcard.h machine/soundcard.h, break)
  
@@ -54,13 +54,14 @@
 +LIBS="$LIBS $LIBICONV $DEPENDENCIES_LIBS"
  
  ALL_LINGUAS="ru ca"
- AM_GNU_GETTEXT
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
  AC_CONFIG_SUBDIRS(kkstrtext-0.1 kkconsui-0.1)
 -AC_OUTPUT(Makefile src/Makefile src/abstract/Makefile po/Makefile.in intl/Makefile)
 +AC_CONFIG_FILES([Makefile src/Makefile src/abstract/Makefile po/Makefile.in intl/Makefile])
 +AC_OUTPUT
---- orpheus-1.6/kkconsui-0.1/configure.ac
-+++ orpheus-1.6/kkconsui-0.1/configure.ac
+--- a/kkconsui-0.1/configure.in
++++ b/kkconsui-0.1/configure.in
 @@ -6,7 +6,7 @@
  AC_PROG_CC
  AC_PROG_CXX
@@ -70,8 +71,8 @@
  
  ###	use option --enable-locales-fix to fix problems with double-byte
  ###	encodings on systems with broken locale, iscntrl()
---- orpheus-1.6/kkstrtext-0.1/configure.ac
-+++ orpheus-1.6/kkstrtext-0.1/configure.ac
+--- a/kkstrtext-0.1/configure.in
++++ b/kkstrtext-0.1/configure.in
 @@ -6,6 +6,7 @@
  AC_PROG_CC
  AC_PROG_CXX
@@ -80,8 +81,16 @@
  
  AC_CHECK_HEADERS(_G_config.h)
  AC_LANG_CPLUSPLUS
---- orpheus-1.6/po/Makefile.in.in
-+++ orpheus-1.6/po/Makefile.in.in
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = kkstrtext-0.1 kkconsui-0.1 intl po src
++SUBDIRS = kkstrtext-0.1 kkconsui-0.1 po src
+ dist-hook:
+ 	cd $(top_distdir); subs=`egrep "^[:space:]*SUBDIRS" Makefile.am | sed 's/SUBDIRS[ =]\+//g'`; \
+ 	echo "SUBDIRS = kkstrtext-0.1 kkconsui-0.1 $$subs" >>.makefile.am; \
+--- a/po/Makefile.in.in
++++ b/po/Makefile.in.in
 @@ -29,7 +29,7 @@
  
  INSTALL = @INSTALL@
@@ -91,8 +100,8 @@
  mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
  
  GMSGFMT = @GMSGFMT@
---- orpheus-1.6/src/cdtrack.cc
-+++ orpheus-1.6/src/cdtrack.cc
+--- a/src/cdtrack.cc
++++ b/src/cdtrack.cc
 @@ -22,6 +22,8 @@
  *
  */
@@ -102,8 +111,8 @@
  #include "cdtrack.h"
  #include "playlist.h"
  
---- orpheus-1.6/src/main.cc
-+++ orpheus-1.6/src/main.cc
+--- a/src/main.cc
++++ b/src/main.cc
 @@ -21,6 +21,9 @@
  * USA
  *
@@ -114,8 +123,8 @@
  #include "uitext.h"
  #include "cdtrack.h"
  #include "mp3track.h"
---- orpheus-1.6/src/mp3track.cc
-+++ orpheus-1.6/src/mp3track.cc
+--- a/src/mp3track.cc
++++ b/src/mp3track.cc
 @@ -22,6 +22,8 @@
  *
  */
@@ -125,8 +134,8 @@
  #include "mp3track.h"
  #include "orpheusconf.h"
  
---- orpheus-1.6/src/oggtrack.cc
-+++ orpheus-1.6/src/oggtrack.cc
+--- a/src/oggtrack.cc
++++ b/src/oggtrack.cc
 @@ -22,6 +22,8 @@
  *
  */
@@ -136,8 +145,8 @@
  #include "oggtrack.h"
  #include "orpheusconf.h"
  
---- orpheus-1.6/src/orpheusconf.cc
-+++ orpheus-1.6/src/orpheusconf.cc
+--- a/src/orpheusconf.cc
++++ b/src/orpheusconf.cc
 @@ -22,6 +22,8 @@
  *
  */
@@ -147,8 +156,8 @@
  #include "orpheusconf.h"
  
  #include <sys/stat.h>
---- orpheus-1.6/src/playlist.cc
-+++ orpheus-1.6/src/playlist.cc
+--- a/src/playlist.cc
++++ b/src/playlist.cc
 @@ -22,6 +22,8 @@
  *
  */
@@ -158,8 +167,8 @@
  #include "playlist.h"
  #include "mp3track.h"
  #include "oggtrack.h"
---- orpheus-1.6/src/streamtrack.cc
-+++ orpheus-1.6/src/streamtrack.cc
+--- a/src/streamtrack.cc
++++ b/src/streamtrack.cc
 @@ -22,6 +22,8 @@
  *
  */
@@ -169,8 +178,8 @@
  #include "streamtrack.h"
  #include "playlist.h"
  
---- orpheus-1.6/src/uitext.cc
-+++ orpheus-1.6/src/uitext.cc
+--- a/src/uitext.cc
++++ b/src/uitext.cc
 @@ -22,6 +22,8 @@
  *
  */
diff --git a/media-sound/orpheus/orpheus-1.6-r3.ebuild b/media-sound/orpheus/orpheus-1.6-r3.ebuild
index d56b810a1026..cd2786b8a7b5 100644
--- a/media-sound/orpheus/orpheus-1.6-r3.ebuild
+++ b/media-sound/orpheus/orpheus-1.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,26 +21,23 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/1.5-amd64.patch"
-	"${FILESDIR}/101_fix-buffer-overflow.diff"
-	"${FILESDIR}/${P}-fix-buildsystem.patch"
-	"${FILESDIR}/${P}-cppflags.patch"
-	"${FILESDIR}/${P}-bufsize.patch"
-	"${FILESDIR}/${P}-gcc47.patch"
-	"${FILESDIR}/${P}-constify.patch"
+	"${FILESDIR}"/1.5-amd64.patch
+	"${FILESDIR}"/101_fix-buffer-overflow.diff
+	"${FILESDIR}"/${P}-fix-buildsystem.patch
+	"${FILESDIR}"/${P}-cppflags.patch
+	"${FILESDIR}"/${P}-bufsize.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+	"${FILESDIR}"/${P}-constify.patch
 )
 
 src_prepare() {
-	# rename all configure.in files to prevent future
-	# autoconf breakage
-	local i
-	for i in "" "kkstrtext-0.1" "kkconsui-0.1"
-	do
-		mv ./${i}/configure.{in,ac} || die
-	done
-
 	default
-	cp "${S}"/{config.rpath,kkstrtext-0.1} || die
+
+	cp config.rpath kkstrtext-0.1/ || die
+
+	mv configure.{in,ac} || die
+	mv kkstrtext-0.1/configure.{in,ac} || die
+	mv kkconsui-0.1/configure.{in,ac} || die
 
 	eautoreconf
 }
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 1e73ee35a60c..c3b70d5e5fd4 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -4,5 +4,5 @@ AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
-EBUILD pulseaudio-13.0.ebuild 11564 BLAKE2B 382848ee5036957c5185473e038be1df071e5436a3eaf3e9089ed411fe44a599d83ac5e64f53f763d0b2e39d087b979aa2785abb60c9bd7b87a2aca5a16e6399 SHA512 7ea56402745dd8c6fb9b79aa5afb49d236ab96072ffb1f2297e4c9e9dd04b0695d77d78de785ad52c32dccf5072c4a952221f59940f0069b1fbc6de1f1a6e792
+EBUILD pulseaudio-13.0.ebuild 11565 BLAKE2B e9ec3af2e8df240de2d142e6981c9ba6473466c7a573f6c8f487392c06d3453c5d2f82c08266176a52d88d8fe7bd8d57e0cffb9981ea1c29da76862e9e003dc3 SHA512 651f3c65aff3d39fb97d259ec73783958f7d4e115ae592cd8395bbc3152f7e1e9e002ad054b626400215769b8b7bd3f6e00681d795cc36deee9d1ab5376612c7
 MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/pulseaudio-13.0.ebuild b/media-sound/pulseaudio/pulseaudio-13.0.ebuild
index f53237cb8b9a..4ed747d04020 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index ad7608979867..49225993ba51 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,10 +1,6 @@
 DIST pulseeffects-4.6.8.tar.gz 1882449 BLAKE2B 57a93eeb32304628efb51473912a70485e054ef50e9e9aec9731ba761dd7809ce0a8c3838fc74a04c6a29537bf182a74c6e6715c722ce76670c8be71dc4a5608 SHA512 672204ad90534ad45228b3473902eb8489c8306c7850f2b2a6f983aa89955529fb5381d6a7d703de94dcd658ffd5b560cce17291a0b23654b225ebd301659e74
-DIST pulseeffects-4.6.9.tar.gz 1925035 BLAKE2B f059169721e643cb3e3a6db42d3a0fef0bb7696c6b2a5583e69573e7620f87d4a06ed448e298e0ca4e9868dcdd8cec8bbf71e7fb83c094d3840a9f90919ea571 SHA512 c767508ae3d9fb8df3e8d27a05bfa908e6c0862514a20b81fbc3ea8680c9d6ca20bac8d90d513494aaccbda29104e0dc015b81dab0bee5a40b708c415246ce3e
-DIST pulseeffects-4.7.0.tar.gz 1931247 BLAKE2B 88545378c55c968e5973973593c8cf8e5ccfbca60c28af5f4604be247dbaeba25f68dd21be77b9160dfaa7dc633127c7a0066615d607d2e5adc8e5608d6132d0 SHA512 9d47a61abaa851b83344437d12d0c674459c0dcc27096f1ce8d22fde8dd56c0819f81cee56a9ef13c93d476ed02195743b2fec1a66794b6878ed796da6c166bd
 DIST pulseeffects-4.7.1.tar.gz 1995518 BLAKE2B 81a0e53875278c5264cc306b81d299b0d016f806f7f142fddceb8aef8798b4f64163f05d72f44ae147195b871b59ed9dce52bba8b98597362e9f154336daff7a SHA512 19a84986ff49d832147697ed81e793f6f7b22600b4b928cf9efe7db0ed455181547d21b3216d47e4d0ae495ef420ce8392cbef0d1edef0d9d5130a1ad2d89c8f
 EBUILD pulseeffects-4.6.8.ebuild 1855 BLAKE2B feb368814eb1124176505d2db6589d1177afe8dc09c8c4f44baddd24984c4f41c89b1e77c3159e7c9eeff4379c3a77e23e409ba1d85ec6a116dd713f9adff1e6 SHA512 c3a45f3c2ae1d3ac82b58110c1529f596e1c367bf66efa5692702e877d11af596da62bb20fb20a69ebb4e0edc6120f8652b801ad6eb43e40238d4297dd630691
-EBUILD pulseeffects-4.6.9.ebuild 1857 BLAKE2B 3c9e2a5136bbcc522a3fd46e98f9ff7d8af418276953eac37de28ca254fc639b6c37add537b9e52cc8afcb09fb90c103f2e7ca9d8d5639ea4438010cd10dd6aa SHA512 79b59faba833d5de9b0b488d471c122e0963e73ff36336afd31c4d33c47f73a3a40c3c6eff777fcf35e18112eeec8d0218d7698b3d1ed2f706a07974b64efbe3
-EBUILD pulseeffects-4.7.0.ebuild 1857 BLAKE2B 3c9e2a5136bbcc522a3fd46e98f9ff7d8af418276953eac37de28ca254fc639b6c37add537b9e52cc8afcb09fb90c103f2e7ca9d8d5639ea4438010cd10dd6aa SHA512 79b59faba833d5de9b0b488d471c122e0963e73ff36336afd31c4d33c47f73a3a40c3c6eff777fcf35e18112eeec8d0218d7698b3d1ed2f706a07974b64efbe3
-EBUILD pulseeffects-4.7.1.ebuild 1857 BLAKE2B 10efa614690ca487cc4af4ae9c6828d22b72aec4da55ff278df0591b6faf1f7a341637e7c49f99f0df64d46fac3ac40e42ec5c9f3b7c4704e2c9cf2231eb5109 SHA512 c305a407096482f8bfa3977aad878df3bf4578800c12702cde270ff174cae5d677290ee055662e7f361760290f08cb9a46aed44ecf0c7c7bc2408675ecc7da99
+EBUILD pulseeffects-4.7.1.ebuild 1855 BLAKE2B 3ce08ef12ba740a6fcec74ff2e252439c842effdca8c626a8de1dba87ea18d9d494a2133bb267ab9d8c4866d64d1f583e31d74c45ca35887dcaec742d82c1198 SHA512 8853016ce534dad13c4a8193a557f9c060579a33b231e3b11d67ee33479e8491ac9760cb6b49aa86352bb3763655baecd4fc1aa950a3c6c0cd6a79b7482f38c3
 EBUILD pulseeffects-9999.ebuild 1857 BLAKE2B 3c9e2a5136bbcc522a3fd46e98f9ff7d8af418276953eac37de28ca254fc639b6c37add537b9e52cc8afcb09fb90c103f2e7ca9d8d5639ea4438010cd10dd6aa SHA512 79b59faba833d5de9b0b488d471c122e0963e73ff36336afd31c4d33c47f73a3a40c3c6eff777fcf35e18112eeec8d0218d7698b3d1ed2f706a07974b64efbe3
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.6.9.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.9.ebuild
deleted file mode 100644
index ab95a499cd73..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.6.9.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
-else
-	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf mda-lv2 rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41:=
-	>=dev-cpp/glibmm-2.56.0
-	>=dev-cpp/gtkmm-3.20:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.18:3
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/lsp-plugins-1.1.7[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	rubberband? ( media-libs/rubberband )
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	media-sound/pulseaudio
-	sys-apps/dbus"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
-	${RDEPEND}
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-BDEPEND="
-	>=sys-devel/gcc-7.3.0
-	dev-util/itstool
-	media-libs/libsamplerate
-	virtual/pkgconfig
-"
-
-pkg_postinst(){
-	gnome2_gconf_install
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm(){
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-4.7.0.ebuild b/media-sound/pulseeffects/pulseeffects-4.7.0.ebuild
deleted file mode 100644
index ab95a499cd73..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.7.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
-else
-	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf mda-lv2 rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41:=
-	>=dev-cpp/glibmm-2.56.0
-	>=dev-cpp/gtkmm-3.20:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.18:3
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/lsp-plugins-1.1.7[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	rubberband? ( media-libs/rubberband )
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	media-sound/pulseaudio
-	sys-apps/dbus"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
-	${RDEPEND}
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-BDEPEND="
-	>=sys-devel/gcc-7.3.0
-	dev-util/itstool
-	media-libs/libsamplerate
-	virtual/pkgconfig
-"
-
-pkg_postinst(){
-	gnome2_gconf_install
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm(){
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-4.7.1.ebuild b/media-sound/pulseeffects/pulseeffects-4.7.1.ebuild
index 29b27d822298..0d88d4c03230 100644
--- a/media-sound/pulseeffects/pulseeffects-4.7.1.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.7.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
 else
 	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index a16a70715640..0b8f440e8b7b 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -1,11 +1,7 @@
-DIST quodlibet-3.8.1.tar.gz 3697363 BLAKE2B 67c56281a998d93b2ea457656473ab7fc45a1d4d80aa561fc1946e129ac91a01c65fdb34bd314b5742756708714ac043341cae6ee38e93e37a7a16e3bf481c20 SHA512 5f8f7ba3157dea83782c64989114ad38295c660300284b72e825eba46eae053120c96e60518d573b4010dd49e396a4fe8d04788e632e61e38fa6edd953014275
-DIST quodlibet-3.9.1.tar.gz 3850929 BLAKE2B c4317521259f1d46e927276ee8bd927afd72708f7b6e260a68e2cfe6e949f44e08df5884f3613804955b18b7284f0140f9d2d409833bd0a139732728903ae978 SHA512 6d6b6380de2fc2d3ab1614b304f2d7219ff1d823e03f532baa0e9b1308fd36094ad745433494253d956182ae9914eb62846df3d3e5fea92dddccdaa725178563
 DIST quodlibet-4.1.0.tar.gz 4882607 BLAKE2B 1e0c519eb3f1d377dc7fc0ee2a08faa51632eabd1f21638e38aaf5edc4faa6707274edfe314910b32895e59a5cdd27434914afb1c33aa2914788e644db2d2aaf SHA512 987001b6335e18ce18d25b71be327261c3fe5e0a142395ce061d7460e9ade2543a3372a64560b804be3e4d70889017612e9bc1a72215d45b215caf4da545e9ae
 DIST quodlibet-4.2.0.tar.gz 4894320 BLAKE2B 0109322ee845e0ca99d620f396c937c0c340e98bfd4b4ffb5aab0253177bdbdac7b59789f05a78f5f610bd2e0037c5cfbc919aea65542d663ce5f65a032bae61 SHA512 3a978acdddd5f7e2736e4d3764d8921d000ec8602c18e319d54d881f606ac97a4c06f23aa4c6f8813121855ed97982a63cd51d594aa12095c7c4cdc32da64eb2
 DIST quodlibet-4.2.1.tar.gz 4908102 BLAKE2B 0c1535e925842d42aafd5ff819b33a5d4527995977dd5d56b84b26462c677d81fcfb6d1de60ce50004a4b4a3eaa69896e430d36d31d904175c38f9deb23c044b SHA512 3817611c887b7c1878ccf852311020ded0a813feec1067f861d1157de6331760166c34992a6e4fe225552ae6ed4472000585fe58a3397faf277ae250f6f3c138
-EBUILD quodlibet-3.8.1-r1.ebuild 1717 BLAKE2B 1d5a8105c82a70394a4602244c3d7734352c02c9ff4e4b32f0802d93a5f4f1bc355397b61f48c2e5ce0b79ddaa9145d39bef54f0f6698ad5b92805affb38d7b8 SHA512 784706ebf88f4a18e869ed4bb6a89ed78c2a5c9fef8b96d4c8358e11d122afcbf831b1028c2d47450b1cf89e0c6c379164cace47f6314045eb3ac9f600be7828
-EBUILD quodlibet-3.9.1.ebuild 1760 BLAKE2B 441b5af4ce9f397b30bc58bed0416c85417b28c55123d1d93c9ecd502e4ebdb0782d5a3eb8eb62c3861d768481e8103fdf0395cf310d0e801044321a20d7746b SHA512 76648bb9945ec27282302ed8e35cb9dcfde7fa0e98860f88ef66b112f6537499296f835c11e9890de642f00de884263af15edad2396feba5d02602cbdd7ace8c
 EBUILD quodlibet-4.1.0.ebuild 1546 BLAKE2B bc786a0765f3c48ea4b9e7f324ec31bac4d5311b160ae39d258230a2556d548387d670b1d917652586533b0e0f4ed6b0c63b95bbd5ee2d18832eb138f9f4e51b SHA512 a7c1888841baf12cb8d241e459a444eb4cb74ddfdb09cddb961cb0a9025308fab97b2eb7990c9d2644b83a48ae1a674cd921f82f8a4411d58f1123c9626910fb
 EBUILD quodlibet-4.2.0.ebuild 1521 BLAKE2B 7b743e10a71a65f2d888defc0569862a87283e937c61fad07ec9f0c78c2f4a0bc74a481f33dae2282b17a5a882c0e8098229f3f5e87d23ce3af9ca1e64c05664 SHA512 fbf5bb1e626e65d7925d37b6662167e35dbf3d3dc7258cb7dfe5785127450b1a924a3398eef3ae782a53d8b1859ab1e2c27ee1f9d731b6699c07e2e6b264358b
-EBUILD quodlibet-4.2.1.ebuild 1531 BLAKE2B 44a2ae1be468efe05d4013c01434a01545320dae4f037f873e962f47fa55e7a36b2af212a53f317c190c38c82d5d39f77b37aade77f60db6d018d90a7aca07fb SHA512 071c29c1e067e1c0c32a4684f58e4a241388c3cf8515305c54a3d64b5669a99aab40ec9eee7bc404d682d630250b148727384a453f3fb911e6c5101dd575d65a
+EBUILD quodlibet-4.2.1.ebuild 1527 BLAKE2B 5717484588265f9ab4a879e5c91a61215b09dea218fa294fdfe15faa5a4d7ad349f161e3c4cc5bea9af6b2b21c348cab07777b5b073abde6193a6400fc2fb8ab SHA512 50779c247c4ed4b3e619c940d1892547cf9924ae9fd0a933caed623d9b887e6ce7bffd6f497bd0a4d1e5ceb20e1e1b21d35c4b3945f7bd93e783cf91b1aab70c
 MISC metadata.xml 1136 BLAKE2B 372295e43337120cabfa3a28f260fa3feff8cce235240be1c65fc0a54922b294cc94124690fdb923d82f78c5866e82bc7becfad334c8e1ca3797b6602a9d0d80 SHA512 1466590147ca42dda2b5c11fe781a39e6d25d205b69fdba20663f1d1bfc2e251123c99990810727a36fbbd7a0c868bf1ddc51e94a38985719cef1bea71f07feb
diff --git a/media-sound/quodlibet/quodlibet-3.8.1-r1.ebuild b/media-sound/quodlibet/quodlibet-3.8.1-r1.ebuild
deleted file mode 100644
index 3862b250cda4..000000000000
--- a/media-sound/quodlibet/quodlibet-3.8.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 gnome2-utils xdg-utils
-
-DESCRIPTION="audio library tagger, manager, and player for GTK+"
-HOMEPAGE="http://quodlibet.readthedocs.org"
-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 ipod +udev"
-
-RDEPEND="dev-libs/keybinder:3[introspection]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/futures[${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}]
-		)
-	ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] )
-	udev? ( virtual/udev )
-	!media-plugins/quodlibet-plugins"
-DEPEND="dev-util/intltool"
-REQUIRED_USE="ipod? ( dbus )"
-
-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_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/quodlibet/quodlibet-3.9.1.ebuild b/media-sound/quodlibet/quodlibet-3.9.1.ebuild
deleted file mode 100644
index d8f5bf17d4bc..000000000000
--- a/media-sound/quodlibet/quodlibet-3.9.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 gnome2-utils xdg-utils
-
-DESCRIPTION="audio library tagger, manager, and player for GTK+"
-HOMEPAGE="http://quodlibet.readthedocs.org"
-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 ipod +udev"
-
-RDEPEND="dev-libs/keybinder:3[introspection]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/faulthandler[${PYTHON_USEDEP}]
-	dev-python/futures[${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}]
-		)
-	ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] )
-	udev? ( virtual/udev )
-	!media-plugins/quodlibet-plugins"
-DEPEND="dev-util/intltool"
-REQUIRED_USE="ipod? ( dbus )"
-
-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_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/quodlibet/quodlibet-4.2.1.ebuild b/media-sound/quodlibet/quodlibet-4.2.1.ebuild
index 59df25cc966a..ab9ef4c4a158 100644
--- a/media-sound/quodlibet/quodlibet-4.2.1.ebuild
+++ b/media-sound/quodlibet/quodlibet-4.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="+dbus gstreamer +udev"
 
 RDEPEND="dev-libs/keybinder:3[introspection]
diff --git a/media-sound/rawrec/Manifest b/media-sound/rawrec/Manifest
index 233a90cce66d..b8235cfe86ee 100644
--- a/media-sound/rawrec/Manifest
+++ b/media-sound/rawrec/Manifest
@@ -1,5 +1,5 @@
 AUX rawrec-0.9.991-fix-build-system.patch 900 BLAKE2B 3572e6c249c777514aed2f35c5a0814aa148ea352361b72c50c4da377bd274ed8241c361fa9124735d881cf6b3ba5dcf6151b0a1484d33469d7dc57a61c57d98 SHA512 f2223ec30e07b43d8ae6790f3e4c7f363824646b5fd7c6fb4e72f8637cfc60306a3b322efae656566752b933da00d19790d6bfeb5c84442ebdfc2960358ecef2
 AUX rawrec-libs.patch 817 BLAKE2B 8da060f6631560d3f994af4471aa08f7f4a0d01664281adac71350088e81e724f021d2ffcd768b889f9472dd819d4e95ef284ded121fe0661854a511b96fb4ef SHA512 86707ebc6533c137c3a569394cbfd17626dd855e2caeebe2a469091ad5d88f50932e4b4717d4e9cf88e44678c4bc51f74bfccd04c13d98f6e3471300fdaf4dd8
 DIST rawrec-0.9.991.tar.gz 62134 BLAKE2B 2ff1bc864f0da3d2416f3b5dfc8f331396544d396a47f94dcbd7b2880453a007db1254610262799239a6096fd7465018129fd23c59fe5b30cef9069a55de0eec SHA512 3f0c6080b246231089cf01dbb5be0e9e6749cd9d339a9d3ea865681e836767c69909bb9f70ef7d87b39298603438169e9531e957e364dfcbe64aef074f862d90
-EBUILD rawrec-0.9.991.ebuild 721 BLAKE2B 562957c3a068cb2f21923b25c8d753ad8e97720dfc315030df3b4d1762beec97185931208abcd77ab8663a9f4154ff4e0266b3d5d1d775ee0943f29f3b4acc34 SHA512 f417dcda3da41f865a4118c9aa1735212ef01a8dcfc4d97bb188e54c07f78a083faa605d37649cbe17a8394d4ccbed00fca0870b65d5dee3bb22537830418c01
+EBUILD rawrec-0.9.991.ebuild 722 BLAKE2B e6d6b0dac632714a87cb2bbd56331bea2e6da09aab354ef4f7df2d19a30b95c83acb025a671cc3826f756bbff112f9631e80f9101fcdd581c6d0d6b3838d7108 SHA512 0961e0e522ef4c743b685f1fe3eb57c761f63c564f099bff06a962b5acdabe7091c9caee14e9fad3c141f51010ca2da04186b74a166aaace4f52ffa303b4aceb
 MISC metadata.xml 329 BLAKE2B cb48532535b24c1aa027739ba20960f703f4b16f4c9bd0dfbee5c3db57fe00b11290ca72f2290b7edd4fa0e806acd82363dd92c7a6fc09ad97bba6784d90ca24 SHA512 03288474cb2d673f67059727711ae15215ea738740e473082470065728892794d13cf2c7426b48d93a85adbcf805d81f1b3eeb2f89dec08fe459a4202f6f87cb
diff --git a/media-sound/rawrec/rawrec-0.9.991.ebuild b/media-sound/rawrec/rawrec-0.9.991.ebuild
index 3372ddccaf5f..2fe5bb684621 100644
--- a/media-sound/rawrec/rawrec-0.9.991.ebuild
+++ b/media-sound/rawrec/rawrec-0.9.991.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/rawrec/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 
 S="${WORKDIR}/${P}/src"
 
diff --git a/media-sound/rplay/Manifest b/media-sound/rplay/Manifest
index 7e38b4dd968b..5724bd768727 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 1210 BLAKE2B 5d2afa989c40eec2845f4e65675a81e4b08d3b17509770838047dbcded9ace48cb9cbea36296500a3634bb5b12b43daf02f9d25e2759c3797fff9137055edbfe SHA512 c12c77c5e90691ea00a08039967223b7d7a00c48fa8e50dca56da0e6bf7b6ca91a122419b3d4911c613f13b040876b8a174aaa34586ad9409f4f9f815130a278
+EBUILD rplay-3.3.2-r3.ebuild 1211 BLAKE2B b1bf9f2c019b7c78de129d257ad1795e05f6da7f64e224b9e43a5de11c8adb5c96b1fbcded50285f86dbedfcd2e0b1ea067f8af661e00c8cdf27ba12b20f2bce SHA512 01a26d7dfa74fc2d9fa29a39c1b2845d0c20590a20f6a94005f94de818eb003fc02b55fc54034d781078fb2d055947b57be73ed311dd567419797ae7d703fb5a
 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 ff0d91c44534..3d2f5a961fad 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/shorten/Manifest b/media-sound/shorten/Manifest
index b403d58337f2..a84148e9171c 100644
--- a/media-sound/shorten/Manifest
+++ b/media-sound/shorten/Manifest
@@ -1,4 +1,4 @@
 AUX shorten-tests.patch 548 BLAKE2B c8478471433a2840513994af71313c228d2cf89717406a03d5d3f65caaf73433c73dfb92b1f7db20025c5a3b1ca80027912f24b80cfca1434b47b00c715fd2c3 SHA512 0572b2bc84473cfc30c72c989035500942ed37eae3d9e3c770e9908606270fe0c52e03b8ac3ad42e2999798b9915a734400ebe1820ab1c7311d714dd66d370e2
 DIST shorten-3.6.1.tar.gz 597581 BLAKE2B 0a8bebc1219cb504df4b24b663048f1649f5279c0b20af7dfa30b8d9ad64a711f3dc5646d296b39f26b3eed6a5fb52271fdcd49d960fb5837ea003d1808d4b39 SHA512 825f2c02fcc5f715eb20b2b4356a5334be9c3d55b9c7238e0a2a734b99b88d8fb23308647644506282fd03df4a8e51e2aafbc1b1a89982d45d042a05a01951b3
-EBUILD shorten-3.6.1.ebuild 417 BLAKE2B 61b3ef1994869252c39e214916bbaea380acbf98073555a71eb6a2559642d091ec7c78539e667e494401cee60e1942c7a65425ed8dd5400df8526c7c0008b9c4 SHA512 b394f34561f275f5837767e7d223e24b7c7f4de67d0d0b3307acbc2fe49da451ac47d88f4dd4879703b1d319ad3ca454927bcabaf330a1bd94a5dfbd8af8a79f
+EBUILD shorten-3.6.1.ebuild 418 BLAKE2B 8e0da826c2537d3f7afe0daa716c547deefe7897bc1a2540328257e9459d14c622c401ff87867f1487fd734a7c2dd4b0ef91a1aaf7b51a9e5c77ad1b79317d91 SHA512 70ab84f85a37cd670b8bb057f52a5bd04abbdd2aa691fbb14019a720b617d64bf136d104048c57d375ba4f63f97b7d7b47b08079ea49624fc36d86746f9e9c52
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/shorten/shorten-3.6.1.ebuild b/media-sound/shorten/shorten-3.6.1.ebuild
index c0a5213789ae..277e51875fd7 100644
--- a/media-sound/shorten/shorten-3.6.1.ebuild
+++ b/media-sound/shorten/shorten-3.6.1.ebuild
@@ -9,6 +9,6 @@ SRC_URI="http://shnutils.freeshell.org/shorten/dist/src/${P}.tar.gz"
 
 LICENSE="shorten"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc sparc x86"
+KEYWORDS="~alpha amd64 ~ppc sparc x86"
 
 PATCHES=( "${FILESDIR}"/${PN}-tests.patch )
diff --git a/media-sound/sidplay/Manifest b/media-sound/sidplay/Manifest
index b29d2a2f9063..dd752bb621c6 100644
--- a/media-sound/sidplay/Manifest
+++ b/media-sound/sidplay/Manifest
@@ -1,5 +1,5 @@
 AUX sidplay-2.0.9-gcc43.patch 1097 BLAKE2B 38c060522fad4f8e71a0a6eab3bb32d01292b60b9adfa7f7cf6f5cd9708b944d5597ab3ceb34dd9d38f1b07513772f8430035cb29ce8723bc3f87f6e858d21a8 SHA512 4e2c717389e9fa7aa7a459138a42f411342def25fa6f236f64e4c306419402d7d9ece7e9376ad492d7a3fa4db9fee3c9bbffd2d3d13669a0366da990fa8e38c6
 AUX sidplay-2.0.9-gcc44.patch 3726 BLAKE2B 6d775f8a1cfb2e33d1ed9a07f51100c6ceb4da52f25de15ed4be504058b43293916661a94ba768fc898a55898ea5268659cd0548f0e8cd15ee1cf4ea3b519463 SHA512 41f319b4e232d199478d586b8a397493e1cc6a8eaa6b4eb5bec272b520ff8ffa078ac72b3eddf4f2865614bfe1f8e28df5ad3f2699bc74684c476a24b7795f75
 DIST sidplay-2.0.9.tar.gz 362140 BLAKE2B 4b5b5d9aff566f8840c4a1f405f64f1d64b642d32d85eca355a4d97bcd03056456c9b49dedd6eca63d5174893206e90693a2555ff35835f6f037ba964bccaae2 SHA512 38d334b7e649d6043b48705edf3c4cd27d01283b95f42d1b46bb7cf266ca0d5f6fac4a7dfd398578a3278d293342e4d4d09cde8d443d60a8d50e4abbe127afe5
-EBUILD sidplay-2.0.9-r1.ebuild 475 BLAKE2B 2b55b670e2418744b3d01233d5a2e9aad56a53ef8e79fe758be3262d170c82b915f08e3c2d2b780d0348cc7aec50c2d6c1759cb225bdbd86ba90e4107a742cdd SHA512 26c966f556bc00559035f291b90310af937ffb030a09fc4751d7ee6d01fae37e52d1853ac89701850ede241859e10a5d039cf4e278c8ca52a23f76d07381b2de
+EBUILD sidplay-2.0.9-r1.ebuild 476 BLAKE2B 69499b1de586ceb44abd212abc9ee441bcabae5d008367662bb90a37e60da869234ee2940f5ad297b4585f1dcad00e831bfc2f35c3d35cf79801d3c81154a9f1 SHA512 b185cadfa12b1e0993e0a644e7b3026f938d1ad7a65233cccb5e4f34548e32776a07e002a07c0232c5fce2b8356873273d9b85188036f3347a204568cf6aff8e
 MISC metadata.xml 331 BLAKE2B 41bbcd40272e97e1e0b10fd8e9471db6bfa393ac15eead124bd6e5885b1a35d746bd5be4ced94ed97d31ea130ed17aee55f81b6582e1895813661e3cf07e55b6 SHA512 83c0e6c0f4c7a85a10c96db7cb2eadffab0ef5e4614b0a091a4e14bb9a37b90d0d509bec47bf75d03853ab39a06ca12bcb5cd89f89e09901340a76c7b5c392e8
diff --git a/media-sound/sidplay/sidplay-2.0.9-r1.ebuild b/media-sound/sidplay/sidplay-2.0.9-r1.ebuild
index b10d636702c8..f0ab4cfc0a2c 100644
--- a/media-sound/sidplay/sidplay-2.0.9-r1.ebuild
+++ b/media-sound/sidplay/sidplay-2.0.9-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/sidplay2/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86"
 IUSE=""
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 2e0f9a99de18..361aa24fcc36 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -9,5 +9,5 @@ AUX sox-14.4.2-CVE-2017-15642.patch 852 BLAKE2B b6d32a2d7909b601953f0603caa678e6
 AUX sox-14.4.2-CVE-2017-18189.patch 1109 BLAKE2B 1014eb9427b4735e08da68707e108a0c04b89ec75c91440a0ce833327af0ed152a1eba1ef46402f198f6394c1787ae899ee1ffc9748d1ec91544fe8f127cecb6 SHA512 dd4023a6bc98f510c2256537e747a20c9b3b8ec35e0f98d19d188a3973f1774566c5d70f8de6cd9083547ade69670d34d10b848836d0724896993e1e56c85c75
 AUX sox-14.4.2-wavpack-chk-errors-on-init.patch 1328 BLAKE2B 0a1f6c0ef96d5508f11901b28b57feda0be79f0af6ead0af51eb97db7a3a97497aa446389904bc9457efd8dc4f9738f5482841caa096d3449d3b1ab5d77b746a SHA512 ae95d810f489efb749f808c6e46b0412f4cfd6ee60fce0289c0c1d689bb599fd2516a79fcd24ac9ddd30fab6f0437a6876dccfb61db2f6c612fe680f6eff13b5
 DIST sox-14.4.2.tar.gz 1134299 BLAKE2B 9fae987d421fc733b84746f8dc8f09ced1c3ce066643a426d7c64c4ed4ceeb18e5d00165108b39065a4ce40ff39e9d020fc6e734ff1121ee39bfeed4ad822bc5 SHA512 b5c6203f4f5577503a034fe5b3d6a033ee97fe4d171c533933e2b036118a43a14f97c9668433229708609ccf9ee16abdeca3fc7501aa0aafe06baacbba537eca
-EBUILD sox-14.4.2-r1.ebuild 2607 BLAKE2B 8b50093e27d71edf76f14100745f43376b160fcde381dce4909233fee05ebcdd75be9a05485fb7a5da1bb1f8258e66d8aa940ad3cb148f766c04060085389cd0 SHA512 70180b12514d64cea8de2964bc78063932cb16d9b1f827aad1f69b4079aaa6eca7800e821525dc9a7a14820b943f57adecc05c56f1c2738a7ac13769f9f822e2
+EBUILD sox-14.4.2-r1.ebuild 2608 BLAKE2B b3aceafac2a84b67081eed30ef54bcd5ccc03164f0a1a3751871130d19d9cb20ce229acb06a61fa9bae69794c90c96bbf31899d16c847bcb1e7de6be147adb03 SHA512 c325fa162d9b0b14ec32ae5454ee8c4dba4ae871dd4a9d00350e479bf10ade4bbdb35d9871140259127b8a8ca3fab09914d4c42988993dfbf8d77cb87e6cd788
 MISC metadata.xml 653 BLAKE2B 73d6e024f7b8cf87cc0640a749af4bf3d45604e9e28cd9ff1f68fea9b7f4c05ff2e1ee676efd07d1221070492a3575c1f4397cfe7008df00403232353f22afcd SHA512 578f6db7fbe2ae3dc3a732a2cbfb8627bfcce1801b4834071040df1b9e3bf20ca9dd6e7a8d7df221d38f4e8fff22cefa6ad57fd19dc145ab4a247f688c497c71
diff --git a/media-sound/sox/sox-14.4.2-r1.ebuild b/media-sound/sox/sox-14.4.2-r1.ebuild
index 3b4ee0db4648..962bb94a9967 100644
--- a/media-sound/sox/sox-14.4.2-r1.ebuild
+++ b/media-sound/sox/sox-14.4.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sox/${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 ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack"
 
 RDEPEND="
diff --git a/media-sound/streamripper/Manifest b/media-sound/streamripper/Manifest
index 8683a3349afa..31a384fbb787 100644
--- a/media-sound/streamripper/Manifest
+++ b/media-sound/streamripper/Manifest
@@ -1,3 +1,3 @@
 DIST streamripper-1.64.6.tar.gz 900205 BLAKE2B b316565c786b2005802b24cb441d6ee73c2548a4ac7515633fd92faba143a4708bc49c9de7c3eb9985de14a43ac1f86935ac2c353e3d14a7cbf28e334fa21338 SHA512 8477086d0099f6de861f1c47112476c427073b6e8127bbaaa2dd3e7930fe9a5c6d9b2c68d4a317f1bc0b20c625e665d5c245189049d35468aa83cf51828d4428
-EBUILD streamripper-1.64.6.ebuild 739 BLAKE2B d8dbb6425d24d83c46c0c9efba1fa906a71ae7726a639e78a93932b684b702e79126d7b21ff442c15e9246eaa54c37dad0e2ebaf7522d19ed5c2bfbf85edef51 SHA512 dbcd3a6d7d0075aec9177fbb286a7fa65f311e78658c310fb78ac2c125d2676fd2bf5b1c8e053d8b07046d296ba092d1c13738eab6efae0ed473f6f6464c8d95
+EBUILD streamripper-1.64.6.ebuild 740 BLAKE2B 5c2f130917af3f83e755c42422dc2003100b3b4f5670df0f9f374c859c3965d89b5f24c80be034a8800a422c5c855a3ac96d42144078d804c99a86e37711e728 SHA512 11661e5f483b370c65065e437cd11fdb47c6b945711f0f567a4c31b1f444d0eff38fcd7f9d62e444492c65c06257fd5cfd721dc345dba34905b9448e7cfc9fad
 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 13b9c6985a7f..bf5b77aac8b4 100644
--- a/media-sound/streamripper/streamripper-1.64.6.ebuild
+++ b/media-sound/streamripper/streamripper-1.64.6.ebuild
@@ -9,7 +9,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="media-libs/libmad
diff --git a/media-sound/takcd/Manifest b/media-sound/takcd/Manifest
index 225c95ee4f9c..288138c10bce 100644
--- a/media-sound/takcd/Manifest
+++ b/media-sound/takcd/Manifest
@@ -1,4 +1,4 @@
 AUX takcd-0.10-overflow.patch 367 BLAKE2B ab2168e1445ace23dcf31410040f363575302ea38ddee9a308ee4dcf7d24ccd0ae9909a72444a4c663412c54a5ccb3811f7f14e222569c76bbf52e2c40c83d92 SHA512 0e1193d558c0c3af0d37d06b0dbacbd10491e0be3dc42e58bcdecdad3308ed19394a9ba3401996df8df5f9cba9186f727272fd9d51cc34ac4334778ec809b7f4
 DIST takcd-0.10.tar.gz 95457 BLAKE2B 60e29a67d84fc600bcd55a7aa24e65bc042de13bc02686597a41cfd2e0490110ac66d60d0dc66977b4dce7bbdd34b7a20a1f6fe46474df16b11cbe1149b7d403 SHA512 a7211ec32adac1a9caf278cdceef9b9daf1ae47fa8ccb1d10eda51ca95566d8d6693f2f635b36e6d78f8f6f9e0efa711bc7263bbdd0f23c3f3ad884682b01e33
-EBUILD takcd-0.10-r1.ebuild 507 BLAKE2B d3ef7e12d8a5498d743b00345eca6eb927a89ac1f2feca043035b377e08ece76c01f3cc2a018d5febb77b496ae5e43ed7dbfb374f555656083f89482d2a5af6c SHA512 d37132d7d87355dd7ba32aeb42a764c3e87fcbb0596f70e41dacbde03a3d1b83ca0c623b9a0b10bfd18bad73de3ca34f43ff7e797faf3fcd895e85475de181cf
+EBUILD takcd-0.10-r1.ebuild 508 BLAKE2B f9248f993d3d297fcd473874c4e07df8a17df2a766adbdaf3b6030b9b1bdf5fa42b078f4d3ee45f08aa164f5dfbada4c712aefe2d51b6723e74a2da4f5995dc9 SHA512 b310941d5f41e2443915b96fd1b25106b3bef9f81429ab02f7999127d61c9ed23cbad879e85d308f236b1abaf173f95c5333a6f8d0c80cf99a015afb66225844
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/takcd/takcd-0.10-r1.ebuild b/media-sound/takcd/takcd-0.10-r1.ebuild
index db251f50f969..856504865e65 100644
--- a/media-sound/takcd/takcd-0.10-r1.ebuild
+++ b/media-sound/takcd/takcd-0.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://bard.sytes.net/takcd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ~ppc sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ~ppc sparc x86"
 IUSE=""
 
 PATCHES=( "${FILESDIR}"/${P}-overflow.patch )
diff --git a/media-sound/timidity-freepats/Manifest b/media-sound/timidity-freepats/Manifest
index 87f878c6faaf..5f0bd0ba593e 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 797 BLAKE2B 0244e9a1b9e6152ea8175be63fba1d7c0b686ca91a178ce0e33084d5cc8e33cc9f1e59de56fac6cba6a2515c906a29e4e86e45aa1f8d3a6f6bb881aa268c3ea4 SHA512 e286c47a31c30ee90f2161d0f4b63000d00aaae558e1967b2dee66abe46fc06bf069c159ae24d5bd745c0a69c6d568b7efff1c18b6dc2a1b589dfdd8dc7daadc
+EBUILD timidity-freepats-20060219-r1.ebuild 798 BLAKE2B 3ffbc9cea5aaa1ff8ade7930211f1b8e0a1b6d2482ce5804d258a2886251b898f0cf3b25c9d368ff12eaf9cb0804fa03d1442813d52af6db582596e1705c26ee SHA512 d3219059d773e42eb97c8807365e16b32f94a86e6635bd00c80691c49ccfeb9c6b931f497b1093a5c164cebac4d8654873ba9203d2b9afbcf5ee0d98e4ef68ae
 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 e617972fb8dc..9aedb624e4a9 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 hppa ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm hppa ppc ppc64 x86"
 IUSE=""
 
 RESTRICT="binchecks strip"
diff --git a/media-sound/toolame/Manifest b/media-sound/toolame/Manifest
index 926f20d522ae..55c23b3ac2f8 100644
--- a/media-sound/toolame/Manifest
+++ b/media-sound/toolame/Manifest
@@ -2,5 +2,5 @@ AUX toolame-02l-gentoo.diff 2188 BLAKE2B 5129ce926e4ee55a6f5baa73bf164eda41e2738
 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 735 BLAKE2B 152e4cda68e1bac875add897f45d969d508f91bb3d121e9b1365f775213447db715b73aa14412b5a243a49a155d410d3bf5ee2f9045b19411cb608bb54700298 SHA512 dbe29d01458f96038ef732b2cf0da6624220e8e2515cb4c33a1e331a8e2e72af21e991c5136f7e81a867806e9c8eb71fdb53ad738a7ab97bd64be006f69bd209
+EBUILD toolame-02l-r4.ebuild 736 BLAKE2B 4f1a58f846727757bd2698c4470f38461f9203de640dfa23ac59136c22d5b7302de9897c9899553c3f8e71efc90067f5e2d26475dd499cbaa05ac55ddfc0d4b1 SHA512 6c1d46df86cb21fd7aea9cd1f68287dad59bbfe9601d13ea4c0fbadaf2df6081dcdd4ba395cba92e59b91a1776f1a4f42b7e84d84655d0ab1a6d630c0660f289
 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 65cdc928f631..ffa714ee39cd 100644
--- a/media-sound/toolame/toolame-02l-r4.ebuild
+++ b/media-sound/toolame/toolame-02l-r4.ebuild
@@ -10,7 +10,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"
 IUSE=""
 
 PATCHES=(
diff --git a/media-sound/twolame/Manifest b/media-sound/twolame/Manifest
index 92791b74dbd8..f81e996676a6 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 1235 BLAKE2B c8e1905e12ad4838cf303a174e384f493e58c0537c53e9110cec7ed9496bd11e65734f73db16991af260708350886389108b524f2292090a4990ed716fb94887 SHA512 9bf472d563e846c485b3d2e0c9a8f270d65ffcb18845c8849b668d67e508ac8fe971fe770e87c9a512f806f57405bfd2b52d6fe44291d5d685cd72b765ed354b
+EBUILD twolame-0.3.13-r2.ebuild 1236 BLAKE2B 68d3f273d4ad0ecb6446c151e149d02d9bd8a98f55bbd31bc90e7fb73fe107e70f0022c5fb89f29e25a5d034e9d9b6b939314caa058a094d887986c1c5eada99 SHA512 0915ee59fc7022d9cbc094bc4015ace63d62613398b27c719454c2a6fd652e71d3f6a540c243fb87169f1b3f08a1fe9ce0e82f42bd304c489d3c5087e53c689d
 EBUILD twolame-0.4.0.ebuild 1336 BLAKE2B 3899df2d91fcaae03cc9356e142cfd15203f5c7d99fb1bf44e3316081bfc8a9529a9ff57d73bab086ca3ffb72b09776a0ca2fb9032d06a2521b6bd6cf47773ce SHA512 337ad4449bfaf14f9efafb8a9b836b1c6131eb122b3cb828cc9f23515a9205f68afc0710cf035cd7e010abf464a2fd3596f832b8537ce88e4c17697a44e3a083
 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 df17f0fc8121..a9489e19f47f 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/umix/Manifest b/media-sound/umix/Manifest
index 25ae573e6402..8959b0a40541 100644
--- a/media-sound/umix/Manifest
+++ b/media-sound/umix/Manifest
@@ -1,4 +1,4 @@
 AUX umix-1.0.2-tinfo.patch 381 BLAKE2B b54721623167ae634b5e6e0243ffe9fb57c7af3f99236e23317163aa95926bf2c2a56b07eed1bdd228c7d92c21e0009dd5044e551e9d06bd3488bbb47a9666db SHA512 acd5f8c6a22ed857182fabba848b1718d1031cd6b7c15456e25f37387ed8cb6c354accd1e83781954c9beed88337889538dc1e38992a4ddadabc3077941c048e
 DIST umix-1.0.2.tar.gz 225866 BLAKE2B 8ab2b3246440fcab64edea366dafd5d8f734c42483fd78410a1f884c2b046a27fdb6959023d6c537900c64409ad0f606e7d2c2e91f23bdd03dda61940ba7d29b SHA512 9e59a26c0b6cd60bbcfa715694ed58e023c119840080ccb46d9e6b17a9613fd42c1346233a5185d02ece77e3f3e456e18be25573fd34e2f265c5b0b3dc593468
-EBUILD umix-1.0.2-r1.ebuild 695 BLAKE2B 5dc3f8ed24cce98b8003f9177fb94ffb283e5938c6023cbdadc24ffb02d6019d85ced87ddf49fe1a57480735c4b2488ec868c122e4d10de5ad6ddf09044c0b1d SHA512 580c93be4b9800b579dd0295bb1fe26ed38fac035d635badc1df48d6c757f12b8d96315848ceeda3ce7b46ca51ce7a416c4f627b9f1af1d7e7bff877e9653c36
+EBUILD umix-1.0.2-r1.ebuild 696 BLAKE2B 49b6cb43d61d8d1390f453b1ef48d78bd33c00eba06ff47712733767199a1da0e30e6426e587669265dfcb3509b88ae9872b47c343a5a7044d70101edfd4ab8e SHA512 0a2f920f1903998a5eae1596dbe8e4f1a6a5e3b7fc579b1ca04b21b229b80eb0a16a6d0b0e3f682fbe4053ea6a1c903c8fca8e7dd82f0ef7ee796679d061e5f2
 MISC metadata.xml 327 BLAKE2B 8c7901bd5f9eac11aa6e16d5df9e6a2ea87475effc0623deb6fc73d741f1ea92b8dc00f77f5edc95b05fe9ef643478497aeb9ebf28274155c4d21b6ebec783ee SHA512 e46843a6b8a9feb294b713eb1766900dbebf7211212423c9e791f0ffa59faeb9fb0c909c4268d13d737d80818fc343d6c067b8dc3bf369515083e7f1fc3abb71
diff --git a/media-sound/umix/umix-1.0.2-r1.ebuild b/media-sound/umix/umix-1.0.2-r1.ebuild
index 14b60cbf318d..60282e8eacf0 100644
--- a/media-sound/umix/umix-1.0.2-r1.ebuild
+++ b/media-sound/umix/umix-1.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ppc sparc x86"
 IUSE="ncurses oss"
 
 DEPEND="ncurses? ( >=sys-libs/ncurses-5.2:= )"
diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
index 7366a04cdb67..2ba1c9397a24 100644
--- a/media-sound/vorbis-tools/Manifest
+++ b/media-sound/vorbis-tools/Manifest
@@ -4,5 +4,5 @@ AUX vorbis-tools-1.4.0-docdir.patch 340 BLAKE2B 147fa0212acd6a7df359d3eeb120465c
 AUX vorbis-tools-1.4.0-format-security.patch 367 BLAKE2B ed537460519c4fb7c9743afe660ae1a741d8bb7b2790823936a089c4a8667a41160d6d1b79ec6027f4bf77dbbd8110bc65d2503bcd87c51f4f1e675566ff2dc6 SHA512 319451c4317e2224cb56c791528c8ba4722a142b5c85f63fd606e3a1acadc95904cfab3bee7ad4634fa982f59a92ebeb30d8698d8f697640d6579b6a80eadd93
 AUX vorbis-tools-1.4.0-underlinking.patch 2368 BLAKE2B 8752f76eb1875932d8695d73cbd41c1127c93443436007da94108caac86ad246a8a200ea1429982caeb882c9418dce9e22d104a7122d191338b02740d81cc9fd SHA512 208347b22bc4144f796cc1cbea68dba890e0620db7f3b9005ca20d87069204e0b474f0dfaab0ea248d37e8d9efb685a70f47def41367281464561edfb5192147
 DIST vorbis-tools-1.4.0.tar.gz 1346532 BLAKE2B 37a915c522bc7ec3746d96bef3982f59aa590098425609d8d9a5cd522d15fe7ca5f0cf6cceb8eadf1a14b732f812b56206ec20c04121e20f34b9df0755d8bd18 SHA512 d2473f2e8e6726b5a5083f567797ae42bbb7fa3f26aec3f7b83e641e028c64726299f71a9d75258595a53cf29c18acb84841bcbc39509258d2c8df859e4e3b99
-EBUILD vorbis-tools-1.4.0-r5.ebuild 1199 BLAKE2B 2dcd31a3859f5a0c816d1f8b3c40cf7e0c16a067d7e7f3ef2a7fc3e35e9f8456f98d9c95e800aeddc91a79b16c0cf86b5362df881437b0bf41bc63299f0edf79 SHA512 3bc726093c1f5bc8248cb0f85b2aa7805cafaff612ef3fda58577b6d833b2959581894d9c15b2bc4d171df52117866c5fa868abfa2c54d3168ec0d69000c13b9
+EBUILD vorbis-tools-1.4.0-r5.ebuild 1200 BLAKE2B c2731970f35612a8aa2ef5974b86e9d2e923198e052f757d6fd3ef261e44abc9918f01e2740fe729a196cf97b3332dba65376a0e02ce70d3c1d750f20b3d7f83 SHA512 20468b9bb38157f9f14a60d4c1b6270f5855ee26309c591c77586f02b0d468b0208377a2186ae2101ff40ee0e21a7bd3165d04cebc0c620bb1bc0bb7957873be
 MISC metadata.xml 427 BLAKE2B 5a3d7b5384086ba3575fd479f1fb99db4aec140b6438389db4b1857ef41cc963053a57baa3d0a18b90cde721b508bb1985cebd23c20445e93e3362af1eb08aa4 SHA512 fe38791f10b0312286c49042e5c24303418ab755d5300b64b7dc406be5dfda993bbe804eae1124c2484d6a1f2e823895e174a522f8710e4b12129e856674d65c
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
index db37da7bf6dc..520fa2d5ac98 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/vorbis/${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 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="flac kate nls +ogg123 speex"
 
 RDEPEND="
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index 0fd691b0b26f..4665db1a3e14 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -6,5 +6,5 @@ AUX wavpack-5.1.0-CVE-2018-7254.patch 3004 BLAKE2B 2c744a5675a8b8c3f6b8e956ff3b6
 AUX wavpack-5.1.0-armv7.patch 805 BLAKE2B dc69a643e3dde75cce1d5a23176cb09fecc513a98835242437659b0724de8ba2cb97a59fb1cb3dc050454ff95bc2669e6b19f10fd03fadaf06e4c859c063277c SHA512 b152f8081b712c24ae8db641f4755798ab4c7412a298054449883255fa76571ffbd0c580848a274ce1c44401f69102a0b2c66137ae36d9323e9e5330ee20856e
 AUX wavpack-5.1.0-memleaks.patch 800 BLAKE2B 601e81daad4208d109bd980cbe63ce0c638577d53fe01fa133469090faed7f641d00efd44f906732905599615513b0dddf918dc9ce13f927b3e889a1dbd0d13d SHA512 ac5f8473314939c1b07019617f8881e4675bab2d4a0f61dd95c5389ec9915a8573f3291a5c29547e8e5a300483600d36f3c53f9ee7380c5f0691860cef6a3594
 DIST wavpack-5.1.0.tar.bz2 824331 BLAKE2B 736dcb3cc0bee4ebcf76b8a7df178aa1b797ec6858358bf289a3e151f62d2ce8f430d163d46a84c0b5a7501c732ac639955c867e53fd9217ca7f213b601a8697 SHA512 4c31616ae63c3a875afa20f26ce935f7a8f9921e2892b4b8388eca3ccd83b2d686f43eed8b9ec1dead934a1148401b9dced3b05f509b7942c48d7af31cf80a54
-EBUILD wavpack-5.1.0-r1.ebuild 968 BLAKE2B d811b19aa3d03c3fb460acf71ff29a51afe26acf87e4448ed07d874405a49d4d04277be2691219c27ed4f7e47da136cdc3efb500f15edead5283cab1eb6daccf SHA512 060e3f32c6c175e56bcd1ffb1d366f507dbf0612e3184ed8706a39ceb01711384833ccbcd0dc810235b3b86b6d055167c679e547020e3ab52d9aa070e7748d2f
+EBUILD wavpack-5.1.0-r1.ebuild 969 BLAKE2B edb0e32c0383fb608a28dc015e3966e0210552d7a7524b24d2422558f78024867010b129ef1d100d62c77eb8bd41c573e2cfe0299284e301d07e2ffca7086900 SHA512 ad3475ff46a19b92acfc1322545237e20dd6b531c14ff760a4c3d1d1b76d686ed048e415e43a459ead24307eec0b40e00701f526713e1bd84a4c127dc5425f57
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/wavpack/wavpack-5.1.0-r1.ebuild b/media-sound/wavpack/wavpack-5.1.0-r1.ebuild
index 39f0c3cbe6f1..1da1e5aa4271 100644
--- a/media-sound/wavpack/wavpack-5.1.0-r1.ebuild
+++ b/media-sound/wavpack/wavpack-5.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND=">=virtual/libiconv-0-r1"
 DEPEND="${RDEPEND}"
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 12c3d49da5a3..e8e0b8463699 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -3,10 +3,11 @@ AUX xmms2-0.8-rtvg.patch 1539 BLAKE2B b359db6f477f0ca6a8e528645f731ccb33ec13067f
 AUX xmms2-0.8DrO_o-waflib-fix-perl.patch 1693 BLAKE2B 6057da2c8493ea7887ea03322d16d45ca0726174e7deb1a64f76b289fdeaba02c7659944803a23d7a32a0a74de7a39de1404d5566b43dd3306004a29876af038 SHA512 0f7f86cebd0ff75ed53366776f8c93abb54adf5942f53d7424183a4bd6913b73493882d4d3caadba6a959ddf22da0a22fa53d0fc18ce5b8508eb5670482e8c92
 AUX xmms2-0.8_p20161122-be-hash.patch 1075 BLAKE2B 7c9678016751b207a5ef48c0f7963bc0a2e3e99fb461e52b5745bc5e2dde6c329bb358e58802c127aef96d5912e22a7df7a64f719286e9cf7787703765c4b18f SHA512 051e22907315bb6bda201497e1c2ef84d919fc7d39aefac187b3616c5f6c41e768cdd79cfe197fbadfdda3863f9e9c96b5f72fa07d5e1655451328cde8ba5781
 AUX xmms2-0.8_p20161122-cpp-client.patch 2326 BLAKE2B a59da287dafafe8a3a177c11673eb7de5918fc6efef2e32c707832d7ea202091493e41f907f3e2dc370cd34d990571eed1d274fddf05f715dff7462973fb802f SHA512 095f2878afe9616bc7982037c0a9b0cc610164e04d116d40fe138df0280160680c19f6bf5c2f9aed6e9d31d42ee2f310570aefae28872ee15496f886d20ee2e9
+AUX xmms2-0.8_p20161122-gcc-10.patch 222 BLAKE2B a198b2e69081253f299ff1c7f94f0a2d3572a31caf4b7ec7de20e8d9a9bc404c58a98b31f0da6560034fe09599ae2e9f03b97728f45ad2fc30061b384c9fb13d SHA512 44685777b04e46e236104a74e654162a85b5c76c9838572921cc78b4775a7c2d5127566202415bfab10bb17261e242b034dde8aaf44024b66daa55a150ed1352
 AUX xmms2-0.8_p20161122-mac-4.patch 1632 BLAKE2B 5bc5c7d499df5faee2fc6b4307af18269b784360bbbcaef33b1db4b880704f88e8dad06168e3737a43fcdb71ba722da1ffb5ba77f3f61ecf07674e1ad0988f5a SHA512 d2fe5f9a0c59205c787386e7b219c3fa9a334c30787b9a343214cc1c4dbf9f5d47f5dad9b2efd7deac1e96a227c827cc66198215a89b0e788c9d856cff51b16b
 AUX xmms2-0.8_p20161122-perl-no-local.patch 697 BLAKE2B 86ab6bb3594fd45e9a9bdbd07d85d3740ed206eea24652161c7fbbdf620c98a6b002b646aba65a3f017e263bb82d6dc7b933fb53540012c2005d65dd2e667b06 SHA512 eb5afb39409c7c199a844d9452ab829a653d2a1ce8f5d9f1361fa995e851914d5a962d25d8116947a265fabc649f8560aa1947a24cf45d954da7743954fc3cd7
 AUX xmms2-0.8_p20161122-tarball.patch 2764 BLAKE2B 1d6ea9bc40db3145460a8ef06c732114475087ea05eef65fd837d6c3bf346478579d7c6ab0bf33387d2228a319245e0e4d2562935be75a58abd04e88205d4373 SHA512 5b03d129a55ac14462a68e47ecba29c2817eb83d122a3614c624c743ecc29a7bac066644aa61d5ac74f9cb59808d1a9bac077dc360c507da722c206b948301ac
 DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb
-EBUILD xmms2-0.8_p20161122-r4.ebuild 7594 BLAKE2B 6e1893817399a44acb7b22b9212d853e437933a6c5d01ca976eba7d1befec1c969d908973cd8ea3fa040ca2e8594eb85fbe543a86e5220a9471a0c5dc2f523f3 SHA512 ff89979cb00f5c88914b1cb7fd2a960a7f8f58598973e490151942a29f980b08f0baf5312a9463743104aac63ef25aca4591e5d4b8ca8b86ff85846fa618cedf
-EBUILD xmms2-0.8_p20161122-r5.ebuild 7721 BLAKE2B 4e2a5cde7a143bc7ba5d495b2c085c105d869fc76bb07d5e9f07eb929c83a3acd4bba1b3986a37141c39859867d66b8c4125aa5bb784b27c2b33d5324a7cfd29 SHA512 d10ba3643ee6db0091dced8fc482f21bda8335ee19ec2256e1376bab8e810a3077dbd9d42c9fa1ab8d7c3b5a9e32a51b1a7e3ed8f7d05b3fb0c57293c69aaa59
+EBUILD xmms2-0.8_p20161122-r4.ebuild 7595 BLAKE2B 934c3be5d48d1333599023aa8ce0fb8cd871a5c48a4c03a8f1b49d8efb0199c793d19c0d1b01d946bc4d5f6ad8bfcb27dc846d02d733c980fe810bd774b17b82 SHA512 2db0d45b99a0090c9636dcabb0a23c40b85aba2e9e481bee6a46ae052f805fbb5e62c90f0938d5a541ea76735f7f2dca734d3c2b9db7da455266f3ad67a10db9
+EBUILD xmms2-0.8_p20161122-r5.ebuild 7816 BLAKE2B 643ab2642018795f535563cf4ea086303ad0ab71781b189e275218672cf1ee9cab4de46ff2949886870b78e868d0545dccdcb8b33a6bcc01085c0513b1be2ab3 SHA512 0b3ddec472458764b7b8fe4df551d56548652554c90fb2740d35444f449c5d7c0a23fa7c444fa3b8d7160e4e6749439fffdf8e6a603a0c7f2e4d51416c4752e2
 MISC metadata.xml 2494 BLAKE2B 47ddee51380c99b03e6a449347f68e0f38742c7310d6e128b741abb13c4ce8126cb7177854c05c7a9e22ede612be2aa0befe7fbc69b918d17366a31005ed392e SHA512 f5c30541d2f5f484ced87780f72b2ce02d8f1a5e9cdfd437a870e6a1f53f1b9f71bf266935a20dc6f1f6d2417636dfa6dfe27c947eeddca1d746ad72e0b3c8ae
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch
new file mode 100644
index 000000000000..29a8311d2197
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch
@@ -0,0 +1,11 @@
+--- a/src/lib/s4/tests/s4/t_transactions.c
++++ b/src/lib/s4/tests/s4/t_transactions.c
+@@ -19,7 +19,7 @@
+ #include <glib.h>
+ #include <glib/gstdio.h>
+ 
+-s4_t *s4;
++extern s4_t *s4;
+ s4_val_t *val;
+ 
+ SETUP (Transactions) {
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
index 55cdd371a14c..b5150186d945 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc x86"
+KEYWORDS="~alpha amd64 ~arm ppc x86"
 
 IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth ices
 jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
index 68f9fc6c4c2e..393d601eabd9 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
@@ -143,6 +143,9 @@ src_prepare() {
 	# C++ client dangling reference: https://github.com/xmms2/xmms2-devel/pull/5
 	eapply "${FILESDIR}/${P}"-cpp-client.patch
 
+	# gcc-10 stopped putting globals into common section
+	eapply "${FILESDIR}/${P}"-gcc-10.patch
+
 	eapply_user
 }
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
commit	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree	ab466b4dfa7abecb401b2f8039d08af4689306bb /media-sound
parent	d42200bec37eef2a7478d88988ff00addd0a9202 (diff)