Merge branch 'edge' into next

56 files changed, 561 insertions, 527 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 89bf2da38d64..cef3f8057197 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index c910b0eb7827..0059b6330e5c 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,7 +1,7 @@
 DIST audacious-3.10.1.tar.bz2 564481 BLAKE2B d1f76f34f0f6fbbe5ba92a95015fa0f3ef6399cc05f69f58474523761b00a4de7b8471660d9cb640487110cc3998df59f21108ff0b4ea72014ad75cd32ad864b SHA512 e88891caaa3897f9b4abf39136e20834aedf1287d0d5eefea392fda89050db8db00c6f363976a68fe250ddbae4e27590f7615916a76370a44ca9235f1fa60b43
-DIST audacious-4.0.tar.bz2 579176 BLAKE2B 62127d9dcc666e0834c71d5004863fe7c2f7a5835a3549aa88decd6e74d6714e70f59343c3a8b5a73bfe43064bf47f8b2d15d964c4957ad70ed17f65a90c0ccb SHA512 82a44270a4dad39098f7055d540a44e6e0e9826a3f140d7feb537518e42a8d391357c1adbcc62d118b0a82e79c88729e74748f8b41b9d8e4ff40ffc5d96ec759
+DIST audacious-4.0.2.tar.bz2 576407 BLAKE2B 001d185db59e38f686c78964b759f851481bc4c7fcddb521fde9bd985095fa32bacb6f1bcea167a91616af4fca412d75cf63dfe0cd3b19ee396e36e211b1a94e SHA512 3f541000c874f2d026f2a4c23f1f98486aae9450c6dc8d7597f742b21d701883b31bbc5620bf23408ce0da397fdf414dffe37a778eb70df5a553a854f2435b99
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
 EBUILD audacious-3.10.1.ebuild 1795 BLAKE2B bcea95295deb3f1b069c44441c7aa27e2a4136084acaa5b821909f48d43fd669cfecd28034d5d94f57d757075f4f8c24e637e919a2fdff29a5bfa76a67abd752 SHA512 6b4b29e2d61adf73eb9e610cf68ac6581ae0434e34a4aab71d3e56e3dc85a77857b3f68b3a8f66f674b62c4588983dc9166fbff6e70050e9aa851f0713b0556d
-EBUILD audacious-4.0.ebuild 1768 BLAKE2B 05d92d11c5b4b4fab175c6ff7a07996d86a9939f5303e23a046133d04308b9d90ff7391e866f0bf458ee72a16674c1f6e128343b172e3825c3928ccab53d383b SHA512 df4cd28d09993ccc387eba815757984ebad77bdb2070258fe0f1be8e1d2321135ff6a25fdabae66441a8ddc92d4d104e06b754841163d0ece945cf2ac603cca6
+EBUILD audacious-4.0.2.ebuild 1768 BLAKE2B 05d92d11c5b4b4fab175c6ff7a07996d86a9939f5303e23a046133d04308b9d90ff7391e866f0bf458ee72a16674c1f6e128343b172e3825c3928ccab53d383b SHA512 df4cd28d09993ccc387eba815757984ebad77bdb2070258fe0f1be8e1d2321135ff6a25fdabae66441a8ddc92d4d104e06b754841163d0ece945cf2ac603cca6
 EBUILD audacious-9999.ebuild 1831 BLAKE2B 0686555744115d856c466cc1177b200e5e66f54c39b1ebd76ed9ce86ac29f0bde9cdf51f14cf4b968cb7d607107b836bbfcdebf279776b5694073e0ede6aec50 SHA512 4b3ae117d67cffc3464cbe5f533abed8d1d3ad2e94165c2422ec0450411ab7c40cb81073f223a387c3a2e2c1316cd1496a3f4ef77737ecd6e84ce7ffc462cf72
 MISC metadata.xml 514 BLAKE2B 6ca503bd16bd79e7a453a6eca5c74802c2b078b3cefa4cf886fac391feb2a11db4398a462502cd4f10dcb2c5ffc60f30e51ab348761118cb1a446c8d865b9145 SHA512 6c8d823ff6be4d914e79193e20fa3dca4948f3945b5c6e6977e72f3d6dee3a8ba01ddc06d3a1a7231c5cf3b585d4f655703cd6df8f3c21d326c91db2edda5107
diff --git a/media-sound/audacious/audacious-4.0.ebuild b/media-sound/audacious/audacious-4.0.2.ebuild
index 13924b39fcb0..13924b39fcb0 100644
--- a/media-sound/audacious/audacious-4.0.ebuild
+++ b/media-sound/audacious/audacious-4.0.2.ebuild
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 9eeeebe5a164..1d7d5adb03cf 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,3 +1,3 @@
 DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a
 EBUILD beets-1.4.9-r1.ebuild 3557 BLAKE2B c2374c28f18396541d8e473b8d0f2a4f7d9d6dd2cdd33c2e73e0504810fa21a77af3652ff6f377d79fe9bb4d762c6356416ab77430be70cbaf9e07378b8d76fb SHA512 70cbf115007ee7420fcf0ddae6185863547ba8d53ce86885a6a7d723a899d280373796fe6583523774e6bf5160199c6ceace0223162f73c592a6835f65a06962
-MISC metadata.xml 2707 BLAKE2B f178a50b9b107e6c5083cc255750416751d0e077f95fc8111b826e458e30d72ce978fe8c8a29056ad076b121fe2690fd636212eb68c758eedb4f380afd29a6d9 SHA512 58ea485657e54c0f1aecbbed49a6c3ce683ef5560f66a02d95c7c89de597a038499b8268771db9fe344dd9baaafe4af750c9402f1725bb791c89dbf4de90d705
+MISC metadata.xml 2480 BLAKE2B 362b835a16709336e8d6fc8858505107a4d060afb66dab31211daa664e942f7475626c462b4ded6738f600ccb14b92e0b2250256daae019da873d6cc7d18cf5f SHA512 1eae06f009e93147c6d63a0125003b00c8e6569ccc90d491bf7bf129bfcd10bfb87f82db35221bfb1f15c2db83b4f99a5ab2119f585ebbfb33358341a99fa12b
diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index c94e37c4b59b..00d7ac2d1354 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/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>bernardo@standard.ai</email>
-    <name>Bernardo Meurer</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Gentoo Proxy Maintainers Project</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
         The purpose of beets is to get your music collection right once and for
         all. It catalogs your collection, automatically improving its metadata as
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 15380bbc231a..c13121d21d6f 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,3 +1,5 @@
 DIST elisa-19.12.3.tar.xz 1388096 BLAKE2B fc522daa74d1517f878b23d8162a21bd22cddb17d7f4f6917b8668d444685996dae9861263289086e093a88bb5526c7dc70ee031bd342705fc6305ec0e8cd84e SHA512 6eb2292e9f50139956ab77f85f566692b0223487d6e365f223d72ccfad7d9029b64dcd75d36f6888d011850eebea240e50b60e5895d9b92cff6886c51b3e1b94
+DIST elisa-20.04.0.tar.xz 1405776 BLAKE2B b73d24dd709cd80bde5126adcb4bec9ece1d408c89397376f225e8b9fb9a6b0e0baee9426ad1ccfc2037fdac8e24e4c750d0b89da1c3e7ef320cbaeedd2740b5 SHA512 e0e77a44f78a1da04c56e69980c80263bd1e09ba1d8f08c6e3ebe2b6363fe516128269e62442f591fde6bcf748502e317f2c928791ed4b67947b7a67eed953d2
 EBUILD elisa-19.12.3.ebuild 1623 BLAKE2B 4b86451aec4bc1d4b89eee833888e10bfe61c29853abbaab9b59464d1a5ac12ef542312ff16a8a36ac42c09974392d163e54b63bdc5dcff218264af880238af5 SHA512 6fa420a0eaf783a60c27f18d39c3b2f9732a221a161cd620096672c2937aa0b88c530a02bf5f3d12081c2668673fda527856d3f6d9412e811b6d6176055d16f1
+EBUILD elisa-20.04.0.ebuild 1626 BLAKE2B dea6c342027827e7760c05241875f5995e82f96d319482a21d8a6ae334f9057f96ba09d1cc3968c362f31d0f435e9aaf2ba565f71e9092fb367dddc4c1b043af SHA512 287000dd0f3e040c7b7053d847e37b8ef520a56d4731328eceb62da396149aba66e194278aaed1c33ad7e3c5db889d1f39a086d1dfb07c36d9d45ef21b71857b
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-20.04.0.ebuild b/media-sound/elisa/elisa-20.04.0.ebuild
new file mode 100644
index 000000000000..27b85b62d54e
--- /dev/null
+++ b/media-sound/elisa/elisa-20.04.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KDE_RELEASE_SERVICE="true"
+KFMIN=5.68.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Simple music player by KDE"
+HOMEPAGE="https://community.kde.org/Elisa"
+
+LICENSE="LGPL-3+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="mpris semantic-desktop vlc"
+
+BDEPEND="sys-devel/gettext"
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kfilemetadata-${KFMIN}:5[taglib]
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	mpris? (
+		>=dev-qt/qtdbus-${QTMIN}:5
+		>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	)
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+	vlc? ( media-video/vlc:= )
+	!vlc? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer] )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package mpris KF5DBusAddons)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package vlc LIBVLC)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index ec9c4ba4a860..9497afd31422 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -1,3 +1,3 @@
 DIST exaile-4.0.0.tar.gz 3635774 BLAKE2B 91a5a0a4b8f3c55ec1c8f6487f30bbc8193b1e8b861bbc4bf3cba18dcef91c8a58c937e7a581378eec9da518565826c35e55b7ab157b7ee4634d36cd71a85c4e SHA512 50ab8ec7a65dc431f2bc71a302d21e59ac3d5939b89a90ec161527e1d5c0b80b8c396f8f323b2959e0b807f577e021863fe423bf26a8f7165a6dd112afca6e45
-EBUILD exaile-4.0.0-r1.ebuild 1887 BLAKE2B 4c36fd07e82e075504e1684c1e8e82f97d5a5a6a148d6a79ba018845c7b4252eba654fd921e4887e89264a837e5e79de82ecc2b994ce018b26d8df5711767e28 SHA512 657b04678257dcb8f1cf287ff630ffe20b67fc5a2cf771c265105e3b8abec2ad6422658af4eba03a0954d2952bda1bce98ee12c4728685c3bf1226b687da3489
+EBUILD exaile-4.0.0-r1.ebuild 1880 BLAKE2B 7c2b3908f0947aad72d08e22e4410361ed36c0a1e42c33ee0a2df0699da9d74321098227386625bf5786e907a9027bace5561f090eab36e03dd4dea6a14aa6a7 SHA512 4306843e4c831ea0a6c7b97c0b2fc17362d484128e9c3427c755c576e3905b33535e42247513f3c3f4b74f11812f86875aaf21857dab99f0970d09e467f885d8
 MISC metadata.xml 465 BLAKE2B 1524388af85ca2f4b928ad4670fa8cc2a86a69f51d72c0dc0a755ca22a05ec95587bab11cfa9f10c9f65cd9a4b08c91ec1fb445f69f9163f54b4a86e2fb99746 SHA512 4185b5a40189086940aa0139e953f39d0af627af73ef2c34f77727e7b8ce596f6f69350531cc7b85cbea4968b7b4413f923f9eda61738a8e1c1dee3b85809942
diff --git a/media-sound/exaile/exaile-4.0.0-r1.ebuild b/media-sound/exaile/exaile-4.0.0-r1.ebuild
index 5fefb08686f1..0b906b58ea75 100644
--- a/media-sound/exaile/exaile-4.0.0-r1.ebuild
+++ b/media-sound/exaile/exaile-4.0.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/exaile/exaile.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${PN}-${PV/_/}.tar.gz"
-	KEYWORDS="amd64 ~sparc x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-${PV/_/}"
 fi
 
