gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /media-sound
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
173 files changed, 885 insertions, 1738 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 75811151df39..9a225e3107fe 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index 56a420f211b9..3106e59a70bc 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -2,5 +2,5 @@ AUX abcde-2.5.4-eyeD3-0.7-api.patch 622 BLAKE2B 2ea52354945fa8d503b06785b0a6a1c9
 DIST abcde-2.5.4.tar.gz 104229 BLAKE2B 38244005df80868e24a21d39f3d4cabd6d8b8d6e4d8384a37c01a40cc550b584a3fc4ee1dcd88ae05980cf4a9368a51d2035e49717faa8086b922f2815f735a6 SHA512 be3c8f697873b65888a37ea6209e161a6fc7bbe26c6e139b211b1fbcb233d3e250b21f6fad2114962ca4dcce79240e2cec51f69ce47549c737071a6122694791
 DIST abcde-2.8.1.tar.gz 149238 BLAKE2B 0adb1ea164e72292ee1e5b7e99c6bd9a92342f9eb5036280b91ad43ab62e5b0ef79652d094a81f38f4052c749d874e12da76eaf74134d07517fc8fac1f0d7e64 SHA512 18e9e46ec69d0b99fc5e2b71ec549e3961e5f6d7f88cef1a6c8da154689554a70cc8bc748c1ef78f81583a510f8b03906b8a4fec454aa0b06f0169d0bc4a7b36
 EBUILD abcde-2.5.4-r1.ebuild 1556 BLAKE2B 1b05caec47b0dd5b10d530641d5fd7963b1746524b6a660bba397e8bbc94cb0468f2a04a7f72f75870c08561626091a32cae871e3832bc16d00e32715a3a084d SHA512 cfae3e23754c1b6a8170d8f4046a4c436ae7247f19e9af3c4397229bc5677f55d935bed731ece8f316edf91f7887e6bf39194d4f094f3810ad9306c7a189e030
-EBUILD abcde-2.8.1.ebuild 1756 BLAKE2B 84baa7f929ae4144ab55b2b470eba21982306ee02afed134de69aec855b3abb23637b0ed1b485047ea00fda2ec2e408bd8c3b52fa5a3d7183a81a5dba870433b SHA512 4010e4bdad8d4b489c6be85a9c8eb96b17a05f51662e6a88d6a888ff05b99f4c0e7060063e7f7a3e7bf8a9fc7830d9ba29e4207d5276b734679a88b0c1cb66c1
+EBUILD abcde-2.8.1.ebuild 1750 BLAKE2B 4a38d572e6c9bcc40b505c77e23914a1e84379871df34efa7151d25692d82eae2331e6001c30d9d2987595bb216d5e894dc9ad740214e44053c514556307d3ac SHA512 70a2f5379c8f1ea3aee668dc8b1e2981745868230972391928428051b5f60e1d8baeebd81bf8a244f543e47dd257b811077abed15330bb31854af9790bec4d69
 MISC metadata.xml 588 BLAKE2B d6639ce0154b4d8b2ad0c7df4d203c7da5650687e24c79ec92977a8e7534539ac62f597b31a3488f976d8f1f11a07f4a77c9b936c56b09ad8e965076e89aa1e8 SHA512 375d7d28e8fb20a86cc92df73927b27e065a975c850aa23575f0f1ea7cc88b46e8eb92013a8b1ff44d5cc150c0082da8142fa41bec49d642c14844ef1a5b1cb1
diff --git a/media-sound/abcde/abcde-2.8.1.ebuild b/media-sound/abcde/abcde-2.8.1.ebuild
index 7ac38d645102..1dedefd70a54 100644
--- a/media-sound/abcde/abcde-2.8.1.ebuild
+++ b/media-sound/abcde/abcde-2.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://abcde.einval.com/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 ~x86"
 # Enable MP3 related flags by default
 IUSE="aac cdparanoia cdr flac +id3tag +lame mac musepack musicbrainz normalize opus replaygain speex vorbis wavpack"
 
diff --git a/media-sound/abcm2ps/Manifest b/media-sound/abcm2ps/Manifest
index 29e27ac0c584..bf9306280572 100644
--- a/media-sound/abcm2ps/Manifest
+++ b/media-sound/abcm2ps/Manifest
@@ -8,7 +8,7 @@ DIST transpose_abc.pl 21045 BLAKE2B 08a28cd9021410ed461283e057ce89000846b9e733ed
 EBUILD abcm2ps-8.12.9.ebuild 926 BLAKE2B f1f268ce6ef144df2babcbf9c0df3add68432b770178d3691a292a3f9f88ca2396299eefad816286a0ed967a135a909327f8a7162ffc510ce72582429149b9a8 SHA512 322377f6f6e14a0e77685c9ab0af1d68676d8e846bc7ee9d134655a43ce5e10385ef08050952242a8fe155ae9a0e11be88a2a7c87885c2a36006bf4615fd95f1
 EBUILD abcm2ps-8.13.10.ebuild 928 BLAKE2B 9d8011958b30d0a15d5a010c6c142e277b804f724757b59b726df1cff84be4b397ef5ef82be2a180b670a1a1bbb89d8904f21bd2967edb57fa1f9b1278a7ab4d SHA512 114dd7423b6035d2f890e5b5325704eefd2ab7f5dec1ba0073cfdbbcee9feea99e7aae1e7e99c3d9156dcc3b782cdb2f3267a8aa54565c2e678739564783a54c
 EBUILD abcm2ps-8.13.11.ebuild 928 BLAKE2B 9d8011958b30d0a15d5a010c6c142e277b804f724757b59b726df1cff84be4b397ef5ef82be2a180b670a1a1bbb89d8904f21bd2967edb57fa1f9b1278a7ab4d SHA512 114dd7423b6035d2f890e5b5325704eefd2ab7f5dec1ba0073cfdbbcee9feea99e7aae1e7e99c3d9156dcc3b782cdb2f3267a8aa54565c2e678739564783a54c
-EBUILD abcm2ps-8.13.12.ebuild 935 BLAKE2B 95371dd825265a89d981a73937ad7d5e27dddf35865561bd91cc21085e567432c0e05ded06ebecaad20813740341905c75ed420ccbce0a25917776099b5354f8 SHA512 7bfb4154114273f6572fd487c4cab15af18db337884b7c8ad24bfefa32926598acd65fe202f79862602b3213bd8199f946451855fe99d9026cccac1ed20b74fe
+EBUILD abcm2ps-8.13.12.ebuild 934 BLAKE2B 6fd161bbca70c60e3546172aab6e9704f8c4bc07a39c8296fe03eced7d8a545d4ff75702ce4809d7af638a500f5e77e78a3b382f671fecea2a527c04278fca23 SHA512 c0e3fb4e054aab640a77c61cb9b7874fbec64d47ae5a4c80141e3b3e5c89381365307b1745e37218971150e2d8d74d8f2a9397059cb531d04aa26994f38bc24d
 EBUILD abcm2ps-8.13.9.ebuild 928 BLAKE2B 9d8011958b30d0a15d5a010c6c142e277b804f724757b59b726df1cff84be4b397ef5ef82be2a180b670a1a1bbb89d8904f21bd2967edb57fa1f9b1278a7ab4d SHA512 114dd7423b6035d2f890e5b5325704eefd2ab7f5dec1ba0073cfdbbcee9feea99e7aae1e7e99c3d9156dcc3b782cdb2f3267a8aa54565c2e678739564783a54c
 EBUILD abcm2ps-8.14.4.ebuild 876 BLAKE2B 4736ba1d5fab17fe909e206be14c5bbc3db54a571dae2e012db8bc55a527185d2cb0806a2745455f56c6806f56369fea2ff4f0d8ea33fc2d42e0c2d70b04e0c9 SHA512 d3f70c0d2a4d5258bd3174670ec80eba024b3c58532a4515ebadb5e646bac3b5a693f554aa5871e1229cd5709556216bd91773e22c561e5fc8e04aeb8b170459
 MISC metadata.xml 360 BLAKE2B d590a7cb36ab74b8880f987b711b24df69a96e9a1fb9e7a5e8a0ff08ad65a5646596aeb866af37a2f4a4acd9984a211acbcedffd855ac5b88506e627d02515ed SHA512 7612e5473e6185cac8f54baf6e1bc1bb75e9e6b252d2cd59ed8865c190e0fee1924cbe6e6fc79c03fedfbcf5f9228d45244483b7ec2ccd7a8bd4997c4b6893c9
diff --git a/media-sound/abcm2ps/abcm2ps-8.13.12.ebuild b/media-sound/abcm2ps/abcm2ps-8.13.12.ebuild
index 06691aa0af01..e934502071a0 100644
--- a/media-sound/abcm2ps/abcm2ps-8.13.12.ebuild
+++ b/media-sound/abcm2ps/abcm2ps-8.13.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://moinejf.free.fr/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="examples pango"
 
 BDEPEND="
diff --git a/media-sound/adplay/Manifest b/media-sound/adplay/Manifest
index 7c182aa7e094..13cc74e22fff 100644
--- a/media-sound/adplay/Manifest
+++ b/media-sound/adplay/Manifest
@@ -2,5 +2,5 @@ AUX adplay-1.7-fix-c++14.patch 615 BLAKE2B d6e3a8f50257a7c6dcf3d058c7637645f7ff2
 DIST adplay-1.7.tar.bz2 264340 BLAKE2B ea9231c66a8233ee1d026bccd073440cbbc0e8868469aee33ec0e18c7d893fa24dd20bb4fe960f908db0666e7ee5c6a4afd14051b851b011418796cc0cc2c939 SHA512 854a9bee1057d3a42308d9149e74a8abae0b6bdfda5e1466086df9d6aeed4bbc92a045bca02917fc699b43195572b39c6316ddf56ee3441add1a01d6cbbdfcbe
 DIST adplay-1.8.tar.bz2 333582 BLAKE2B e5d0e3baf3f37adb1a2f42eee368fbbcb3947b0c651415b60d5f1d648d004789eae0ef75b7e6ac8ad9f90ac9941332e713e36555167648a40a871659083d1b59 SHA512 6a82b10fa73ad9317303da03d2fcb1fa97772d850f3f78f53c554b9daaa9ae5d04bc2f0a1b1d25fd5d3a1eab073641d6fa0589070721612987d57762f03363c7
 EBUILD adplay-1.7.ebuild 749 BLAKE2B 10c474d7f9f47f00ca55b3cd32568c5387156671f64943cbde06f98dd7694417e26ab3801fa1627b6cad0a5d7e730a1bf18646f26f0225ee48363ab18c9a3b9c SHA512 b54d9e6672fbe0cd86fe86fc33bda8159e016c9a8d06198b4a0dd0a42dd2651ebfe13421e16de3d655c89ae2d319cd0309c2faddec12bb3102a2ad832a2a4a56
-EBUILD adplay-1.8.ebuild 727 BLAKE2B 0372362b9b94acab18f6218505e12a7d871d600af2d23d159493b5120839f528fa62592cfb5599c62df3bd269bd6c80f16cec84dc75737b9b9198b6f7e05e9c0 SHA512 05e8162462884a0a91f11363a9a26a0435f6dccf68c710ea831b9aeb03ac393d944e4b56d7399ecb266c3447b38e1060bb0ae98a1a2193b1c0b0bd19b06a4bd5
+EBUILD adplay-1.8.ebuild 726 BLAKE2B 53febc1166be82279e9fee04d8065d2f349c294a3d426c5ad3673c3b0ba22f04490f33e60b9c86fa8895c57ecf6546a36e14ea78b2db45b9a8e622829dca75e0 SHA512 268beedbaa61b6abcede8be30626fcb30874f05535ba30c60dbb657f4985aff3ddc822db0a9916eded5f2c35bebb760d1f5dcf48697bfbe0e77b8c0def05f742
 MISC metadata.xml 387 BLAKE2B e8dec98b4529ad29a4254bd8bb45b79264ec513b5d5b6368fa00c6755842835e84cd7b709ff884abe892656ee38d1c2640a884b9936876fb5b01ae3371c9e41e SHA512 98c5710d7d8677c0e6152d5ab7ca43b835aa6a8718352047c3424907e390662d714a6083a80cfc6b502c8d504d666deadeb20a917d8ace168411247e531d8af4
diff --git a/media-sound/adplay/adplay-1.8.ebuild b/media-sound/adplay/adplay-1.8.ebuild
index 76afd8fa9a6c..81cb182a77f8 100644
--- a/media-sound/adplay/adplay-1.8.ebuild
+++ b/media-sound/adplay/adplay-1.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/adplug/adplay-unix/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="alsa ao oss sdl"
 
 RDEPEND=">=media-libs/adplug-2.2.1
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 47656b4d7122..d1a5b58c84aa 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -4,5 +4,5 @@ DIST alsa-tools-1.1.6.tar.bz2 1778330 BLAKE2B 256ffaef47f78c07f1d8cd86df57b2f75c
 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 3549 BLAKE2B 20d2c75e3e1276871c30dcb8e4202502aac46c46a2ad6cec946706f9e32e5d8f49ab50a01ed7913814bc3b6a3290db84af78e188182f35d1d97879b952b7d673 SHA512 c35600237d55050fa2410d67a27a733ea482f5e4327b2ddc94292526c06e89f8cda41c44fca6e678a0751177c8d4cb26de54d79694ebac55778fc8fc64e856c2
+EBUILD alsa-tools-1.1.7.ebuild 3548 BLAKE2B 35106ec6215558f63133431a436a287a89541e64c26c8ffbd40e2081cc93bc6c44f5f51826276d9eb2c096cd2bdac9ff02f8083b1cd0c066ea1d8e66fbf83422 SHA512 850c2a8d029dbd37e7cf9e3fed04b26ba6c5e471407c46116ddf695d4528487b04bcace57e20e2f1a5e72438f53730b202b81ac5c78a794ca76977175b7d3d68
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
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 90bcf068eaa6..876971ee2953 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
 alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index e150dfef9fa6..94ad77bc919c 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -10,5 +10,5 @@ DIST alsa-utils-1.1.8.tar.bz2 1262174 BLAKE2B 643017f8f31d88356a2a55b5b1249d5b70
 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.7.ebuild 2266 BLAKE2B 55f1b932f6812fb453d7f5fd2cf432b046297bd90a998c85fa338e0ece9b45f06ce7083988f48876ab481851a5e5e5de94a7291cd602f935b3c89ff3122f0c87 SHA512 6ff5c859af866ce59d46952fc25d1f4f5402ed1aa458ec2798a51647c9cc1a5424f0f3c3a1b0b4327f501f239f8bd25eae9880f7d414a2774581b720a1a207f2
-EBUILD alsa-utils-1.1.8.ebuild 2325 BLAKE2B c1c1f42135253389c0ad5af2cf97209c8276d65910fbb64d7829575f81e5d5bc7f7840fea011cbf431d1db1ed69d233dfc77883e6cad32488c7bed2ff9c5865d SHA512 165ac58b035d4831411e0eda69dac2c01e267bd0df1f526e194e74fe990d9ce73bd690c83d386aa48573162895ed0616a5e809ed809bf4b239b73d5688338cda
+EBUILD alsa-utils-1.1.8.ebuild 2324 BLAKE2B f060b776cbdfcc0abbc3db65ae9f248a7abea99e0fee67dc52c9459449318f713831063367ccd19554096ebebad692de238ac9639ae42bdadeb40bff138ac85e SHA512 aa64ad1cdaa7a7a8d252b6dd7d43dc0102b9512349c7fa64114aa551b526e0db4e6dd1d7ca1ef19a22a6a77631c2d2c254e0139bc6bc3e4640c5406b6a87f1c0
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
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 39874af1a0e1..0dcb43c06530 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/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/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index 4c80ca41d247..c305df906e4e 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1,4 +1,4 @@
 DIST alsaplayer-0.99.81.tar.bz2 806906 BLAKE2B 6b37aaa65f6426a43483c3fa7e077ca89ce553655587e0f44ac61ade5d4f5467a304e18ef0142336b0cc94311498ccaa16d9ed2d6eb8109474626c6d1a4ca97d SHA512 6723b36837d01f14645bb1d43ec7c54c85e8afed9b020f56dc81b4de64b74e4da2504507fe83954c7b26817e90510c585d09e759fc11e731d4d27e86f3932650
-EBUILD alsaplayer-0.99.81-r1.ebuild 1923 BLAKE2B 64767934a9aa1e2665db11e0b69ce5beef39ea219be0e005bf69d0e74874e17bc46ad11e085c7815bd11cb1ad313551d0c34c2abb0234653b97425837e555b03 SHA512 216d303c6048621be9e3b10b866086c2d8e48a8a25aaa75acb00ea58d6804fbf0d35ebfa4a0851e9e42dbfaf33a2ce8b77970ff68a64a9e9111fc9a5f5737c97
+EBUILD alsaplayer-0.99.81-r1.ebuild 1919 BLAKE2B c1f73cd22c958ef65582a3ded287337bac220596bc61ffe95edb45246089a7976ee6e153f5dee25c19f28588a5072c196e2b9aa1d67290e14261a1821fbdb231 SHA512 6bf9ebcee6912190c4e832bd9bf30995d46a5feb0054b71d1894e9ed7a3aa9d63fca1132ababd2ec93e9000a9bf77efade7079473d109751e19deaebccae7abe
 EBUILD alsaplayer-0.99.81.ebuild 1953 BLAKE2B 9b474fb6a2b00fa7510d105f3c7d42d807e34ce5f547795607dedd2b0a35d345c11ef9431a280bf5713d475b0b3950cd50327d4283a78ceb6e4a7580707772c0 SHA512 2916eb5516a8caa4bc173a0c579b76824f3b3625303f56ef3ce507f46a4e19ed5a1abf74b1851b57b1d8c1cc729ce0c4f00488aee03410fa12e9367cbbf98994
 MISC metadata.xml 337 BLAKE2B 1f60abc42f95db4e9876c4894ddc16175f17d35b53c7d9fcd425e0124d3fdf08978b349cf2364cfc32555408d1e5ec011fc6367ac9d3e4b7260cf0d2d665522e SHA512 eb9f49ef0aaa5f6ec8c8a29f0459cde3fbbcce419217ae9c22ed6f50dea1893e02037b556daa4276de62aa18fd3193d8c213c6b819d701689fea845d64f97f61
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild
index f1d448e8b1da..bfbd3f058085 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.alsaplayer.org/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~mips ~ppc ~sparc ~x86"
 IUSE="+alsa audiofile doc flac gtk id3tag jack mad mikmod nas nls ogg opengl oss vorbis xosd"
 
 RDEPEND="
diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest
index abf4696c614e..7d1010652127 100644
--- a/media-sound/amsynth/Manifest
+++ b/media-sound/amsynth/Manifest
@@ -1,5 +1,3 @@
-DIST amsynth-1.7.1.tar.gz 1409439 BLAKE2B 80fbd2c56b307cb7defce46e2dafe72ce1a56222314faaec9b2d16be9f4412869e377a8cea97d20803eb668b259f2110179607b4148acb8ba7d5e0ef1bb5b14b SHA512 ad5eff805f3ad30a7cc9f3933bbe82b99c670c669c0c405d5045a410afc75cdc0d692856e73ccf870d3ca66e0997a81a5c35baf57b33bb6012f19056cff725c9
 DIST amsynth-1.8.0.tar.bz2 1170068 BLAKE2B 0b570efe1db69bba04215055147792a9635bc086749ca7d70b5b3f8bc16613310591802c6cdabfd83009bda2c3b109b17ccc9d4ace7681614bed8c42c5f84f8d SHA512 a47489b103dbdd1cb2233d8629acfda2a1d26ac1f7ea5b8c4e7925676842cac21758ca94b50894e71426517bd826e9a9b6fd26800516054e24d62f7cbce4f0f9
-EBUILD amsynth-1.7.1-r1.ebuild 1003 BLAKE2B 54955a36527911ef69dbfb92731eeed27b0f0ff8266dc886697375adc0bc84864543a7610d74884ac29cc365c687b68842414932eeac0d717e611fcf52cb13b2 SHA512 7ebff70fd04c27fd458f0c40266d239c5e6a2255c012e4db4f47d8576621fac0081c22ce62f21136b69d4bd29819300e944bd0aa2b297b5044ef416489a9e8ea
-EBUILD amsynth-1.8.0.ebuild 1041 BLAKE2B 201ab68413c01eda167184fc8043059d3e03c7d1b1da13aae5c7af38290a0cc6de76de0949ef6bca724161595901986b19b38f32f2350f4081881bb91eb96dee SHA512 5a1ba0dd28236911e10c0e21a7b4ea348ab35fd28ada32b0c56eb9d8d49bb5e3c08029a8290946891f9243c0d86ba77d4720d293c106eaca0fcef185315b0040
+EBUILD amsynth-1.8.0.ebuild 1040 BLAKE2B d4927d245ac316c8e82507617d5b911701dcc4e4d083c5d66083155c66d5e756df22de9d71eebbe3045cf7491034b5bf64e80f1de9d7572b1218ac0929159256 SHA512 d181aa4e5642c3f0c03cbdcbb952a7d5468d8a1006a583b6baa236394c5dd66801c6a06c8b934c62139c5b9f3b700cff331141f0776e5509311aee24cf46c91d
 MISC metadata.xml 472 BLAKE2B 0af28a6f759474d8b879c6830e03fe043c623192b36a39acc90c431f93a82eccd392bedd172414610a58f3d74fcea6d41e081dc3cb06eec32b3352be7c2d7bfc SHA512 41a2736e7376b37ab7770ded3ee6653891ab56d4c52c5c96601d2ee3b5269de1fb2fda0de464569cae005b6b08bc5813ec9a4c20bbdf9ba7cec8d5eecae190cd
diff --git a/media-sound/amsynth/amsynth-1.7.1-r1.ebuild b/media-sound/amsynth/amsynth-1.7.1-r1.ebuild
deleted file mode 100644
index 0d1d95723334..000000000000
--- a/media-sound/amsynth/amsynth-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Virtual analogue synthesizer"
-HOMEPAGE="https://github.com/amsynth/amsynth"
-SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa dssi jack lash oss sndfile"
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	sndfile? ( >=media-libs/libsndfile-1:= )
-	alsa? (
-		media-libs/alsa-lib:=
-		media-sound/alsa-utils
-		)
-	dssi? (
-		media-libs/dssi:=
-		media-libs/liblo:=
-		>=x11-libs/gtk+-2.20:2
-		)
-	jack? ( virtual/jack )
-	lash? ( media-sound/lash )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	oss? ( virtual/os-headers )"
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		$(use_with oss) \
-		$(use_with alsa) \
-		$(use_with jack) \
-		$(use_with lash) \
-		$(use_with sndfile) \
-		$(use_with dssi)
-}
diff --git a/media-sound/amsynth/amsynth-1.8.0.ebuild b/media-sound/amsynth/amsynth-1.8.0.ebuild
index 1b250c91fe2b..6d9f401eeefb 100644
--- a/media-sound/amsynth/amsynth-1.8.0.ebuild
+++ b/media-sound/amsynth/amsynth-1.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="alsa dssi gtk jack lash lv2 oss sndfile"
 
 REQUIRED_USE="dssi? ( gtk ) lv2? ( gtk )"
diff --git a/media-sound/apetag/Manifest b/media-sound/apetag/Manifest
index 9d4e8daabcf4..0323684c7fe7 100644
--- a/media-sound/apetag/Manifest
+++ b/media-sound/apetag/Manifest
@@ -1,3 +1,3 @@
 DIST apetag.1.12.tar.gz 29942 BLAKE2B 866f0ed90b9bcdbed3c0a35729327058806478d1c17a7f88528809b1480a2a55f4665ce809737010cc3b642b6ed99ec22db84b7b6ec4b14f73974274f3e31bc5 SHA512 615c495721c6d46e6ce4546ede218efaac1f3fda91dcd9b8da2b8f7c79cc0f5fbee7dd5bc433c0b125973a816980abb8677f16d4000e5e71699524baddd16887
-EBUILD apetag-1.12-r2.ebuild 989 BLAKE2B 8d3b4d947a0a4a1e53cdc84d52b349d596f02ef92e1d29c687baf6d8e941921dde835e785637847c676b5588c3f7a79f378f147efb7fca1292aa5cea41f8ce6d SHA512 6086758aca87fe2440d4dae5bfdbcb0d2b266f39834cf4677269bdb2a5eee25636ca4296c5267b9c979daddec4a780e576e5cdfcdd72465d5f87a16bd78fab38
+EBUILD apetag-1.12-r2.ebuild 984 BLAKE2B 3aa9e1aace83ecb791d364bf015cc92195eb17a193c2910c40594557b0093cc0a94dadb378ab5abc7ed995e93006a63d173101144928e95d48564eddf3f55287 SHA512 c9b821fd2e66627a6133ab39ddb21fca70d3711061984d6d80df34c7aa1a0407e0d7f969879a88b4a087626341b70eb9bb8a902da8d7e921326187a5fe3a21c2
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/apetag/apetag-1.12-r2.ebuild b/media-sound/apetag/apetag-1.12-r2.ebuild
index 831122cb12a8..2bf854f55614 100644
--- a/media-sound/apetag/apetag-1.12-r2.ebuild
+++ b/media-sound/apetag/apetag-1.12-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://muth.org/Robert/Apetag/${PN}.${PV}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index 0eaf7e80b5b8..d11c9dda03fe 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -1,5 +1,5 @@
 DIST asunder-2.9.2.tar.bz2 279227 BLAKE2B 7b8e1a54e4577267d7c4b4fa3f3fd5b434bc52465d3c473de309f48ac196c2d40885acf08fe84669ccfd5c107d7e45e45069c1757fbc2b550cdb8eaa90e01475 SHA512 37b8ed7c7eed46e594807866d29c3bd37cba8d880c68e714168ae373a8d0dbc58cf837dbd704f95ddbe2544880470fb1f176ab6a67643a4a45b048eabb87e4c2
 DIST asunder-2.9.3.tar.bz2 275527 BLAKE2B a113fc2c380555550a5903919b78d5c7f304c3938665318d86dbbdd01d503641413bccc755621cefd948b10fb352f6995252fb548cc5730e1ff50d4b2d6a3634 SHA512 b6546e16c936285584480cf378be11e96717aeedc22a7c5163cc0791a41498597d8437369d00823710c56faabe1dea23e4be9c839eb1ee371415104f13d61296
 EBUILD asunder-2.9.2-r2.ebuild 1043 BLAKE2B b31247afc84f6cabf68b752e49b464470389de98fbcfa7c52fe90080802c16f3b4dfb796c79144713b08987a147db9f8a81e03d4bb40c2f4925e54f363f23583 SHA512 33aeebf7b9062697e34f58d0659fbc3caa306ca53671b218148861a1f5236902c015311ff8dc13fb88379d13ba15b73508e3bfb35a3afeb6718ecbb70b0558d2
-EBUILD asunder-2.9.3-r1.ebuild 916 BLAKE2B d0667f09a4408d0a2506cdac7e28a7a9bf55d60660d2d583ff240e3421da12917a76711c25584b52c9e70eedca1e24f1cd8431c71df60e2820228a20fb260774 SHA512 15602f1ce1ec6be393d591c88743a34c01a15ddff8d40087077906aad551f2ee6f7cd24082b269e2b64acdbee74c4e069125a3e59aaf9742c2ff1d868bcac1a7
+EBUILD asunder-2.9.3-r1.ebuild 915 BLAKE2B 2d7e88359336f93e594a2db8dee57ef036817d0d1a5b36e3cad8e6e1e88624e68956aa3be8a7ea099884a4990a71e4c089549254b20252bba1cdc70b204d8f1a SHA512 7e1138cae82654cd3042fccfe860a7fc717fa64916c988942db7fb48aa5fb6744ff86fb7fe4470a8eb28dcf31542e3f11c70d5adc5ca244dac730c05f41b2336
 MISC metadata.xml 345 BLAKE2B dc144dfa8d94c1293b6b84f24ecdedc8530c4fa19105e3deca1670ca1a43a261094635bb31abec0d027d1caaa4c72c884e4690f43d7af1b9f5b2dc9685502bf1 SHA512 aa6a8d66e2961a176722a5ab0d2db6a1edb246403ac81f2b282d14d0b4a231449d052c48c59f622c04b7582af0545fb97bb430ca89c33924ce24b354b0e2e47a
diff --git a/media-sound/asunder/asunder-2.9.3-r1.ebuild b/media-sound/asunder/asunder-2.9.3-r1.ebuild
index df537f03bf42..ec065b26f72e 100644
--- a/media-sound/asunder/asunder-2.9.3-r1.ebuild
+++ b/media-sound/asunder/asunder-2.9.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="flac mac mp3 musepack opus vorbis wavpack"
 
 BDEPEND="
diff --git a/media-sound/awesfx/Manifest b/media-sound/awesfx/Manifest
index b9abf7f25bb6..7d7b6e76e6ee 100644
--- a/media-sound/awesfx/Manifest
+++ b/media-sound/awesfx/Manifest
@@ -3,5 +3,5 @@ AUX sfxload.initd 398 BLAKE2B 90c2c51638531b7d51092b70af966db961889f0991a60ee8ff
 DIST awesfx-0.5.1d.tar.bz2 282981 BLAKE2B 1d8e656a4645a24c62e355bb091b0c666ca63b8921e27e53eaefe7d7944bd33eba6595d2509946c58bbfd5a0a28e981e4b31b23d364c5744ed5c36482bcebeb3 SHA512 50cd27ca4da8bd38fd11fcdbb2eb8806ea8956c834433c92cb094e0a6ee143175ba85be4665431527133abf8430e6fb60eb69ee35b0afed81d11db517cbb3758
 DIST awesfx-0.5.1e.tar.bz2 307929 BLAKE2B a3bee0750ca44ab2e732f6bdb2c119104521330226e243be1b0ab9c19e2bfd87176ad2dc039f26b9552be621a7af2ef86852e2f31f8d0b9158b093712d2447e1 SHA512 f70e631b6ab6ec6dcbde7773c1da5cba72763d2198c2ac51f4bde0fee80f057f296cabc915aed805e744f7b2323b4e2b20b6d894c79cf5682457a3fc6a9be11d
 EBUILD awesfx-0.5.1d.ebuild 874 BLAKE2B 18627c40d0b192598d797979e7690cb91ac9153b225907f492db3b891010c2007f518c089217fc6e74ee9d5d5f4348cb6bd8db93f1d38a0b72b774401f015de4 SHA512 2a784d392ec1da69b4ae90a19db5f1629dbe253671b13345e33f3b2afdf325d49238b3c24a89fb9892b2aff8fb62c344ad82d9f7df705cc8570ab34a4b0d763e
-EBUILD awesfx-0.5.1e.ebuild 876 BLAKE2B 8521dbf176fbc18cc5c07e6096895f7776498d0fd37c2ab5e2a97703842b148f475176143e629f1f43f7b54a3f7f6b1db0d63b1b578d0d642ff15f57e508cf9f SHA512 5f78e33fc8a83e28690c4c3f16e52f99f83d4dcb16065ef2e46288659e6f66bd049f14f27f77b821e764eb0cb826413d068a2a73eddd8051d07328438b046908
+EBUILD awesfx-0.5.1e.ebuild 875 BLAKE2B ffc1153dfdbbf85816e604b071c6ba7caaf85779d753a6a1b722255fb18cef6359b4042f88923be9b49d2781d2ec6ca670fe0b2bc88b59ff09863340de2f2e17 SHA512 14daabad2d25195479f2c8c67a23bbeed1f80ed672e06cc73c39893768ef8430910de3a4720502f421d467012e3c363b1d461aa1f22023833ab05b13464eca2b
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/awesfx/awesfx-0.5.1e.ebuild b/media-sound/awesfx/awesfx-0.5.1e.ebuild
index 2e218cacb6b7..d8c776ff4dbc 100644
--- a/media-sound/awesfx/awesfx-0.5.1e.ebuild
+++ b/media-sound/awesfx/awesfx-0.5.1e.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.suse.com/pub/people/tiwai/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND="media-libs/alsa-lib"
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index bdf182b44e61..82a2fdaeabad 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -3,7 +3,7 @@ AUX cmus-2.8.0-ffmpeg-deprecations.patch 3913 BLAKE2B 71065d6db1682955e96aa70bfd
 AUX cmus-2.8.0-opus.patch 774 BLAKE2B 3ac353e658ec4bd87e7cf6156d76760fb84ca03b78126403ccc577c169001f468d763341da5df8a63cff2a94f3e732b4ed94384bc94da414c229793c89595497 SHA512 a1f22b620232700a30249a61ee13559bea75cf82cdac9c29ee5ccafb45c689e4c0d487523d613e37cf9c3e8764c9a4170c612721fbf1a56b04ddac63ddfe6801
 DIST cmus-2.8.0.tar.gz 317243 BLAKE2B b24c3dd74797ef26b42c2c303191dd751af7bb3b5c4c6f05bfef393eda9a35371eba4658321d473f9af210321132cfba5eab4037d257dd71c38ea3e24f78067f SHA512 cf359dfcefa833a5b10a2d16ac405672bea762b62b7177c115560127035682fba65c15b9a8710179a343d1f99212a0260b5c095542982202e2cd1bef5b0c17fc
 DIST cmus-2.8.0_rc0.tar.gz 315613 BLAKE2B b5f44b724176ecca61376866da20614ba34e741b8295b8d21ba0eb13226024812dd6dfafe98f08ed367fd9454e787da5ba623b238b5944f5ae69fe58b02a224c SHA512 0379f18497d6510fad35a2d905c932d12f2726a5694d3ab272ce139e9ea4520cb4dd1cf3fafe890f6ada8a64285f8c04ef7571647a66c2d44df17e2dca80f869
-EBUILD cmus-2.8.0.ebuild 3829 BLAKE2B 4645a05212286ce2c2ba9f583ad71d978fa785b0c88d0a43560b48a0ae2ffd6bcc88afb22c95a3a2f7d696d8f7e97caf7d5ad5b6e32abe13f9760dcf6d7f41dd SHA512 c7f526006697f50bf6df78ee8dc4341acbbb5ee3d5558adfef816a9dd664b0587d6db021d3b173ab6c52218a14a6bfac2dc7a344cfd138c7a139f811ba38a5b5
+EBUILD cmus-2.8.0.ebuild 3828 BLAKE2B 097425fffc4be6e97b4fe919582dd8e2725283cdf9f45f0daf5b6882dc3cbf5065488a1a1f11702ddd78fb4e407c0be343954be5b6d9b7cd15495a1a162fbd6c SHA512 301421639c61d74215518ebe879a79786bc3203a78684d41cd272e3658319d19ca060d8fbe796ff6ae46fe14a256ce00111d13878c8f25be3540aaffecbaee2f
 EBUILD cmus-2.8.0_rc0.ebuild 3300 BLAKE2B f4af7df639feff9d976cda04f6bcb9b3cdb2592046ca3ce8600845b0200f34b0541042edb0785010698296775864fc9221876e887f4acd1d675c05dbae4002f3 SHA512 306d304bc131a67960188573ad46da113539c86eb40e7bf78762214065fb69c8653f2af8e19ac140499ad199139c0c12a82249e6f6d13d632704fd99cf49d2a8
 EBUILD cmus-9999.ebuild 3705 BLAKE2B 2452b59c056ad050a8e3015d10d157a0492ddb7ba1620883c83b36129f40dbc4d8838652f88b7122a4b9c6e281175f90be6b63c7942bebc840bd3eb2073eaa55 SHA512 03ded6c4b2fc7b4e1a201e98191d38311be5d2c56d17f9ed8b58af72c251eafe7180f0a5fda5baddbb104790d94e45716abd176ac2d4a4a999633edf7a08bde0
 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 7ad9b48909d2..eeff92441106 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 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
 
 DESCRIPTION="Ncurses based music player with plugin support for many formats"
diff --git a/media-sound/cvoicecontrol/Manifest b/media-sound/cvoicecontrol/Manifest
index 85c4246ee83c..2b60f585ad76 100644
--- a/media-sound/cvoicecontrol/Manifest
+++ b/media-sound/cvoicecontrol/Manifest
@@ -2,6 +2,6 @@ AUX cvoicecontrol-0.9_alpha-gentoo-2.patch 1512 BLAKE2B e02182d5035b863bb194bfcb
 AUX cvoicecontrol-0.9_alpha-gentoo.diff 442 BLAKE2B 6ff8c90887d262d3ee8c755ae695291d2c8c757758254c41f40bf8f07646d3810935f3c339b63525219c1358593e8e42b58a134917c83b4030ea80d5d8479e9e SHA512 6c32c51d621662be71dfc1801296e5766001ac645251f34e69de711f80ce8781bbacf329af51556c72fe70a6fbb823ea84cb55229a0ba667488d0c0ae79287a0
 AUX cvoicecontrol-0.9_alpha-tinfo.patch 561 BLAKE2B 5e67fdd31e96e10e005e03ffcb44e886b78086cc22705721b4efe26dc382d18de46ddf55f3d38beda4d9f45a54c4aa4877b6eddfe2df9dbff1dedfefdbb81c60 SHA512 e6616a1880be116aaf6ad00378ec434fee530bed56c7c11492f1ad3903c3302239599f49e7adcfbc884f59053639f3d73a937ceb5763bac24cd12a48ef4ee5a3
 DIST cvoicecontrol-0.9alpha.tar.bz2 78081 BLAKE2B 162557e9e85ee3e15142a1603a70a23d8e55f6180c006660c020c476aab45d37de3c66df8ebb1ac78ae7c5ddd79912a45dc4b29297899dfc8a0a4b5a67ede9f8 SHA512 c01d932edf563f7c50f5edf36ccc03401372915776489026fa69a12dc545f8698f542dcba054d0d1694a86ce78171bc9507feb47a924996cf3a22e865e0ed187
