gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /media-sound
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
127 files changed, 496 insertions, 566 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 76668bb5af0a..10f3ab2f0c54 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 f22f38b2807a..e573fbd655f8 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -2,7 +2,7 @@ AUX envy24control-config-dir.patch 593 BLAKE2B 481ffd2bf81ce1e8fb0cd8ee1d40c398c
 DIST alsa-tools-1.1.0.tar.bz2 1715113 BLAKE2B 9b64f3a78e0cff212663c716c189591cd249e58992e5b403e8948b0fa81c4b3b86cc4872f4dcb7a0fadf9cb313043201549b10f3a36d546911bba18fe9fc3602 SHA512 caabbc9a8b494de6bba0dea6440b335b35e5c7dab4942ac36f127a75c2212ff98e7e38566444666edcf40c6c95e6d9797c421014fb5c5c292bb398780e6c9f87
 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 3491 BLAKE2B 6c4c591a1025f18d1b8e7e2058fbb227f200ec5c50334ae400a9cff94d5630d05f5298faf91c2c76451b09ef9b90d1e3b1b04aad70871eb79d55a6f66b683f53 SHA512 704b16d093923c138ea05bfbeebd96be74987ea0ea076f40e2260e32765074bbde1bfe08f3b231fc6fb6b7b32a5eb2241c980f9d62294475df8e848e46393284
-EBUILD alsa-tools-1.1.6.ebuild 3551 BLAKE2B f47b5d46525d70fe5f6147be5c1c15a387c13a01248dc23587af8262d73fba73afd546e5dbf9c55a8370d457e5d0c15d75b9c62ea82e9400ad8750fe3a2fbc74 SHA512 adddcc1c52a9facee00e8e9d1db6a197f32f43b3a1ccd3aabda33a46987ba1bbea16cbbd8015fe0875e8661ef305480f0dbf2f633a32aed173d44d57466ecad1
-EBUILD alsa-tools-1.1.7.ebuild 3551 BLAKE2B 4bb9c47f6316a1c39dc4220cdc8215dac6043ccbeb206ac830bb451bcb7ff5313438603c6ca910327fddc569eeec2ef090b4bc4518d6da0866c001541ece06cd SHA512 5e53d00ff59bfc547e2e23e88e0f36517a3bfd2de3c5eae8b137eaa87c3bbf19ce0f69de9d41bbd16c8ded73980a3229ff32b8b2d1ca55adb6cf684e9f91d9a7
+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 3575 BLAKE2B 4e96ae5cb9bb09b357bd3babf8c982df2bbda2b7b08a2077ee239644c590e59a9e6baa1b19c96cf5d7ec0de331f21d8b9e3be32fa08f8dc04bf12897b7a3ed09 SHA512 340de1088c8a3e125ae1ea3cef5ce7e8ba5b1534a44d43a7c8234e1284f1d7f50473480dcea6cb39eb5df33308fb04d36812ac5c10a51df8d4f5b9d38f48e5ed
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.0.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.0.ebuild
index e2b9d265a6c6..7e1ceda4f912 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.0.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.1.0.ebuild
@@ -6,7 +6,7 @@ inherit autotools eutils flag-o-matic
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
 HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
+SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
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 64011815ec4d..c853b373050a 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild
@@ -6,7 +6,7 @@ inherit autotools flag-o-matic gnome2-utils xdg-utils
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
 HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
+SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
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 110266eb8793..4b9c01c3c787 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
@@ -6,11 +6,11 @@ inherit autotools flag-o-matic gnome2-utils xdg-utils
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
 HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
+SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="amd64 ~hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ~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 c637c4e1510b..8a3b72920db8 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -9,8 +9,8 @@ DIST alsa-utils-1.1.2.tar.bz2 1193140 BLAKE2B 8c9d3baae1530a399299379963e68c50d2
 DIST alsa-utils-1.1.6.tar.bz2 1203722 BLAKE2B e098ecbc5835c8ecd311a4df1ab51a709200b0d3666437f7f059d3842f07e1200a934b951e8e2c8ecedbe0aef4e2c766d875df577662eb21ce989807941ab6b7 SHA512 24d0ffaeeccecb3276d7d35ef51e6de6026a63fa5a1a1e4605b024f54d8097717e97ec9d33cfe50830ad17e4a89268ca24b065039b0df7f9fbe02b570617aa58
 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
-EBUILD alsa-utils-1.1.2.ebuild 2199 BLAKE2B 110899e375e20f25067db6dcc21b3302ac119dc9656c88946f0fa304084571f61ab6335536336d874dedad465dfcb0b4b1c39e3a7b0b502082dbb90ca5a32abf SHA512 e0253fbba1c48e7318d5b9ab5bceebccd303ac09e6e2687a3947788e90491a7c88952209128ece17ffeb6255330118d3a43e245513e4c1dca9254bbeed72394f
-EBUILD alsa-utils-1.1.6.ebuild 2249 BLAKE2B 9e754eb263685924e5897018242cea86a4a4b9d3fbc5aad66aa17e6df23d01d99854058e624139db257384d9cbd5c4d2722cf26dda8c0f89daffc4894e58c192 SHA512 14caac4da6c061bdf718e93465ffe09963aad438e7b83c5d82ce8b743620774d3e38aa0a8c91d9e949b35371a55d99fc6d10d0e52f209e3435b1d6d84f537dad
-EBUILD alsa-utils-1.1.8.ebuild 2322 BLAKE2B 1489975be3ec7e6f19aabbcd589cb9451cd6ef41433f8f7b1e3c4ac122cc519fb265ca7aa840cfa98ceba29fbd0ac241a6bd727ea1f69063bdd6533b60dc7416 SHA512 c1b10d7b427c14f422b372be500c031fa4c6a1c7f5c8108f5252b982833d6d659a710fd0c5328a357ba86cefc5ff00d7b2a2f0a32582b5812ac59d99afd56410
-EBUILD alsa-utils-1.1.9.ebuild 2405 BLAKE2B b72a8e6554127614a10ea82013cacd8fd74cac20bd4b1ab6e2178a55e12ad83078a9c7a80e4442eb6898b307457983574346d6c5588d989b09c67d50777439b9 SHA512 d0e158fb2740b63a7e7126fc57d3e4db2897da69e5ef8bd19b0b57e646b05816bb94404782c069da562b8eedd3564431eeb94b55ef172b35432282eca3f95310
+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 2339 BLAKE2B 8b5270cd07c10aa87e7d6d2a01c970da53903da5a7c0b126ab12f236b8b3503d8ddc114c9801e534ccc09d09f32147c57cf38ab006ce68d27f009c270ae1740e SHA512 db6a0d8e24d8e3fa8e7eb4fd16dca16939ffa8426eb938bac27b04034c44449a43f166d5f071ab9921942edecb2adacaf725d40eafd3943cf92eb0a06e6579e1
+EBUILD alsa-utils-1.1.9.ebuild 2423 BLAKE2B 27a87cd73011e680060fa04173aaff943b6b7674a0b937588c6421ae2f25bdd5ac1b37a15ec5a80a5d1ece1548275c6892e12a79564a8e3953aaa8ab596ee676 SHA512 38c1fd5cd8463d2cf4dabd3b509ff2270ad33f0c6fc3afba73560563767c8432baaf03bb315876f54ea0c2ebc6dbff23b8ae90599ac2f4cb1d8088f2d72711e2
 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 17f2f59fdab6..ff8d38adbc19 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild
@@ -6,7 +6,7 @@ inherit eutils systemd udev
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
+SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
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 a59f68701139..94c2d33c3127 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
@@ -6,7 +6,7 @@ inherit systemd udev
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
+SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
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 f25b06af8d7b..97f2e8d076c5 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
@@ -6,11 +6,11 @@ inherit systemd udev
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
+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.9.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild
index fb31c6bb07a7..280d4466e121 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild
@@ -6,7 +6,7 @@ inherit systemd udev
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
+SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 59efe48e409e..d340f815bd18 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,5 +1,5 @@
 AUX ardour-4.x-revision-naming.patch 1107 BLAKE2B 18378f1cbc3bb7871ed599dd03c963e7d808796477838b84e9a1010bf31d175edcbba62dc076a37ff3cdf20868f32fc42c2fb2a687616be27a0ecf00b97afc3e SHA512 f9c742345b4f89bc0cabc7a7fe86c4084c99f962c3b3770a0e14b259fa4ca9a3f2cdac35c3b9214816f895fd083befab16e38d2b753cbe6ab94ca7da7b251580
 DIST ardour-5.12.tar.bz2 8852834 BLAKE2B 0409d920ab0abc9e52a40cc343c5481d53292bea6e5c89c58328f95c53f7f09f30ce421f2ed0da0e3fdb4eaeeb5a25da0d07ed1d4c382b5b607f3b89324eca1b SHA512 c4b4332bddb2406924119c181622801725f4a7dd7741c1a66ddbc2236542764b786337da2f0a751f3bbe6e0389b5da765eb19b14a6a90c8f8a7fd68231e5067d
-EBUILD ardour-5.12.ebuild 3996 BLAKE2B 5f18092338e134b31a5f22f10bb025a2c6cef1ec4499d75463dc10e8b1837c9f2aada6da6fa56c572c70270d56715a2063d8f2e460ab875c636a3f3539d66d1d SHA512 e6e39cb313566b6344430c6fcb25db7c2a94429686fe8dc421f5174f9c3122e29236c9d3827bde38f922d383556a2b691ad34596b0157f5671b91e98e0f30fa5
-EBUILD ardour-9999.ebuild 3996 BLAKE2B 5f18092338e134b31a5f22f10bb025a2c6cef1ec4499d75463dc10e8b1837c9f2aada6da6fa56c572c70270d56715a2063d8f2e460ab875c636a3f3539d66d1d SHA512 e6e39cb313566b6344430c6fcb25db7c2a94429686fe8dc421f5174f9c3122e29236c9d3827bde38f922d383556a2b691ad34596b0157f5671b91e98e0f30fa5
+EBUILD ardour-5.12.ebuild 3970 BLAKE2B 80446da4371cd5bf16c543fbe04705c4b9dc256a5ad51097eaf325a3fa61e13d4a06dcbcf34e3a85e85ff81ab9db3dba51d0a873fa3ca3cfdc5314efa8b7e9d5 SHA512 c006f09a6c8100426752e10ec939fd80c8a80e131b1e04e7b7b6ac4543f3bc4efd620a29fca90c9152fa3bc7400811c1097d5103eff1a66731c42c78f89129dd
+EBUILD ardour-9999.ebuild 3970 BLAKE2B fc0e2d3093beec249597597d8318bdf5f4255b7bfcc3a49002ea662b4a8980188dfd00172feb950619efd4ccac94371c88b3aadced603bbfe1e41037efc89319 SHA512 2bfb8447939ee661667bad4f1ca6fb7c4522fd05e52e5dc5cef531cb22b65dfaf8f40a6bc69348571caaba94e35e597060e4b33e946a486bb1e56485209618aa
 MISC metadata.xml 347 BLAKE2B 055877000b928bdbc38be9fec8b34e2b5ad6b0c9533e59406bfa6ebdc81fcb2990cfebe577f920f110aa57bc8e20a26f896f4ce8e5ab949177727905656119c3 SHA512 30f231423671c8c1a0911b9591a6239431d55860679c45452b430ce974defafeaa86e8a0f5b950e6176fccb986259780f3a13fa73df0e03c4a5f7e5e60cbcb63
diff --git a/media-sound/ardour/ardour-5.12.ebuild b/media-sound/ardour/ardour-5.12.ebuild
index de386a8cd326..d671a3a3432e 100644
--- a/media-sound/ardour/ardour-5.12.ebuild
+++ b/media-sound/ardour/ardour-5.12.ebuild
@@ -15,12 +15,12 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
 LICENSE="GPL-2"
-SLOT="6"
+SLOT="5"
 IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