diff --git a/media-sound/fluid-soundfont/Manifest b/media-sound/fluid-soundfont/Manifest
index d6ecf444b7bd..072cac0fa101 100644
--- a/media-sound/fluid-soundfont/Manifest
+++ b/media-sound/fluid-soundfont/Manifest
@@ -1,4 +1,4 @@
 DIST fluid-soundfont_3.1.tar.gz 134835922 BLAKE2B e280d64e977b290e7b6512b6781631c7e3dd08aa37a8c934243b4569b3b59810640153b03405d5845c76b7c4701ffe9d528a81d8101d9668af0c95df8c0a180e SHA512 014394752ac50d3162c87903d9dd6b38d199ddfab10e2dea3b2a96d02ddcb876a792cc20bc0e83be5ac15eb0c7e261612eedcd792a3f0ff85a7d032a7dd24f29
 DIST timidity.cfg.bz2 10667 BLAKE2B cdcbf9eed076c6ed210f90f7c592a830e53c6d253eb2b13c3aba00b6040aed946af59981707e3e55a0757fb76b30b5ba0676b9cffdc433c58975b38702cd98b2 SHA512 def3ba456c040a010e7e5d22eed1e1674f8b50853c5771085a16eced47e9a8e429b34564218df6a4a16f697eda69365afe51a0d158b0672a66fdf1b0284c50f5
-EBUILD fluid-soundfont-3.1.ebuild 668 BLAKE2B 007743dc91c1b145937894c98cf7547c11e28456d31cc949e998d3a1a8e75847026af9d50cd99caded621bc69b5208123140e11a142c00f2efc1995a0951ba5a SHA512 20f9167c11210abc3173cf7b6fc8d70cab448d542970fd00ebee0c5e4bad9a8cd33d5984ecf1f7db684354c38e2355ed1e7cdc57e530b88caa759958dd1a5949
+EBUILD fluid-soundfont-3.1.ebuild 675 BLAKE2B 604bb758f90e5fa82ce0979c840a14100c8abf1fc4bb1bfa890bbe8b7b1a741f1bd684981fc19037e65eb2c4bcd4a7a6940c9247836613c8b8792826b5a13578 SHA512 28fe61370ebdd0ad29d5773e61657a610d700290977705f0e41242736c9d33d793de56d8137514d163b22e8cb5323d1fa00c8b1a85caeedd4d0fd4c2387c1c08
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild b/media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild
index ab000cfaa15e..a26b6e9316c2 100644
--- a/media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild
+++ b/media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="timidity"
 
 RDEPEND="timidity? ( app-eselect/eselect-timidity )"
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 7a2db22a1ddb..e68f5b31151f 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -3,5 +3,5 @@ DIST gnome-music-3.34.4.tar.xz 1412396 BLAKE2B 44899422b9a16de48b1435f139ff49f96
 DIST gnome-music-3.34.5.tar.xz 1415240 BLAKE2B 3545541171b023da116ebee5d28a2b69b6b45677cde26c833ea0992ba9bc41d4792375dbf3617105da53f0e98d21576e166980e896527a60d47c92690b343a27 SHA512 c4f3c8cd7e8a6d24d3766672acfe3abc340d0cd305ba0d3d0a87c02b5a5f9e8c47bee9d8284e76ad28c51eeebe56e3163f4e5c34c89e294801d0047b8476f80f
 EBUILD gnome-music-3.32.2-r1.ebuild 2010 BLAKE2B b3b123804ae70083bd1196e164edee687a1c3142db14426b60b34417af6a042e86975e3a08f659b92c8683e5dc6f0a3a66dcce804894ec0827748ab1590baca2 SHA512 901c7210a21a1b6702a8513250b83946810e547529536ffceae88cb66e95a29012e058333d75c55c56c01375d8bd940983c2a157e47c3f5f63d75fda3c84f83a
 EBUILD gnome-music-3.34.4.ebuild 2035 BLAKE2B c6fe49d24527a9fb61a3c3e166164a86ec5598a54247275e9e145c1da15c2679bd7ef2f0af6601fab44b793859e719df78536f326f40b725eea9a79a2bb38c58 SHA512 0c7e7a9a847e7c79aba6a50205b9fbf7df8d9d8bb0b7741303765c61684b66def80fdeaf379ce96592819a765ea3e3ba24c09aad1061706cc00fcd075a4b2de6
-EBUILD gnome-music-3.34.5.ebuild 2035 BLAKE2B c6fe49d24527a9fb61a3c3e166164a86ec5598a54247275e9e145c1da15c2679bd7ef2f0af6601fab44b793859e719df78536f326f40b725eea9a79a2bb38c58 SHA512 0c7e7a9a847e7c79aba6a50205b9fbf7df8d9d8bb0b7741303765c61684b66def80fdeaf379ce96592819a765ea3e3ba24c09aad1061706cc00fcd075a4b2de6
+EBUILD gnome-music-3.34.5.ebuild 2033 BLAKE2B f6c46beb2c44f23ce20f49d46ed9783ee8c2f157fc7e067947914e943bbeaa0c4e2233ee7f3f94f76e57b1193a09d8e74efc5987da26c87d1050c6dc07070006 SHA512 7f85851e01d6be1cf7c51893ad1135f8e0ce1760e56c6b7e5ac0a136f091723267110bb70f0dfb16f3618048b97ba6be08e85e5a11b8debfb6d4d8c4c31d7791
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.34.5.ebuild b/media-sound/gnome-music/gnome-music-3.34.5.ebuild
index fde8cf288529..c16a85cdeef5 100644
--- a/media-sound/gnome-music/gnome-music-3.34.5.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.34.5.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.50:2
diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index 631a5f62735d..b1ee399ef750 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-sound-recorder-3.28.2.tar.xz 454216 BLAKE2B 9f9a5a7c0a5a34c2a5ba00ed6d83736a0facb2dd7ffbe86b9c482e7bc50b282f9e20a8800591238e74a45c3c8eb2adf27c66dea59d0551d87c8997b2ef53d24c SHA512 1f4022d96d636391d4973bdc1285286a61a28107b9f875e66b4b2def767b4f2900ba2fe4b92166b1cdb61dc0b5afe65c0f81ffa7304aa38c1f510108dcd8b70f
+DIST gnome-sound-recorder-3.34.0.tar.xz 133808 BLAKE2B 2e8b83eb58776324717fcbeb8e0383ef3370e394f26978b1367bff22eaef3d9143eef65cd5c678bc25a67b32ed8d1c9e838ce63b0e2868f2ddb88805a5c43c5c SHA512 cb28f1f93f78cae5cc98750f937f60abb326065cdbbb1ee48146daceb9e34f03bc9bf4d78b7a149e579654673b9879fb249fd5a370a19764f01961c565b901ee
 EBUILD gnome-sound-recorder-3.28.2.ebuild 1080 BLAKE2B 1a0f4da7e721c2d71a04d9058d479567e4387cd973c0b9bc94987831997a1b5dec408afb563b7aa01cb31f821c7222dce482ab3df4caa7e84035f2005cb95d23 SHA512 b9d90776b7a38e7f6944097a2cda69124da6c82d3eb2a0c0aa537c7360987d5d0314c922f4477affa8549209200c5659154873d391a3733184aa1a255b2172a7
+EBUILD gnome-sound-recorder-3.34.0.ebuild 910 BLAKE2B ce3df51e9fddb710d0aadc855b5fcb8616f533b3d5d09c0279c70e306dce3314f874cf1b62588b7dafec0c3720aba3eb9e90ac47ecf156d4b1cec8572f5633f3 SHA512 dfe6bcb55c39c6af5f42c88eb0989899b1df6d61d7357635f80d75d5eabe54669efa5d1312f41d72553cca37c0ad0cd442bab7ac835643b9da397fb2b0cc68fd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.34.0.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.34.0.ebuild
new file mode 100644
index 000000000000..4ada7e52cb73
--- /dev/null
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.34.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Simple sound recorder"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/gjs-1.50
+	>=dev-libs/glib-2.46:2
+	>=x11-libs/gtk+-3.12:3[introspection]
+	>=dev-libs/gobject-introspection-1.31.6
+	x11-libs/gdk-pixbuf:2[introspection]
+"
+RDEPEND="${DEPEND}
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection,ogg]
+	media-libs/gst-plugins-bad:1.0
+	media-libs/gst-plugins-good:1.0
+	media-plugins/gst-plugins-flac:1.0
+	media-plugins/gst-plugins-pulse:1.0
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/gtklick/Manifest b/media-sound/gtklick/Manifest
deleted file mode 100644
index 6e7a8de9e414..000000000000
--- a/media-sound/gtklick/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gtklick 787 BLAKE2B 6442edd7fe2249447950e03b4abfa912a0841d58aa9bd43a16fdaf52bfa735925caff404db477c40f99b27f4085ba1324d97316ea1f0fe02cdf0a5cce68dac1d SHA512 3ba1e5e9507eb6827dd7649e00da69539537934714b8a3833c8fae21abd0d0d7793a0207f4ebf1f65cb6e111cb7e344b97d5cf397cf038364cffe2ee6be39d6a
-DIST gtklick-0.6.4.tar.gz 35901 BLAKE2B 1dd0adcb5c0489633a00ec52230b0a3b7c0017ce5148c5d8a32cf09326243f61e26cf31e3f25c8213af9a77a4a4bc9b74bfd7167808c9037549cb10b20701b99 SHA512 8491650cf324005f32808036f63574b0a59659bc8e5f3efe615b83e42701f1a3bcb95825a2378b3a17b45ddb5b33c87bed9602a0492d117665d85bd35f4a4a9b
-EBUILD gtklick-0.6.4-r1.ebuild 871 BLAKE2B 5928694401c5df24315312095ba83ba7de705a178d1b14f20d03c2457b80738e644fa326d759dd0fe82b3bc3267738d3adc824385bfc98f1e11d76712552bad4 SHA512 ea76fd58f103ddf2c8cb0f5051761e6fc495e9553b2f71b40fab7888b234851dceec114290b842db6c80088ec9beec94b1a4249302f9537a34a1dcdfd7124661
-MISC metadata.xml 443 BLAKE2B 6674b5c036cda85de93e6ad5718105445bfb79209d0d9e84516381349ca4798e14fa4b913b89916b14550d75f0b8b82a4f396d22673659a4c3eb50e9019f9d1b SHA512 2bc8fd482c0035ca55233825c9312c36d8172d9f8a230140d84ea2813cc0f78eadaaac6d62f3647d74aac661e8ad7875544c7bdb5629140bd36fbff1ca9c4344
diff --git a/media-sound/gtklick/files/gtklick b/media-sound/gtklick/files/gtklick
deleted file mode 100644
index 6a999edc0719..000000000000
--- a/media-sound/gtklick/files/gtklick
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
-#
-# gtklick
-#
-# This is a replacement for the broken runner script provided by the
-# original source. This script does not assume that the data is in some
-# folder relative to the script, but instead hardcodes the variables
-# during compiling.
-#
-# Copyright (C) 2008-2010  Dominic Sacré  <dominic.sacre@gmx.de>
-# Copyright (C) 2013  Karl Lindén  <karl.j.linden@gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-from gtklick.gtklick import GTKlick
-import sys
-
-app = GTKlick(sys.argv[1:], "@sharedir@", "@localedir@")
-app.run()
diff --git a/media-sound/gtklick/gtklick-0.6.4-r1.ebuild b/media-sound/gtklick/gtklick-0.6.4-r1.ebuild
deleted file mode 100644
index cf89a50cad7f..000000000000
--- a/media-sound/gtklick/gtklick-0.6.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="A simple metronome with an easy-to-use GTK interface"
-HOMEPAGE="http://das.nasophon.de/gtklick/"
-SRC_URI="http://das.nasophon.de/download/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
-	media-libs/pyliblo[${PYTHON_USEDEP}]
-	media-sound/klick[osc]
-	${PYTHON_DEPS}"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	distutils-r1_src_install
-
-	# Replace the broken default runner script with a working one.
-	sed \
-		-e "s|[@]sharedir[@]|${EPREFIX}/usr/share/${PN}|g" \
-		-e "s|[@]localedir[@]|${EPREFIX}/usr/share/locale|g" \
-		"${FILESDIR}"/${PN} > "${T}"/${PN} || die
-	python_replicate_script "${T}"/${PN}
-}
diff --git a/media-sound/gtklick/metadata.xml b/media-sound/gtklick/metadata.xml
deleted file mode 100644
index c0aa4bcd7bf7..000000000000
--- a/media-sound/gtklick/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="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>
-	<upstream>
-		<remote-id type="github">dsacre/gtklick</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 1deef4156da7..cebf49508185 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,5 +1,5 @@
 DIST lollypop-1.1.4.16.tar.xz 455312 BLAKE2B 358fae45a4332c10ba59d65d09ae51f28fb7fc026e137289c47951536753796e0b7efa9f3713bccde68e6260f79b1132eb00357be8c53fba04f3c827e97851cf SHA512 08b8ec7c1fbe5f1b8f95f95677012eeb9bd83951ee320470a0da852e0a446818e48ede7de045f6d7b98dff8be139fa69d780dbf03e65904c773f8ec1493f9915