-EBUILD cvoicecontrol-0.9_alpha-r1.ebuild 842 BLAKE2B cbbffb25cb940b96fc61f659a60c90e83a52dfb76bd1ec01f4198dbb390fa122d1cfaefe1458ab6690ec04b23c2a9546d3054661fc9cda7e10f8e6ec58c41781 SHA512 93efbb1508fca5581cef95f369dbe3e6a123b1998e18b3ccd3a4c1112d39303a1ead81b26e414042ca26bf5c803cd4a3a377803832a3bf5291cf8e7a5e4b6be2
+EBUILD cvoicecontrol-0.9_alpha-r1.ebuild 840 BLAKE2B 449ff6cd5a1aca419ff3afed3001469ad0a5cb4eef002c4aa9717d53a4c1c7004c7a4e758fdc5dc9092c2a2599c565a4c5f467fac2453939ccd8cc3bba55cb78 SHA512 cdca76eed057ffe0f901b695b8e3581218b700264ef0b684a1d50121c40c9adf1d865b583b61adef47f4eab6b8b531c991e68c783fb8d340c8dcf701ec12701d
 EBUILD cvoicecontrol-0.9_alpha.ebuild 951 BLAKE2B 9b1d2ba07c664826373679ed678d0f23eb12478160d8bb0f51f4e4f4280460f067b03096879da4aaad376c233c75cdcd699f76093baf63543ada542dc50f8e96 SHA512 04d08e6961d1e2d9cd7ca55cf62a5452286574f5a49feee282a0475f19f3cdda2bd90acf34d60f13471f23cf42465dcf0209a00983aff2c54cd5aa9bab650695
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
index 205285a0b803..e8555e78e0b3 100644
--- a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
+++ b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.kiecza.net/daniel/linux/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc ~x86"
+KEYWORDS="amd64 ppc sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-sound/dir2ogg/Manifest b/media-sound/dir2ogg/Manifest
index ec0e7a9a630c..ad29c61f0d2c 100644
--- a/media-sound/dir2ogg/Manifest
+++ b/media-sound/dir2ogg/Manifest
@@ -1,7 +1,5 @@
 DIST dir2ogg-0.11.6.tar.gz 19442 BLAKE2B 4cad096f6e727b90e8b09594b1b189b3dbeae581e5ecd485ac8dc853b3f059cd73529422835d682ac7db96d4225380c48ef101343faecc8f32aa8ce056a6b784 SHA512 c5b82640b21e5c94bf15ae174b1351bab11511fee15c30ba39f8ac64103fd5f6934687eb5c025f68adb3e70701f1b644f61800e2d745e33ecb02005f07b6c6b0
-DIST dir2ogg-0.11.8.tar.gz 21145 BLAKE2B ff3fe7586e935bc3d3c2de7e3625807bc91c0b507670af20d9707f777255f3c953c0a084b92e23f55a83c4ecbd1343eb258b1baa8adda158a0a46921c173ac50 SHA512 44275ab5b1bda26e2148b24a1b9fc49ee09e6f2848c1e62d13da12369e28a1f787c695c1547b002f13e1733d14984bf3ca0c425d60ace8bda69f0de28af0ed8f
 DIST dir2ogg-0.12.tar.gz 19608 BLAKE2B 39b1210b2458f7774aef64f29b07826a19b274d17a6038fc676557c8b15bed3662f851b87414b9318be154cdadd450001ea45bd8ed6103cffb2ee183511fe617 SHA512 bd76ba168b6e5305e4e5cfd87333200ec72a1d6e7055e966e1544abc842b39743b479b80c63382e10e85eebad92e97ec33e6fe52b0ace2df024ed50468e3946e
 EBUILD dir2ogg-0.11.6.ebuild 872 BLAKE2B 87808d632d07bcb7508af868d3402486314b0fc18b1da430e3548e97d89efbcc8dfd4121aa54686c26a7aadbc1440a35101fdf8a7f3579ae9507890ff848fa7b SHA512 a85412cd58fca620d19da47247d3bba1878bc91a179381b9a252d403aea5cc7d7f3d6e4700aa8c0c71b0a387d27af150b96f2429309f0ce5fef9976bb0d9f5eb
-EBUILD dir2ogg-0.11.8-r1.ebuild 1145 BLAKE2B 41a93cc9b8d4f3ec250d4a954b5e7fc2727998e6cacc192b7b524564d886581c419e00fc58b35da0a40d41d546d57e883722f92fa7c4d2065b01ea8af7566ef7 SHA512 5d8b1e1ecd29a43a84163f0bb6ffe12b13e65772f011434e1754703316fb58b170895e2624b7cb72ee42953979f3b852bfabca81991c0698a08f3227ce15085c
-EBUILD dir2ogg-0.12.ebuild 1170 BLAKE2B 5d323c29bf9e9b345b866801c62b9c61206371f9580f468f36bcdf49deb41b8de1e4626f939f0950c16041cae6be05d97038a0e214db2c5f6af46fe684af75b6 SHA512 10aeacfbfd77e8c49b2d467466a0f92d91e842671db53cb7a57e0aa7a9704a9c8c1ac36fafa241597440478759328c64c8fe4c0847a58095808b08ae8860149b
+EBUILD dir2ogg-0.12.ebuild 1168 BLAKE2B 80279d00e5d1559d862b178877cb7754a4a360a496dcd494ee497db006d894ecba6976581fc7d6df3798f5ee893cf45106ac69a7923c6486d0a1f721e0b196f5 SHA512 86ab6cbd11e5bdfced7e2e85b836b42a6e1c67825a467edecc8fc7986485d3b020a3943263309f13a4283325ec756a89d1b4ed27f9d572e159af07312b23a031
 MISC metadata.xml 420 BLAKE2B 96885d28693df18ad564fe6ff658cd66bc39b3d556dcb5079ba531fea3bf603cdd558cd083c82bf76e06c170bf21e880600981dcb114117e55d585664119f1e5 SHA512 3c87da9d9f935209757f3731cb1b80817d28eab005b9ce29cc5113e3ad063e61666d1e00585e709b77f1ba3aca5703f4c9f64100c075062cddf58c2f72edc074
diff --git a/media-sound/dir2ogg/dir2ogg-0.11.8-r1.ebuild b/media-sound/dir2ogg/dir2ogg-0.11.8-r1.ebuild
deleted file mode 100644
index 15713d829874..000000000000
--- a/media-sound/dir2ogg/dir2ogg-0.11.8-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PR=$(ver_cut 1-2)
-
-DESCRIPTION="Converts mp3, m4a, wma, and wav files to Ogg Vorbis format"
-HOMEPAGE="http://jak-linux.org/projects/dir2ogg/"
-SRC_URI="http://jak-linux.org/projects/${PN}/${MY_PR}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="aac cdparanoia flac mac mp3 musepack wavpack wma"
-
-RDEPEND=">=dev-lang/python-2.5
-	dev-python/pyid3lib
-	media-sound/vorbis-tools[ogg123]
-	>=media-libs/mutagen-1.11
-	aac? ( || ( media-libs/faad2
-		media-video/mplayer ) )
-	cdparanoia? ( || ( dev-libs/libcdio-paranoia
-		media-sound/cdparanoia ) )
-	flac? ( || ( media-libs/flac
-		media-video/mplayer ) )
-	mac? ( || ( media-sound/mac
-		media-video/mplayer ) )
-	mp3? ( || ( media-sound/mpg123
-		media-sound/lame
-		media-video/mplayer
-		media-sound/mpg321 ) )
-	musepack? ( || ( >=media-sound/musepack-tools-444
-		media-video/mplayer ) )
-	wavpack? ( || ( media-sound/wavpack
-		media-video/mplayer ) )
-	wma? ( media-video/mplayer )"
-DEPEND=""
-
-src_install() {
-	dobin dir2ogg
-	doman dir2ogg.1
-	einstalldocs
-}
diff --git a/media-sound/dir2ogg/dir2ogg-0.12.ebuild b/media-sound/dir2ogg/dir2ogg-0.12.ebuild
index cc8c8840f0b0..a09a25bd5d6c 100644
--- a/media-sound/dir2ogg/dir2ogg-0.12.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://jak-linux.org/projects/${PN}/${MY_PR}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc ~x86"
 IUSE="aac flac mac mp3 musepack wavpack wma"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index 3ed41c35b0cd..243cf8f49fff 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,7 +1,3 @@
-DIST drumstick-1.1.0.tar.bz2 1012405 BLAKE2B ad1e4990cbf4954eadf8c7ae602234852e77abcf534e14090a6e158e9032288fcce6c39b742c40ac9b8c7967dbfcd04578b871088f61ce411de9c910c79e1fbb SHA512 1099b80e1d2819a8343e877742c5f01c114419b2c63a965717bcff2c220aa218f40ac3860cf9496d3586663e73a6c2c7b62aee74c51229578a5ae3044da208da
-DIST drumstick-1.1.1.tar.bz2 1011275 BLAKE2B dff36487a1cf79512150638c793c471fb410c3563184e9acdbd9d441c53596a0bc611d4ebef2b4dc0214c0fef5324443fe0dfe4158f45521762abf4e838cf716 SHA512 f3278be71b1850bbe742ff46b65a656443a1d655c5bcc1e289d92492db985ab185ed140b88ca68f37235c07926be5b82cfe97ae2f95ca7e3a7f48a7c95c61654
 DIST drumstick-1.1.2.tar.bz2 1012371 BLAKE2B e60a5678d33db1831130037bb4a6df6da8de815a6a0ca33a167f85596f45a1d420ca4c689c756c1fd3f794fb2a097bc19878d78bfe0789a40f9eae1b306b769f SHA512 6e84fbf2ce717cdb3c669a477de65d2f32c277073d812546267c0a9556f7ead612e3140cbc412fcd560786ca024f201a1eb3ba9de4b037e3ba8d4db89e0e2e29
-EBUILD drumstick-1.1.0.ebuild 1764 BLAKE2B 2c42c5d81f55c43ad019db34a15765ed2578541e69550c6871898a1b2568fd3b5ff3dfaeadf46e9a5803b284020463f1f7278da2fbcfd9266fe070169d84077c SHA512 26f6cbb97288f9d1b0413f5fc7545491e68b725a9633898b2147d846855bb01411ab3a28b3a39113d277048e90b53e6416104b75ec45fbc15bfa294ed3f2312d
-EBUILD drumstick-1.1.1.ebuild 1467 BLAKE2B 152cc25ca806b624879653c1ba904003ea941941ceea8924f99828c8a55fa0b747550631e4179b14f8dcad46744eb16eb22792e8bcf3f8cb737e847a78454b09 SHA512 b57479c4c339a7d9ca6577787eef67fc1b4c9252b57564405dc7eaf2bd78401d8b73e2710a51e68ca0917310812a3a414c65f4c63c150570fbd2358b7be76a01
-EBUILD drumstick-1.1.2.ebuild 1467 BLAKE2B 41261e947a6f6183976e66b1ea6fd1a2088df669542ca5d5b253bce0855067aae8a00a1b3bb55cb6d3a23e19cce3bcc57e423cc259c10d2c2317c9714f3b4472 SHA512 2571bab9d4936521b08c8847ab866553acd87974b5a428cfcfffa2febe05aa940efece6ee6f1c501b5f1c25db0c376a62bbf8d75e63157a467733abcafbd87c1
+EBUILD drumstick-1.1.2.ebuild 1466 BLAKE2B 1875c3fc6df6afcda35ff243fecdde7e30558a11096976d18a9f22ef595bd32401d72a63182c3ae28a0da9905c99862338225f0d545b10bc3b1153d36db9f710 SHA512 6fadb06cd83001be43e08c5e468935333d6ad045618b407ce84133ac949b083089789f5ff366a26aeda5774ec63d74eb30bcf0553f60db9e9a75b488cc4b91d7
 MISC metadata.xml 543 BLAKE2B ab65d693031858992d6015da0dd074b2fe2975d50136fb105674c9f51b694d6b41e3d0b6f93e2b0928dac68aabd32cf1b4b3081d460639cbe6bd3e8b3a045c46 SHA512 b91230be7ae7d1cce86bba1b2706d88fb4beab8a37f1faef5d4ce79627bea14798d508269c6fe0b132450be6698a9466987b6d71d12006e09f58dc25404e784f
diff --git a/media-sound/drumstick/drumstick-1.1.0.ebuild b/media-sound/drumstick/drumstick-1.1.0.ebuild
deleted file mode 100644
index 3c51d0d2cf4b..000000000000
--- a/media-sound/drumstick/drumstick-1.1.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
-HOMEPAGE="http://drumstick.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc fluidsynth pulseaudio"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.7:5
-	>=dev-qt/qtdbus-5.7:5
-	>=dev-qt/qtgui-5.7:5
-	>=dev-qt/qtnetwork-5.7:5
-	>=dev-qt/qtsvg-5.7:5
-	>=dev-qt/qtwidgets-5.7:5
-	media-libs/alsa-lib
-	fluidsynth? ( media-sound/fluidsynth )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-	doc? (
-		app-doc/doxygen
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use fluidsynth ; then
-		sed -i -e "/pkg_check_modules(FLUIDSYNTH/d" \
-			library/rt/CMakeLists.txt \
-			library/rt-backends/CMakeLists.txt \
-			utils/vpiano/CMakeLists.txt || die
-	fi
-
-	if ! use pulseaudio ; then
-		sed -i -e "/pkg_check_modules(PULSE/d" CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=OFF
-		$(cmake-utils_use_find_package doc Doxygen)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	use doc && cmake-utils_src_compile doxygen
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc ; then
-		dodoc -r "${BUILD_DIR}"/doc/html
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/drumstick/drumstick-1.1.1.ebuild b/media-sound/drumstick/drumstick-1.1.1.ebuild
deleted file mode 100644
index 4c119fe9f8d3..000000000000
--- a/media-sound/drumstick/drumstick-1.1.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils xdg
-
-DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
-HOMEPAGE="http://drumstick.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc fluidsynth pulseaudio"
-
-BDEPEND="
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-	doc? (
-		app-doc/doxygen
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	fluidsynth? ( media-sound/fluidsynth )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-RESTRICT="test"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use fluidsynth ; then
-		sed -i -e "/pkg_check_modules(FLUIDSYNTH/d" \
-			library/rt/CMakeLists.txt \
-			library/rt-backends/CMakeLists.txt \
-			utils/vpiano/CMakeLists.txt || die
-	fi
-
-	if ! use pulseaudio ; then
-		sed -i -e "/pkg_check_modules(PULSE/d" CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=OFF
-		$(cmake-utils_use_find_package doc Doxygen)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doxygen
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc ; then
-		dodoc -r "${BUILD_DIR}"/doc/html
-	fi
-}
diff --git a/media-sound/drumstick/drumstick-1.1.2.ebuild b/media-sound/drumstick/drumstick-1.1.2.ebuild
index ba70fe478c6a..c76b61480434 100644
--- a/media-sound/drumstick/drumstick-1.1.2.ebuild
+++ b/media-sound/drumstick/drumstick-1.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc fluidsynth pulseaudio"
 
 BDEPEND="
diff --git a/media-sound/fapg/Manifest b/media-sound/fapg/Manifest
index b975d84a65e3..69b9898df469 100644
--- a/media-sound/fapg/Manifest
+++ b/media-sound/fapg/Manifest
@@ -1,5 +1,5 @@
 DIST fapg-0.41.tar.gz 94315 BLAKE2B 9814ae7fff84060b647b2e82d0aae3b3fbaa290ea673a7fe9b539ea3efb82d5e310692a70b2d1d976b37714c227665897c5983bdd14e6e14c241e9bd1e4baa45 SHA512 17efde8cf0760f2eb3136814d9d332352b9c378213104a5540aee381482d3da72fd17e63e96360bcffe1850399124f1c6fcff9471a89881f746453a092d64ceb
 DIST fapg-0.42.tar.gz 94920 BLAKE2B b7da3a9df4b3f61022d237fe2b94238d56ceee456de54843062a887710f8faea17cfc6198487317797d9b16b006ccf311eb8e0f9e9e55a2e5d0aed173758457f SHA512 e3bbef35b9c845d80bcd1ee1116e4eb99b98e9d84cff034f2a49bbfcaa7664ab48b9453fb680fe7274fa74e9e0126950fbb15deb793eb95362f74c11151f8731
 EBUILD fapg-0.41.ebuild 628 BLAKE2B c4cd12fc4dcec2ad93660146ae2fdc0f437e7ace8a2b2892fb69e19f504682e8dd4583c9137277d14a6b3f8bf401644c529c618b27caafaad27bfa701f6faa55 SHA512 2a980502ca2761d3862846e1639c7d5dcd27429d8ae2f4eae8d286e95c3444e64555b5d864cda8b91f44e8e192c831452995584996490eb92454351caa283096
-EBUILD fapg-0.42.ebuild 556 BLAKE2B d80a865305fa82f51d4c139b83b893c67ea8a9414b52ae1ed8efd8b4a965be475a1a9297d43b30bd6a1308bf3ca794a91d6ed456f499b16a6b083d256f08aed4 SHA512 d5b5ebeb18bd975d7355d7990d6bd0271b53b1eb671ff1685893e84bba9b3097680ff761954e1d5730b2914c5ea21e71aa0c3772d339c60fad80e6544e433324
+EBUILD fapg-0.42.ebuild 554 BLAKE2B e9348b33ce32495b3199c7aaf53ba388466f967236ca6003b9c21a3f99577c0c671a6c50c46c8cf7935278f03a3cbe32811d784bacd8ceee5d72cafcf0466026 SHA512 4d365a7c8f72aa6fe1599355fd02db328b64fea9960c4303bd3c52767ef46cabc639eb34d3213680a3adab49a3fab589b1e22ed0f9257a1869d8b95eaa5dd934
 MISC metadata.xml 345 BLAKE2B e790a1276e74a87344d475c26e041546981c9d72b52c87f4a059d455db310fa4bcf6423d46e44971fe0776cc3ef52163235d6ebf7dca68aae20d2339c1e946fb SHA512 d8286400b18dfe0d38bd49478c84c5d7bebb24a734a74cbdf60a9e91c51f4ecafa476868351a7f09c064887da841f79e0449910df1f3b2a49f460d74cbebccb6
diff --git a/media-sound/fapg/fapg-0.42.ebuild b/media-sound/fapg/fapg-0.42.ebuild
index 22a8f8f9a2f4..2ce675374d26 100644
--- a/media-sound/fapg/fapg-0.42.ebuild
+++ b/media-sound/fapg/fapg-0.42.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://royale.zerezo.com/fapg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 ~x86"
 IUSE="xspf"
 
 DEPEND="xspf? ( >=dev-libs/uriparser-0.6.3 )"
diff --git a/media-sound/forked-daapd/Manifest b/media-sound/forked-daapd/Manifest
deleted file mode 100644
index 35a46652155f..000000000000
--- a/media-sound/forked-daapd/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX antlr-3.5.patch 1576 BLAKE2B 5fec041e0f13b61cf355ca2a810a03538200cee1b2c97d9bbc5d68da6c16151e18e964da1a5fb6209dfec33e234d42632726fb092a9989f4e354c89c6d7e964b SHA512 221dc595c39ea312cab8d7afb2fbc56736036b4e2bae31621b621318742abcbae9fde5c8a54540d4b1d6b2fc30a7d4accaf812b43d89ecf50f5dd3a709b0857e
-AUX daapd.confd 344 BLAKE2B 62176766f5350bc0335b233431adffae42915abb5fd540e121dbe26da6ce03728bbebed3aa2b79a7044f39374b7ae16e4b11a837a4d5ab3690ecdc027e11ffa7 SHA512 b8e2d1bc61fbaa23d9b99770657fbf3af55a9e6fd39a34af4e90379f5ce883f29458dae48f424b77c3000933932b31106466714838da38e9a159d34af6cbdacc
-AUX daapd.initd 583 BLAKE2B 0d84bdf5eb458568e07b2e3866dc36e95f1a2e169055345383b5607a38c347b3457b108385f16df8cce0ca280845a3ff122246af3c06747b91e9f2f7ac39857c SHA512 a584cd71c5673732ac0c31fb92d156f5c480ced066d0686f957d6adf9c769ec234fe46a468077ea6b28efca132336e186fa0adc2200150e9fca11f2800aeb67a
-AUX forked-daapd-23.2-fix-arg-enable.patch 2272 BLAKE2B a32aafa2779f3c276def8c522215f46dc6289230d3b055d5ae0389590b9d71eadb7e96a919266089eead0b567ad880b4c836bb596f569d64cda1365f3c87285b SHA512 48768ab213334c2324435a82cb58982100e8467001284bf589816e983982d4916198e659afad1fd7ca8e437c48971fb5ed7eeafcfa0118965d91fac839bfafe4
-DIST forked-daapd-23.2.tar.gz 325895 BLAKE2B 31fd3362ed3a46721aec7b48efafb2fd77a4bb549362ee1717e2166409ce0f24a65c5ea95d4278860cb0e3ad717bcdaf7c3a744678dc591263f5cd4c4a965991 SHA512 11b5c6c16c0c9e20f1c196941cd09602d90b5e2ed0765e4fac25c6aeba388706bd7ede9f6c467227c245f2597466e8658f9db75073ee8b47b16f947514eb1511
-EBUILD forked-daapd-23.2-r1.ebuild 1706 BLAKE2B 3f8e975f12e33b4bb199bced28400914ebde21282e7738ef007f77ff1ea7ebb84c7f6eef584b08dca54d8077af8e6560618e82cbf09576c05986b77a138a0226 SHA512 84eedde4fb1a319bf4a9eec0b7c49ba0e46ca35c9c59742086e7866b7b3b8e71ae36987c71d7a31ff6bde49d6480736ef528e879886fed4da7d58e5c4835158e
-MISC metadata.xml 709 BLAKE2B 2117c8cbf0c60b7ebe4b8b049ef4404bac1a352a7ba57eaf2f2f96b0e907cb89d434a1d8a65a322a7ea4af412f65d7815e112821638b61caa229cbca7838a2b7 SHA512 70fe2587d026889937545d2f7c72429f3ff09edf8d95296c1a4047cff829863614c9f63981f63686b67de6ea33c4b78b8622091cdb14cb6531d3af80dbb294b0
diff --git a/media-sound/forked-daapd/files/antlr-3.5.patch b/media-sound/forked-daapd/files/antlr-3.5.patch
deleted file mode 100644
index 86461f3f0ba5..000000000000
--- a/media-sound/forked-daapd/files/antlr-3.5.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 7cf35d1e8bb8dedb710e4a60bada2739d60306d0 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Mon, 5 Oct 2015 23:10:45 +0100
-Subject: [PATCH 1/2] Allow ANTLR 3.5 to work
-
-This involves a harmless backwards-compatible adjustment to the
-grammar. I can't explain why this is necessary but this might help.
-
-http://stackoverflow.com/questions/20057063/follow-set-in-is-undefined-in-generated-parser
----
- src/RSP.g | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/src/RSP.g b/src/RSP.g
-index 435de16..6a27536 100644
---- a/src/RSP.g
-+++ b/src/RSP.g
-@@ -43,43 +43,43 @@ strcrit	:	FIELD strop STR			->	^(strop FIELD STR)
- 	|	FIELD NOT strop STR		->	^(NOT ^(strop FIELD STR))
- 	;
- 
--strop	:	EQUAL
--	|	INCLUDES
--	|	STARTSW
--	|	ENDSW
-+strop	:	equal=EQUAL
-+	|	includes=INCLUDES
-+	|	startsw=STARTSW
-+	|	endsw=ENDSW
- 	;
- 
- intcrit	:	FIELD intop INT			->	^(intop FIELD INT)
- 	|	FIELD NOT intop INT		->	^(NOT ^(intop FIELD INT))
- 	;
- 
--intop	:	EQUAL
--	|	LESS
--	|	GREATER
--	|	LTE
--	|	GTE
-+intop	:	equal=EQUAL
-+	|	less=LESS
-+	|	greater=GREATER
-+	|	lte=LTE
-+	|	gte=GTE
- 	;
- 
- datecrit:	FIELD dateop datespec		->	^(dateop FIELD datespec)
- 	;
- 
--dateop	:	BEFORE
--	|	AFTER
-+dateop	:	before=BEFORE
-+	|	after=AFTER
- 	;
- 
- datespec:	dateref
- 	|	INT dateintval dateop dateref	->	^(dateop dateref INT dateintval)
- 	;
- 
--dateref	:	DATE
--	|	TODAY
-+dateref	:	date=DATE
-+	|	today=TODAY
- 	;
- 
- dateintval
--	:	DAY
--	|	WEEK
--	|	MONTH
--	|	YEAR
-+	:	day=DAY
-+	|	week=WEEK
-+	|	month=MONTH
-+	|	year=YEAR
- 	;
- 
- QUOTE	:	'"';
--- 
-2.4.3
-
diff --git a/media-sound/forked-daapd/files/daapd.confd b/media-sound/forked-daapd/files/daapd.confd
deleted file mode 100644
index 8b268509861b..000000000000
--- a/media-sound/forked-daapd/files/daapd.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# Set the log level (0-5)
-#LOG_LEVEL=2
-
-# Specify the log domains.  Comma-separated, choose from: config,
-# daap, db, httpd, main, mdns, misc, rsp, scan, xcode, event, remote,
-# dacp, ffmpeg, artwork, player, raop, laudio, dmap, dbperf, spotify,
-# lastfm, cache
-#LOG_DOMAINS=main,config
-
-# ffid to be broadcast in mDNS records
-#FFID=homeserver
diff --git a/media-sound/forked-daapd/files/daapd.initd b/media-sound/forked-daapd/files/daapd.initd
deleted file mode 100644
index 7854bd4cc40e..000000000000
--- a/media-sound/forked-daapd/files/daapd.initd
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/openrc-run
-
-# Override in /etc/conf.d/daapd
-LOG_LEVEL=${LOG_LEVEL:-2}
-LOG_DOMAINS=${LOG_DOMAINS:-'main,mdns,db,scan'}
-FFID=${FFID:-daapd}
-
-PIDFILE=/var/run/forked-daapd.pid
-
-depend() {
-    need avahi-dnsconfd
-}
-
-start() {
-    ebegin "Starting daapd"
-    start-stop-daemon --start forked-daapd \
-		      --pidfile "$PIDFILE" \
-		      -- \
-		      -P "$PIDFILE" \
-		      -d "$LOG_LEVEL" \
-		      -b "$FFID" \
-		      -D "$LOG_DOMAINS"
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping daapd"
-    start-stop-daemon --stop forked-daapd \
-		      --pidfile "$PIDFILE"
-    eend $?
-}
diff --git a/media-sound/forked-daapd/files/forked-daapd-23.2-fix-arg-enable.patch b/media-sound/forked-daapd/files/forked-daapd-23.2-fix-arg-enable.patch
deleted file mode 100644
index 7c4297ef0e9f..000000000000
--- a/media-sound/forked-daapd/files/forked-daapd-23.2-fix-arg-enable.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure.ac.orig	2015-07-20 18:03:12.270584746 -0500
-+++ configure.ac	2015-07-20 18:03:00.050585581 -0500
-@@ -51,25 +51,35 @@
- AC_SYS_LARGEFILE
- AC_TYPE_OFF_T
- 
--AC_ARG_ENABLE(flac, AS_HELP_STRING([--enable-flac], [extract FLAC metadata with libflac (default=no)]),
--                      use_flac=true;
--                      CPPFLAGS="${CPPFLAGS} -DFLAC")
--
--AC_ARG_ENABLE(musepack, AS_HELP_STRING([--enable-musepack], [extract Musepack metadata with taglib (default=no)]),
--                      use_musepack=true;
--                      CPPFLAGS="${CPPFLAGS} -DMUSEPACK")
--
--AC_ARG_ENABLE(itunes, AS_HELP_STRING([--enable-itunes], [enable iTunes library support (default=no)]),
--                      use_itunes=true;
--                      CPPFLAGS="${CPPFLAGS} -DITUNES")
--
--AC_ARG_ENABLE(spotify, AS_HELP_STRING([--enable-spotify], [enable Spotify library support (default=no)]),
--                      use_spotify=true;
--                      CPPFLAGS="${CPPFLAGS} -DSPOTIFY")
--
--AC_ARG_ENABLE(lastfm, AS_HELP_STRING([--enable-lastfm], [enable LastFM support (default=no)]),
--                      use_lastfm=true;
--                      CPPFLAGS="${CPPFLAGS} -DLASTFM")
-+AC_ARG_ENABLE(flac, AS_HELP_STRING([--enable-flac], [extract FLAC metadata with libflac (default=no)]))
-+AS_IF([test "x$enable_flac" = "xyes"], [
-+  use_flac=true;
-+  CPPFLAGS="${CPPFLAGS} -DFLAC"
-+])
-+
-+AC_ARG_ENABLE(musepack, AS_HELP_STRING([--enable-musepack], [extract Musepack metadata with taglib (default=no)]))
-+AS_IF([test "x$enable_musepack" = "xyes"], [
-+  use_musepack=true;
-+  CPPFLAGS="${CPPFLAGS} -DMUSEPACK"
-+])
-+
-+AC_ARG_ENABLE(itunes, AS_HELP_STRING([--enable-itunes], [enable iTunes library support (default=no)]))
-+AS_IF([test "x$enable_itunes" = "xyes"], [
-+  use_itunes=true;
-+  CPPFLAGS="${CPPFLAGS} -DITUNES"
-+])
-+
-+AC_ARG_ENABLE(spotify, AS_HELP_STRING([--enable-spotify], [enable Spotify library support (default=no)]))
-+AS_IF([test "x$enable_spotify" = "xyes"], [
-+  use_spotify=true;
-+  CPPFLAGS="${CPPFLAGS} -DSPOTIFY"
-+])
-+
-+AC_ARG_ENABLE(lastfm, AS_HELP_STRING([--enable-lastfm], [enable LastFM support (default=no)]))
-+AS_IF([test "x$enable_lastfm" = "xyes"], [
-+  use_lastfm=true;
-+  CPPFLAGS="${CPPFLAGS} -DLASTFM"
-+])
- 
- case "$host" in
- 	*-*-linux-*)
diff --git a/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild b/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild
deleted file mode 100644
index e38ffacba8d5..000000000000
--- a/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO:
-# Add --enable-spotify when it works
-
-EAPI=5
-
-inherit autotools eutils user
-
-DESCRIPTION="A DAAP (iTunes) media server"
-HOMEPAGE="https://github.com/ejurgensen/forked-daapd"
-SRC_URI="https://github.com/ejurgensen/forked-daapd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="alsa flac itunes lastfm mpd musepack"
-
-# Note: mpd support appears to be standalone, e.g. --enable-mpd doesn't
-# result in additional linkage.
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/antlr-c:0
-	dev-libs/confuse
-	dev-libs/libevent
-	dev-libs/libgcrypt:0
-	dev-libs/libunistring
-	dev-libs/mxml[threads]
-	media-libs/alsa-lib
-	net-dns/avahi[dbus]
-	virtual/ffmpeg
-
-	flac? ( media-libs/flac )
-	itunes? ( app-pda/libplist )
-	lastfm? ( net-misc/curl )
-	musepack? ( media-libs/taglib )
-"
-
-DEPEND="
-	dev-java/antlr:3.5
-	${RDEPEND}
-"
-
-pkg_setup() {
-	enewuser daapd
-	enewgroup daapd
-}
-
-src_prepare() {
-	# Fixed in 23.3.
-	epatch "${FILESDIR}/${P}-fix-arg-enable.patch"
-
-	# https://github.com/ejurgensen/forked-daapd/pull/185
-	epatch "${FILESDIR}/antlr-3.5.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	ac_cv_prog_ANTLR=antlr3.5 \
-	econf \
-		--with-alsa \
-		$(use_enable flac) \
-		$(use_enable musepack) \
-		$(use_enable itunes) \
-		$(use_enable lastfm) \
-		$(use_enable mpd)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}/daapd.initd" daapd
-	newconfd "${FILESDIR}/daapd.confd" daapd
-
-	# dodir by itself fails in the likely case of /srv/music having a
-	# volume mounted already.
-	test -d /srv/music || dodir /srv/music
-
-	fowners -R daapd:daapd /var/lib/cache/forked-daapd
-}
diff --git a/media-sound/forked-daapd/metadata.xml b/media-sound/forked-daapd/metadata.xml
deleted file mode 100644
index 6c5d7e30e1be..000000000000
--- a/media-sound/forked-daapd/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<longdescription>
-		This is a much updated version of the original
-		forked-daapd 0.19 (non-gcd), a Linux/FreeBSD DAAP
-		(iTunes) media server with support for AirPlay
-		devices, Apple Remote (and compatibles), Spotify and
-		internet radio.
-	</longdescription>
-	<use>
-		<flag name="itunes">Enable support for iTunes library XML</flag>
-		<flag name="lastfm">Enable LastFM scrobbling support</flag>
-		<flag name="mpd">Enable streaming to mpd</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ejurgensen/forked-daapd</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/frescobaldi/Manifest b/media-sound/frescobaldi/Manifest
index e71ae05f9450..a443acac198a 100644
--- a/media-sound/frescobaldi/Manifest
+++ b/media-sound/frescobaldi/Manifest
@@ -1,3 +1,3 @@
 DIST frescobaldi-3.0.0.tar.gz 4895317 BLAKE2B 6a9a2b92d075742f54b3148761f1946c4dd73616482aec9278c0326d5597773ce6eb714f8d31d49f79051294d23d4e43552ce29bde0f464d1a677900b8a276f6 SHA512 e33cbcb70bec74239cd84691725e9978b6c6fee391848c7de8ea32dd5459d953ddda120eeea25a602154d94a84947b6c151237b859450162db0822ef58fd7787
-EBUILD frescobaldi-3.0.0.ebuild 1036 BLAKE2B 51ed67d2c04e1b8b3168bbb393282812982994cda27297dcd932222ddf65f67b359f573a7ad54359b2e17da187f2d776e174b4ece49f3fe3eef0d100537398f5 SHA512 eee6df5313ffb76b81bd053a345c61ef4fcb53784f80a80e3270c4fa2ef17ab12883b67324d04f43c79196df81ea1e27d304f1c66554a30e969ace3abf7f9585
+EBUILD frescobaldi-3.0.0.ebuild 1034 BLAKE2B 402296da2aee931089552b7b872f5a7a1a508d69d785ff5624210dc1587ce32a7abe69deeef31578212bffd258a2db4a2c064b67499bd8a5540854d2cfb95e5f SHA512 9ecadd4a3f1e31f2888c94a17e7b23dd178783e285b34bdbd040d901f57e72af72860cdfb0c93b48c100d23f98ed888b3f048a8d70cce6ae2dfc6c33788c3727
 MISC metadata.xml 437 BLAKE2B 5df0dcf6f211964427c34070f126b8a7b65f4341d5ca0edc899e413d112eb3920197086981537847506148b11b58cfcba80213839e5171baf8c16f05781765f6 SHA512 fee7fc00ca40615d9470bcf15ac3df4541864f825f55021c4b8d59891ea1fbec88f4e5133cceef05791cee1d95be320c7405cdfa67446863bdd2b23e86ca2940
diff --git a/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild b/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild
index 7f9ebe02b837..b33d3acef51e 100644
--- a/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild
+++ b/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 inherit distutils-r1 gnome2-utils xdg-utils
 
 DESCRIPTION="A LilyPond sheet music text editor"
diff --git a/media-sound/gmusicbrowser/Manifest b/media-sound/gmusicbrowser/Manifest
index 2896c19cfb9a..443c13e2ba5d 100644
--- a/media-sound/gmusicbrowser/Manifest
+++ b/media-sound/gmusicbrowser/Manifest
@@ -1,6 +1,6 @@
 DIST gmusicbrowser-1.1.15.tar.gz 2349451 BLAKE2B 8967e404360dd59b8cb59bfdfde8a9b8771be9deb2d449800fd2515b65c5b06d935db828030aeb8e839305781f799e1fd2ee8f975c1ce479ed0211fa71a84731 SHA512 9176be8f2b1b6c832099feff87a7a526efaa3c512c9b7b6d433f1a157ac1185adb05185f52f9ce1b3b41afc967c37345d216a090b472927a661747e25479cbdc
 DIST gmusicbrowser-1.1.15_p20160530.tar.gz 1305616 BLAKE2B e67d239a4483624d298814c75442ecdbe6f243549e77ac73e511a123aa038c78dc1c7bd6a707df6a4085d66e6ffe720fc518babe29d382f960e95fb47cd56f29 SHA512 980446a873fab39c5b880e289e2ff61df112f5336dfd19b0ac3b3b6a346ddebaaca8718f169926404f38cc518817f115a38ab210ae7f4eab05962506d70d3f3b
 EBUILD gmusicbrowser-1.1.15-r3.ebuild 1674 BLAKE2B a3e1f4009928db8f10561e06e353e0d706533060d0c9ac2b5fff97872da89822aca223fbd6e1ce59eb347751132eea2a2743fc2d112c81871a773dbc6e720f37 SHA512 02c101547fc328b22c4504e3be3d089e5cbef29b104d1cb4ed1b5fa697d6d6d096384d3585d19118d5413c7fbd044549800c6ea90fad99ba6fddf075d54d8ef0