@@ -127,7 +127,7 @@ src_install() {
 	mv ${PN}.1 ${PN}${SLOT}.1
 	doman ${PN}${SLOT}.1
 	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
-	make_desktop_entry ardour6 ardour6 ardour6 AudioVideo
+	make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
 }
 
 pkg_postinst() {
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index de386a8cd326..302741278d66 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
diff --git a/media-sound/audiotag/Manifest b/media-sound/audiotag/Manifest
index 02728aff31df..11b48552a3c5 100644
--- a/media-sound/audiotag/Manifest
+++ b/media-sound/audiotag/Manifest
@@ -1,4 +1,3 @@
 DIST audiotag-0.19.tar.bz2 15016 BLAKE2B d650887a72242d1258fa2d60a876a6c5984369074d16e4f9028468f6520b38afad4a5cf92ba5c2a92f7f2a26b1aaf515998fa1a3fbd6d8d49d15074c68940c14 SHA512 a2e117deb78c3141ca1e17a12ee17033eb762fee822187d8aa708715ee4077b120ea2f7acf09d683d9dd292c0826e1152d09286830976b65d08738ced9a0529e
-EBUILD audiotag-0.19-r1.ebuild 728 BLAKE2B c9888c3883078cce26f16ee46b7660b3d85827a8eb70c6c7b553f8f3611224a90b91b27d18867e9eefbbe05e90355ede7ab53628a0bdf7a727921fd7b803357b SHA512 46be83ed69e6498f5ac3f547fccd0d16ef89840d40dc829d8219807f6a735f6f4289fbe84d3b4a3e84cd26efe1204756d81ceee5eaab5bd4a77c3d6e86facd74
-EBUILD audiotag-0.19.ebuild 655 BLAKE2B bee9ba262b9b9cc1ed7e85809c7784432c4d5be4ba0aa637f0d74732cf3422c4c8b2316eebd1128d6d84740787c2634cc9cd985dfc72d566cb9f5749f73a0a09 SHA512 fcf241e9e5645b49605d3172c835cf80068554c1bf6f8ba50411af19389ae746346e0aba76800ed3c8ba777068977ccfabdf08443f9f1f8ced4ee2811c533f9c
+EBUILD audiotag-0.19-r1.ebuild 724 BLAKE2B 6f0a8d44eda19a00d86184dfe5e5f3c8884f5745e8134b2258d005c2eb2e2df4bd93362e6fa37a5d8179da01e98818aef99e0e60ffd207ebfae9f69c0fe707d9 SHA512 f566ccfa3b0e772a2e6f3db8943aca55ccaa956ab192f483e350679a25bb83bc162a9da7809f936007adf5cbc768d170fd7334cba26ccbb208d0c43ee613135f
 MISC metadata.xml 335 BLAKE2B 1ef03cdff887802e47c3e25d41673ea2c25129b2c43129a72d717249da1208b4445d6d03557b2427f6aa6d7f3e34de9bcaf2c696aad214e842dfdc4782a96cb5 SHA512 6652048b2ed7c99882375c57521d9a2a75cd07a8a54ef88ba351f93212e4cfc42a5eca93572b0ef956696d0fae61a741957b146ae048f5a954b0a0954486507a
diff --git a/media-sound/audiotag/audiotag-0.19-r1.ebuild b/media-sound/audiotag/audiotag-0.19-r1.ebuild
index ec257e988dea..02c0389a093a 100644
--- a/media-sound/audiotag/audiotag-0.19-r1.ebuild
+++ b/media-sound/audiotag/audiotag-0.19-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/downloads/Daenyth/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/media-sound/audiotag/audiotag-0.19.ebuild b/media-sound/audiotag/audiotag-0.19.ebuild
deleted file mode 100644
index 0f163d9e904a..000000000000
--- a/media-sound/audiotag/audiotag-0.19.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Command-line tool for mass tagging/renaming of audio files"
-HOMEPAGE="https://github.com/Daenyth/audiotag"
-SRC_URI="https://github.com/downloads/Daenyth/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 sparc x86"
-IUSE="aac flac mp3 vorbis"
-
-RDEPEND="dev-lang/perl
-	flac? ( media-libs/flac )
-	vorbis? ( media-sound/vorbis-tools )
-	mp3? ( media-libs/id3lib )
-	aac? ( || ( media-video/atomicparsley media-video/atomicparsley-wez ) )"
-DEPEND=""
-
-src_install() {
-	dobin ${PN} || die
-	dodoc ChangeLog README
-}
diff --git a/media-sound/cdcd/Manifest b/media-sound/cdcd/Manifest
index 8968bd0e583a..e195a0813410 100644
--- a/media-sound/cdcd/Manifest
+++ b/media-sound/cdcd/Manifest
@@ -1,5 +1,5 @@
 AUX cdcd-0.6.6-acinclude.m4 17866 BLAKE2B d7bbcd33769cf44324b7f29580b9967b6f0a2ff16ecac9a6eaaa1946d82912116a75f80c31fe071fc7a2e179bf6d276216de8f24ea735ed1ded19eccaec9ceba SHA512 c2011160ac6db7b73c495fd35f5bdd5284026a7d615a0706185cb0547b5f0ddd5107fee7e99e5026e7481b39f8440518e5ca8762580332b246a3410e960d4de3
 AUX cdcd-0.6.6-configure.patch 2032 BLAKE2B 4f18da07a483da2a197888f28813a347a8b003d30855d8aeec4506027897b22f22f6ec97eab01d33fb5f9791d35e6d2e7fceff2ea9981fda6ad56ad5c383b805 SHA512 2029f39b924473a33417fe4bf24419be010e1bd508e2544fc612b7db2aceedb4575534b69030d25e471118be6df4272121ddaa6e29b2ac93eda3dadb8189ecba
 DIST cdcd-0.6.6.tar.gz 246286 BLAKE2B 7f2f4ecbc0d50c441dc3933f222d5bda74246b1fd2e7716564adfb73fb373665bc175b2a501c67b6af6e01c881785f1736843845917d8c1c8e19b9929f457284 SHA512 841f2d7f85c81a8cc9e88bc13515959a911e22fe9cff7fd272bab63fccb3e6bbf44e9d66fc2524f1670da20568d6e10434de8143a5e94fc576c7193b4a68f418
-EBUILD cdcd-0.6.6-r2.ebuild 647 BLAKE2B bcfd5df2d800de6e6b5431d92fea4e47ed9fc2c203c55cd61487ad068cf44613cf85d78171f24ed19a6a10e7f0982b3ec4ed93c095137c3a183dad3fadcbe9e2 SHA512 32488d51ace3ba3fe71b82110a1401be942ea378a235c6cfad1c33bb3f26d358938c691fcfe7da0fbbef882b599b0561420fc58615e07c88f1d8bf7f303d1a09
+EBUILD cdcd-0.6.6-r2.ebuild 637 BLAKE2B f40154d0d30e35c7d6fa5a1260bed86039197d7ec30ec1e8a50f91292e8286d9977798e002c3f6a2daa59fe025db7ae78debbff2529c9d0f9ed97110db8f3635 SHA512 99813a966aeaa4793070de78a4cebb10c4ad98e4f0710ec99298ff446489cc4d7af9ff174f0ad3a32d84d7ec9597c00413de030a5b30bbb519dfd056174fd3c0
 MISC metadata.xml 333 BLAKE2B f6d68462d464a5a381a3a09aa96646ecc510b0e0ddf855588b94ca2662caa4bf17112d57741d5e4b013b43ea621d856bc000c62477cc9c3273f23a6ffe2de7e8 SHA512 5ac86238b0db4069b133127f007fec468f87847cb219dc0c5dab8df5544a5e515057b4c44f44dfa843b5b81a62141a21352dec9e9a0fec98c300e9e9509cd034
diff --git a/media-sound/cdcd/cdcd-0.6.6-r2.ebuild b/media-sound/cdcd/cdcd-0.6.6-r2.ebuild
index a101ff69a31c..6f47ecb006f0 100644
--- a/media-sound/cdcd/cdcd-0.6.6-r2.ebuild
+++ b/media-sound/cdcd/cdcd-0.6.6-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/libcdaudio/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ~ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=sys-libs/readline-4.2
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 2980d9cbb009..ae9128e9ec65 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,7 +1,9 @@
 AUX clementine-1.3.1_p20190609-fix-restore-from-systray.patch 1235 BLAKE2B 9904a6df024998d4268ca952fc2c17cebec01873b93aa141ac6db193e1a69481d4f7f5f02cf9fec6174eb390fce66b443ef86de8b2379c6c9192c6d5eed5edd8 SHA512 86be2b64b38347d5f0bd086dd35970d6f2c1fcffe315a116d68251193e91a05a0fe02f029d558290d4ebc09175067f0f2bb4e59bb58984150d52d219a8c9503e
 DIST clementine-1.3.1_p20190127.tar.gz 8516435 BLAKE2B ce884c25d76e26349cf11109f885361dd79c4d567b08927962a611a2bb17dbe6674ac176f6b09b3a8ebe14e82f30125a56ffd08ff6d2072a96ee7b9ba1f066db SHA512 b82d2dc49dbe41e68440fb421cda6989f670a2a43829bf42e21f3c07d6f6badcb217333559d6dd9c66accd88e2473e5c717969e987410bf4801669dccba7cd15
 DIST clementine-1.3.1_p20190609.tar.gz 8516585 BLAKE2B a02e473703da5cfa3a7fb702f3ff90f3aa0fd97faf8b10b2c080b4a9a052f514f67fe40dcd0fd435c1681bd8749b0f4d731b21e4b842979e9dbe516cf7a19e76 SHA512 d72d29a01920bfe74d1a51b419cdbb5bd096cfd816edec4e7325bf43cc5b75a893c273b131539ae362f2a804cbb4ca57002737e4833ef6e5c1adc1b7f142dd57
-EBUILD clementine-1.3.1_p20190127.ebuild 5043 BLAKE2B 4d6c2113a990744bb310f7d2ef0c20e24554fc64a5df1546a11cad449a689f5aa2515508dd30cf77b9294eb2b880980f24a5e3b22dd8ca6521c752939eafabb2 SHA512 ca57e01f9fbce22460f1d52a01fbc641afbe2a6981f04544e21fd4a35fc8a16c36313b86637e5bd7ce1b0aa87eeb32178acd92266c47f8c50666a0f4f93e1143
-EBUILD clementine-1.3.1_p20190609.ebuild 5108 BLAKE2B 062c21a837d595d1a45a82306330c39a35137acf0d703ea107ebe9b2dd1cc3abbf41cbb28dd8e68f7eb4d85506102be585bdf3f9339621c89133bc3e99f6a51b SHA512 06fbd7be87b7e7266141a505606d6f54e103ee9554094d46023e5fea168390ed4dab18402c128eb33454dd0aee637b6497647fabd0d7adc6e6bdef8835268f0d
-EBUILD clementine-9999.ebuild 4974 BLAKE2B e25668017fc68c1443848e9677e44672109522bf4e1a6ca806dffbb262f063b430eb31af17c36e349b872f32d7a1b05b5989f457dcaced6cc913ac61121c64d7 SHA512 e3e1d1e24f2290281644313c5c29a531b53d80c5f22c09e87e8f3f5119bb56540844020fce471bbd4070bbb55f08229c35c2b0b0e7d736b0b49c6b12cf34a1c7
+DIST clementine-1.3.1_p20191004.tar.gz 8528437 BLAKE2B 11c7bd7ac4ad4cdc75e2c5e54651832c1aa31448341230917df973227fcb1cd659309bb361f0b62a12dc38ce48e1f25697742df478650f4c10996938a7093acf SHA512 eb755d47f2e518c4e1bb28596e6554184d9fb6bab594e2f16b73c0bdecaa7c19692d368e9ec6a91e5012b786368eb7d3b2d051db11f3b5934233ba3e5b488679
+EBUILD clementine-1.3.1_p20190127.ebuild 5045 BLAKE2B 1a5413ccdf502d0c56cf09c4067161b128e5f8a2fe960e9c3b0dc2b7ed05e13b59fac2a866c11d5d53a715a4d3557b8ce84050e94c5974a9aa357a3dededae1b SHA512 88d87ecba083252f52a4aac810680ea088c49b70216dbe1d9a51f1a7b7d8912c35e8dbcee3879a8475f53fb8db3a5f95449d22b2f185cd179a077b57f6804b92
+EBUILD clementine-1.3.1_p20190609.ebuild 5110 BLAKE2B 2ace372f4b6ba4969d075e8954f0a5bfa5ea78037cb1dfb129b1a4d726990df4a862925a3b901da2ef1d5de088a20d720e4b3a59d5b66778e2bb4a860850daa5 SHA512 3689915216cebe991bd0d5ae9596ea0844f0583ec39f287f9487bd859e6e95d4dcc8c075efc94a69af52df3fbf4af222b2d430e7dedc002b92c0f38b067bf810
+EBUILD clementine-1.3.1_p20191004.ebuild 4615 BLAKE2B 310536c020206dc6754799dc80261ebe2fbb18304923fb61a241484f0bd019c4310e2d3fead5eabd07e89369d3aab54eb87fbc6d365e1000730a47afe453074b SHA512 edca69e331d5547b8e274b5151713ad45bb171bddbe9f3558142be4e6d8da05525297688a0b8f5c1ae2283c9bd364b0297154c5483c323886da694b3d5198965
+EBUILD clementine-9999.ebuild 4544 BLAKE2B 0f73b23c5478fa964180ff29e7e7b0a22b340088074a32bcf152e54206c39736923d6dfb43443d7d3d9e2a9e7c8f924af6d1aaa2938d74b1c1603cf92ecd7d38 SHA512 441b2d6b3e08ad6218fef936fbb1c37103b10ec4367e1d53aba8537d72dd48ea51d040cda1053b970b1224ffa5b1d6ea7f2f63933188fc248729d06b11ec356f
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-1.3.1_p20190127.ebuild b/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
index 64add8ac854a..9aa4ffa1983b 100644
--- a/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
@@ -68,7 +68,7 @@ COMMON_DEPEND="
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	projectm? (
 		media-libs/glew:=
-		>=media-libs/libprojectm-1.2.0
+		>=media-libs/libprojectm-1.2.0:=
 		virtual/opengl
 	)
 "
diff --git a/media-sound/clementine/clementine-1.3.1_p20190609.ebuild b/media-sound/clementine/clementine-1.3.1_p20190609.ebuild
index a4d5f63d5bb0..c1abcfd676e4 100644
--- a/media-sound/clementine/clementine-1.3.1_p20190609.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20190609.ebuild
@@ -69,7 +69,7 @@ COMMON_DEPEND="
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	projectm? (
 		media-libs/glew:=
-		>=media-libs/libprojectm-1.2.0
+		>=media-libs/libprojectm-1.2.0:=
 		virtual/opengl
 	)
 "
diff --git a/media-sound/clementine/clementine-1.3.1_p20191004.ebuild b/media-sound/clementine/clementine-1.3.1_p20191004.ebuild
new file mode 100644
index 000000000000..f2d1766fb153
--- /dev/null
+++ b/media-sound/clementine/clementine-1.3.1_p20191004.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
+
+MY_P="${P/_}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_BRANCH="qt5"
+	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
+	inherit git-r3
+else
+	COMMIT=664c5a31f9cf519af5a4c3adcb30dbbc73d037d6
+	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN^}-${COMMIT}"
+fi
+inherit cmake-utils flag-o-matic l10n virtualx xdg
+
+DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
+HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+	wiimote? ( dbus )
+"
+
+BDEPEND="
+	>=dev-cpp/gtest-1.8.0
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		dev-qt/qttest:5
+		gnome-base/gsettings-desktop-schemas
+	)
+"
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+)]
+	dev-db/sqlite:=
+	dev-libs/crypto++:=[asm]
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/protobuf:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	media-libs/chromaprint:=
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+	>=media-libs/taglib-1.11.1_p20181028
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio:= )
+	dbus? ( dev-qt/qtdbus:5 )
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
+	moodbar? ( sci-libs/fftw:3.0 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	projectm? (
+		media-libs/glew:=
+		>=media-libs/libprojectm-1.2.0:=
+		virtual/opengl
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	mms? ( media-plugins/gst-plugins-libmms:1.0 )
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	dev-qt/qtopengl:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	box? ( dev-cpp/sparsehash )
+	dropbox? ( dev-cpp/sparsehash )
+	googledrive? ( dev-cpp/sparsehash )
+	pulseaudio? ( media-sound/pulseaudio )
+	seafile? ( dev-cpp/sparsehash )
+	skydrive? ( dev-cpp/sparsehash )
+"
+
+RESTRICT="test"
+
+DOCS=( Changelog README.md )
+
+src_prepare() {
+	l10n_find_plocales_changes "src/translations" "" ".po"
+
+	cmake-utils_src_prepare
+	# some tests fail or hang
+	sed -i \
+		-e '/add_test_file(translations_test.cpp/d' \
+		tests/CMakeLists.txt || die
+
+	if ! use test; then
+		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
+		cmake_comment_add_subdirectory tests
+	fi
+
+	rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# force to find crypto++ see bug #548544
+		-DCRYPTOPP_LIBRARIES="cryptopp"
+		-DCRYPTOPP_FOUND=ON
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
+		-DENABLE_DEVICEKIT=OFF
+		-DENABLE_GIO=ON
+		-DENABLE_SPOTIFY_BLOB=OFF
+		-DUSE_SYSTEM_GMOCK=ON
+		-DUSE_SYSTEM_PROJECTM=ON
+		-DBUNDLE_PROJECTM_PRESETS=OFF
+		-DLINGUAS="$(l10n_get_locales)"
+		-DENABLE_BOX="$(usex box)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
+		-DENABLE_DROPBOX="$(usex dropbox)"
+		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBLASTFM="$(usex lastfm)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_VISUALISATIONS="$(usex projectm)"
+		-DENABLE_SEAFILE="$(usex seafile)"
+		-DENABLE_SKYDRIVE="$(usex skydrive)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}" || die
+	virtx emake test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+	elog "depending on your preferences"
+}
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 95744f36b833..3f87ebadac97 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -68,16 +68,10 @@ COMMON_DEPEND="
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	projectm? (
 		media-libs/glew:=
-		>=media-libs/libprojectm-1.2.0
+		>=media-libs/libprojectm-1.2.0:=
 		virtual/opengl
 	)
 "
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# Still possibly essential but not applied yet patches are:
-# 06-fix-numeric-locale.patch
-# 08-stdlib.h-for-rand.patch
 RDEPEND="${COMMON_DEPEND}
 	media-plugins/gst-plugins-meta:1.0
 	media-plugins/gst-plugins-soup:1.0
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index 57263380095c..6719fdbb4346 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -2,6 +2,6 @@ AUX cmus-2.8.0-elogind.patch 581 BLAKE2B 109426191591ce4df2b512d74d4e16d7e96d78e
 AUX cmus-2.8.0-ffmpeg-deprecations.patch 3913 BLAKE2B 71065d6db1682955e96aa70bfd46f63175dab467743f3977a4a3b5ee90c4f595ed935ab341b6a80d0da5febf093e948dd143c36c6c4513b8f97d2abbe759daa4 SHA512 b76aa27fefe0b7c0e0d18c7aaacd19183619376c8609b777cef6b30892045aa052d9a829f7d511799998907fbabe10272a02215490025f4d1d376e18f219adc4
 AUX cmus-2.8.0-opus.patch 774 BLAKE2B 3ac353e658ec4bd87e7cf6156d76760fb84ca03b78126403ccc577c169001f468d763341da5df8a63cff2a94f3e732b4ed94384bc94da414c229793c89595497 SHA512 a1f22b620232700a30249a61ee13559bea75cf82cdac9c29ee5ccafb45c689e4c0d487523d613e37cf9c3e8764c9a4170c612721fbf1a56b04ddac63ddfe6801
 DIST cmus-2.8.0.tar.gz 317243 BLAKE2B b24c3dd74797ef26b42c2c303191dd751af7bb3b5c4c6f05bfef393eda9a35371eba4658321d473f9af210321132cfba5eab4037d257dd71c38ea3e24f78067f SHA512 cf359dfcefa833a5b10a2d16ac405672bea762b62b7177c115560127035682fba65c15b9a8710179a343d1f99212a0260b5c095542982202e2cd1bef5b0c17fc
-EBUILD cmus-2.8.0.ebuild 3825 BLAKE2B 3b98e95a5566f054dd8a6a26e19e8644ca830253a9f476e4669ae1332af62fef8b67f1efbca4ac709a91b51759ce5ef40b3b38837cb6229f569439d59d9ca8b9 SHA512 d8e29529e859028819dc0f9793beade036dd35498663f10cb7e7f5035b3074e1925ba97b9958da293043a42386d919992acd23bb1cc26218a64505cfa15d028a
-EBUILD cmus-9999.ebuild 3705 BLAKE2B 2452b59c056ad050a8e3015d10d157a0492ddb7ba1620883c83b36129f40dbc4d8838652f88b7122a4b9c6e281175f90be6b63c7942bebc840bd3eb2073eaa55 SHA512 03ded6c4b2fc7b4e1a201e98191d38311be5d2c56d17f9ed8b58af72c251eafe7180f0a5fda5baddbb104790d94e45716abd176ac2d4a4a999633edf7a08bde0
+EBUILD cmus-2.8.0.ebuild 3815 BLAKE2B 37cd0d5f1a15e6a33d1f6d968593ef25fcbe85516bbb7c8409257b65ef51d18a4a9d3e753f5e48bada15803dc9a802132f70b6e3c2afc4c7a6dbe9b34ce14296 SHA512 956ba9f8bde61420dfc444af9206f345ed535d2a6dc2bb8d5d1a3109fc29fd5be845c4f3361ce637b0d128c25fafe5ffd3a992fbf02dd3fa52ebfd55ef0ccb55
+EBUILD cmus-9999.ebuild 3695 BLAKE2B ff63e104338789551fa0ebc6b03673561332cc645499447c2fb11a4db4c0c25c515a541cd845a6c1d76502f8c3c0f7ef6cba4129f7f4158463aa46f7b5df6757 SHA512 5e1e14bee56ef47c960c29957d9ab00ef245541dc62acac2bf20096caa6132061b770a65bf9e72c66250c6990c60f8529f0c9036668a2de18ad9e05bf1ebdf62
 MISC metadata.xml 935 BLAKE2B 6623b356fec8c0bb8ea7b30ff8b767ba108afdd0f02e4881b2afd7229b4b912f781ec89daf1078a057d6f10638e361889ecb9535b3cd81822a6a88c17972ae58 SHA512 f17d07ee3d1bb7e7a813c12d994005c6603f2c381680d4b79c07504556d7de4a84f3720916f39325eacf846000af39500259e4d2446ca6b302d61c59a1535710
diff --git a/media-sound/cmus/cmus-2.8.0.ebuild b/media-sound/cmus/cmus-2.8.0.ebuild
index 6e315c52c064..83c05f7dc5eb 100644
--- a/media-sound/cmus/cmus-2.8.0.ebuild
+++ b/media-sound/cmus/cmus-2.8.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+	KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 fi
 
 DESCRIPTION="Ncurses based music player with plugin support for many formats"
diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild
index 0b1b04b727cc..6ae109af57a9 100644
--- a/media-sound/cmus/cmus-9999.ebuild
+++ b/media-sound/cmus/cmus-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 fi
 
 DESCRIPTION="Ncurses based music player with plugin support for many formats"
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 58d2edf4424d..758a1127dd8b 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,7 +1,9 @@
 DIST fluidsynth-1.1.11.tar.gz 634566 BLAKE2B ed135533c9e3e807794e0eca8117d430aa299b8772b2b6c85f6233e7e497d69f43381d9c7cf2de5ce8638f5dc616339bd28cecc3cdc23408bf5883a0b14fee79 SHA512 ad7c634426b29e5a05d67addf32d43a9ccb11a1fe3cfc09ad617416b9df3dc99a48191377f5027232521380737dde2d9b59833516d1bffb90f410bab3bbe140c
 DIST fluidsynth-2.0.4.tar.gz 1378042 BLAKE2B 0fc75ea68169c47d64bdf727b8d78e311b36cb04509832f449a52d05e085908bd1ef837dd4c5e23edc25286b8ff3fdf69a9d042520c8eb2a3234fb929bed8de5 SHA512 d58ddc5f4da9bb5954a82749617548ef32edd25f6ca5c6d5c2b06d23090784ec175d2422553a66776f543c6b253f037a6cf1e717a853344ffb899fa53752eec0
 DIST fluidsynth-2.0.6.tar.gz 1315138 BLAKE2B ce6d1717d56d61b83bef6c30254c584ddb9ee3e74fa49422881c96c969068ebe7965de507547e8bfa025da4376f52499413ff66b56607aac107576754980a0de SHA512 c160e3d7c6ad62d5cc014642eb18a0f65eb90b5ad91db4049e1b45446034e989a4f9e5b805270967d4eaf47a6e2da0e81bdb5ae95500cc80d7021e8e61cd7107
-EBUILD fluidsynth-1.1.11.ebuild 2193 BLAKE2B 4d66cef4db9220271baa5dbf8d1577e80b78fb568490cd52d2ce6bf58b3656a983be6c444a6b798b7563273c54f27a7e4dd937f1e692389fc768edc524a719cb SHA512 4f3925eb3aaf0ecf92f9ffc3435331c3f81588a46632de368d17eee9a4bd37f282772c962956882e46879526e4b79e3b7a38ee9cc0ce9302e32e96e16bf80431
-EBUILD fluidsynth-2.0.4.ebuild 1970 BLAKE2B 6f9833e43b733a366eb3e7f3b32defa96378e2a88635d43ef6b2df2f9528d9a3914ef8b232db9e17f65134e5dc79e1d6e6159a6b068e1f98fc64f170a6a43759 SHA512 6c48d02f66896260659c9d139501cb181fb468d3f4b7e4f43ffa45e3035d61194362c70db099a96b3f7713fdc415a78b92b1f2c25d8c951be18a7f790c99ecf9
-EBUILD fluidsynth-2.0.6.ebuild 2554 BLAKE2B 64d09be869880b78e7d9edaf6daadd784975ba4f77e2db30af834305a18c4db18eda6323e181692b3318a2a4dd74eacfa1eabbd8677fad5a029a286f66d02e64 SHA512 a536bc87c0826739c05df317eb23adb795684c7700e929d0eb9bb1a36d4b29dc3452f4717dab547ac8b6953a5e8a3ea0a224789c905d82100188461eb23b3df1
+DIST fluidsynth-2.0.7.tar.gz 1315250 BLAKE2B 13186522b3eea6bdd9f4893fabe9d06e67061647c83cb9479630333b0bbc5878682d5d19d9050403875ac49f66f756947d48928e3367efef537408e86c4c4a00 SHA512 c939c77277767541b90ae8bc24687cd9cd11b375264e6b5017658f5fd9c5637a3ce09bc4ad837a349e4a63883fe5ecbe80e65dd91d2cbf71072bcbcfc068614e
+EBUILD fluidsynth-1.1.11.ebuild 2183 BLAKE2B ea383b393777556778f5a59e54e2c203ad8e0e201c46f3ed02bdf2c9182b00c6e81258af43b712f67f2b9ce50772bf86b6c208bcedac65bdddd3b8ef98bcaf98 SHA512 c721d50a425d74dcf74e19c8e4b1aa369dfb6e49f0772cf8461c7f8d19eaaa49c5182cc749d3de36276e7e802f8d5f0db000584962195fb9ecd354658c2535da
+EBUILD fluidsynth-2.0.4.ebuild 1960 BLAKE2B 3c837ac65f448c3706e9e12e34c39c6bace524b33e521e36a2d8c86c34a57e6d6361ec4fec27c585418b91e399ba502cf076e6f45442673db9b793f11b47bc6f SHA512 6d092fedb5994a354d0002412775d3ef5729394692ee944248d2e89e0bc15d76dd17259b7391bece108a11cd956808573c3d68a44dd0529b555cca6ff4269a44
+EBUILD fluidsynth-2.0.6.ebuild 2544 BLAKE2B a8a92dbf91b00ff77143de85d8c4062556d3a37964eece7dc6f0c4eb4ab6e9304fd2782086654a4757069907e4f0576996c1c3b4493b504d4cfc2b9b0f12b148 SHA512 9b94f048581866cc82522c5dd7798c37e10b777b79419f937130179e63e7e95c2b2d692dcb83fd09e75b2dd0bb0aa581090cdb65c553fd1d1a4677b50a377c28
+EBUILD fluidsynth-2.0.7.ebuild 2544 BLAKE2B a8a92dbf91b00ff77143de85d8c4062556d3a37964eece7dc6f0c4eb4ab6e9304fd2782086654a4757069907e4f0576996c1c3b4493b504d4cfc2b9b0f12b148 SHA512 9b94f048581866cc82522c5dd7798c37e10b777b79419f937130179e63e7e95c2b2d692dcb83fd09e75b2dd0bb0aa581090cdb65c553fd1d1a4677b50a377c28
 MISC metadata.xml 339 BLAKE2B 4bc7678ba8ccc3e97a79dda9294b31ffc1950212619ace448def22e50852b20e3b716368d9c5b7127aff381aab85d7fa104404fcd409144452855a4b5d41b529 SHA512 abac43fa8ab39fe41adf6c34a4f0e3aa605dbe834555b2eac4abcaadb6556cc08555197aadc43e51733cf8d4e30c7f7be3efb724536d54604069055836a36980
diff --git a/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild b/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild
index 038896c834e4..04d9ec34ac1a 100644
--- a/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/FluidSynth/fluidsynth/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash portaudio pulseaudio readline sndfile"
 
 RDEPEND="
diff --git a/media-sound/fluidsynth/fluidsynth-2.0.4.ebuild b/media-sound/fluidsynth/fluidsynth-2.0.4.ebuild
index e2c18dbfea28..3cca69735a46 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 ~x86-fbsd"
+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/fluidsynth/fluidsynth-2.0.6.ebuild b/media-sound/fluidsynth/fluidsynth-2.0.6.ebuild
index 1fafcdd0ad95..a7d802e7d595 100644
--- a/media-sound/fluidsynth/fluidsynth-2.0.6.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.0.6.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 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash oss portaudio pulseaudio +readline +sndfile systemd"
 
 BDEPEND="
diff --git a/media-sound/fluidsynth/fluidsynth-2.0.7.ebuild b/media-sound/fluidsynth/fluidsynth-2.0.7.ebuild
new file mode 100644
index 000000000000..a7d802e7d595
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-2.0.7.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib systemd
+
+DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
+HOMEPAGE="http://www.fluidsynth.org/"
+SRC_URI="https://github.com/FluidSynth/fluidsynth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa dbus debug examples ipv6 jack ladspa lash oss portaudio pulseaudio +readline +sndfile systemd"
+
+BDEPEND="
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	alsa? (
+		media-libs/alsa-lib[${MULTILIB_USEDEP}]
+		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	ladspa? (
+		media-libs/ladspa-cmt[${MULTILIB_USEDEP}]
+		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
+	)
+	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS NEWS README.md THANKS TODO doc/{fluidsynth-v20-devdoc,xtrafluid}.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-Denable-alsa=$(usex alsa)
+		-Denable-dbus=$(usex dbus)
+		-Denable-debug=$(usex debug)
+		-Denable-ipv6=$(usex ipv6)
+		-Denable-jack=$(usex jack)
+		-Denable-ladspa=$(usex ladspa)
+		-Denable-oss=$(usex oss)
+		-Denable-libsndfile=$(usex sndfile)
+		-Denable-portaudio=$(usex portaudio)
+		-Denable-pulseaudio=$(usex pulseaudio)
+		-Denable-readline=$(usex readline)
+		-Denable-systemd=$(usex systemd)
+	)
+
+	if use alsa; then
+		mycmakeargs+=( -Denable-lash=$(usex lash) )
+	else
+		mycmakeargs+=( -Denable-lash=OFF )
+	fi
+
+	if use systemd; then
+		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
+	fi
+
+	cmake-multilib_src_configure
+}
+
+install_systemd_files() {
+	if multilib_is_native_abi; then
+		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
+		insinto /etc
+		doins "${BUILD_DIR}/fluidsynth.conf"
+	fi
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	docinto pdf
+	dodoc doc/*.pdf
+
+	if use examples; then
+		docinto examples
+		dodoc doc/*.c
+	fi
+
+	if use systemd; then
+		multilib_foreach_abi install_systemd_files
+
+		elog "When using fluidsynth as a systemd service, make sure"
+		elog "to configure your fluidsynth settings globally in "
+		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
+	fi
+}
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 5c2a18664eb1..07fb85df56c8 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-music-3.30.2.tar.xz 3027580 BLAKE2B 9cd5a10fecbf7fb962455bec7ee5392a305f3bab9ebb3e2f0d24066ffd6975377c57a722e850ee340e2990f61b06456f1fe963b80d57030416af7ea3b7f92b32 SHA512 b9fa33ccb76d747e22e1144b2c77dc88432386fdfd4f52720cb1ae3230c06fb899fec654dc1e126103e393eb0358a4385099743abe26505b9b7dcffe2d04a8c8
-EBUILD gnome-music-3.30.2.ebuild 1937 BLAKE2B 318b6ad95b725e1a88d25f7ee310f69d2daa0ed3e7df19f633bea2682005f0f9bf779aa50e9c083be718ce4d0f1836cdaa0f48ed3cba433aca98cd9d4dd0387e SHA512 3dd49d5f04478be68708e628ddd6e584c3fc57c4d52dd7d76f2207685c282b85b204e8b14f62ffe642d3a3ed7dd5746b330b354ef6c9dba0bb95b8016dcf45c7
+DIST gnome-music-3.32.2.tar.xz 1391112 BLAKE2B ec64d48bcc137c69df77d9d9fadb3fa5c1809850e7a434d501cf6fd680500e57a4e6946ab591db9b715e728f0274f37b659afce53fd9213b3cf74f329f4373f3 SHA512 633748dcb5cf839f29059fd9bdd5283c455a4157d6c004168d9ef80352b83be3db547377034d0d78af0b6a84fec6fb941888bd53aa14c8bf51da880f04170a23
+EBUILD gnome-music-3.30.2.ebuild 1875 BLAKE2B f3152d6664dc5f7b9166d86d3adf88be1eb5d87454a50729451eb0a55fb4951057202f086549b6a7cdaaf439a7751f7dc16dc3f67918bae2cd53fa79d05a7a58 SHA512 00716b316ea3af6cd4928a2a9d659bae0d2a94b44807eca9cc1b6470b9334fd029000a03569e9fd16cdc3671156b342da0c1eeba02fa1bb078186c10eac669a0
+EBUILD gnome-music-3.32.2.ebuild 1971 BLAKE2B 1720f095eb449238fe1096f256e76e835cb8876fcd633bb1d72983c9c643760c89fbcbb5f1bb37aa991f25cfd23bf0f3d71d7a6363258247e925996471537161 SHA512 e076ef2aebb06ea4075852943a72e88daeb4c39c8bca9e5257333ea14900b0ef6023801b3f7d995e513281b1cc2e7ef357aa179c1ff75074beb89daa40622f0a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.30.2.ebuild b/media-sound/gnome-music/gnome-music-3.30.2.ebuild
index c6dba4f8ad4d..04d88e333422 100644
--- a/media-sound/gnome-music/gnome-music-3.30.2.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.30.2.ebuild
@@ -16,12 +16,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 KEYWORDS="amd64 ~arm64 x86"
 
-# At 3.30.2 libdazzle only used from .ui file, thus introspection not needed
 COMMON_DEPEND="${PYTHON_DEPS}
 	net-libs/gnome-online-accounts[introspection]
 	>=dev-libs/gobject-introspection-1.54:=
 	>=x11-libs/gtk+-3.19.3:3[introspection]
-	>=dev-libs/libdazzle-3.28.0
+	>=dev-libs/libdazzle-3.28.0[introspection]
 	>=media-libs/libmediaart-1.9.1:2.0[introspection]
 	net-libs/libsoup:2.4[introspection]
 	>=app-misc/tracker-1.99.1:=[introspection(+)]
diff --git a/media-sound/gnome-music/gnome-music-3.32.2.ebuild b/media-sound/gnome-music/gnome-music-3.32.2.ebuild
new file mode 100644
index 000000000000..49e7450a357e
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-3.32.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Music"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="${PYTHON_DEPS}
+	net-libs/gnome-online-accounts[introspection]
+	>=dev-libs/gobject-introspection-1.54:=
+	>=x11-libs/gtk+-3.23.1:3[introspection]
+	>=dev-libs/libdazzle-3.28.0[introspection]
+	>=media-libs/libmediaart-1.9.1:2.0[introspection]
+	net-libs/libsoup:2.4[introspection]
+	>=app-misc/tracker-1.99.1:=[introspection(+)]
+	>=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_USEDEP}]
+	>=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
+	>=media-libs/grilo-0.3.4:0.3[introspection]
+	>=media-plugins/grilo-plugins-0.3.8:0.3
+"
+# xdg-user-dirs-update needs to be there to create needed dirs
+# https://bugzilla.gnome.org/show_bug.cgi?id=731613
+RDEPEND="${DEPEND}
+	|| (
+		>=app-misc/tracker-miners-1.99.1[gstreamer]
+		>=app-misc/tracker-miners-1.99.1[ffmpeg]
+	)
+	x11-libs/libnotify[introspection]
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/grilo-plugins:0.3[tracker]
+	x11-misc/xdg-user-dirs
+"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
+	xdg_src_prepare
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"/usr/bin/gnome-music
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/gnump3d/Manifest b/media-sound/gnump3d/Manifest
index 3555a9f2746c..37f8254af0ef 100644
--- a/media-sound/gnump3d/Manifest
+++ b/media-sound/gnump3d/Manifest
@@ -1,6 +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-r1.ebuild 1944 BLAKE2B 37852399e039928c33914d38a32057852990446148d99aff057b63275d0c129f70b03ea1555ad589fc6c566a33bafed0170332e7a77497428dfa9464038bce54 SHA512 a147f18cb82b05535fcb3c10ab2295334d9931a5eab69fe5d8377807469cc3cf5b5de5b843355736ec32ddc3050d5142150f8471270d5a4ea194c99085261137
 EBUILD gnump3d-3.0-r2.ebuild 1997 BLAKE2B a44f01ce47de98ce1a17fdeb4cfc82a4a6bf7bcdbcb09d67c45ccdba40483d5f8a475308f4bc329e2da9b89f5ae312ca82ccf30504335a0a397011d7721aa925 SHA512 72326d3790db09ddf6590b8167218d12da18de668307256908d9d6795e52816ae92b4a0c3dde4a1a3d3145403899706d27d3406aa0a48122c3cacd9c0320a411
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gnump3d/gnump3d-3.0-r1.ebuild b/media-sound/gnump3d/gnump3d-3.0-r1.ebuild
deleted file mode 100644
index a0ceec638862..000000000000
--- a/media-sound/gnump3d/gnump3d-3.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib user
-
-DESCRIPTION="A streaming server for MP3, OGG vorbis and other streamable files"
-HOMEPAGE="https://www.gnu.org/software/gnump3d/"
-SRC_URI="https://savannah.gnu.org/download/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~ppc ppc64 sparc x86"
-IUSE="sox"
-
-RDEPEND="dev-lang/perl
-	sox? ( media-sound/sox )"
-DEPEND="dev-lang/perl
-	sys-apps/sed"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewuser gnump3d '' '' '' nogroup
-	LIBDIR=/usr/$(get_libdir)
-}
-
-src_compile() { :; }
-
-src_install() {
-	PERLDIR="`perl bin/getlibdir`"
-
-	insinto ${PERLDIR}/gnump3d
-	doins lib/gnump3d/*.pm
-	insinto ${PERLDIR}/gnump3d/plugins
-	doins lib/gnump3d/plugins/*.pm
-	insinto ${PERLDIR}/gnump3d/lang
-	doins lib/gnump3d/lang/*.pm
-
-	dobin bin/gnump3d2 bin/gnump3d-top bin/gnump3d-index
-	dosym /usr/bin/gnump3d2 /usr/bin/gnump3d
-	doman man/*.1
-
-	insinto /usr/share/gnump3d
-	doins -r templates/*
-
-	insinto /etc/gnump3d
-	doins etc/gnump3d.conf etc/mime.types etc/file.types
-	dosed "s,PLUGINDIR,${PERLDIR},g" /etc/gnump3d/gnump3d.conf
-	dosed 's,^user *= *\(.*\)$,user = gnump3d,g' /etc/gnump3d/gnump3d.conf
-
-	dodoc AUTHORS ChangeLog DOWNSAMPLING PLUGINS README SUPPORT TODO
-
-	newinitd "${FILESDIR}"/${PN}.init.d gnump3d
-	newconfd "${FILESDIR}"/${PN}.conf.d gnump3d
-
-	keepdir /var/log/gnump3d
-	keepdir /var/cache/gnump3d/serving
-
-	fowners gnump3d:nogroup /var/log/gnump3d /var/cache/gnump3d
-}
-
-pkg_postinst() {
-	elog "Please edit your /etc/gnump3d/gnump3d.conf before running"
-	elog "/etc/init.d/gnump3d start"
-	elog ""
-	elog "At the very least, you will need to change the root directory"
-	elog "where music is found.  By default, gnump3d will also listen"
-	elog "to any address on port 8888"
-	elog ""
-	elog "You can optionally use sox to downmix the quality of streamed"
-	elog "music in realtime for slow connections."
-}
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index fcaa91cc44a2..1cf2dd67eddc 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,7 +1,7 @@
 DIST grip-3.10.1.tar.gz 980748 BLAKE2B 75f8bd4a3a22ca0dc9c03f5a7a3d501d054a1443735a684296fefef95c4ab500034724d7f9fabab3ea1bafbb45653f068615b941d6b5845d2e0edac63270ab2d SHA512 627f55e69a06ee21ef3f21900c22903a70cdb7d25f9340d6c9bbf92317e2b0ba0160cda825bc370f9854c96ea81c96684a82bfd000f890d016d5a858095a9eb2
 DIST grip-3.10.2.tar.gz 980804 BLAKE2B d7dd2585d379733a60215705b5d91ffb3ba292bf78b6728c0ce4ccd98eeb79a5c26131b1023e884d51810857c25a18066e89e726d6d08e2b8b125840b0c30016 SHA512 ee17d5842ff4d13b812e5863ce5d0c516d6bf6bffc8131c685056e1f4bb003ebbc9cad99d48d0dc9d3657d0b13d63c2bf09a67db0d37ea47c8ce715c70cfd3fa
 DIST grip-3.9.0.tar.gz 968706 BLAKE2B 9d530b1e7c93239d4298a57a784eec38d98fe57e2c964018a04a8646ce5f1f4734b21103f31612bac4cc45c8c03eeca2080ba88d60a2cfe51d161ef61758639b SHA512 748821f59c90d7239bb711a4a7e1df4e9f2b67ff7bd5c635a2c49389efc7836cca6672cdd93e727f8b97c4e2221f895cc7b4110aa0d3419a5fbe56530ca1b1d0
-EBUILD grip-3.10.1.ebuild 1232 BLAKE2B 458a4cd5560f48c872a19d0359563054a2b961176789329c0370eb3d72093ebe826a9c048dc25c7f3133355c02464095754057a664471656d1b5059f1d9246f4 SHA512 3bceff62a4ac1c85845c318cc5e8ab43b9b17c37dbb05f6d63b4608c6232a951c2ec37748939c1fb94d979f4caf9a6c0d336622ea873ba9a8dcb5ba4f29ece9e
-EBUILD grip-3.10.2.ebuild 1232 BLAKE2B 458a4cd5560f48c872a19d0359563054a2b961176789329c0370eb3d72093ebe826a9c048dc25c7f3133355c02464095754057a664471656d1b5059f1d9246f4 SHA512 3bceff62a4ac1c85845c318cc5e8ab43b9b17c37dbb05f6d63b4608c6232a951c2ec37748939c1fb94d979f4caf9a6c0d336622ea873ba9a8dcb5ba4f29ece9e
-EBUILD grip-3.9.0.ebuild 1218 BLAKE2B c6c424d05651474333d322dd1bac779418f3b446c5f28397820fa07ea4c0edca60bfe478d56825fbc5a2a669dd98e4712b191c864a10582bb0d00d2c2f1122a8 SHA512 68f067ef88b5572a6338397e7c8be9a7f200da93b7d3a49d4e2a533082ee7b65c85a8999b8110de8a8e6e69e6d2c925dc132197d9a59459fde9cfc732d323f30
+EBUILD grip-3.10.1.ebuild 1222 BLAKE2B df43a95a06e053381848e36234eba2c8f7436c0db415ae88ca389c59a80aa37ccc15a496ee02d9845565446b4caabe4fbde6f7363c493fd01b5c178da71a30f3 SHA512 539dd6555803d76a6ea9e805ae883956de001001af699405ff9d70d774548e68513006a42131e9242f7249dbb057eb69790e4db48ab051e61a2f3791c414edde
+EBUILD grip-3.10.2.ebuild 1222 BLAKE2B df43a95a06e053381848e36234eba2c8f7436c0db415ae88ca389c59a80aa37ccc15a496ee02d9845565446b4caabe4fbde6f7363c493fd01b5c178da71a30f3 SHA512 539dd6555803d76a6ea9e805ae883956de001001af699405ff9d70d774548e68513006a42131e9242f7249dbb057eb69790e4db48ab051e61a2f3791c414edde
+EBUILD grip-3.9.0.ebuild 1208 BLAKE2B 4b0840d67f852edead6ed6e52e7290df4cbfcef116ea7f6a9473d6eb49f80498d0c9e004e468a97cbf7c5572987049795e312b69eeaca3f8cf3e307888a5aaa7 SHA512 4ca022cb15eda867d1efcfa476d782894094d401a26a98469b27739ca9d5a9778a9bed61f970f8270951915d3fd73bfc76bb29053cd65991fa1f17288ed826fe
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.10.1.ebuild b/media-sound/grip/grip-3.10.1.ebuild
index 4f7ac3d6b08f..5ebbbe73084f 100644
--- a/media-sound/grip/grip-3.10.1.ebuild
+++ b/media-sound/grip/grip-3.10.1.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 ~x86-fbsd"
+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-3.10.2.ebuild b/media-sound/grip/grip-3.10.2.ebuild
index 4f7ac3d6b08f..5ebbbe73084f 100644
--- a/media-sound/grip/grip-3.10.2.ebuild
+++ b/media-sound/grip/grip-3.10.2.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 ~x86-fbsd"
+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-3.9.0.ebuild b/media-sound/grip/grip-3.9.0.ebuild
index cd20960d0c8a..21ff65596542 100644
--- a/media-sound/grip/grip-3.9.0.ebuild
+++ b/media-sound/grip/grip-3.9.0.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 ~x86-fbsd"
+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 185ee1aca3f4..a88a30a029c0 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 1529 BLAKE2B c77358a598f6d480c3d47d1c95b4326380f554959f4f9f46fec0ce268e64bf2fa514b6f53af8e57ae85515537fd149ba5abc346b34230704d0627833657ebe44 SHA512 c19ffe4b7818d752d9544ec7aef63daf8b67bddef90f1e1db56618cb4b0075ef898bc596bbbe682fccc9cb221d26514329885a3a53117528cbda2779e723f50f
+EBUILD gsm-1.0.13-r1.ebuild 1507 BLAKE2B b8163ad6fe1ac0be34ff2ff87b786f6e40a8a7af0adfe1c0b86d4d41af06ca970c76ab8dab68ec8b1d68593f3b7817c21e99b7631b1c21ff4b5ac7793d539266 SHA512 3445f086177b9f624af8346ab71eef36ebd49928b120ca9ff6914b45c9db6ed60f916b654e87f3984709e217714019c6eb886d48587d75c31387c8071d946696
 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 6ca036cc100f..60550df0a103 100644
--- a/media-sound/gsm/gsm-1.0.13-r1.ebuild
+++ b/media-sound/gsm/gsm-1.0.13-r1.ebuild
@@ -10,7 +10,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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${PN}-"$(replace_version_separator 2 '-pl' )"
diff --git a/media-sound/gtick/Manifest b/media-sound/gtick/Manifest
index 4f4872d320fa..4661472329ba 100644
--- a/media-sound/gtick/Manifest
+++ b/media-sound/gtick/Manifest
@@ -1,3 +1,3 @@
 DIST gtick-0.5.4.tar.gz 641902 BLAKE2B f1832f46b559908ae0c40bd0f6a08e145a0ba58a6cf2f8e7235b4f3f0b9141ea514cf52c51cef24d745ce360423daab855c42b5f6719664be65bf5f254650c1d SHA512 28ea6f38952c376f1f684e7b598d1032063f7fdf3454cdb86735cb835079312c0d1c30dfeade7272f5399296f2a2ede5b81524036a9ac0d91e0878865fab446e
-EBUILD gtick-0.5.4.ebuild 826 BLAKE2B 8ec62ac0b57c42acd9d69f36f4c2aba0ad7e015fb3297409244a9333b14be6aa0a9bc2ba722a5d39210b775d45746e2b064c28fa5a63691f163fd228e4bb2f48 SHA512 6762af90b089c1e86d6fd42eee4f6b64b5bb54d578a54880a99327ed1358fa561f0d77064c53eddcb028c206367781a6ee9541c6f471ff0e8aed641cf9ecf1e6
+EBUILD gtick-0.5.4.ebuild 816 BLAKE2B 57c114edb48af45d23246129c0ad0c78d21c637fa9e3a647eaeebb9676303f45ce894ed96d7a1afb0cedad38ece9c3651995a5131574c90cb84831da6881e086 SHA512 774b3518bfcf3f2e18fae37f2bb85b6785b035ed20bc3315a9ef52cdeb13f4716ee472f85b0ed46f05f29b47551ecdcdf227f292758b5cf411f077161520bbe6
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/gtick/gtick-0.5.4.ebuild b/media-sound/gtick/gtick-0.5.4.ebuild
index 72c0cef645a5..f589cbb19346 100644
--- a/media-sound/gtick/gtick-0.5.4.ebuild
+++ b/media-sound/gtick/gtick-0.5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.antcom.de/gtick/download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="nls sndfile"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/media-sound/hearnet/Manifest b/media-sound/hearnet/Manifest
deleted file mode 100644
index b896ec2b73da..000000000000
--- a/media-sound/hearnet/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hearnet-0.0.9.tar.gz 11164 BLAKE2B d342ce584052ea5ebdd759b7f7af27e26ab875ae75b68526a18a9f3ac71cb5ac676dc58a3643c223fe3f97e09df9392ea8d85083f937cad4cdbcab96015ab612 SHA512 2bf1f8c8edc34327f5a3ec398b025a28af17a0fa674b96ed98a532b61b2d4723f16ccaa07df3aed15806aa24552e6dac2ce4451325ab8b1e632b3ee22fcfc912
-EBUILD hearnet-0.0.9.ebuild 748 BLAKE2B 6d6c2cea6462f8334d25d6ea93d89e15423824432411d9048740d32bd435e205cd8cefedd67b688ba7bc7bf2b81240cbf250ab05537b363dee1a22b793b0cdbe SHA512 16af57ad7affeac4d7781f8b54551f2236937125863d824fbfca47801daeaafa2ec94384399dd9bbca99f101937476ea0ef16d5e45f1c65f65dac7cb40a24444
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/hearnet/hearnet-0.0.9.ebuild b/media-sound/hearnet/hearnet-0.0.9.ebuild
deleted file mode 100644
index ca1227c6d6c7..000000000000
--- a/media-sound/hearnet/hearnet-0.0.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="Listen to your network"
-HOMEPAGE="http://falcon.fugal.net/~fugalh/hearnet"
-SRC_URI="http://falcon.fugal.net/~fugalh/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-#-amd64: 0.0.2: No sound sent to jack server
-KEYWORDS="-amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="net-libs/libpcap
-	media-sound/jack-audio-connection-kit"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_compile() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} ${PN}.cpp -o \
-		${PN} $(pkg-config --libs jack) -lpcap || die "build failed."
-}
-
-src_install () {
-	dosbin ${PN}
-	insinto /usr/share/${PN}
-	doins grain.*
-	dodoc AUTHORS ChangeLog README TODO
-}
diff --git a/media-sound/hearnet/metadata.xml b/media-sound/hearnet/metadata.xml
deleted file mode 100644
index c870d0eef0ab..000000000000
--- a/media-sound/hearnet/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-sound/id3tool/Manifest b/media-sound/id3tool/Manifest
index 8fae822bddbf..23b0fd89c344 100644
--- a/media-sound/id3tool/Manifest
+++ b/media-sound/id3tool/Manifest
@@ -1,3 +1,3 @@
 DIST id3tool-1.2a.tar.gz 74723 BLAKE2B b96e16337dd468ddcba9343fd2286fec0149b6919f006cb6db99e862f449050b6f7bacdc3b40ca769affe233881ecba657e93f93d59f9bbf5f18fef150809ec5 SHA512 518d51794f19605bb3733b0d66f55ad3106ba17826bf2791b4629a0697f92bfbe0193d4442c4e3a5eccc8200ad3c0089085167857652884922a34cbe6683b36a
-EBUILD id3tool-1.2a.ebuild 373 BLAKE2B e9309019b73a6e2d940dd184753a335b79854130085db9806bc3deb41da5394d86a586bfada60fad4502ae5c7ddf76cc327d9c26ecfcc4564bb968c24f988831 SHA512 262be800fa58cfb819adc44753ee12b0b03be3500af476b43fb579337c6d05e3bd32b947017d90d7064788da9e65dab281901b30e14dba53c3c413439f9abec5
+EBUILD id3tool-1.2a.ebuild 363 BLAKE2B f3dad88a89424bb14014d8a11bdd2321b100645ec09097653a5700ea19570539374f79b0827545c07c04a08606751317e8d4750387818e64269d70212bc24cb2 SHA512 a067f6c9364bfc82b3ab853fffc39e270700e70a7c2be4d116e694617821faa14f53f589d087e198e640993991dfb975418d0de3fdcf64aa9a062e5c2afad9f3
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/id3tool/id3tool-1.2a.ebuild b/media-sound/id3tool/id3tool-1.2a.ebuild
index 018bd6961d12..8fb566ff9c0d 100644
--- a/media-sound/id3tool/id3tool-1.2a.ebuild
+++ b/media-sound/id3tool/id3tool-1.2a.ebuild
@@ -9,4 +9,4 @@ SRC_URI="http://nekohako.xware.cx/id3tool/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ppc64 sparc x86"
diff --git a/media-sound/id3v2/Manifest b/media-sound/id3v2/Manifest
index 88dbd94d7a77..580c9583f249 100644
--- a/media-sound/id3v2/Manifest
+++ b/media-sound/id3v2/Manifest
@@ -1,3 +1,3 @@
 DIST id3v2-0.1.12.tar.gz 121476 BLAKE2B 421e95211048a6e17559736aadee2b40b4c817373f83790a23b4206aa2715ef8473bc9ae83dad480b1edac29cfe20cb8686f2d78773a2929c5f9c97bf4e718ea SHA512 f9c74ab6ffbb50ab7ae7af64dcde78a0766bcbf71308d4c9fb480543b5790e2690ae096d6a2ecaffb01b7497a18841b5235500177cf5eaa8e668cf443abc726a
-EBUILD id3v2-0.1.12-r1.ebuild 547 BLAKE2B ec9ec6f5d1458f1b397d596af1e9e985a59a985dbeb16c99f35ca045e400b73894bef5a9ec9ff8c677694049e73c95100009756f400c4714df83648ab16d853a SHA512 18a51c410c8cc9342cf1e68d14b1a2a2f21ce186a82b17ef80cb6f4a77ef0d84fa252b6ca481a8a7626c9aef8523c4db8bef380deb40b6c460c93776655accb1
+EBUILD id3v2-0.1.12-r1.ebuild 537 BLAKE2B 8eccd112733d597bec1780524c138cfb583e5c3bc8862d1d6e01d904f5040b35cabd73e37bce8bc7e6e6c77f04efcbd226427bca4955b7186575c6e065e23217 SHA512 484fa9c360f0a263e3ce50783157f612fb2fd2610cda1fd5e99b7491a2eac77d00df452f0045d5e970c80c9ed8e8efdadfc07ad5b2e392fbba4d2bcc59b9b349
 MISC metadata.xml 328 BLAKE2B 42e0653aa87bd9f00be18dcdeac17ccbb61d5a6e1399d8a246f2b2745431f84f81175a61d77780899bcd48868c9f66df8e93d7a89ae6660151cd768a45560881 SHA512 d813858c55feb67797a7c5226debd484291e153994ebfe42a3038690c6fcc18a2b70ec0324fec1fba2a8eadb49fadeee419f279c7ea105a355eedb8178e615bd
diff --git a/media-sound/id3v2/id3v2-0.1.12-r1.ebuild b/media-sound/id3v2/id3v2-0.1.12-r1.ebuild
index b312ca8b9708..c0fde2319c97 100644
--- a/media-sound/id3v2/id3v2-0.1.12-r1.ebuild
+++ b/media-sound/id3v2/id3v2-0.1.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/id3v2/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 
 DEPEND="media-libs/id3lib"
 RDEPEND="${DEPEND}"
diff --git a/media-sound/imp3sh/Manifest b/media-sound/imp3sh/Manifest
deleted file mode 100644
index b9b43b7f4578..000000000000
--- a/media-sound/imp3sh/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST imp3sh-0.2.4.tar.gz 344331 BLAKE2B eeb14c8dce737e5eb3b028ce0ce2af757ddb7a6ea67175328407118154db6757c9381a26d707edd4d9eae369bd7c5409bac56e3be254c1ec797e269df34681db SHA512 a5d48413d359bef280a090aef323d9abc9400ce08da86d24194881f6305ee82ceaa5226e19f476885792e9d0cc2a75f3edd4465c6fac7222e2a6e21ef0002a1f
-EBUILD imp3sh-0.2.4.ebuild 737 BLAKE2B b0517ac7d70a96fa0659edd13a6a740e5c2592cc7a84923da2f82f6766472efbd534a99088200362f1fa82349463073cb60d84af53de1061224d0b420b441b31 SHA512 0c11b01a9281f399f20d64abd46769dea72afd209a1e581e889851fbb5a6fd437e4c2516f0c27e597eb4a4d472ec412c18816275e12f2f1414f8d809272212c0
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/imp3sh/imp3sh-0.2.4.ebuild b/media-sound/imp3sh/imp3sh-0.2.4.ebuild
deleted file mode 100644
index 287d97f8f59c..000000000000
--- a/media-sound/imp3sh/imp3sh-0.2.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="flexible playlist manipulation shell and song player/streamer"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses
-	media-libs/libvorbis
-	media-libs/libogg
-	media-libs/libao"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	econf
-	emake CCLD=$(tc-getCXX) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README* CHANGES web/README.imp3web web/imp3web.php EXAMPLE.imp3sh EXTERNAL.players
-	# Some docs are liner notes in the actual .c files. UHG.
-	dodoc piped-io/imp3sh*.c
-}
diff --git a/media-sound/imp3sh/metadata.xml b/media-sound/imp3sh/metadata.xml
deleted file mode 100644
index c870d0eef0ab..000000000000
--- a/media-sound/imp3sh/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index d0a78c2995b6..b8eadeb6c096 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 2068 BLAKE2B 6e8848a8e5c13564277a30f19892f9f3d5091eca3c6ad6f2e5514a843cbb9fa542715d5266112fcff942dcb55ff8396a6e2ae7b0f4986e18c0b1d83c728524b1 SHA512 48ddb4368b3b954e11a2900352f0d3f4dcf251fa619113c21be65e0bde3e01f649c64ac8f063511435fd4203b6de401e2a9a5c37f0349b99da3ae4e3a00cd486
+EBUILD jack-audio-connection-kit-0.125.0.ebuild 2056 BLAKE2B 7648b7056d21db6378d038cf4e9d3b3b80f952ce36415b89de15de9003f497ca4eb6e7e2177109e927d0829e09af4da27ffc1a736af5ea923f2e91b1c13f8242 SHA512 129ab15a0eb8a12de21b2407916e5749b400466f78774d2e65b1975ffd254db53b3d83801bdac735a0881b421cd273386456bf5364b00eb01af35b696009fbcc
 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 ca29625d9585..57c9b767b21d 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 ~amd64-fbsd"
+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/lame/Manifest b/media-sound/lame/Manifest
index b0d22ce92fdf..7a6857a9e6fc 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -3,5 +3,5 @@ AUX lame-3.98-gtk-path.patch 8523 BLAKE2B 9b5231402293a61f8366383a704056e60edbcb
 AUX lame-3.99.5-msse.patch 557 BLAKE2B 76b1201e0909ee408a9556ffeb3d41b4bd749407b17ab0dc98582c01b027d492ac6e2f09c8758a59a6bb2649fa1c7a55e96fccab0525b0dcb70b6ea44a034dc0 SHA512 9bf5a1b0f8955aeedff6effcab7f657961ad60ce00b5f455c05ce39ad5b03c2a809ba7225a3a33b61b84a36665fafac53e35b14e0d357289e66194a4f0ef9807
 AUX lame-3.99.5-tinfo.patch 768 BLAKE2B 3fbbd31b0b5752ee4c2dad573d053edcbfb80d24b68a876c2092cae37d3450ac6044ec14d26b180a46197093151d614be8400f33ff7b1f6968130412daacefa5 SHA512 504428e0a0b43c467848296c219ac855ffc9bd83fadb54107e8f6b99290b91bc36457635a092fc121972a3c89918f2d81b42f98f6d007f9b571c7bc3f9c2895e
 DIST lame-3.100.tar.gz 1524133 BLAKE2B 6954d30cfd3951ea07762ba5dd7ff27038b78455f423099a225ebf748abddf9970e444456ca5a6179bd381e2205b32293392cb757c203901674860710fe2c183 SHA512 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b
-EBUILD lame-3.100-r1.ebuild 2127 BLAKE2B ffb3fc3586ce7afea7fa25fbac1bb87b1756a2de64f1b2c6618d50fdb43bd8aaf3f6d149111fbb9e11e450f238fc838766f4cf07a67c1cbc7690533ded83bf3f SHA512 3e60dea3a3372b75ccad158a5a663fa7beaeed548c599df33e52c893eb38e30cd1628905d463c426e16748f80c9d08bd782f455facf0c08705619375fb32eef5
+EBUILD lame-3.100-r1.ebuild 2105 BLAKE2B e4531b3ab55b89738a81c2fd62f202134ef55929395de7612df961cda81b8e680fb5be002bacb9dc11722d5168a1b5975cf629bbbcb675aa2e7227c26a944056 SHA512 2c5e77d2fe681c742d5da11dec93ae688d29acfb9280a87513989b8100f2e586c6f4daa8662b2da9959b0c6f612daa99333c4bd36308547cf5400f592d84e070
 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 7a8352297488..49e49c648a67 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-fbsd ~x86-fbsd ~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/mcdp/Manifest b/media-sound/mcdp/Manifest
index faed8cc7beb2..c45ea3204080 100644
--- a/media-sound/mcdp/Manifest
+++ b/media-sound/mcdp/Manifest
@@ -1,7 +1,5 @@
 AUX mcdp-0.4a-dietlibc-fix.patch 464 BLAKE2B 6660bba10dc650d0ce9727bdfbf353427f19cddf672290163dd30b847434020610eb66c376feb7f0919fdd021eb556c6286b038ee1cc72e2cf48a9ac4cd8d4a8 SHA512 f20c9cc828017f149e9618eb9b8c22ff6d02c48a2c71cbebf15a6a4d2010e95aaba7bc0961f947d48acda746e5d34997ea55eca62d5a66d822bb83073f105267
 AUX mcdp-0.4a-makefile.patch 343 BLAKE2B fadbe306ed674276296dc5157c126b2576d966e1c366a6ea7ab71d6d803ea1db57209b2963bc690108f3b3c8d3c24917b9077c8824898cd6f863bb383345c61b SHA512 b0cf13475b05ac6f11f0eedd64368db2275e461eeebcc96b3fd006869e77c79a2388753c4bc2f8b9e0b8982c6cce7ee25b9d15aa9f94f5258faab29fcd4a2ca5
-DIST mcdp-0.4a.tar.bz2 29872 BLAKE2B 35f6719f677d428805fec4ab95fa9c0c00d776265238a672fb3ec9e1c6106e30735729f546b8075e9db68e2cb164c01effd0340cbc7b7c6b831e9508c59778e2 SHA512 7747d9743213923deaca04bcd3748014512622a757e4501c661e128e231fe418ece429aca23fdee390ffe1cbd1384039c9fccf2a7c1d93b1cf735d600787f3ac
 DIST mcdp-0.4b.tar.bz2 29940 BLAKE2B 711822257664e21ff3b56eed415e57abd8eee3dfd1912bfa2a88c58b525239c6c30d958c15dd705cdf8d10e56a75d9f0a6c33d35d62e1279828e32343811eb24 SHA512 af7042794ed36c1cfdfbf8ad3299ca377942c67f3eaaf0778ef368e29288945331f753dfdd320e667f499c8229cf770dc8d6149ef6214d76b7eaceff54203b6d
-EBUILD mcdp-0.4a.ebuild 704 BLAKE2B 18c1bde3a97fed5f00c3238e92ec1ee37b0c98c946bd52b56b03c8d087f114c475de44102b2e6589d5994461e088abc339ad55e6d3cc165b7dcf401c5306951c SHA512 23547ef70978f0f3af8da52c91e4688acbe97a745f5b15d35869eceacdead25142c23aee92dbeb7899f548c4dcec7a62d9f45fec6ecc7480f3bcddd55815d0a3
 EBUILD mcdp-0.4b.ebuild 676 BLAKE2B 13cd4d46e0c2059bdda9df7f072f16d7e095fb1f4d7e9b4aeb7a739dbab149648e7bbb2bf76eb19f6091acfd92fa2ecf99a2afb0f4cbd048c7e4ebec11b21502 SHA512 430535ba0646b01357252823b34280dee0e611e74d745e7253cbd8a3b28de8c69a39578c104ede13ddd2d608908dd4c870dbbd5baf586f27d032fc4d62486cc5
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/mcdp/mcdp-0.4a.ebuild b/media-sound/mcdp/mcdp-0.4a.ebuild
deleted file mode 100644
index 9a450671c141..000000000000
--- a/media-sound/mcdp/mcdp-0.4a.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A very small console cd player"
-HOMEPAGE="http://www.mcmilk.de/projects/mcdp/"
-SRC_URI="http://www.mcmilk.de/projects/mcdp/dl/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${P}-dietlibc-fix.patch"
-	epatch "${FILESDIR}/${P}-makefile.patch"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
-	dobin mcdp || die
-	doman mcdp.1 || die
-
-	cd doc
-	dodoc AUTHOR BUGS CHANGES README THANKS TODO WISHLIST profile.sh
-}
diff --git a/media-sound/mp3blaster/Manifest b/media-sound/mp3blaster/Manifest
index 91579db468d8..50cfc23c2b37 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 1564 BLAKE2B 93bceb64fc0566e7ea2f54c30b6754be1454e280d0690a5f896350191edfb36dabad8fc6b816e4fb2c884056a7ca2d283faf05e562023f83f7e30e25089d3d82 SHA512 92c4ee037ea81b9a3b8a2a26afdf318a8961e2025898e235b13cf7025c7624fc03732937f0a56da09c4b74097d4b1e51a0d602da48536800882dcace31efb889
+EBUILD mp3blaster-3.2.6.ebuild 1554 BLAKE2B 92b83163089fd0c6ad3d5051a948051aedea7109295782f15c175ddb92ef980b1cbb346992e86a91d460deea0c132ac399c307e39b97c7e978a2a6015c79bb57 SHA512 f2d8d0be9f81a355bdbd1e6ead538270037464f8f52ac6163d423b22b1f62d21c568b17a81cdf0dd3bd0de186fae73c81de9da61b7239c7fac8b46b10a025f73
 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 cb697b8658f4..ca1ba984a0f1 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86"
 IUSE="lirc oss +sdl sid vorbis"
 
 RDEPEND="
diff --git a/media-sound/mp3cat/Manifest b/media-sound/mp3cat/Manifest
index 7c72c1bea569..48b59bc29bdc 100644
--- a/media-sound/mp3cat/Manifest
+++ b/media-sound/mp3cat/Manifest
@@ -1,3 +1,3 @@
 DIST mp3cat-0.4.tar.gz 14956 BLAKE2B 3da17f7ccd5739657ebfa31fbc78a77f78d7b25fd3e1e82825fa2efc677b2aa64da8f699faaef8dd55ecea647bcfa014c7bc6149a9ca52b1f255304f838837e9 SHA512 a72bbbd296bb07a7e7fc084a494b2676c012cf3a4c71ace7eea52892f6f478769c5b6140fcd8dbfa245d537335a484fd8c5db15edd83a0146821d48e24862492
-EBUILD mp3cat-0.4.ebuild 584 BLAKE2B bebfb04e4635d2e5e42038186795921f6c689065e8afd5cecb437bdb80f451d0b5d7fca6167ea7f19de02b622e8eb36b2942179f32a6303611c312fdf29a40a2 SHA512 2f6709748f503d1038556119f1a21cdec8e2373ae36ceee2eb50f0c74c2aedddb499042eb440e23154cd8c26d570b8883d9e98cef53baeded8e8bc7e46a695cf
+EBUILD mp3cat-0.4.ebuild 574 BLAKE2B 5c17ad84a5a7af3cb5c57e83aef8e648ecdffc34bb0074c36757a442000320774826bd5f9f147fff4f73642aeff549384e96b52e3c614493f69ed3ea58a5d51f SHA512 8e782196451d6b9af8eebf441e3804b64990209443e0d391093a29e247f5d9ffae03a025410c7a7b554159d721634ae9f51b70e1e3c5b561d8ea35d6018a5722
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/mp3cat/mp3cat-0.4.ebuild b/media-sound/mp3cat/mp3cat-0.4.ebuild
index fb9d33d02c97..19faf5591869 100644
--- a/media-sound/mp3cat/mp3cat-0.4.ebuild
+++ b/media-sound/mp3cat/mp3cat-0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tomclegg.net/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 src_prepare() {
diff --git a/media-sound/mp3info/Manifest b/media-sound/mp3info/Manifest
index 1d4664ae8e81..1925874eb20e 100644
--- a/media-sound/mp3info/Manifest
+++ b/media-sound/mp3info/Manifest
@@ -2,5 +2,5 @@ AUX mp3info-0.8.5a-format-security.patch 507 BLAKE2B e3a26ec3df15f24436d7c463f69
 AUX mp3info-0.8.5a-ldflags.patch 466 BLAKE2B 77cd382d37bd35cf4cb06996946cd61c98918395eb7cbba021a98084db90ae1024f8729413c1073e619e2de72de5b7f70706280e2d75b1f3eb100021c12b5ca8 SHA512 868b62dd4565e1f59a057bb4af06ba6618ba320f1a28104b936ae889ca851c344c3a221afedcb309bf11287079c86f44d5f92b6cfcdd8a6ef2e4a72508ed052c
 AUX mp3info-0.8.5a-tinfo.patch 195 BLAKE2B b8b25093c6b320d5f635d35b958699072d13498e93921dd7221aa0c5454deaf3ae77fb4a7d5fd7aeaea0a27b2d1737c22749c8a326fd8d9af52aeb5fb1584e92 SHA512 3e2deb03559afa3029c673a7c9bb165c6c3419b19a629f9b55e20f96e49b8132c2d454274a8f5c64e20330c148351c4ef51e92164d230124b9d3a6d90d2b2653
 DIST mp3info-0.8.5a.tgz 127482 BLAKE2B 303b7fb798604693c58e6412e5e282fbfb1ae126166a7c3d12c335953669c6e8482fb287313d6f44fb802545d728a58ae5f58c4e25bcea1d530879fe87910577 SHA512 30e0ef62deaa090fc115317f6c372f408077dfceed7e05faa6744b8516291e38d21f1742732f6532585f0c3d8c705d8c7026c2bed84c97e1f497d433637affd2
-EBUILD mp3info-0.8.5a-r1.ebuild 926 BLAKE2B 892de79112e0ef86c88ac7aee47a7728d6e9c6b4a3dc46b5e25b061f8d7d585578d0be4578f4ba7d1a39260b0c15df8f085cd79ce494e2c927ba180c5cc14758 SHA512 eb9ff8c4176304db565053e238ff0dce3e0287810ab64fd28e4e72b8589b636d1903d829297c40d31c840fdd4fa1e3b0447a5135248ced6cf533c81f24775fb3
+EBUILD mp3info-0.8.5a-r1.ebuild 916 BLAKE2B 4ec37f8814852d8c3a45fb75efbac2f2858971e9e5db495020e435eeea563bb851f899172e453038585e72eb8764a105851467732abddf065edb0d01a4e8218e SHA512 b00a8e80c520bb2d57530d13debc452a256fe69fc87189bdbdd3e93534de29215b73cb59fec42768727d77187fc479e6e7e6a631e064c92db9bb8027f3f79e53
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild b/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
index e8ab93b246f3..33b63ff7b710 100644
--- a/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
+++ b/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ibiblio.org/pub/linux/apps/sound/mp3-utils/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="gtk"
 
 BDEPEND="
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 02f1edf022b9..dddab00fb4e1 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -2,11 +2,7 @@ AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20
 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
 AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57e4614727d7425e9323836db997a6876ae4b8266182f34cbb72199f8db5ef8aed79f5beb4fb5ea483 SHA512 ad67bee1e614b2901e977e0a7a9bfea7ec9bdf3af9546664f42c1d1426eb5e7990028546390219912e724eeca8ad063a2ac39a048be281527b19b0a79e819961
 DIST mpd-0.21.14.tar.xz 673036 BLAKE2B 73eed90c0d48e26d747e26b0cd000d3e0a12dfebb015f865fe9d3ddbe5f7fa564b1655b7e0639951e9aeb2554185063b11d6bc818813ca6366688ea05705ba4a SHA512 d5ce06741444d545c7334f4c4ab32dbfacaa264df5a1ac61b73d951e0a6f952c8ea1e4df1b5bfc827e7faa35a6b8026e78cbf3a057ee35adf448fa7204389cd9
-<<<<<<< HEAD
-EBUILD mpd-0.21.14.ebuild 8127 BLAKE2B b1b725c5704f4b7ae9eabd50ab31543f1f0893c2377a9eb62acb97109bdac197a898de0597dbc13778932d22a769f613890f1bd3e5b49e55312dd81779f1c8f9 SHA512 61c95152724bcc672d0dbc8597b83802928edefb74bbd6cfaf74735d06683cded78fac33a7bec08de1b5d23e3f8ea6e213e223d2a634e2f67e09d575391ad3cf
-=======
 DIST mpd-0.21.15.tar.xz 673056 BLAKE2B e399c0439e790ac62525b33c5d2d26b47d36687edc877169934dd5379646d1d38ed7fec75532498a4c0f6e51e355e872847873045ae2446d037cce8781be3067 SHA512 c67ebdb7609b36b4b8504ce0751ca2dcc38a2fba03a5b8419185e8be64bce7e19560347a600773b65f55ba0a3cedeff051117071db8e7fe0a90c9771de8bd37e
-EBUILD mpd-0.21.14.ebuild 8127 BLAKE2B b1b725c5704f4b7ae9eabd50ab31543f1f0893c2377a9eb62acb97109bdac197a898de0597dbc13778932d22a769f613890f1bd3e5b49e55312dd81779f1c8f9 SHA512 61c95152724bcc672d0dbc8597b83802928edefb74bbd6cfaf74735d06683cded78fac33a7bec08de1b5d23e3f8ea6e213e223d2a634e2f67e09d575391ad3cf
-EBUILD mpd-0.21.15.ebuild 8130 BLAKE2B 1ec6da3cd0207ab701ef1571cc2a3ec1711302104eb480b456f0c507c1819f2be28b8e8c6c9913afdc4181bae4b3d25970aab94ab51711aa6f9f865f72e4cd62 SHA512 6ec92a3c7f9d0676d733c3b14fe2c936aacce2dc585f3b6d078170964664add5a2f94ac53a978c6db417cf32791f5af7bf91c4291fe1597c98db3bca1c908c62
->>>>>>> next
+EBUILD mpd-0.21.14.ebuild 8191 BLAKE2B 9851cb110f9059babe6e5095f87a79a769871f755c78439b01fbde57a0c8fde354a1318e0d2da9b0ec1df3c4964ed3b23eede05cd17d1727380ffeba282911c0 SHA512 2ac00aa81d9d3ae49f65ec77d73d798d7d3170823039ab50e2c5735c7e454b8fcc9647cb5e37afc8a900ce3a456aca2536b0e861a2f9587f78c430696b8aa0cc
+EBUILD mpd-0.21.15.ebuild 8194 BLAKE2B 312fddb816b472d5851c34249d10f78bb03f0b22d622f1c6719acf46de05767b6b36671ccfab8e93c8402004ecf439f6d3ad5cd0b9ed00298f9d765fba9956cc SHA512 b2c2fe8011db9aae9721e9314d5888fb5a7d3b10503f0f8a53b2f44d4af10a7ca4cfa4ae8d7fa05600094f0600fc2de204ceb2540ba7935e16315d9f716480c8
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/mpd-0.21.14.ebuild b/media-sound/mpd/mpd-0.21.14.ebuild
index c886ec4ed037..603f91529c25 100644
--- a/media-sound/mpd/mpd-0.21.14.ebuild
+++ b/media-sound/mpd/mpd-0.21.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic linux-info meson systemd user
+inherit flag-o-matic linux-info meson systemd user xdg-utils
 
 DESCRIPTION="The Music Player Daemon (mpd)"
 HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
@@ -11,7 +11,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 ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~x64-macos"
 IUSE="adplug +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
@@ -291,4 +291,9 @@ src_install() {
 pkg_postinst() {
 	# also change the homedir if the user has existed before
 	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
 }
diff --git a/media-sound/mpd/mpd-0.21.15.ebuild b/media-sound/mpd/mpd-0.21.15.ebuild
index 984310bc5363..a5cdc87afb48 100644
--- a/media-sound/mpd/mpd-0.21.15.ebuild
+++ b/media-sound/mpd/mpd-0.21.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic linux-info meson systemd user
+inherit flag-o-matic linux-info meson systemd user xdg-utils
 
 DESCRIPTION="The Music Player Daemon (mpd)"
 HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
@@ -11,7 +11,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 ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x64-macos"
 IUSE="adplug +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
@@ -291,4 +291,9 @@ src_install() {
 pkg_postinst() {
 	# also change the homedir if the user has existed before
 	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
 }
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index b9bd1bf9d5b7..7d141768c0d8 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.11.tar.bz2 909478 BLAKE2B e821826c91acd3c0b4b9e6b83df6c5625f86611ecfdedd2dcc12b0ce8b3389199aa4cf7eea48b597e5b7f740bbe2c7612d27e75897e34bed2a2407e98b2b7a43 SHA512 986338d0f4829ec9e40990cb384746c7abfa80d3b3d5656b6dda73d03e2441c1f28ffbe7f3f82b0008a1c4ebcfa07aeffb493e95f13f7d04cbc818a09f1008ed
 DIST mpg123-1.25.12.tar.bz2 910149 BLAKE2B 4e1b6329fafb4d1e018c6f5fc0846480ef8cfb6811f92d745f7e88d45fa6a8704ad707d110b12709763ac79fe095603c8ece0bbecb54cc2cde4de819083a2078 SHA512 fa3c719c68dbe45b265fd7677d0932b07f6a14e7ffe365ede965ff1637e655c4b57c86f7e4cd60cace7df5fcc93d48e0d44f082931394b7c6ef19f5d11638eff
-EBUILD mpg123-1.25.10-r1.ebuild 2860 BLAKE2B 0d25dbccc63c6788dd6c1e0c3a15fc8766d5e5616decfbcaa8f3567a53b98c01c6fcbbf23a4aab85369b14d8eb30498be411cf3cc1a8d577bf2f73dbc08849cd SHA512 20f23de51561b06b5dc1c6ef2923afb7f855caa234033847259223d8076588197f7c9f84be7421bf70d01f2cef3bacfa6b21cdb05e36c59539e06f9d3918bd44
-EBUILD mpg123-1.25.11.ebuild 2884 BLAKE2B c3d89fc5a388dedd602be32569f3d1269d1b30b1ca4728abb5e14b979a37ae1a29c11e76b0afdb5fd231419750d6707e6b2844485e867479f9c7f3a244d64898 SHA512 95c204f1ea1e0ff2406daef4114d21cdd74d62842215f977abdec3736c6e626345e112aaa8d035d67aec0306cb121f25f5c3b02c834c874e1965883d50fd3f1b
-EBUILD mpg123-1.25.12.ebuild 2884 BLAKE2B c3d89fc5a388dedd602be32569f3d1269d1b30b1ca4728abb5e14b979a37ae1a29c11e76b0afdb5fd231419750d6707e6b2844485e867479f9c7f3a244d64898 SHA512 95c204f1ea1e0ff2406daef4114d21cdd74d62842215f977abdec3736c6e626345e112aaa8d035d67aec0306cb121f25f5c3b02c834c874e1965883d50fd3f1b
+EBUILD mpg123-1.25.10-r1.ebuild 2838 BLAKE2B 36665cddd86d7d0d206cb5555b11224f54c1fb3905f5d077cad8960fc29a3e76b0df5f6b953d5e037abe06eae5df5a281a670152589715136ceaa28c82064893 SHA512 ce2b633f7332c9923bcffbf84d141b6e65e915fc4485b05d9b44c022ae05ddcdd09027510e5cd2f18feb71c54dc51430a250de84da66bbf830a31967653396f5
+EBUILD mpg123-1.25.11.ebuild 2862 BLAKE2B 5784ece87b256c16378b409bf3a502d99f4eb0810f2cb883b2cce54f3baddcfc653c628c2b3dfb8b95109cb75b0a8c7845003b075df8db7400389d4bd7670db7 SHA512 cd6f6fb1d82b8320fdba5e0a5e47241c380052b84f060665b63758318848c5cdf8c3f9cd01087999c7806c9c026c8336c6b54c2c988c642bb62c0307f00fa593
+EBUILD mpg123-1.25.12.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 2e0212be220f..b8e1965b5919 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-fbsd ~x86-fbsd ~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/mpg123/mpg123-1.25.11.ebuild b/media-sound/mpg123/mpg123-1.25.11.ebuild
index b0eac0164fa8..2a6b18dd31c2 100644
--- a/media-sound/mpg123/mpg123-1.25.11.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.11.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-fbsd ~x86-fbsd ~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/mpg123/mpg123-1.25.12.ebuild b/media-sound/mpg123/mpg123-1.25.12.ebuild
index b0eac0164fa8..2a6b18dd31c2 100644
--- a/media-sound/mpg123/mpg123-1.25.12.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.12.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-fbsd ~x86-fbsd ~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 6ab5746c6066..685c0dbe5504 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 1189 BLAKE2B b9697b1aafc13f693c6ce14d88211326fd7e0b34261214faf6966064345e2003bddf0be84ebbdbd9055b155ba842b88c342cd2b540503999ebc8a4814c4b5bcd SHA512 e14146237c6f354cba6c686973d43662696bd71cbbb05418d5a4406db2716d7729f52221faa873084374ca6109a62a5dfd86539f09464c955dc372b2abdbec48
+EBUILD mpg321-0.3.2.ebuild 1179 BLAKE2B b077d50153e0f2c6dfdb331dba631a7143d194e5b29d2b60a930a265b13619d582fafd70c5355e0b4e13636c6884b7c2a4c09539834d735c13a6541e03aa0269 SHA512 4bd2e733c799ec2b2b334c30c85ad641e1816e1ea46e5b30b111a340c21ef1790f8778ddd616b549b356bfbfdd6e0b408b9697229b729c6a8c157b2219616a23
 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 00ba08fb4df8..e19f449b16cd 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="alsa ipv6"
 
 RDEPEND="app-eselect/eselect-mpg123
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index e83db43df7e0..40da75493f75 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 831 BLAKE2B e7c82080b80a25de3fe681156671deaae8fef0408e133c4ffdef1fe6739a500508a4508faf804a0c5390b9ac1d41b840a8d476a65a36ba826c2eb0eb79401260 SHA512 344fbc7f46cfc66df17e6119880101358c9d4fe1841f91b44f9260c96afc9614d367d62aaea6d2ee32e042e906c6faf000595a3a468c9cfcca4a32d0338852ec
+EBUILD musepack-tools-465-r1.ebuild 809 BLAKE2B 91b93bf13256b0586c2ca6c89aa61fada8be7a6f8c5dd4fa136180bc16e6de8b46725f5712d3ec8c2e3ec951539d34c6066e2fe0a9040a959aeb993b5999e006 SHA512 0f7aa71dd989f1419399d243b399831189d6db0656eb314d5f9b06a35ff076d2e3d5ec481e7714af00fe64cb6008246000f89751ad40e7eaef66f4bab717b4f6
 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 ebfe9885e1a3..55e1e0b22907 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-fbsd ~x86-fbsd ~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/normalize/Manifest b/media-sound/normalize/Manifest
index dc4deaf53051..fe54523e7579 100644
--- a/media-sound/normalize/Manifest
+++ b/media-sound/normalize/Manifest
@@ -1,5 +1,5 @@
 AUX normalize-0.7.7-audiofile-pkgconfig.patch 1865 BLAKE2B 4a03c449e218300328297d30229b26b425e65ab4f7a05725bea78c19ea3e6556bbf3dd9dacf1c73c064a6912120772754e65aee00af8a2f016b9bb2750b2ca2b SHA512 bf8b4fdd3ba9629cefba6eecc3db21b3fe9129429a8df1fcc7794f3eb6e802f1939d0ec23863bf91edecd94651a70f798d6888f0b94b39664b53acf68b737967
 DIST normalize-0.7.7-m4.patch.gz 5078 BLAKE2B 6bb0979c1a94b7bd52ea01cfcfbd715772fb5cd92c46124a43ff6982cc0e369c86a43c836354ea10e1f613274cb58afa4dad6c1d6656393edadc1b7e029f35a8 SHA512 a06d3a51557a0c54e1ff2d0eaec0a8ad51b0faf1457393f2c9207fd428d58e21ecbcbfbab59a15e9fcc59d6ec2dbf91fe78802a67d533a1f90cc6e46205d39f7
 DIST normalize-0.7.7.tar.bz2 388777 BLAKE2B 3ac7be8b86ada8899661d7012d7a60e4a41fcf2c510c302069d1b9ab54efd50e7e042fd5c1365bed1c28fe15b6bc804e605ea7b5f1fd7f96047a70c335275324 SHA512 5fb2265eac93b243682cedb955d2ddfe05f55cafdeb1d757aaef0afb36bc9907ea3321b8554e128f6228bdeeaeef96e3e9ba000d0ad84282cc76a50b3e460ce4
-EBUILD normalize-0.7.7-r1.ebuild 916 BLAKE2B d8a755fad275fa0ecd8b70bf088ccf8a54150a6f89665efd016893fdc2366f6689a2ea9f9dc5a7ef7afb1f9ceafd5f31a71e99692075d78d43717feaba25e020 SHA512 cc6097ce3d9015ba33d67df13e47127877acf570eb3a3ccc93a0ae72f8023a25b5188fce9c00c353e14b016cf8a5aa6b68fa172cb37c23efd4dc102cf7794653
+EBUILD normalize-0.7.7-r1.ebuild 906 BLAKE2B cebe8daf495100143975d501fb040efb13a82d0f56726169352a49aa017acac5e1993c7837ab502e7dd12f1009c43b04668b6bf7ae58f87e91a32d6f2a6674f7 SHA512 a5eb5ff826d68d7a762a9dbc9a63ad94a9ed6136ae11fea33ee0ca036ec6c06081be438bb02f54e637005232aa4dbd433cd077e00be006b1375feb6bc1dbd9dc
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/normalize/normalize-0.7.7-r1.ebuild b/media-sound/normalize/normalize-0.7.7-r1.ebuild
index 29194b93ee44..6058be69c6e0 100644
--- a/media-sound/normalize/normalize-0.7.7-r1.ebuild
+++ b/media-sound/normalize/normalize-0.7.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="audiofile mad nls userland_BSD"
 
 RDEPEND="mad? ( media-libs/libmad )
diff --git a/media-sound/oggtst/Manifest b/media-sound/oggtst/Manifest
index 29d7e20354fe..de7154127e8e 100644
--- a/media-sound/oggtst/Manifest
+++ b/media-sound/oggtst/Manifest
@@ -1,3 +1,3 @@
 DIST oggtst-0.0.tgz 19382 BLAKE2B 6af2e7db89e27c5e13d3bc53712631fce2eef78702689b37af3a7a54e32825f95a8b054b82b808f27a2099554c232921ef1f5cefaac962a4bce5dbdf679a6018 SHA512 6ee73f4ff1a0160135583997664eeba75857d1e76ed2e1b5a9be2d30feea064fe6bdd105edd58ad358ee8d9db20f1f3a64fe4b31c6c9dc5bce5241c5ceb2ef26
-EBUILD oggtst-0.0.ebuild 623 BLAKE2B 240614e7f0e47e393939c3a725cddc74d6a958bc07cc9539d8118b9365e4c0383fbc05c879c3cef240641dddfd67d48cfa294e8a4cddea2b41854b7e00171a7d SHA512 0b43467656fb9f2ba6bdf6c5354ed27ebe838c6c4facbaa898fc3876c29a8cfcb5d25464fb9214e39515902617c85921f3e8c6c5eb5dfa56f104d5272556e82c
+EBUILD oggtst-0.0.ebuild 610 BLAKE2B 4ea0e545bacdb06a84a6256fd9492a3be10e6934cbc20a6d37bf6aa887454dec3e7f3a69cadb67022f3b3014d20620af597fc02796259a1f8d29ac5b7e723998 SHA512 8003635cf838344ef1a1071b91c131687bbe84328cf6a6a724df7e88898a00496a7d55df8da1a7644da479323f4ac5598afa2f27f8702892d452e51790ebdc86
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/oggtst/oggtst-0.0.ebuild b/media-sound/oggtst/oggtst-0.0.ebuild
index 52a8223e6f76..a21769303815 100644
--- a/media-sound/oggtst/oggtst-0.0.ebuild
+++ b/media-sound/oggtst/oggtst-0.0.ebuild
@@ -7,7 +7,7 @@ inherit autotools
 
 DESCRIPTION="A tool for calculating ogg-vorbis playing time"
 HOMEPAGE="http://gnometoaster.rulez.org/"
-SRC_URI="mirror://gentoo/${PN}.tgz -> ${P}.tgz"
+SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index 157e8096ada1..3fe9cc2c3cda 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,5 +1,5 @@
 DIST pavucontrol-3.0.tar.xz 145092 BLAKE2B 3461aaac4228150918effcff04b61f9112c8b12aa61bcce9a82d033c825d7466720a4d8f008ff19d9d8d2ad0d52c6ffd0ee0a2288ce84beb7f30c5f816eb0c11 SHA512 3562fc50e5f60c6b6280c2d524e13cf44114bf481e5ec98b8714c7c2f162d0332179ebcf4c5a78d86f511de857bdc3aa7415e1548e0c10d4582b5958c4cacae9
 DIST pavucontrol-4.0.tar.xz 165216 BLAKE2B 5a556dbd8132d811b7704b377f4a62ad606378e235f9892a7951e1f981917e4196d17e85350ef757a956e6fbc448f0f6cd600b5656e12e2152b71d10b5e64e2a SHA512 eaea303c46ddb36733aed88c8a603907d70e4539c345d8acec23527d3306ee21ae630c0508bdab6ae52cbc2f1eb8fc4b212abda72876dc92e83fba7ceb623be2
-EBUILD pavucontrol-3.0.ebuild 881 BLAKE2B ea25e8863fe6e1ce340db5c1981dea6afa587e7596ba2b4f3992fabb054566117481a5e51ff2b3c6b1171d7971d547ddef228c0035c369310b63ec392f9acb36 SHA512 520625ac6fc823eb12c31210f810b5febff29da6f35c94757c4515fe9828e01381c3be4b1e2881d071515369e780ffbabc55bc2972205ba69e99f8dc9192b782
-EBUILD pavucontrol-4.0.ebuild 896 BLAKE2B 145ad515e336fdecc116a28206cd64783d8fac028ccee8f0237e822a0ad1fc3a74e513bb7b8d5e2aec43341ddc59a0ed59d640b4d9e6afeea96ca27a0ef80e36 SHA512 56a023fc2cada0bc406f23eba257905b4ee1869c470b50f1bf70b3f2056f8b041faaba4dd327561edcf111fc6f37d3400afeea953d816cda84a4823b46395035
+EBUILD pavucontrol-3.0.ebuild 871 BLAKE2B 3a137fd6ab316730a519663bb163599146fa721bf4c1336f0dceb236c2b038bbe74effa3d3f31a5283a52acce3539e5264ffe1dbec17b2ae83e8d7b019a89625 SHA512 c820a7ac52a7b8f95d860a6349aa0e453ee9e3c54330ca3cb0f23e5fce2f790aca1d503b691db274a3494abb7639c07d92d9c71adc2ac7c410e3bf30611401eb
+EBUILD pavucontrol-4.0.ebuild 886 BLAKE2B 768219367cca2f1abb75253bbfa1884281679ff179d1ed657af1da52844c2e549ac8f1b14d564be81e70b3c27fd856d879274481f416a5a7620b52a053433143 SHA512 32a7d8ff5122547819100a120c559621e97234e4ccf1251933bc44361be159d517da2ffb9b2b1755530f9e1574819659068622eb21f12113ec20a39aa138d96b
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/pavucontrol/pavucontrol-3.0.ebuild b/media-sound/pavucontrol/pavucontrol-3.0.ebuild
index f32f253d755e..074bee782902 100644
--- a/media-sound/pavucontrol/pavucontrol-3.0.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-sound/pavucontrol/pavucontrol-4.0.ebuild b/media-sound/pavucontrol/pavucontrol-4.0.ebuild
index 4272b6334cfe..182d6ce2c562 100644
--- a/media-sound/pavucontrol/pavucontrol-4.0.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-sound/picoxine/Manifest b/media-sound/picoxine/Manifest
index 0c90f179989e..cfc6964a5e8d 100644
--- a/media-sound/picoxine/Manifest
+++ b/media-sound/picoxine/Manifest
@@ -1,3 +1,3 @@
 DIST 39596-picoxine-0.0.7.tar.bz2 13677 BLAKE2B fc76726213f7f931988dbad6f7e3975171ddb852db0c3d58b74f400b27aae8d2231769f8db554394c373d8156cfe0593097b4216c189364f54af572ddf58d347 SHA512 c028e5f0c8dc8d692637ee091322d608c89509a7d9ab842ce15e14b28a940f03c356e8fdb8c90eb26ac9a7eed9c7c0e20c15eb0de06cf88e4e495cb99eabbbd9
-EBUILD picoxine-0.0.7.ebuild 804 BLAKE2B 92fd0f1261271695b2d380df4830660fbc39a24bf2bdd470898811e292b63274afac68cf4ea26a06dd318dbcda353a9147a680ebb8e1c82776fdd80f89fa8d3a SHA512 7b3c5ac9564cb861eec6f6522c2662fa31c5210e05f273c4755c26e96bc602cb797396c28e19440c8eecfac7cb2ab479902cad09390659272c9bf2ab815ebeaa
+EBUILD picoxine-0.0.7.ebuild 794 BLAKE2B 0f27ba66a46c4c4c35cd9d66b253c092466202d41b803e697302b096a654ef8d44e8cd8055ff66d45230e1aeb04834e04852b8f74a7e48c5e3cf139f57f4b06a SHA512 b9c11578b61f320da39f96afd77a10f10d3d6ea985cc96243aa858f5420eaa68ed943f0acc09ef7e7478214161ad2105bb64f0e6a369061ddf040cf37626564e
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/picoxine/picoxine-0.0.7.ebuild b/media-sound/picoxine/picoxine-0.0.7.ebuild
index a9252df8ab46..32ccc01af5d9 100644
--- a/media-sound/picoxine/picoxine-0.0.7.ebuild
+++ b/media-sound/picoxine/picoxine-0.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.kde-apps.org/content/files/39596-${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="media-libs/xine-lib"
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index fe40eb5466e5..10d2f2f15783 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -8,8 +8,8 @@ AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-12.2.tar.xz 1665092 BLAKE2B 2e36efc5142c1e379cc2b135f4126f03a31831b26efe60f7cdf128af6e23fab25706a5609644d0b387530021055f87525fe60d527cd3a087f51bfd58e810644f SHA512 877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
-EBUILD pulseaudio-12.2-r1.ebuild 11536 BLAKE2B 28892f7980092e0a314c5d69edcc88d5d9be7dd7a8845f4396f2d4a885ab69b1cb9298f3bb720beed253b5a3ed796ba8e55c94c63f7a4e1ec9b4ae7e369f69b5 SHA512 529c755ecbc2c8596cf295fc56c095dd7b987a5b7e1eea9b35ec04993ca0967e1afa52027e3a7a864d12f362f25d2cc1e2190b6d4c91a5cb730535c6bdd403b2
-EBUILD pulseaudio-12.2-r2.ebuild 11718 BLAKE2B dcf014538084f982a90380f3bc358686bc8ddeb6fb636d9ea1bfd2203db7216a35efb728c68cdd57ebfce55365e1ddbd6c944665220dabf1a59960c8b41989b9 SHA512 b016a7fd49a61715da48737d6e8e8a2473a5c3794d133d3b410b3e917dee7cadd46630526b193c39c3cac8cdbedf9a3ffe482a6a0185fd399a1272df47ee29b9
-EBUILD pulseaudio-12.2.ebuild 11111 BLAKE2B bd002a2bf9d7c0521eed3baec7d2b602302e8cd4bd7acd6ea22abeff54ee1be8042b44bcfd64a7f4d57f2855a958235d5b16fcf018f0377cd5f5faee040c84e2 SHA512 dd20835fb783428209dcffa07b0b4c1ec9f3e42b91faf07052df5f77f3eac388ee91dfbfe2da7f07890ae3631234a8a14bfafc41875c6716c6b8b9e839ba0f21
-EBUILD pulseaudio-13.0.ebuild 11558 BLAKE2B 6f0b32fb371e0fa3257eb4413f037b07fed153f9017e26d7d78827e7a04db437ac9daa70beb9e0c64c2d1a59e4259cc4a365dc086e6e9af95a308616f5b05ecf SHA512 a2c88bc6e487ac3795cbbf66df34df7f9a0de153a2fe77c3467c578bbf7f789b3f5442c906fb643c5d24410211488f0fc67f0977b2093b7dead18dfa32469777
+EBUILD pulseaudio-12.2-r1.ebuild 11524 BLAKE2B e5bc795b25e2168669f7cbfdc8c0978e0cbe4505303e7fcaf6880be67863e7c0adef2f1191eb0f87526bac69bfebe75890e0d57931b3738b62214c74b64f461d SHA512 c5d49ef2a1cca32102f7115892a5047af11a09edeef0653610c5d1e1ddf385fe781496929d3d2f150f9aa210ac4e6ea7fd5927b639f5416827f82b39583e20a0
+EBUILD pulseaudio-12.2-r2.ebuild 11705 BLAKE2B 5ac1b15972f9273eaef6aa9a32bd71b7cbab9825a8557ed53197fedd0e726cbe40668e52e0092cfed397348b2ca4ae2980de6daec91924089a8a9548775732c8 SHA512 0aaa32ed145fc37a1b8d1de1fa00dd597fe8a093e80d5d0392a29e842abd0ac0cc447ccaa2fa51f86072465bb95ec8c55717db732cd1400faf319b5232a39fb6
+EBUILD pulseaudio-12.2.ebuild 11099 BLAKE2B d33df38bacc886aaef22ae97f4be401dbbb057573454285801258f413368c5b4efc287061bc8bf4a8bc5008d473912304604d66399d5f6edb2a4a6573689b30e SHA512 c040da91b5156d9da07a8bb5ef19fba4429def61204b7784d55329c5504de04eefcc3fde06bd614bd18820b9753ad924ca42dfb2ab50ff66a26144bf25fba469
+EBUILD pulseaudio-13.0.ebuild 11546 BLAKE2B e8b0ff927a906f63ac0d721814430c160036ce21385dd6fcbe678e581b550712d66b5a569b3e4816dcd94b56c9f49e3c181d013046c0039ecef02da04cf32d2d SHA512 250d2aeb6c5a05eaf489e975e7588f9baf45a103d392207b5bd1a39b62986fc659694e3331afa63745a75e295c89e36ab44646e7a7c6489fc3fdb49035550363
 MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild b/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild
index 2768e832e130..c4c92bb67f48 100644
--- a/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-12.2-r1.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-fbsd ~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/pulseaudio/pulseaudio-12.2-r2.ebuild b/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
index 14fcb10d3ed7..a661e7070d97 100644
--- a/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-12.2-r2.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-fbsd ~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/pulseaudio/pulseaudio-12.2.ebuild b/media-sound/pulseaudio/pulseaudio-12.2.ebuild
index 9c17d6d71b00..35e17253e500 100644
--- a/media-sound/pulseaudio/pulseaudio-12.2.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-12.2.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-fbsd ~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 gconf +gdbm
diff --git a/media-sound/pulseaudio/pulseaudio-13.0.ebuild b/media-sound/pulseaudio/pulseaudio-13.0.ebuild
index 3c16e3f4d8d7..0fb8e6e4a0ce 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-fbsd ~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 beb64b200599..c71adc298e5b 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,8 +1,6 @@
-DIST pulseeffects-4.6.6.tar.gz 1881680 BLAKE2B 9bb1048b3870824d19f72e29da2ee274ed387bea7fae0036a104694defd47f754fda3fa1668a95ddb8c2ea066c457bb469c3c32292dc7a378625c6f19d9339ff SHA512 ed6482169bb06490bbcbc57f293723089e5750279a74d6ec5ba2693cb1a71df88262e6fd7d91c852ba5a75b07c246992f619299017e856fca38ad5c619486963
 DIST pulseeffects-4.6.7.tar.gz 1880914 BLAKE2B 919f9885c8b991782251257ba13512c5c25ae6590fd3f709b9f142f74f80f9fd15bbdc0cd57a7a7d84cc4c94c795f69db57a13b161cbbebdd2458803e36e8ccc SHA512 138ea6081e3b1751f0cd15d6ae1eb0dbc4156493b37f7c8b48878a6600ec19c8846145b7bef3bccb93b6775bd4f0b9ee998c603152c6526540eaaebcdcaa5d2e
 DIST pulseeffects-4.6.8.tar.gz 1882449 BLAKE2B 57a93eeb32304628efb51473912a70485e054ef50e9e9aec9731ba761dd7809ce0a8c3838fc74a04c6a29537bf182a74c6e6715c722ce76670c8be71dc4a5608 SHA512 672204ad90534ad45228b3473902eb8489c8306c7850f2b2a6f983aa89955529fb5381d6a7d703de94dcd658ffd5b560cce17291a0b23654b225ebd301659e74
-EBUILD pulseeffects-4.6.6.ebuild 1803 BLAKE2B 62eb4d5b56e930df0ceda31bdeebf26ae89f80108f1754c6718342468481768dd5dcf8a5b0006a77ced1a92c3d8504142b65dc558b26defb4295caf20699e9c4 SHA512 052459a1211ea7a74265723b6d4352d0c79346195aab43136b74f3be7a3cd29a4cb8b53874b9106419d7cc3dc3e194dc36c7f7b67aa53450872eaf614f305a33
-EBUILD pulseeffects-4.6.7.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
+EBUILD pulseeffects-4.6.7.ebuild 1803 BLAKE2B 62eb4d5b56e930df0ceda31bdeebf26ae89f80108f1754c6718342468481768dd5dcf8a5b0006a77ced1a92c3d8504142b65dc558b26defb4295caf20699e9c4 SHA512 052459a1211ea7a74265723b6d4352d0c79346195aab43136b74f3be7a3cd29a4cb8b53874b9106419d7cc3dc3e194dc36c7f7b67aa53450872eaf614f305a33
 EBUILD pulseeffects-4.6.8.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
 EBUILD pulseeffects-9999.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.6.6.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.6.ebuild
deleted file mode 100644
index 9ff4d83fe6d1..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.6.6.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="${HOMEPAGE}"
-else
-	SRC_URI="${HOMEPAGE}/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.6.7.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.7.ebuild
index 0e6624cf2428..9ff4d83fe6d1 100644
--- a/media-sound/pulseeffects/pulseeffects-4.6.7.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.6.7.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_REPO_URI="${HOMEPAGE}"
 else
 	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index aa5a5bae9d96..ad5da3549fb7 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,8 +1,8 @@
 DIST qmmp-1.3.2.tar.bz2 1221919 BLAKE2B 3081aa6b3ef4712ea064d5bb23e9ac7da5e102fde820c378438c13723bd007fe8e79ac351b0ad01ca0aa22c50f6b6773965ce418742cf1386d2ae1d7ba7b1758 SHA512 5c68d87650abf10d03dc8638df73a6694e470af1121a936bb983bcbcea04d95616ad8a55d87e8874b51b7424a890dad2c5353afe65db7029f6513a382e2144e4
 DIST qmmp-1.3.3.tar.bz2 1244817 BLAKE2B 913f52915f30607044168d906b151cde8e7ac5e3c5b82c452b4f297c5e5eaa05ff2fe139c671a46beba351f34bfb013a8eb4d98483dcfe260fd63d8f6b09e244 SHA512 92deda33ed90d5e802258ae014452e5ce384c6ce0d437675b28ead8a838bcbbb2d0b4242b98b2a0f32cc922e7af69b72479fdf8a7946f1fe041a6803a6934c8c
 DIST qmmp-1.3.4.tar.bz2 1246048 BLAKE2B 8108e1b5f0098ee1338ccb72889614d6876855f22159e48cb54a3000a855e843d623a3a491ebcb2e7b627c014946190117bfed586729b424dd5a3564cfdc5ba0 SHA512 520a7b50a3e0bd17418bd3137a4e73a52f644ad38d7fe86647a8781ed3036cdbbd14d5311b9471443f8a2cb42422b5fa11e22acee72ff5b670a7508b55364bb5
-EBUILD qmmp-1.3.2.ebuild 4268 BLAKE2B 9027930e327d56248e1d4d83e69895a3ad9b0ffc9d26d67ce8ec073b72a8392de89509e59041f79e778c2e1664c4a62fdab3df8645a0cb8edf724f2879575310 SHA512 1786f3400aa0d8426744149bfd0ea1c7c2a3180be002972c52e800d33747f8beb8efca9e4a86065e944aba709b73673dc4f056ea9540828cfaacbdbf76186cf2
-EBUILD qmmp-1.3.3.ebuild 4270 BLAKE2B c9e7ba05de9d12abdca56bcaee34767960e656be3461c52c5e01dd2d6a0c7272938d245f75500e4258bb111feb3efe538bb14673fed0bf192d25fd0b5015b743 SHA512 affd8b3ecd07dffdea15558805788a8082e490f991922dfc3a612ab523010c4c21f0ff172e9f6db955c30643eb94d2a2df923c02f1878ac03a4ab36f93b99c19
-EBUILD qmmp-1.3.4.ebuild 4270 BLAKE2B c9e7ba05de9d12abdca56bcaee34767960e656be3461c52c5e01dd2d6a0c7272938d245f75500e4258bb111feb3efe538bb14673fed0bf192d25fd0b5015b743 SHA512 affd8b3ecd07dffdea15558805788a8082e490f991922dfc3a612ab523010c4c21f0ff172e9f6db955c30643eb94d2a2df923c02f1878ac03a4ab36f93b99c19
-EBUILD qmmp-9999.ebuild 4270 BLAKE2B c9e7ba05de9d12abdca56bcaee34767960e656be3461c52c5e01dd2d6a0c7272938d245f75500e4258bb111feb3efe538bb14673fed0bf192d25fd0b5015b743 SHA512 affd8b3ecd07dffdea15558805788a8082e490f991922dfc3a612ab523010c4c21f0ff172e9f6db955c30643eb94d2a2df923c02f1878ac03a4ab36f93b99c19
+EBUILD qmmp-1.3.2.ebuild 4270 BLAKE2B 51832e8de7fa487b4893f91d7d9b1f8f16f4210884e36a5b5fadbcf9a0c119ccdb98c5dfd298be67bca33d627cda31b1e3ec6f1e68074d05bbc6b27f5d898e86 SHA512 0ce1c2846df26fc86c5484a3b4fe9895fff0c9c275165404e5423dd6dbe624bb6a880655b4c4bfa7832cba5aaddf831330e0294980e6ee9d6775d35eb4bffa01
+EBUILD qmmp-1.3.3.ebuild 4272 BLAKE2B 34b34812d51d014691a9ef07fb544d7cab1d36b767495655b84e7bd19ae01aa00a3fe8c495dd3171333e330f1b152c14be9b101ff0c4b463c9853c3bad920ee8 SHA512 f5db03a9d8bc0ee3d6c439dc09121de7e5156fb30cdc36099289a856ee148a165447ba8830f1b1a43bf0927b79af0310d5a46dc6a03d788205d5b92a8685c33b
+EBUILD qmmp-1.3.4.ebuild 4272 BLAKE2B 34b34812d51d014691a9ef07fb544d7cab1d36b767495655b84e7bd19ae01aa00a3fe8c495dd3171333e330f1b152c14be9b101ff0c4b463c9853c3bad920ee8 SHA512 f5db03a9d8bc0ee3d6c439dc09121de7e5156fb30cdc36099289a856ee148a165447ba8830f1b1a43bf0927b79af0310d5a46dc6a03d788205d5b92a8685c33b
+EBUILD qmmp-9999.ebuild 4272 BLAKE2B 34b34812d51d014691a9ef07fb544d7cab1d36b767495655b84e7bd19ae01aa00a3fe8c495dd3171333e330f1b152c14be9b101ff0c4b463c9853c3bad920ee8 SHA512 f5db03a9d8bc0ee3d6c439dc09121de7e5156fb30cdc36099289a856ee148a165447ba8830f1b1a43bf0927b79af0310d5a46dc6a03d788205d5b92a8685c33b
 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/qmmp-1.3.2.ebuild b/media-sound/qmmp/qmmp-1.3.2.ebuild
index 479ae90ea42c..ba1cd14b3f13 100644
--- a/media-sound/qmmp/qmmp-1.3.2.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.2.ebuild
@@ -75,7 +75,7 @@ RDEPEND="
 	projectm? (
 		dev-qt/qtgui:5[-gles2]
 		dev-qt/qtopengl:5
-		media-libs/libprojectm
+		media-libs/libprojectm:=
 	)
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
 	qtmedia? ( dev-qt/qtmultimedia:5 )
diff --git a/media-sound/qmmp/qmmp-1.3.3.ebuild b/media-sound/qmmp/qmmp-1.3.3.ebuild
index 13f7bd0c2f20..c0516ae68779 100644
--- a/media-sound/qmmp/qmmp-1.3.3.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.3.ebuild
@@ -75,7 +75,7 @@ RDEPEND="
 	projectm? (
 		dev-qt/qtgui:5[-gles2]
 		dev-qt/qtopengl:5
-		media-libs/libprojectm
+		media-libs/libprojectm:=
 	)
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
 	qtmedia? ( dev-qt/qtmultimedia:5 )
diff --git a/media-sound/qmmp/qmmp-1.3.4.ebuild b/media-sound/qmmp/qmmp-1.3.4.ebuild
index 13f7bd0c2f20..c0516ae68779 100644
--- a/media-sound/qmmp/qmmp-1.3.4.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.4.ebuild
@@ -75,7 +75,7 @@ RDEPEND="
 	projectm? (
 		dev-qt/qtgui:5[-gles2]
 		dev-qt/qtopengl:5
-		media-libs/libprojectm
+		media-libs/libprojectm:=
 	)
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
 	qtmedia? ( dev-qt/qtmultimedia:5 )
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index 13f7bd0c2f20..c0516ae68779 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -75,7 +75,7 @@ RDEPEND="
 	projectm? (
 		dev-qt/qtgui:5[-gles2]
 		dev-qt/qtopengl:5
-		media-libs/libprojectm
+		media-libs/libprojectm:=
 	)
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
 	qtmedia? ( dev-qt/qtmultimedia:5 )
diff --git a/media-sound/rplay/Manifest b/media-sound/rplay/Manifest
index 5cc0b267dd4b..b6cf79dbd175 100644
--- a/media-sound/rplay/Manifest
+++ b/media-sound/rplay/Manifest
@@ -1,9 +1,5 @@
 AUX rplay-3.3.2-built-in_function_exit-r1.patch 366 BLAKE2B 104e722c7da8a97b5fc8abe58a9efe8b6cb7fbfbebe3493eaa094ac9580ac982eb32dcdfedd1ed11a972a665514788db6c2c29ac51839fa979692aaa56eb3f60 SHA512 6c5f358a6ef89b7338ae5bf2e485a3996e143fdab0c73455d97bdb2e07729464323992d72424d29c954f2537acef2c45ebd744db6a2e26b99ffd97be2f44957d
-AUX rplay-3.3.2-built-in_function_exit.patch 358 BLAKE2B b816acda01241b80cc9ae091c7d66cb7b78c3ff8ef05ac989afc28264667126ce096243d5349330c5427c146af9b6e702cd4eeedaeb3cf2fbde7fd542235a1d0 SHA512 64c95e1f01f414301e7fea56986e2cf5230b1ce30bff909984fa489105c9951e7d9c05779dfa542aa8002203d0fbb3d71b0fc0412fa849d21b7b8786aaedc2ed
 DIST rplay-3.3.2.tar.gz 480015 BLAKE2B 5f506e81a5c9bad175c8906cb3104564ec9c8c6f4496382a428d77dff6264d0f39d3ab9af7cb83b0ef34bccc14f15978e399d428c62f6dafe46ee8ad70d32d37 SHA512 b0683de0f5dc1483d22ac68c0502fe66e89ba1c25300fdca9486df1cb6ea96393b18b783f918f18dba0ba0fbfd20410448e3e03df06fc4afba1b63024d82a713
-DIST rplay_3.3.2-12.diff.gz 25322 BLAKE2B dc66fd94076e7ac3ffe863db98b326ce0272bd654d4a3e86ec6d9eb243e237c2db383b2fe7b0e1f750a1812e4a54ec73e7e0200d1562aa898c5bd549814e32ba SHA512 b9a178fbca44cec9814ef0b65e4924e18c053ec6f0024c30b35abbcd9062c094bfffe3ca7113c74604df80b12b38d412a45c645ff13903e6b23500ea99f89d7b
 DIST rplay_3.3.2-16.debian.tar.xz 25456 BLAKE2B 34c69d95c964465a04681d7cb4c1a66b34d486e540486d1b47d9590fb893e574381405c15a48bfec272f3b566f5b3ab6ce88806497f8d1533f441cbf9481a3a8 SHA512 8d5db7862267fd0ec7f27896b6a76708304e54b9f2c8a52621c0a92c4688511e07a7820b2468c93032dab15f27f5dda1f8931e35d95e724501e2586a5851486b
-EBUILD rplay-3.3.2-r1.ebuild 972 BLAKE2B 894346d8cdc7ea39a3f7e69e92b3a3645df8848699be6258518b2b1a28e1605e1a9febf8cd7384003dbde0dcdfe799ec8e8cabc3781316e5e09203a7fbf13762 SHA512 d9dc52fe82472426e6d8217003fd0d46bf4dc4af7b57fb67b7356821b39604be10a5429973606b62e0949c60b030df2e5ff99e9c0249e53d27ec962a5f0d5bfd
-EBUILD rplay-3.3.2-r2.ebuild 1125 BLAKE2B 24522fbbbcbb42cda98f1692853708beef98a42fc50f998aeae58bd8234bdff1f75fa34fef2412e71044bbbbb3d4b8275416c110694a5bb1c3ec6b2427d2cc40 SHA512 8b949b1f97bf29b94cc9eac103a1cb365bee26da8f3dd91f2c6ac187cf0254366e36bf062d95fe0cef79dee0f3797faee54342430ecd3719c6e3c22fceb73785
-EBUILD rplay-3.3.2-r3.ebuild 1209 BLAKE2B d3e526574a7db10d1cbedd3eef847ba69f9ee45ab11657ce6f1c89dbf7479625c13019804cdf96bdb4b510edff6c2d2d29d8ce30186477dd22a6a8090ca91380 SHA512 fc852a0ef5090f3fad3aff066f7d2488822af639ba428c65ce27e6e584755130991cbbb1cc2fcd862b52c10dd3b601266bea0f24354ddac16f4fe9a064d5bc86
+EBUILD rplay-3.3.2-r3.ebuild 1199 BLAKE2B ab197ef138876fec5dff1a3f3ad33594fcb0c372c73c85a960b668d42d17a794138734c43982d75eab1be2832f206b38b6215ca4617fd2153eb5cf88abd6e917 SHA512 b199c330119034bec58fb50edc586d1e04ec2ec0f6fca95c59f1f6d12e90fb8e5a82c292506e25b79189dd0801b07764d2a3e798c2e50d0bf011d9e8fc76ba81
 MISC metadata.xml 602 BLAKE2B 12db89459ab4cc0696d1c6ede006c6f0365854801e2a67ae060fe0a807fc8021d5d4c0b992ee1adc21951bba7aaf5734aa7c4742feff563d8b009322f58cc5d7 SHA512 2133c5096ee010c0470667238f9d600c4617b9659615b3302abd81eb7b4b84107cfe9efa2070d5536d91aa11a90be1865703cdd5f92d0ea1f8718336a65cb272
diff --git a/media-sound/rplay/files/rplay-3.3.2-built-in_function_exit.patch b/media-sound/rplay/files/rplay-3.3.2-built-in_function_exit.patch
deleted file mode 100644
index e7b59dfeba88..000000000000
--- a/media-sound/rplay/files/rplay-3.3.2-built-in_function_exit.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- adpcm/decode.c
-+++ adpcm/decode.c
-@@ -6,6 +6,7 @@
-  * Usage : decode [-3|4|5] [-a|u|l] < infile > outfile
-  */
- #include <stdio.h>
-+#include <stdlib.h>
- #include "g72x.h"
- 
- 
---- adpcm/encode.c
-+++ adpcm/encode.c
-@@ -6,6 +6,7 @@
-  * Usage : encode [-3|4|5] [-a|u|l] < infile > outfile
-  */
- #include <stdio.h>
-+#include <stdlib.h>
- #include "g72x.h"
- 
- 
diff --git a/media-sound/rplay/rplay-3.3.2-r1.ebuild b/media-sound/rplay/rplay-3.3.2-r1.ebuild
deleted file mode 100644
index b2a812355447..000000000000
--- a/media-sound/rplay/rplay-3.3.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit autotools eutils multilib user
-
-DESCRIPTION="Play sounds on remote Unix systems, without sending audio data over the network"
-HOMEPAGE="http://rplay.doit.org/"
-SRC_URI="http://rplay.doit.org/dist/${P}.tar.gz mirror://debian/pool/main/r/rplay/rplay_${PV}-12.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="media-sound/gsm"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup rplayd ""
-	enewuser rplayd "" "" "" rplayd
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${WORKDIR}"/rplay_${PV}-12.diff
-	cd "${S}"
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="dpatch" epatch debian/patches
-	epatch "${FILESDIR}"/${P}-built-in_function_exit.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		--enable-rplayd-user=rplayd \
-		--enable-rplayd-group=rplayd
-	emake || die
-}
-
-src_install() {
-	einstall || die
-}
diff --git a/media-sound/rplay/rplay-3.3.2-r2.ebuild b/media-sound/rplay/rplay-3.3.2-r2.ebuild
deleted file mode 100644
index 4083ac523973..000000000000
--- a/media-sound/rplay/rplay-3.3.2-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools user
-
-DESCRIPTION="Play sounds on remote Unix systems without data transfer"
-HOMEPAGE="http://rplay.doit.org/"
-SRC_URI="${HOMEPAGE}dist/${P}.tar.gz
-	mirror://debian/pool/main/r/${PN}/${PN}_${PV}-16.debian.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="media-sound/gsm"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${WORKDIR}/debian/patches"
-	"${FILESDIR}/${P}-built-in_function_exit-r1.patch"
-)
-
-pkg_setup() {
-	enewgroup rplayd ""
-	enewuser rplayd "" "" "" rplayd
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-rplayd-user=rplayd \
-		--enable-rplayd-group=rplayd
-}
-
-src_install() {
-	# This is borrowed from the old einstall helper, and is necessary
-	# (at least some of variables).
-	emake prefix="${ED}/usr" \
-		datadir="${ED}/usr/share" \
-		infodir="${ED}/usr/share/info" \
-		localstatedir="${ED}/var/lib" \
-		mandir="${ED}/usr/share/man" \
-		sysconfdir="${ED}/etc" \
-		install
-}
diff --git a/media-sound/rplay/rplay-3.3.2-r3.ebuild b/media-sound/rplay/rplay-3.3.2-r3.ebuild
index 01ae984a688d..8f3e4f47ac28 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="${HOMEPAGE}dist/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
+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 61b6324ca369..3be1a1be5a32 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 576 BLAKE2B 25c9520116bc74f17ef7dc57ca5fa1e41be79c82a9ccd5c7819898af993e6216cd394163a12ec91be46053291b91c86edb0a98e9f41d9fa9ab4e4c908d3e5843 SHA512 b7a4732c2b02e94a935bb86d7ec89ca1ee2c1c47e6accb70a1096527c1134158b8b6daab9bb127fae946cd4222213e83bbd6551ad67295e02acd6f45c407dfa2
+EBUILD shorten-3.6.1.ebuild 566 BLAKE2B 2323f749abe202309952725b53c52f2004c88f70f956013fea904079e131721ecab5a56e5e3e684a042e49adce4cb51712c068362fdfb8ae70f739251c819f92 SHA512 6349239ca2ed899f6378ccfcc4176a1f0b4bcff8b0a1eb2a88e4e7d9d7aa3d307f42cccdf804a0916b6624e27a3913dacf6ae62f5d22b2279846de06d1637637
 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 600a5902ea5e..633278326a9a 100644