-DIST lollypop-1.2.33.tar.xz 509636 BLAKE2B 850f24e14cd574710f0712389a1db96380eb1058fbb76e0353d9f6aa66978754bd30e4584fd3f50724909796247ec894c8f0c0b1cb1476ed0935596a0edcefe6 SHA512 f5e77e7427f1ef4db05f8ffc1f0f2fd3c412ea22b433a7b0a9de7e0159b0172012478dfb2cd1a39df27c07bcd1dd55fdb14a430d9cf8b04aa77ff7befc92c95b
+DIST lollypop-1.2.35.tar.xz 509916 BLAKE2B 8cf9ea74287b6ac7d4942c2312cc4d6e07d4748d505cc9e45a896129f9e4a43ef5c65c0c18764597d7ce3c4d2fc93804c501f68ea3b67625e200497613077af6 SHA512 179fa5e77482db35de9e30e392e6d07bb5c832d5d1decaee06982570bdcbb809dc99375eeb6fe3dce75829af3570953ce517e3b4eaabceac807b9d5c382bd53e
 EBUILD lollypop-1.1.4.16.ebuild 1405 BLAKE2B e0916a5cb5c30307ad7ca43117d626bc75d619efa9d0589f601d02a5289b4e3c192445c5c039f4a4964ba3a7336461749763fcb894d39af79e81ba271b0f248b SHA512 1bd607bf528289ec104ca40940259ae1b90cde149db8bd4732fdc8b736b597f0c827c2c8dfa4881dd1ce40378a205a500b105897c5ca0ac4c0185d704f1d5389
-EBUILD lollypop-1.2.33.ebuild 1532 BLAKE2B e507220017bbf63ed978b6f7f4725f3867f2d8e5a7ac8e2104e489b2b3a563aeafdb5fb89edd16e1cafd4d2fc3afdf7b1a9e26e5613e6f666c90ba4543e9c2a5 SHA512 9a2785cd94b10b005c7238431a0ae56d305dde1dfda27c98c56c3d676d97ef21678cba3bc41888f8bc29d1a9b0316f6a4d4d7a624bf854b493f5dd42b7f5d5d8
+EBUILD lollypop-1.2.35.ebuild 1532 BLAKE2B e507220017bbf63ed978b6f7f4725f3867f2d8e5a7ac8e2104e489b2b3a563aeafdb5fb89edd16e1cafd4d2fc3afdf7b1a9e26e5613e6f666c90ba4543e9c2a5 SHA512 9a2785cd94b10b005c7238431a0ae56d305dde1dfda27c98c56c3d676d97ef21678cba3bc41888f8bc29d1a9b0316f6a4d4d7a624bf854b493f5dd42b7f5d5d8
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.2.33.ebuild b/media-sound/lollypop/lollypop-1.2.35.ebuild
index 06db306eb32f..06db306eb32f 100644
--- a/media-sound/lollypop/lollypop-1.2.33.ebuild
+++ b/media-sound/lollypop/lollypop-1.2.35.ebuild
diff --git a/media-sound/mp3gain/Manifest b/media-sound/mp3gain/Manifest
index d9f57c502a2a..057a491ee290 100644
--- a/media-sound/mp3gain/Manifest
+++ b/media-sound/mp3gain/Manifest
@@ -1,4 +1,4 @@
 AUX mp3gain-1.6.1-CVE-2017-12911.patch 2804 BLAKE2B 71d410abe4196cb47d4f006af7d8fd73a0308280ce57aaa955434c9f7b1bb8bf3363eb1ad8dbe0da3b5dd79e4ac5a355b796cdc253608c5bf2ba7c03527c3b32 SHA512 b5b093f18160cd4205870952d8f092c300f66d6fa025ac09114f55b1e5b37af6ab8ea1b505e33446f6c7153a5ffad04c001b67f9a069db8d3418c6fae3e73002
 DIST mp3gain-1_6_1-src.zip 68932 BLAKE2B 8c1ed35123f1613e189ec7bd74ee9f6176404a1b79c660f8f1a6df461cdfd3c6bb505daa09b8cc4756e1755d0923fe473a45c3ae171fcf35df22daaa08a7717a SHA512 6d26a7716a1901c80caff9d7fb03a454a452c06c6a57a7a921d5979727e112ba139690d8a287dde7a6e5a09b022d3c6f57193b4756a9c25caa177cef65f9e375
-EBUILD mp3gain-1.6.1.ebuild 671 BLAKE2B 8e0c4e258c8ac8d7adb48fd90826f59aa32608a5c33ac15886bf04e5ab38060784506c25024c830a516ba694ede297af67d0cfebb6b954a36d8537c172840ac0 SHA512 af75e640b70ef576bd1196f0bf7621cea4071455dd33416e9230140c60243aa831babb13d3be447dd96fe90dc94ec231cce8716d035a6e02122511e6f0b9450c
+EBUILD mp3gain-1.6.1.ebuild 672 BLAKE2B f4bc25038d8ffde1df40f0a08b602f2c05e88870b6495cf83022acc273736ec19f1ca76e5451e07ffc1d1ed657fc6d92700d56eb5c92dfe60d5690d6c7284c22 SHA512 770d05807d4529c126a9b113dd95cf4b04abd8a5d0d3e8a9f3fe8a4d5a4f5c9ea96366eb293f8070a856694b3d6c1771d4273addc213e55f5616f6c63e7ea443
 MISC metadata.xml 452 BLAKE2B c0b22d81f8e91934b834281f256b67e4e61a86fe9cfee08ace713baa8ff28221393594e9199aa631889c2b7e25b50bc108876b3f991ea7bef7575e486d5b206a SHA512 8ab00c2369fea3ed2ae75f5d04939ac81f4f227236215556157c3616ce1d72636c94af0988f06c995a08dd95c3774635c5d954e6992a077c20c7472be907a119
diff --git a/media-sound/mp3gain/mp3gain-1.6.1.ebuild b/media-sound/mp3gain/mp3gain-1.6.1.ebuild
index 2882bf052219..11c40690473f 100644
--- a/media-sound/mp3gain/mp3gain-1.6.1.ebuild
+++ b/media-sound/mp3gain/mp3gain-1.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/mp3splt-gtk/Manifest b/media-sound/mp3splt-gtk/Manifest
index 3423aa86f4b0..ca7ebfd70770 100644
--- a/media-sound/mp3splt-gtk/Manifest
+++ b/media-sound/mp3splt-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST mp3splt-gtk-0.9.2.tar.gz 1070580 BLAKE2B b49a246eeb03d11ec8d4c8968323c62e200439af5d2cb52321442365615b20444908f4c33e6bddeec4051fc320f303b98a1d341bc834ec768bc4d803d2fb5be8 SHA512 e837cbc0759cd6535fc466099a170d066ab72b4854f8546f524261fe660887f5d2add60d9fa1e19d68d811004c682a324b5bcba86aa8cb89ae1ad2bc2f9b1d9d
-EBUILD mp3splt-gtk-0.9.2-r1.ebuild 930 BLAKE2B 3086bf682804c6d753bcf37947f4ed35203ff6059dc133560279ee1b430145e6329c65303fe29e687a8da11467cc743f6da31e4e830b3718dd62307f7019b232 SHA512 21f1e13f2db7580dacc15700a12d80f04f47b49be5eba538077be671e1bbcb469f625d0284a27469d3954ee3730fe2355b5c1d96fbdea19c461ff0bb7933a803
+EBUILD mp3splt-gtk-0.9.2-r1.ebuild 931 BLAKE2B bdc420f10381a12566c1d57d3f2008432823ac753865b35558b787773a3044add747b8cdfc0356368368d2a3f2d8377a81979bfcf6a5b95954c455182ecf9159 SHA512 5865f27686cb54a4eb2b3e435af561213d733b23d55fb224d17ed8cd680eecbf59c2e01dc54645e3e80c500c1e69474b23d85584b9a5ec8c88acfe2280aaaf1a
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild
index d0f02f52dc94..edd740e08563 100644
--- a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild
+++ b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mp3splt/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="doc gstreamer nls"
 
 RDEPEND="
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index b6b23a861d38..1f39d2f77668 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -4,7 +4,9 @@ AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57
 DIST mpd-0.21.20.tar.xz 676396 BLAKE2B e87d844ac0b20f10df7d2306d1c76f76ead84f5e61acb51f60d62847b1fb4f2ada66b20e0a36d87eaf70289027139e4beb80ea8ef7637b1cdb656c9635adb720 SHA512 9dd49190ba4c85014d24e88cdb02a4649e8fb687a49fc9ea019f23725eda483980008e9abebf0ad3960bd310b693c56999699d7c7ddee3ca18e9b2aa6d5a2176
 DIST mpd-0.21.21.tar.xz 676668 BLAKE2B 83964784db4a7372344853ebf2e9c966e23ac293c06304a8aa6f927ec8ea38d2749d88670f1c5e380953bb8b777b4b0f2c5e8a98d7eb3cf1bae50b5e11549150 SHA512 1780a24f341dec1cbc3d9170cc2fc8249081cac8f677ff17df15fc959787cf43d30696eefba9b8a44824da14eee3d58e2ee78b34db1335c0a182b4c2a89e6b3a
 DIST mpd-0.21.22.tar.xz 679244 BLAKE2B d2d76662d1f249b138d3a173cdf712eafcebf91e819b70f2cbc6ccb36ca4bc1f2319972548445789d8861345af5e18ea82f071cd7874a7380bbdda85cf834b73 SHA512 051d97500d8224fe4769a667a58c7915eebcca809e9345a30881f99d7c33d99907d9cc0258c0a5fd20f10609edbeb6da16941099ac3c033762ceb4b116e4df04