-EBUILD gmusicbrowser-1.1.15_p20160530.ebuild 1735 BLAKE2B c2548f44165b32fb7937a1174e0a7c370ff1718cecabb6219f7e358f743a9fb415107ef56732f9b38bc1d80dd323b34b497b7698cea29f7ff3c79b80761fdec7 SHA512 5b3b4a4e109816a1071577bb4977c15b3b0f4b56317307b5cc3eea93be55d76b31640c16157ff487df4653b26bf5afe99412f70096068dd0e91d05b994a5ef84
+EBUILD gmusicbrowser-1.1.15_p20160530.ebuild 1736 BLAKE2B 7fd8ffdfd09ff37aa681b6a4dd4d8b9ab11478f4a4053b3c3322f22ca09d66fa4da3141975fa4405928d74aa7e535c62e0982facb960d3b9bd5b736f5153fa6b SHA512 ba837fc226673b0b5a1ad1972fc5ccdf8223df5f96e7dbac6bd9cd63649ed594ced80656ae7042edbe9482c92ffe3d77f909373ca8289c1e8d32cadd1ee9640e
 EBUILD gmusicbrowser-9999.ebuild 1735 BLAKE2B c2548f44165b32fb7937a1174e0a7c370ff1718cecabb6219f7e358f743a9fb415107ef56732f9b38bc1d80dd323b34b497b7698cea29f7ff3c79b80761fdec7 SHA512 5b3b4a4e109816a1071577bb4977c15b3b0f4b56317307b5cc3eea93be55d76b31640c16157ff487df4653b26bf5afe99412f70096068dd0e91d05b994a5ef84
 MISC metadata.xml 465 BLAKE2B 53caced65e537cd80208bd2dad2853b72efb79925ddbf4009153483207f17bc7337312870d47e65ea971b3c944286875882d06d1bfc7b7e9c0bb88695d5f8ce3 SHA512 ff760d056bb2f67c021cfca327ad1f7f5be33264a6f03ec657e83a4ea7c14800d6f51340cb6ecad895bf2dfb8db38767982e63b030a9923de16820b7558f8497
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild
index 3d144fcc11c7..5812aee33a2a 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,11 +9,11 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
 	inherit git-r3
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="amd64"
 else
 	GIT_COMMIT="853840eb9dad0b59ad2dac5d303f5929b2f09f21"
 	SRC_URI="https://github.com/squentin/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
 fi
 
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 6b68a1080fa6..cacd57b86c79 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,9 +1,5 @@
-AUX 3.28.2.1-appdata-test-fix.patch 1102 BLAKE2B a4af513d38152b19f4dfd1e40ded23b5ba6b270f266dd789db423527c298edba5e44ba8a68761d0421dcafbe131fd7ae0701b35a50b2e71950efc3c0f073073a SHA512 4b666a47fdde5410c15e0488e772425f572aae3d9f621180f930991db4b291d8664486afa2cd3a48bc2da73c3c8152ac6653aa68e91bd7feafb050092cb905fc
-AUX 3.28.2.1-icon-fix.patch 943 BLAKE2B 49731d14897e5ce6ca10addb90a63361eb127e64be46ec672852df7a1221c1843c174263881ff714432341dac0f56d1a09772d8a42c67da2e981b6e144f97641 SHA512 5a07e984bc6132439b5c1b20dc36fe2b8cdb42ab84bee876c750f02bf2f97a4302d16547e38da0249e4596ea5431ddc212b36d392ab8657d9eb2482a46f3772b
-DIST gnome-music-3.24.2.tar.xz 1557848 BLAKE2B 329d60da4c2c601524e01bddf086ea699bc10ea311d440ae24af0a83829d7ad4c351963e1b08bd30a8538c9b9987d9f2a41f95690ae31e75c06aac0cc9db2dcf SHA512 a922c80f922b9231e9bbe0cbd1fd33c059c719350c250dbb24316224e3306de7576303119fc9ec303f569559c36d6b076b5ec1076b4f9221a8fb133dcd9f040e
 DIST gnome-music-3.26.2.tar.xz 1563244 BLAKE2B 5a5d27b34470a49a752cb67a1040e227595fd15c6ca4f7656818636d614dfef8ec082dc014ea05c271f512f7c362dc2f81a38359ef04e0663467f62ff3ac2423 SHA512 e8efe31003a54b6cfea151c5402c4d06e48928be7b79332f7f9fb8a567ff7d0d42a43e943398ad6cb7e391d0162322c7fde74922a4b16e52ec24691cc1bfc5b0
 DIST gnome-music-3.30.2.tar.xz 3027580 BLAKE2B 9cd5a10fecbf7fb962455bec7ee5392a305f3bab9ebb3e2f0d24066ffd6975377c57a722e850ee340e2990f61b06456f1fe963b80d57030416af7ea3b7f92b32 SHA512 b9fa33ccb76d747e22e1144b2c77dc88432386fdfd4f52720cb1ae3230c06fb899fec654dc1e126103e393eb0358a4385099743abe26505b9b7dcffe2d04a8c8
-EBUILD gnome-music-3.24.2.ebuild 1600 BLAKE2B b557c83509fa13fe33fea28b1938fe55b898ab056cf18a06ed01cab765474b28d2e2264be63b90056516e5e9cda41e2976116ca14ecf8ae2168288edf38d46b5 SHA512 36233e11a15d7c4a26a077f146d805f9ff971851816e1bb2be624aa3ab73d3f6c02f9029da5020163b7c00e67bc509d39cc45d887dc10bd47c0c7229e18b97cd
-EBUILD gnome-music-3.26.2.ebuild 1630 BLAKE2B 061c29740c59a142be455acb0643284a533fc557b0953e2a40c61c021d1e5e7b27b0fbe12084fbc3ba0f0dd828db8246d48e572cdd6650cf2d7c48d725a9110d SHA512 bc39dc181c9d9e853c79432c11c444a73099207721e013ba52b20e752ab0b72b0ea7f746ce40a3f28da2f0bf27f48eb778e22a1ab1557163f6ffd2a3f6cee8c9
-EBUILD gnome-music-3.30.2.ebuild 1934 BLAKE2B 6272d666d847d9c970e5e8352afa10980a2fb2387a5d64aba830bef9c8543ed3d6d60f771d1338f488831b6da16a801ac7a7334fa1b81027eeccc9f5259b5796 SHA512 9d3ab939cdc919ab2181ceeccbc4b61d6ceb50776a712e40c08d1fad4007dd1602c44ec111f6bca4f03a87e940d9af58a72836475d8ec8abe63f83443d7cba90
+EBUILD gnome-music-3.26.2.ebuild 1624 BLAKE2B d6db41f12fa7722e78ba7e1f16071c7afb16df1d29c7b2cf5e859a86ed74e7b5b09570db32fcabe49fac782fca1099982fd6a63b29086ee32b001d3e20924074 SHA512 66619a886cf9e5b544d967a0c708abe3a4ab7ba7429f70cb151b298679bb6001e27b6f9be214ba6542643704a3184d3531d90032455c7b2a8a33f0502bcd004c
+EBUILD gnome-music-3.30.2.ebuild 1932 BLAKE2B 9fad7b0fd067fc454cd8b095fffae6e4f7654a61188ca645c7ba51ee9d8f21a410468dbc6041b0f60698f712692e1d63dc623495bec3f2e3a3729faaad20f76d SHA512 1cf767c757b120d9258bb4893a519bbbf196bff764c5965db81a30a40617ed19c844286888ed2b1bca086c00a4a7b764a79d8702e6daa2d7ff909a6394aa94ef
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/files/3.28.2.1-appdata-test-fix.patch b/media-sound/gnome-music/files/3.28.2.1-appdata-test-fix.patch
deleted file mode 100644
index edc06b2cf2bb..000000000000
--- a/media-sound/gnome-music/files/3.28.2.1-appdata-test-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0fc9bee85ab994043e1c5365d665fe51c95cb047 Mon Sep 17 00:00:00 2001
-From: Nick Richards <nick@endlessm.com>
-Date: Tue, 31 Jul 2018 18:09:09 +0100
-Subject: [PATCH] appdata: Reword description
-
-Use the appdata description to list the available features and try to make the copy more inviting
----
- data/org.gnome.Music.appdata.xml.in | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/data/org.gnome.Music.appdata.xml.in.in b/data/org.gnome.Music.appdata.xml.in.in
-index 999236e0..6e8295c5 100644
---- a/data/org.gnome.Music.appdata.xml.in
-+++ b/data/org.gnome.Music.appdata.xml.in
-@@ -7,7 +7,10 @@
-   <summary>Play and organize your music collection</summary>
-   <description>
-     <p>
--      Music is the new GNOME music playing application.
-+      An easy way to play your music. Automatically discover music on your computer, the local network and internet services.
-+    </p>
-+    <p>
-+      Find tracks in your local collection, get music from DLNA servers or try something new with the Jamendo and Magnatune services.
-     </p>
-   </description>
-   <screenshots>
--- 
-2.17.0
-
diff --git a/media-sound/gnome-music/files/3.28.2.1-icon-fix.patch b/media-sound/gnome-music/files/3.28.2.1-icon-fix.patch
deleted file mode 100644
index 5a69a86d3d82..000000000000
--- a/media-sound/gnome-music/files/3.28.2.1-icon-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 39e03f574c34e89b8ee9aa07ea5a2f7a595ecc20 Mon Sep 17 00:00:00 2001
-From: Marinus Schraal <mschraal@gnome.org>
-Date: Tue, 8 May 2018 11:51:36 +0200
-Subject: [PATCH] window: Set correct default icon name
-
-With the switch to Meson the default icon name is now org.gnome.Music.
-Fixes the icon not showing in gnome-control-center.
-
-
-(cherry picked from commit eeea5f41b9a9f7e716f9b95dddfe2d151a06f06d)
----
- gnomemusic/window.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gnomemusic/window.py b/gnomemusic/window.py
-index 956d7ab4..66131d72 100644
---- a/gnomemusic/window.py
-+++ b/gnomemusic/window.py
-@@ -77,7 +77,7 @@ class Window(Gtk.ApplicationWindow):
-         self.add_action(select_none)
- 
-         self.set_size_request(200, 100)
--        self.set_default_icon_name('gnome-music')
-+        self.set_default_icon_name('org.gnome.Music')
- 
-         self.prev_view = None
-         self.curr_view = None
--- 
-2.17.0
-
diff --git a/media-sound/gnome-music/gnome-music-3.24.2.ebuild b/media-sound/gnome-music/gnome-music-3.24.2.ebuild
deleted file mode 100644
index b4e919cf824d..000000000000
--- a/media-sound/gnome-music/gnome-music-3.24.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit gnome2 python-single-r1
-
-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 x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=app-misc/tracker-1.11.1:0/100[introspection(+)]
-	>=dev-python/pygobject-3.21.1:3[cairo,${PYTHON_USEDEP}]
-	>=dev-libs/glib-2.28:2
-	>=dev-libs/gobject-introspection-1.35.9:=
-	>=media-libs/grilo-0.3.2:0.3[introspection]
-	>=media-libs/libmediaart-1.9.1:2.0[introspection]
-	>=x11-libs/gtk+-3.19.3:3[introspection]
-"
-# xdg-user-dirs-update needs to be there to create needed dirs
-# https://bugzilla.gnome.org/show_bug.cgi?id=731613
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		app-misc/tracker[gstreamer]
-		app-misc/tracker[ffmpeg]
-	)
-	x11-libs/libnotify[introspection]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	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
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.26
-	dev-util/itstool
-	virtual/pkgconfig
-"
-# eautoreconf needs app-text/yelp-tools
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${D}"usr/bin/gnome-music
-}
diff --git a/media-sound/gnome-music/gnome-music-3.26.2.ebuild b/media-sound/gnome-music/gnome-music-3.26.2.ebuild
index c88b4dca273b..1ccbf317c741 100644
--- a/media-sound/gnome-music/gnome-music-3.26.2.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.26.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit gnome2 python-single-r1
 
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
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 8ce1cedf008a..16c1ca157fcf 100644
--- a/media-sound/gnome-music/gnome-music-3.30.2.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.30.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
diff --git a/media-sound/gtick/Manifest b/media-sound/gtick/Manifest
index 296108a910fd..dffe6ab90efa 100644
--- a/media-sound/gtick/Manifest
+++ b/media-sound/gtick/Manifest
@@ -1,5 +1,5 @@
 DIST gtick-0.5.0.tar.gz 650541 BLAKE2B ecffe2ce04438352f3c294eee550d3d73268102960e9447bdea03c9ddfce20a223fb018f8dc92ab98a778f9a24718e2d740a2631d130da8eb4ea065761da0110 SHA512 916295cb4101e6b958e1a51195dcc0cc0e088f0b2a2e52afaf8becd93782277cbf9cd51ae4e0b3edbbc66994912b6f7be755632ff85a47aabb8fb87b4acb14ef
 DIST gtick-0.5.4.tar.gz 641902 BLAKE2B f1832f46b559908ae0c40bd0f6a08e145a0ba58a6cf2f8e7235b4f3f0b9141ea514cf52c51cef24d745ce360423daab855c42b5f6719664be65bf5f254650c1d SHA512 28ea6f38952c376f1f684e7b598d1032063f7fdf3454cdb86735cb835079312c0d1c30dfeade7272f5399296f2a2ede5b81524036a9ac0d91e0878865fab446e
 EBUILD gtick-0.5.0.ebuild 743 BLAKE2B 019c11b01476e74c91e5d78a073b8dc1ec53e1f6d80a1a4f52b99118bb31972b84979bd1df849d34b3b34d13da87041edbc48266dde7dc8d0a77552c8986f6e2 SHA512 7afb0f2bde050105746fedcf2cae36e83afeb90c5b1decfe94b96ad0f81a3908cddb388031f88fcfe5f68d84e630b1eea341ba3913ab64a53390f26ede5f2e2f
-EBUILD gtick-0.5.4.ebuild 828 BLAKE2B 9608d8d8880912a6e846c62a6cdd3d4ff2e51e22c1dd2b379d6e2be8a1e4b7b861c70944748e4b9d2ccca9e0e8f523457678e461d9776e7c979648ee301b36f4 SHA512 1bc9bc4ed28e4c3b187b8f33e5e1d0d48b9e49182b35b3e96788154a7b690ec92e0f9719983a531b3f20130b5a718661f4068448ac3adce8a94f92b32d397761
+EBUILD gtick-0.5.4.ebuild 827 BLAKE2B 171bf2365a9accf0543cac3caf44e2e9027ed2c8e9a5504da196d463825744fd078d37b962f968f5cc0d08414046c9692a7a63a61da0d54cf88607a4a819ddcf SHA512 731fce81d55c27b385872c6ca51ec4f3c0ca97052a25de6975a15ad51a5f3a8c81795885ca6267aa3d3436d568cc2ae33e21c711be634c7f8aedc600e6a98eea
 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 6d5842684e83..41c400eac1f3 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 ~x86-fbsd"
 IUSE="nls sndfile"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/media-sound/gtklick/Manifest b/media-sound/gtklick/Manifest
index e862573cd8de..7824f6b9a8f0 100644
--- a/media-sound/gtklick/Manifest
+++ b/media-sound/gtklick/Manifest
@@ -1,4 +1,4 @@
 AUX gtklick 787 BLAKE2B 6442edd7fe2249447950e03b4abfa912a0841d58aa9bd43a16fdaf52bfa735925caff404db477c40f99b27f4085ba1324d97316ea1f0fe02cdf0a5cce68dac1d SHA512 3ba1e5e9507eb6827dd7649e00da69539537934714b8a3833c8fae21abd0d0d7793a0207f4ebf1f65cb6e111cb7e344b97d5cf397cf038364cffe2ee6be39d6a
 DIST gtklick-0.6.4.tar.gz 35901 BLAKE2B 1dd0adcb5c0489633a00ec52230b0a3b7c0017ce5148c5d8a32cf09326243f61e26cf31e3f25c8213af9a77a4a4bc9b74bfd7167808c9037549cb10b20701b99 SHA512 8491650cf324005f32808036f63574b0a59659bc8e5f3efe615b83e42701f1a3bcb95825a2378b3a17b45ddb5b33c87bed9602a0492d117665d85bd35f4a4a9b
 EBUILD gtklick-0.6.4.ebuild 873 BLAKE2B 441645e0deac450ff50fecb3c27ca2cf00978359c6278e63ed4b1964777178500d3efc949df052d1efddfc38ba72a5c26ca9d5ff65f1544e702905e148b1ae7a SHA512 55bd67fac8119fffd8a495da8ba9eef49b13374729d1a27ccd8d68667fc71f410261394d7769f33be58dbb14190d093c45ea53dd052fd6e47ad679aecc7801b8
-MISC metadata.xml 367 BLAKE2B b8db3256ae431dc01c1e76c8be9088cac93d956aabaabae59247451c96baa54679a655e1a5d1e52c1d9c9eef476decebceceedfe850d2c9b4add611ec3a4e074 SHA512 fa954108bf3d089d95ccdafda4daaf6ff4b13c8d5791e3aa01579d8a23050180ddca511656a5a996579b571e5a643d721984290db3b5e3584ba9c322949fcdf7
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/media-sound/gtklick/metadata.xml b/media-sound/gtklick/metadata.xml
index b5f0b450d001..1b2becffa26c 100644
--- a/media-sound/gtklick/metadata.xml
+++ b/media-sound/gtklick/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>karl.j.linden@gmail.com</email>
-		<name>Karl Linden</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
new file mode 100644
index 000000000000..7680a627476b
--- /dev/null
+++ b/media-sound/guitarix/Manifest
@@ -0,0 +1,3 @@
+DIST guitarix2-0.38.1.tar.xz 80768608 BLAKE2B fd745955d8b44da72c669e69c36294d4a2131f2b5868e7e254a0b33768852ba9fcf9302f2a7ebd962c8a6dc02a543f70574466c51341a371c9fb988989123e50 SHA512 54d08b4ed20b9df4c69d0c86e4d668c53fffde8919f5570f376cee903926bd01945169d177d0d45976569ea55b28f8dca7884ac6dfe2f063df6583467559c5b7
+EBUILD guitarix-0.38.1.ebuild 1692 BLAKE2B 9d1fcdc858fb93a7c1bcb0b24d99461fe2eade8cfc9a18701b6535aaf09b9bb1b97bfe97d868b570cec6b2eebb4f764b6f0790cc364dec06627d02c5f91a8701 SHA512 1b463a6bc4ee96b0fdbcc9bb0129eaf62597cd9bedefc1925ca0db68783b272cd9e419e55148e53b813e618c6470ed10cb19e0445ba40daa14788e91c30c1437
+MISC metadata.xml 622 BLAKE2B 390ed1150f373c73c5bbcd5e5193e8465ac348bebae4a5f8484fb214172717d5166c0a17be6afb4e5091c4318cd3a3e30bcc05c70fff78423347298acbc64c61 SHA512 b18db16b6af5381331418267660822972be42997065eed2182c6305ce84bd61fb6d3ee01de195f3f8f01570deed7f97b93ca31916986609a374c1f5962c45dce
diff --git a/media-sound/guitarix/guitarix-0.38.1.ebuild b/media-sound/guitarix/guitarix-0.38.1.ebuild
new file mode 100644
index 000000000000..a35bae00fe20
--- /dev/null
+++ b/media-sound/guitarix/guitarix-0.38.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils xdg
+
+MY_P="${PN}2-${PV}"
+
+DESCRIPTION="Virtual guitar amplifier for Linux"
+HOMEPAGE="http://guitarix.org/"
+SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="bluetooth debug lv2 nls +standalone zeroconf"
+REQUIRED_USE="|| ( lv2 standalone )"
+
+COMMON_DEPEND="dev-cpp/eigen:3
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-libs/glib:2
+	>=media-libs/libsndfile-1.0.17
+	>=media-libs/zita-convolver-3
+	media-libs/zita-resampler
+	>=net-misc/curl-7.26.0
+	>=sci-libs/fftw-3.1.2:3.0=
+	x11-libs/gtk+:2
+	lv2? ( media-libs/lv2 )
+	standalone? (
+		dev-libs/boost:=
+		media-libs/liblrdf
+		media-libs/lilv
+		virtual/jack
+		bluetooth? ( net-wireless/bluez )
+		zeroconf? ( net-dns/avahi )
+	)
+"
+# clearlooks gtk engine and roboto fonts are required for correct ui rendering
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/gtk-engines
+	standalone? (
+		media-fonts/roboto
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )
+"
+
+DOCS=( changelog README )
+
+src_configure() {
+	waf-utils_src_configure \
+		--cxxflags-debug="" \
+		--cxxflags-release="-DNDEBUG" \
+		--ldflags="${LDFLAGS}" \
+		--enable-lfs \
+		--lib-dev \
+		--no-desktop-update \
+		--no-faust \
+		--no-ldconfig \
+		--shared-lib \
+		$(use_enable nls) \
+		$(usex bluetooth "" "--no-bluez") \
+		$(usex debug "--debug" "") \
+		$(usex lv2 "--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2" "--no-lv2 --no-lv2-gui") \
+		$(usex standalone "" "--no-standalone") \
+		$(usex zeroconf "" "--no-avahi")
+}
diff --git a/media-sound/guitarix/metadata.xml b/media-sound/guitarix/metadata.xml
new file mode 100644
index 000000000000..567aa7cf7675
--- /dev/null
+++ b/media-sound/guitarix/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alexander@tsoy.me</email>
+		<name>Alexander Tsoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		guitarix is a virtual guitar amplifier for Linux running on Jack Audio Connection Kit
+	</longdescription>
+	<use>
+		<flag name="lv2">Build lv2 plugins</flag>
+		<flag name="standalone">Build standalone application</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/id3ed/Manifest b/media-sound/id3ed/Manifest
index 9b76c82f20e2..70c5546e0fa2 100644
--- a/media-sound/id3ed/Manifest
+++ b/media-sound/id3ed/Manifest
@@ -1,4 +1,4 @@
 DIST id3ed-1.10.4.tar.gz 31610 BLAKE2B 4bb013fe8205a91fe9b25012390707c25b1879ef34322ce85430dcd4fcfc4545e2d2637c113d4779a054815d90951052db4ec4c4b16f0ab7658ad5bbc70a6d4c SHA512 c96716dd24e8fc0aafbb5f0befe1a401ff7ed13821c71470945a5251a553316d17d5eeca3df5d3bd9775d12386078ab2b88d47a7ab9e9f32cd3d209934e31d56
-EBUILD id3ed-1.10.4-r1.ebuild 729 BLAKE2B da6cc0b88940368ad5ce99cfc6f7499f181331b862a4bbdd3591dc7eb6a6318ff4ea3056211bfbcd69b153be0a445b61e8d2ecc7f34153984a7905ff0fde87bb SHA512 9473d3b4c63a79ec22c1d3ff9435bea5f21eb0449492b01c77c0088d6eeea04af1ef5fc0df4a2cf9f3a2ddfdde01aa45fa054881b5fdac85a55af13cc820836f
+EBUILD id3ed-1.10.4-r1.ebuild 728 BLAKE2B f0aa26f40a9029e676a08f2eca9a336aaec2594bb8a35435fb1e822fef2259293d5668829753aacc82ea5c21467a3d6f043577636dbf4e759e818c9011166ca4 SHA512 320ccc148afb7ee99991bd6b7f12d9d44280ec18bf370b10874b898789a82d67812ea4b3dd0cfea2b64f832d14dc7d1bbb8698c1d64afb49065922e1853b37ab
 EBUILD id3ed-1.10.4.ebuild 741 BLAKE2B d828a7818eea749d5129d2508f49c2f5302335de215ad833edc46ff3ff72dcb9a3adfc24b9b80d9bf44044192d7059911e5ea09f895ff2dc1dce6a302f0b13fb SHA512 b7631fb269284409b77d9c315893bc66795ee99264f0d0ae44d2d452c548b2d461712d46e803cf14d8521ca2e11c8bcfeddcea1b6b4175bca2ed9e1f9057b844
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/id3ed/id3ed-1.10.4-r1.ebuild b/media-sound/id3ed/id3ed-1.10.4-r1.ebuild
index 021df28d3129..0cfd2a879da8 100644
--- a/media-sound/id3ed/id3ed-1.10.4-r1.ebuild
+++ b/media-sound/id3ed/id3ed-1.10.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://code.fluffytapeworm.com/projects/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 sparc ~x86"
 
 DEPEND="sys-libs/ncurses:0=
 	sys-libs/readline:0="
diff --git a/media-sound/jalv/Manifest b/media-sound/jalv/Manifest
index 7e786caa11d8..e1a05942e8ee 100644
--- a/media-sound/jalv/Manifest
+++ b/media-sound/jalv/Manifest
@@ -2,5 +2,5 @@ AUX jalv-1.6.0-qt-5.7.0.patch 906 BLAKE2B 86d7f74c8a80dd4308c5ec4c67d866ae1c6917
 AUX jalv-1.6.0-stdin.patch 2008 BLAKE2B 0fca98631638a2713cf9caa127ca4dce715d81441071fbe695654d9902639c9836398de5adc878f242c45fd52af73238621065cceb4ec0cf685c25debe1b02e5 SHA512 aab7ccb29a63ebaafe1c05852a9533930181e2c34c6015aff9b4d608bfa95a6d4218849736e960adcaef635f4ecb0c3188bcaf2c1f3feb02a5eaff8866a1cacd
 AUX jalv-1.6.0-suil-qt5.patch 1159 BLAKE2B 8e319a59d00946f42586ea9b048b78725ed295d5ae55f6c87bf1739e5aad7319aa9eb7624aee7638b07d45dd757b7859745030d0419ac446367cf8a16bc024bc SHA512 22fd7452af3fcfd2c71a24cce218ce2fbcfccc2eaa224d54594a014ca184a72e80fb5489a868c298ff4ac3884805f2fd2bc827dd63eaa22df081804f0b355fc2
 DIST jalv-1.6.0.tar.bz2 157726 BLAKE2B d1d35ccc3c0234d0005b83fca89ba0570f747f65568da6b5ea4ef0a0974bbd729540555e3cdcd77f3f5b7a8de9f987c7743e258d7544c8d70c7c51aaae84f9a5 SHA512 70453404788846774ef88b43653379f97140301e09e8de61779683df9ee85120485bebf03c959624639dc4d8dd71ce83db2a89b14b66be17696a88d1820ac1b3
-EBUILD jalv-1.6.0-r2.ebuild 1437 BLAKE2B 0148beb0670011112756a18ef93c56cc77b9a1f314aa8da99b995f71f6fd766a9774e31882fc069615196f0021c04a408914997cdd8232d0a5515f042567bbd6 SHA512 905639f8fd8b92569fa07554ee00ba90c6605e0c13877ab527a861fd1e8f5940f2259bbe142c95978f7dc7f5881bb6370c67bc4cf9eb32d98282a0b3305a4da1
+EBUILD jalv-1.6.0-r2.ebuild 1433 BLAKE2B 63c1abc9787cc22d35ccda185a5da4a115fd8cdb83357cc0f60f4edf75788373983c975cd8c261b24d779e407bfb67fa927a436bfdbcc82caab40b77a7fe9971 SHA512 86b383075924d48fa789cd7ec7554300f1b30984df200490ce9d82b6d99ff618e978b2a52cb16cab82fb89bd74f4ab5a8dcb139ee6bed0c994d0293ae893c449
 MISC metadata.xml 1152 BLAKE2B c5969351b829ace0f2e54d452526a3f77939f99f721acd846c34ce84ca2264ca2c6996725969c034721df7de41abbf9dfbfcbdde9ade5b375f845479ec66d3ac SHA512 e9b1e1f84df16a830785b7020eeb35369d0c0465b82b3033cc0714f4df706b0b63a946c0dc1051d3c1a3b185e5c9563189a05482c2e1013462592d3b1150b29c
