gentoo resync : 19.07.2019

44 files changed, 301 insertions, 1776 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 7701c58d2b98..3677a3048bbb 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/ario/Manifest b/media-sound/ario/Manifest
index 59ddb7a8efb5..6fc5735abd22 100644
--- a/media-sound/ario/Manifest
+++ b/media-sound/ario/Manifest
@@ -1,4 +1,4 @@
 AUX ario-1.5.1-single-includes2.patch 16062 BLAKE2B 1cacda4c7fcf04de122d3a0b960605b384239de7fb779b593f9de3dc13d5aa32cbae0018ca60f32ab003cc282f1d3800e08e6d4efd759d77367a0cea19646b90 SHA512 f832498f2445f2f937a1b9636ba6c75fce3a75e706296a315e0c33c3a852140ba829f6972d8cc2ade3fa4a45f21a964eef8134b315fdfe1155cd221e9ee0cbb2
 DIST ario-1.5.1.tar.gz 1135444 BLAKE2B 2d91a7b8ce9c6c6069ec7230e10e7c358a146272474d0dbb298e038a3fb31d524c6ad7a8428af12f580853bbc6ea484ce3ffa6919cd454060d19e9f4cde42200 SHA512 78c3d881d51c3109b73252da0742da2a77bcc24ec21ff2ff02fd3527d62d49a75e412bf092051a9035863d645cba73e6cd2fc674d97629909b931ae9d3ec002b
 EBUILD ario-1.5.1-r1.ebuild 1554 BLAKE2B 124e80d5a4714b1251775ae82ad6b6c19864ddfcd39f29e56644e02a141a1b305a51aecceeeaffd47f668ebc52f9d338d51c26121d6db74576dca5ff9ed8b723 SHA512 6d2a5d70b2974412b2fb9f1d3bc365e8b4eac81fa72da6d192ec2a03969e27a4bc24dd9d2cbadfa6dbf6e2baa4aa8fbb6b543c61abacbc61b627191738e87e31
-MISC metadata.xml 464 BLAKE2B 9f5fbd62fe7ff0cb5a5b73f0aac544f123f26282124d1cd3356f995ab142579bed554c3ac9562b02990aac53ae1f1ed5211a82796487dc32c701ed6c77f09844 SHA512 c520f4984e3b00675e1f79981ee213cdf43af380c3ce86ade4f16848aa80502f4bd7fd3e48804287ab14e269d68d6ab9442d536a443d6121f1bdbf52c429b7c7
+MISC metadata.xml 490 BLAKE2B fc146c228205f47ade75b01f2536871a9c67e08badb9fdb9555393d9602db90305a480ac3aff8adcb2ff3cdef56a0274ca844cab49b3accc4a6f6e04a8981764 SHA512 df1656e1674d9aedbf4e6837fd2836e5fc3286e742e014ac6660fd7b5bf30e0709a64899f33e5303d6b4a3754f1cf6e9830ad336a0d36d96c6cdf2ebc91746c6
diff --git a/media-sound/ario/metadata.xml b/media-sound/ario/metadata.xml
index f3c1d73810aa..0d5b7ea3ec52 100644
--- a/media-sound/ario/metadata.xml
+++ b/media-sound/ario/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<use>
 		<flag name="idle">Enable experimental support for MPD's idle command to reduce bandwidth and cpu usage, requires MPD 0.14</flag>
 		<flag name="scrobbler">Enable audioscrobbler/last.fm support <pkg>net-libs/libsoup</pkg></flag>
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 86814bdb755b..965b87427eb4 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,5 +1,5 @@
 AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df
 AUX cantata-2.3.3-solidlite-static.patch 994 BLAKE2B 66b4a6a0325f0f7cb4f3886bca68c88e45aee4eb08947f422f07d7e43b585d6d3661f92152dcdb2c0fb243978fe3fd203bf14d88cfd7b472031e87f8d83430d4 SHA512 395b9d8968c2be12561ac595c99cd821296722598d33916328823137538d174f9dd2953146eee24263cc8f0485e3e1627eab678890ea6b5c6141472e4ae9aaeb
 DIST cantata-2.3.3.tar.bz2 2445139 BLAKE2B 679ac68afa6219aa684aed1202bb2268552f6fe560db36e17748b9b220ae6ec4ef103ff68b3bcc7127835f8a2debd32895f5edf319a759ce78bc161c4e540a84 SHA512 8314930c9e16a5811f607f131ce7134daa0c6de81c5f87d45967c076895540b388b89b3f2cbd82950f6defb1087e61923c1719670f19b4ed3c074f05fe8577c6
-EBUILD cantata-2.3.3-r1.ebuild 3133 BLAKE2B 07da67ff326f1309b0fcd7f42aa02c70a102b92c48b2aa442f8d5bfb6b1b066f80b6d67a3efb8f6491d135493bc403c385f4732b67bcc656d22b49067c1cfc48 SHA512 6b880a9b9533fc98e20ce7d222288f09141cb50e2b29e1de7e8130edaeaed80df47c3f6d14405d19d9827ae2d8df1a7703a5c489d06ce9f0aaef6621bebe865d
+EBUILD cantata-2.3.3-r1.ebuild 3140 BLAKE2B 8b8b6f5d9521d65201913808b5aae3a14de5858e7715b6473bd3c1981eb57cf4ebd84f576c23f4d765be9db5d03a407cea09d7d78bdda68d60572de912454c85 SHA512 1444bf3b32ffb13bc92337b9b871449b444cc9d11cbdbc9f7ef87aec8b67119adfe9f32aaa109b04114a85e41fb547198ecc0757fd9424af71a5c955400f5ecf
 MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97
diff --git a/media-sound/cantata/cantata-2.3.3-r1.ebuild b/media-sound/cantata/cantata-2.3.3-r1.ebuild
index ccd0d2f5b44d..05ee35f51094 100644
--- a/media-sound/cantata/cantata-2.3.3-r1.ebuild
+++ b/media-sound/cantata/cantata-2.3.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming taglib udisks zeroconf"
 REQUIRED_USE="
 	?? ( cdda cdio )
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index b8c7bbc6f9dc..f2faa1a43d17 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,3 +1,3 @@
 DIST elisa-0.4.2.tar.xz 1274720 BLAKE2B 8b8a0db29ec2011bd4494167e637646e873020b24fa721f78683d0c2d062961919a9750a91955204fb65c8efcfcb883ae055c8d2de477a508d990657e1926197 SHA512 8044eca86613be279d2f8df61dd518b69672ba2f586474866f11df7494912020e59bb87905eb3c30a44c2f9bf21466de7f7efac35a6db0f822dfac013a6d57eb
-EBUILD elisa-0.4.2.ebuild 1517 BLAKE2B 7f9013fdf4d739e4e587c34b0d00f028c2f3b44b5698b2461c1325c260bd01b2440d41870d28a3280e6fa1b83be43811d062da8c7fdde23fc10f9160f30a019e SHA512 e4cf1afc6846c64947ef62755366f0821d06f7f876c090573f43bcecf577c0da6635ef17b80b1fb86a103ce5f3f916bfb849d9171638e5cc8f2670ff23bdd998
+EBUILD elisa-0.4.2-r1.ebuild 1561 BLAKE2B e564aa8d8c6cfbab6fdc4eda61ca25667b5b59cd4ea19e68b1e2364c69854ac39c075916761e1bcede850343751b517d9cebb1ea7e12f8fc53308d840378424d SHA512 18740b955c59bdcc1409903744a5ff047c596e0d706c74f85889c41d79a856d95fd993284193810352272d68c61cf574ebbd04db9b2df9c2260b9db2362bdb63
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-0.4.2.ebuild b/media-sound/elisa/elisa-0.4.2-r1.ebuild
index 59c4f96313ab..f6e273800590 100644
--- a/media-sound/elisa/elisa-0.4.2.ebuild
+++ b/media-sound/elisa/elisa-0.4.2-r1.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kfilemetadata)
+	$(add_frameworks_dep kfilemetadata 'taglib')
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kirigami)
@@ -33,17 +33,16 @@ DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia 'gstreamer')
+	$(add_qt_dep qtmultimedia)
 	$(add_qt_dep qtsql)
 	$(add_qt_dep qtwidgets)
 	mpris? (
 		$(add_frameworks_dep kdbusaddons)
 		$(add_qt_dep qtdbus)
 	)
-	semantic-desktop? (
-		$(add_frameworks_dep baloo)
-	)
+	semantic-desktop? ( $(add_frameworks_dep baloo) )
 	vlc? ( media-video/vlc:= )
+	!vlc? ( $(add_qt_dep qtmultimedia 'gstreamer') )
 "
 RDEPEND="${DEPEND}
 	$(add_qt_dep qtgraphicaleffects)