--- a/media-sound/shorten/shorten-3.6.1.ebuild
+++ b/media-sound/shorten/shorten-3.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://shnutils.freeshell.org/shorten/dist/src/${P}.tar.gz"
 
 LICENSE="shorten"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~ppc sparc x86"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index f1c7689f397d..4dc04cd9f740 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,3 +1,3 @@
 DIST sound-juicer-3.24.0.tar.xz 1019588 BLAKE2B 04ba81aaa2e02fa0f6d7bfc1304be3dd1eb750c324c577b4a12809fbf43fc5ff74339750af3d99e91dc66bb0f0e4e6c33144177421f34258fb13c949a3fd5b63 SHA512 7bd158a4e3a7c3072513fc508f59cd70b6d9371cde142fdb58597e72b3687790b9368fc7e1a35fd8c7b49cb28703f8b2da4a789854f96cdc0af076278818a91f
-EBUILD sound-juicer-3.24.0.ebuild 1495 BLAKE2B 88e05d2a4740ee85ea85d2044f2d03d48283040e794b020dc35757cc18ad386135f78a79ed2ed3f3f6a3ef1c82fb6f34cc9d4df48634609cd993d3f205813d33 SHA512 79b3a9d4d61d4213f4f2c2f856f80c34817d1bc8ce0b6854ff353d8a693f3b6cac2105babb1b604f43735388a0d6e21513f2175c8860c134ecbb1ccac7e41137
+EBUILD sound-juicer-3.24.0.ebuild 1485 BLAKE2B 8f47a8198a79cba4f7b37e0895bf8ef4597899b7904c79c79f27ffb1e9781a1c67b4f7ebe3829cf9e39996ecc66d0e0f20421fa590f0c27a97d9701a518fef01 SHA512 5c781c5a8729f0998a3a123f660f2ed5b3f946cfdf12c40fe6e6c2bb5027657fa0a265405525070b313abe39af1463d572ff3573c3e6fb45fb6a6b239d35da73
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
index a71ee1afec83..0af3611a9e9f 100644
--- a/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="debug flac test vorbis"
 
 COMMON_DEPEND="
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 2ec802edda02..2e0f9a99de18 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 2617 BLAKE2B 16de3a69ba83189cc3285b2886e2f04081fd875f8d0c85fd28986d0e5bab9afaade01fa39b02adc39f21cc92273dc55e65ec8d71f8000ec0adc96229a76e9ece SHA512 b503cec195701776966eab7ee510faf0f76b48f084bd6a2addfdefcdb8c1eb50370cd7ddcf214524da89d06e8ccd57d1859d84ce2ab2d158ac7b5c71eb6fff46
+EBUILD sox-14.4.2-r1.ebuild 2607 BLAKE2B 8b50093e27d71edf76f14100745f43376b160fcde381dce4909233fee05ebcdd75be9a05485fb7a5da1bb1f8258e66d8aa940ad3cb148f766c04060085389cd0 SHA512 70180b12514d64cea8de2964bc78063932cb16d9b1f827aad1f69b4079aaa6eca7800e821525dc9a7a14820b943f57adecc05c56f1c2738a7ac13769f9f822e2
 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 0f5768a5812d..3b4ee0db4648 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 ~x86-fbsd ~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/timidity++/Manifest b/media-sound/timidity++/Manifest