diff --git a/media-sound/jalv/jalv-1.6.0-r2.ebuild b/media-sound/jalv/jalv-1.6.0-r2.ebuild
index b97681deb420..ea94a195346e 100644
--- a/media-sound/jalv/jalv-1.6.0-r2.ebuild
+++ b/media-sound/jalv/jalv-1.6.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-any-r1 qmake-utils waf-utils
diff --git a/media-sound/karlyriceditor/Manifest b/media-sound/karlyriceditor/Manifest
deleted file mode 100644
index 2e49be1f007a..000000000000
--- a/media-sound/karlyriceditor/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX karlyriceditor-2.2-ffmpeg-4.patch 1520 BLAKE2B 813447de8d3db0263583b0eded78f68bcae89d70917645ec92924ff08a56fdd53c6623167f1624a16292089d6293c2cb1b771a0becb7fdef8d105c37f5382dad SHA512 3a3e42a0fdb485513fe8a2c39b3ccf78d0510a6e5f77efc8e2e1e351b024505c8490e9ba43c624dc21562aa8b3841c66e13d5276c3c7342a4b306cfad9a8bf42
-DIST karlyriceditor-2.2.tar.gz 280119 BLAKE2B 1cfd3c681e7f8c52b0e67fdff96bf929ef86aa607615be832907b3d933628b8cfe2d94066acfe1739aa83c0dfc4884de7063180dc3e4acb54fb73eadfbbd2a66 SHA512 bce3aed1402c8fff3e04940527773d2855d3d67e47b159478c53e63eaadfbb70df3f4fbefb75490cc17b750455e1359963468ce14dd504f37219e1268a213103
-EBUILD karlyriceditor-2.2-r1.ebuild 854 BLAKE2B 00fe487d2f0429dceb2dbe160a6dad3a98c5da12e721be213e0f0407da3b281af839f23fc82fbc8cf9a4d9a7ce841c559040a8f1dfe02511fff721ad3d345431 SHA512 af959bb3d0cff2f7c4cdf81f070fdb9d283ad112a57b8eb7bc68a5f23a356995d1fb9c547fe18f44d3e3345c0d2c6d76029a95f6eba1af197b3150bd565eba58
-MISC metadata.xml 445 BLAKE2B 8461e838a66f087d47c9edb6953fda465f97a24828ef5e6f25efcb5dd0041f72f34563a0b21f6142e9ef99fb475af11db325c61c7bbe4b2c8d7b2b781631190d SHA512 8f31be93dceebe185179640ae877f83d1128f6193509d6979cecab95eb06db1ea9901be6e8334c2046c1e22c3a36c782807069665c15722c912833d4ed3cdff4
diff --git a/media-sound/karlyriceditor/files/karlyriceditor-2.2-ffmpeg-4.patch b/media-sound/karlyriceditor/files/karlyriceditor-2.2-ffmpeg-4.patch
deleted file mode 100644
index b7ae9d6e90b4..000000000000
--- a/media-sound/karlyriceditor/files/karlyriceditor-2.2-ffmpeg-4.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Fix FTBFS with FFmpeg 4.0
-Author: James Cowgill <jcowgill@debian.org>
-Bug-Debian: https://bugs.debian.org/888377
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/ffmpegvideoencoder.cpp
-+++ b/src/ffmpegvideoencoder.cpp
-@@ -345,7 +345,7 @@ av_log_set_level(AV_LOG_VERBOSE);
- 
- 	// Enable interlacing if needed
- 	if ( m_videoformat->flags & VIFO_INTERLACED )
--		videoCodecCtx->flags |= CODEC_FLAG_INTERLACED_DCT;
-+		videoCodecCtx->flags |= AV_CODEC_FLAG_INTERLACED_DCT;
- 
- 	// Enable multithreaded encoding: breaks FLV!
- 	//videoCodecCtx->thread_count = 4;
-@@ -373,7 +373,7 @@ av_log_set_level(AV_LOG_VERBOSE);
- 
- 	// If we have a global header for the format, no need to duplicate the codec info in each keyframe
- 	if ( outputFormatCtx->oformat->flags & AVFMT_GLOBALHEADER )
--		videoCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+		videoCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- 
- 	// Open the codec
- 	if ( ( err = avcodec_open2( videoCodecCtx, videoCodec, 0 )) < 0 )
-@@ -463,7 +463,7 @@ av_log_set_level(AV_LOG_VERBOSE);
- 			audioCodecCtx->time_base.den = m_profile->sampleRate;
- 
- 			if ( outputFormatCtx->oformat->flags & AVFMT_GLOBALHEADER )
--				audioCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+				audioCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- 
- 			// Since different audio codecs support different sample formats, look up which one is supported by this specific codec
- 			if ( isAudioSampleFormatSupported( audioCodec->sample_fmts, AV_SAMPLE_FMT_FLTP ) )
diff --git a/media-sound/karlyriceditor/karlyriceditor-2.2-r1.ebuild b/media-sound/karlyriceditor/karlyriceditor-2.2-r1.ebuild
deleted file mode 100644
index a0b4b5ff69a7..000000000000
--- a/media-sound/karlyriceditor/karlyriceditor-2.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop qmake-utils
-
-DESCRIPTION="Application to edit and synchronize lyrics with karaoke songs in various formats"
-HOMEPAGE="https://www.ulduzsoft.com/linux/karaoke-lyrics-editor/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libav"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtwidgets:5
-	libav? ( media-video/libav:= )
-	!libav? ( media-video/ffmpeg:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${P}-ffmpeg-4.patch" )
-
-src_configure() {
-	eqmake5 "${PN}.pro"
-}
-
-src_install() {
-	dodoc Changelog
-	dobin bin/${PN}
-	doicon packages/${PN}.png
-	make_desktop_entry ${PN} 'Karaoke Lyrics Editor'
-}
diff --git a/media-sound/karlyriceditor/metadata.xml b/media-sound/karlyriceditor/metadata.xml
deleted file mode 100644
index 12706d20e542..000000000000
--- a/media-sound/karlyriceditor/metadata.xml
+++ /dev/null
@@ -1,15 +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>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">karlyriceditor</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/klick/Manifest b/media-sound/klick/Manifest
index aba1d289d899..2d1b82c62e15 100644
--- a/media-sound/klick/Manifest
+++ b/media-sound/klick/Manifest
@@ -2,4 +2,4 @@ AUX klick-0.12.2-gcc6.patch 1513 BLAKE2B 70eac0137fc8b4ffa25ccb86789efe7fc45cb9d
 AUX klick-0.12.2-sconstruct.patch 1836 BLAKE2B 1e22becd7205fe5f9717b18d1d63f7dfc8b265d995c2d503553676c3d281fb7df818375f1fd76f64067d6d3150124c6f162dc42842d1a7ddf2ef39cf9a95e66a SHA512 0db89995a39962e91085c761cf9eb07470ab20a16dd90ae77e1e34bf912ede28aca15a8c7f7708fdfbafe3c84f3b92059aa01f160b936e20a32cd69fbc6d03c1
 DIST klick-0.12.2.tar.gz 111801 BLAKE2B 990743d079927fae0768c9fd7c979b88055e2886ae7d9f6a25116dbdea5b295b82446c6ac5c7e9af35f48058126bc925c4495f5776fb7cd4c6266741cd6c02bb SHA512 e0da321b4f5573e8a0b7ef53a554bf33b6d999b7125c62648d5ad64278107b429effa573187327d7c6fe5ae07bf9c7f81b96f069358315b2ee9166480f6dae7f
 EBUILD klick-0.12.2-r1.ebuild 1028 BLAKE2B ccc840f9041de5d1b45b304eb2f712dc60df598c2dc166ba1c0d1cf1abb46695e05b449fbfd6abee1b9cf2157057eabe46f7573dc66e3a880e76f43f2c542295 SHA512 3be24a91e6279d2381d505a16642143b0f340a3269d53e2ea4b03eb85883442bf9094e778eed7cdbf1c2690749aeeb713160c1ecc42b57c8b518c46473583e7f
-MISC metadata.xml 440 BLAKE2B a60b9b86c120297373d87d67f5f701a3efbf3c09541d0fa1d82c6c9994f41300e92f44bb690a2b5c338d682a04fe433bd6e068e820fa9427b32ebdb47d0e4abc SHA512 fb4c25c97a06ab72f02df5554f430d058cf1178d210d793658e0665617183843bdec2711f0c0a39cd08cb6bf45677a1218927cc9a793997699da7a90b5e88d47
+MISC metadata.xml 241 BLAKE2B a584bb38ed8f3409284138457ac176a82c7ca3156daeabfb91b7bda72fa8d355c42b66683d16eca6addaa3548caba23e1beee758c7a10cc38686df9bee658e3a SHA512 7b743e56833b3696355128536d637744b5b2f7236f4818c6f8fda0c03a82c1f2ad1c8f491b700eb6ec45454924414c2e2df506184466b2145ba895e12dfa76fb
diff --git a/media-sound/klick/metadata.xml b/media-sound/klick/metadata.xml
index 3a4ad095af7c..e83667d5c945 100644
--- a/media-sound/klick/metadata.xml
+++ b/media-sound/klick/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>karl.j.linden@gmail.com</email>
-		<name>Karl Linden</name>
-	</maintainer>
-	<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="rubberband">Enable rubberband support</flag>
 	</use>
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index dc50ec2d8508..98c54327ca0c 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -6,6 +6,6 @@ AUX lilypond-9999-programming_error.patch 479 BLAKE2B f5375c71b2a82340dcda7ca24b
 DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
 DIST lilypond-2.19.80.tar.gz 17244725 BLAKE2B f0883d59b1a14634d5d32e6a6f02c0a224643d6d28a3da623d5163396b74ebd15c3307c33c4d96778254fb6486a74c3324d26e3015d51fa163e3765f2c3767aa SHA512 13a7f258bac8ff77ad6d3879f128e86dd5bf45c7780c9738e6976915574d2dfc5404e6f49ca61dcaf8bb15eb266e65fedec4131a50ded7ab305d1856bbd7a3d6
 EBUILD lilypond-2.18.2-r3.ebuild 3211 BLAKE2B 3e87556e56d9fdf00535b816a952fe5a133ad46f71668a0d02102c09c9f73b799c5d370d6ed788434901da5217524ee7675a3a10338831f5d2df44ef95525b9f SHA512 3f8ad4d240e1df1ed32c1b2fcfb2755dc4aa9f1c018693df543074cf776034bf4b4b89c7129952004ea72ef7f053dadfb9d9bf696be9e6ebd04951b6f366677b
-EBUILD lilypond-2.19.80-r1.ebuild 3299 BLAKE2B 996bfcf42327e0d6372b0867f07592be6e11afbcecdebfa79561dfae3079ee38f0a2b233357705cb00e74b18c2dbdb1e802fe6ddff120f2548d446e593bff745 SHA512 e2561b9c1adc9738ff275fb0eee2eaa2425269c009a94855d27a3f2585b75c0620ab515f447d19ce9817edd14797b3daacf6880ccd0b8979a61f68dfc6700497
+EBUILD lilypond-2.19.80-r1.ebuild 3298 BLAKE2B 52ff415a50fa1509dad2305bd5b419d9a49d28bd0c542f8225100387f613576304bc728e6e6308821f07ba9bc4d6eb367a3b04b95837e45fee1d7189ea9f8dd4 SHA512 17ab9bc1ed6d5a71d7415395d7e0ddda5962247323318bba88a9ecab6e1e170ca941fa018d024e5d9867317c6bfb663615de4d0830bd895a699f7cd33df990a3
 EBUILD lilypond-9999.ebuild 3466 BLAKE2B d68e1e1962510d9653b2bbee3647eb88c9bdb4a9f1824ad41ff30f07ad927f3b93f0f8ddbf7eb92f42530e4a40a778c9b2ea4c648e0c4443f82705983a41a987 SHA512 5e8a7e0fea9896c76e3187d7417dea2c38f05ebd0b5cb06aba66770608a0c2c315412c1e24f22dcbdc182371c617e911785ccfbf1ac731e67e9b8914d9f00f6a
-MISC metadata.xml 861 BLAKE2B c7214caf915ce8f32dad9cd6f08c72bb42490de9f679f073bb6e68c6f14e209f6b3013554fc786d3fb765d271bbb39d54ecdc4df2967700507ab0c9f782d4621 SHA512 d20e7dc27a7836585c7ca28cb78c073c3767a1749d16bca3989bb552d4920e949b3caf36f2227862655e61be0914602aa3af41f17a0f61246b3f305228c9b70c
+MISC metadata.xml 633 BLAKE2B dac41152bf1bacb1e17be7bff2adb0d84c1bf1be3655cb2c32bf70375890fb9bb4be188142e2fa120b11ae14775d85a064bf3603b2f34d99b9b59b1ac30c8fc4 SHA512 b18557745ee11cf04c2950daf88bc1e6a38e05d6610f5740ddf569c914c38a4522706e3b170f318a8380939a9bd5890b6b4db3e6bff02c5f93a7ceb44c6493eb
diff --git a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
index b4574b4a73c9..1a358dd52c2c 100644
--- a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" = "9999" ]]; then
 	EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
 else
 	SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa x86"
 fi
 
 DESCRIPTION="GNU Music Typesetter"
diff --git a/media-sound/lilypond/metadata.xml b/media-sound/lilypond/metadata.xml
index 38d04ad7a91a..75dc5b8e8839 100644
--- a/media-sound/lilypond/metadata.xml
+++ b/media-sound/lilypond/metadata.xml
@@ -5,18 +5,10 @@
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>karl.j.linden@gmail.com</email>
-		<name>Karl Linden</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>scheme@gentoo.org</email>
 		<name>Gentoo Scheme Project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription lang="en">
 LilyPond is an automated engraving system. It formats music beautifully and automatically, and has a friendly syntax for its input files.
 	</longdescription>
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index a1b87169162e..6f960f3efc2d 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,4 +1,4 @@
 DIST lmms-1.2.0_rc8.tar.xz 14318692 BLAKE2B 972404ab6ce517c748aad21528d5891af5d12c47d38a18f802fb3a5dfc5d6f3ee91cce14a6ff267341c06c9607328b018e1b612f7f0f550372a35038749a7bb3 SHA512 b8fb9c505d9f5e7854767bcd223c8578d4977e59d7bf64993fe0b57e00d1de87f8e77366c3195d8ea429eb3dd44c641e3dbecf27e64609e892a4453ab17d7343
-EBUILD lmms-1.2.0_rc8.ebuild 2381 BLAKE2B af03643f06d4acf0e20617111c6b72924ec3f3bdca9b597b6ffb2eef5a4d4baeb9d0a1f66975dcd22b4d959d919e0f668e4fc264bcbc4955c74fc2bfb7134719 SHA512 22555ba14f36692c389358b917e01d764d948fe0301a70353ec5bce7ea992e65cc23f0f88b0e355800cb5149dcc1fd51865c472f0f2ad3e40af95209d1a6c575
-EBUILD lmms-9999.ebuild 2289 BLAKE2B 6478c818d455f024f2ca2a6990c7966037250441ea0870e16bb18a6ac5a87609e473bd416ca6d6cfa50862ff65a1b4c2692f5fa5c1cfc8e8acc7c6b1bc7de92e SHA512 3210450792654040d75011816237a9f3ff6b06b32dade0c9614a6b6077d852fb0e7c080b28913dd90d2c2b46ea27b3eb780c557b1d0c87fe4fe649747fa0e17e
+EBUILD lmms-1.2.0_rc8.ebuild 2404 BLAKE2B 4327d8dcf22d9a6d170843235fde5f96bb6d0630332459da4a3b3ed636ce984d42e8c46cdfd210571443ab9adf1c9c1694da8d1cb4f5654791133f3df5605371 SHA512 cd71131d24ff78b0cbb8bf039dde1e24d206e91787782bf6e2e23d9f8028188ea0fd675eff630a9372f3199b88445048de4db42242f06343e19a6a33bd7d71a2
+EBUILD lmms-9999.ebuild 2312 BLAKE2B 4ff386189219b087a28849b5eaa9821705b9e58497206a0e1d29ed4d2a67893b222562ad36e85c6e62569c1689efe7d10c0bd01cf3a6cf118ed9526e90b871ae SHA512 e2880190ea5731e948b72b4a1f2d06f6992486f7e0d3b7a521d2723b070e611143d686b37fe43f110b52cdf40a16f9a08fb6938915b80cd27b256ad7869894db
 MISC metadata.xml 956 BLAKE2B 0146d8de32c1f9aaa1b111f10e48de20bde5e3634527b4da37ec14d2a148e6eb974bf6665e4fe6254732dff28ec24e3ca7fd1d7b860928453a223bd183895715 SHA512 d96540b061f24e031f1cbb381c05f4eb368e207f8300e8b68e57a36deb2bfb6108453e8428e2534e895927a738d74d8692fc918d8456e0f01b5ec971d4400acc
diff --git a/media-sound/lmms/lmms-1.2.0_rc8.ebuild b/media-sound/lmms/lmms-1.2.0_rc8.ebuild
index 2827a9620b2e..60e4c62c671e 100644
--- a/media-sound/lmms/lmms-1.2.0_rc8.ebuild
+++ b/media-sound/lmms/lmms-1.2.0_rc8.ebuild
@@ -54,7 +54,9 @@ COMMON_DEPEND="
 	stk? ( media-libs/stk )
 	vst? ( virtual/wine )
 "
-DEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qtx11extras:5
+"
 BDEPEND="
 	dev-qt/linguist-tools:5
 "
diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild
index 4fddbf9d2960..66d6fbe1e437 100644
--- a/media-sound/lmms/lmms-9999.ebuild
+++ b/media-sound/lmms/lmms-9999.ebuild
@@ -52,7 +52,9 @@ COMMON_DEPEND="
 	stk? ( media-libs/stk )
 	vst? ( virtual/wine )
 "
-DEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qtx11extras:5
+"
 BDEPEND="
 	dev-qt/linguist-tools:5
 "
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 0e5532322f39..ef61ddd67c23 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,5 +1,7 @@
 DIST lollypop-0.9.612.tar.xz 452072 BLAKE2B 784a7df8baa0b87fb34b6ab8b506d5ce1c90e78e959c6dbd07809c2765e4528c67bf358efc0eaeb03542640290b9fe181f99b2cc19cef3a3fbbb6a9bfc07afdc SHA512 dd61d38f245e6a8ad8eb5fad35fb23aa4a31399c2d2f628266b19aa00f6b615de82a6af33f2f4ae40f768a3786fb991e5f48dbcb0d7ba075579c6779fd05a371
 DIST lollypop-0.9.908.tar.xz 468260 BLAKE2B 126ba0cf76f733cf05d50fc2e23e926e1e380c4f1bd6e2c100a2b2d3c25df4e1cad8cc8382021f80050dd1be3c0cb879fab829abf02acbfc18b960e8a49598c3 SHA512 a066e9d0854869b0d0ee3b0fb84b40a9a768934d475cf7c8bb3f88537eb18027b719660d717766b6ba2fd5ba0a2a25ff7adbda0219e99811e928150b448e6d7f
+DIST lollypop-1.0.7.tar.xz 436000 BLAKE2B 8b41a3378e39b0cba59323bbd7946226bcce29f80c878833ac920f337c036fcaca9c81caca2e360972295c6446c67d79e201093f86cad0685f7365a332d0e116 SHA512 ce537e60e3f1c678fcbf26d1305a178a3f2299abd4f75bb3c3a2cf717295e14aa73a8f21fb88d0c1fc790a80a572dbce84d01a0fe3229879124f89f8a5fa8305
 EBUILD lollypop-0.9.612.ebuild 1332 BLAKE2B 2e92e7d2f1f7ef4811a9b20c92f17178ad21964c5679236cb298e1a24e001a4b5e74620b8cd7fe861474d91ae5059fae5fdc4f9119ba476298e0787ae90a5582 SHA512 f4b33867027ca9ca2a219a18299a00daaa857d89cfa9aba63401442fab2c2c665bb2a6f05fb2eb45332347915a5608f37924013cfa7ebbc0c444bf910fd651b8
 EBUILD lollypop-0.9.908.ebuild 1332 BLAKE2B eb958a4f6485cfd37f744e7ee443e1ea4223c97ba89273b70c0d6906421e02c3476d7726eccaaf8e7bd50cd6536228abdde8ffc7b8adfca18091fe4dd6ab12d3 SHA512 ee6d04c61ffeb0c4d499f254e181a3662d7b1ebd0af70ebe2df6497ec21e5c4b3ea14759dce0e79d44c0d62d3552d2ffca47f52f3a1e8f0e5b86cc6fc361c3d1
+EBUILD lollypop-1.0.7.ebuild 1367 BLAKE2B 58e95f8666ace9c74cdba8e8ef4508b3ec8aadd40c5f07bbe1deb713f7da0f200827a66b23b28f73abbf130356cfced8e1309996ba793196e35c4d2ac233bf50 SHA512 8ddf6d570858bbdb8381ac75a419b2b6534d5c9165df166356783c7c02fe0ec6fca1cf79087a954680f17825d35ebfeae8e1ccf147ca701559e2415249825f32
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.0.7.ebuild b/media-sound/lollypop/lollypop-1.0.7.ebuild
new file mode 100644
index 000000000000..80d94cea4023
--- /dev/null
+++ b/media-sound/lollypop/lollypop-1.0.7.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite"
+HASH="04b4d9bdafd176f98dbd233c564bafb8"
+inherit python-r1 gnome2-utils meson xdg-utils
+
+DESCRIPTION="Modern music player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
+SRC_URI="https://gitlab.gnome.org/World/${PN}/uploads/${HASH}/${P}.tar.xz"
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/appstream-glib[introspection]
+	dev-libs/glib:2
+	dev-libs/gobject-introspection[cairo]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	gnome-base/gnome-common
+	x11-libs/gtk+:3
+"
+BDEPEND="${DEPEND}
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	dev-util/intltool
+"
+RDEPEND="${DEPEND}
+	app-crypt/libsecret[introspection]
+	dev-libs/totem-pl-parser
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/dbus-python
+	dev-python/pillow[${PYTHON_USEDEP}]
+	>=dev-python/pylast-1.0.0[${PYTHON_USEDEP}]
+	media-libs/gst-plugins-base:1.0[introspection]
+"
+
+RESTRICT="test"
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/lyvi/Manifest b/media-sound/lyvi/Manifest
index 33e45587677d..7e86046e3613 100644
--- a/media-sound/lyvi/Manifest
+++ b/media-sound/lyvi/Manifest
@@ -1,3 +1,3 @@
 DIST lyvi-2.0.0.tar.gz 19307 BLAKE2B 009af146f917ed7867c737a78c50261b688b4b78e104518338462b3f1372656298bcda5ef0b70f8a84db800488a57ba4c665884ff5fa2f992d53d3940e204f47 SHA512 0248ceb16436be427ab38769824ce4be48998997b1997f90ddef751105e7449cff7d865e9a5895fb67c79da0eaf394baefe1a77bdc9e6c5e2b6498d64128b045
-EBUILD lyvi-2.0.0.ebuild 838 BLAKE2B 3e190435e06f8ee0f6752e64296c9d102698584cbfeafd4d07ba16a47c63e5f972fb01c069f05fada4a4e953e7a73b15718cfd0d5e7d446203a97a61a2c1147a SHA512 4820d43681d23e2f74700a1fbc68b8fe8045305739ab0e705b016f41bc76b478bbb026a7af4fe1098cdd1dbee8ee6f8a2265274479da8be57f69931f232ef35e
+EBUILD lyvi-2.0.0.ebuild 833 BLAKE2B 4c27b22251fa23d07031360e98614ab90ea97d583969c8893413634a210299b1ad9b70274c6650bd2bf28f2059375729bd3fbdd2bfa0cfe5edaae67504ae81f1 SHA512 7e1bf392dc7f6c15a2478f090cd66947542dbe2f1822e5e0ee6e82fcdb61b88b114c07e11b3e3ae8e65746b8521b2c16f9bc959fe405152d526e10df027d1e73
 MISC metadata.xml 475 BLAKE2B 553ea1293e265b8b077fe66eb6a3ba954fe417a83b802820ce2d10d32b126c780ac6290729137851628a81bd6f69fe4508e67449db42fa3c41ecfaa1b5a8d6c8 SHA512 563ae54e16871f78847fdb8ca7ca1dcc392994acd6726850730ee664af2a0e404ed7e9572fb1574dbd260f41c405349df0cbcb5623c70e0168c54786c03a2134
diff --git a/media-sound/lyvi/lyvi-2.0.0.ebuild b/media-sound/lyvi/lyvi-2.0.0.ebuild
index 545d85dd45fd..3b940f27a26d 100644
--- a/media-sound/lyvi/lyvi-2.0.0.ebuild
+++ b/media-sound/lyvi/lyvi-2.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest
index fcf1e3d9a5f0..cbcdbf423356 100644
--- a/media-sound/mac/Manifest
+++ b/media-sound/mac/Manifest
@@ -2,6 +2,6 @@ AUX mac-4.11.4.5.7-gcc6.patch 10119 BLAKE2B d6a363f26c7a08c6bdb0e14fea6bb2955342
 AUX mac-4.11.4.5.7-null.patch 406 BLAKE2B 8e8c38cebd040bc9728de64c994ee422ee6ab6f403773ff69ea26b85c38ceb4b15ced1b3b6343b36ebc7e380bde54eddf2c13e6c00e8f33cfac99955f6b44920 SHA512 d8fc2ed994b627176f78796980a9d8f4ce386c97aa05ce68085f642f3feb62a0994f88c8586f60a4a1f1116bc42e57d3881deb967e81a887eed800589d61c867
 AUX mac-4.11.4.5.7-output.patch 1498 BLAKE2B 7016b28d4c9a71d02471de1f4a5e5f1ade7db75d53f096916d3f87b154d82fcb4c3e6fd3891f909e0eebef512795ad2072d332241d69315b9e1ab959f7f895ad SHA512 c96874817ea5389ea2af46c634cd548733e614274b43c9395e146c9151dd9e7a03bbb8c82f36807cc2178070f8a87b886c6db94c27cb4369dbfcb874074db490
 DIST monkeys-audio_4.11-u4-b5-s7.orig.tar.gz 511190 BLAKE2B 28b5a3aadd9dae410c93cfc43c40c07fe207036f27cf60d59d8fa137a0327f90a78746c14930b7d3becb7f5fa69a454a6855aae1553dc74cd5168a9a523bb8f0 SHA512 7e73b35c86d6007ab2a94a2d8b7449bb4ac505bbba53e40373a279dc83a9cad5f62a51419a6375335576cf325c88ed7d317b0ef3039b8a497100cb74a63c25d0
-EBUILD mac-4.11.4.5.7-r1.ebuild 1311 BLAKE2B 32e2b958cbb8570956cbafd6f539a5c1b3ed9b25f20526abe300e3eaaaed472d7b21e3179b0b99a891c307e45c4703f8e3e1332682925a6bde7ad559dce8b5c5 SHA512 869deaee6fde8ce9896c43fb5f5db23d0d6fe427e072763e3227e31ae9514b39152e1d437d62b6c26a19a96cb7845875b8a6a30ba7c0a979149b897c0e8bdf98
+EBUILD mac-4.11.4.5.7-r1.ebuild 1317 BLAKE2B f79a904f9b8caee6810c5ebf3fe51b54296ffc31ef690f1b859d3bbfffec53c4e8f2c7a55ea57f8763a3c4190de8ef41ea95ac8d2403795c875826f2f0023b90 SHA512 10269b244873c47cb2dff9725bc25b23035dcb4149c1e435c841b7e40500a89dfc4af4450f0cc55bca7ede7769ad8c04d2b873a14b7f5bc260409781472d8123
 EBUILD mac-4.11.4.5.7.ebuild 1321 BLAKE2B c2f1b98f21ff7bc6c52868869f5b7155d8e88d7db3816c0543b3910fa2eb20de1a9bab983474e55f5ec11ce52a652289587182c740a057591e1d0ba5e805ae32 SHA512 fb1d912f512ed224a52f5899182ae40220f8e7c6cc2aa8f2c8a4d7ae3bf841e2a0e7607b685b7f07c82e348554b69f070f7a629f82b036ab04eed376dedd3404
 MISC metadata.xml 373 BLAKE2B e341287ecf4d69b3a6401db4ee2a465749e63a57fc0bb462928156eee49c89441eeb9dc2943fb7b0209ecbc966d6df0c6de9cf16a3ae9cb1c0dfa893a540458a SHA512 398ca3b9a13eede72e283f90a215d1e05a518f6b3eee9d8f6a74e3eba1e1f0f501443399906f09771ef1c7441667b5e991f98d9cabd9c6b8395af334312f02a9
diff --git a/media-sound/mac/mac-4.11.4.5.7-r1.ebuild b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
index 3391de9d7884..0f0018a5279b 100644
--- a/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
+++ b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.deb-multimedia.org/pool/main/m/monkeys-audio/${MY_P}.orig.ta
 
 LICENSE="mac"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 IUSE="cpu_flags_x86_mmx static-libs"
 
 RDEPEND=""
diff --git a/media-sound/mikmod/Manifest b/media-sound/mikmod/Manifest
index a84a5242da87..5077a67f0b20 100644
--- a/media-sound/mikmod/Manifest
+++ b/media-sound/mikmod/Manifest
@@ -3,5 +3,5 @@ DIST mikmod-3.2.7.tar.gz 279228 BLAKE2B 47c125c76446fed42ca4a40f1d745cef8261ac64
 DIST mikmod-3.2.8.tar.gz 279763 BLAKE2B 27731a143d3483289ed0d6809c3ecf0ce504f8c4271e20d4405a99c39e605dc6c0b50c3cd4e689f7c417646f51141b2a8634e74cd55164e9b0e88be750db1a27 SHA512 fbccfd31c49fc1faa159e7174fb0886dc3742ef935b596176fafeb953498ceb04475bebf9b0a948f1e2de1b11a01b130d2f11f4f034199b501ca08823a3ea620
 EBUILD mikmod-3.2.6.ebuild 458 BLAKE2B 12a8b2456d6558e66a0f057f5c8ecb492b959610b387dd9f94b5b818bed7459bf7a546b3fcdc26dab60b0c9c958966b32ae59e5b45e889db572f97ef20edee80 SHA512 c955942a4a008790f189c27bc91e8f860ca61a3193383afa1cd68d5275e6b525deabc523e83418881f52d41495e71f2a177cdc04555d0426f905db8c2aa55678
 EBUILD mikmod-3.2.7.ebuild 466 BLAKE2B e01b40632ef1d1158804d7331a01049b159e8b7192bf6b066b437975715a5f5c2fb010938d3b4acc0bb07569bdbac1e4862d424825ce16cfd9cd8708bfd36417 SHA512 60a483907d1b11029944dcadb586c3c79ebccd9a4f5946ea1fcd7c41926bcb52aa5fee61ceb0420c25640668ca8e7acf4544b132bd059edd0c40a120f9e0826f
-EBUILD mikmod-3.2.8.ebuild 471 BLAKE2B 838b4da56ac7851bb9e5529e5e739e8239090b7ed3113d26aea32368f37876756cd2bc9763c55e7592f890c17c49f3b9452d5117ef6de0d54f3c04b6a3882724 SHA512 2dee158c4a15091b002667dd32a7c9f693f05321dd851a9b5369312d4f729c5854387d065f1ce3a79e311d757c7cc5b90a58de7257c1da5cae94ebca01aa71b0
+EBUILD mikmod-3.2.8.ebuild 468 BLAKE2B 8d40871420d071b4db21a255f33c5a3ea060fef981cdcc82a5ae0b1334180407d4a04f868c92ac12939b865d5697ab2b1fe58f2b7c58cf286f9dc380922cf189 SHA512 911a8a354798b39b68051928bc5f170d2c19db66e2d0c94fa5d459a61c175a5ee326270b0cfc5847799fe5ff50e772bb9bbe095d8788576adca4c3c14527f4a4
 MISC metadata.xml 329 BLAKE2B f5950a51c451bd95614667a932e0799427831bed04505850b99dc77173b773cb8c158b50053b6c3a41755c8a1bb87077fb538207d56fbcf94fdce44ea0709093 SHA512 5deced2e8ecff6e1098f1ff339281cebfb8027bb052af10c9d95c7ae1eb80db0448cf5b350d40e5d5f76ed9948ffb5e4f8802f200f9b7f139a40992311eedb55
diff --git a/media-sound/mikmod/mikmod-3.2.8.ebuild b/media-sound/mikmod/mikmod-3.2.8.ebuild
index c4356cddee7a..4e9a21d09c4e 100644
--- a/media-sound/mikmod/mikmod-3.2.8.ebuild
+++ b/media-sound/mikmod/mikmod-3.2.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 43a1740e5a8e..012949588536 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,12 +1,12 @@
 AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e30e29e6c4d6330cc298a568ee7dd7014af6b9c1f1c4d98b8c11c96da7f74660eb4b3b522f449e7a6a431addc SHA512 01ab76466f782f538c894e460f7694553ae12804651f68aabb6aaa0dbdc89e2ff7e2b51529b0f112cee42c8053b75fc64241a9c8898def8cf1c76231b1ec5d59
 AUX mixxx-2.2.0-lilv_include_fix.patch 1006 BLAKE2B 1541ecc32cb20d02d71577615b96605938a2d38e40e04fc43e864c8a85722475b795c807ccda1df0ff86c6268d1d1425934e3b413fdedc2effcbd6a2ab584ad6 SHA512 e15980f9861a61bf965636182fe3f0d41d25d569d2d4b43e167e53e33fe7e8f533878e93db237e90551ac409811de497e3313e32fc62462bf963b7f1f29c4a11
 DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166 SHA512 c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20
-DIST mixxx-2.1.5.tar.gz 34474975 BLAKE2B 3daf5598cc7efe162157004116ba7fed2d53a2f97b513abd03d7ce55731a9de1e85ae5c8d82e1cc1369201f3694b1a295223f70509540ca471e6e785070acbd4 SHA512 f46f528fdbd39a14a16ebce3e53c9bae12299cfd405d69e812d87c66e9f3728542f73f1156a352c0637b194f4bb35ecdd599e4bbbfbaa7ebdddcf9a1eb792854
-DIST mixxx-2.1.7.tar.gz 34534265 BLAKE2B 63bd7b0002b2b595e8e7b3be6b282e55465221dcdf1a0dbafc454663e87061059dbac66b764c3c3f59446d3794f2d43f9dd0f087ffa6cb7215361d8d0e51dca6 SHA512 976bb76b360ec8a81a6e497d193e7e450afadb66be4c2648a198884a3bafee7efed3b2fa57d0c5cb9bfa216e69e51db588cdc274aaca8dc0f22486949732167a
+DIST mixxx-2.1.8.tar.gz 34652727 BLAKE2B d996bb07a5914e5a3b8f276130e1f8fb46a9493e192e45a1b65cdb961b1a7ca0e98fed69d894ace8e61ee72231a1d8ba731921e46d3601ad0d41a79aa04a47ab SHA512 c1423bec9b3a9654ece5ae68c0f72975dcd2a9cee377520e56d4f35366a3bb23157c9c64f0f2b8a61d36e5d818216b64cb6aae53ca2b8e3dfa865b8911a7e1eb
 DIST mixxx-2.2.0.tar.gz 34639153 BLAKE2B b99d05508f3f59debf026fdc5102f213eaa10a747c234e3f8f1782af9c07fb30c4641ca3c15fc634e2e8081966f8897751fb7bc72928f8b07a3c9c6d9d728530 SHA512 8174b504d236cde36c636985e0e224915f0be69b13691bf0d88c21087c20c1100ff55561b6e395d97fe5b21a0229fe9ecdac2493cb44fa99a42549c368fa2134
+DIST mixxx-2.2.1.tar.gz 34763333 BLAKE2B 246bd01fe346298ea27d1cf64a597ddf009f31fe7edb004a2b5ffd4a2c4a09843e5c47d38acb6428ed2b8f3bb4e5618b1e97d64ff1b9721682a6b34fbd49b73a SHA512 16f0f4f6a83cd18501fdba3cb8d4f7fe4ac14b980d390406cb61acb889647ba89bc4051bb342d73081f940166f1689027f47fe6928e36c72babc18bf2a0d9bf3
 EBUILD mixxx-2.1.1-r1.ebuild 3004 BLAKE2B a1718363b127fe5515d616bf8daf6a354c9ee4798514327fee5b90d8f9d397a1b59ca5ec6423d1949ebc3863b24beeb6f8f154cf6610dd1ae3e7fcb527a329b1 SHA512 db6c3550d8453e36e0b469a283317235e27fae69f2ec7c40b893e4e2345a7a4c5295d6ab7fe4572c91867311067697a602cd8173e771f2b10319fcfc453d3bd9
-EBUILD mixxx-2.1.5.ebuild 3003 BLAKE2B a7f2261d2a470e77b7b7d227bf68cd15e32572bca684662c66480cb8adef3878c8b25d7e85b19496ce6e977d45cd72e7e9063a405d1603bfcaef30f4637fe022 SHA512 3d59474452d549a5c2c72028067a554ec4b4b5e11e57cbed1ca445c00578026bb87b5377066335d438245597bf120e11425e0fd0a5dd0164ba1e09378e6d56a4
-EBUILD mixxx-2.1.7.ebuild 3003 BLAKE2B 5d35929d617994bd53f442deb2d6ececb490ee8867736a5232c864fe16d0e1ca44ff65c5965a7790653319d02c06bc8f528cfb8730379db54d238ebea4d8cff5 SHA512 838ec039f8acdbbce7cab3147ebf1446fc9fdc0130dedd6a13ce8f468537c1e9832b9d552a48f601acfbf069784118eabfa61d0ae24d1c8f3aa083791742abf8
+EBUILD mixxx-2.1.8.ebuild 3003 BLAKE2B 5d35929d617994bd53f442deb2d6ececb490ee8867736a5232c864fe16d0e1ca44ff65c5965a7790653319d02c06bc8f528cfb8730379db54d238ebea4d8cff5 SHA512 838ec039f8acdbbce7cab3147ebf1446fc9fdc0130dedd6a13ce8f468537c1e9832b9d552a48f601acfbf069784118eabfa61d0ae24d1c8f3aa083791742abf8
 EBUILD mixxx-2.2.0.ebuild 3159 BLAKE2B 01478993c3cf731fba6ec0df3a53492cd8e932100d9b37ed398c231eb91be7179f3244715d7db0351b6a3a71dfc29c23b6f5b1e819509a90e97d4d6292b98098 SHA512 194f76c1d2aeb32a331abde710ada213879b80e0c18afe7cb2164c542ee084466496d5c7a5a21db46b07c41bc3d4a9ef439bf05e20b2f6221467d990a5d21cb6
+EBUILD mixxx-2.2.1.ebuild 3159 BLAKE2B ab14ada19b18cf85144ac82b915ce3b16e2df4516587d7b11765f2f8c7d13db2c342d1a3e6d3f79b66a58a9a1dfddd1fcaf6b8a34f2f7d3179d61c73fced3f8b SHA512 8a124c7d2fa60b726707bf181f38193f36cf77ce6608343d13bc9ef9c78e32318837dccc8115233f44da637699327a9cd6aac2f8697c04d0fd466ded07ed9622
 EBUILD mixxx-9999.ebuild 3156 BLAKE2B 9251127fa8cab40f36aa43f999478b2bda2a4e99ab7939f1f758efd59fd58716e938b4e0128820996bd9bad616e35cf209eee4c9134fe229a296910db45dfa28 SHA512 ae54684c8970ad8068fd97674e4972326c14006c1c1e48d4563ab3b574a215d140eaa3c88f2ee6fa4ad3ebe9479c3bc1ffe5e855016605106d8ea30ab71e5af1
 MISC metadata.xml 632 BLAKE2B d6c7a595841941a39b97a16a74677a1baae1a97fb4af73bb019c4fc03a96aaebf5b369b1e89a398f92c6cad4a28083620b4016cb9e5cbc99823025b776d7813c SHA512 109ee347f6a011c55858a555a93bc0d67ed6dc8a86ec7e2bcce8ad949a8742a4dedd1da3487ccaf1f928e063c6ce5750e083cddb9807d8bd732db231e2e7904f
diff --git a/media-sound/mixxx/mixxx-2.1.7.ebuild b/media-sound/mixxx/mixxx-2.1.8.ebuild
index ab11da0490bc..ab11da0490bc 100644
--- a/media-sound/mixxx/mixxx-2.1.7.ebuild
+++ b/media-sound/mixxx/mixxx-2.1.8.ebuild
diff --git a/media-sound/mixxx/mixxx-2.1.5.ebuild b/media-sound/mixxx/mixxx-2.2.1.ebuild
index 1b5e84701fd5..87572640dcad 100644
--- a/media-sound/mixxx/mixxx-2.1.5.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac doc ffmpeg hid mp3 mp4 opus shout wavpack"
+IUSE="aac doc ffmpeg hid lv2 mp3 mp4 opus shout wavpack"
 
 # fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
 # got fixed
@@ -29,6 +29,7 @@ RDEPEND="
 	dev-libs/protobuf:0=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
@@ -36,6 +37,7 @@ RDEPEND="
 	dev-qt/qtsql:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
 	media-libs/chromaprint
 	media-libs/flac
@@ -59,6 +61,7 @@ RDEPEND="
 		media-libs/libmp4v2:0
 	)
 	hid? ( dev-libs/hidapi )
+	lv2? ( >=media-libs/lilv-0.24.2-r3 )
 	mp3? ( media-libs/libmad )
 	mp4? ( media-libs/libmp4v2:= )
 	opus? (	media-libs/opusfile )