diff --git a/media-sound/fmdrv/Manifest b/media-sound/fmdrv/Manifest
index 5a86db5051dc..0f00564c66bd 100644
--- a/media-sound/fmdrv/Manifest
+++ b/media-sound/fmdrv/Manifest
@@ -1,4 +1,4 @@
 AUX fmdrv-1.0.7-ioperm.patch 434 BLAKE2B 355fa4db5dc48ff732aecdf6d9b79de934f4ff05647723d74953f0e6ca9e457bcd9973b7b71541c0a196ba136b471f0e4927801998cb0386b0c8abd0ca264177 SHA512 c092de86d3d2ec1dd403304b918b96196d4ceeb1856a1e2c21c1af5a5b71ab3cfa2a9e461de007296a74206cebc25c0f9633425b921f58d645a024bbbc2755b4
 DIST fmdrv-1.0.7.tar.bz2 61373 BLAKE2B d361bb974c48ebbcbfdcf3e65c03c67b5449579671eebe862b8df1220da5e738045a6ad61ea4603ff38bb801f8bdc5d7572a5eedec1765773b18f7c61ba9792d SHA512 d5533aee5c4c4e6a08dd2ede07c2f657edf93cf89bdb43d3453badd8dde68ec39a94820f91098192202490d59e2abda49af03737db39d2bfdd6b009a65824f1d
-EBUILD fmdrv-1.0.7.ebuild 832 BLAKE2B f903c85c7d1411e52582b965edb4be5d1019113e81a116c55e6233618374d169e18b0532f70d2ac813e707f2a26b46294346a40c28e906c99a6b39e5c6b2f0cc SHA512 1dc318f2122454338ffb496ee6bdbeee9dd6d29064642d7dc6c77ee5ff642b42ecb6938b40f3fc9eb0ac6c6e7e262e0dad8361181a6c27e08ba2b7af7cf57aa6
+EBUILD fmdrv-1.0.7.ebuild 829 BLAKE2B bfa070a39c7fe709502c6cd36c5141164e3c3452a05268ef9d4c88734cbe69e2d0722eb92575f2c15bb2c191897e0f287fa89c2a9b74220ae6d77908527e4aed SHA512 c380087eeaf15945596d210976a43fd585b411c9751c53b4c0d9522d491c253a4485262d8fbcbbe7c78988ef10d9328fe2eaffce48c99373fd2891b72e836f9d
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/fmdrv/fmdrv-1.0.7.ebuild b/media-sound/fmdrv/fmdrv-1.0.7.ebuild
index ba6ca99cb32b..e4701c3430f5 100644
--- a/media-sound/fmdrv/fmdrv-1.0.7.ebuild
+++ b/media-sound/fmdrv/fmdrv-1.0.7.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=5
@@ -10,7 +10,7 @@ SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
 
 LICENSE="fmdrv GPL-2" # GPL-2 only
 SLOT="0"
-KEYWORDS="x86 amd64"
+KEYWORDS="amd64 x86"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-ioperm.patch
diff --git a/media-sound/gom/Manifest b/media-sound/gom/Manifest
index 95d7d3ee169a..da02cc93c450 100644
--- a/media-sound/gom/Manifest
+++ b/media-sound/gom/Manifest
@@ -1,3 +1,4 @@
+AUX gom-0.29.103-tinfo.patch 632 BLAKE2B 29e8857c9e63b4d415c747bd80ef42d50fc3fe6c3aa20f3274a0ae1fddd37d0a67ed5256fca9d833c8ce86fe58c136fe5d6cd2d2d42e249bab2aff0738e11ec5 SHA512 b02dd7751d5614532b2409161c196e11fe34dd9c5c99c7734cc1d72afc0338093d221d38c2b02da237e1be75e815b22a0479b04125670aa4f1bac0580486e419
 DIST gom-0.29.103.tar.gz 88269 BLAKE2B 2ec8f767276d61dc5e16c511e62de3fdecff82de686627327ab10bfbd4bd8eb7bc3ac8a44627a8d465a4a4f4e42ec4c4b0f9f1e2affd75d8916c6435764a6c94 SHA512 2b386aab0e1fad55e39dbd902ec50db5faac39268cd7e79c0e10d252e9633d777f43b861bcf079191e0d41a3414ccc05d70b8fddb4bff0bb54e72e0606eed28b
-EBUILD gom-0.29.103-r1.ebuild 794 BLAKE2B 907a660621d70485f96109afa817159842eb426d5378f314d77739259894edc0ac103dd38cdf89cbf706265ee8900874e48ec092c234f302d0f2b0e3b658ac63 SHA512 06e0205d93f0cf057a1aeafe5150f09450bdd69205cfefcdfa9083a6ddd2f0584039615deb7a6cc754d49f82a97cf077e45ebab723297548c944058d797670a8
+EBUILD gom-0.29.103-r1.ebuild 856 BLAKE2B 78bd8f7ff56e0023a047657eae8d66eec17f7cae0b405597e15ab529ff305c10ca257a4c51169a5a546fd5ff50c108df83a92864b3f01973458ac00508b805b9 SHA512 3b7b7f3ca2770a2b8c65a5ca5ef880f3410c75f8ff537d263a8a9af0bfa197258016e71adb6b30c597138098d1958aa99daf5e83ac6c55a5dcf85f148bdcd441
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gom/files/gom-0.29.103-tinfo.patch b/media-sound/gom/files/gom-0.29.103-tinfo.patch
new file mode 100644
index 000000000000..bb93fc2d39cd
--- /dev/null
+++ b/media-sound/gom/files/gom-0.29.103-tinfo.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/690092
+
+--- gom-0.29.103/configure.in
++++ gom-0.29.103/configure.in
+@@ -25,6 +25,7 @@
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
++PKG_PROG_PKG_CONFIG
+ 
+ 
+ dnl Custom options to configure
+@@ -39,11 +40,11 @@
+ 
+ dnl Checks for libraries.
+ 
+-AC_CHECK_LIB(ncurses, beep)
+-if [[ "$ac_cv_lib_ncurses_beep" != "yes" ]]
+-    then AC_MSG_ERROR("Need ncurses library for terminal gomii!")
+-fi
+-
++PKG_CHECK_MODULES(NCURSES, ncurses, [
++		  LIBS="$LIBS $NCURSES_LIBS"
++		 ],[
++		  AC_MSG_ERROR([Need ncurses library for terminal gomii!])
++		 ])
+ 
+ if [[ "$enable_x_gomii" = "yes" ]]; then
+       AC_CHECK_LIB(X11, main)
diff --git a/media-sound/gom/gom-0.29.103-r1.ebuild b/media-sound/gom/gom-0.29.103-r1.ebuild
index 30295a79e97a..b49d71e781ed 100644
--- a/media-sound/gom/gom-0.29.103-r1.ebuild
+++ b/media-sound/gom/gom-0.29.103-r1.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=0
+EAPI=7
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Console Mixer Program for OSS"
 HOMEPAGE="http://www.fh-worms.de/~inf222"
@@ -14,15 +14,24 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ~ppc sparc x86"
 IUSE="examples"
 