index d160554cd143..bbe4b9923f2d 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -17,6 +17,6 @@ AUX timidity.service 190 BLAKE2B 909311fae666b9970a8b4d56e1848f907ffeff1fc9e0cac
 AUX timidity.xpm 1522 BLAKE2B 9aee528dbf843d992d548adc923f817373013760128ae96df7becb6bc844a95ddc056b072dbaea1528d9db5c2d4836b09f8316b740c75033fc23a0bb76186fab SHA512 1630fc235e450e5420c598357ad98eed6f04b1d1035fd6284dfeb2e633ce5d80135f89ea593d58b4eac2b9405383787e4d891b9c22ff8b5ac3ece64e9abe7d4e
 DIST TiMidity++-2.14.0.tar.xz 1356476 BLAKE2B 8d4a360d1c16b250f3bef7c010e1e263fdda13446437ff2454dc2c2a717246c4d27836a3b40586b12b33e175bc54ee211a3a1798005733461cf5833eda11811a SHA512 d8fc06fa36e4dd42de80c61943da4cd9aec5f8aaf31057a9ededa633d2d48e64c4e53391378d82a7a46ffe4f96c756b010ea9727270f80b134ae1f8bad535bd3
 DIST TiMidity++-2.15.0.tar.xz 1363040 BLAKE2B 63612dc96ddef9b24ca35a8fa24c22fee8b0573efb09543e6017070b2d0a68494bc34afe8ffc50b5f7fe2d95397a971d5dc7afd4c9adbb524b119012e716b7f7 SHA512 36c3c79d941903109d5d6d529963d12e8192a857e80402ad5ab0d1e223451a7cf5dc8fdd046b22ae7da96f413d68db8587a8fce348635838eba2f30f7019192f