@@ -76,6 +79,7 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.0-docs.patch
+	"${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch
 )
 
 src_prepare() {
@@ -107,6 +111,7 @@ src_configure() {
 		ffmpeg="$(usex ffmpeg 1 0)"
 		hid="$(usex hid 1 0)"
 		hifieq=1
+		lilv="$(usex lv2 1 0)"
 		m4a="$(usex mp4 1 0)"
 		mad="$(usex mp3 1 0)"
 		optimize="${myoptimize}"
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 1f398910768e..b7ab4cbb2074 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -2,5 +2,5 @@ AUX ffmpeg4.patch 1401 BLAKE2B 116679802c4acb9e843dbb8d656177ae133aefc49a270392e
 DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a31d47cb9a3b377ccd04e2be53e57274e76daed29177368c944740fd26cc862fc498f950070f0b83b0acc7a SHA512 992d06809fb52e58dcee63704bde05795b99edbac46edd8381f314c564490013b18e1853926f419c2c3c7f1bb68ff35e97048de03ace3232b800cf4b3b7dbe0f
 DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf
 EBUILD moc-2.5.2.ebuild 2148 BLAKE2B 3039de5a7faa6b92c6b9c836a5268896eec61657dc9ce98075f39096df8b3b21494b2bcc1fe7b3178d6870be7505bd8db5aec1b9e08118ded7c315f4dcfec172 SHA512 9680c784f3dcf4a1ceb57c5df5b6c92e27bd3f144ff49d3805fbe8a3afb614b72c40160da15f3a204738a935d6fb84aa16dd329002c59a461e0550c15a80ed5b
-EBUILD moc-2.6_alpha3.ebuild 2309 BLAKE2B 4eb66dfcbf1937b4f53f4ca55e10e13c3a7b11c643c1ba23b0420ca74ae62285ee8906a83a34efbd4061017259f96c63853a79c77d66dfd3ab43c46a05491ba5 SHA512 bf0ee47a7722d2ad30e6df63f39325f298a87ab30c3dc0daeb40dd1fec6302bcdf1cac7b754ebf612a2316f7c4df84b599c2da22d9b3b60e5618753e7ced18ea
+EBUILD moc-2.6_alpha3.ebuild 2306 BLAKE2B ed55a70360aa10640f72a7cfc240fb71a8e777fac2cbbf2200dcf97fbc7cea34b78d74eb819df46bc00ea76244e09c22c80e3aaa916cf643e1f3cf9cf3f7bc6a SHA512 e91d464c1671041ccd940da587a0f2aa2a0d9ab0f83e7107ebd6cd493d835cf71c47d34d67b19221840c7b6f88f4831318708f137402844b57d62f9822c27242
 MISC metadata.xml 596 BLAKE2B 4ebc0826f9a0352909b2dfcfcbd7712d0af6b484b5801ee8e0b73be7a5966968af27d5fc4d56893d407e0bbb3809376f8336291901bc36aeb2e43e549e60bc44 SHA512 f2ca529805ed93256100396a8ee414ba1098097eb4a8379144d52fbdf02d98a05c399cb1be861c64eb712bd5160f3286c30e73875dce05ce2e974f7123b40699
diff --git a/media-sound/moc/moc-2.6_alpha3.ebuild b/media-sound/moc/moc-2.6_alpha3.ebuild
index cd4d54fb88f7..051b36098d98 100644
--- a/media-sound/moc/moc-2.6_alpha3.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.daper.net/pub/soft/moc/unstable/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc ~x86"
 IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
 	oss sid sndfile speex timidity tremor +unicode vorbis wavpack"
 
diff --git a/media-sound/modplugtools/Manifest b/media-sound/modplugtools/Manifest
index 51b077e7b225..476af5b4f12b 100644
--- a/media-sound/modplugtools/Manifest
+++ b/media-sound/modplugtools/Manifest
@@ -1,5 +1,5 @@
 DIST modplugtools-0.5.1.tar.gz 337382 BLAKE2B aa04a7fbe0b4be1e8be2bf5ac1d9ca9641fbc99f16ce1e9cc8bf65bd89f42e6cba1e1ef5fed3323bd49c086d7a5ed199fcbfdc29ccfa0845244f6177a848139c SHA512 58e2bfda90630bc0a4762fdde4afc48865a921beea41419a0f57e7a2e4120579d4a1bf734b1c7925b27fa3fe83a665a35a3e4a22a30c0035854e9fe35f6fd759
 DIST modplugtools-0.5.3.tar.gz 342603 BLAKE2B f66d985769c3f8f311aff539bdf88c9c63a1e0e86e5a63e8d5b287140c113c6443fe48ef9bef8b7fc598b488cfb5a4618c42a432607e9aed58896d7cc23aed7a SHA512 82f3787dfd6188c722d2b2dac315ee40f46795704769575695d7d71cd504b88e0e2dc39bc2d9d803dd84473b86d09019be9aa6c5dc713c72bcfa6ca1c1340e9d
 EBUILD modplugtools-0.5.1.ebuild 482 BLAKE2B 96fd6fa5bc83e973bfacaa51024ec7b1f070a65059cf9c4c8cb817ddbff935106b64b3b97c84e717545d91a49feaeca60a05e945b205f0a70a3d0057ed94257b SHA512 06ca01846a7b4073324fcd069d3dd221290b31a38f74027c3a0c20f692fa2bf96bf06f35ac6ed1dc0840d4cacd7375e591e842d64759b6bb3ee943ac107cf52e
-EBUILD modplugtools-0.5.3.ebuild 484 BLAKE2B 197dfb4d55d8dba3d6ee11c9ca9837ca15823fe54083f4129e90f439973a0e866c345ee7499f4e34586dbf7dd80d0e8ded5e3e303aca9d9a849f0e11a4556f9b SHA512 e914abcce34adcf2c8aa417bd2493b6a9f889291fc0aa56e10eecf46f61308d4639b10785bb601d4a985d5f08b1fe17c14368a4519d292940ce3fe6233da54e3
+EBUILD modplugtools-0.5.3.ebuild 480 BLAKE2B 4fb7096f4fb8014b218da07f5eef714c1c92e0dbe19e3ca1420fd8c7323683b74727fcf23576f014019da2cfe288aba8841ac9a10ebec7cc72018bcbb450ec45 SHA512 510906c1f5d3a2a7d826e37f09adabc7141629ce1effddc22a3620eb18116258a8bdbc3926a0aadfdb3aa89c0fa4c56e1d421a8a5a3aba7817ce0e746ad0ba1b
 MISC metadata.xml 335 BLAKE2B 8d72f4d71a61dcb53528381c1661c06f4a4229dec58ba437e43478cc65b3f7d92133cfcc8cb49e5e411176da08ed3311aee58c0490882b90b8922a38f47c1546 SHA512 ff5cc9078858678f75ede9fed227b75f852d2caa6471dc1af1ea6827d30895bd59a7f4a7bb3414625d86af528fe2ca358debcc77887d34bfa51ddff618569d33
diff --git a/media-sound/modplugtools/modplugtools-0.5.3.ebuild b/media-sound/modplugtools/modplugtools-0.5.3.ebuild
index fec8ff0e7fc2..7f83d99bac6f 100644
--- a/media-sound/modplugtools/modplugtools-0.5.3.ebuild
+++ b/media-sound/modplugtools/modplugtools-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libao-0.8.0
diff --git a/media-sound/mp3info/Manifest b/media-sound/mp3info/Manifest
index 9afa74ec7ed1..a9a2d5151129 100644
--- a/media-sound/mp3info/Manifest
+++ b/media-sound/mp3info/Manifest
@@ -2,6 +2,6 @@ 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 932 BLAKE2B 10fff96e08979079e936acc5769724f364e98cfc9b5135d4673942cb15d3b564ce40760e5b1bffca426e551825f40e0e92cea1acce5e3bc2222b0106ae2ed13b SHA512 ea5fdc950bbe80cf0769c4ff30f530c6c509d20d125ae584e838204e960a08b60b8278e37536857cdea877a4d621842f23b190cfe82bc5b6e616910cd7e8e66d
+EBUILD mp3info-0.8.5a-r1.ebuild 927 BLAKE2B a7faefe420a7493931d94b469b305db1bd7d7fa228f949908fd30b1114ef78073b223b82c5cdfca40352d75547e71f80121ab1f012d4dcb4b889178175717c8d SHA512 1cf7636c1d67720e45bd925b2164e644a53e8b4b311a54ce963d0e8ec821ef3aa4b7f34c902facb7be9ce3d35b402bed1480a7db6d7f45d70b6feea767ad2b51
 EBUILD mp3info-0.8.5a.ebuild 901 BLAKE2B 3db0a926a9e7b8f26778f0a9cfcd5a7b019c4b966ff6f23684343463810ce4f5f9ace1896ddc52cef1c35fc2e633462e1a11e5365b1b5bf58ccfb6413d0cfc5e SHA512 3ea667a13f1b618a7370686b9d2b0e184a3a87677d45c6fe541a25a45bdabcb206f89e244d6fa16b78bff9166dd6588afc702a961d3247714f784edd9fb9abd6
 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 c536ded44571..e027778e9ece 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="gtk"
 
 BDEPEND="
diff --git a/media-sound/mp3splt/Manifest b/media-sound/mp3splt/Manifest
index 5e7a6532a5d5..9828dcbd3b81 100644
--- a/media-sound/mp3splt/Manifest
+++ b/media-sound/mp3splt/Manifest
@@ -1,5 +1,5 @@
 DIST mp3splt-2.6.1a.tar.gz 260476 BLAKE2B d40555eb98886ef229baade1c390498d2fb3bdb79f9efb3e8ff286c7db70165b9c18d5bf4c331c175fad937d2eb85d1419f5e15b8fc31fb60d07ed02d7e39e24 SHA512 5c0f6a56e09c0b33f83360bc4ea5d4c9398fa6ec9bc39e7e9ab34b0ff19e46ddacbbc69ff51953ee399f1a172f2d634c57c256abdfe51def593e5f981490cc17
 DIST mp3splt-2.6.2.tar.gz 260901 BLAKE2B 49b45f53fd1a646993aadb6c18fb0cf7530b61f3ab5ddcf7bf220a6cdbde9844dfa048f22c10c1c89ceff2a5f77744b17c70e1aae7120300c606316b0a48eb0a SHA512 c1cbdc905d4f19e8e20afeadf02a2967049d86e69613312c8855e03afc5b190a569ac63f970171384853961cbe6bf248fae47e5116c4fe9deb7a0787f299918b
 EBUILD mp3splt-2.6.1a.ebuild 701 BLAKE2B 5d5b33841e8cedc429f19f58bea0af6f0f88b96f84d270a11a9720b5e5659978f99a168c05b00d230e72cc99fdca455e80044a46d29eee992b01a6d5fd4fbdf1 SHA512 70cfd32c331223d21c33693d7b77018781b2a86dd7875cb80935a1868e95c0c474efa0dd5e315cf0ce0fbe7c0634508ceec653765824442d273de3088207605f
-EBUILD mp3splt-2.6.2.ebuild 706 BLAKE2B ae6a6f788217a8509ef3656c7a375a0d9a593df9b8562d07931cb34f75bd7a3ad3dac6dbe129ee859167da5ed6ffd06fa4e9269783b93efb8c0609dda62be3fb SHA512 43644996c9ec92dbe185454fe78383020bf2989066e4542f86e2a923c4b638cbc76878d017c9f9252700992418ca490245b3efd6fb1f6850540f46d895155b5b
+EBUILD mp3splt-2.6.2.ebuild 704 BLAKE2B 21b9a7509d535417291a0f896f40f8acf0ae3cbb6ea3241c6d96983cb56fc5f87e494a80a068c3c64d05a681b41f05e71a2c235bd817438c65a140529d07ae63 SHA512 a621f19d46460a43d165410e4509d3808bca95d93e0e2dd9617901b9feac567822dff9c1e2662d0ff86c4604cd71cb32628e8ccb227d27d18e70f21f4f144faf
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-sound/mp3splt/mp3splt-2.6.2.ebuild b/media-sound/mp3splt/mp3splt-2.6.2.ebuild
index 88d0bf3cc76c..0d1020409e7e 100644
--- a/media-sound/mp3splt/mp3splt-2.6.2.ebuild
+++ b/media-sound/mp3splt/mp3splt-2.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc ~x86"
 IUSE="flac"
 
 RDEPEND=">=media-libs/libmp3splt-0.9.2-r1[flac?]"
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index ccb50baba1bf..b66720739cab 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -5,8 +5,10 @@ DIST mpd-0.21.4.tar.xz 663648 BLAKE2B c9226d2b02b1035091d3af535c269aec3fead779bf
 DIST mpd-0.21.5.tar.xz 667624 BLAKE2B d4de4c55306a42caf4f79ee469db2037c0217563d50d7a4ed349d0c2c61cab1c6e519da96f552f38692bedf18ffbdb2032ae0a3314a05b2f2461c2da526f85e5 SHA512 b3a938f43cd554e0e761890ca7ea910e21b8f98f54f5bfceb0efcbef4df46db0d110d1bbc24a233021b463e3424d6246c1013f5a6ebdfc85a418008d49ced7a4
 DIST mpd-0.21.6.tar.xz 669272 BLAKE2B ffd50c35e431791503e5d0137abdb93beb42cf48f7638ac0f394d8c4198ce96f915220c92d078ce99cfe7c9866f8e35e58106b801a6d83cdf0a121442f12976a SHA512 20e752a8db2f8ae0b2419b35018557c37a64c6baff25666ba35fce89cfd354e4df5064c25685791f3fcca7ba9e6e6acef0e4653c0c0ffafde2847085dc51b3fa
 DIST mpd-0.21.7.tar.xz 670268 BLAKE2B 1dc6b923e6c6f66ec1f0769b6c4d785761a798659c192184801cee5cd6df361fba0107275650da3e5982ebad5370fb6fe1fe4f7bb9da8986e9c359e4ec2a7815 SHA512 a6e8848c851ca464cfd26284d6479d561f127bc102128e8a41274bc1d62d87a3720843ff1922b5b64b33280217a6036b512f7aa0ce7d7f6b90cbed9fe787c5ca
+DIST mpd-0.21.8.tar.xz 670508 BLAKE2B 04df23007e5cedd00259b1d5f7d301c36b52993ce8352bf784c794150340e4bf2d0a606eb02de3abedcbb9a76f01aca9dc9191d95efd49d0868a32af385821d2 SHA512 034f1cfe431ce163ed808660bee90c2a63926fcc95ab22f55fd566f24c126878fe0fd6521f3008612ea5dca7b448cc5e5d895e0b0156c768bf632674ea982901
 EBUILD mpd-0.21.4-r1.ebuild 8174 BLAKE2B 35bc9bb4ccf75ab510065b1eee80ad626d1359654a3faadfd0ba8e3d09eb3ab3bca37836f2d540704f1914b2a25fe90dbcc80ad1333e6b57970e0f6b2c227f09 SHA512 b347f5939053b35bc95c1600706a364a762e4e81a3a238d31e38a884970df9d1db8892c6b943d8895cd7a115e21310fab646bb0c13a2731f7037e93ac21dddd2
 EBUILD mpd-0.21.5.ebuild 8185 BLAKE2B bf1f75190482eb97a199b068376af40f32369ff51dc47643d3a1f65a2521611ed2373c9cd4ebb5b6a6496f781e35457e7352173e46106dae9585d781b716b960 SHA512 f3230bafb050bc68308fe99d567e4ee593907b8087bf45343ac07307d0253132a04e96a3b26e8c74f7a890914c3fac6d12a1a6155a0d46caada7fc8c2384d915
 EBUILD mpd-0.21.6.ebuild 8185 BLAKE2B bf1f75190482eb97a199b068376af40f32369ff51dc47643d3a1f65a2521611ed2373c9cd4ebb5b6a6496f781e35457e7352173e46106dae9585d781b716b960 SHA512 f3230bafb050bc68308fe99d567e4ee593907b8087bf45343ac07307d0253132a04e96a3b26e8c74f7a890914c3fac6d12a1a6155a0d46caada7fc8c2384d915
 EBUILD mpd-0.21.7.ebuild 8210 BLAKE2B 6d8dc4bfe296f70ee0fade0a0c77059500da0a7e6fc880a329973620d823496519da8b94598757a327966f209c6c20f3f4b30bebcb99eef74849f0dc8984efa0 SHA512 18ebeaedad356600acb15badd8b5cdc3d81708ca3c62505a00fe77aa538c114accd650c439f1ea29ceb9df40cc4b8c34821abfec575bfc091a84b53bf8dc5118
+EBUILD mpd-0.21.8.ebuild 8210 BLAKE2B 6d8dc4bfe296f70ee0fade0a0c77059500da0a7e6fc880a329973620d823496519da8b94598757a327966f209c6c20f3f4b30bebcb99eef74849f0dc8984efa0 SHA512 18ebeaedad356600acb15badd8b5cdc3d81708ca3c62505a00fe77aa538c114accd650c439f1ea29ceb9df40cc4b8c34821abfec575bfc091a84b53bf8dc5118
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/mpd-0.21.8.ebuild b/media-sound/mpd/mpd-0.21.8.ebuild
new file mode 100644
index 000000000000..969b82d84813
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.8.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+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"
+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
+	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
+	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd tcpd
+	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	adplug? ( media-libs/adplug:= )
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">=dev-util/meson-0.49.2
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Ddebug=$(usex debug true false)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dlibwrap=$(usex tcpd enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		-Dadplug=$(usex adplug enabled disabled)
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=false
+		-Dsndio=disabled #not yet in the tree
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	doman doc/mpd.1
+	doman doc/mpd.conf.5
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
+}
diff --git a/media-sound/mpdas/Manifest b/media-sound/mpdas/Manifest
index 73fd69d25955..87778969c96f 100644
--- a/media-sound/mpdas/Manifest
+++ b/media-sound/mpdas/Manifest
@@ -4,5 +4,5 @@ DIST mpdas-0.4.1.tar.gz 15117 BLAKE2B 0d1c527434aeecf822f686e50ca43bf684c4ed528d
 DIST mpdas-0.4.2.tar.gz 15695 BLAKE2B 907417050ab1b3d6577311e633b060dad2ff834b5436b7ed086ab5cb9ef291004916fc07cbe18ba4b80eeec8573775cc8e212b93d4ed103cbab3ce81082a18ae SHA512 cebd3c027002ac5283834edf3a1338b449c4a78261690cb5d25c57f767f1b0b81ff8ca5c64d79d6aecf5e86ba0c7b63a51131f6cc9031f2922e92eeddcada353
 EBUILD mpdas-0.4.0-r1.ebuild 713 BLAKE2B 457d000fb43cfa63a8d897dd9b4ea9c7fab52f9e2b3a875616104a2c5988c78d6bdb43c67a7a8753610dcdd79504f5fa42b077db8a752058ec3f665ab197eade SHA512 6ff9c4c330e1a0cd2da0082469f2c4e194e9861a252f6733c427cb62c85b5e3d8ffd63528439296817614e0f7c9c3e4ee6341106823a5718fedc22f88f82f49c
 EBUILD mpdas-0.4.1.ebuild 715 BLAKE2B 5cdbecdd1167865e850733c2f4bcc7ad598c4bafcba46e35afb17e8ddf941ae2137d9e192c5212ce1bbce5c9d58376acd1d808e768551ece2f3c2b786d304ba4 SHA512 79b9bc6753ae2d6a19c07b72ea4d2848b4d34a5e94033c28b8c7aa75e32145903d715c70da3e7ac2c24095e5d43a8ef60b8ce12f764cb20ed7853ca8cc02b7af
-EBUILD mpdas-0.4.2.ebuild 788 BLAKE2B 91fefa743ede8093667fba953314fc28d41ea427ebf344e1d05d224197da958a67c72f8baff8afb794853e1dcf7657241f0f4cf6f704d33430b6bacaa182ee49 SHA512 be73bc9490f418920606434241c3a803ac73b4d57eccaed23bcd0522ea3fcfc3852462e660ef6cdfbc5789d9d2bc372fd0e361ff6c4babe0ce1805610913595c
+EBUILD mpdas-0.4.2.ebuild 787 BLAKE2B e79468b91ed36841072ba5f40ecc798d099ecde07bbe6b5d05c998a06984ba3142cc190cff49ef172daa40e117dbbf369c461a80d05ee33bbac3c2ce345cb12b SHA512 5cd39afc8f260664ba55dadb1ed771cdad448e01195ace5b8a2fe88ea0316006908200758951129e399e3545b8b5e93af3f885253ebd8e86c2d580a51d945665
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/mpdas/mpdas-0.4.2.ebuild b/media-sound/mpdas/mpdas-0.4.2.ebuild
index 67cdeae8e69c..e5dd45d3bd91 100644
--- a/media-sound/mpdas/mpdas-0.4.2.ebuild
+++ b/media-sound/mpdas/mpdas-0.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://50hz.ws/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/media-sound/mps-youtube/Manifest b/media-sound/mps-youtube/Manifest
index 1d035c22e38d..6a46c78bb34d 100644
--- a/media-sound/mps-youtube/Manifest
+++ b/media-sound/mps-youtube/Manifest
@@ -1,6 +1,6 @@
 DIST mps-youtube-0.2.7.1.tar.gz 78128 BLAKE2B 1883ac93ec06b657f72463291d4844b4cf5c1edfb14088769d32bb7590ea676c06a1022724c40b94230ee5469864b402a07c56e535ac3001d57c87cf6937d370 SHA512 760bd6ef6c04606e6e70e4d7f985482c5d5f1f33481a69398d20c2518ae7a1b0371501e31b6d0bcb46e702c53d8b2311e4556700c7d2ae4011006ffe9582de9b
 DIST mps-youtube-0.2.8.tar.gz 95542 BLAKE2B 67aa7db4e26325ef35b6c263ad1020bfc76ee683314c4e49b5f850d9c49c3795b5e9f3ee042772d9ce1c682fd04cd21ac24975cb3b7b7a2c4834bbd51b0726cb SHA512 7d4e092225652b5b63a2f94e7fa7cf07ff8f7797bc412de9388883ca9f95e87a14ff59276f28d208c5fd2e74315b1d7f275937f7c4cc86134ae5778d880d2620
-EBUILD mps-youtube-0.2.7.1.ebuild 592 BLAKE2B 7224e3b48b3725c3a79f3487c408ab863bd5cac6b34aa53520b2b22d23d361c9435577d9dccc6d2928d91e8045e05d9a39bbfcb58413190ff22cb9dd1c6848a2 SHA512 713410c6f919aa27033190a1616b624bf62660e93dd579b4a7df0080db668363c3ef737aaada6b87aaa3debeb181517ee300e97f674fb155a1432182e8fa682c
-EBUILD mps-youtube-0.2.8.ebuild 715 BLAKE2B 1c7f6b8fd2000ea93b397936ba2b08933f6219b0fc25a42c52285352d423bb6a2fb0a7a5367c4f98dbd0fe9e4d3d1fecd0ae21364da0b39e9c1f76dcc7f4cb81 SHA512 b71975b8d4b40f7181dd88cf660c51d7273ad925af391d7b532ca013aaac9f93aec066a5fd5774af7fecd61f82fe523a332590b3493e769d172ddaf0930f09c2
-EBUILD mps-youtube-9999.ebuild 715 BLAKE2B 6db89a4d3a34d91fe7b191ed3d4faa41557bad51891de00cc70641da2e9a7f19c2355e76f6ee0cae0bc8ed98ca5aea0dfa6b1c9dbc2b4b103ef9fa5f5842e4fe SHA512 c3ae59308f9f3d05b9a95aa14b35387460d3b1099140252b21d1ee7693da14f7f924e3320661535d86d1f3f43787e7186ebff549e16fc9a45d989ec783374b73
+EBUILD mps-youtube-0.2.7.1.ebuild 585 BLAKE2B 1f7ca5abaa37e23c285be9a5f181bbd9b7e2682786dfe70321c223139b258e9d7620cad2221199b395e07f054762c906e9a1c8a6dacc53affbc598fd365eff93 SHA512 e3d5fc7c825ade522aa6fc55d38ca9355ece977fa81bd1d489913d83ef2028519554431c8a07f16b85a884ca21499af297afac85e7a6bef8c87b6296223ee697
+EBUILD mps-youtube-0.2.8.ebuild 708 BLAKE2B f8317ac35c1b83926dde60b1c7f0253b929bc2df6814603414c9e9a20a635ebb687a400d9a60d47215e15213ebd6f431419dc06efb78f7fd890b1e3b0c03a515 SHA512 fa88d3b0632ad2ea146b2c85c673e20822f7204556d60fbf92de31e35e57403d62ccea7fdd8abb491e02e51236c590a06a18b2c39e4934093ec16c724d68b643
+EBUILD mps-youtube-9999.ebuild 708 BLAKE2B f8317ac35c1b83926dde60b1c7f0253b929bc2df6814603414c9e9a20a635ebb687a400d9a60d47215e15213ebd6f431419dc06efb78f7fd890b1e3b0c03a515 SHA512 fa88d3b0632ad2ea146b2c85c673e20822f7204556d60fbf92de31e35e57403d62ccea7fdd8abb491e02e51236c590a06a18b2c39e4934093ec16c724d68b643
 MISC metadata.xml 390 BLAKE2B a451cde37ad9b1809005675d0dc8233c760f0ee1678474d60c74990a4ef07da572947498a0da14577072a4f14e57da7b008251ff551f4bcb9ee966957344bf83 SHA512 22e8eee2d28b36f19350ef791ff5a5d705da83b4dafb9b0e959b5cfe4ea6cb5f4e4a47c29eda531e189a253f7d26d58f1be127896cfc2d4fa08bd4e142c61e70
diff --git a/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
index d4a5c32c82b4..401901a6be89 100644
--- a/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Terminal-based YouTube player and downloader"
diff --git a/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild
index 2bc7de936ab4..5ecfdc287fac 100644
--- a/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 inherit distutils-r1
 
 if [[ ${PV} == "9999" ]] ; then
diff --git a/media-sound/mps-youtube/mps-youtube-9999.ebuild b/media-sound/mps-youtube/mps-youtube-9999.ebuild
index 196606cc1844..5ecfdc287fac 100644
--- a/media-sound/mps-youtube/mps-youtube-9999.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 inherit distutils-r1
 
 if [[ ${PV} == "9999" ]] ; then
diff --git a/media-sound/mt-daapd/Manifest b/media-sound/mt-daapd/Manifest
index b07ac584a6a5..dd7a1113f603 100644
--- a/media-sound/mt-daapd/Manifest
+++ b/media-sound/mt-daapd/Manifest
@@ -1,9 +1,9 @@
-AUX mt-daapd-0.2.3-sparc.patch 927 BLAKE2B 637cb70b9382155a05f2e7ffa10da320185946acf593e00a6a3f3ded9e921a5dcd0cf636e65a820e5e32ac2355e1d31d078ee81eae4c4b432cd5ee8f54091389 SHA512 8f263a1a1905f9dde592dc321dc0a2ef5c4a8d9ae1e80eb7d9f04810fadca3cce38628282a0c7c27b4745a3fbce46893d834bf315013a1d5c200d64218371cce
-AUX mt-daapd-0.2.4.1-libsorder.patch 5361 BLAKE2B 4b240fc992113fa73c6f77089c39996954a161c4627b4f6af58f3a527305e81a13c8df40a44ac7f88a00e7e4cce2d2dd2e5edd650fc743e317ee45fd77ef9340 SHA512 6333215ff44c4df2e87664b4262c733b1aa9334a0659ffc7deb1cdfe694eded6387f74fe30bb5709d38a9309b928d97c156a3ec4d165c7c3446eb428413403a9
-AUX mt-daapd-0.2.4.1-pidfile.patch 1908 BLAKE2B d0300a4d59429d01ddecd73b5c022e30b20b0238e7da7943ac6ed23e2b2b807e3648775d86ca0614eb54cf3e6e3145ffe9e0096205af315b7a451cec35fe6b5d SHA512 8dbf79b4ebe890a398b1b14b7a85d2f40fbffd8c0cabc21ee6271ca4f1c062f580fc113a8628eecff091d31fd6af54d3c408dacaa2e7433d191f31f26ad54dad
-AUX mt-daapd-0.2.4.2-maintainer-mode.patch 405 BLAKE2B b3ee1774bcc2b61ad54e1182793be5cc3394b835fc54747efed5aa3da8732ee5015de4683dee1c0ced6d00805729e21900d594907d143fd0fdc55869d25ee7fc SHA512 a7fcabca95370395ba344c4f8273def2a401889e112bbe6163db324f72639a073be4406f1b812ae67d2a99fb8159c2296ee1b9a4f18a8492dcdeea0e3b4e52c7
-AUX mt-daapd-0.2.4.2-oggvorbis.patch 663 BLAKE2B d6556ebc43c606ce17680eee0bd5ed758b47c7ffcd082ac512931aee4b49a880fd6341e29ec5491417587cad5e137e63f31ecd651a005777a2fb16990215bd68 SHA512 0ec74b9cdf4fde912944c95f148fc0f232249c978954e4a4ed052ca60c7ec4cfb7ae88f791bf2d8b895ce69bbd6580bfbd5e88439e09ce33a3e32de34dd47533
-AUX mt-daapd.init.2 1238 BLAKE2B 816cb83d67f6bfbe797ed5ccac260b9c368d29085bcf8b53b69eebaccca3f0eef4cb0a446008d310ca7434c6cbda38bea5fd613c794bd0ebd763418d317d9188 SHA512 8e4649a8fcc1d3de94c872644ff0bee62cb32efc5e5f1bb2c25c1ad42e2b675524f76417b0ccff30f0574fda126b4316c512508bbe7283973ee1020d84e95df7
+AUX mt-daapd-0.2.3-sparc.patch 740 BLAKE2B 3dda0247a83790a97bd2b3d7a6f5fa72b20dd4ea71ee95b72d381272f5c97604d45116d03aa64c7eccedf109aa334d464a619558ba4ba42353034f9ae5d36bef SHA512 69a187f4557901f8cf0a2854297a3f80cdb451719eab835feb1a3ac37ca1fef8750b2f573f710c6b490c27de1ad41901db19196b17a7309ee585c25188feb0c5
+AUX mt-daapd-0.2.4.1-libsorder.patch 5073 BLAKE2B 46fc079420368466c5aa6e9efabcdea0e06194b9c36c22623e7f1930fcfcdf21de7a200e5874096ed88a1cc059de02e0086157f190a89186f0cfadcd5636e3ac SHA512 f3765589ae7eeb5b342a7eb3fe8e6cd38e92c5584b304d153ee369b95890ce98c1a6ac5096cfa05b91f5e971a0ab86c83b1b99307d73bbca6ce0b95f82ed6c16
+AUX mt-daapd-0.2.4.1-pidfile.patch 1731 BLAKE2B 49f59edee6756e814da79e9fbc15422e8f95dd84f6723f6996370e794e7189e5164f8b881863d338d1a8437cf9ec06f80c4eca276e817a80475a543550cba093 SHA512 86340f84e20d847267dd1e46ca9a0d209f16d7fd0bd6936b0dd1f830c8c7c0572a6e49a664371780d71c9ca930aaba1ddc4cac2b0f0fdb64c2833b2202d4b458
+AUX mt-daapd-0.2.4.2-maintainer-mode.patch 332 BLAKE2B 94083b6a8847b0f6a1f8c060842ce7496ae61ebd92e669a8ee58d558974f078d739500c25c87d9e572ad1da85fb75c1ebdb7b04549157df4b553a3a33e363c0f SHA512 631a844c2bd0a07d1c793ab0ffe839d4b75e34f2268915b6451f44aeee7fc0d4597bbabe3c8f09b12fc432f76a38fec9593f5721ee76c5c7e761634926b7a9f3
+AUX mt-daapd-0.2.4.2-oggvorbis.patch 590 BLAKE2B be372f1dc4aa4541b35782064c0dfccc40d62e704d2ac3041fda8d719af52f5692dd8a0ba351c8fed3b5ef35be0ca604242e2a9cc588c890862ff710c4762c96 SHA512 51785b2e89fe20d71a3bfaaf75ccbf6b8369af8e5b76f2c8fb63b76fbb0a3249b9119be7c63256b507ce4f39cdfd08982ccf9e398d3d3fd13b24628b2c8f2280
+AUX mt-daapd.init.2 1220 BLAKE2B 483f41aeab5ab3de0ab6c268f8263317a26b6c647e5e02c52c1636bfd4f4b2efb3cf9f8745e4da90b8f19d809509fcebe721fe94fef8140fb65da3152bd26549 SHA512 32a24aa6c027df24a959f908bfac5be24638975fd98a7470dd0e5e9e4590c9918810f646eb9a4497405563c1dfdd139a974cc6db8b7066684af8d9701c703b42
 DIST mt-daapd-0.2.4.2.tar.gz 436513 BLAKE2B bca01805bbdc96d3aed1499a1295c48761d83f2ab876e15ea546d30b164bd86eab9e8278db39bedad356b4c018bec96f2086a98113562dfa09a496c6c0ce60de SHA512 1a944f31cc63355d33c7fd821d4509b8b69805ae29aa23f1307bf7602f6a62beba1f5ab5f4005387177f17c5fdf8db91b338f010b4be4ab0cd783dc72c6df60f
-EBUILD mt-daapd-0.2.4.2.ebuild 1913 BLAKE2B 21efa73abfde9d98df4d67bb0b99fca4626fbb3e8d9138d9a7d2308c0c08590302a5b7f6daf73fbb0e3d35aa0b979bafe242335704fd4568b5a4ddd2dee86ade SHA512 41fda1f05096e9bc11f7a6d53e5f7b06de9b2fe9f72001090a2ca915be58f0548bb52cb49793f19d686ca8951b0aa3606c8df448b3fdaf4a61896a2ed4dfcf73
+EBUILD mt-daapd-0.2.4.2.ebuild 1852 BLAKE2B 99f4ce30c8c35767b695f698839acb027906942bb54cb6981ae9bee7b90544f00d27d2af7326f8eb4da20e51ba2b62abf0781afd1f968307ce176bd9d5f06f76 SHA512 65897ce763065f4f00717bb882bdd9e5876b0dd81183daafc9fc7dc0668ffcdcea1dfbabd36756afd6e9d7c8dd2c3ca87bcde84240e5b1bfbec2663efa09a969
 MISC metadata.xml 331 BLAKE2B f7842e1c5183217f3496de60b60bad916ff47ff7419dc9e6c72116a030ca36d9508a8b2d01c3350374be8e2513b982e7c59d18325934f9814eb1ceb09e8d3ff0 SHA512 75a2feebcc5b6226a059c79d8519bbf79de8ff4025c43389a39cb287ff220176e99f2fa2abdcdb371ebf9d988cc8bea4ca018ed347c98e9aedfc4ef7cbead941
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch
index 482b25c13779..71d3009c8aca 100644
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch
@@ -1,6 +1,5 @@
-diff -Nura mt-daapd-0.2.3/src/mp3-scanner.c mt-daapd-0.2.3.sparc/src/mp3-scanner.c
---- mt-daapd-0.2.3/src/mp3-scanner.c	2005-02-05 18:22:47.000000000 -0300
-+++ mt-daapd-0.2.3.sparc/src/mp3-scanner.c	2006-01-03 16:39:50.000000000 -0300
+--- a/src/mp3-scanner.c
++++ b/src/mp3-scanner.c
 @@ -1663,14 +1663,14 @@
      /* now check for an XING header */
      if(strncasecmp((char*)&buffer[index+fi.xing_offset+4],"XING",4) == 0) {
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch
index a4c5a176ada4..91d9e848c124 100644
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch
@@ -1,6 +1,5 @@
-diff -ur mt-daapd-0.2.4.1.orig/configure.in mt-daapd-0.2.4.1/configure.in
---- mt-daapd-0.2.4.1.orig/configure.in	2007-10-22 02:50:24.000000000 +0300
-+++ mt-daapd-0.2.4.1/configure.in	2007-10-28 23:31:43.000000000 +0200
+--- a/configure.in
++++ b/configure.in
 @@ -20,8 +20,9 @@
  CPPFLAGS="${CPPFLAGS} -g"
  
@@ -126,8 +125,8 @@ diff -ur mt-daapd-0.2.4.1.orig/configure.in mt-daapd-0.2.4.1/configure.in
    fi
  fi
 diff -ur mt-daapd-0.2.4.1.orig/src/Makefile.am mt-daapd-0.2.4.1/src/Makefile.am
---- mt-daapd-0.2.4.1.orig/src/Makefile.am	2007-10-22 03:32:27.000000000 +0300
-+++ mt-daapd-0.2.4.1/src/Makefile.am	2007-10-28 23:31:33.000000000 +0200
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -34,6 +34,9 @@
  	redblack.c redblack.h dynamic-art.c dynamic-art.h query.c query.h \
  	$(PRENDSRC) $(ORENDSRC) $(HRENDSRC) $(OGGVORBISSRC) $(ARENDSRC)
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch
index 5976316e5bf2..71178f678118 100644
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch
@@ -1,6 +1,5 @@
-diff -ur mt-daapd-0.2.4.1.orig/src/main.c mt-daapd-0.2.4.1/src/main.c
---- mt-daapd-0.2.4.1.orig/src/main.c	2007-10-22 02:27:57.000000000 +0300
-+++ mt-daapd-0.2.4.1/src/main.c	2007-10-28 23:54:29.000000000 +0200
+--- a/src/main.c
++++ b/src/main.c
 @@ -551,6 +551,7 @@
      printf("  -m             Disable mDNS\n");
      printf("  -c <file>      Use configfile specified\n");
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch
index a81483db6a11..7fc127fa6957 100644
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch
@@ -1,5 +1,5 @@
---- configure.in.orig	2008-07-06 23:57:08.000000000 +0200
-+++ configure.in	2008-07-06 23:57:46.000000000 +0200
+--- a/configure.in
++++ b/configure.in
 @@ -17,10 +17,12 @@
  rend_posix=true
  
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch
index 714f34142ac2..b0352587a965 100644
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch
@@ -1,5 +1,5 @@
---- configure.in.orig	2009-03-11 08:15:14.000000000 -0500
-+++ configure.in	2009-03-11 08:25:36.000000000 -0500
+--- a/configure.in
++++ b/configure.in
 @@ -63,9 +63,14 @@
  AC_SUBST(AVAHI_LIBS)
  
diff --git a/media-sound/mt-daapd/files/mt-daapd.init.2 b/media-sound/mt-daapd/files/mt-daapd.init.2
index eacc6ea7b7e1..c77b7dd2bb5d 100644
--- a/media-sound/mt-daapd/files/mt-daapd.init.2
+++ b/media-sound/mt-daapd/files/mt-daapd.init.2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # Somehow based on init.d file shipped with mt-daapd itself.
 #
@@ -26,7 +26,7 @@ fi
 
 depend() {
 	need net
-	#USEHOWL need mDNSResponderPosix
+	need avahi-daemon
 }
 
 start() {
diff --git a/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild
index a36e59993f8e..572b7c217878 100644
--- a/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild
+++ b/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A multi-threaded implementation of Apple's DAAP server"
-HOMEPAGE="http://www.mt-daapd.org"
+HOMEPAGE="https://sourceforge.net/projects/mt-daapd/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -13,63 +14,69 @@ SLOT="0"
 KEYWORDS="amd64 arm ~hppa ~mips ppc sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="vorbis"
 
-RDEPEND="media-libs/libid3tag
-	sys-libs/gdbm
-	net-dns/avahi[dbus]
-	vorbis? ( media-libs/libvorbis )"
+RDEPEND="
+	media-libs/libid3tag:=
+	net-dns/avahi:=[dbus]
+	sys-libs/gdbm:=
+	sys-libs/zlib:=
+	vorbis? (
+		media-libs/libvorbis:=
+		media-libs/libogg:=
+	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_prepare() {
-	cp "${FILESDIR}"/${PN}.init.2 initd
-
-	sed -i -e 's:#USEHOWL need mDNSResponderPosix:need avahi-daemon:' initd
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.3-sparc.patch
+	"${FILESDIR}"/${PN}-0.2.4.1-libsorder.patch
+	"${FILESDIR}"/${PN}-0.2.4.1-pidfile.patch
+	"${FILESDIR}"/${P}-maintainer-mode.patch
+	"${FILESDIR}"/${P}-oggvorbis.patch
+)
 
-	epatch "${FILESDIR}"/${PN}-0.2.3-sparc.patch \
-		"${FILESDIR}"/${PN}-0.2.4.1-libsorder.patch \
-		"${FILESDIR}"/${PN}-0.2.4.1-pidfile.patch \
-		"${FILESDIR}"/${P}-maintainer-mode.patch \
-		"${FILESDIR}"/${P}-oggvorbis.patch
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable vorbis oggvorbis) \
+	econf \
+		$(use_enable vorbis oggvorbis) \
 		--disable-maintainer-mode \
 		--enable-avahi \
 		--disable-mdns
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	default
 
 	insinto /etc
 	newins contrib/mt-daapd.conf mt-daapd.conf.example
 	doins contrib/mt-daapd.playlist
 
-	newinitd initd ${PN}
+	newinitd "${FILESDIR}"/${PN}.init.2 ${PN}
 
 	keepdir /var/cache/mt-daapd /etc/mt-daapd.d
-	dodoc AUTHORS ChangeLog CREDITS NEWS README TODO
 }
 
 pkg_postinst() {
-	einfo
+	elog
 	elog "You have to configure your mt-daapd.conf following"
-	elog "/etc/mt-daapd.conf.example file."
-	einfo
+	elog "${EROOT}/etc/mt-daapd.conf.example file."
+	elog
 
 	if use vorbis; then
-		einfo
-		elog "You need to edit you extensions list in /etc/mt-daapd.conf"
+		elog
+		elog "You need to edit you extensions list in ${EROOT}/etc/mt-daapd.conf"
 		elog "if you want your mt-daapd to serve ogg files."
-		einfo
+		elog
 	fi
 
-	einfo
+	elog
 	elog "If you want to start more than one ${PN} service, symlink"
-	elog "/etc/init.d/${PN} to /etc/init.d/${PN}.<name>, and it will"
-	elog "load the data from /etc/${PN}.d/<name>.conf."
+	elog "${EROOT}/etc/init.d/${PN} to ${EROOT}/etc/init.d/${PN}.<name>, and it will"
+	elog "load the data from ${EROOT}/etc/${PN}.d/<name>.conf."
 	elog "Make sure that you have different cache directories for them."
-	einfo
+	elog
 }
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index 3cc605213810..c78fa36abd8a 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -2,5 +2,5 @@ AUX ncmpc-0.33-mandir.patch 884 BLAKE2B efe04cbaecc0c44511f9a4e9eb0bcc29da1ab53a
 DIST ncmpc-0.31.tar.xz 249816 BLAKE2B c9c42fc1ba5cb79cab9a9cc86831ba8ca82bb57981885be81b218d57f529ac7ca9adfbb0de1e0bc7dca8215ecf5fdae1481b73ff6d0dfb69c2020390d0c6a1a2 SHA512 0d3fed08f54afd9aef6342928a3f3b63a973d86ec6510f54c59271316aad856cd1a493e193f676971d90c40ef26486789e8580f2df528bd031251265c48a5eac
 DIST ncmpc-0.33.tar.xz 226344 BLAKE2B d52fdcb17adda1d3d61645715029552804edbf8ed95d2f19e0a25ba11f66cf0e7921748aebceb63e8e32b8d31fbc2d387dfbed6bd5c6a735d5ffa4b17d9b4fa3 SHA512 47730003c9a8ad5b6e682de4b4d3c8882d3266659fcd73ea131d1bba3d6b4d9ac66bb1a3522d63cb238ca9e22d8035907b9d7621a0b5106763770b17325f53b9
 EBUILD ncmpc-0.31.ebuild 1783 BLAKE2B 897668f216ced813cc97c2ff2ca45d977f171fcb43603e859f8d36910e7bd3c1c0cf4868393484876cdd5c6111153bbf1762d5506a184d146dc8d36889f229f2 SHA512 dec7ce858c61367633a2a4ac2869067c37492eaef9455a209a275d3514fc3a15933daa129d111b0c828f0608f3d418ef3f3d5d225e9f682691c6e702f3bb8250
-EBUILD ncmpc-0.33-r1.ebuild 2074 BLAKE2B 6c4535a425b2d3febc3f32eabbe400748ceb7cf02235b06c909da777fb6b66f851bc8aae109843e81003e13b484a37cf7160a8f33ebf8268cae3b9618f2a1052 SHA512 8e8e4f24d93397839eb111435314518e1992a2e421d075104c0c6dda7b70d2b5e4b662276bad8c7accbe7fff31ed71df4d8c47b528826e22c5ee0b6d8c813538
+EBUILD ncmpc-0.33-r1.ebuild 2071 BLAKE2B d21b5185449a5329b5b331a4249a020932d051b23454dc3cff44853dcf93b90e647f64a050a147a43708aa3be5738e2f6a6739577fa21ff4e9abbe3ba9025034 SHA512 ec31dcc1cbda6e5b7e52973552781b8300bf134ecb518695116d76ba73e7e346cccc3a85f88d8615d5d533d2599f1a73d11971f19db921113b31a60b0c7557e9
 MISC metadata.xml 1049 BLAKE2B 7b19b1d2c404f22864faeb30a96cf87a9eb7429eb4bd0372bc28e03a88a42f827c468fb13fb0b164b8019d8e54a7a8b0f4f6d37c9f33a4f410e930cd00092df8 SHA512 f4b1af0181ec32c85f15e2357db3dd59ea38a820ade7ce658195c61ee0bf2449b06d12a2dd67c40aaaa8895e51fbbd003edd84e54804368d00f0dd1225009cbe
diff --git a/media-sound/ncmpc/ncmpc-0.33-r1.ebuild b/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
index 745b2f2cc692..67297f834180 100644
--- a/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc ~x86"
 IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen"
 
 BDEPEND="
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 3b3d11342f0a..13ef49809113 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,9 +1,6 @@
 DIST ncmpcpp-0.7.7.tar.bz2 443801 BLAKE2B b0bf1f6264f94fc1d0dce5b7ec8d85607427e5bf8955914fddffd8dec94850e6dd20dd83a966a25353d6ec23a61e92751d83fddec8202d9a843e0ed9e3b32077 SHA512 a0bbe85f154c40513d41e85810de86ed21109b72fb0f2bdb0b78dcbddb3770aff5422b5bb7fbac2b76634c5b9aaf843bed5fc16fc672fcd71bbae911f65c0034
-DIST ncmpcpp-0.8.1.tar.bz2 464123 BLAKE2B 0edb57fc3a0527dea085a10736ff2cdca3ea25fdbb4aac686f4c9db6403fc1ee2f0f724aa3c3411104f355ba11e76193ede2a52bc550ff9bed33261cc426dd87 SHA512 2b1b615672910f6b55d4a3e1842f677b8c72659a86dca74d9c306612038d7b765f622e4b8948f14d8a3f4fa913d413d128ed8726f70d7a09cfe95d3c1fe87d15
 DIST ncmpcpp-0.8.2.tar.bz2 465713 BLAKE2B 0d07477b3473e1ac7362175cef4bfb085ebdb4c8b1e77f7bb68d8bf4c645fdcccd067d12e2080a740ade18c57dd055f270d2e50096f0ad3afaa40175e19259cf SHA512 9384edd162f40af23e4f26f437356520f117e4e2ab513ed3de132d2f11e597082d1cb7f0dd3696660d0c9bb85ad03e31fb921c97a11c7b28b32c5907fdbb8e8f
 EBUILD ncmpcpp-0.7.7.ebuild 1501 BLAKE2B b4fac49d9ebca61da51109aa52b06a14f5005064d4427bb94403d534ad03ff65574ff7cbf0d0708dadc7942c51ddc93bc0260e1741ba5b75a026a2e5c726e674 SHA512 dc3691ec4e4d92f063fcccf219e3566ebc85d8b2b0bdf8134720701172108bce462ba9278b9405c556c8631df846747e5f5a2ccdfaab1b6efad58ec92e9474e1
-EBUILD ncmpcpp-0.8.1.ebuild 1404 BLAKE2B 47db7c4ced708da6b78afa0a410e5938d0a3fc5cf7916adee506ea997b35e3de7d2b004e9d3295b6e36e75af2d042f60603d6d243c2b4a3982279e21202a09dc SHA512 6af5a76e471a154458777d1dc0ebfc298ff927444d01d2b70ebca01a617dc11f5ab6e1baed83cd03a323f835cea76aa1396a307092ecf789d49e0ac29630febb
-EBUILD ncmpcpp-0.8.2-r1.ebuild 1403 BLAKE2B 716e85eca79367ad182bdd8c6cf2f46e1adb8bc1458ff856451ac35824d219d01ba4cd32b0e4bc38ee2fcf00dc4a61eb44e9af7f87b191c5607fe7fd0d1cd0f5 SHA512 2cea3c8b3b76fec3e8955ae748cca24ad5b69115503cc4c745c243a8494e0e457a4bcd7152b5fbdc6d680f2c7ec4f94c76d0e40ea1235261709389aa446b0789
-EBUILD ncmpcpp-0.8.2.ebuild 1398 BLAKE2B 884dd2b899f971087dd8c8152be1df83928e897e6e34b0d65394bd3771a95e024510ae2efcd02fdf2cce8406ab3b31cd38822a640086c6d757ac9dda5a4bed2b SHA512 478763e7f57d66b1005efa5a81e919bb38a78340f67edf7bcb4212edaf46ea2a2a88b5f6df9a8f287d0553cd588085cf779da6f0b081d38ea0e870d4ef6db622
+EBUILD ncmpcpp-0.8.2-r1.ebuild 1400 BLAKE2B 3589bbbdf554ea2b8f959eb1ad1debe41f304d1a10b119a35c49a2ac7fb48cf6cfd690fcd1fa1ce51c8a6ba8d3ecd5fbd59d92a5639941a6218b1733f1574ea5 SHA512 540bd9aa529398d2e543f1410cd948e80542630d6fda7d74db1659746e898e22c34b8517be05d977032d3e4a42c749179a533562781b2fd87e731668cd97a635
 EBUILD ncmpcpp-9999.ebuild 1395 BLAKE2B f8a77e9ac893098a5a37b2540832498862125868b59f75082194151bb1f0a503d773011a61f41195a2dc95d1dd6638bab9b90a57f0dd62961131b62d7893359d SHA512 b1a99cfbb6b20a9ebd5be2ef1e088ed3db036bd64ab73d5b398e1d1a6e62a623a57376747dbcd2bf84d469a2ab6f55a5d727335e5b830e151fcb52177352f53c
 MISC metadata.xml 1175 BLAKE2B 2a7f404c5db97a726429add8dc33d3ec1d0032e1a57291bebe3c79d76d9cfaca2eeb1e6e3b83b6ce8ffcdf94442cd32fe5079f2f19d70a05cc12da66caf96316 SHA512 9584bdbc4c3def081acc02f78bb64d28fb795db2b7766bb842709613124f5548c0c4b0ed02865d459e1ce45158d59137220a341e29f51db31c6cdf1c91bc776d
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.1.ebuild
deleted file mode 100644
index bd2f837dbb38..000000000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.8.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="https://rybczak.net/ncmpcpp/"
-SRC_URI="${HOMEPAGE}stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="clock icu outputs taglib visualizer"
-
-RDEPEND="
-	!dev-libs/boost:0/1.57.0
-	>=media-libs/libmpdclient-2.1
-	dev-libs/boost:=[icu?,nls,threads]
-	net-misc/curl
-	sys-libs/ncurses:=
-	sys-libs/readline:*
-	icu? ( dev-libs/icu )
-	taglib? ( media-libs/taglib )
-	visualizer? ( sci-libs/fftw:3.0= )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
-	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable clock) \
-		$(use_enable outputs) \
-		$(use_enable visualizer) \
-		$(use_with taglib) \
-		$(use_with visualizer fftw) \
-		--docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-
-	dodoc doc/{bindings,config}
-}
-
-pkg_postinst() {
-	echo
-	elog "Example configuration files have been installed at"
-	elog "${ROOT}usr/share/doc/${PF}"
-	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
-	elog "as user configuration files."
-	echo
-	if use visualizer; then
-	elog "If you want to use the visualizer, you need mpd with fifo enabled."
-	echo
-	fi
-}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
index 50bc9b2e8d63..6db57f594392 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="${HOMEPAGE}stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="clock icu outputs taglib visualizer"
 
 RDEPEND="
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.2.ebuild
deleted file mode 100644
index 58f8e679616a..000000000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.8.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="https://rybczak.net/ncmpcpp/"
-SRC_URI="${HOMEPAGE}stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86"
-IUSE="clock icu outputs taglib visualizer"
-
-RDEPEND="
-	!dev-libs/boost:0/1.57.0
-	>=media-libs/libmpdclient-2.1
-	dev-libs/boost:=[icu?,nls,threads]
-	net-misc/curl
-	sys-libs/ncurses:=
-	sys-libs/readline:*
-	icu? ( dev-libs/icu )
-	taglib? ( media-libs/taglib )
-	visualizer? ( sci-libs/fftw:3.0= )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
-	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable clock) \
-		$(use_enable outputs) \
-		$(use_enable visualizer) \
-		$(use_with taglib) \
-		$(use_with visualizer fftw) \
-		--docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-
-	dodoc doc/{bindings,config}
-}
-
-pkg_postinst() {
-	echo
-	elog "Example configuration files have been installed at"
-	elog "${ROOT}usr/share/doc/${PF}"
-	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
-	elog "as user configuration files."
-	echo
-	if use visualizer; then
-	elog "If you want to use the visualizer, you need mpd with fifo enabled."
-	echo
-	fi
-}
diff --git a/media-sound/opus-tools/Manifest b/media-sound/opus-tools/Manifest
index 9bf57c870b3a..6498c98eece2 100644
--- a/media-sound/opus-tools/Manifest
+++ b/media-sound/opus-tools/Manifest
@@ -1,5 +1,5 @@
 DIST opus-tools-0.1.10.tar.gz 312093 BLAKE2B d96377f3c56990bafef58f0eacdf8795302400eb986e6408b2eb1af67eae59194709b9e1ef86b420b4adab767be329278cc60c1fcc7da4b3f461b532ebf8bdb1 SHA512 4ead97b9fe4658968a4b5cbe4bde5e2d8cbfaaea18dd0d817597cc6b6b11f26937b9eee7358ade63568f0213131aa80ecbed169d1b3885980a556871a4a7fe98
 DIST opus-tools-0.2.tar.gz 457680 BLAKE2B c5896a6303aa1e1626097622e671bc96fd292a0f0c40a56410ef1f7699f8d18540d71e70f1cace6a91bb430886f1ddb07ba08503bdf82aa81758793bcea5b530 SHA512 6fdde8d938e8fadc9391b5d188883dab0aecf8b27d40d00b5d67d8fac9cfd9d5107b1934bfe6310587400f277c99d1db5cabf3d26f340ce2141873dec238e5ce
 EBUILD opus-tools-0.1.10.ebuild 944 BLAKE2B 128013973365bd4de9d4f11cbc536b3868935482cb24a7998b5ec6f73195497d28d5622d6ad9186849ba2850882ee4a0179bb04098f9d8471a1c2ae2fe884d52 SHA512 844133cf0a6077d13cc85eec31dc47af94c25bd3dac6eea41eb396b9a36a27d6b0d67e86be0fc53dea8bd3ea03595ef47aba87d06482f3ddf144bc70466b7c38