-DEPEND=">=sys-libs/ncurses-5.2"
+DEPEND=">=sys-libs/ncurses-5.2:0="
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-tinfo.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_compile() {
-	econf
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed."
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }
 
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
+src_install() {
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS NEWS ChangeLog README
 
 	if use examples; then
diff --git a/media-sound/guimup/Manifest b/media-sound/guimup/Manifest
index f4c08e85ad80..8b25699429bb 100644
--- a/media-sound/guimup/Manifest
+++ b/media-sound/guimup/Manifest
@@ -1,3 +1,3 @@
 DIST guimup_0.3.2_src.tar.gz 587543 BLAKE2B 8b8cfc3c6a42360320b44b42710b29ef0038de535d9f1004d19cbfb7d326a8e0f6e87ff1274791dac9960e4ca306299008f3324075c1f2374ce1a46749c757b0 SHA512 64f56b189e17c60432199d72e658ac2091d051d9cde7e53da7f89b96aadb006121a123bdde7ec80634c0b263e3d68ca1517592dda5a55cddf747c8ce85a535e2
 EBUILD guimup-0.3.2.ebuild 660 BLAKE2B bdb8c2e1c1aafecc84f3530377eed9ad1548e8b2913d0b3c958520f662a864d33d2b6da42278cc81fad26e1e4119c2b52cf864a4dc495d7f5b7dd0c3a63250a7 SHA512 c893349ceaf1e6c08a03b6f350f3742d20538462337fbeca29773744070b5dd94e21a55ff717d8bd600098212459b8223c8939597f6076aa61ee73ffde447e3c
-MISC metadata.xml 216 BLAKE2B f5ccda6d55bf38977fb8aff6da677ddc4601b7eac101e14a631650d35719d7f2acc88e27c275138e27afb890c3e7e6d02d07a031b94bec90913ab976f65c16b1 SHA512 ad6f0a8e26ad46fcaef1ea708b34788c38ae8826742b89f880c68b343e03d5f30cad1bcc2218e6c77dab240654773df8c80da270be88f404005f49768e2a46a6
+MISC metadata.xml 242 BLAKE2B 46ccd4c22db60541120e422bf9e5f14889e9f15b0c49657d126b6b33d54429f7088a08d6bfa38ff17024e783ac34e85bf5921eedd4cacc71c8094061b2f49965 SHA512 6247324f1ca339f695c8043cfbe7b785db9d44146bdce490738a4ff1a093f3f2db4591e1b42fc12b5865379caeb871be5f549bbb5b1cfa758bb99abb1f114af8
diff --git a/media-sound/guimup/metadata.xml b/media-sound/guimup/metadata.xml
index abe4ad0055bf..b16fad84e68a 100644
--- a/media-sound/guimup/metadata.xml
+++ b/media-sound/guimup/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="sourceforge">musicpd</remote-id>
 	</upstream>
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 08d4badf3941..cc839f5bbd8c 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,3 +1,3 @@
 DIST kid3-3.7.1.tar.gz 1486532 BLAKE2B aec19ca9792ab5a3ae975d64b581074f6505507027bc52483a95b8570fdf7484fadd63a5cc740b59817b6b2b7227f02637aeb3e9611d206a536138c6db083198 SHA512 68b1d4978e5e984d180981d02df5efa247d50da79e5c6a41010eb3c5369b6cdc023042333865f4730e47814c4b4b69dc2f1bcbe1566396b72637fd576f5e543c
-EBUILD kid3-3.7.1.ebuild 1632 BLAKE2B c12fec8923b9e8fd951d95d2d91acaf74d19772f173393823dc221b3b02c740f9a9bb89ecac7d5450637562dcce9cf992c31197296619a5904350097df2e6051 SHA512 4b04447619ba6e4618fab769fb1eb13ac42888b12e51c8b9257c1b4d5a1137d81e714deb606150c47310300b2157178ba7620cc89e858ca5fa5ebce08c28b1a2
-MISC metadata.xml 661 BLAKE2B 5a16df625ed1a34a04f7cd00cae636ec4dc2867cf1bab477c4a2fd99e21777ac949391c0c940da1235ee976a00b3812a84db1fb58c8c089aed983668f9ff49fb SHA512 d27b8c077e8363864d6d4baa217bd7813a01c520cba943bf25996823b944ed07c7b78205d5c77c1610566e2aa55cf03624633e4abef86e4378f6386b7bfb89c9
+EBUILD kid3-3.7.1.ebuild 1678 BLAKE2B ba1c3630a8ceabdf0e85564a714a8a7383f3627eab3757600cce110c5c4bf62befb0d560bf4039ca47ef929e07066562606dd556037b255f434711b448d5fc3a SHA512 1b03581e83c83748d027088b8ab358800d462a4ac699d1023ce938ebc747f4ed04598886327beca6a970d522dc293919468a7d41bab1e6e25f57da3cce8bbf03
+MISC metadata.xml 737 BLAKE2B eec3a25f3041a1174f4d43780344e5dcee09313461e18ecc7ad94400858d84e406934ee5924318539547ead7ad0dfc98af87e333cc62b2653a675598c15d9694 SHA512 6d4dc69756971b2db5d12116db5644b9cda51ea44f06b6e840246ca1d1cc0f53ed37240a1b71e6bd8b3cf6f31975ed9b5ec2a4f7d6a9d0d3dc5130259fce98b1
diff --git a/media-sound/kid3/kid3-3.7.1.ebuild b/media-sound/kid3/kid3-3.7.1.ebuild
index e6b2937cb437..87343373f369 100644
--- a/media-sound/kid3/kid3-3.7.1.ebuild
+++ b/media-sound/kid3/kid3-3.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="5"
 KEYWORDS="amd64 x86"
-IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
+IUSE="acoustid flac kde mp3 mp4 +mpris +taglib vorbis"
 
 REQUIRED_USE="flac? ( vorbis )"
 
@@ -21,7 +21,6 @@ BDEPEND="
 "
 DEPEND="
 	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
@@ -46,6 +45,7 @@ DEPEND="
 	)
 	mp3? ( media-libs/id3lib )
 	mp4? ( media-libs/libmp4v2:0 )