-EBUILD timidity++-2.14.0-r3.ebuild 5317 BLAKE2B b708c93a6b944ca3e6f248dbfb454e962b272891787d81dc375d27b3a3b0db99193bec1639c738496e47d55200c7eec97f4ac1fa618fef768906334bdeae1830 SHA512 45bcefe69f07d111af5a37c96b3a36cc3fe7ff175823a4db49973b540a18f14d2f93a71f5251bc36ec4367d810869c698fcc7d54261d293e14427bb760aa11d0
-EBUILD timidity++-2.15.0.ebuild 5203 BLAKE2B 2479e9bcf7c4503c876ef65f56249d19aaba76382749b0ca998f2494fdafa46b247de37c10764e735c5c201048f723de0bf02ee51e9b299309124bb4d1013680 SHA512 6ae5d163f322429acb976915318c8d82a8f20c38b41840446b38edc87cd1ffba7d4639c790d1e396a4f1a8e5f4f7ca5183baef66bf0baa2dde184ac7313db0f9
+EBUILD timidity++-2.14.0-r3.ebuild 5307 BLAKE2B a4863b43b4ca2aac94b7b2b52bf0598369712ef1a7d993e2c49081724658571923c92791564f49aba74283a536949a3a228268c8220b5bf10620b3865fbf4bb2 SHA512 676cbf84c8861ac7ecc3c4a0de45fa1b6a7662327bfa6404d252121283fe6e380bfc6fad4812d2463c9832de51c942aa8e2f1ac94a31c836aaeb916b1830aa49
+EBUILD timidity++-2.15.0.ebuild 5193 BLAKE2B 7262e16db8ea52afb6d742625cec6028d25ecdd7c5b68de2dd767691b89ea0aa4bb76eb8194bd91812df54661b3dfba5f42beb054888db59facdb672beaa0450 SHA512 4e56e52ef1514dc1ac685651d2aa5ca6c7a0db216b3a9c6c1b9233b5780770ec6e3357cdbb55d581ef386602e686d6d03f9c62504045e0033a6c743c487ac0dc
 MISC metadata.xml 331 BLAKE2B 0e52df0230422381a5982f075e39f00e982f9948a3d3309d183bbac93569d908fe3603082f11943fc35e3b8bd1c76bc131e7525c91e3aac5b7d9461093686f71 SHA512 b4559e92a59ba70b25863304bbdc59225c6ccbf3ee9ab8516db6987a19e8b5b7b6ea95f40c9ff55ed33c194ab174360d5f8fd6bfafa43290bb97a3a2093289e3