-EBUILD opus-tools-0.2.ebuild 1007 BLAKE2B cd9627edd8696f5becfeced83169fe1b724f085cb4ed29a52a6d3718afa248b1b4b166e8b0170a0956b12627712a260645bc689b4550ef117c9d35b5b674522c SHA512 7efa5b8ffba5e62c066438e7582852f357700d1d37bf7f3ade9d29a6e5ec8d2adfd8c898ac30b53fb33e759f2ac5f6d8d5b12151a3f1b3be0b91066ac9db9818
+EBUILD opus-tools-0.2.ebuild 1004 BLAKE2B 36bdd5cde5b7a6c30cc28d2be883b5d0e8fa07cb55b424c1e2ad9b149cc9c12accb53de2c8eec1a7f7d7858a55c21dc865b2b6d7553f871dca9b79d98646ea26 SHA512 332691fd5dc0dbc2296fd0c3a901709deecf32f069b16f0fbf555c5f8c2e3e24c93637a7a9912c2e92ba9383a48964de44690c21ff064c2ea5011ae8d3f485c1
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/opus-tools/opus-tools-0.2.ebuild b/media-sound/opus-tools/opus-tools-0.2.ebuild
index 789bbd1a16dd..c62c01416a15 100644
--- a/media-sound/opus-tools/opus-tools-0.2.ebuild
+++ b/media-sound/opus-tools/opus-tools-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 ~x86"
 IUSE="flac"
 
 RDEPEND="
diff --git a/media-sound/paprefs/Manifest b/media-sound/paprefs/Manifest
index aa197fd23ea7..daabc6598975 100644
--- a/media-sound/paprefs/Manifest
+++ b/media-sound/paprefs/Manifest
@@ -1,5 +1,5 @@
 DIST paprefs-0.9.11_pre20180621.tar.xz 221100 BLAKE2B d8f79865a0ce6d4491ea252fdef65e700d1ad4cfc253d8b0415a6cd454fe60685a3d647c8720cb50f85033a7bb0d411c404b4d50c43b320bd728390a8056c1de SHA512 650e365b77d9d9beee4dc62b7ba5d367b55a9f0e95f39ca1e75d210dab05820b4d3485a34366e6e341fafe55b5c6ee458088666937e0220c3d91bd68aa327c53
 DIST paprefs-1.1.tar.xz 69144 BLAKE2B 9809bb73156be1e4020679637c1203524a0ccc5f5e1fb3696724925bb196cd397e433c22e993e7353cfaadd38260980676af6ace2cac795c0b615298d1d85805 SHA512 4203fcb485b40223a5c8672fdbbd2875a25d05d85366773015728f54a17020098ee9e9fd1c02180c01799e100b99389c970855fc1bd69921d32d8e43c749ce76
 EBUILD paprefs-0.9.11_pre20180621.ebuild 1070 BLAKE2B 834097d5a7696c4ec3a079b2e59290fd7c519c8c154b8a9c1cf40f3713187d9186f428d50d813075f54aa0e2f2e5ecfa37361a24169b4e70b9dc93be89adc88a SHA512 2aecf44049793efa91cc7497c5c539cb26476c1c2e68523e1571478250db6f7f0ab9e41febac757a5767285704d350ce8d9c66b09b6810749086ea5ed41a0178
-EBUILD paprefs-1.1.ebuild 947 BLAKE2B 4fb3dbbd7224f2737d91b118c725c5cf886fc1da58f13670f89eb36831e5889f330d7bfd7a73f06af3c1840645cfd90e3692f8aa080da6b857031f53b2010600 SHA512 98bec4f983f3b21607f2d507686faf169e13a5e78e83e77a42a6a7f2684b32f8968eda2c9b8ed932bb6baff2bed5b7b0da169ee3916aba52d13b9677bf8c232a
+EBUILD paprefs-1.1.ebuild 946 BLAKE2B 398cf50aacecb1f5de7f088914249742fba86c0a097c748c8d7d967dec1ba8dc54fd6cff79c375f898a8a780ff68daa4b2124c1b07f9d249b31788f1cafe560e SHA512 c296fba3d1e1b56ea1074bbca6548801fe4d75b24a15f161ec84feee4920b0a0d15aab428e98892477cd16b333c2ce8503a8818d065320d30a19c92e293ae18f
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/paprefs/paprefs-1.1.ebuild b/media-sound/paprefs/paprefs-1.1.ebuild
index 5918d87e6375..1c96b3c2a120 100644
--- a/media-sound/paprefs/paprefs-1.1.ebuild
+++ b/media-sound/paprefs/paprefs-1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-cpp/atkmm
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index d9df75f099ec..d0061263d62a 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 893 BLAKE2B 85b0e9e4bfc0d8894a01a7f6b46d19bb340ed53d52f3728c5007cba8dd43929220b8ffc277262830a4f86df8dd75afa687136848310b6ad0ebcc308c8fb772ad SHA512 e25a85ed23f2c3fa383190b3277a1b42889677c1ff552b09e31f2b4f520b9d4cb4f453032c69f4f4620f6f10b4a26793683af9eba0411c013012ecea8acfd6c9
+EBUILD pavucontrol-4.0.ebuild 891 BLAKE2B b79fc755cc00ae2e3dc1420fd43ec97c56b08ef5fa122fed98b31f54a664e80eb4c651f195b555bddf35e2e981c2455230a84ff5149363506d06cb1fc1403b29 SHA512 521fcafbf2033d5e34463e485b8bd92c891a8397f19c78146deb71b7ebb3ca3b6fff31131088959e134ef91f44182d56835151c341e9d441943d7da9aae2952b
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/pavucontrol/pavucontrol-4.0.ebuild b/media-sound/pavucontrol/pavucontrol-4.0.ebuild
index 8b512d96dcd8..45130e44acab 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 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
index 229d4943e8f9..861479120d4e 100644
--- a/media-sound/pianobar/Manifest
+++ b/media-sound/pianobar/Manifest
@@ -1,6 +1,6 @@
 DIST pianobar-2018.06.22.tar.bz2 47455 BLAKE2B f1d61709f7c95438352f29a075120c4794c666d9406fb9e6dea47930f2715a0538588d29510097487c5bc06d77ccc44f393fff1561545e21bb71f739151a712a SHA512 0fc2d90324da576266f063573549399e4354b8e83678632fadb80864e82c432a1a90a3092085f0155fc136b726ba59eabb26586a1ba11c5ce668c3a89a218133
 DIST pianobar-2019.01.25.tar.bz2 48340 BLAKE2B 09078b0fdf43baab99c343a86d5f1c1e0ee7ab39e2af20e7cdde6c21320a74d82ed9bc02e821b02ab045329944aa7d273d637c80bcb0ce96692281dc2e1a0568 SHA512 bfcec235ff01e40a2f650166a29020276b43b241008fd5eb8b84944744b1ce6262cf3be140354404c9410b88d6910e4bcf77b4de787742a7898bbc8511fef0f6
 EBUILD pianobar-2018.06.22.ebuild 1074 BLAKE2B 1a92b84e3f89536777996c5c63b917229820e197b3170178e15b61107c92bdde532c750757c1c5ebf2bf0162f9328279a5a129c538b9b53069dead349bfb1e15 SHA512 b2e8b898cbf353bba7bca795c4bdeb773dbd1c21c780b65b948d08cd1219f08fa5766fe3d97c8214ba4a32c4dfadf14b83f8424ffc1d60fb8fc36cf0c407d542
-EBUILD pianobar-2019.01.25.ebuild 1073 BLAKE2B 5d28f29d27cf29d32cedba2d8e1eea1cac17a7aa7181aa82d7cdfdf2dc866730baeb343cd4e4c3189e87dc900c77940876bfc665948c8f45d854de8adec82157 SHA512 95b6254277503f6920356d7b48aff0644a4441ae32bcfbeff35092ed56d4507fa7f3d4bea2e8cdf6b2d3e163435701f4a1b9cbb4e7b7998ab55893a1cf3c684c
+EBUILD pianobar-2019.01.25.ebuild 1072 BLAKE2B 9213e4877d31f1d9ff2d989387065b946287724467f4dd52cb98ced245e14ffc62f2db25d1cfe2053cf9d842c2fde65b4b3878ccc83ac934d1920842ace1ff27 SHA512 b73a7c48e7b3b2895891d6bfef6a290d7c11961f92e2de04d3ef4e92d98216d42d88ca2617e3be6932d4349733fbe59a34e40963ed8c820a13ee070d9150887f
 EBUILD pianobar-9999.ebuild 1073 BLAKE2B 5d28f29d27cf29d32cedba2d8e1eea1cac17a7aa7181aa82d7cdfdf2dc866730baeb343cd4e4c3189e87dc900c77940876bfc665948c8f45d854de8adec82157 SHA512 95b6254277503f6920356d7b48aff0644a4441ae32bcfbeff35092ed56d4507fa7f3d4bea2e8cdf6b2d3e163435701f4a1b9cbb4e7b7998ab55893a1cf3c684c
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/pianobar/pianobar-2019.01.25.ebuild b/media-sound/pianobar/pianobar-2019.01.25.ebuild
index dff31a20e216..21ff5b2645ae 100644
--- a/media-sound/pianobar/pianobar-2019.01.25.ebuild
+++ b/media-sound/pianobar/pianobar-2019.01.25.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/PromyLOPh/pianobar.git"
 else
 	SRC_URI="https://6xq.net/${PN}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="A console-based replacement for Pandora's flash player"
diff --git a/media-sound/pithos/Manifest b/media-sound/pithos/Manifest
index d939fccb2fd2..3b0d64e2a74e 100644
--- a/media-sound/pithos/Manifest
+++ b/media-sound/pithos/Manifest
@@ -1,5 +1,5 @@
 AUX pithos-1.3.1-dont-try-to-update-icon-cache.patch 584 BLAKE2B 9127f728cd0da41a490fdcaa3c781d9137099507192f9301e6237d7f3b833ccce81429efcf8aaa67c04945cf0af16d47829582968b7d72850446c7ced93fd3cf SHA512 cc30b733388a9dea61ea4ab23c4291c11656a117e0f9aa98e3b286b6698ec38242154da21af9dc840bc697a34a1e604f86e489a2c5d6fcb76ac6f3e1bef750e5
 DIST pithos-1.3.1.tar.gz 119658 BLAKE2B 0d6e1c4e48a4beb1082f8788d4e016371660667dbe32ee925aa4b904f60a25e6664a94cefbc62dd9323a6e69338c03fc4080517e842102fd6eeca144f568c984 SHA512 c06715516992e4aa8bb3b200035ee10ef8dcec9491d32af0fb3f4e176d0ad5313a437f228747d5d716a29d2fe5b93ddd3704aa4fe674ce3be5a17eaad13b0da4
-EBUILD pithos-1.3.1.ebuild 1985 BLAKE2B 79873695959b7d23c627952ae2ebb71d7e4cad7a0f0bc7736d2578c0deda5463027d4201c973fee5dec6f02e6012069b807ece8d38aa194b1f560249390a8239 SHA512 76711f7aeec2429a4f1d2ff43ac8bdb1085824538789a55e3f3a5ce9d64ee625c516cf96560e71059220935cc6f81254682e507db5bf28d0b74d0d32612260d2
-EBUILD pithos-9999.ebuild 1980 BLAKE2B f16d1f20338bd30c9d1baac719fe99cf7f7f798eeea17f42b63401ea3262bff784ee1b9d28296d6ac52866a4127c376c41c7e939f2ef055d7c622e523e2b0d32 SHA512 23c57db817edb813c51eb0bda1824137e5d4105f273edea1a5e878efd4acad3b1e177abf563bb8dd91714600b45ebd9cb0624406b83033b39e4dd30104d2a2c6
+EBUILD pithos-1.3.1.ebuild 1980 BLAKE2B 52d1da52d54ca9575bc99820df1d82bfc5c5a1315d79cdfd0cef0686aaf0c103347a1caa279f09c2047e666d623716549bba8ed066b2b523b988ad3934392eba SHA512 324040aacc26f47f24ee4b930e8129b3370ee20f34fb691a5a72fab38965f7b44a29bf07a6bd15c8d6638ff785d2214bbf7c53c6a9e0135f32f8c027af415dc6
+EBUILD pithos-9999.ebuild 1975 BLAKE2B ce5d00c0f97d531703caf596639dc19d116f7ab540791ed356fd696e73795cae4116365a316d71be39dba9f16c1f0f87fbe5dc7bb56d4d3c1fb5fa9105fa0804 SHA512 b81a9d87251a54fe4f8cb2c8d6315ea30c596103ff66f4934f9c0b3322b0e673e432e7fc5e45fd3bef6d94f9ee00b5a8a96ae9ba857d3ca6d3b453b681b2c414
 MISC metadata.xml 517 BLAKE2B 4d18a3f149c2ffc3b87206cd67a7d87978f36c9f45f6a99c3240e77458c3c2bee1ee9eb7cc64e22414eded3f44ba5da5cf8a680b16975759b0027e90fcd6e5bd SHA512 1922b0145e076b849061072c03eafe7354bf79ab32d7f2a5bab219db6a9caa92074423c5bf1196b91ff1e183bd8fab2fcbad583f20b02b9916c3e73140a97367
diff --git a/media-sound/pithos/pithos-1.3.1.ebuild b/media-sound/pithos/pithos-1.3.1.ebuild
index 6fbe39fc870d..5858dc11c75c 100644
--- a/media-sound/pithos/pithos-1.3.1.ebuild
+++ b/media-sound/pithos/pithos-1.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 inherit autotools gnome2-utils python-r1
 
 if [[ ${PV} =~ [9]{4,} ]]; then
diff --git a/media-sound/pithos/pithos-9999.ebuild b/media-sound/pithos/pithos-9999.ebuild
index 55d1a94154dc..82dd3227ef64 100644
--- a/media-sound/pithos/pithos-9999.ebuild
+++ b/media-sound/pithos/pithos-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 inherit autotools gnome2-utils python-r1
 
 if [[ ${PV} =~ [9]{4,} ]]; then
diff --git a/media-sound/playerctl/Manifest b/media-sound/playerctl/Manifest
index 5ecf06f365ae..4e76de0083cf 100644
--- a/media-sound/playerctl/Manifest
+++ b/media-sound/playerctl/Manifest
@@ -1,11 +1,12 @@
 AUX playerctl-0.6.1-doc-typesfile-path-fix.patch 1127 BLAKE2B d41f347717cbd49fb9ba1792fc33f9777e7a43ddc88a5678dc94666cf4b14a03467b270cd333329c41535f72cd3d075210e8bcca84ff9d6b41791e111eb198fc SHA512 24694c8172e59b2eb76f72e4bb1ce8809ab9ce0b335875750e189ba0047d7282e824f993495feea5680a53afc668cf313a50c1f00ff878512e52260c534248d5
+AUX playerctl-gdbus-codegen-fix.patch 516 BLAKE2B f83b6f8780553aa1c49240d2724f5b88a47246c2c80d652face89ddc9b5effc4ee009b00f2d8fea52db173ebeb77b036b20eed0b0cd29d76c4515d06888c09f4 SHA512 d943c238fe15f003bbe798e8eb9340f5277d745414b258b8e124d7fdf186d7708e341bd8c24783c32d18faea63784881f082ee1d365779cb36c88e4c1c076cf4
 DIST playerctl-0.5.0.tar.gz 17015 BLAKE2B 5da1d0fd4e442ac5f124bd693ae14222624c5239c9fad72e57d43977467339522344bc8d8c37b0f2bfda51c61861dc33d7e35e4a730ce59a87b691b5657ec729 SHA512 307cad5eeea7efa0c97c885660f49468f442fe907ef2495b56ac512e0551c7248750897b6d00934cbfcfcb35f486a101a238b276ef71d2ef866132ca3cc0932c
 DIST playerctl-0.6.0.tar.gz 22124 BLAKE2B 6bb90586c56e21a00b5e6e1769248b9782a8211b01dacf590857fe4fe199d6d3fa7aa46a36cba9a8e198a1aad0bf17973fc15140db11c484edfb0275971d3d08 SHA512 8023b5704ca2a428510df6228850b616061289764cc3c4190c0c46f79d6a20e499495f2d773bd821357653ba63bca40eac70f7cc3a11251da3c6a4f7781db739
 DIST playerctl-0.6.1.tar.gz 22921 BLAKE2B d2f5874280e1a99b318bc83c40a38ee31d9c68426cb63e1e16e8ded26bac1a894d78a929f46d45d631af70e37476a4151c520eb69c94e80026689a12c682f0ad SHA512 07c302eb06a96bf3b8aa180e68e85ef6f9fdb5933b80fbce8ee5f9a36c1d961eaf5638e319ff0b26475984acc57a447a4aa8e705667f77e4bd393364cdbfb284
 DIST playerctl-2.0.1.tar.gz 43700 BLAKE2B 9df01bdb5f71a589a40462ed807b0f150d8c90921d1e0ef96bf99f20d9e58345307af35b39cc95e8ab37fcf9e5686935d856e050b61210188008b65281e63557 SHA512 6a5807abc79358bab0ad30a11897a8109121d5eb7d9e17d2c695221ef83942c3c7235fc738ab27c9dd2d3364c04737355e9c88ec5d49f999565565fb4494f720
 DIST playerctl-2.0.2.tar.gz 44241 BLAKE2B 3a1d5f59fdb0067f1147f4ef95990ae0755a372469c0f03491b4f3aec8d0cf754bb4d3057063211ee810532967ace0d35fa6a7f3f8cee8d7a5c09031cb5b11c9 SHA512 ad588f81d42c8000ccd2d2dedacfcd82887a958189b354ad6285545f7ed59e885febe0c3f9e3da915ae0fd0af4bfb4cefda54f17f0560fc4c00b1be6e92f3ac0
-EBUILD playerctl-0.5.0.ebuild 909 BLAKE2B 4b4149e81209610d4de900f59860270d9bee8d97821350f5a9dd921869c6987b0952d93e958f662ded41a08ba58709dfb9af5b4c71e9b5ce209cbbde8c1135b7 SHA512 81bd0b13240357151302d2ba9bc28631e634b25437a19112b3b10e0d1939141c9acb0cf26f62d795bfff8f0d0d70c0a74149aeafa0185a2cae6a67ee8c8db666
-EBUILD playerctl-0.6.0.ebuild 919 BLAKE2B 9023af5a6c9fe937c5096e12720b676c434e45c21238326d957dd50f33d4a44ed20abd2f541386ae471ce6835efdfad1f406fcb220ae6833cc94544aeec2445f SHA512 898d55b119f86d63a9b46dab9b10f53017caa728ba484c7ab814b58f936ae4a25d168b407d86e560099b478b4dfa10fcef01ea5c9c4ecb1d8367cc833cc26e28
+EBUILD playerctl-0.5.0.ebuild 961 BLAKE2B c5e9a31ab6029fda37f90048bfefbd427597f415029c7b21a8d06ca28e93a0adc52086378ac4d4d92e231ac2ca6f60f28c2cf901a863d323fa798880d5a7b63c SHA512 a8c736778a09c63d1b9590e690475287b63dc4578c114ac4f5920ceb36842aade3ddc935fb1ee05830549a99ddfa17c5051c06c14ae4d634ce4342817ab950d3
+EBUILD playerctl-0.6.0.ebuild 971 BLAKE2B eb0815e604aa2907e30973cc247af604f4fe896791db2531bd3bce6ca019a0353a4aa1f0dfad74b1102c4b0ce9f2d75d22f40ae924ca712220a95c56f2cef466 SHA512 7aef5362b82114a3b9ea8885610fff9b382ed26609cba7d68f6dd28c56b0f12dc1b6082daa351202993dc9bfdfd317803823fc597ce47a6941f6941a5e6b9c3a
 EBUILD playerctl-0.6.1.ebuild 973 BLAKE2B a6f3a4432d1b42984a3426977b05f4e94b303afc755a061f121196e882704cf440c8606b9829099ff91d3e01653ecf75e2beee121b9d0683c6e3c4c0c1b8032c SHA512 0c57ffda7cedd332b10cc566967f35c9a89b0cf732025fe9b4febedb89801332b7a357fb281520dfeee668ae1cea95b1d9c26e9a5cde6fdf0536bdbe9f355d5e
 EBUILD playerctl-2.0.1.ebuild 1053 BLAKE2B 2d5414790ca1e1745e6c86bf2524718c37c843c162050f688072ca9385d23054fb63494a9ac41fb89579eb5b28717650186f70b2ff10cdf0093b52c26dc0aa0f SHA512 d2b1bd2e41f60fb5c61923ec8088986ac5acd695462a5d4dd7be6b7689792072e8846de0da4071c26bb00add72e19f33ee063302760a26547948f4ce7782a84d
 EBUILD playerctl-2.0.2.ebuild 895 BLAKE2B 2c298cbd020cf05b0f6501cd0516e2164bbcc3cf7f2b65a263a992e7af8a27bebef341dd4e24eecb879a3ebd9b96ffa8017b62542e0c62e0764233b8ed0e2cdd SHA512 6c1e0442d8913e2601da8a0257a76d51f3587b53b345b3051973d295970bb974fda5e358f048537e51dc14e99350c435382b4a330e1819f2cd4acd1abaa5907c
diff --git a/media-sound/playerctl/files/playerctl-gdbus-codegen-fix.patch b/media-sound/playerctl/files/playerctl-gdbus-codegen-fix.patch
new file mode 100644
index 000000000000..06c073aa2761
--- /dev/null
+++ b/media-sound/playerctl/files/playerctl-gdbus-codegen-fix.patch
@@ -0,0 +1,15 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,10 +21,11 @@
+ PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.38])
+ PKG_CHECK_MODULES([GIO], [gio-unix-2.0])
+ 
+-AC_PATH_PROG([GDBUS_CODEGEN], [`$PKG_CONFIG --variable=gdbus_codegen gio-2.0`])
++GDBUS_CODEGEN=`$PKG_CONFIG --variable=gdbus_codegen gio-2.0`
+ if test -z "$GDBUS_CODEGEN"; then
+     AC_MSG_ERROR([*** gdbus-codegen is required to build playerctl])
+ fi
++AC_SUBST(GDBUS_CODEGEN)
+ 
+ # Checks for typedefs, structures, and compiler characteristics
+ AC_PROG_CC_STDC
diff --git a/media-sound/playerctl/playerctl-0.5.0.ebuild b/media-sound/playerctl/playerctl-0.5.0.ebuild
index a06816f38bd9..0a05e650f208 100644
--- a/media-sound/playerctl/playerctl-0.5.0.ebuild
+++ b/media-sound/playerctl/playerctl-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,6 +29,8 @@ src_prepare() {
 		echo 'EXTRA_DIST = ' > gtk-doc.make || die
 	fi
 
+	eapply "${FILESDIR}"/"${PN}"-gdbus-codegen-fix.patch
+
 	default
 	eautoreconf
 }
diff --git a/media-sound/playerctl/playerctl-0.6.0.ebuild b/media-sound/playerctl/playerctl-0.6.0.ebuild
index 8741ea6e29e6..4effb5f74a60 100644
--- a/media-sound/playerctl/playerctl-0.6.0.ebuild
+++ b/media-sound/playerctl/playerctl-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,6 +29,8 @@ src_prepare() {
 		echo 'EXTRA_DIST = ' > gtk-doc.make || die
 	fi
 
+	eapply "${FILESDIR}"/"${PN}"-gdbus-codegen-fix.patch
+
 	default
 	eautoreconf
 }
diff --git a/media-sound/pragha/Manifest b/media-sound/pragha/Manifest
index 556375680b62..5a300d2c2458 100644
--- a/media-sound/pragha/Manifest
+++ b/media-sound/pragha/Manifest
@@ -1,7 +1,5 @@
-DIST pragha-1.3.3.tar.bz2 679754 BLAKE2B e9e785998d5ae805aa8427d18d1cbdcdd1e23224ce18b3927933c0986fd8793dec9457eedcb005be498b37940cc3c7e36e68940ccaa675f4b350931315c3d997 SHA512 3dc87d4e75cd9f145c3921af4c09140a705611d72176fd80db2d89048bc22c8edda5f87bce75f26e0cce4f6934c927e814e5c54fec7820116485cf4e04e876a9
 DIST pragha-1.3.4.tar.bz2 691256 BLAKE2B af1455633a4f9d3c40f6b97051692fa301cfb763d0ca5f03c3ae932513556ff7a6fed5c68cdd3f7e86dbca305598cb9495221e1b2c841f7e1cb56905fa742130 SHA512 65aadf68f427f03ea7ca07d2002806eb94019c8091a80320da7d8ff4c2f0cd912e9c346956188b42d2b7a68c56c79ee5af8e8327c69ad69f4a1fa5b9e3b3ca58
 DIST pragha-1.3.99.tar.bz2 781892 BLAKE2B 9d73dd2859db0c7ab7ac66fdafe873bd78b019408682828ddd05aa18a1591576df667e326037a7ca28eaed227fcbce943209fad16c9f55bb38c0c2c808275104 SHA512 df032fe16932ad464417306d8d01373b8e415f5f810a06b1baff647a395b10bdee5c912f36a3f6e3ea6a0e04d399257e202112c1838444d23dfc17b5fd34e12b
-EBUILD pragha-1.3.3.ebuild 2288 BLAKE2B 0cad8db3ec862e8e731135eb2e53c2e6fadcc397476512153b1d72531eb74521b4f97c99c3a929f8968046ec98581a41719e75c0c8bee5dd15e2d77a9c7c0215 SHA512 90a7562ed5be7146fb86ea61befd6d145230235020d88f99a0762d2749b05640591343e680b3580654840ebb34ff1c9b1174ee28f73e28fe79c030ab739c6f73
-EBUILD pragha-1.3.4.ebuild 2312 BLAKE2B b025ebc1ab90b559ed821357b1a36248efef8cb992cef738a4f2daea79785ef7f4d834191c4a4973721625f5ee6bb014587b815b58f152b0d3e46c11c91ca766 SHA512 b58a3846c8555384609756df47d118c12692ef0f631c6e6f86668eb5a630fc63e9e8893e3b2906e7754bacfa2b93242988252dcda65de5a9e083b65d3b1ffb42
+EBUILD pragha-1.3.4.ebuild 2310 BLAKE2B 381391dbdcc5ced2d515ec0e9adbce25152d9b578cdeb92290dee352293ba306432c3c96ac26187b6116cc1b1186e1dbb0c32c6be93e30997fdcd9c7f966f884 SHA512 f61ec80c622a9f22a2afb6f03fb1e22e03a16ca20ee738b638b544a0541e5bf27af04772b1596e87197047c69417746982ebf3e03c0d0443e7c3a83a0ef799eb
 EBUILD pragha-1.3.99.ebuild 2591 BLAKE2B 3ea0da51e0ffe4fee16e69d92e39143666817c9031c037be0fca13de5d457819fa348b0d7258651f67e888d265d9396f4db8ead768bfcd8c4c04f58a06ed50e2 SHA512 d83414ca8e3d34357d9b123dbb4ab19d663ea529f6898437404108d9394b061dde8d1bb0a3219f9a8e3bebe0ff8cfd7973fb80ced341d7955363f8f3d63ff06d
 MISC metadata.xml 1215 BLAKE2B d7a5bf01af7aa7047342f674cc33ee8ad9ea20dd9b0a496f1954830057bc51932530755429d54faa599da6b2817907100057153436a47a731892a8d8f91aece3 SHA512 9700873ef8ee962e9ba0057d8489b22e73ebaf55a6bda1cd58f062167f15f1b8d08e0c9061e45b4fd71040932e394a9006c00a95a944bf45ef7b65d48f922f34