+	mpris? ( dev-qt/qtdbus:5 )
 	taglib? ( >=media-libs/taglib-1.9.1 )
 	vorbis? (
 		media-libs/libogg
@@ -66,6 +66,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_CHROMAPRINT=$(usex acoustid)
+		-DWITH_DBUS=$(usex mpris)
 		-DWITH_FLAC=$(usex flac)
 		-DWITH_ID3LIB=$(usex mp3)
 		-DWITH_MP4V2=$(usex mp4)
diff --git a/media-sound/kid3/metadata.xml b/media-sound/kid3/metadata.xml
index 8db1b09337d8..17adb5fc18bd 100644
--- a/media-sound/kid3/metadata.xml
+++ b/media-sound/kid3/metadata.xml
@@ -10,8 +10,8 @@
     <name>Gentoo Sound project</name>
   </maintainer>
   <use>
-    <flag name="acoustid">Enable support for acoustic fingerprinting plugin using
-      (<pkg>media-libs/chromaprint</pkg>)</flag>
+    <flag name="acoustid">Build acoustic fingerprinting plugin using <pkg>media-libs/chromaprint</pkg></flag>
+    <flag name="mpris">Enable support for MPRIS2 interface using <pkg>dev-qt/qtdbus</pkg></flag>
   </use>
   <upstream>
     <bugs-to>https://sourceforge.net/p/kid3/bugs/</bugs-to>
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 1d7df2c7e5fb..c66a2d2e11ad 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -2,17 +2,7 @@ AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20
 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
 AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57e4614727d7425e9323836db997a6876ae4b8266182f34cbb72199f8db5ef8aed79f5beb4fb5ea483 SHA512 ad67bee1e614b2901e977e0a7a9bfea7ec9bdf3af9546664f42c1d1426eb5e7990028546390219912e724eeca8ad063a2ac39a048be281527b19b0a79e819961
 DIST mpd-0.21.10.tar.xz 670952 BLAKE2B efebbd5202b82e52800ff7e4f60fb9e7606e0b07cb157cf0bf04859887316a8466976095bc1cb83479f76f4a54074967ecfd3bbd1bf703e6ff6d5b8ad75a7816 SHA512 42272ab5f767c5a6b907f5dd922ca35abc759dfbb4769a235261fdf0433a0f70494f503255403d41dfd34902bd6aff21f48291b24fd5bc260a5fdef53800c991
-DIST mpd-0.21.4.tar.xz 663648 BLAKE2B c9226d2b02b1035091d3af535c269aec3fead779bf17d95b858706affb84089ca85250452884ed5ee96008724735abf80cdfa4d2de14d9928748284d753a4638 SHA512 454fde206f98f89a58ac773037963ac895ee6ce3e7d1032c49b980a3bfbbb69782a62900a5c09e4b39f24b2d1bcd380d7b520935563dd3b8d02f701389389ca7
-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
-DIST mpd-0.21.9.tar.xz 671092 BLAKE2B 87e1d8afe42b4ca59b1aa47cc0f6260af2d1c161928411cefdcd1f9e6c1013869cffccd729d2cefcc4ddff4fde18bab887407b1b71c6c46457c930c7802f3337 SHA512 e4c5561df881874a16716b32bc1381b6e3bd3690eac07cf3923d1e273937b9594cf387d1e1aa3b02c7f0d19bd30c4575f43863e11d9a69b6a647205009593a9e
-EBUILD mpd-0.21.10.ebuild 8210 BLAKE2B 6d8dc4bfe296f70ee0fade0a0c77059500da0a7e6fc880a329973620d823496519da8b94598757a327966f209c6c20f3f4b30bebcb99eef74849f0dc8984efa0 SHA512 18ebeaedad356600acb15badd8b5cdc3d81708ca3c62505a00fe77aa538c114accd650c439f1ea29ceb9df40cc4b8c34821abfec575bfc091a84b53bf8dc5118
-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
-EBUILD mpd-0.21.9.ebuild 8210 BLAKE2B 6d8dc4bfe296f70ee0fade0a0c77059500da0a7e6fc880a329973620d823496519da8b94598757a327966f209c6c20f3f4b30bebcb99eef74849f0dc8984efa0 SHA512 18ebeaedad356600acb15badd8b5cdc3d81708ca3c62505a00fe77aa538c114accd650c439f1ea29ceb9df40cc4b8c34821abfec575bfc091a84b53bf8dc5118
+DIST mpd-0.21.11.tar.xz 671444 BLAKE2B d10e65103e9c0c6dfc44f8d4858c202ad68a5e7a44bd7dd473b7f78c697b20ab7d52d2bff0f7e7434ce06b1afb9a68e6f71ca6148efdf51e122c463506b356b2 SHA512 40e25428295f1bded618872c1450f6836c46b2e788dca06d0af134b939a25a7a9a215273bb005306df288e5dc5ccb44d4054c47e5583e54b970fa252e4b030a7
+EBUILD mpd-0.21.10.ebuild 8207 BLAKE2B 89cffe19bb5f8b78bdb83bf1594a622778cbe38004b325ee0c28f8d0947ae31794be22668b9629efd69036343199688ac49f37dc4a3a6d3e8b9ba1135b3b3163 SHA512 a9c9fc5d95f2340a084507028c3d8a861ce97271496e394d397599def16da1372748ce986f5bd163278a8be54a5251509b543f56cddfcab704d91d149d33f43c
+EBUILD mpd-0.21.11.ebuild 8210 BLAKE2B 6d8dc4bfe296f70ee0fade0a0c77059500da0a7e6fc880a329973620d823496519da8b94598757a327966f209c6c20f3f4b30bebcb99eef74849f0dc8984efa0 SHA512 18ebeaedad356600acb15badd8b5cdc3d81708ca3c62505a00fe77aa538c114accd650c439f1ea29ceb9df40cc4b8c34821abfec575bfc091a84b53bf8dc5118
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/mpd-0.21.10.ebuild b/media-sound/mpd/mpd-0.21.10.ebuild
index 969b82d84813..4199b689d53f 100644
--- a/media-sound/mpd/mpd-0.21.10.ebuild
+++ b/media-sound/mpd/mpd-0.21.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~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
diff --git a/media-sound/mpd/mpd-0.21.7.ebuild b/media-sound/mpd/mpd-0.21.11.ebuild
index 969b82d84813..969b82d84813 100644
--- a/media-sound/mpd/mpd-0.21.7.ebuild
+++ b/media-sound/mpd/mpd-0.21.11.ebuild
diff --git a/media-sound/mpd/mpd-0.21.4-r1.ebuild b/media-sound/mpd/mpd-0.21.4-r1.ebuild
deleted file mode 100644
index bcf1b26d296f..000000000000
--- a/media-sound/mpd/mpd-0.21.4-r1.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# 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="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}"/${P}.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/mpd/mpd-0.21.5.ebuild b/media-sound/mpd/mpd-0.21.5.ebuild
deleted file mode 100644
index 9f214249da52..000000000000
--- a/media-sound/mpd/mpd-0.21.5.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# 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="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/mpd/mpd-0.21.6.ebuild b/media-sound/mpd/mpd-0.21.6.ebuild
deleted file mode 100644
index 9f214249da52..000000000000
--- a/media-sound/mpd/mpd-0.21.6.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# 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="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/mpd/mpd-0.21.8.ebuild b/media-sound/mpd/mpd-0.21.8.ebuild
deleted file mode 100644
index 969b82d84813..000000000000
--- a/media-sound/mpd/mpd-0.21.8.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# 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/mpd/mpd-0.21.9.ebuild b/media-sound/mpd/mpd-0.21.9.ebuild
deleted file mode 100644
index 969b82d84813..000000000000
--- a/media-sound/mpd/mpd-0.21.9.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# 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/mpg123/Manifest b/media-sound/mpg123/Manifest
index 416f3e400b70..a4c74c827dea 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,3 +1,5 @@
 DIST mpg123-1.25.10.tar.bz2 921219 BLAKE2B 04bfbe8915e3943ed42cc2d3597b0bd9c4686f77ee699f5845e7d1e905022206724cf23d6b0420a36e64b232f840dd9367f46f3c00dc2fe6256f44e8b83fa5b2 SHA512 a33666ae4aca7e7c1a93a6414d8c525ec19044c54f712d578180147d88e63033f7af2370b9ad22960cc3a0b454f15967b7a831cccc97e034c8855f70cdf1ab09
+DIST mpg123-1.25.11.tar.bz2 909478 BLAKE2B e821826c91acd3c0b4b9e6b83df6c5625f86611ecfdedd2dcc12b0ce8b3389199aa4cf7eea48b597e5b7f740bbe2c7612d27e75897e34bed2a2407e98b2b7a43 SHA512 986338d0f4829ec9e40990cb384746c7abfa80d3b3d5656b6dda73d03e2441c1f28ffbe7f3f82b0008a1c4ebcfa07aeffb493e95f13f7d04cbc818a09f1008ed
 EBUILD mpg123-1.25.10-r1.ebuild 2860 BLAKE2B 0d25dbccc63c6788dd6c1e0c3a15fc8766d5e5616decfbcaa8f3567a53b98c01c6fcbbf23a4aab85369b14d8eb30498be411cf3cc1a8d577bf2f73dbc08849cd SHA512 20f23de51561b06b5dc1c6ef2923afb7f855caa234033847259223d8076588197f7c9f84be7421bf70d01f2cef3bacfa6b21cdb05e36c59539e06f9d3918bd44
+EBUILD mpg123-1.25.11.ebuild 2884 BLAKE2B c3d89fc5a388dedd602be32569f3d1269d1b30b1ca4728abb5e14b979a37ae1a29c11e76b0afdb5fd231419750d6707e6b2844485e867479f9c7f3a244d64898 SHA512 95c204f1ea1e0ff2406daef4114d21cdd74d62842215f977abdec3736c6e626345e112aaa8d035d67aec0306cb121f25f5c3b02c834c874e1965883d50fd3f1b
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.25.11.ebuild b/media-sound/mpg123/mpg123-1.25.11.ebuild
new file mode 100644
index 000000000000..b0eac0164fa8
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.25.11.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="https://www.mpg123.org/"
+SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+RDEPEND="
+	app-eselect/eselect-mpg123
+	dev-libs/libltdl:0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+pkg_setup() {
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+}
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	if $(multilib_is_native_abi) ; then
+		local flag
+		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+			if use ${flag}; then
+				_audio+=" ${flag/pulseaudio/pulse}"
+				_output=${flag/pulseaudio/pulse}
+			fi
+		done
+	fi
+
+	use altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use cpu_flags_x86_sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
+		_cpu=generic_fpu
+	elif use x86-macos ; then
+		# ASM doesn't work quite as expected with the Darwin linker
+		_cpu=generic_fpu
+	else
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
+	fi
+
+	local myconf=(
+		--with-optimization=0
+		--with-audio="${_audio}"
+		--with-default-audio=${_output}
+		--with-cpu=${_cpu}
+		--enable-network
+		$(use_enable ipv6)
+		--enable-int-quality=$(usex int-quality)
+	)
+	multilib_is_native_abi || myconf+=( --disable-modules )
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! $(multilib_is_native_abi) ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-sound/scmpc/Manifest b/media-sound/scmpc/Manifest
index fe993e98f2c6..0bb390be9591 100644
--- a/media-sound/scmpc/Manifest
+++ b/media-sound/scmpc/Manifest
@@ -1,4 +1,4 @@
 AUX scmpc-2.init 317 BLAKE2B 4b6f9aad5b4f993b5e34ec35aaf1af67a2407e815ba51942e3634451b0bb814e6dec10004e9df43df5aa3ffae4f1ef84899438dd704748d0e5925e4a6156481c SHA512 58cd9269acbdb92bd4ab0ae23c1f5a07909debf9b37131824827089aece9552493b984f5d73c654a7f6ef47e7bb496e424cbe3885db932ab5554bee9f296f0df
 DIST scmpc-0.4.1.tar.bz2 88288 BLAKE2B 6502b21b512604e611f2d6a3210b3f5d64d3dd476b5c17e7e92480478b1488220147ccaa3b43f838fcae646c6c501f6b4bdaaf543df05151782f46bf689cd25d SHA512 7d9f8aad29d58f2227a6149a6b4c9bfc4d400946ac316cbb34482feffd71619c1f311cb1ce6f02c22912793e866661e4d976c8f4ee99ffd1e76be65c9a06d876
 EBUILD scmpc-0.4.1.ebuild 663 BLAKE2B 31dc582fbd0bb73fe5379bdb3de06594d63174051b7ccdc5ea4f592916d998caa960de09c34ea6b097eda8fc29d93fa81ff73c039c58050dde8ee9098c88a999 SHA512 964e38c230f79930c210f481cf0227ea7a3136e7b98b4feabe0eb2ef3164fd4cb639178efc0a713f1ed5b0085e1844ff28e40ce585e2bac163daf3377d3d1bfe
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
+MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/media-sound/scmpc/metadata.xml b/media-sound/scmpc/metadata.xml
index 097975e3adc2..58f638b2ac3e 100644
--- a/media-sound/scmpc/metadata.xml
+++ b/media-sound/scmpc/metadata.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 </pkgmetadata>
diff --git a/media-sound/sooperlooper/Manifest b/media-sound/sooperlooper/Manifest
index 26a87552bb13..8ae85f456894 100644
--- a/media-sound/sooperlooper/Manifest
+++ b/media-sound/sooperlooper/Manifest
@@ -1,7 +1,8 @@
 AUX sooperlooper-1.7.3-clash.patch 52851 BLAKE2B 8bc313d488306b2c5ab6b9055ccad4173835a3715dfc39ec85e434555dfa930dc38d566883f8d2c88ca6c87f3d626c7026b77754e6b77827e524f6d0bfb443f7 SHA512 a95db701cbc62bb0e730a34fe2bbc8e6f0351c9d7c579c87465a8b9808ed9c213f2ed406ee42787313c08e9a6ba9ce4c5e8aa215ddea8bbf984b0d7bd0429536
 AUX sooperlooper-1.7.3-libsigc28.patch 3219 BLAKE2B 05a0afbf8f5d0038df97d86ad4b4ae76dbf08bc717dee3932779abc450d025a82aa9314f97252256a660f0bfff473ea882999e12431545b260ba3998353e54ce SHA512 1de246e8bef9ea6f2163070034ee829166a89d0e670fceb36f8df2d47e2de7b845d98f3556a67575a793b01e2823a62f1c6d27e594932cfba7b1620e1e3007b5
+AUX sooperlooper-1.7.3-tinfo.patch 682 BLAKE2B 670e14508384de3fbab0eeaf38ab8db451822a42dae88ff570a49d5ece4b22f50254c830b72db04016c66491d20cf2cd992c09f20ba75af8f0aed668327daf37 SHA512 6d3c4d5ee8625d0dc833c0150fcf5bbe1d19f0492cd66b5a260d2a9e72816af964cdebb470fbf665f45ea37193b20d8f9d4309e6dc845f47b7ab42304df4a15a
 AUX sooperlooper-1.7.3-wx3.0.patch 8149 BLAKE2B a2afa2d64dc2390db6690304339249f046639c6f0cba5f754c388515cc8093cca57342ed634cbb460678a3d0bddb2ac05a2d2c4f43c8e51175d1dc27dc13bd39 SHA512 93e3630f2a7f839b282b04cd35cdfee025f91bd24b5e715c668ef0f63a675c1c57f53aaa1ead0d27c73a9a2323160217fd9d62c25a5da27c5ed361f527880381
 DIST sooperlooper-1.6.5-m4.tar.bz2 1463 BLAKE2B b02010f5aae113078d167b65a8ab232673eac622ae6595d23f4759fafa05aeb503ea30ace950b3e9cb4d85abe92af7eda13e4c5a3199630c83f2761c812bc9f7 SHA512 01b4405dcd91e617c8dafb9fcfab99507d0a9637d9b0eec84276c348968e31159b68ce5c8b7f900ab8a830f2b5c91b798146d5272d006a2b866f149e485f228d
 DIST sooperlooper-1.7.3.tar.gz 732406 BLAKE2B 65adf851c0f8e4152176ac5a53a02c2113cb4876f1abf1cbbc5c12556d8508b8e1b063cc7107032f6cd3118afa3f239303c7b04e66786bded24e5950bef16bf7 SHA512 cbc9f6b3e4cafc6f18ddb2e2415d2bac274c8cc578b5dadc6ad878b1bed34e514208bc990c3a7dab0106cbf34ad16be12846851e446d724d77386e70d975e14b
-EBUILD sooperlooper-1.7.3-r2.ebuild 1397 BLAKE2B df9629f99238644202529d7d468077643d6c72d13a199ee4501cd955b87ffbfa2f0515fcc4027cb562d08b073ec5e93319086a56deb43f5caf3b1bc25ff8fd04 SHA512 46caa1bac63f47adbb9ea129b66e8a5baf10b5ea7287dc410a8c34e94003d0deee7e54d3cd3ce37be792bf80523e99d0ae476f4ae4030e08ddfb9be078f2fde2
+EBUILD sooperlooper-1.7.3-r2.ebuild 1426 BLAKE2B 3f47d23b730c693b2feff00c91493758d69f5590f3b55c05a2990eb0b83366e274f12aec9a0225df325f39cd3708443960221bb1a7d7ef565306bfda333baa19 SHA512 32bc01c21cb171f45b80c9cc8085a3a6432f907cac85dd4551592029d4a8367597738cd8509184618182859d137ee20f2d9837f25613afee310ae30882e43215
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/sooperlooper/files/sooperlooper-1.7.3-tinfo.patch b/media-sound/sooperlooper/files/sooperlooper-1.7.3-tinfo.patch
new file mode 100644
index 000000000000..82694f463839
--- /dev/null
+++ b/media-sound/sooperlooper/files/sooperlooper-1.7.3-tinfo.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/683738
+
+Thanks-to: Jeroen Roovers <jer@gentoo.org>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -214,10 +216,11 @@
+     AC_SUBST(LOSC_CFLAGS)
+ 
+     dnl curses
+-    AC_CHECK_LIB(ncurses,initscr,have_ncurses=yes,[AC_MSG_WARN([******** you don't have the ncurses library correctly installed])])
+-
+-    NCURSES_LIBS=-lncurses
+-    AC_SUBST(NCURSES_LIBS)
++    PKG_CHECK_MODULES([NCURSES], [ncurses], [have_ncurses=yes],
++		      AC_CHECK_LIB(ncurses, initscr, have_ncurses=yes,
++		    		   [AC_MSG_WARN([******** you don't have the ncurses library correctly installed])]
++		    		  )
++		     )
+ 
+     dnl sigc++
+     PKG_CHECK_MODULES(SIGCPP, sigc++-2.0 >= 2.2.10)
diff --git a/media-sound/sooperlooper/sooperlooper-1.7.3-r2.ebuild b/media-sound/sooperlooper/sooperlooper-1.7.3-r2.ebuild
index 5d2301bfa9d8..62c837de9ed6 100644
--- a/media-sound/sooperlooper/sooperlooper-1.7.3-r2.ebuild
+++ b/media-sound/sooperlooper/sooperlooper-1.7.3-r2.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
@@ -40,6 +40,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-wx3.0.patch
 	"${FILESDIR}"/${P}-libsigc28.patch
 	"${FILESDIR}"/${P}-clash.patch
+	"${FILESDIR}"/${P}-tinfo.patch
 )
 
 src_prepare() {
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index e851049840ab..f04619d38990 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,5 +1,5 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
 DIST spotify-client_1.1.5.153.gf614956d-16_amd64.deb 113728674 BLAKE2B bc7930a1935c0a05dba262abc384a699720be53e3bec83393c962761bee647a247d2ddf475a6812bdb969fc1f59e9d2c283de0da398a9b8f7ddfff8f1232fef1 SHA512 db354f161c35b5f1a2d633282fad8fccf565e0061e7d258012f28422d766630391d47d4dafe22448fb60f850bf4ccbfdf82443cf107e03727c077b2c62e524be
 EBUILD spotify-1.0.72-r1.ebuild 3204 BLAKE2B 8844b7707b35537320da75bd7417c320559abbc668249cc652e9e2d481cfc9a00328458a8ee8c242acc46e832a81127686f0a3bb93ee6d4e4cc2e9e24f8c18d7 SHA512 8f194869be7f6aa8a9330d8597e8a4419a19203f4dbe387de1aeeda9350de13e4596a01290ed452c358d72fc8e20e249b4fcbf17a1f38a688315e0c189e0cc4c
-EBUILD spotify-1.1.5-r1.ebuild 3139 BLAKE2B 1ee1b89ab15fcbdc964636cdcb2630d72ed1b6a4830761c98465686aa9a06e09659dca2a1afd5b0f6f4f65e3e7a6fa4ee9613b78232bf34b4109ba5480c94664 SHA512 412165d9e270d0a3a1ebf0338a307e0fdc6a22d760aeefb46427dcbb3b9dcc906d9be40bdeed986588a9096bdb45465018f22e2752e8adb56c7e43a844a77433
+EBUILD spotify-1.1.5-r1.ebuild 3188 BLAKE2B 79a4713225eec33dac6d1228dbb6d885fefb787f7f314aa8324309c77f6bdd18de3be553f76b71fcb44d1b7f3a344b3e836cce64645413003b74e6ad62b67032 SHA512 c2c5b75c64e4b6c8ed2d4b8ebb75d9239b0c081339226040cae012c72f29beae89d6a25ba8d85db2416540a0104afe12dce30db10cc0332c26c1ccafda97d200
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.1.5-r1.ebuild b/media-sound/spotify/spotify-1.1.5-r1.ebuild
index 5fe58e2255fc..a681fe950c04 100644
--- a/media-sound/spotify/spotify-1.1.5-r1.ebuild
+++ b/media-sound/spotify/spotify-1.1.5-r1.ebuild
@@ -75,6 +75,7 @@ src_install() {
 	dodir /usr/bin
 	cat <<-EOF >"${D}"/usr/bin/spotify || die
 		#! /bin/sh
+		LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\
 		exec ${SPOTIFY_HOME}/spotify "\$@"
 	EOF
 	fperms +x /usr/bin/spotify
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index 3711ff81d7e6..64e8c327c66d 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -1,10 +1,12 @@
 AUX supercollider-3.10.2-boost-1.67.patch 1521 BLAKE2B 0e63a18647b85cede59cf8dcda9f9834122f7cc6cd0ebc6722aa94e55ae0f8e1d1cf68ad7a5ac05c0a43d993e10decae034e8d17b09c14caa31314a131b3ff9e SHA512 6e57040b2ab9df0ee9c64d72b95ed5cee2d9f6c76231ff36d72ea8662df1cd49f96cfde68e6ba76b0f15ef2a1d9c78386fd886fcfc337630e47a9d35d036d7b1
+AUX supercollider-3.10.2-boost-1.70.patch 1882 BLAKE2B 48fdf58789d37a296a28f11045d3f224c29a3bdfd39d5377101d2a1bb501f8a648307b0546daadea3d46213d6847098a1128101b1bd990c6ffe203aac6bdd6fc SHA512 0a999fbd53de6c7c2fb81451c6a1f4ce909220a257eefccce1d2246238637d661757795dfc4be7dd69c0553bdf1a02db9311da6033fe7b17230800d06fd291b4
+AUX supercollider-3.10.2-no-ccache.patch 927 BLAKE2B 661610049aab5c077cbff57fa476d08ef7170440135362dafa96b4ab312d778154acdcccd93562822c7d6078d55c6c5eaf59eeadc85e61cc85f1e50a76c908e8 SHA512 5a1f6f074adcb77b9958ff47e855378f9ec180201e32cc417925320ee7fbeedd5b2a163b300286bf0344bb6bb47743598c59c95f28573f4a309696ca5e44af8d
 AUX supercollider-3.10.2-system-boost.patch 15055 BLAKE2B d6b3b2c9f13829ff5b2af037f4204fff519efe67bcb7b705090a2883d97738f0cc8b4a66fe39f88d5fe676081ed44fe3132d23e404c821353d1e9b31d1e0d764 SHA512 d9b2ef108673b11a27c63654ceacf3b7e51df11ce05fc6d9045abd219ea718c2552f5ea026a5182c272639e695a1073192013b14cae257e7e4b00dd3c303ecae
 AUX supercollider-3.8.0-no-opengl.patch 2146 BLAKE2B 0697fcad3f277072459d40675509b223e5b7e35d8ecd94e200817bceeea12e224201376c8db61b46159f8b18e3f27b28549458bdfc0793c994d17943ae4cb3b8 SHA512 33dabf5ce200b783d3c54e8ddbb1217d4d4269ae4b8f82627264737377c786fc049e6b9309b97ba06eced7e313d39a57129dea98915b4a0106a8f413b9e86fd2
 AUX supercollider-3.8.0-no-qtpositioning.patch 1840 BLAKE2B cf4ee13c08e81f3ae19d50b23f8416a5045bd60ab64f8b6c0903f40addf7701b30792f9d4de0c57f3b4f4b2b661eec19eb5b8faa520997b263215dfee6df5a8e SHA512 df86ee0e3c190283b9ed79a3bc4f1108ee0279c1d6f44bea6ffdeb7fc77b38163f2d9ab199b8124e2f06d436d68d217995b46c580740951e5e13cbd56618b635
 AUX supercollider-3.8.0-no-qtsensors.patch 2675 BLAKE2B 0fae3883eddbf2bc025e7dab0600915d3770e20c28fedc51522d1dff7e9b3fab2e4d920762b252d2af711ea4f2b010e8b532d90595c4594a757437cbc6a907ce SHA512 4574101c4c41522ebeb7a747f29734beec7a7d4eb0751d959718e0a040e1fb7fc76685d53e2cdf5e027ad91b7a0c7465714acc951bd4d4d8023145008f0b314c
 DIST SuperCollider-3.10.2-Source-linux.tar.bz2 11366481 BLAKE2B d01324ed65f7e8977c138709471e7b9000b1d05ce4c1c0ff83c9ca0ae6e3948b4933320c382b64ecd2aebc65597c963c9348dda09a8c2ec7bc2ea5a14473fe44 SHA512 f7d136cb03e32dfd0b72e36047deaa24d5edfac0f7e9eeaac35f8e991cd52b00db0701478e0daefb24bfbbc55b5cf240e3f3429fd46caa8d76daa21c7aebaf46
 DIST SuperCollider-3.9.3-Source-linux.tar.bz2 11060240 BLAKE2B 5da51bece13d2a3e4ca1ff6b79637122a46c1f590aa7e4ebf52d7a663506c6f4bae4f3d618bb7f947c73828402f329be68e435a4de2ecc092c312cb2c993742c SHA512 5b0c29941907d5ca45c1676e34184664c03891051bba0ee50d9e8311400824054de7b6daba6d29fd875ff38f42ee9654504ea2f0b5bf0a36ae9605e6a79a0841
-EBUILD supercollider-3.10.2.ebuild 2982 BLAKE2B d1ef0c71025087b75d46edf3ed95013afa1468bc9cbbce4d14713480b43ef2d497ac9051229f5c895223069ee1f2fffc7d3ed46120536047ca8bec0c46538d98 SHA512 c40b75978895ed49d83ae7a423d87af26191520073edcc6339ad698fda510f6721cdeecbab9e2eaa492a32f2fe60007311a462cfbe35ac15e251b6ab4ea79d29
+EBUILD supercollider-3.10.2.ebuild 3055 BLAKE2B 3569094c88762fde957ff9c979f3d6bb777b859a0f4bbb4c7a893b14acae31b32bd5a319867407488fde390c00261591bded8143ead4835866e7b64dd2599eb8 SHA512 01e2f6979578cba5736c415594e805ce36db7c797b02fe22932ad7320a11fc7242fda2b87c09021797517a20b0f8353e4b6cea877b4f8990c603f45bc8d85277
 EBUILD supercollider-3.9.3-r1.ebuild 2836 BLAKE2B 164dd68cf7178fca42bb1a650ddee93dc9ff90db43f4f4c95a09530ac02305c176a450430fa956d094a6368e6e0e81ab1d379cf10ea6e801a9e762edc61fb9c8 SHA512 25ca2d3f3a14fc11db4cb6626bbdaa43ded4e1ee2bf2a616e3c83cf34e171eff22ce831ca6d4087477140fcb92a3f2283a1dff6374a5d2d4a65226e3da23060f
 MISC metadata.xml 840 BLAKE2B 261014eccb171924a9a70a4972d9ea1cb9ad36f6ac2b7ecb40ebc2eee59d535871957109e239b90500d26073769cf58cd475cf221af0d2caf42033a2e0e56911 SHA512 a8ce15c95e8b04624301b814156ebe84195071b2ec80b223444c733e8b4de8137d4d70397f3a84d2894bdc635fff5d15ba66a9409749c02b3f3acb40d9479895
diff --git a/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch b/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch
new file mode 100644
index 000000000000..74fc05ac45cd
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch
@@ -0,0 +1,53 @@
+From ea95d667907e1c9d4ee3ad8b33b452d60059e3c8 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 16 Jul 2019 17:30:38 +0200
+Subject: [PATCH] Fix build with boost-1.70 (get_io_service() removed)
+
+Fixes https://github.com/supercollider/supercollider/issues/4490
+
+---
+ server/supernova/sc/sc_osc_handler.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/server/supernova/sc/sc_osc_handler.cpp b/server/supernova/sc/sc_osc_handler.cpp
+index 5116a1be8..8c2418b09 100644
+--- a/server/supernova/sc/sc_osc_handler.cpp
++++ b/server/supernova/sc/sc_osc_handler.cpp
+@@ -728,7 +728,7 @@ void sc_osc_handler::tcp_connection::handle_message() {
+ 
+ void sc_osc_handler::start_tcp_accept(void)
+ {
+-    tcp_connection::pointer new_connection = tcp_connection::create(tcp_acceptor_.get_io_service());
++    tcp_connection::pointer new_connection = tcp_connection::create((boost::asio::io_context&)tcp_acceptor_.get_executor().context());
+ 
+     tcp_acceptor_.async_accept(
+         new_connection->socket(),
+-- 
+2.22.0
+
+From 53909b1ff2983442dd8d2fdeff6b4331767237f1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 16 Jul 2019 17:47:44 +0200
+Subject: [PATCH] Fix build with boost-1.70 (missing checked_delete.hpp
+ include)
+
+See also: https://www.boost.org/doc/libs/1_70_0/libs/core/doc/html/core/checked_delete.html
+---
+ server/supernova/utilities/utils.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/server/supernova/utilities/utils.hpp b/server/supernova/utilities/utils.hpp
+index 35b8ab5ad..a7c191f2d 100644
+--- a/server/supernova/utilities/utils.hpp
++++ b/server/supernova/utilities/utils.hpp
+@@ -23,6 +23,7 @@
+ 
+ #include <type_traits>
+ 
++#include <boost/checked_delete.hpp>
+ #include <boost/intrusive_ptr.hpp>
+ #include <boost/noncopyable.hpp>
+ #include <boost/detail/atomic_count.hpp>
+-- 
+2.22.0
+
diff --git a/media-sound/supercollider/files/supercollider-3.10.2-no-ccache.patch b/media-sound/supercollider/files/supercollider-3.10.2-no-ccache.patch
new file mode 100644
index 000000000000..66a765a8b9ea
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.10.2-no-ccache.patch
@@ -0,0 +1,25 @@
+disabled the use of ccache, to prevent FTBFS; as the compilation is done once
+it has no backdraws to make the debian package.
+Index: supercollider/CMakeLists.txt
+===================================================================
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -150,12 +150,12 @@ add_definitions(-DBOOST_CHRONO_HEADER_ON
+ #############################################
+ # Detect CCache
+ 
+-find_program(CCacheExectuable ccache)
+-if( CCacheExectuable )
+-  # only used with >=cmake-3.4
+-  set( CMAKE_C_COMPILER_LAUNCHER   "${CCacheExectuable}" )
+-  set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExectuable}" )
+-endif()
++## find_program(CCacheExecutable ccache)
++## if( CCacheExecutable )
++##   # only used with >=cmake-3.4
++##   set( CMAKE_C_COMPILER_LAUNCHER   "${CCacheExecutable}" )
++##   set( CMAKE_CXX_COMPILER_LAUNCHER "${CCacheExecutable}" )
++## endif()
+ 
+ #############################################
+ # Options
diff --git a/media-sound/supercollider/supercollider-3.10.2.ebuild b/media-sound/supercollider/supercollider-3.10.2.ebuild
index 83ab1fcb862c..6ea80528297c 100644
--- a/media-sound/supercollider/supercollider-3.10.2.ebuild
+++ b/media-sound/supercollider/supercollider-3.10.2.ebuild
@@ -62,8 +62,10 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
+	"${FILESDIR}"/${P}-no-ccache.patch
 	"${FILESDIR}"/${P}-system-boost.patch
 	"${FILESDIR}"/${P}-boost-1.67.patch
+	"${FILESDIR}"/${P}-boost-1.70.patch
 )
 
 S="${WORKDIR}/SuperCollider-Source"
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index ec4d4876fdf9..ec5ab44ad6e7 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,10 +1,6 @@
-AUX teamspeak-client-3.2.5-qt-5.12-symbol-reexports.patch 4523 BLAKE2B e7193fae5efbaeac62e8366f89e8fc19cc32b0eb5269f74ba2108c2bf656f4fcd22d861e21e6512fab6240cef89a6aae7f1c2f77aba01be78af14aef68a8d223 SHA512 fdfe279bb69e7e48a28b64dd430eaeb74a51a3de7c3ea7ee32d0b399e386188f0d3f8f26064ea90f857d362639ad5cc019696cc28cf04691cb97c119cb47627e
 AUX ts3client-bin-r1 474 BLAKE2B 79b29de7ea3ceabc88d681e96c871612e9ebcb1da291f2500c3e533433a31593cb9d32e82cf9fd305d2d9c04f7d6df62295594397eb447ffb9a6d3396541872f SHA512 27b6ac42ec3ca05868786ee62d0f9ac4900ed2db9dfed0f2fe9cb951669e7abee7e0d2f8d07db76b03c3fc965fb48f46d94b4e64a5e8dbcd6c24d22e724db938
 AUX ts3client-bin-r2 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
-DIST TeamSpeak3-Client-linux_amd64-3.2.5.run 76619678 BLAKE2B b8d42a4d633124cab395ea69d3ccbebc65f4d9b5a148c6a81a6d9a3afab48dd59fd99ac3f5cc9551c89daabb7cc51a60c5587034a7a5bec5e3b530ecb3d6e220 SHA512 fdfaa863d3523fffdf46ca0cf9c2b0588e8d847e348ade75c8f82818920f493460740a5192d4cc8d1eafe1e7a03af93b09ae6ddecaa0b166552ab5409508a445
 DIST TeamSpeak3-Client-linux_amd64-3.3.0.run 95624376 BLAKE2B 0e6129ef32e43bbea18c9a047af3599f96975dbdbfd9ff22a9f3cea60eaf5841eacf8b396b855819fa06787a4f192aadcf2cd76b3873b48021fdd3e7fd99b371 SHA512 477ced3deb4d4226817bf1f4ec0828123c027027160cdc62a6384583227c153168ec28025613380483229e2a8b3c30bf5b17337c3011e52f01317a9f0dbd4bbb
-DIST TeamSpeak3-Client-linux_x86-3.2.5.run 76311914 BLAKE2B 4a8f4a6ce55bde680f2d9d1f28c1cabe2a01fa6c10f3f3f637931dbe2f652c87cd2a7b61f054b50a8faf3bce461e316ca2e9b68418271535a5f6a3cd0b9d3492 SHA512 90b46a840a6e43bbc7d4cfb526117a81cdb92fb8186194ab9f245e8e501608ec4740a198e8d1de5e3f69bea84ab6281384915193d4e6a1e90aff45b4b80d3d9a
 DIST TeamSpeak3-Client-linux_x86-3.3.0.run 94313517 BLAKE2B f806d23f3039cc30a6bf09945f7041bb271040419b5221d663b0119873edd08bfa4f57befc4e8f53efc12f5b9d4c423bc1706e48f6194f4df89392db6b4cff9f SHA512 b5696ed18fe31b3051c5346ceb1bb06ceb0abafb1f87767a696961836a02804cd92a1aabccd24959b37962162bdc2bcfbf5ccd0ebe44b1816b832f7b018c5588
-EBUILD teamspeak-client-3.2.5.ebuild 2539 BLAKE2B 567bb70a3c72a3bf13a5cb9c721b40f292b2a7c18260e042b7f6a48401fb78aabd12f095b963336cca6baaf2681f9c41caffab961959d689fe13f1b4c1f2cc58 SHA512 65e2c1006054b428a8d230428abaaf9bf99b6df51c3fa13b8941e6aac4619d1f8e988e4bc0bdfc6bc50972a3ec642119fae23c277a0bc149de24f5fcf77b9540
-EBUILD teamspeak-client-3.3.0.ebuild 2471 BLAKE2B 14995cbd4b7af4f54e234ff5935806191c43fea5b71e07ec585eb0373fb9ad5969d749c8da7425349beb85d5e928ce7dda94bcf7ec628512cc3809b0cb384263 SHA512 9add7c8377a9e7d0f7e75d1882617bba4295fa1f144823fe78b2d6dc47c9b0c0c4f6b6865fb160f2611c68289790915ebb015320d737e30e7ff8ff958cc8f2b8
+EBUILD teamspeak-client-3.3.0-r1.ebuild 2474 BLAKE2B c6ccb57ac969eeac6e69a329cc1056215fec98ef46fbbe00d8d995dad0846c97fb637a0d7820470fc0908223d847eb37b183cd9923ce8070ee179a0100b45bed SHA512 3fb4a07a3dbcf3c99520324c42ad765d84fbaa56f6d37686389a00a9421cc01e21f549cb35a22802b1bc2a0497b786187fe5a557cd57a9d6326e6304d6554877
 MISC metadata.xml 756 BLAKE2B 24d27da6d88662420d55ced31434390eeb7cdb354bdd09c7ae9381c1317d69e6aba654098a11efe3a0a9f86f5dafa53302ef6ba09a84463ab4267a4bcb5cc260 SHA512 5fea4c3f3823d53bb3ab6d9c05fc8e468f45c7441276e94eabb05b680f6253a920d92fff8735433121814b1fe80bf5f51c60cd001b42e714cb10bb22a5609cca
diff --git a/media-sound/teamspeak-client/files/teamspeak-client-3.2.5-qt-5.12-symbol-reexports.patch b/media-sound/teamspeak-client/files/teamspeak-client-3.2.5-qt-5.12-symbol-reexports.patch
deleted file mode 100644
index ee5f78914d0b..000000000000
--- a/media-sound/teamspeak-client/files/teamspeak-client-3.2.5-qt-5.12-symbol-reexports.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff --git a/Makefile b/Makefile
-new file mode 100644
-index 0000000..c036d5f
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,2 @@
-+overrides.so: qt-5.12-overrides.o override-version.map
-+	$(CXX) $(LDFLAGS) -shared -o $@ -Wl,--version-script override-version.map qt-5.12-overrides.o
-diff --git a/override-version.map b/override-version.map
-new file mode 100644
-index 0000000..991d98e
---- /dev/null
-+++ b/override-version.map
-@@ -0,0 +1 @@
-+Qt_5 {};
-diff --git a/qt-5.12-overrides.cpp b/qt-5.12-overrides.cpp
-new file mode 100644
-index 0000000..002a1af
---- /dev/null
-+++ b/qt-5.12-overrides.cpp
-@@ -0,0 +1,120 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2017 The Qt Company Ltd.
-+** Contact: https://www.qt.io/licensing/
-+**
-+** This file is part of the QtWebEngine module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and The Qt Company. For licensing terms
-+** and conditions see https://www.qt.io/terms-conditions. For further
-+** information use the contact form at https://www.qt.io/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 3 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL3 included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU Lesser General Public License version 3 requirements
-+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 2.0 or (at your option) the GNU General
-+** Public license version 3 or any later version approved by the KDE Free
-+** Qt Foundation. The licenses are as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-+** included in the packaging of this file. Please review the following
-+** information to ensure the GNU General Public License requirements will
-+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-+** https://www.gnu.org/licenses/gpl-3.0.html.
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include <stdlib.h>
-+#include <malloc.h>
-+
-+#define SHIM_ALIAS_SYMBOL(fn) __attribute__((weak, alias(#fn)))
-+#define SHIM_SYMBOL_VERSION(fn) __asm__(".symver __" #fn "," #fn "@Qt_5")
-+#define SHIM_HIDDEN __attribute__ ((visibility ("hidden")))
-+
-+extern "C" {
-+
-+SHIM_SYMBOL_VERSION(malloc);
-+void* __malloc(size_t size)
-+    SHIM_ALIAS_SYMBOL(ShimMalloc);
-+
-+SHIM_SYMBOL_VERSION(free);
-+void __free(void* ptr)
-+    SHIM_ALIAS_SYMBOL(ShimFree);
-+
-+SHIM_SYMBOL_VERSION(realloc);
-+void* __realloc(void* ptr, size_t size)
-+    SHIM_ALIAS_SYMBOL(ShimRealloc);
-+
-+SHIM_SYMBOL_VERSION(calloc);
-+void* __calloc(size_t n, size_t size)
-+    SHIM_ALIAS_SYMBOL(ShimCalloc);
-+
-+SHIM_SYMBOL_VERSION(cfree);
-+void __cfree(void* ptr)
-+    SHIM_ALIAS_SYMBOL(ShimCFree);
-+
-+SHIM_SYMBOL_VERSION(memalign);
-+void* __memalign(size_t align, size_t s)
-+    SHIM_ALIAS_SYMBOL(ShimMemalign);
-+
-+SHIM_SYMBOL_VERSION(valloc);
-+void* __valloc(size_t size)
-+    SHIM_ALIAS_SYMBOL(ShimValloc);
-+
-+SHIM_SYMBOL_VERSION(pvalloc);
-+void* __pvalloc(size_t size)
-+    SHIM_ALIAS_SYMBOL(ShimPvalloc);
-+
-+SHIM_SYMBOL_VERSION(posix_memalign);
-+int __posix_memalign(void** r, size_t a, size_t s)
-+    SHIM_ALIAS_SYMBOL(ShimPosixMemalign);
-+
-+SHIM_HIDDEN void* ShimMalloc(size_t size) {
-+    return malloc(size);
-+}
-+
-+SHIM_HIDDEN void ShimFree(void* ptr) {
-+    free(ptr);
-+}
-+
-+SHIM_HIDDEN void* ShimRealloc(void* ptr, size_t size) {
-+    return realloc(ptr,size);
-+}
-+
-+SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) {
-+    return calloc(n,size);
-+}
-+
-+SHIM_HIDDEN void ShimCFree(void* ptr) {
-+    free(ptr);
-+}
-+
-+SHIM_HIDDEN void* ShimMemalign(size_t align, size_t s) {
-+    return memalign(align,s);
-+}
-+
-+SHIM_HIDDEN void* ShimValloc(size_t size) {
-+    return  valloc(size);
-+}
-+
-+SHIM_HIDDEN void* ShimPvalloc(size_t size) {
-+    return pvalloc(size);
-+}
-+
-+SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) {
-+    return posix_memalign(r,a,s);
-+}
-+}  // extern "C"
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.2.5.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.2.5.ebuild
deleted file mode 100644
index 9204ab36f972..000000000000
--- a/media-sound/teamspeak-client/teamspeak-client-3.2.5.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs unpacker xdg-utils
-
-MY_PV="${PV/_/-}"
-
-DESCRIPTION="A client software for quality voice communication via the internet"
-HOMEPAGE="https://www.teamspeak.com/"
-SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${MY_PV}.run )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run )"
-
-KEYWORDS="-* ~amd64 ~x86"
-LICENSE="teamspeak3 || ( GPL-2 GPL-3 LGPL-3 )"
-SLOT="0"
-IUSE="alsa pulseaudio"
-REQUIRED_USE="|| ( alsa pulseaudio )"
-
-RDEPEND="
-	app-arch/snappy:0/1
-	dev-libs/openssl:0
-	dev-libs/quazip
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[accessibility,dbus,xcb]
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwebchannel:5
-	dev-qt/qtwebengine:5[geolocation,widgets]
-	dev-qt/qtwidgets:5
-	net-libs/libsrtp:0
-	sys-libs/libcxx[libcxxabi]
-	sys-libs/zlib:0/1
-	virtual/udev
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="
-	opt/teamspeak3-client/error_report
-	opt/teamspeak3-client/package_inst
-	opt/teamspeak3-client/soundbackends/libalsa_linux_*.so
-	opt/teamspeak3-client/soundbackends/libpulseaudio_linux_*.so
-	opt/teamspeak3-client/ts3client
-	opt/teamspeak3-client/update
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.5-qt-5.12-symbol-reexports.patch"
-)
-
-src_prepare() {
-	default
-
-	if ! use alsa; then
-		rm -f soundbackends/libalsa_linux_*.so || die
-	fi
-	if ! use pulseaudio ; then
-		rm -f soundbackends/libpulseaudio_linux_*.so || die
-	fi
-
-	mv ts3client_linux_* ts3client || die
-
-	tc-export CXX
-}
-
-src_install() {
-	exeinto /opt/teamspeak3-client
-	doexe error_report package_inst ts3client update overrides.so
-	newexe "${FILESDIR}"/ts3client-bin-r1 ts3client-bin
-
-	exeinto /opt/teamspeak3-client/soundbackends
-	doexe soundbackends/*.so
-
-	insinto /opt/teamspeak3-client
-	doins -r gfx html resources sound styles translations
-
-	dosym ../../usr/$(get_libdir)/qt5/libexec/QtWebEngineProcess /opt/teamspeak3-client/QtWebEngineProcess
-
-	dodir /opt/bin
-	dosym ../teamspeak3-client/ts3client-bin /opt/bin/ts3client
-
-	make_desktop_entry /opt/bin/ts3client "Teamspeak 3 Client" /opt/teamspeak3-client/styles/default/logo-128x128.png "Audio;AudioVideo;Network"
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.3.0.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.3.0-r1.ebuild
index 9e873515c3b8..1939f471108b 100644
--- a/media-sound/teamspeak-client/teamspeak-client-3.3.0.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-3.3.0-r1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtsvg:5
 	dev-qt/qtwebchannel:5
-	dev-qt/qtwebengine:5[geolocation,widgets]
+	dev-qt/qtwebengine:5[geolocation(+),widgets]
 	dev-qt/qtwidgets:5
 	net-libs/libsrtp:0
 	sys-libs/libcxx[libcxxabi]
diff --git a/media-sound/wmsound-data/Manifest b/media-sound/wmsound-data/Manifest
index aca67c8c00e4..c7d3c6272e43 100644
--- a/media-sound/wmsound-data/Manifest
+++ b/media-sound/wmsound-data/Manifest
@@ -2,5 +2,5 @@ AUX WMSound 548 BLAKE2B 8c392187608a409d7a336c8983b7cf08b7bf6c5e0657feb11bd48fb4
 AUX wmsound-soundset 312 BLAKE2B 7f3c22a4f7d99e3aacae3d1135e1b90ae065dc300d323b4a1815a8d92c78aa071f2163207a6ef10d852c71172e8476205853a85554b0e1c24aff82258b8d53fe SHA512 c8822f4ab1621159b07f2f412dcabb128bebb85fd01eea1b6dd329605f4202c6d65d300f48adec6706854bee9655901851d8c92ad487620d0c20cd0232900a70
 DIST wmsdefault.tar.gz 711376 BLAKE2B 23814e9514dad9e987ca456c42ff5524d8dc120af195a908deb03d5184b409e38b508560dcce51418a7dc47ef28deeb3e91c1910c8d3ac0498517008fd44fb9e SHA512 7fce83906f675ab8426fc4c2440a39dc9b658c93e99c515c4cec02c89df99097545931591358a33adb3dfc7c73b28cd9698d8e071b7b019511aa5edc5d51f62b
 DIST worms2sounds.tar.gz 356608 BLAKE2B add52d7e3bb459012b17397ed397deb34aca361fd9e1164b9fa19acd6a9b256511769913b51d9871b95fbec617f446d62c6b85dda9ecd13145eb601721e1d259 SHA512 7fe60511e7f457ea398d6d5456bac90d6303ede645c73a527551e44008e09b8f1f343f5622a49b365bcd93674b9f2ee6a91f9774dadf770cd71daec69400e5da
-EBUILD wmsound-data-1.0.0.ebuild 945 BLAKE2B f43727f8ff568b305f6a4be82f2cd281a9d396999585913055179dd54ed0a9cff917684db281585a9654048c4acb305abaff7ff2041b5ee1132f35998faee1e7 SHA512 3747fa07ca1e71e80de477148bd5ff65b39f8c77543e0566732f4dcf9519f5f1edf23f62a95ea65c056a2302adaedcd53afe05a91b7101b8de319dfc9aba4c12
+EBUILD wmsound-data-1.0.0.ebuild 942 BLAKE2B b2508b3098bbe8761c9df00b5e29e86225449a007a9cdc6d8f87855a5168425d367eaeba5bd44760521ed988c61629f1fb8c86a96452d59bbae33ad1b690d685 SHA512 5d810a6522ebe8107f8de037d7385b7499fc9db8290bc8a7a816caf15426a8b60996380ad4be15a0218a350df423feb298d8258a5a8ae655677cfcba10f8f6e5
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/wmsound-data/wmsound-data-1.0.0.ebuild b/media-sound/wmsound-data/wmsound-data-1.0.0.ebuild
index 22e2728e8ad4..a3caefa71ad5 100644
--- a/media-sound/wmsound-data/wmsound-data-1.0.0.ebuild
+++ b/media-sound/wmsound-data/wmsound-data-1.0.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=0
@@ -14,7 +14,7 @@ DEPEND=">=x11-wm/windowmaker-0.80.2-r2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc amd64 sparc"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 S1=${WORKDIR}/Sounds
 S2=${WORKDIR}/SoundSets