diff --git a/media-sound/timidity++/timidity++-2.14.0-r3.ebuild b/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
index dabcdf61ba8f..11f7cc697dbd 100644
--- a/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
+++ b/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X"
 
 REQUIRED_USE="tk? ( X )"
diff --git a/media-sound/timidity++/timidity++-2.15.0.ebuild b/media-sound/timidity++/timidity++-2.15.0.ebuild
index 678ea59d2575..3f93fcd10a9a 100644
--- a/media-sound/timidity++/timidity++-2.15.0.ebuild
+++ b/media-sound/timidity++/timidity++-2.15.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X"
 
 REQUIRED_USE="tk? ( X )"
diff --git a/media-sound/timidity-eawpatches/Manifest b/media-sound/timidity-eawpatches/Manifest
index 23642b8cef98..5d4ba8c57061 100644
--- a/media-sound/timidity-eawpatches/Manifest
+++ b/media-sound/timidity-eawpatches/Manifest
@@ -1,3 +1,3 @@
 DIST eawpats12_full.tar.gz 32047230 BLAKE2B e2711c59e95b29f77d07dc7465e1eee717007759328ce03c85ae4897d6507ad6801ca7040b1b08d26fcefae5afaba1d6415b6fe152920b58a77947682a9bfb08 SHA512 fb5532c85653e624ed310cd5607d1e24231bcaa9bf966548e9383daf463b9221b21945d2786db0bc44dbabc5342b224a4cbb6c9329f1eee1ee8137d56b3cf71a