+DIST mpd-0.21.23.tar.xz 680060 BLAKE2B 5c7b4a69ff5960b171d715560aa7a6b0712a7fd3758e1561e5aea957c5d13164d92bee0ed262b70ea7e91d73c16412840078603c95d50959cc06d9aa4a981022 SHA512 155f606cd6ddce3e74d745a0f1479776d9f73b4cd250604072a863e28ea72d1ff1a7eafeae44cada7b16042251065634376eaa1a211b503e2f874c72dbcdecf0
 EBUILD mpd-0.21.20.ebuild 8056 BLAKE2B 48fff6cdcc18bc6ec1d2c5d95581e523857a632ff447b2e422c6acab8917af45f698d1e3b2b78456076dee6b56f48588f7dd1971a105219ea6938f366abdba24 SHA512 b90a1e4f7d4bc85223ce338699d423ccf46a94f9b1d3172e6d8379ee218b6858fe9cf8f31325d4580093c21bfee7873d1888ff50e54975d14e1a7555d3659aea
 EBUILD mpd-0.21.21.ebuild 8058 BLAKE2B bcd02da8d2815f0226b0a12af2ecf059e6b19633110234ab6c86c4149f3a3a3bfb709eb839ce6ec96f210032e78be7e9bfdef9285d2381281df1d982886535a1 SHA512 98088d506f8943ac1722a26773929193432b7d1e3aa5a02cf0c459065dab2dc4b0fc9e14e8a03caf7b5bf06bece5e3cbe2660200bc6d52228b4ea8980b30ed25
 EBUILD mpd-0.21.22.ebuild 8058 BLAKE2B bcd02da8d2815f0226b0a12af2ecf059e6b19633110234ab6c86c4149f3a3a3bfb709eb839ce6ec96f210032e78be7e9bfdef9285d2381281df1d982886535a1 SHA512 98088d506f8943ac1722a26773929193432b7d1e3aa5a02cf0c459065dab2dc4b0fc9e14e8a03caf7b5bf06bece5e3cbe2660200bc6d52228b4ea8980b30ed25
+EBUILD mpd-0.21.23.ebuild 8058 BLAKE2B bcd02da8d2815f0226b0a12af2ecf059e6b19633110234ab6c86c4149f3a3a3bfb709eb839ce6ec96f210032e78be7e9bfdef9285d2381281df1d982886535a1 SHA512 98088d506f8943ac1722a26773929193432b7d1e3aa5a02cf0c459065dab2dc4b0fc9e14e8a03caf7b5bf06bece5e3cbe2660200bc6d52228b4ea8980b30ed25
 MISC metadata.xml 2473 BLAKE2B da637e3495141e79aec3a6a1d676c6d98440482e00c57b48efdd9d8a93185d7d093cd2544a2a31beb552ac31f3ea4be897a036b640d630a02f297bde6e2a9f29 SHA512 e7afe6339926473e212cdd9a5be5f4e72c47e78b7ed9839621a09b331c40b4a21312ba4f8fe4154c4cd88908d005af4f3eca17cd6407ea8d10e294775d19299d