diff --git a/media-sound/pragha/pragha-1.3.3.ebuild b/media-sound/pragha/pragha-1.3.3.ebuild
deleted file mode 100644
index c1ea92fc6b3a..000000000000
--- a/media-sound/pragha/pragha-1.3.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A lightweight music player (for Xfce)"
-HOMEPAGE="https://github.com/pragha-music-player/pragha"
-SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cdda +glyr grilo +keybinder lastfm libnotify mtp +peas +playlist rygel soup +udev"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
-	>=dev-libs/glib-2.36:=
-	media-libs/gstreamer:1.0=
-	media-libs/gst-plugins-base:1.0=
-	>=media-libs/taglib-1.8:=
-	>=x11-libs/gtk+-3.8:3=
-	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
-	cdda? ( >=dev-libs/libcdio-0.90:=
-		>=dev-libs/libcdio-paranoia-0.90:=
-		>=media-libs/libcddb-1.3.0:= )
-	glyr? ( >=media-libs/glyr-1.0.1:= )
-	grilo? ( >=media-libs/grilo-0.2.10:= )
-	keybinder? ( >=dev-libs/keybinder-0.2.0:3= )
-	lastfm? ( >=media-libs/libclastfm-0.5:= )
-	libnotify? ( >=x11-libs/libnotify-0.7.5:= )
-	mtp? ( >=media-libs/libmtp-1.1.0:= )
-	peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] )
-	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
-	rygel? ( >=net-misc/rygel-0.20:= )
-	soup? ( >=net-libs/libsoup-2.38:= )
-	udev? ( virtual/libgudev:= )"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	>=dev-util/xfce4-dev-tools-4.10
-	sys-devel/gettext
-	virtual/pkgconfig"
-REQUIRED_USE="glyr? ( peas )
-	grilo? ( peas )
-	libnotify? ( peas )
-	mtp? ( udev )
-	rygel? ( peas )
-	soup? ( peas )
-	udev? ( peas )"
-
-src_configure() {
-	local myconf=(
-		$(use_enable peas libpeas-1.0)
-		$(use_enable glyr libglyr)
-		$(use_enable lastfm libclastfm)
-		$(use_enable cdda libcdio)
-		$(use_enable cdda libcdio_paranoia)
-		$(use_enable cdda libcddb)
-		$(use_enable playlist totem-plparser)
-
-		$(use_enable libnotify)
-		$(use_enable keybinder)
-		$(use_enable udev gudev-1.0)
-		$(use_enable mtp libmtp)
-		$(use_enable soup libsoup-2.4)
-		$(use_enable rygel rygel-server-2.2)
-		$(use_enable grilo grilo-0.2)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/pragha/pragha-1.3.4.ebuild b/media-sound/pragha/pragha-1.3.4.ebuild
index 7bd78608d370..24f7053da9d2 100644
--- a/media-sound/pragha/pragha-1.3.4.ebuild
+++ b/media-sound/pragha/pragha-1.3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/v${PV}/$
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cdda +glyr grilo +keybinder lastfm libnotify mtp +peas +playlist rygel soup +udev"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 080accdfdc54..fbefe386cbe3 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -4,6 +4,6 @@ AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-12.2.tar.xz 1665092 BLAKE2B 2e36efc5142c1e379cc2b135f4126f03a31831b26efe60f7cdf128af6e23fab25706a5609644d0b387530021055f87525fe60d527cd3a087f51bfd58e810644f SHA512 877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e
-EBUILD pulseaudio-12.2-r1.ebuild 11542 BLAKE2B a410f322510d6a74fe005f95fdf9f32c43e0e892a3577687f26366a37b48793c20865dca6c393dc607fc72404b7445f1796fe76304379aacb7f28be4f999cc54 SHA512 7db67aad091ed831aeaebb4c067851dfa92fabd05bf877e78d8f6ccdd1b88de419d985ef52739e6735b7c3e0f4e4a023f3a47834968e28ef74fac4c84acbe93b
+EBUILD pulseaudio-12.2-r1.ebuild 11540 BLAKE2B 05ac7f7da5fc1ca311e7e3e790b2e02811b4f3d041e369ae09a91d63334801e027c8b1d593d9d073ab389e7fc01a85073943cb3da034460ad4ec557dd6e3829d SHA512 c45300bf8a3dce5396ed9b65065390dac21d521d066d60efe3165ddbb2987b9685c5f04af88630c943adda8483639ba66769d0c04a495a044be9ea5f5f1cf805
 EBUILD pulseaudio-12.2.ebuild 11111 BLAKE2B bd002a2bf9d7c0521eed3baec7d2b602302e8cd4bd7acd6ea22abeff54ee1be8042b44bcfd64a7f4d57f2855a958235d5b16fcf018f0377cd5f5faee040c84e2 SHA512 dd20835fb783428209dcffa07b0b4c1ec9f3e42b91faf07052df5f77f3eac388ee91dfbfe2da7f07890ae3631234a8a14bfafc41875c6716c6b8b9e839ba0f21
 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 06d7c5b03461..7ef205735e65 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-fbsd ~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 f9cf7bfed190..bfdb338a1003 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,12 +1,8 @@
 DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
 DIST pulseeffects-4.4.7.tar.gz 1082596 BLAKE2B 3265507191f5fca405282d8bdf9cf078023e80d2ca8f3a8bb999f7828f5220ca61b68ce01dc80e2d066a0d759b83229eabd523aff71106bd4024067afd1a8220 SHA512 243bd23d107f22a2a4b5934fb67bc5c059f278f2ec824814791ea24429e8d53844ffd71c9c21c35209261f4a0a4633827362bfd43355437a10944bbfd9a25421
-DIST pulseeffects-4.5.5.tar.gz 1783582 BLAKE2B 4c2154fad61705811d2e2135bdacc7f1e31d499ea65fbbb044896ba37cfde9ef4cd925fe7cc390c5611fb294d57a7297c7e54c76b3d69505c9b595d47259ad9a SHA512 fe45097bcd5aa9754c612c52cfba7d06d14185e18a75e5ae2a257733159f0288897e4f60d147e164f4bcafcd23978e23a006753b2b26e26613809863895cfab5
-DIST pulseeffects-4.5.6.tar.gz 1822218 BLAKE2B def674bb35970ceb2a440acac20ebd5c406ae1691b58e8e8cdee3f0eacc7077daf989bcd94a962a1ef1054bc81f68108fd445adebb32a96940a91306025d72a2 SHA512 c18e4b52c4eff15db40c398b0a60b7b2e7a069142552a9801d0a580f52145d8b13b4507a9d37aa49919bbdc144b85b3f02e140aca671d9dedfb521ed34dbc99e
-DIST pulseeffects-4.5.8.tar.gz 1826469 BLAKE2B fd19eb0c96b478eefd3d21c94887c8403d3b3c26b9e9e3850782565655994c25f45ccd4a4a119bc16b2299f299578a09499279b927ba9a5dc7a605b27c847dbf SHA512 4fbe59e034051b29e34eb3afba2db84a789c4f0ada8e26ee341f855c16417be7d29445bb8b5119796bc333a76714c2f450358c7d6ee1852420934b91c7ba86b2
-EBUILD pulseeffects-3.2.3-r1.ebuild 1508 BLAKE2B 8de30d74bdd807b2003c54cce7752f05fe60c10a4ad52c0d2180f926cb1f4af94844b9afb99b6cacdd776521d093acc72fe2f181a54175373fb1c2b767134634 SHA512 cef02bea9f8006de5bf33c2bd25528849f3addcc6409672f6ed8753ee621aedd0f985e45a33c2ddcba429305e71df8a2b3fa4135fd163913c36e25b0ac25b5f8
+DIST pulseeffects-4.5.9.tar.gz 1830876 BLAKE2B 3b80e26eb7b3593f0636d4c3a86ddb05c4c08ec446983d8f521828a4a004b42011ca12cbed6fefe3a0df7d1347197abcee89d5786020a61ed28c3277668d8e57 SHA512 aa47b546f13ef29d03c907dfeeba0ecb531ba07bb5bbb7bc49399bceb75583c58c9e188557c1d77c02b8b50e5cac9562b6fc882750c14d755ec0d294e8b60105
+EBUILD pulseeffects-3.2.3-r1.ebuild 1506 BLAKE2B 561117695d98390d646cc6d36263aae5f375b1d6ebbdb4baa271a8ff009e788218952b8bb63d5088e1ce647e2e7fb7f38a1ea27ae634d341bd8e7dd3bc332e65 SHA512 ed37577b50ead9ae9d4a007f343ada566df3ed7dbde12a2114bdce793c1ec2a123296f4e4b059619644d6c293b917bbbb26cf2936c55211c89fbaa2abb68df25
 EBUILD pulseeffects-4.4.7.ebuild 1727 BLAKE2B ca64436e30a37e6a6f42bfec26eda83f55fdba724c15c63dc1f76deebaa504d21664cf14eb4ea8be713c8710e4a39a6fdd54dde84f18fd6c7082a646809911a9 SHA512 587856d36ad596a802eb9441571ba0b37290694dc5c466bbaa450e2dbfbb516c70ef107bd0b5a968e03bb15fa0ac6829219787b5819cbf7b7b473efb85e05e79
-EBUILD pulseeffects-4.5.5.ebuild 1766 BLAKE2B 713fa0e42ff237787f2a24ec1ce2cca7709fc7fb0ef5f74eb380c60d52fc48ccd20988a27db109a50c0096212f41309230f3670a86fdca534f0c6907773d363e SHA512 68ab10d1d9bebd863d768829ad949345e482bac4e87622d16113f31c7d583094a93afd5e393a740bc8b7909526636b31f24b7b8337b192d9f8c4497230c41cee
-EBUILD pulseeffects-4.5.6.ebuild 1766 BLAKE2B 713fa0e42ff237787f2a24ec1ce2cca7709fc7fb0ef5f74eb380c60d52fc48ccd20988a27db109a50c0096212f41309230f3670a86fdca534f0c6907773d363e SHA512 68ab10d1d9bebd863d768829ad949345e482bac4e87622d16113f31c7d583094a93afd5e393a740bc8b7909526636b31f24b7b8337b192d9f8c4497230c41cee
-EBUILD pulseeffects-4.5.8.ebuild 1774 BLAKE2B 949e7481e96674e3a62570eecdfd6542a6d92f65fe35a9c8077e1ab37fc76717e94b65c78cae2d382f5d872e250374449d83613a3e004ee4fab1a18e62302d67 SHA512 d6fe05ad2ead861c6d0a6008e346be0634687261374f23402d029fba3b45c5f40ba1df3906b3ffe37f36d710316eb339769351e44926bbcac1e825d1797038c3
-EBUILD pulseeffects-9999.ebuild 1766 BLAKE2B 713fa0e42ff237787f2a24ec1ce2cca7709fc7fb0ef5f74eb380c60d52fc48ccd20988a27db109a50c0096212f41309230f3670a86fdca534f0c6907773d363e SHA512 68ab10d1d9bebd863d768829ad949345e482bac4e87622d16113f31c7d583094a93afd5e393a740bc8b7909526636b31f24b7b8337b192d9f8c4497230c41cee
+EBUILD pulseeffects-4.5.9.ebuild 1799 BLAKE2B e6ba4eb6229e8aaf31eaef655f770989ef0a5794e06c8673f565b3e3e49689ba5c6745c551e6e2bc5cb6aef84bc79e5eaa68b58c7ca5a4a606feed443b2dc2db SHA512 952d00097cf90bd69273ad8f67a4f8caae9ec2d84d0c424972d5c340a0bd1406442fb0e4b9005489da1691f72b98ddc124e2e148b4ecabdeaf7781a56a76948a
+EBUILD pulseeffects-9999.ebuild 1792 BLAKE2B 4770e4f7f3fbd013166e2b5c694c5463a71ab4209fd8aac620015c654137ffb92b3e53fe338bad07b1fd69b00423eec2e4d9162730f4830352cc404c8051cafe SHA512 1bae5647fa6d7e53d5d97c60236e53af007ad4c2cff13ef385b45c0bd1cacadc154edce2dc677b008624bc7e41ab8f5edb332acd86c63e8ac70dcb78c32605b9
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild b/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild
index 54b3db05c075..bcf96af7cc44 100644
--- a/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit gnome2-utils meson python-r1
 
diff --git a/media-sound/pulseeffects/pulseeffects-4.5.5.ebuild b/media-sound/pulseeffects/pulseeffects-4.5.5.ebuild
deleted file mode 100644
index dc0c6cb447c7..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.5.5.ebuild
+++ /dev/null
@@ -1,71 +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"
-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[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
-	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.5.6.ebuild b/media-sound/pulseeffects/pulseeffects-4.5.6.ebuild
deleted file mode 100644
index dc0c6cb447c7..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.5.6.ebuild
+++ /dev/null
@@ -1,71 +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"
-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[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
-	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.5.8.ebuild b/media-sound/pulseeffects/pulseeffects-4.5.9.ebuild
index c45904327f5b..2717baaa643c 100644
--- a/media-sound/pulseeffects/pulseeffects-4.5.8.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.5.9.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"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="GPL-3"
@@ -55,6 +55,7 @@ DEPEND="
 BDEPEND="
 	>=sys-devel/gcc-7.3.0
 	dev-util/itstool
+	media-libs/libsamplerate
 	virtual/pkgconfig
 "
 
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
index dc0c6cb447c7..e3e2406c171b 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild
@@ -55,6 +55,7 @@ DEPEND="
 BDEPEND="
 	>=sys-devel/gcc-7.3.0
 	dev-util/itstool
+	media-libs/libsamplerate
 	virtual/pkgconfig
 "
 
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index 9b35129e4404..0427f7fdd348 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -3,5 +3,5 @@ DIST quodlibet-3.9.1.tar.gz 3850929 BLAKE2B c4317521259f1d46e927276ee8bd927afd72
 DIST quodlibet-4.1.0.tar.gz 4882607 BLAKE2B 1e0c519eb3f1d377dc7fc0ee2a08faa51632eabd1f21638e38aaf5edc4faa6707274edfe314910b32895e59a5cdd27434914afb1c33aa2914788e644db2d2aaf SHA512 987001b6335e18ce18d25b71be327261c3fe5e0a142395ce061d7460e9ade2543a3372a64560b804be3e4d70889017612e9bc1a72215d45b215caf4da545e9ae
 EBUILD quodlibet-3.8.1-r1.ebuild 1717 BLAKE2B 1d5a8105c82a70394a4602244c3d7734352c02c9ff4e4b32f0802d93a5f4f1bc355397b61f48c2e5ce0b79ddaa9145d39bef54f0f6698ad5b92805affb38d7b8 SHA512 784706ebf88f4a18e869ed4bb6a89ed78c2a5c9fef8b96d4c8358e11d122afcbf831b1028c2d47450b1cf89e0c6c379164cace47f6314045eb3ac9f600be7828
 EBUILD quodlibet-3.9.1.ebuild 1760 BLAKE2B 441b5af4ce9f397b30bc58bed0416c85417b28c55123d1d93c9ecd502e4ebdb0782d5a3eb8eb62c3861d768481e8103fdf0395cf310d0e801044321a20d7746b SHA512 76648bb9945ec27282302ed8e35cb9dcfde7fa0e98860f88ef66b112f6537499296f835c11e9890de642f00de884263af15edad2396feba5d02602cbdd7ace8c
-EBUILD quodlibet-4.1.0.ebuild 1552 BLAKE2B 004b30edee5b0bc484fd677b96b5953c84482bc4107ed3e742d9575f2638efdbcac0d5705e34ad1a768d26768b08681369f387c4562ba9c2813816acee44e968 SHA512 3b410d375f6bc6075af746ee813f380eff500a3ef0703d9296ab35736525d466c11d96c02a3f7b2c4ae740f14fbc991822c1f78eb6ceb9fbbf0810f783aee037
+EBUILD quodlibet-4.1.0.ebuild 1550 BLAKE2B ecaa5941dcac07a6e86fbad686b3e6be721e98db5a36c2c49562f616a572b053b058b9c970a203148fcad6c2648eea199d90c858296b38f1881ef11639f0f926 SHA512 5ca620d75d367c8ecb5a6fad045c3a728a76bc18ccb9b757b84a76b5cf8ed77af747377f496ec9eb4df998d4b2cbf88b43aaa23536f701a32c5a915567e41428
 MISC metadata.xml 1136 BLAKE2B 372295e43337120cabfa3a28f260fa3feff8cce235240be1c65fc0a54922b294cc94124690fdb923d82f78c5866e82bc7becfad334c8e1ca3797b6602a9d0d80 SHA512 1466590147ca42dda2b5c11fe781a39e6d25d205b69fdba20663f1d1bfc2e251123c99990810727a36fbbd7a0c868bf1ddc51e94a38985719cef1bea71f07feb
diff --git a/media-sound/quodlibet/quodlibet-4.1.0.ebuild b/media-sound/quodlibet/quodlibet-4.1.0.ebuild
index d3c983afd4ad..1150e8a6cbe4 100644
--- a/media-sound/quodlibet/quodlibet-4.1.0.ebuild
+++ b/media-sound/quodlibet/quodlibet-4.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 inherit distutils-r1 gnome2-utils xdg-utils
 
 DESCRIPTION="audio library tagger, manager, and player for GTK+"
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 033cd7ecba1a..7e8b831ec1d4 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,6 +1,6 @@
 AUX rhythmbox-3.4.2-gstreamer-1.14.patch 16445 BLAKE2B 0adc6ea739a5a420d8817117cc97477f00453fb0f6426da0dff912ab6ad9ad435645c13657950b1fd31243be4cc21c49d2bf0b5701b5844ac17f8a8279350dc6 SHA512 6e204d2e9af111a138c13aa0a5cb5f74d56ade81e86c7cd5349617119288221b46533682d7b974c1453a6d0a9a0de1fa40f2cc4dcb9f474bb93818d44930520a
 DIST rhythmbox-3.4.2.tar.xz 6909436 BLAKE2B f5714485b253370a161f2255030d85bc8a697d795f97011c2acf6acbf8c9312f5180c0ec06ebe2d6e70730dc3fd4e97289b1f3a5e4dd4989a4e8135433430aab SHA512 275f7c6344c88c7331d433895d479517e7a4b854f6ae660abd79b3c324f5e7a06132fa44387443ec9ce50b20187e1abf1ec9683ec4bedbd4b17da6efece8399b
 DIST rhythmbox-3.4.3.tar.xz 6410600 BLAKE2B 0df8ac37ac0815468414c5b8118da6d07276e0c15f08812a46af7f377c29418416e1a24d7398aec10772887ae98922f6fb9fa9eaecc6ae15115cd7ca1c4b67a4 SHA512 a3585c026037674345909e2050a4ccb22a75084f830f351b926f7fbfc84d200c8246b8da4bd72804e595929ab06d3c7b53d362675dde193746f40b0f38b7c493
-EBUILD rhythmbox-3.4.2.ebuild 3443 BLAKE2B 70ed5f930ef74f4ab93d08af7f60337acdc875a44f752b05cf7a5038889c958a1c71d75e313fb92f61d73dbfa07f183b9de63c0f423efa38f3fa558bf74b97a0 SHA512 fb4a84c482fc82e5cdea2024f5545cf7235789b28a023908278f69c68285d1e58bdb6bcf0cdbe92ed0abbb7514ddd6ec14667a08692336e5eeab671daec194f6
-EBUILD rhythmbox-3.4.3.ebuild 3375 BLAKE2B 6a0cab92219a30abbcb18dd590850e459c90ee650171e5d105bd6c2a264e1125c50ecb4e482e33aa0e50b67042fae6a426f3595d847e34512d9a2e8528f45b19 SHA512 6688812c1f6c2a81ac21f79d77df61a62381427dec5908d85ea61a33f64687d0789f0a42850fb86be3f953e5ade67971c4176e45e673c8c14536d2b6b815628b
+EBUILD rhythmbox-3.4.2.ebuild 3441 BLAKE2B d2e56df3485478b8398e478130d3457d2ed50b79b843fcca2ae7b7532dc224a2ee7ad06fe7f0100c8188be9b45f96e56cbb0b95935e43003fefd88dd562a2411 SHA512 ccb33aa6378a9801a43ab68aaeaed523453e574432152924d6b2e26cb9e9598444a1c1f1446c42e33dc09e19691aac7b82a2d6faed4644a0166c5240edae1a94
+EBUILD rhythmbox-3.4.3.ebuild 3373 BLAKE2B b6893b3fe6d7a959ff46717c158c45bf237505fbb093b0894c2c01f83d2d200251c2c6b3ddf48502b8053fccf13158dde443a0de84e768575978bf84c843564a SHA512 2d5d5bb2bc8322aa61c52076e51800188800176daa812fabeaf60087a1e99bca915bc7193cc45eebd863a913965185c3aa617e7b858b5de7f3c93f963e2dec75
 MISC metadata.xml 545 BLAKE2B 541f660e1607a2e02779487edf290dbd8d8262184c2b0f245eabea4490165a0b019b1a989ad9a27acea26a15edc1ba39b4669756a9b17464b9592191e4498a99 SHA512 a734430876806e8bc114e3058c6b5cdabe87372af71a478f333dd7449faa63af011dc2c7115293049e74da8df742ed6a03f03c8e2a56a2d56b2aa4c547bd6065
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild
index 5f274f786f54..17ce213bbca3 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils gnome2 python-single-r1 multilib virtualx
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
index a9801c4d3bc9..81de16305f75 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils gnome2 python-single-r1 multilib virtualx
diff --git a/media-sound/sexypsf/Manifest b/media-sound/sexypsf/Manifest
index 2271155c88ac..e4d5eaf8b8d3 100644
--- a/media-sound/sexypsf/Manifest
+++ b/media-sound/sexypsf/Manifest
@@ -2,5 +2,5 @@ AUX sexypsf-0.4.7-misc.patch 7770 BLAKE2B ec617d75c15378dea9546b4a098430d9904258
 DIST sexypsf-0.4.7.tar.bz2 83001 BLAKE2B f2c74374f68cda1837ab4f91e338377dee539f60ca28efdc31b10a48d1028aa54892f5a2e2e6e23b145dea88a1e20e9b2a6c0155547c9d7fe10b6a5f415ab72e SHA512 5b4fe7662769e668e15bea0db8785c5355a803dfe39f86eeba6dfce5df573f342525e10bc5317e1cd2b1ef70730ee4cf766c9d02cc9f404b0e39defbb30c364c
 DIST sexypsf-0.4.8.tar.bz2 82954 BLAKE2B ce710cfe20372f81e5c4f18857b46e7eef1837b87469bdf999dd677f617802da0f7cb0ff9ff1a0ee78f6424b179b33cc111ba98619dde4a03b178c63397749a4 SHA512 bb95cdb40cf7172fdf815d6a2083adc4f684973534625d76c4fdb04752888acecfdd5ba329f9e2eed64311f30eb4400c8913ace13e4fa371c89c774905dc35d0
 EBUILD sexypsf-0.4.7.ebuild 1029 BLAKE2B 87a2c5e8d5e95a067b6ae9919620f7e1fb377f51ceef9a3ab4015a5a93d575dc21cb11ed001fa4a24dcf23971abadda9c99d1bd9f5da6196c1344c427e97834e SHA512 30840716a6885ea9aca3f87cbaed4a43fce6342f10645f515e14a22fe2cfaa7150fc22eb5a0cce6a6d86aaa0bc4b7ef449dd4ada6edaf7c2e55701833d547326
-EBUILD sexypsf-0.4.8.ebuild 506 BLAKE2B 5bc5e06f7bc845dce61cd84ecf021eefe88ce967fc7dc320c850e21f27150d129506c17a366bce1ada4154b6cb395c35c6b7f0704d48c04b8e17ed76d39f9c9d SHA512 bf59e499ca6074a020dc8881393c19bcae3142f65aeffe6b25acde3f54e4a8054bede1f93a3d7e5c924057a0458a9e6c4f8cc02b07f90161f20809622c67f722
+EBUILD sexypsf-0.4.8.ebuild 504 BLAKE2B 48099fb68d6ea4681e583429679ca7c2c7ca0f549fb4148203851aacc23dfbbe18737a5538964a5fa4726edf0708f3ddadeb73c473b812beb20729aa81362d95 SHA512 5cc64d72bd233c8b796ad7dc68debfb0cc7cc8997fc1265d6e201f7ef800a71db784968b7f50952084028d98c1b3f374d2c3e7753f0a59f5e87c08f50bae7500
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/sexypsf/sexypsf-0.4.8.ebuild b/media-sound/sexypsf/sexypsf-0.4.8.ebuild
index a4b4be55b434..0eaf52342bce 100644
--- a/media-sound/sexypsf/sexypsf-0.4.8.ebuild
+++ b/media-sound/sexypsf/sexypsf-0.4.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://projects.raphnet.net/sexypsf/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 IUSE=""
 
 DEPEND="sys-libs/zlib"
diff --git a/media-sound/sonata/Manifest b/media-sound/sonata/Manifest
index 83dac5f07fd1..ce3bcd15003b 100644
--- a/media-sound/sonata/Manifest
+++ b/media-sound/sonata/Manifest
@@ -1,5 +1,5 @@
 AUX sonata-1.6.2.1-mpd18-compat.patch 820 BLAKE2B 473334fdd3f3b72352dbc2a35c842765cd8140c1ec65e905f50c48c234f13fd26c85267cae5db9e497d55229c1896feffb301d70df7a298dfc8a6bf1d09ae31d SHA512 b0d904edbb9d6e92408402d3b25b5e2dad452767d3030c2608335a86dd7242c135b121293a2f73b92a77a260d44806ffec99b309f4b394f558cd5f8ab318ac66
 DIST sonata-1.6.2.1.tar.bz2 314333 BLAKE2B a2d7f6f8b5fe4b774136c70e7a354a8b8d948f44e876e3d59b0a216cb482de6c9b5a38b1332347136466965bd0551a03ba53f9e554c969ce901e880fa691496e SHA512 8022b69380714e9c3c685c61d0f1e62be087fc2cbd77a55f32008edea53411f8493d416bd0a446ccb52b4b5603ba9f4a00b655af485d739932dc06af69345c27
 EBUILD sonata-1.6.2.1-r1.ebuild 966 BLAKE2B dd16bc734d1b82516bf58fdf2d68a3d8e2a6af2a24ffd0186a3df50293491db4220ada3dab009a989fe4f002cce671448a4f044dc8102545677137a742e549b9 SHA512 e21e1e906562b6a3d23a08ac0ecb2d3e05865a2a8ee931a106ec495c47694176bb78915baf6f3baa9df29beb60f4f36cd491e0e35280d79b0265cdc215ec7198
-EBUILD sonata-1.6.2.1-r2.ebuild 915 BLAKE2B 3d41a5188a97c770cd78d4301dc79cc5179bc4a6332f56d91af984a5fab45188d1d85c3d2eafbcab6be160ab4431bc38376308d5df5fc96b1624612b57ce1015 SHA512 9b94dc86b289fa6319f1eea86eab475c63ea127baf11bbfe750e658d6dbd9086e2cccf7524e6f306656c19a27b99de6c798e30f7d05cc31287afa4cadaa0bfd3
+EBUILD sonata-1.6.2.1-r2.ebuild 914 BLAKE2B 7922f3cac78d2fce81c210f8b54b9c808c36fc51f76156ed0e5e4cb826ee743f42f99e80fa1baf01545921d8d4e1e7a1d25880fe161816e8fd776c8a5333239c SHA512 d5c6f8c08d8bfce3890ce81893147aba4c3ccff604653faaa5c7fce4b3b833b2a1a24bb21ad2babdccc8f7110f6cb4063fd43c5956117d0d52c42ce6e357e5dd
 MISC metadata.xml 615 BLAKE2B 818b8486f6142d1816045cee963976f34d462f2b26662c242aef72155c180bf9ab6c739ae9925a2cf71434bddbf6f0fcb5487ebac018889bfae6ef6ad41e7f1f SHA512 bec106b2bd1a9ca9f55d833f822b0cd9eb9541989f030e7a6698c3428efe2d99ae7ad88d6ef572a4af4a07c1d1450e1a031842608b10f9891ca9fa40816affa4
diff --git a/media-sound/sonata/sonata-1.6.2.1-r2.ebuild b/media-sound/sonata/sonata-1.6.2.1-r2.ebuild
index 96a2bdd4d479..84d5a419dbd5 100644
--- a/media-sound/sonata/sonata-1.6.2.1-r2.ebuild
+++ b/media-sound/sonata/sonata-1.6.2.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="dbus lyrics taglib"
 
 BDEPEND="
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index e0e6fca31ab0..10e824ebe742 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,3 +1,5 @@
 DIST soundconverter-3.0.0.tar.xz 201548 BLAKE2B bdca42d22d2e497b807149dcd5c8f911519b71dc7e836ad359831d0b7cd2241f58f8f9f60fa4580e2f038528e9c249dfa8a811d1681d0c8dead2c53e0f58f7ce SHA512 6f5518711c76e7748447805dbf16ac8622c5041c3f3cac2de6f31968aab4eff43a2fde2da48c47d12093ce1732208923d83d57b6a97ea99fbf882dfef239a62d
-EBUILD soundconverter-3.0.0.ebuild 1797 BLAKE2B f83a22a7acd5914b385d2eb4cad0ff74e03e9061956e02a5ad5e4715ccf15370a4e1c1e4dbf63a931a90a66d037f4d3ef23c2f478cc347871c36a0248d5babab SHA512 222d2ef0e3a993a28da7f8d033135dad5da098fbaaa37aaba0b682ac771ef002b5bd149f7914d52c114ae3717e9a33de76f2a928b2beccbb467cc514816c5367
+DIST soundconverter-3.0.2.tar.xz 208440 BLAKE2B e7817648fe27b2083629ea718b0479f7b9e2607a017868b1e1ce3fb0407a84a548bd007647e73a1d4163a7f51b162a89e3914419ccdbfd07586c2a94a23f4af2 SHA512 0746395de412a4d845e3df4d6cce0dbcba266c9efc8db71663dd1c751d2a5de5b0dc266f24bbfe6c00f69428801ce5f9558fc8e5e2f5d5e6be8562085cd7fe92
+EBUILD soundconverter-3.0.0.ebuild 1795 BLAKE2B 9708f0fed867b06009862386e4c375292e70e9d5dd25507ee3ad2eb902ca6a58e5a83570e23a07ce1f6a3c138b62088ad47a24d0dd0c33e2b6a76779d8e171fd SHA512 69f83e8ef303fcd0432113eb39de60665471e7c8c8bd1c3080a34954fb031817101d4af7ebdfec0badfb9b46f1054a13ddf8f9a8de91c246ea321f9674be891f
+EBUILD soundconverter-3.0.2.ebuild 1796 BLAKE2B e21ce025bedb8290992dc8503b2a76b56cb0ce049a02e27a43e3c03dabb811edc66686a7dcd6d81e2279a4dbe2864699e55eea7cf2de4ab640d030cdaea41123 SHA512 ad2e641ee2aff0ea2c4e7640ad1d5546d63b545b7491c307810573683fc2ca4e8ce4ecfb7adc3fe3479ab4bf725d844d5961afd290f5a7351f138f9e6587d937
 MISC metadata.xml 348 BLAKE2B ca79913ada8d48522d7f0f593caff90549704f518c13f1ca79f34a1f885ffa1500d498be6fe4f70b301a3ff168235ca9e6a2642ff4c4d5a0565ad3bc8de99050 SHA512 a9daf27ee0eeb8342f28e7089b3ff3fdfafb1e19f517efc0d56f5eaae09f05b5b7309368af53fba1f46b8810349ca1f6f82aa3c14369144b22970f488c6ae1b5
diff --git a/media-sound/soundconverter/soundconverter-3.0.0.ebuild b/media-sound/soundconverter/soundconverter-3.0.0.ebuild
index 80a65a531013..58d2ba6e2c78 100644
--- a/media-sound/soundconverter/soundconverter-3.0.0.ebuild
+++ b/media-sound/soundconverter/soundconverter-3.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit gnome2 python-single-r1
 
diff --git a/media-sound/soundconverter/soundconverter-3.0.2.ebuild b/media-sound/soundconverter/soundconverter-3.0.2.ebuild
new file mode 100644
index 000000000000..e0324bbe7b4c
--- /dev/null
+++ b/media-sound/soundconverter/soundconverter-3.0.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="A simple audiofile converter application for the GNOME environment"
+HOMEPAGE="https://soundconverter.org/"
+MY_PV="${PV/_/-}"
+SRC_URI="https://launchpad.net/${PN}/trunk/${MY_PV}/+download/${PN}-${MY_PV}.tar.xz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+IUSE="aac flac libnotify mp3 ogg opus vorbis"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/gobject-introspection:=
+	x11-libs/gtk+:3[introspection]
+	media-libs/gstreamer:1.0[introspection]
+"
+
+# gst-plugins-meta for any decoders, USE flags for specific encoders used by code
+# List in soundconverter/gstreamer.py
+# wavenc and mp4mux come from gst-plugins-good, which everyone having base should have, so unconditional
+RDEPEND="${COMMON_DEPEND}
+	x11-libs/pango[introspection]
+	dev-python/gst-python:1.0[${PYTHON_USEDEP}]
+	libnotify? ( x11-libs/libnotify[introspection] )
+
+	media-libs/gst-plugins-base:1.0[vorbis?,ogg?]
+	media-plugins/gst-plugins-meta:1.0
+	flac? ( media-plugins/gst-plugins-flac:1.0 )
+	media-libs/gst-plugins-good:1.0
+	mp3? (
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-lame:1.0
+	)
+	aac? ( media-plugins/gst-plugins-faac:1.0 )
+	opus? (	media-plugins/gst-plugins-opus:1.0 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+RESTRICT="test" # broken pot files list in 3.0.0 release, making src_test fallback to "make test" which fails
+
+src_prepare() {
+	python_fix_shebang .
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python
+}
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index c392e8ecce3f..f306db4a04d2 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -3,7 +3,7 @@ AUX teamspeak.service 418 BLAKE2B fad43e28b976db44b290937654f3fa503a7a17dbba17e7
 AUX ts3db_mariadb.ini.sample 99 BLAKE2B 8b81805ac580ea892d4b05fc55787b850202545b911b11175932d2b3031dabcfa29d2bafe37742a05cea5e6dc8913abfdba140f9c2203515eb5da4444b3bbdd1 SHA512 60993fa58beb07f3304e7603abe91dba2e23e3f6868a6e2894bf55e1e79c358defd1a08523e6ade16d1eb1042aad1783c76c2dff8e6ce282d08d77800c3357db
 AUX ts3server.ini-r1 723 BLAKE2B 3c5f77686b602ec052477c32e2b38ecc6812760b487ce4e6cd7616bd8aa57ef3aa186374805a1f5a073e755429a98bdb677ba400c7db3b833edc1e2e3db3a729 SHA512 cf1eb76d4fe7a8305b758439925be56ea4f34254ee3c66e796a3ba7cec38dd40009f455672429906c31631f4877fc70d6fde16a904239da2fa62d121b43d0481
 AUX ts3server_mariadb.ini.sample-r1 764 BLAKE2B 3d8b9e88194b54cddb945860c77d497fe8e4bd537a39a101d2658a44b72568a671e301bbb1888099907cbc36c2aba42b89a2215f19ffa8e0acfd3f417a08ba8d SHA512 861f0074e4521947fa44e2decfff172bb14f9b905c37dfc37afedcd5f42d864de7712aa0a6ff7eb17b8f885098abb720b29b16c658955c3c8aab73e451def6a8
-DIST teamspeak3-server_linux_amd64-3.7.0.tar.bz2 8631710 BLAKE2B c18acc1a0755ba86aaafdd0d1b50f5f56085c5ab2ad12d3a701de2d90ff2bfb741cb81efa66843e282fb934d718f8d11d8bf8ee8fda452314a6969b93f4cf3e8 SHA512 74b6ab1685aaf5b5065a346129eb329b87aedd36495442d17c2f6bacaeef2e484e7b811b279a26a8993054026aeb81a9c1907fa8b580ad87d8ad630fe66be3de
-DIST teamspeak3-server_linux_x86-3.7.0.tar.bz2 8491441 BLAKE2B 62691579e248bbda23041887beb7395df37dafd0417f291928eb000b2b43ed755704ac8e6c340d9dab9abaa1a9b7f4cbd1b299010296b3d76d8a742890810a56 SHA512 53d420c82ed78d5d1998e278080ca6a204a5191e4f3f2001a3fc67c69a0f6ff5f2b2f32667632ba87d9ebefd3996618a3845467879f27cfd63284dd5eb940ddf
-EBUILD teamspeak-server-3.7.0.ebuild 3063 BLAKE2B 13c327003913aedacad85326a3782077c8fbeb22f9fac8311b11754f01b5c05e664fb8fae1f31fada242c578df1ea88893923d5544dc2cdd3fd7ad19412c6257 SHA512 c5bb099281f5176d16209988c98b363be7f78d466bcfd285a096079c9c78c7ba4357a5162bb750a57058644f36b8e17c8662899793a98b8e76b35f5ef13fd691
+DIST teamspeak3-server_linux_amd64-3.7.1.tar.bz2 8658067 BLAKE2B 83d91ca9c77a53fde15efced19229bb94c140566b73f209ef340af9208a3a47271295682ab435bf325dc725cf1475614a85049b625c67c7e5c387b6a44337747 SHA512 8d1e9b90a83beb1f05f8f9ca8d79a7aed27880b41d34de0def5184c902e3d8a3bed4e1542841bd3ebcc179b90f6d335c00802b700f8caf8cd05e6d7b6e10563b
+DIST teamspeak3-server_linux_x86-3.7.1.tar.bz2 8506454 BLAKE2B 19052edf1db9a380ae7d9a9cf8464d058f5486adb80060b144feb7a832ccb403b3233ed21a998ba432c76ad3ca2f7969aa6e10a5e8c111d590e5750071f51a28 SHA512 1b01941a1f28a02d01b8685971f6c748161343675739ea46b8efdfc6fd87834478f23057d87fb394c27819e40960577e1eac7a482ad76d90ca2a6535196c9589
+EBUILD teamspeak-server-3.7.1.ebuild 3046 BLAKE2B 3b1eb27994eb61bad68c0b2aae5e046ea6fa2ff187bf8bbaa1b50c1bfefcf02d4a1d5ed46a6cb5095e69e98ff490bb68ac5a9801678c4d44a9468ff5f81eee62 SHA512 47177f6e3c6896de9905838617cde8de4ced395036f74f0fa9707696c9cfd240ff731f88be4e09e8ec2ba498606f3c198e1b3cc939209e0542420563f489dee5
 MISC metadata.xml 822 BLAKE2B ac5c32d28c089f00c7ac508d60d90fff40313dcb4758145401d4ebc76dd53f449834373475e7437c37b8892be6d121be5c2ff1b20cbbdde9c110cab4e1a1f760 SHA512 7265c0f252a1b7e1e4e2901773b81fc7e96d0b6da39475f1e7c65a37c75188f86ce3da13b39a1cf8be46b9ad80945fc3a5755135d6bb2c63829d13a0d3c1dc10
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.7.0.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.7.1.ebuild
index d944f47933ef..019e11726567 100644
--- a/media-sound/teamspeak-server/teamspeak-server-3.7.0.ebuild
+++ b/media-sound/teamspeak-server/teamspeak-server-3.7.1.ebuild
@@ -112,7 +112,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "If you have a Non-Profit License (NPL),"
+	elog "If you have a license,"
 	elog "place it in /opt/teamspeak3-server as licensekey.dat."
 	elog "Please note, that the license must be writeable by the teamspeak user."
 }
diff --git a/media-sound/umix/Manifest b/media-sound/umix/Manifest
index a878282315c9..f451f1282fce 100644
--- a/media-sound/umix/Manifest
+++ b/media-sound/umix/Manifest
@@ -1,5 +1,5 @@
 AUX umix-1.0.2-tinfo.patch 381 BLAKE2B b54721623167ae634b5e6e0243ffe9fb57c7af3f99236e23317163aa95926bf2c2a56b07eed1bdd228c7d92c21e0009dd5044e551e9d06bd3488bbb47a9666db SHA512 acd5f8c6a22ed857182fabba848b1718d1031cd6b7c15456e25f37387ed8cb6c354accd1e83781954c9beed88337889538dc1e38992a4ddadabc3077941c048e
 DIST umix-1.0.2.tar.gz 225866 BLAKE2B 8ab2b3246440fcab64edea366dafd5d8f734c42483fd78410a1f884c2b046a27fdb6959023d6c537900c64409ad0f606e7d2c2e91f23bdd03dda61940ba7d29b SHA512 9e59a26c0b6cd60bbcfa715694ed58e023c119840080ccb46d9e6b17a9613fd42c1346233a5185d02ece77e3f3e456e18be25573fd34e2f265c5b0b3dc593468
-EBUILD umix-1.0.2-r1.ebuild 700 BLAKE2B 5cf044d5416e0e9c1944abe971aae61066db7ae5d0df270dc402a420c36a628ca4590f95858662aa0fea972862f894bac957c589b6e9727e088620b481dfe7a2 SHA512 2ad4f8e1e7767364c7ded426817f55addc1244e1424d7a811b67a1cc5187aeedba26874599a5e618877b814d7e717bc3fb1f7a9e8010d8d5c96127a4fac1c0e7
+EBUILD umix-1.0.2-r1.ebuild 697 BLAKE2B f5b49cb08ac56b2c8edc8e558d1f7085190e50e2243ed74db3dbcb93c3373eef5a3219f05bb020d9d5a75fb49da390b226d5625024d3e2cbb590459b7adf78e7 SHA512 2df75902cccfa19cf652acfba9f64affa27a55a36712a527dec4edd62e5fce73b33ccc44909b39cd693d6ecef1b6ecd461fd7aefb2adaadb4e57dc9aed656f36
 EBUILD umix-1.0.2.ebuild 627 BLAKE2B f08396b4ac2659b8511bcc8c1b44653cd07f657aa2a27b021a6f55cbab861301ecc95817d6898fe066deaf9cd9b9783f3903b89c78374bd5fdb974e84a085c9f SHA512 00c36690b96c9f6106657b229c884e7e7ee0d6a94e367c26e2bcddfd7645303be054d319c994c4204664441471f2fe655af747b31deae55efe6fb722c796a548
 MISC metadata.xml 327 BLAKE2B 8c7901bd5f9eac11aa6e16d5df9e6a2ea87475effc0623deb6fc73d741f1ea92b8dc00f77f5edc95b05fe9ef643478497aeb9ebf28274155c4d21b6ebec783ee SHA512 e46843a6b8a9feb294b713eb1766900dbebf7211212423c9e791f0ffa59faeb9fb0c909c4268d13d737d80818fc343d6c067b8dc3bf369515083e7f1fc3abb71
diff --git a/media-sound/umix/umix-1.0.2-r1.ebuild b/media-sound/umix/umix-1.0.2-r1.ebuild
index cb9c1380a34e..6e460373a488 100644
--- a/media-sound/umix/umix-1.0.2-r1.ebuild
+++ b/media-sound/umix/umix-1.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc sparc ~x86"
 IUSE="ncurses oss"
 
 DEPEND="ncurses? ( >=sys-libs/ncurses-5.2:= )"
diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index 71af8a1bcc0a..c14dd2afe4e9 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -1,8 +1,7 @@
-AUX upmpdcli-1.3.6.initd 391 BLAKE2B 73220691754159e11d2b15f1f16a462cd80eb5b60dda8b6a45f2b9f4d56a1c054912989088f506f8bb98757606cf232debd60595c3b5f44cef391b7c1bff7af6 SHA512 562ea92fc43f15d00f0afe3ecf57d1925997e2be9245959ee1e0e50604fa64c486ee56589188db8cf34dd1175a3f59423f7822fc2967a27c9b18f259bb1d455d
 AUX upmpdcli.confd 26 BLAKE2B 840eb6e9353266f3669c00dda2a317a6146780180ff0998641dd258806b8dce0a1c49caca570c2ce1fac97e0bf3a347536c147f1a38092ae745bddd728128a01 SHA512 3dd82c12d66aac4be69a98cf25098fdb9c377c4ad0559d07f99cfb4599b6454a6880486053091d55e30b45ac8d877cfa544b1f3dc617d11c32c058767ae6a64f
 AUX upmpdcli.initd 387 BLAKE2B 1cf2ab80c9447041b2b1d1a921c164a6c0436204909c4857db798ed9930d3c1f6e5957a4382cfa884e9fa296ac8d72cc5e3d4d8025234251b665fb5d85efc12f SHA512 fcbefe70aecd05f4fea6427734933344cd1f537fd187c14f05d809f8cf8bb720241aeddc526e9c5497f76e5e7cdcf14798a160b4e4303d1482b53b646dd2b03f
-DIST upmpdcli-1.3.6.tar.gz 515712 BLAKE2B 6de6a3af2e474a3f8d12865e3cdd420f31955e88a0eb1c8ffd019809666c4c613631d642b34bb5fa473fceb7207613d90584fdf856b6a49899f9c2aa31b2b471 SHA512 280b02116786c86fd5f1e472fa9070b3a6d846acd670e36d476b150d4a3e91e5a6d1546b7053b1f35a2e0de553c8517640934af010d371d3cbed248592be502d
 DIST upmpdcli-1.4.0.tar.gz 469357 BLAKE2B edd46e86f367ff2f88346cfb4cb249dae4463095553bb220fbd9a4078315044ec7591f58c30a0f20840a9f217230e46bc3b3569989a0ae2c05a44aa140c234c4 SHA512 1ed1f0a89a02610d70fb9e380dcbdbd8d636bc4a0964a16d27bd7c04126674f7f14e50e5fe521a430a06ea04ecef1275c7ad5f1c276daae1c285b73cceba9dec
-EBUILD upmpdcli-1.3.6.ebuild 1048 BLAKE2B f28c7d3156e79ede24518503fa2760583b9fe6f4af2f0c122c0a327bc1cb693123fdbbf1007dbb87e101f44dd9312a269f960cf6c7c8c982e2eadf33211f36ec SHA512 fb8f49ca57a4479fd7e2cc4a403649f0fc7424c784c2826488e2069f6916a955baab7b4b00da515f2c5db68e868b328307a48284a0e2af5dab93e40c1423ae90
-EBUILD upmpdcli-1.4.0.ebuild 1260 BLAKE2B c0e4f83b38aa554fe246e2e65ec7152f4460ba1ed7c73a5ab7240d9279852f79cace506da9ca529872b9173bfbd166692ad62fb67ded6c96bed57cefabc03e48 SHA512 e07f423e06f57ee86484f066c16a2c7cbe416d8f845406269161eb61e4f1ff5467016e62ae4847497a72c0ab83cd798f81bc6108113e4b2e7abcb5b1dca4c87b
+DIST upmpdcli-1.4.2.tar.gz 477650 BLAKE2B 8bc2f86e8821aaee29f969e6031553f29e3224fdaf4b9c7d443f55bda5f321f36607dbb7dc0af15f0d1e7b006e93595cd1d668f9d1975e8673a80b218ea7f570 SHA512 be855214b55686422689ce786103ff50748a9f9e7e556c8dbeaa7e39e0229a3e0b56502bdbeb7071771706416cd2ff36592cb5245b505d8438f0ba75c200e9c2
+EBUILD upmpdcli-1.4.0.ebuild 1259 BLAKE2B f62c3642b43df9d6d6d78001d0c45aec8b3fc1e5be2fbf5843ec3a6c20f4c500a18f367c6c5abd687482d88a5e39f86d98c30f635e3d8508cc21bc6123a0f81b SHA512 6e97ea302f73f8a3f7ce05d92f06cfe5d7f0fbf9a6b872e271000392d0bd8dd8fdb4cfa96c72beec1c56f94fa7fd31531d393b77f71ab8920c4fc578ec4d9fb1
+EBUILD upmpdcli-1.4.2.ebuild 1261 BLAKE2B 022363689427e8477865e2b6e9dd21614a706447698d80b736e2e01d0f0fb137e1ff85950465f42f5edbe863bb9399241872c5c34caeaef2627f7c8a659ce6a5 SHA512 a7f2d8874e4fac75c628341b00b980a523f58b50b4696500ce0d772c2e7445b42531698e586d3b75d1f15a05f323a32d33f9ef1d8dc4c7501addca52075589f5
 MISC metadata.xml 424 BLAKE2B 255b763f479850aab6630f6b5c27eb84ea66692004c85cfafd9ad08edbfa9fe08d745c49f02bc27b126dc883ffc8c22c1d3a248cc94d163b88e8946bdb0d9362 SHA512 283c31f284c8789a0e74d8df0c5324add6875b3eb48a7dd91cb036102bda21465df2ea76656c5015ef050651765fd1fd80f66351deff9d31a2462d1009579ecc
diff --git a/media-sound/upmpdcli/files/upmpdcli-1.3.6.initd b/media-sound/upmpdcli/files/upmpdcli-1.3.6.initd
deleted file mode 100644
index f37623e8f2c1..000000000000
--- a/media-sound/upmpdcli/files/upmpdcli-1.3.6.initd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
-pidfile=/var/run/upmpdcli.pid
-command=/usr/bin/upmpdcli
-config="${config:-/etc/upmpdcli.conf}"
-command_args="-c ${config}"
-command_args_background="-D"
-
-depend() {
-    need localmount mpd
-}
diff --git a/media-sound/upmpdcli/upmpdcli-1.4.0.ebuild b/media-sound/upmpdcli/upmpdcli-1.4.0.ebuild
index f1851fb80b75..a5f87fad529c 100644
--- a/media-sound/upmpdcli/upmpdcli-1.4.0.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.4.0.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="thirdparty"
 
 DEPEND="
diff --git a/media-sound/upmpdcli/upmpdcli-1.3.6.ebuild b/media-sound/upmpdcli/upmpdcli-1.4.2.ebuild
index dc2832f79f0f..9d24547be31e 100644
--- a/media-sound/upmpdcli/upmpdcli-1.3.6.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.4.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit systemd user
 
@@ -11,19 +11,18 @@ LICENSE="GPL-2"
 
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="thirdparty"
 
 DEPEND="
 	dev-libs/jsoncpp
 	media-libs/libmpdclient
 	net-libs/libmicrohttpd
-	<net-libs/libupnpp-0.17.0
+	>=net-libs/libupnpp-0.17.0
 "
 RDEPEND="
 	${DEPEND}
 	thirdparty? ( dev-python/requests )
-	media-sound/mpd[curl]
 "
 
 pkg_setup() {
@@ -33,13 +32,18 @@ pkg_setup() {
 
 src_install() {
 	default
-	newinitd "${FILESDIR}/${P}.initd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
 	systemd_dounit systemd/upmpdcli.service
 }
 
 pkg_postinst() {
 	einfo
+	einfo "This package no longer assumes that upmpdcli is driving an"
+	einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)."
+	einfo "Probably it is though, so be sure your mpd is built with"
+	einfo "USE=curl."
+	einfo
 	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
 	einfo "detects sc2mpd at run-time, capabilities are added"
 	einfo "including internet radio support.  See upstream docs"
diff --git a/media-sound/vkeybd/Manifest b/media-sound/vkeybd/Manifest
index 5de9e0c8e4be..cd10b3dae32b 100644
--- a/media-sound/vkeybd/Manifest
+++ b/media-sound/vkeybd/Manifest
@@ -1,4 +1,5 @@
 AUX vkeybd-0.1.18c-desktop_entry.patch 498 BLAKE2B abc3ba4a1425e097b96fda6a3fa14f99adebd315d493a46a40422b6590a4fceb567e1179af58ba52fcc44bdffe9d7e611901c67f3c3df3d2ba6c28bfae39076f SHA512 5bb4d0a1b47e1e3390f927c1c8394da12c3058d68b43a5b46b4c3d91659aa720abd2fff2cdd1a8827c90512a116010d8d023b35214f6ec696a34857eb547b6a9
+AUX vkeybd-0.1.18c-fix-buildsystem.patch 2243 BLAKE2B 635d6c46029b9e9012bc93880042213be52d46584d1478cfdb702292878faa17536c84016ac791813650b33abcbcb94fed8070120d96def6b6a70a017c56492b SHA512 1d2cfe82272df9859175e921ab4c0d3683b69d5cc74a35c5f47395396f08b992f3b59adb4923e20b69a425485e891cd406f81a86dddbf71305bf0288acd3a0d6
 DIST vkeybd-0.1.18d.tar.bz2 38918 BLAKE2B 75af417b1458f840c22c4fb1fd10da24a78b1bff9e64c094291643bbe6c2c0dd5e552665ee41765e3cb7659f4d81dc35b69e372291ab1e154f838417b936952b SHA512 d26766e80b598af12e3962d043896f7737685a04dc5bd466be6902cc14a8bf5727900e0dfe66e443169a2539f22a110d1fbbc514a621a4a7cb8aa0e9d38be583
-EBUILD vkeybd-0.1.18d.ebuild 1432 BLAKE2B 7f032bbed481f71dbde70b92455541aafa6e94e275808629acd780317697bef6f9c03232f55a66f22e418c1dae1e0fbb3cb1c8c580177b6e77124e67da122253 SHA512 93987076c0b7ef1b933207c077a631216ee476671e8c787cf6e87096235c9da498ce00fb9b75fbf0186cdcc0093171c331f9e537ed3843683ba15fa893d67800
+EBUILD vkeybd-0.1.18d.ebuild 1251 BLAKE2B 5deb886515e00c504e6123086db5beea05e1996adda29d0f14fd9131ced236b0d0d2cd2e352c086ad2e4f9bc5f89f5488e977b7b30f616dd9aeddefc5c3fa50a SHA512 5b93bc7faffb3f365e35678f9c712fbbe54a7106b4cc32b76c00fda036e1dcf9554646c6f97895a13a921de66a9f58f42fcfbc398f33a43c28f3f72992d42f02
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/vkeybd/files/vkeybd-0.1.18c-fix-buildsystem.patch b/media-sound/vkeybd/files/vkeybd-0.1.18c-fix-buildsystem.patch
new file mode 100644
index 000000000000..84c99172ca4d
--- /dev/null
+++ b/media-sound/vkeybd/files/vkeybd-0.1.18c-fix-buildsystem.patch
@@ -0,0 +1,81 @@
+--- a/Makefile
++++ b/Makefile
+@@ -8,7 +8,7 @@
+ #
+ # installation directory
+ #
+-PREFIX = /usr/local
++PREFIX = $(EPREFIX)/usr
+ # binary and Tcl script are put there
+ BIN_DIR = $(PREFIX)/bin
+ # man page
+@@ -27,21 +27,21 @@
+ # device selections -- multiple avaialble
+ # to disable the device, set value 0 (do not comment out!)
+ #
+-USE_AWE = 1
+-USE_MIDI = 1
+-USE_ALSA = 1
+-USE_LASH = 0
++USE_AWE ?= 1
++USE_MIDI ?= 1
++USE_ALSA ?= 1
++USE_LASH ?= 0
+ 
+ #
+ # Tcl/Tk library -- depends on your distribution
+ #
+-TCL_VERSION = 8.4
++TCL_VERSION ?= 8.4
+ TCLLIB = -ltcl$(TCL_VERSION)
+ TCLINC =
+ TKLIB = -ltk$(TCL_VERSION)
+ TKINC =
+-XLIB = -L/usr/X11R6/lib -lX11
+-XINC = -I/usr/X11R6/include
++XLIB = $(shell $(PKG_CONFIG) --libs x11)
++XINC = $(shell $(PKG_CONFIG) --cflags x11)
+ EXTRALIB += -ldl
+ 
+ #----------------------------------------------------------------
+@@ -71,9 +71,9 @@
+ # LASH stuff
+ #
+ ifeq (1,$(USE_LASH))
+-LASHCFLAGS = $(shell pkg-config --cflags lash-1.0) \
+-	       $(shell pkg-config --exists lash-1.0 && echo "-DHAVE_LASH" )
+-LASHLIBS   = $(shell pkg-config --libs lash-1.0)
++LASHCFLAGS = $(shell $(PKG_CONFIG) --cflags lash-1.0) \
++	       $(shell $(PKG_CONFIG) --exists lash-1.0 && echo "-DHAVE_LASH" )
++LASHLIBS   = $(shell $(PKG_CONFIG) --libs lash-1.0)
+ DEVICES += $(LASHCFLAGS)
+ EXTRALIB += $(LASHLIBS)
+ endif
+@@ -84,8 +84,7 @@
+ 
+ VKB_TCLFILE = $(VKBLIB_DIR)/vkeybd.tcl
+ 
+-COPTFLAGS = -Wall -O
+-CFLAGS = $(COPTFLAGS) -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \
++CFLAGS += -Wall -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \
+ 	-DVKBLIB_DIR=\"$(VKBLIB_DIR)\"\
+ 	-DVERSION_STR=\"$(VERSION)\"\
+ 	$(DEVICES) $(XINC) $(TCLINC) $(TKINC) $(LASHCFLAGS)
+@@ -100,7 +99,7 @@
+ sftovkb: sftovkb.o sffile.o malloc.o fskip.o
+ 	$(CC) $(LDFLAGS) -o $@ $^ -lm
+ 
+-install: $(TARGETS) vkeybd.tcl vkeybd.list vkeybdmap*
++install-default: $(TARGETS) vkeybd.tcl vkeybd.list vkeybdmap*
+ 	mkdir -p $(DESTDIR)$(BIN_DIR)
+ 	install -c -m 755 vkeybd $(DESTDIR)$(BIN_DIR)
+ 	install -c -m 755 sftovkb $(DESTDIR)$(BIN_DIR)
+@@ -120,7 +119,7 @@
+ 	mkdir -p $(DESTDIR)$(DATA_DIR)/pixmaps
+ 	install -c -m 644 pixmaps/*.png $(DESTDIR)$(DATA_DIR)/pixmaps
+ 
+-install-all: install install-man install-desktop
++install: install-default install-man install-desktop
+ 
+ clean:
+ 	rm -f *.o $(TARGETS)
diff --git a/media-sound/vkeybd/vkeybd-0.1.18d.ebuild b/media-sound/vkeybd/vkeybd-0.1.18d.ebuild
index 56fd2ccbeca4..eadf36bb8eca 100644
--- a/media-sound/vkeybd/vkeybd-0.1.18d.ebuild
+++ b/media-sound/vkeybd/vkeybd-0.1.18d.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="A virtual MIDI keyboard for X"
 HOMEPAGE="http://www.alsa-project.org/~iwai/alsa.html"
@@ -13,44 +14,30 @@ SLOT="0"
 KEYWORDS="amd64 ~sparc x86"
 IUSE="alsa lash oss"
 
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	>=dev-lang/tk-8.3
-	lash? ( media-sound/lash )
-	x11-libs/libX11"
+RDEPEND="
+	>=dev-lang/tk-8.3:=
+	x11-libs/libX11
+	alsa? ( media-libs/alsa-lib:= )
+	lash? ( media-sound/lash:= )"
 DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
+	x11-base/xorg-proto
+	virtual/pkgconfig"
 
 S=${WORKDIR}/${PN}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.18c-desktop_entry.patch
+	"${FILESDIR}"/${PN}-0.1.18c-fix-buildsystem.patch
+)
 
-pkg_setup() {
-	TCL_VERSION=`echo 'puts [info tclversion]' | tclsh`
-
-	vkeybconf="PREFIX=/usr"
-
-	if use alsa; then
-		vkeybconf+=" USE_ALSA=1"
-		use oss || vkeybconf+=" USE_AWE=0 USE_MIDI=0"
-	else
-		vkeybconf+=" USE_ALSA=0 USE_AWE=1 USE_MIDI=1"
-	fi
+src_configure() {
+	export TCL_VERSION="$(echo 'puts [info tclversion]' | tclsh)"
 
-	use lash && vkeybconf+=" USE_LASH=1"
-
-	vkeybconf+=" TCL_VERSION=${TCL_VERSION}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.1.18c-desktop_entry.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake ${vkeybconf} COPTFLAGS="${CFLAGS}" || die
-}
+	export USE_ALSA=$(usex alsa 1 0)
+	export USE_AWE=$(usex alsa $(usex oss 1 0) 1)
+	export USE_MIDI=$(usex alsa $(usex oss 1 0) 1)
+	export USE_LASH=$(usex lash 1 0)
 
-src_install() {
-	emake ${vkeybconf} DESTDIR="${D}" install-all || die
-	dodoc ChangeLog README
+	tc-export CC PKG_CONFIG
 }
 
 pkg_postinst() {
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 52ee5358935a..5527f286d933 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -7,8 +7,7 @@ AUX xmms2-0.8_p20161122-mac-4.patch 1632 BLAKE2B 5bc5c7d499df5faee2fc6b4307af182
 AUX xmms2-0.8_p20161122-perl-no-local.patch 697 BLAKE2B 86ab6bb3594fd45e9a9bdbd07d85d3740ed206eea24652161c7fbbdf620c98a6b002b646aba65a3f017e263bb82d6dc7b933fb53540012c2005d65dd2e667b06 SHA512 eb5afb39409c7c199a844d9452ab829a653d2a1ce8f5d9f1361fa995e851914d5a962d25d8116947a265fabc649f8560aa1947a24cf45d954da7743954fc3cd7
 AUX xmms2-0.8_p20161122-tarball.patch 2764 BLAKE2B 1d6ea9bc40db3145460a8ef06c732114475087ea05eef65fd837d6c3bf346478579d7c6ab0bf33387d2228a319245e0e4d2562935be75a58abd04e88205d4373 SHA512 5b03d129a55ac14462a68e47ecba29c2817eb83d122a3614c624c743ecc29a7bac066644aa61d5ac74f9cb59808d1a9bac077dc360c507da722c206b948301ac
 DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb
-EBUILD xmms2-0.8_p20161122-r3.ebuild 7519 BLAKE2B ad7093c0b9af101e3f29ad81b6eda1fac3842cbeaf7dd2322704ed8ff2394038c141d72a9bcc6b4ab14ee12d36d2af3e12b8fc9851fdb2ec17bd5bdb5c107c93 SHA512 3fe26a7e0f1542ef9ec787d87d4ff7ee5c6ad19543c66d1a6c31ceae5d921ad5bd48c20b5d7a546aea69a87b1877e0144d1cdee7ac8c06eba96826185f982185
-EBUILD xmms2-0.8_p20161122-r4.ebuild 7577 BLAKE2B 449e5421e5bd4c1febb2403b1fabf53af35ed8c22a06488805fff23fef27b8691cda0cfd2d7b6fe230160929d3549c081581fb736d9fb34b6ebad4c28325959a SHA512 189a0fe53beb27adac0326c3370d147706c3072f933fb0d09d0bc3503555108b2d8acd8f2046902b59e20a3078c19262632241722bd2e9f1028b42b188941eb6
-EBUILD xmms2-0.8_p20161122-r5.ebuild 7701 BLAKE2B 825f60294354e9779581c4e74a936672ecfcd513a3b420c026dbe1dd50db87e066c6b519c8fc02fc6dfd7d92adcb3ebf4dd0da27309922d5a1687ab5a3689330 SHA512 8d24d878b985fd8a9eff773bae5fd53cb28d7a0e995089ca04ca103088e480c4ea03c5bb6e11f25923c4b2925527bed4555c0660c41e8dc4a248c78d0ecac7a1
-EBUILD xmms2-0.8_p20161122.ebuild 7389 BLAKE2B bb82ad9ed821fefab30cb8a3f9a4b77e50ec6cc219b297506e8e2fbe8aba2b347c1da0a1b675d072b8bd97263dd03c47bcb8589daddeea8e3d0e7a85020c44c2 SHA512 2c09816bf4c22b89e885b4c6c64f0bbf42729eba0f77834451d9fc943057aba9a15f0362b81458192d21c48e61918f689d7f9b0fd7dea22e416b96598caa293d
-MISC metadata.xml 2560 BLAKE2B 267abaaa9bf07aa218ef3d2613c4ff94c183f84f5caf2525a1d902dbdecebc724e94bdf84f09bd820cec2579bb293478777459b2a0d801e560f853270746d576 SHA512 f92c04cad82b65f335aa44d0890f133df1f1bbdba97592f1c69bb90e9fa2a8d8827029ff10998cb4fb8ab936dc1f2c9a7402b6259e5000e2644467e89b23b26e
+EBUILD xmms2-0.8_p20161122-r3.ebuild 7512 BLAKE2B 9f27e34436e26b5b1c21c0b200439949fd1139ab0fc4baaf09ad7040298e4e67036b79d1d29076e7649d32ac5e57e70bb59a32f402d4809dab3ae0b105e5380f SHA512 c396e5fd3908e2652584eb69e935e65beff4a4bf2876cebbae2fbeda0ec3449443aed32f1286914247ba9ae751b84516b0f147bbb44a07b5fbe15630e0c6f1db
+EBUILD xmms2-0.8_p20161122-r4.ebuild 7570 BLAKE2B 2d86795c94d54465b9440f22ee276bd309da2a9f2ae117903c768b8ef1e836280eea4bf1eea13600465b00689f5d1146e6e86a5dc8881fe1f5a3fbf5c8504218 SHA512 2813a46fc3261cc6f0dc538ca5d827cff1e7a1f82043a82815b00ad62305682aba5c0fba73db38d1e46eeaaed4458d4574fc43cd7770cc6b81b2cbfab35104b3
+EBUILD xmms2-0.8_p20161122-r5.ebuild 7697 BLAKE2B d53767b9b76d1824dc8629021f52e0cc501a7a1c08ab5669589c26d9bb66463dcdf23f1e560d39a97a2b7ffae4f863377005866f85f6ad06d95d2d12069b9379 SHA512 f8f59ccf3df8e9d8be357b265155e0b29c466d28e0b85f40897c4daffabe4907e7ab096cee883dd5ed468241ab4c1d03a3ace3f32bb2521be8dca0b3a5cda035
+MISC metadata.xml 2494 BLAKE2B 47ddee51380c99b03e6a449347f68e0f38742c7310d6e128b741abb13c4ce8126cb7177854c05c7a9e22ede612be2aa0befe7fbc69b918d17366a31005ed392e SHA512 f5c30541d2f5f484ced87780f72b2ce02d8f1a5e9cdfd437a870e6a1f53f1b9f71bf266935a20dc6f1f6d2417636dfa6dfe27c947eeddca1d746ad72e0b3c8ae
diff --git a/media-sound/xmms2/metadata.xml b/media-sound/xmms2/metadata.xml
index a19d3fb9caf9..2019a968d215 100644
--- a/media-sound/xmms2/metadata.xml
+++ b/media-sound/xmms2/metadata.xml
@@ -34,7 +34,6 @@
 		<flag name="airplay">Support for airplay format</flag>
 		<flag name="asf">Support for Monkey's Audio (APE) format with help of bundled libasf</flag>
 		<flag name="fluidsynth">Enable fluidsynth support (MIDI)</flag>
-		<flag name="gvfs">Transport for glibs virtual filesystem</flag>
 		<flag name="ices">Icecast source output plugin</flag>
 		<flag name="mac">Support for Monkey's Audio (APE) format with help of <pkg>media-sound/mac</pkg></flag>
 		<flag name="ofa">Support for Open Fingerprint Architecture (OFA)</flag>
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r3.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r3.ebuild
index e35262be43d0..7a6d9e9211da 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r3.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 USE_RUBY="ruby23 ruby24 ruby25"
 
 inherit eutils multiprocessing python-single-r1 ruby-single toolchain-funcs
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
index 89d7d42efb0c..436345d7fae1 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 USE_RUBY="ruby23 ruby24 ruby25"
 
 inherit eutils multiprocessing python-single-r1 ruby-single toolchain-funcs
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
index d6d2392bada7..01daddf56462 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 USE_RUBY="ruby23 ruby24 ruby25"
 
 inherit eutils multiprocessing python-single-r1 ruby-single toolchain-funcs
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122.ebuild
deleted file mode 100644
index d4c26a1373cd..000000000000
--- a/media-sound/xmms2/xmms2-0.8_p20161122.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-USE_RUBY="ruby22 ruby23"
-
-inherit eutils multiprocessing python-single-r1 ruby-single toolchain-funcs
-
-# generated as 'python2 ./utils/gen-tarball.py' from clean git tree
-MY_P="${P%_p*}DrO_o-949-gca15e830"
-
-DESCRIPTION="X(cross)platform Music Multiplexing System. Next generation of the XMMS player"
-HOMEPAGE="https://xmms2.org/wiki/Main_Page"
-#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2"
-LICENSE="GPL-2 LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-
-IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth gvfs ices
-jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss
-perl phonehome pulseaudio python ruby samba +server sid sndfile speex
-test valgrind +vorbis vocoder wavpack xml zeroconf"
-
-RDEPEND="server? (
-		>=dev-db/sqlite-3.3.4
-
-		aac? ( >=media-libs/faad2-2.0 )
-		airplay? ( dev-libs/openssl:0= )
-		alsa? ( media-libs/alsa-lib )
-		ao? ( media-libs/libao )
-		cdda? ( dev-libs/libcdio-paranoia
-			>=media-libs/libdiscid-0.1.1
-			>=media-sound/cdparanoia-3.9.8 )
-		curl? ( >=net-misc/curl-7.15.1 )
-		ffmpeg? ( virtual/ffmpeg )
-		flac? ( media-libs/flac )
-		fluidsynth? ( media-sound/fluidsynth )
-		gvfs? ( gnome-base/gnome-vfs )
-		ices? ( media-libs/libogg
-			media-libs/libshout
-			media-libs/libvorbis )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.101.1 )
-		mac? ( media-sound/mac )
-		mms? ( virtual/ffmpeg
-			>=media-libs/libmms-0.3 )
-		modplug? ( media-libs/libmodplug )
-		mad? ( media-libs/libmad )
-		mp3? ( >=media-sound/mpg123-1.5.1 )
-		musepack? ( media-sound/musepack-tools )
-		ofa? ( media-libs/libofa )
-		opus? ( media-libs/opus
-			media-libs/opusfile )
-		pulseaudio? ( media-sound/pulseaudio )
-		samba? ( >=net-fs/samba-4.2 )
-		sid? ( media-sound/sidplay
-			media-libs/resid )
-		sndfile? ( media-libs/libsndfile )
-		speex? ( media-libs/speex
-			media-libs/libogg )
-		vorbis? ( media-libs/libvorbis )
-		vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate )
-		wavpack? ( media-sound/wavpack )
-		xml? ( dev-libs/libxml2 )
-		zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	)
-
-	>=dev-libs/glib-2.12.9
-	cxx? ( >=dev-libs/boost-1.32 )
-	perl? ( >=dev-lang/perl-5.8.8 )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )
-"
-
-DEPEND="${RDEPEND}
-	dev-lang/python
-	virtual/pkgconfig
-	perl? ( dev-perl/Module-Build
-		virtual/perl-Module-Metadata )
-	python? ( >=dev-python/cython-0.15.1
-		dev-python/pyrex )
-	test? ( dev-util/cunit
-		valgrind? ( dev-util/valgrind ) )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# used both for building xmms2 and
-	# optionally linking client library
-	# against python
-	python-single-r1_pkg_setup
-}
-
-# use_enable() is taken as proto
-# $1 - useflag
-# $2 - xmms2 option/plugin name (equals to $1 if not set)
-
-xmms2_flag() {
-	[[ -z $1 ]] && eerror "!!! empty arg. usage: xmms2_flag <USEFLAG> [<xmms2_flagname>]."
-
-	local UWORD=${2:-$1}
-
-	case $1 in
-		ENABLED)
-			echo ",${UWORD}"
-			;;
-		DISABLED)
-			;;
-		*)
-			use $1 && echo ",${UWORD}"
-			;;
-	esac
-}
-
-src_prepare() {
-	./waf # inflate waf
-	cd .waf* || die
-	# needs port
-	#epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778
-	cd "${S}"
-
-	eapply "${FILESDIR}/${PN}"-0.8-ffmpeg2.patch #536232
-
-	eapply "${FILESDIR}/${PN}"-0.8-rtvg.patch #424377
-
-	# required to build tarball from git tree
-	eapply "${FILESDIR}/${P}"-tarball.patch
-
-	eapply_user
-}
-
-src_configure() {
-	# ./configure alike options.
-	local waf_params="--prefix=/usr \
-			--libdir=/usr/$(get_libdir) \
-			--with-target-platform=${CHOST} \
-			--mandir=/usr/share/man \
-			--infodir=/usr/share/info \
-			--datadir=/usr/share \
-			--sysconfdir=/etc \
-			--localstatedir=/var/lib"
-
-	local optionals=""
-	local plugins=""
-	if ! use server ; then
-		waf_params+=" --without-xmms2d"
-	else
-		# some fun static mappings:
-		local option_map=(	# USE		# sorted xmms2 option flag (same, as USE if empty)
-					"phonehome	et"
-					"ENABLED	launcher"
-					"mlib-update	medialib-updater"
-					"ENABLED	nycli"
-					"		perl"
-					"ENABLED	pixmaps"
-					"		python"
-					"		ruby"
-					"DISABLED	tests"
-					"DISABLED	vistest"
-					"cxx		xmmsclient++"
-					"cxx		xmmsclient++-glib"
-					"DISABLED	xmmsclient-cf"
-					"DISABLED	xmmsclient-ecore" # not in tree
-
-					"test		tests"
-				)
-
-		local plugin_map=(	# USE		# sorted xmms2 plugin flag (same, as USE if empty)
-					"		alsa"
-					"		airplay"
-					"		ao"
-					"ffmpeg		apefile"
-					"ffmpeg		avcodec"
-					"		asf"
-					"ENABLED	asx"
-					"		cdda"
-					"DISABLED	coreaudio" # MacOS only?
-					"		curl"
-					"ENABLED	cue"
-					"zeroconf	daap"
-					"ENABLED	diskwrite"
-					"ENABLED	equalizer"
-					"aac		faad"
-					"ENABLED	file"
-					"		flac"
-					"		fluidsynth"
-					"ffmpeg		flv"
-					"ffmpeg		tta"
-					"DISABLED	gme" # not in tree
-					"		gvfs"
-					"ENABLED	html"
-					"		ices"
-					"ENABLED	icymetaint"
-					"ENABLED	id3v2"
-					"		jack"
-					"ENABLED	karaoke"
-					"ENABLED	m3u"
-					"		mac"
-					"		mms"
-					"		mad"
-					"ENABLED	midsquash"
-					"		mp4" # bug #387961 (aac, mp3, ape can sit there)
-					"mp3		mpg123"
-					"		modplug"
-					"		musepack"
-					"DISABLED	nms" # not in tree
-					"ENABLED	normalize"
-					"ENABLED	null"
-					"ENABLED	nulstripper"
-					"		ofa"
-					"		opus"
-					"		oss"
-					"ENABLED	pls"
-					"pulseaudio	pulse"
-					"ENABLED	replaygain"
-					"xml		rss"
-					"		samba"
-					"DISABLED	sc68" #not in tree
-					"		sid"
-					"		sndfile"
-					"		speex"
-					"DISABLED	sun" # {Open,Net}BSD only
-					"DISABLED	tremor" # not in tree
-					"		vorbis"
-					"		vocoder"
-					"ffmpeg		tta"
-					"ENABLED	wave"
-					"DISABLED	waveout" # windows only
-					"		wavpack"
-					"xml		xspf"
-					"ENABLED	xml"
-				)
-
-		local option
-		for option in "${option_map[@]}"; do
-			optionals+=$(xmms2_flag $option)
-		done
-
-		local plugin
-		for plugin in "${plugin_map[@]}"; do
-			plugins+=$(xmms2_flag $plugin)
-		done
-	fi # ! server
-
-	# pass them explicitely even if empty as we try to avoid magic deps
-	waf_params+=" --with-optionals=${optionals:1}" # skip first ',' if yet
-	waf_params+=" --with-plugins=${plugins:1}"
-	waf_params+=" $(use_with valgrind)"
-
-	CC="$(tc-getCC)"         \
-	CPP="$(tc-getCPP)"       \
-	AR="$(tc-getAR)"         \
-	RANLIB="$(tc-getRANLIB)" \
-	CXX="$(tc-getCXX)"       \
-	    ./waf configure ${waf_params} || die "'waf configure' failed"
-}
-
-src_compile() {
-	# waf is very keen to run tests in build phase (bug #424377) but
-	# it does not bother running tests twice, so the hack below works:
-	./waf --verbose build || ./waf --verbose build || die "waf build failed"
-}
-
-src_test() {
-	# rerun tests
-	./waf --alltests || die "waf --alltests failed"
-}
-
-src_install() {
-	./waf --without-ldconfig --destdir="${D}" install || die "'waf install' failed"
-	dodoc AUTHORS TODO
-}
-
-pkg_postinst() {
-	elog "This version is built on experimental development code"
-	elog "If you encounter any errors report them at https://bugs.xmms2.org"
-	elog "and visit #xmms2 at irc://irc.freenode.net"
-	if use phonehome ; then
-		einfo ""
-		einfo "The phone-home client xmms2-et was activated"
-		einfo "This client sends anonymous usage-statistics to the xmms2"
-		einfo "developers which may help finding bugs"
-		einfo "Disable the phonehome useflag if you don't like that"
-	fi
-}
diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
index 314523bae580..a2444ad52aa0 100644
--- a/media-sound/xwax/Manifest
+++ b/media-sound/xwax/Manifest
@@ -2,5 +2,5 @@ AUX xwax-etc-security-limits.conf 18 BLAKE2B 7056521164d62b76e2cba2b7a128a160364
 DIST xwax-1.5.tar.gz 77582 BLAKE2B 5d02dbf1b4ee30f333b6df2ca63b657683aa15d5790fc474f54a6571314f5e506b4403e983889fc8afcca77489b3b15285907d61e33f080123d94ac4c20bd5ed SHA512 b5fb66c35dd5174277417b8973bab63232bdf471fe190ab3df1c37e386a9cdc9e2b5cbdc4f5715bf69d146846c13ce2acd5db6a0881412dabdcd234d6d199b61
 DIST xwax-1.6.tar.gz 79452 BLAKE2B 3cefded6fd39435d92ca07458048910e5e95169562c9dec17cd1411c992ca864124f3155b1a8a9313c86cfee01fe79d72a5c5bed9963b1740a1d4e89e9e249e9 SHA512 710a53a1b056bf6850a668a1f267b91664d5629998e6ee2d4853aa57d1ab351dd782716272ed4a4858168c0ac9f5c7d2e1fe0a8b330e26775677e1eb54249015
 EBUILD xwax-1.5.ebuild 2174 BLAKE2B 33f6a0373b5605036879f87e06064f48d870f6175d61d62f88d6ed536092bc72f8e725851b22f0b24801e685ca6a55e9ad70a874803403ce85d746db4f467cc4 SHA512 02324db41aad3424fcc9b8fa2f221ba95d74ecdae659fc84ea425ff262e6ed97f3c77f41a1f45268966cd83c5c9075ba73a9e0e299a49bafbf496343f969e04e
-EBUILD xwax-1.6.ebuild 2193 BLAKE2B fd0928afc037e639165198edc97979bf43ababd8606d564447b3ecc7e65905ad00f4057a076c715234b017128f7c0096f10fe8063511d7c97327469bbc6ee110 SHA512 3c2117c0a69682f1c0b46676d791731098d794dc9a683d3a5386638de0e9534fbdeae39097f30d0e508d26e52b18bfbb3821827ec432d7940860ec2563949032
+EBUILD xwax-1.6.ebuild 2190 BLAKE2B 98205cb84e53dae453a09f528e490d0d2da752327c52e49ff30ff1a531a86f13fadcd504d2a1615e899dd7e86d75e94fd176e0744f633427a933931730c5b6bb SHA512 4d2e4630ed1a33129e8e6f1c5cb417a08a26f60ab165ee8da3bb16386a906ea48625d26167ab884a6fd1cae5781372fb2e332ad804d7aa86600e4bf1a79ac7c4
 MISC metadata.xml 803 BLAKE2B fe59d8229f2f7189451f99e0f4da36fbc0f2b39f04d152f927b7f6822fdb9160c570daa82c6d7d8e85dd0c9bac44e50f759334e9c5a547b224f52ea0cdb2bb84 SHA512 9d15deede88ee114e0ade78665996cfaf09443f8629b08415ae0bd1c486ff6a239567056aacde2d49883066d4d8dc3690a397d170effbfe5e4aa5cf7d24cbca8
diff --git a/media-sound/xwax/xwax-1.6.ebuild b/media-sound/xwax/xwax-1.6.ebuild
index d265c8017b5c..273bd31cd5cc 100644
--- a/media-sound/xwax/xwax-1.6.ebuild
+++ b/media-sound/xwax/xwax-1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://xwax.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 ~x86"
 IUSE="alsa jack oss cdda mp3 +fallback"
 
 REQUIRED_USE="|| ( cdda mp3 fallback )
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /media-sound
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)