-EBUILD timidity-eawpatches-12-r5.ebuild 1337 BLAKE2B b69d663b94ce9402a0404705f3da52999286f826acc0752d64c44ebec29c7324f07f0dad12a5df133ca172668f5adcc19ca5b36e4cb05ca7bb47ec9a73925a73 SHA512 431eabdff41aad5c0c9fc6aa90fba8675684130a47068e21fdcef885704627e3dbb86fd69e3dce5cf44b47fc315aa117bb66afcaf02604ff0e84e89276e44083
+EBUILD timidity-eawpatches-12-r5.ebuild 1327 BLAKE2B 652d0b6d0701e78e7bb7dcbab6a6199e348885aa51d1e513d0c2bd3ad907bdf865fa48d577fabfe18591268edc420a94ea1b878f770b7376993298cb17bcb09b SHA512 35ccd833af645011df43c3bc0175efec5ffb0b861d5d6206a45008233f06d47e736f4a81e76506490b1d1b2880c48bf16980fa16890bdb7b2839e5578f5c08c1
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild b/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild
index 51ee7b9cd93f..942dcdb38ee7 100644
--- a/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild
+++ b/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://5hdumat.samizdat.net/music/eawpats${PV}_full.tar.gz"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 # These can be used for libmodplug too, so don't depend on timidity++
diff --git a/media-sound/timidity-freepats/Manifest b/media-sound/timidity-freepats/Manifest
index 8fbac2bb62f4..38674a258f0a 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 791 BLAKE2B 6de5f0da7c12d8320f614e4f284acdcaac221f0e1b54e6d1fefd87ef00620b20375877e075b28fc202a37031fcafb703e2b6232b5db847a6fc207303edeb9c81 SHA512 c533b764053456e563cf995ed5c98b9af70f76b4a38b01e8a4406b44619ee245fc69cd28bb050a9bca23eff69dc6bc6bc348697a59fd0f2bbb463aeaeb40c48b
+EBUILD timidity-freepats-20060219-r1.ebuild 781 BLAKE2B fb0b6418cc9eef9a8161eea9420c794bdf2bc7d7c42f921fe9541a8a7fc810e5d2d48ed0aeefa7ccbaaa1a805be9e47b4980d67cd2ae42b60e8d4cba64b7a04d SHA512 274a40f60296d3dae2b05be8722a47c65eba3bb1bb6f05e557df67fb8692ffdd8337c7ca14ea264af4d5ed076d2cec8cf92c8d481d4c91439f863b0d3dd08b14
 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 52ec79eab505..575a8efa0c96 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="${HOMEPAGE}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 x86 ~x86-fbsd"