diff --git a/media-sound/mpd/mpd-0.21.23.ebuild b/media-sound/mpd/mpd-0.21.23.ebuild
new file mode 100644
index 000000000000..731ab04c695d
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.23.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd xdg-utils
+
+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 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
+	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
+	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="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="
+	acct-user/mpd
+	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 )
+	tidal? ( dev-libs/yajl
+		net-misc/curl )
+	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() {
+	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)
+		-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+=(
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=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() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/mpdscribble/Manifest b/media-sound/mpdscribble/Manifest
index 21adcee837a3..35009b547ce8 100644
--- a/media-sound/mpdscribble/Manifest
+++ b/media-sound/mpdscribble/Manifest
@@ -1,5 +1,5 @@
 AUX mpdscribble.rc 475 BLAKE2B f57a87b042cd60d87119ea396bd84bdf846a04fcfadff69b6bfa6700cd177dd95cb5e7c753fc51eb4916410a64e20d42dff1a9e0b5024f2ad1d1d7e3ed3751f9 SHA512 b82d3e5678aba145a5c8d172ebf74960d164e3e934426cc755948d795743bb07158f502705d40c1730a40b6a6d73e84c5792419adaf6ab83ec7c33756f0abb43
 DIST mpdscribble-0.22.tar.bz2 116981 BLAKE2B 13b15ca9e49faa3e5d254bc2864de4a0c409d8767db586def3a7bee415c67f84ddffbd7fce6093afe4aba5d5e66db8182aed52d9a141bebf4094a400f2ababe3 SHA512 bedd93392a4d5a0609dcaf7aefeeff3851f3084da8c34a4fc1f8fde51c2ba10b8370ac52cc8d55f0c9a96fffed975827a0935087c2c51880b7bfef8d79182dc8
-EBUILD mpdscribble-0.22.ebuild 716 BLAKE2B b658f75d4fb18afa68cb63eda76dc5f4ec9fdfdc65583719c39ba7d8db9fc27af043a58048e48bb6c079791a08169af401d537b0f0c99272b8ae747ad68b1325 SHA512 8884c7a2393f83788331e01f4bf6ed7933146872ff581c99d7219ac874a9f5866c7c5e1ab8f855e0b47d71ca7faab170ef73113aa0ed384b4189e7e02e9c2f64
+EBUILD mpdscribble-0.22.ebuild 707 BLAKE2B 2ce67900b9bde1e81839e257cf3365f934873177b9675113915f6c46e68b6de006e703e37930162ef07558f46a0213ad1d06ecf038dd0546788388ac51ca0aaf SHA512 e2aaf1b1bb18bb8a0311b3e34379669666606fc2af58b2eaec6098dc88b2cb9a6f25a5c0db3ec01d83a68e041853a2c6963e01b1466e15400c188d604c27e131
 EBUILD mpdscribble-9999.ebuild 764 BLAKE2B e35259c4ac7ee6500a43f2d64139c5b36577b29703b2abd28ef52a2a1d8ce71c46b928edad256f3ab2fdebc877c136e9b41bd66b9e9d703e68704e3460e8119f SHA512 642d0f4699710df0da80f7bb65f86618e3c598002080277c829a2bfe5695bac82842b3ec0909c8c9f5ba3013fcaee40aece4e26a43d22600d63eb32cd449d1a1
 MISC metadata.xml 783 BLAKE2B 8c5f5cfa0903908465f562d6379f046287cac7d72f95c314c467c5e5bf67fdf452fe2e4d77292e4c1df9461dccddd3276818087a321afe42e43a0b89aff55149 SHA512 e6ec23af50371a4e1e1b8ef904ea89a71c5ad2fd52b96bf23a1b9c1625fcddc72cf2c398a908cb7a6f07649630b2dc5ccc8fa8aaa57fcbb6d395ef270f478a44
diff --git a/media-sound/mpdscribble/mpdscribble-0.22.ebuild b/media-sound/mpdscribble/mpdscribble-0.22.ebuild
index 21a952be25b2..29b2c66fd7d6 100644
--- a/media-sound/mpdscribble/mpdscribble-0.22.ebuild
+++ b/media-sound/mpdscribble/mpdscribble-0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+curl"
 
 RDEPEND="dev-libs/glib:2
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 2614d5ef61b0..a23cf9e453be 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,6 +1,6 @@
 DIST ncmpcpp-0.7.7.tar.bz2 443801 BLAKE2B b0bf1f6264f94fc1d0dce5b7ec8d85607427e5bf8955914fddffd8dec94850e6dd20dd83a966a25353d6ec23a61e92751d83fddec8202d9a843e0ed9e3b32077 SHA512 a0bbe85f154c40513d41e85810de86ed21109b72fb0f2bdb0b78dcbddb3770aff5422b5bb7fbac2b76634c5b9aaf843bed5fc16fc672fcd71bbae911f65c0034
 DIST ncmpcpp-0.8.2.tar.bz2 465713 BLAKE2B 0d07477b3473e1ac7362175cef4bfb085ebdb4c8b1e77f7bb68d8bf4c645fdcccd067d12e2080a740ade18c57dd055f270d2e50096f0ad3afaa40175e19259cf SHA512 9384edd162f40af23e4f26f437356520f117e4e2ab513ed3de132d2f11e597082d1cb7f0dd3696660d0c9bb85ad03e31fb921c97a11c7b28b32c5907fdbb8e8f
-EBUILD ncmpcpp-0.7.7.ebuild 1450 BLAKE2B 45829e75e7e25ba59a1661a4bfe71c5f97ee08030e30de5a51cbbd999a9efe3f928e343e5178f07ac43a7cab74648608050c9bd3fe34d4ddfbd11da24499e947 SHA512 5f1426092301d579c44881cd09ea0a1d41d6f194627cafef2d411c5b1baf41530f140599d741b3d642e9c4344310f9216d110540ebda9c009c8ef434418c43aa
-EBUILD ncmpcpp-0.8.2-r1.ebuild 1379 BLAKE2B 8e5907d0ae467b3d64fe5c9266487d1fb9296bb7a9a62bf34ac00309a51c7dbaf927cce2e00a7490fb8fec03d81723e95452c8fb15c48509135abaa643e35d08 SHA512 53e607419c55667499124e66389b8c8e436290e23118bd175a3e5d73db6a2891bf360e11219eff862a0e0cc53f35d98eab2da4a7d40561b432d5fa80347ed730
+EBUILD ncmpcpp-0.7.7.ebuild 1446 BLAKE2B 64c094cc6dd32e8a3f3891930167b6350a128ef90ed84bae6aa74eabb160406f76022f8461c6d9f40489da7deb786eb175ce444016dbd55daf12779b8630e231 SHA512 75ba9a04434ac5fa5f477d6d7f905e9350f48cc1aa9543a6085677200dec0b319d078896e18407a8e76c9af1f92db7a81cb760391a76470a5781b0ed285aec56
+EBUILD ncmpcpp-0.8.2-r1.ebuild 1374 BLAKE2B d9dd250d0b1e9cd0fbdabb08a483b6a429e8415d0e46a567109f35745715a33e2ba1b614a5a67f8128d25e825a03f48e4538c9d0ff54300b6f865f0f6baebc37 SHA512 66cec70e2d9a8e8868f6f1d02cf31afa76e4b983b13c3a7a604dbc27e8d8f1e4006a941ea7c849e982c5c8eea5e52e2a866ebb75175c2655b1453faf3b195870
 EBUILD ncmpcpp-9999.ebuild 1357 BLAKE2B 3215c3e2f2dee61ffbfd6c8ef01f534593f2701b50b4d2beec557532626923b5cf9d68ea7205afede9fca1e51d445919510845b3d66d8b7ff2ffb47e970e9bba SHA512 d388f8371a7e4afdfb2130ff5f6405c86896391a609545b76d6dcbe0a9006aeced45a6c15012aab49efe1f8e4150d99aed85e43977e704f282e1364c03f20f00
 MISC metadata.xml 1175 BLAKE2B 2a7f404c5db97a726429add8dc33d3ec1d0032e1a57291bebe3c79d76d9cfaca2eeb1e6e3b83b6ce8ffcdf94442cd32fe5079f2f19d70a05cc12da66caf96316 SHA512 9584bdbc4c3def081acc02f78bb64d28fb795db2b7766bb842709613124f5548c0c4b0ed02865d459e1ce45158d59137220a341e29f51db31c6cdf1c91bc776d
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
index ec608f309a9d..6ca6ada7832f 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
 IUSE="clock curl outputs taglib visualizer"
 
 RDEPEND="
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
index 9731b864cd96..55b91f7c614f 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="https://rybczak.net/ncmpcpp/stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="clock outputs taglib visualizer"
 
 RDEPEND="
diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest
index 4907ba636dbe..5bdd4b8936f1 100644
--- a/media-sound/openmpt123/Manifest
+++ b/media-sound/openmpt123/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.4.11+release.autotools.tar.gz 1471760 BLAKE2B fa6fd53974e235c9efb01dd7498067be9eb90a06906785d05257557c4c7faafbd0136f63e46f76638b46362cad02849fee45a21ed1c65603134c387d1c064d12 SHA512 d720a0c04984f624f7ecd1ee8648045cd09ced2cc8b1cf3546404b9e73b2781493076391c1881e0d0eee72cf829a38365313efb9852448cd1cfe5f7b7f535e99
-EBUILD openmpt123-0.4.11.ebuild 1722 BLAKE2B 1a46c7b124b4f082126240ca40cad681da9cbe6efaa75f2bef54b11d1f00efe759451ad4d15c28a6557e53c21dc395bc339084fff989d8e3c850f1a2e7fdba52 SHA512 524a929b41feb0b335bf57774d4b42a28badd6a8dc13e9334265e7131d72be05935e60107d83545fe396d965617abc36b79496fb1ca5f4d19fd7daa80f4e108b
+DIST libopenmpt-0.4.12+release.autotools.tar.gz 1472183 BLAKE2B ef3a2e04289a767e911c1d1aca9f973418be103b5aa62517cbc2a3900d2c5e3f175a885a13d85d29b1fd87af3df17b93900a6faa4ad38507b8aabf8897ab1203 SHA512 ed3d992712d6f3ecf019491311af72842c80703542a67f4e5a8bd5196156ef0941412d44f6887f3eefcf04094408704a23ba86cf12b05943bde4007eced9c63a
+EBUILD openmpt123-0.4.12.ebuild 1722 BLAKE2B 40fc9e664030922463ecb3a899ff83e5f4a338ca698e6c191ccbbd81cbc956aaada491052ae57364b3d0b04d772be8937c13ccee57b753843049ce8f4d59b289 SHA512 7e128e38f365cb8077bfe6ce661b59839e2ddfd69312d95dae8a0a8006e930bb7dcce9e263372484d7b6cd5031aab635b19c4e71bc401a3d3c4ecfc1de16a8b3
 MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297
diff --git a/media-sound/openmpt123/openmpt123-0.4.11.ebuild b/media-sound/openmpt123/openmpt123-0.4.12.ebuild
index e7c6d6f4b4b7..f015fab023a7 100644
--- a/media-sound/openmpt123/openmpt123-0.4.11.ebuild
+++ b/media-sound/openmpt123/openmpt123-0.4.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-sound/pithos/Manifest b/media-sound/pithos/Manifest
index 73c501af1b8c..474ef80a3793 100644
--- a/media-sound/pithos/Manifest
+++ b/media-sound/pithos/Manifest
@@ -2,4 +2,4 @@ AUX pithos-1.3.1-dont-try-to-update-icon-cache.patch 584 BLAKE2B 9127f728cd0da41
 DIST pithos-1.3.1.tar.gz 119658 BLAKE2B 0d6e1c4e48a4beb1082f8788d4e016371660667dbe32ee925aa4b904f60a25e6664a94cefbc62dd9323a6e69338c03fc4080517e842102fd6eeca144f568c984 SHA512 c06715516992e4aa8bb3b200035ee10ef8dcec9491d32af0fb3f4e176d0ad5313a437f228747d5d716a29d2fe5b93ddd3704aa4fe674ce3be5a17eaad13b0da4
 EBUILD pithos-1.3.1.ebuild 2028 BLAKE2B 983a55b505b4e58e32f99eefd1fb4fe34496e15591bc7280ca2f43e6384ebcb4be54c8d3d1dfe0879f0099b35f8406dc33d1febcc136bf4fd4edeb3cbce258d6 SHA512 0129b8ed80200daab5d416e62bafc06e982dc8d33623cd4d30645817cbc7cdc3a2b46d6595ad15ccb96056d8463bf55446890c72c60e019630cba84d15b0eb4c
 EBUILD pithos-9999.ebuild 2023 BLAKE2B e1118278c43d6b560320e480fd022f5c3f54545064bcdc956f12e8af06b1466415bcd4d07799d992488f642c94b9f1976cdeb6eaaa3cea49272f19ed3129476b SHA512 531975652ccd1c80e44ed7ba4b34cfa4a03944baad2048493dfe035a13afc7de7de26231008cba1fc53c20d534f5cd5e8ef202553ca12d3a2fd87ee93011c2e9
-MISC metadata.xml 517 BLAKE2B 4d18a3f149c2ffc3b87206cd67a7d87978f36c9f45f6a99c3240e77458c3c2bee1ee9eb7cc64e22414eded3f44ba5da5cf8a680b16975759b0027e90fcd6e5bd SHA512 1922b0145e076b849061072c03eafe7354bf79ab32d7f2a5bab219db6a9caa92074423c5bf1196b91ff1e183bd8fab2fcbad583f20b02b9916c3e73140a97367
+MISC metadata.xml 418 BLAKE2B a438f3fc8d1df9e7dcdd099f5fce71bdf2423b5f030ef7c73c747cdc88a9de543321a825c1c4674ce3fe5659b71ee643c3e561d7237de2e290dafd6ac4583bef SHA512 2a0e965854663d1ae76b17729ced051a6571016e989fbf1605f41ddbac699e99e51a03dca7b171d829635725f920bfc13c5885110d3694878a425660201ff651
diff --git a/media-sound/pithos/metadata.xml b/media-sound/pithos/metadata.xml
index d1915fe5a788..cb3285681700 100644
--- a/media-sound/pithos/metadata.xml
+++ b/media-sound/pithos/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Patrick McLean</name>
 	</maintainer>
 	<use>
-		<flag name="appindicator">Enable usage of appindicator to export menu options in to unity</flag>
 		<flag name="keybinder">Use keybinder to enable global key bindings</flag>
 	</use>
 	<upstream>
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 135f939f9b15..5ccbb72d9812 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,6 +1,4 @@
-DIST pulseeffects-4.7.1.tar.gz 1995518 BLAKE2B 81a0e53875278c5264cc306b81d299b0d016f806f7f142fddceb8aef8798b4f64163f05d72f44ae147195b871b59ed9dce52bba8b98597362e9f154336daff7a SHA512 19a84986ff49d832147697ed81e793f6f7b22600b4b928cf9efe7db0ed455181547d21b3216d47e4d0ae495ef420ce8392cbef0d1edef0d9d5130a1ad2d89c8f
 DIST pulseeffects-4.7.2.tar.gz 1998420 BLAKE2B 6ac9d4b416ffac73f874fafcfd07b990ead7a2645832fd35eae23b3c9e9acb8663718b9cbb5fd0c1066c1f75272d0473257e711602d2646742785fe2c6ca5ea9 SHA512 f235504ca6edddf7a18f2c909ba58578a3d70e6fdab5ad0882f831c9d148f4fd35d0e55617305d787feefdba7a7544e1a72dac3dbc0e03bb9183e0937cdeaef2
-EBUILD pulseeffects-4.7.1.ebuild 1857 BLAKE2B 271656e30d1a20cee60afb5668bb8219db529a6a3ac2892bba566c17001fecce23390ffd85b6586b166a865a274a2066662a7ef385b8ae3d9cc6ce94dadacdae SHA512 4df711ddadacd9a4e35a0c6543e705b2b0fa516efc11d3ac2569ca45fe1c39538f7f4d5425b8a19969b20d95bea248d91cdc16f4413eee3db2724632d14434df
-EBUILD pulseeffects-4.7.2.ebuild 1859 BLAKE2B 7f39b2cdbd52af31357a17ffe3743b60156ddcec2638ce7d298148a14f464238d485eb0fca2aba2171e02c21fd4c6c09ea69acc0104d4779cc912fc0638c6ebc SHA512 d341a24bce7fff28e53cc58132bf10a15bf48e396bd43d0b9bf4fbd8f01b3f8dbd1a5a98ba04bfdafdaa9dd00ef6416b125851acdf2116d8b44db19abb329b12
+EBUILD pulseeffects-4.7.2.ebuild 1857 BLAKE2B 271656e30d1a20cee60afb5668bb8219db529a6a3ac2892bba566c17001fecce23390ffd85b6586b166a865a274a2066662a7ef385b8ae3d9cc6ce94dadacdae SHA512 4df711ddadacd9a4e35a0c6543e705b2b0fa516efc11d3ac2569ca45fe1c39538f7f4d5425b8a19969b20d95bea248d91cdc16f4413eee3db2724632d14434df
 EBUILD pulseeffects-9999.ebuild 1859 BLAKE2B 7f39b2cdbd52af31357a17ffe3743b60156ddcec2638ce7d298148a14f464238d485eb0fca2aba2171e02c21fd4c6c09ea69acc0104d4779cc912fc0638c6ebc SHA512 d341a24bce7fff28e53cc58132bf10a15bf48e396bd43d0b9bf4fbd8f01b3f8dbd1a5a98ba04bfdafdaa9dd00ef6416b125851acdf2116d8b44db19abb329b12
 MISC metadata.xml 1017 BLAKE2B 82b1cecefd2a2bd6016097e750f8806f6be9e3380b2091aeb1121c250108b974ff3df38494f7136af05c3463eb78acad2a273e0abce431f92c63aca981031d84 SHA512 7f45f2f28593397f78d9b08363fc8757e6e0cae075dc7a1c80eb546666f479b1fc20d20e440937305c87a2d02a081da9ad19403f02114d5f282e65ddc38bc66d
diff --git a/media-sound/pulseeffects/pulseeffects-4.7.1.ebuild b/media-sound/pulseeffects/pulseeffects-4.7.1.ebuild
deleted file mode 100644
index 867b66803cf3..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.7.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
-else
-	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf mda-lv2 rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41:=
-	>=dev-cpp/glibmm-2.56.0
-	>=dev-cpp/gtkmm-3.20:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.18:3
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/lsp-plugins-1.1.7[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	rubberband? ( media-libs/rubberband )
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	media-sound/pulseaudio
-	sys-apps/dbus"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
-	${RDEPEND}
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-BDEPEND="
-	>=sys-devel/gcc-7.3.0
-	dev-util/itstool
-	media-libs/libsamplerate
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-4.7.2.ebuild b/media-sound/pulseeffects/pulseeffects-4.7.2.ebuild
index e883396899bb..867b66803cf3 100644
--- a/media-sound/pulseeffects/pulseeffects-4.7.2.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.7.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
 else
 	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/pulsemixer/Manifest b/media-sound/pulsemixer/Manifest
index c5b5c647e35c..a9ce68c58ea5 100644
--- a/media-sound/pulsemixer/Manifest
+++ b/media-sound/pulsemixer/Manifest
@@ -1,4 +1,6 @@
 DIST pulsemixer-1.5.0.tar.gz 21557 BLAKE2B 4c6cb9a3f9701301223c259532a0803a5c3e5f3abbce6f2763b6fd987f85aba56549e66861e9b69d0bf89c116c6c7e221d11cc65eb9a531402f74e8d63e9d824 SHA512 e07556a0cf2c9f660764977158cf1e338f7d8a92eae639c4a8f355847840e3aa9fb65adf553dbde905b64f2eff57c630bbfe19cfd5420b6205b1e2f688a6de64
+DIST pulsemixer-1.5.1.tar.gz 21789 BLAKE2B 4a20be7b6499501adc64f5ac33b30ad1ea9418190104fbf452e1ed2bd3585552033c042554948b78b41e6a48c22ac62a42f4117b0311300bda738f7556ef1dc3 SHA512 c07b5e5fffa71ca60ed41e4c28a0f4ae5c8b5df9f269ea7376ed835b35536300f34504da724899bab5277f0c39a4c345654b99930ec8bdf4b43374d9b6d331be
 EBUILD pulsemixer-1.5.0.ebuild 577 BLAKE2B 8b73807770eb336446a579febae9a28e0037f06e4fd99bd59d91bf1a0a5e9b601e0adae4494a51b128fdb679971b01baf177f6efcbccad2f37b4c169b285bfbb SHA512 2693ca3bf3366dbc9889fb40f4382cd9ab58de3a78e277aa0e73c8d90b512a226d62e0f24987ea0b6620fd687df22274efaf17b2d81cf547e64bfefe38f7adbc
+EBUILD pulsemixer-1.5.1.ebuild 577 BLAKE2B 8e9250a77944164284605f392bbba2f1d2ad2404a56a99e049ef08e2a3443c36a3f5fa387e33d1ba6f46c8cfaa7de85e0821e8af7e8946cb5c01bd61fad5f991 SHA512 06b2cfc087cac32ce478f772f7887c716796da7fb9e8f4d8da9404db8d5bdd482dc7fae798c7d4c0771f64fa766b3553ca08b53854b812fd7eb0b1c07a72a98d
 EBUILD pulsemixer-9999.ebuild 577 BLAKE2B 8b73807770eb336446a579febae9a28e0037f06e4fd99bd59d91bf1a0a5e9b601e0adae4494a51b128fdb679971b01baf177f6efcbccad2f37b4c169b285bfbb SHA512 2693ca3bf3366dbc9889fb40f4382cd9ab58de3a78e277aa0e73c8d90b512a226d62e0f24987ea0b6620fd687df22274efaf17b2d81cf547e64bfefe38f7adbc
 MISC metadata.xml 539 BLAKE2B 3c4aeb04befd6535d90492837abf142f83ca907b9d158688488537b9edea29f00973763a8d59ca3deb5bfa34a0949d1e57fa7251f014f1750f854b5ebd3044b0 SHA512 9bf6daf8ce060e87586f3c2abfe56631785624d7e449cddca3d488ec298917da2413d28db0ada915bfda40d75715a07f17db5413890fbe6a3667c34599818e0d
diff --git a/media-sound/pulsemixer/pulsemixer-1.5.1.ebuild b/media-sound/pulsemixer/pulsemixer-1.5.1.ebuild
new file mode 100644
index 000000000000..7f8ba30cd070
--- /dev/null
+++ b/media-sound/pulsemixer/pulsemixer-1.5.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="CLI and curses mixer for PulseAudio"
+HOMEPAGE="https://github.com/GeorgeFilipkin/pulsemixer"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/GeorgeFilipkin/${PN}"
+else
+	SRC_URI="https://github.com/GeorgeFilipkin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="media-sound/pulseaudio"
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 359d7b1bdd16..65cc7f879df4 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,7 +1,5 @@
-DIST qjackctl-0.6.0.tar.gz 933416 BLAKE2B 116a6a71ab0c0974ff5109c5ae34c47fb4706e3e051d7bfc9daec74f952304606f5a790e03d3b97bc2c68968ac6a09ad885c4dd4c774b2454c9a7af8ec6c997f SHA512 f1cd281f67a764f12301c6b58644aed2419d2c82696a24bd9980aa7ea42a266ff5e4aa6247b0b6ac78cb01afc34219c7de8c0657cfdf0fa9858a52d1f84b8fea
 DIST qjackctl-0.6.1.tar.gz 955985 BLAKE2B 410acd6ae5b1ff57e63002a2e780dd848b86eabf49916dded8d0f3a877c32668fc6f8643ec853a4805d5cb5dff4fcec1fae782b5d4fa01f45f05978ae7ece045 SHA512 f803cfca1b0f01d08bba0d61c169def928c5b0b5619f7212b4b2aacdc499a88e0def64ad0752f12131b1768e0357d81fb92e0a20151602c1442d90b904b123a2
 DIST qjackctl-0.6.2.tar.gz 1027742 BLAKE2B d2db9e0496223844e3cb289aa8c4ae136011ad36578f3526fd54b44344606e14885d7272bd8e333035b2c908216e60ce2bfe7698c4c8395fd3b017da6b64f03f SHA512 a05f514d749b4f2344c7f0d57a2a0dd1ac6a97f35d0227827e78d3bd7abfbddc3201e2fc7e23f878cd318e408f169a4006a150dc0e43101086e9ba32004e5520
-EBUILD qjackctl-0.6.0.ebuild 1172 BLAKE2B bb25295260ccc1913c50ca1b46ace584a9d93e2ae95027e7387b2798cb5d568c44a4212934d08cd3b98a896ce46c517ed59d16dc304ab703c8fe12850e2fc521 SHA512 3a1e5600be51033776d634d5e1aaf05ab13f84362450e700d0b5ac2f64f35e31473669efb943a781d6a71bc474230b3c66bf5cef594b42c83a6dde06d1cf0b90
 EBUILD qjackctl-0.6.1.ebuild 1172 BLAKE2B f1a1d7d36f6924fe71d346fd9fc7de7be4fd91b00dd420b6b47b62bbeefcf0ad6f021fcbc9d8e0885437da30df8fef84dd684f1168c132f3dfdc655d3e23b701 SHA512 c3e57d66a72d86db0d02e916e057a0338306f00b03ed1475245811e59d20117a991662e83d9e69bb50ef424928e25f6865adcd5de0aca638255c26bacbcc783b
 EBUILD qjackctl-0.6.2.ebuild 1174 BLAKE2B 5414b4dce71be14d30212e3f512c710cbb354a340442a345ebab4e43b29f421782bb89e6cbdcfdaf98858ad75e626e1e20c7c1349783402aedd80344336068fc SHA512 3af1c9366fb4ad9fce5b9702d6ba11933c2c8b68e9e80b8d9c566d1e15c6df199aadd9156d4ef55b22900ffe4bff31f7c40aba42cebe20235cb11af355f72e49
 EBUILD qjackctl-9999.ebuild 1226 BLAKE2B 4c340d964561fa9c34635d02220a7139882283ab5cd9a8b4ce0e0f799aea6c0116d2f2d3482f1febb234f7044c63a0dddd8b63da064238f4013f0e81c0f9f0b4 SHA512 f9f277ec117e06a8c1ef8f2210e6943c62141367c1328eb68d25af401749c180d84b4e54b4a8cb027d985415f93698bf6c7e6ad0d422d00107fdbcefdffc90da
diff --git a/media-sound/qjackctl/qjackctl-0.6.0.ebuild b/media-sound/qjackctl/qjackctl-0.6.0.ebuild
deleted file mode 100644
index 4fa3df425ad2..000000000000
--- a/media-sound/qjackctl/qjackctl-0.6.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic qmake-utils xdg-utils
-
-DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="https://qjackctl.sourceforge.io/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="alsa dbus debug portaudio"
-
-RDEPEND="
-	app-arch/gzip
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	virtual/jack
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		$(use_enable alsa alsa-seq) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable portaudio) \
-		--enable-jack-version
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_compile() {
-	emake -f ${PN}.mak
-}
-
-src_install() {
-	default
-
-	gunzip "${D}/usr/share/man/man1/qjackctl.fr.1.gz"
-	gunzip "${D}/usr/share/man/man1/qjackctl.1.gz"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index c441cfff4bb7..4e0e03f030c9 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,9 +1,7 @@
 AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
-DIST qsynth-0.6.0.tar.gz 316308 BLAKE2B d414c73d5baf3be1563c45390735de964c79774a4d7cc37ff4bc609a7fa4d291a5b0cba7f3b8ed52649c50325a3ba2fba7baad3943122cc76a98aa6cfdf2cb0f SHA512 34e15d283f403ec6633fef911285dc2d4d4b2c5a0cd3614bd38feefbf68cff5fd8e296f47d1bcd527658b8a9dab212106aa63ca71ea60cf49f8126adb7d28591
 DIST qsynth-0.6.1.tar.gz 337277 BLAKE2B c0f160bc4a1db84a53fb96fe66212b335a07736f6659514a61a20e9d23a95e50bee5818443035095e262f45a38d09b59aff10062cfc121c75a20e2b57a488aef SHA512 597ec51f2f2bc45e717dd6e039d10ace3540c6e7332832cbd36a16fb05b88248a59e5ba107369c8bd66d29060c31d0daef13f4967794e2f7b55c85a64dcd6e0c
 DIST qsynth-0.6.2.tar.gz 383146 BLAKE2B 6e93a1d16dc57ce5cc180932eec049cbd62eb64d6667cbfc748c474fe2b751273ff50a94a5497f1d268e2d413831095bea92a2f086b417625f02fecf1bc6ec9d SHA512 6e6f5dc64c39ab18ad1a9e791376e0dcf6eea4882986b1723a5a2f7c53309ce166d443a198c62b33ac31ed3fc17100c3a4f8e3b1e474b70afcec0ffa7f1ffc08
-EBUILD qsynth-0.6.0.ebuild 1394 BLAKE2B 30f5874938401b92a150b5676dae7ab2005d5c7d6ff59e5c888c17e307f5a5e7c33df68390ab3831b1599d9b0d73556eebea77644d0d79ceed25d0048866c36e SHA512 205f48bca8f7c6803b60eee6cf5601b4de47095f1ec2beea19a1abd9a0dd70fb1af4d887b0fefce9af2f2cb1140d6ada7b27742c64c2d2d23b2d51b98b8c6bdc
 EBUILD qsynth-0.6.1.ebuild 1394 BLAKE2B 30f5874938401b92a150b5676dae7ab2005d5c7d6ff59e5c888c17e307f5a5e7c33df68390ab3831b1599d9b0d73556eebea77644d0d79ceed25d0048866c36e SHA512 205f48bca8f7c6803b60eee6cf5601b4de47095f1ec2beea19a1abd9a0dd70fb1af4d887b0fefce9af2f2cb1140d6ada7b27742c64c2d2d23b2d51b98b8c6bdc
-EBUILD qsynth-0.6.2.ebuild 1397 BLAKE2B d2ddac93b1cac37db26abffe8f0e1bc1579e0570fef09f2509db11fe85a0e39220f8ee29b15de3127a0b02c8948fd705bc1a51e80f0850905e7748bb60933adc SHA512 a3a3f1b49e31d087666e9fcfa28c6de4af2732ffc77762cf76d9761514a7b249238e13b8ab6853415b9b609e4972b606b7159b4c2045cf2c990fcc1d229721c8
+EBUILD qsynth-0.6.2.ebuild 1404 BLAKE2B cbca6d0987a24e3582205d1ef20c085a8c25624df2e64a3d31d8004910bdd3e2967cc332317ecc67b6608697db0751c35bf511b0483e2b52aa77f4d69a6d40e2 SHA512 a7cbd00ab28659b37d3ff33b81313ec34bd938a5ffcb102059b0dae9697329d87383bed02eddc8c21d5e54169488d736405257fa9f7f3e7d8a2f0e78825dd4e8
 EBUILD qsynth-9999.ebuild 1444 BLAKE2B 73fe5bb7f1217e209e80faeea59a0d250e49ab51b37bd3597650f3e68b3a84d8f4d1920a959a2a53bef6165175abed55d6ed6015d80b01028892503f82f4fdd4 SHA512 818faed6786b0369fa96d42493c9f99e27f0db9e45d7bfa709a95ff02f99e4712955e98316f19b14a2c309486f71c102db75b7b688c529f6c9ec50711dfb8fc9
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.6.0.ebuild b/media-sound/qsynth/qsynth-0.6.0.ebuild
deleted file mode 100644
index afd6bb7009c6..000000000000
--- a/media-sound/qsynth/qsynth-0.6.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic qmake-utils xdg-utils
-
-DESCRIPTION="A Qt application to control FluidSynth"
-HOMEPAGE="https://qsynth.sourceforge.io/"
-SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa debug jack pulseaudio"
-KEYWORDS="amd64 ppc x86"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
-
-src_configure() {
-	append-cxxflags -std=c++11
-	sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die
-	econf \
-		$(use_enable debug)
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${ED}/usr/share/applications/qsynth.desktop" || die
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/qsynth/qsynth-0.6.2.ebuild b/media-sound/qsynth/qsynth-0.6.2.ebuild
index 71cbc9eebd10..8cf21bfa2aae 100644
--- a/media-sound/qsynth/qsynth-0.6.2.ebuild
+++ b/media-sound/qsynth/qsynth-0.6.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+alsa debug jack pulseaudio"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index f826328c5624..7a24f6de6083 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -1,3 +1,5 @@
 DIST quodlibet-4.2.1.tar.gz 4908102 BLAKE2B 0c1535e925842d42aafd5ff819b33a5d4527995977dd5d56b84b26462c677d81fcfb6d1de60ce50004a4b4a3eaa69896e430d36d31d904175c38f9deb23c044b SHA512 3817611c887b7c1878ccf852311020ded0a813feec1067f861d1157de6331760166c34992a6e4fe225552ae6ed4472000585fe58a3397faf277ae250f6f3c138
+DIST quodlibet-4.3.0.tar.gz 5061542 BLAKE2B 31ec24f43a1750d065e14fe69d90a1646382ead13362633c08c9c44b17cb1dca02da37612bd30e1737212098fd26947cf637501ed79b34f03167b85cc11cbdc8 SHA512 6e3cd8bebb8abeb6acde6effb08a439479e293fed18633240a1508a015c083c814fb98722c36d3970917970259095499efeb27e323ab788252940714cae2fddc
 EBUILD quodlibet-4.2.1.ebuild 1488 BLAKE2B 12368ad1f061a35589b734acf5555f44dbaf9c27789564ddd68774e1029ea16dc611646af441f36c7e4a23f0918aa96891e9b04b8c86f09854e55653b12a0222 SHA512 ef978a8dca79a18844be64fb9ac87f2cf51755b1c91b7e09a6a5f1a084f008555f198c0ec7f95b9fd2acad74838a82ac2674d5c23b39642c65ecb4437253ca26
+EBUILD quodlibet-4.3.0.ebuild 1512 BLAKE2B 62c617b310e113fd7f4b819f1c6805b6bf088675e75d55da4e349ab5545a80392f1e56890adab7139f723ea83ef898c8f3bfe56335ac96a3121d737023fbc023 SHA512 e4f39742ba0ad4735e9e03d4719954c4d224e1e349df96203792ede228e0c9ed08e1c8fa7c3e98cf23f5d27f5764ece94559b234922cb672ecbe7d35b2061c71
 MISC metadata.xml 1136 BLAKE2B 372295e43337120cabfa3a28f260fa3feff8cce235240be1c65fc0a54922b294cc94124690fdb923d82f78c5866e82bc7becfad334c8e1ca3797b6602a9d0d80 SHA512 1466590147ca42dda2b5c11fe781a39e6d25d205b69fdba20663f1d1bfc2e251123c99990810727a36fbbd7a0c868bf1ddc51e94a38985719cef1bea71f07feb
diff --git a/media-sound/quodlibet/quodlibet-4.3.0.ebuild b/media-sound/quodlibet/quodlibet-4.3.0.ebuild
new file mode 100644
index 000000000000..0dd768bcf9e4
--- /dev/null
+++ b/media-sound/quodlibet/quodlibet-4.3.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="audio library tagger, manager, and player for GTK+"
+HOMEPAGE="https://quodlibet.readthedocs.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+dbus gstreamer +udev"
+
+RDEPEND="dev-libs/keybinder:3[introspection]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.32[${PYTHON_USEDEP}]
+	net-libs/libsoup[introspection]
+	x11-libs/gtk+[introspection]
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		media-plugins/gst-plugins-meta:1.0
+		)
+	!gstreamer? ( media-libs/xine-lib )
+	dbus? (
+		app-misc/media-player-info
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		)
+	udev? ( virtual/udev )"
+DEPEND="dev-util/intltool"
+
+S="${WORKDIR}/${PN}-release-${PV}/${PN}"
+
+src_prepare() {
+	local qlconfig=${PN}/config.py
+
+	if ! use gstreamer; then
+		sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die
+	fi
+
+	sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc NEWS README
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index a89f66568264..fed6b18156d2 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,5 +1,3 @@
-DIST rhythmbox-3.4.3.tar.xz 6410600 BLAKE2B 0df8ac37ac0815468414c5b8118da6d07276e0c15f08812a46af7f377c29418416e1a24d7398aec10772887ae98922f6fb9fa9eaecc6ae15115cd7ca1c4b67a4 SHA512 a3585c026037674345909e2050a4ccb22a75084f830f351b926f7fbfc84d200c8246b8da4bd72804e595929ab06d3c7b53d362675dde193746f40b0f38b7c493
 DIST rhythmbox-3.4.4.tar.xz 3890320 BLAKE2B 69c89c0478d6c43e1c4a10d39f25c25c3dc81f9b93f870e0de8947395e0f49d3902cb8dcf74c945da744536090b7058616545ad706626047e0c8fb61b0b792d7 SHA512 1fcd41dd66ffe34852f8cedb80ade57d101118295d6fd6f0a8687000ab6500991d2e11482daedb30a7abaf63e54e33ee3c4eaab73b075ec5e5907182f9a8c865
-EBUILD rhythmbox-3.4.3-r1.ebuild 3446 BLAKE2B b2d0ae2bdbbc025b6ee86ff2940603a8221099e965c625b8aae80f5487fea99560edae867e51ced8a78a82d68590453f8bea7adfb651bd7ef6babead637840de SHA512 a6f13e9d6e2016289e26c32ef5215f7420d6256da34ac8a92d6b0325b987eae9fc2fd8eec3a003553e851f64bd3637b95206a229e2a5ef576ef7e4745b4593fd
-EBUILD rhythmbox-3.4.4.ebuild 3338 BLAKE2B cf18006d8ff24326cc06ba618086b96759c61547e27cd3961a278194abebbe68c88ed38d156788d45e58907193497fbfb99345cb78c8e06ddf2f429525e837d6 SHA512 45007df1d716a88fa096c28730565197986c1c854c3ee58ca28721e7e763e255bde94d165d7cf535020c60e42d522773912928d2c52abd28fded2505eede4990
+EBUILD rhythmbox-3.4.4.ebuild 3336 BLAKE2B 763fb6f4b6c2b9787d69e31403010d1a29912af0bb31a6129ca4bf1a715110e5c7eef5e306c4b98ee92dd444765c580312030368a366c0c541ffe9128bce8439 SHA512 d93ddea2e69884703830dd2f70c43446f58d58cc74b7dde7a012ca3ae392113ee30183626429b0e3507ffc743ff8c1cbba98ff3c05c45f90b2e63bfa4301e59b
 MISC metadata.xml 545 BLAKE2B 541f660e1607a2e02779487edf290dbd8d8262184c2b0f245eabea4490165a0b019b1a989ad9a27acea26a15edc1ba39b4669756a9b17464b9592191e4498a99 SHA512 a734430876806e8bc114e3058c6b5cdabe87372af71a478f333dd7449faa63af011dc2c7115293049e74da8df742ed6a03f03c8e2a56a2d56b2aa4c547bd6065
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.3-r1.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.3-r1.ebuild
deleted file mode 100644
index 5d67d46725de..000000000000
--- a/media-sound/rhythmbox/rhythmbox-3.4.3-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils gnome2 python-single-r1 multilib virtualx
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Rhythmbox"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="cdr daap dbus gnome-keyring ipod libnotify lirc mtp nsplugin +python test +udev upnp-av"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	ipod? ( udev )
-	mtp? ( udev )
-	dbus? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libxml2-2.7.8:2
-	>=x11-libs/gtk+-3.20.0:3[X,introspection]
-	>=x11-libs/gdk-pixbuf-2.18:2
-	>=dev-libs/gobject-introspection-0.10:=
-	>=dev-libs/libpeas-0.7.3[gtk]
-	>=dev-libs/totem-pl-parser-3.2
-	>=net-libs/libsoup-2.42:2.4
-	>=media-libs/gst-plugins-base-1.4:1.0[introspection]
-	>=media-libs/gstreamer-1.4:1.0[introspection]
-	>=sys-libs/tdb-1.2.6
-	dev-libs/json-glib
-
-	cdr? ( >=app-cdr/brasero-2.91.90 )
-	daap? (
-		>=net-libs/libdmapsharing-2.9.19:3.0
-		>=media-plugins/gst-plugins-soup-1.4:1.0 )
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	libnotify? ( >=x11-libs/libnotify-0.7.0 )
-	lirc? ( app-misc/lirc )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	udev? (
-		dev-libs/libgudev:=
-		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
-		mtp? ( >=media-libs/libmtp-0.3 ) )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-soup:1.0
-	media-plugins/gst-plugins-libmms:1.0
-	|| (
-		media-plugins/gst-plugins-cdparanoia:1.0
-		media-plugins/gst-plugins-cdio:1.0 )
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	x11-themes/adwaita-icon-theme
-	python? (
-		>=dev-libs/libpeas-0.7.3[python,${PYTHON_SINGLE_USEDEP}]
-		net-libs/libsoup:2.4[introspection]
-		x11-libs/gdk-pixbuf:2[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-
-		dbus? ( sys-apps/dbus )
-		gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) )
-	upnp-av? (
-		>=media-libs/grilo-0.3:0.3
-		>=media-plugins/grilo-plugins-0.3:0.3[upnp-av] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	dev-util/itstool
-	virtual/pkgconfig
-	test? ( dev-libs/check )
-"
-# eautoreconf needs yelp-tools
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# --enable-vala just installs the sample vala plugin, and the configure
-	# checks are broken, so don't enable it
-	gnome2_src_configure \
-		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins \
-		VALAC=$(type -P true) \
-		--enable-mmkeys \
-		--disable-more-warnings \
-		--disable-static \
-		--disable-vala \
-		$(use_enable daap) \
-		$(use_enable libnotify) \
-		$(use_enable lirc) \
-		$(use_enable nsplugin browser-plugin) \
-		$(use_enable python) \
-		$(use_enable upnp-av grilo) \
-		$(use_with cdr brasero) \
-		$(use_with gnome-keyring libsecret) \
-		$(use_with ipod) \
-		$(use_with mtp) \
-		$(use_with udev gudev)
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check CK_DEFAULT_TIMEOUT=60
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
-		MAINTAINERS MAINTAINERS.old NEWS README THANKS"
-
-	gnome2_src_install
-}
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
index 6f89ae419208..a2483b05d611 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 9dfb8d4b48e4..9cfbd0e7157b 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -3,6 +3,7 @@ AUX xmms2-0.8-rtvg.patch 1539 BLAKE2B b359db6f477f0ca6a8e528645f731ccb33ec13067f
 AUX xmms2-0.8DrO_o-waflib-fix-perl.patch 1693 BLAKE2B 6057da2c8493ea7887ea03322d16d45ca0726174e7deb1a64f76b289fdeaba02c7659944803a23d7a32a0a74de7a39de1404d5566b43dd3306004a29876af038 SHA512 0f7f86cebd0ff75ed53366776f8c93abb54adf5942f53d7424183a4bd6913b73493882d4d3caadba6a959ddf22da0a22fa53d0fc18ce5b8508eb5670482e8c92
 AUX xmms2-0.8_p20161122-be-hash.patch 1075 BLAKE2B 7c9678016751b207a5ef48c0f7963bc0a2e3e99fb461e52b5745bc5e2dde6c329bb358e58802c127aef96d5912e22a7df7a64f719286e9cf7787703765c4b18f SHA512 051e22907315bb6bda201497e1c2ef84d919fc7d39aefac187b3616c5f6c41e768cdd79cfe197fbadfdda3863f9e9c96b5f72fa07d5e1655451328cde8ba5781
 AUX xmms2-0.8_p20161122-cpp-client.patch 2326 BLAKE2B a59da287dafafe8a3a177c11673eb7de5918fc6efef2e32c707832d7ea202091493e41f907f3e2dc370cd34d990571eed1d274fddf05f715dff7462973fb802f SHA512 095f2878afe9616bc7982037c0a9b0cc610164e04d116d40fe138df0280160680c19f6bf5c2f9aed6e9d31d42ee2f310570aefae28872ee15496f886d20ee2e9
+AUX xmms2-0.8_p20161122-faad.patch 724 BLAKE2B d7e11332341c2e1d4b19e31b19db9f577a41aee9172e886d885ae6a9518383c861537f6cc2eba2314839a000a2216828a176de9095ec45050b8621da9db9aa88 SHA512 2bed6ce756c0bbf21413485b336e4e33d8dc261c214c51bc6a0c7d310ae6e885526b8f243763f6c3ec665024e94acc55a46b26dcadf9a9cc0b5bf77b9306c1ed
 AUX xmms2-0.8_p20161122-gcc-10.patch 222 BLAKE2B a198b2e69081253f299ff1c7f94f0a2d3572a31caf4b7ec7de20e8d9a9bc404c58a98b31f0da6560034fe09599ae2e9f03b97728f45ad2fc30061b384c9fb13d SHA512 44685777b04e46e236104a74e654162a85b5c76c9838572921cc78b4775a7c2d5127566202415bfab10bb17261e242b034dde8aaf44024b66daa55a150ed1352
 AUX xmms2-0.8_p20161122-mac-4.patch 1632 BLAKE2B 5bc5c7d499df5faee2fc6b4307af18269b784360bbbcaef33b1db4b880704f88e8dad06168e3737a43fcdb71ba722da1ffb5ba77f3f61ecf07674e1ad0988f5a SHA512 d2fe5f9a0c59205c787386e7b219c3fa9a334c30787b9a343214cc1c4dbf9f5d47f5dad9b2efd7deac1e96a227c827cc66198215a89b0e788c9d856cff51b16b
 AUX xmms2-0.8_p20161122-perl-no-local.patch 697 BLAKE2B 86ab6bb3594fd45e9a9bdbd07d85d3740ed206eea24652161c7fbbdf620c98a6b002b646aba65a3f017e263bb82d6dc7b933fb53540012c2005d65dd2e667b06 SHA512 eb5afb39409c7c199a844d9452ab829a653d2a1ce8f5d9f1361fa995e851914d5a962d25d8116947a265fabc649f8560aa1947a24cf45d954da7743954fc3cd7
@@ -10,5 +11,5 @@ AUX xmms2-0.8_p20161122-tarball.patch 2764 BLAKE2B 1d6ea9bc40db3145460a8ef06c732
 DIST waf-2.0.19.tar.bz2 682213 BLAKE2B 0bd2e31827ac65e0565abc09df37a42193ff37b50b6d0244f8b10ba7f308b4ba31ba864742d8c8d4005b86e611223dc4315cf70c0dbbf6b7db8f02e4f551fbb2 SHA512 ae7f3973c79e44313b4894c75763ad43ccd2be88e0d351d7f606ce495c5a464a379c85c076ebd8ba577fc88918af2bbb39bbec1049f25f02c14d98388e012c59
 DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb
 EBUILD xmms2-0.8_p20161122-r5.ebuild 7807 BLAKE2B 7226cdca97888fc127daa09523d28254f891ca164d3a536121f1ff03b5cfd5eb1413e7a6c32d6c8c3b57431aff3c6b9ae8ed0251f9a9271086d17f133cf330a9 SHA512 2ac2878fac8d408723a932370fbad67fb80e52e24377da52ebd419a2bcf2ff198661745baa8a973a28dc36f2b58eea90c0802bc8ffe047833abdabc13e307bcb
-EBUILD xmms2-0.8_p20161122-r6.ebuild 8100 BLAKE2B 598bacb75a8b87239b3d18b82373d31e5cc480caec47737bb3f1414c8922156b66ce6cbdf0b11f6b3e9bd422d2d28f0fbe91bae2a6b83a7b5e4940f62709767f SHA512 9229b5c821fce1f0add8fc5f455c94f83aed2749817c78c11e50f521c7dc32e2cd8bb8fc0929e6f288e36e571df299607330447455fd2cced5bacc3f86e928ba
+EBUILD xmms2-0.8_p20161122-r7.ebuild 8165 BLAKE2B bbc7b4da88dde76b360e50e24cba271d9873b1f1b3932456754ff82975f3336569f787f1388a63c67f81a3fbaf5064e14669ce249818d50a5a2c392067f5360f SHA512 d75f76538907d9712d187b8c0356545d914e6d6c546c06a0a9fe3670649d4b55916cf30fec65fe9991bde6d97fd6110eb31fd982540ffe9b5f2b76578045c1b4
 MISC metadata.xml 2494 BLAKE2B 47ddee51380c99b03e6a449347f68e0f38742c7310d6e128b741abb13c4ce8126cb7177854c05c7a9e22ede612be2aa0befe7fbc69b918d17366a31005ed392e SHA512 f5c30541d2f5f484ced87780f72b2ce02d8f1a5e9cdfd437a870e6a1f53f1b9f71bf266935a20dc6f1f6d2417636dfa6dfe27c947eeddca1d746ad72e0b3c8ae
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch
new file mode 100644
index 000000000000..00aa5d770823
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch
@@ -0,0 +1,18 @@
+This line has stopped working since security fixes in the faad 2.9.0
+release. XMMS2 upstream were informed via IRC but have yet to act on
+it. I've run XMMS2 with this patch for months without issue.
+
+-- Chewi
+
+diff --git a/src/plugins/faad/faad.c b/src/plugins/faad/faad.c
+index 50835d27..7074e1b5 100644
+--- a/src/plugins/faad/faad.c
++++ b/src/plugins/faad/faad.c
+@@ -242,7 +242,6 @@ xmms_faad_init (xmms_xform_t *xform)
+ 	 * and durations calculations... So we cheat and tell libfaad2 we're feeding
+ 	 * it frame 1.
+ 	 */
+-	NeAACDecPostSeekReset (data->decoder, 1);
+ 
+ 	/* FIXME: Because for HE AAC files some versions of libfaad return the wrong
+ 	 * samplerate in init, we have to do one read and let it decide the real
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r6.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r7.ebuild
index 691654060525..88101be578c0 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r6.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r7.ebuild
@@ -114,6 +114,9 @@ PATCHES=(
 
 	# gcc-10 stopped putting globals into common section
 	"${FILESDIR}/${P}"-gcc-10.patch
+
+	# fix required since faad 2.9.0
+	"${FILESDIR}/${P}"-faad.patch
 )
 
 pkg_setup() {
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index c8853f20f252..8bb93109bceb 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,4 +1,3 @@
-AUX yoshimi-1.5.10.2-cxxflags.patch 2592 BLAKE2B 383784742913ad2a2d711a1999269438eea525da3ed54fdd24fbad46932e05e781b18b2cbad1bd1e5bbe3ef160762f865517bbcda9ea6f5c4df4eb413af8b278 SHA512 78c3e2a84f44e9220b2f3fcc1cbac1b243a4fd19036d32f0ded794c90f83e5797ff3cddcb57ae3612656be27954b1db69b92d4b2107d8c18ffbdbd984abb87bd
 DIST yoshimi-1.7.0.1.tar.gz 9987526 BLAKE2B e1793b0515fce39a62288f61fda0028c1683080c276b451f2cc67edd617ed2d25d408d3571ac56e8a7d6a4fd537719ba517b4faef969810520fc8af3aee013de SHA512 d403ca3f54a0c8eb27a1f4ea3bf90ab0fd8041b864259c94b0970b24b50b79fc84ea623af2981a1b00e65ebdd3f9ceeb0b5f04c64f62e5694aa55b31bb8390ce
 EBUILD yoshimi-1.7.0.1.ebuild 1032 BLAKE2B 61e247d835af7733a1bfa0d8e7a2a3011c5c2c7b6384c0ca5613992a769492b7aee994af3208378fd465f0580984504b990b87a02dbfb7154e120ee9fe05b0d4 SHA512 7224d8385a5feb36ec7dfbf62ee6b2b8f4bac15139174ac0766008c5c89c4c650d720d7553848da18f3c7ac3d181c6adf423208ee887d02e8df2f32ce5ffe2a7
 MISC metadata.xml 1650 BLAKE2B 1581b61fd8129d530dd164a50aa38a9621d947cd42b1a6c0c41924e7539c44f38c30f2e91d440a094b878c2f5db720c71de4df93f378061e0db2063419477021 SHA512 eec6c334d5c7ad11741c6318cea8374d2b46b2700372b1eebed66e1808a819794029d0d13306b8b5d7df3d7830569f8f76188dfb502eb1df4f668f1c21e4d152
diff --git a/media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch b/media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch
deleted file mode 100644
index dc5544339b54..000000000000
--- a/media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Respect user CXXFLAGS setting.
-
---- a/src/CMakeLists.txt	2019-05-06 15:09:19.010755505 +0200
-+++ b/src/CMakeLists.txt	2019-05-06 15:14:11.668510627 +0200
-@@ -307,28 +307,28 @@
- endif(READLINE_FOUND)
- 
- # set platform specific compiler flags
--if (BuildFor0ld_X86)
--    set (OurCxxFlags ${BuildOptions_X86})
--else (BuildFor0ld_X86)
--    if (BuildForAMD_X86_64)
--        set (OurCxxFlags ${BuildOptions_X86_64AMD})
--    else (BuildForAMD_X86_64)
--        if (BuildForCore2_X86_64)
--            set (OurCxxFlags ${BuildOptions_X86_64Core2})
--        else (BuildForCore2_X86_64)
--            if (BuildForNEON)
--                set (OurCxxFlags ${BuildOptions_NEON})
--            else (BuildForNEON)
--                if (BuildForThisCPU)
--                    set (OurCxxFlags ${BuildOptionsThisCPU})
--                else (BuildForThisCPU)
--                    set (OurCxxFlags ${BuildOptionsBasic})
--                endif (BuildForThisCPU)
--            endif (BuildForNEON)
--        endif (BuildForCore2_X86_64)
--    endif (BuildForAMD_X86_64)
--endif (BuildFor0ld_X86)
--set (CMAKE_CXX_FLAGS "${OurCxxFlags} ${CMAKE_CXX_FLAGS}")
-+# if (BuildFor0ld_X86)
-+#     set (OurCxxFlags ${BuildOptions_X86})
-+# else (BuildFor0ld_X86)
-+#     if (BuildForAMD_X86_64)
-+#         set (OurCxxFlags ${BuildOptions_X86_64AMD})
-+#     else (BuildForAMD_X86_64)
-+#         if (BuildForCore2_X86_64)
-+#             set (OurCxxFlags ${BuildOptions_X86_64Core2})
-+#         else (BuildForCore2_X86_64)
-+#             if (BuildForNEON)
-+#                 set (OurCxxFlags ${BuildOptions_NEON})
-+#             else (BuildForNEON)
-+#                 if (BuildForThisCPU)
-+#                     set (OurCxxFlags ${BuildOptionsThisCPU})
-+#                 else (BuildForThisCPU)
-+#                     set (OurCxxFlags ${BuildOptionsBasic})
-+#                 endif (BuildForThisCPU)
-+#             endif (BuildForNEON)
-+#         endif (BuildForCore2_X86_64)
-+#     endif (BuildForAMD_X86_64)
-+# endif (BuildFor0ld_X86)
-+# set (CMAKE_CXX_FLAGS "${OurCxxFlags} ${CMAKE_CXX_FLAGS}")
- 
- if (BuildForDebug)
-     set (CMAKE_BUILD_TYPE "Debug")
-@@ -330,8 +330,8 @@
-     message (STATUS "DEBUG Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
- else (BuildForDebug)
-     set (CMAKE_BUILD_TYPE "Release")
--    set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
--    message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
-+    # set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
-+    message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS}")
- endif (BuildForDebug)
- 
- configure_file(