+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 a9e5ec8a940c..926f20d522ae 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 757 BLAKE2B 98926405f83a568160af371b91e1e267a9733978ab9f4af0e5c0bcd37a819a4c30a2f105c104a0506c8a08d6b8b61e5e5c8094b9900aa91b50bd1cd7bb776b52 SHA512 9e947dc2c25cdb6cd48697f91975c1385ed5b83f3e6675f504e182fc22fd5f466175009532d5f57ad1523db27658ffb9e84860f3d7912580551378a04135a220
+EBUILD toolame-02l-r4.ebuild 735 BLAKE2B 152e4cda68e1bac875add897f45d969d508f91bb3d121e9b1365f775213447db715b73aa14412b5a243a49a155d410d3bf5ee2f9045b19411cb608bb54700298 SHA512 dbe29d01458f96038ef732b2cf0da6624220e8e2515cb4c33a1e331a8e2e72af21e991c5136f7e81a867806e9c8eb71fdb53ad738a7ab97bd64be006f69bd209
 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 4d732b6a5545..65cdc928f631 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 ~amd64-fbsd ~x86-fbsd"
+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 b833bc3a6267..3924f593b8df 100644
--- a/media-sound/twolame/Manifest
+++ b/media-sound/twolame/Manifest
@@ -1,4 +1,4 @@
 AUX 0.3.13-perl-tests.patch 779 BLAKE2B eba221a58a16dc22ec7e6a10388045db6a2b2535a9f0a55e47a01315aa0c0121c1473aa6ff9f53b7bcf4b70a849a0b19bfe3125213f558c17ecb1d4fd1349376 SHA512 1c483daf75991fa6d390360d9108803f65fa894745140d3955f73ce8e87eb813a068efa810988ac462ed22ae0bf3d0f95b63feb5c823ce3bfa3a0dc9b9a8f413
 DIST twolame-0.3.13.tar.gz 660415 BLAKE2B 741e91983546241b984ce95ef3b1c3b00ff2c1e84f496961749b13b932a1c3fdcd44a3fde3a24e44d9a3ff9e859e64780ad60949f827d986608c51c1afe44912 SHA512 241ae5faebf05cb919959bb0545cb89e9b71cfb07f92a7118d864499ea4f0065ddaa646ab1482ffbcbca427d52c2436764074bd67fd19a1eb9979987f23163f7
-EBUILD twolame-0.3.13-r2.ebuild 1257 BLAKE2B 782644eec5de1359844090723c0a147f4c8495615ea782f05a1e70564d0866b7b891d1183f90ff891b87025c81a7f0af04faa92e1c9edc93fc0650a464e82c7f SHA512 f9edd745053e414f1c551d98a00f830b03f93a99391ab857b4586576a6b449c58ec982a8e98d65522260d8912abab4a486bed22247e12371c1a22e78cb8341aa
+EBUILD twolame-0.3.13-r2.ebuild 1235 BLAKE2B c8e1905e12ad4838cf303a174e384f493e58c0537c53e9110cec7ed9496bd11e65734f73db16991af260708350886389108b524f2292090a4990ed716fb94887 SHA512 9bf472d563e846c485b3d2e0c9a8f270d65ffcb18845c8849b668d67e508ac8fe971fe770e87c9a512f806f57405bfd2b52d6fe44291d5d685cd72b765ed354b
 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 8894f10ca4a9..df17f0fc8121 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-fbsd ~x86-fbsd ~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/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
index 1abd1f0fefe5..7366a04cdb67 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 1209 BLAKE2B 534f416e532934aeb7d3e206a37b858b92ae18042154f1b31e60c67c4dca684b39a2bf8e5bc692d2833cc18e521cc0159bc2b5e978d2c2cd394da27979ed94f2 SHA512 938ea8ca7496a0f2e85b1cedc73f7f9745909bbf919c218468717fe590346469f991397226dff0f58fca6d2b6d885fc7399ec38d4612c3fbfbdf238abf85e536
+EBUILD vorbis-tools-1.4.0-r5.ebuild 1199 BLAKE2B 2dcd31a3859f5a0c816d1f8b3c40cf7e0c16a067d7e7f3ef2a7fc3e35e9f8456f98d9c95e800aeddc91a79b16c0cf86b5362df881437b0bf41bc63299f0edf79 SHA512 3bc726093c1f5bc8248cb0f85b2aa7805cafaff612ef3fda58577b6d833b2959581894d9c15b2bc4d171df52117866c5fa868abfa2c54d3168ec0d69000c13b9
 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 7587affb5980..db37da7bf6dc 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 ~x86-fbsd ~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 1520c544a907..8c4369d6a7dd 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 988 BLAKE2B f814ccce82ff920b417f63428b640d1f473675c1460639b4a836871a2ce2249cf0c7e06bbe0caf008ee6449a3341274d17320baf7c35a4b363633b7e60ce3cdf SHA512 42afa02f257b569aa6bb8b27758c2027399f465c22c2ca6bfc247e459bbc07b80e925516b6b4ad9f071f79549c73ec9d02595604e5f693bcae394d9eceec64b1
+EBUILD wavpack-5.1.0-r1.ebuild 966 BLAKE2B 49fbef7600b0b2073e8c9f5ec342d8b0e59ac3023dd95c6e0d66234f64cc7253bb6f6c406d4fcf88225d3337059eb72148eccc32947e2805e7fa1ab4b8918838 SHA512 762006a3806870180d763687920235a96851d662577c29c39ce337fc1b225ad5d3f897208f4965f37eb175c6da9c41f2f62a718ca75ac2a6f12c771f9a748c50
 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 2bfc5691ce79..041956f9efb6 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=virtual/libiconv-0-r1"
diff --git a/media-sound/xfmpc/Manifest b/media-sound/xfmpc/Manifest
index ef5831847b53..3f620c938939 100644
--- a/media-sound/xfmpc/Manifest
+++ b/media-sound/xfmpc/Manifest
@@ -3,5 +3,5 @@ DIST xfmpc-0.2.90.tar.bz2 449973 BLAKE2B 89b1e0136fdc161857fdf50a47b5dec388f9e99
 DIST xfmpc-0.3.0.tar.bz2 443234 BLAKE2B ee0f491baadfb6be9148de8060758f788f773bdbc0354d6061889e979fb16eeb7a44357b61e698908c972714616b4268ed443d1d6323cbf0f457cdfd6cdf0fc1 SHA512 6e876aca2c2a6764fe97f061c97dc0fa9ce72b7ab6a2597b5f54bdce39789cc73bd038a0ef69b87d826c225efb9c3a2d19aa9ed7872ce7ee9ac5d7bd275444a3
 EBUILD xfmpc-0.2.3-r1.ebuild 774 BLAKE2B ecfffb22006c3452b3d0cf54bcdb9d993fb274b3adee1b72164beddfd4eb3a786863fd8278c02afb8052e89fc748ae90699ebada619436d0fccafbf3d9c004db SHA512 5b1272722cac67bc3b6c5492a64f63d85e22014dda9f45eaf8e523df5e56ddcef562a57db71093721674f82db0665933522b66922fca16d64cd9757d69f7cca8
 EBUILD xfmpc-0.2.90.ebuild 759 BLAKE2B e9f3b13df3ed0e2a45580051576db384e43016751f2aa15a33194685a1f41c7fbaef20cccc19ec716e59c50b64ff94d47e22d61396c6b8aa05e79ad259292d64 SHA512 7105976a5d8a3f779948b5363bdd4a2261522a4b041fd8d4ea48bd1fd0ee2c643755abd59feb4ba4ba3fe7de4f7c3048032f6d7be804d050b6a5b170eb521eed
-EBUILD xfmpc-0.3.0.ebuild 770 BLAKE2B 5523da1c07592d3b51b3d18729b33fe9102316bdf2e6baa1718a5a05a73a60c6e2b52894e190d6bd9a3d0d8a316914c9e0821b4f3d6a2cadc599d6008faf623e SHA512 c4de99cac701d6f5fa6e125813cb8b86540f3b7fe6117a9657ca6af82f8577d73805e65fb1926df83f54b47639bded206a1efa5e6dcaa559d0fafd76e56fb718
+EBUILD xfmpc-0.3.0.ebuild 768 BLAKE2B 94c1ca9a19414e7b1d5cd217a4aa67b41525717227e76a267fc9c864c1635f96b1c94d877da81e21c505c6e515b9a32e02b7ae0bb74e681aae419cfaa5c70073 SHA512 5038a745344bed18aecfbf515dc7278935bc65ab0a81012f3df44dc1803a062a877dd8ab584369c7a7c979ed3f278a92b4328309d25af88654b4ca4ff1b0ea95
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/media-sound/xfmpc/xfmpc-0.3.0.ebuild b/media-sound/xfmpc/xfmpc-0.3.0.ebuild
index 18a7bd3b9554..3f00933bf48b 100644
--- a/media-sound/xfmpc/xfmpc-0.3.0.ebuild
+++ b/media-sound/xfmpc/xfmpc-0.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.18:2=
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /media-sound
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)