gentoo resync : 06.08.2019

44 files changed, 1278 insertions, 177 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1ec1e0d8383b..ee71383fc30e 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 963b1bb4833d..f22f38b2807a 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -4,5 +4,5 @@ DIST alsa-tools-1.1.6.tar.bz2 1778330 BLAKE2B 256ffaef47f78c07f1d8cd86df57b2f75c
 DIST alsa-tools-1.1.7.tar.bz2 1782642 BLAKE2B 1b2235c3471595c17836b376e5c87194b798f39d2ab52398c634b430c55a4d10482af2aef9568c6694ac4f5a58c4b2f4601cc6a7a80b4e1a3e87dd8d86d8e67a SHA512 d715fa5b909fb33ffce252b4ae9f027dc7c1a509253d52bda6ecbc5e0a38e7d30ab8486b14114b226424217812a0edf66e7ec11f7674e44c77a14e4dfb16889c
 EBUILD alsa-tools-1.1.0.ebuild 3491 BLAKE2B 6c4c591a1025f18d1b8e7e2058fbb227f200ec5c50334ae400a9cff94d5630d05f5298faf91c2c76451b09ef9b90d1e3b1b04aad70871eb79d55a6f66b683f53 SHA512 704b16d093923c138ea05bfbeebd96be74987ea0ea076f40e2260e32765074bbde1bfe08f3b231fc6fb6b7b32a5eb2241c980f9d62294475df8e848e46393284
 EBUILD alsa-tools-1.1.6.ebuild 3551 BLAKE2B f47b5d46525d70fe5f6147be5c1c15a387c13a01248dc23587af8262d73fba73afd546e5dbf9c55a8370d457e5d0c15d75b9c62ea82e9400ad8750fe3a2fbc74 SHA512 adddcc1c52a9facee00e8e9d1db6a197f32f43b3a1ccd3aabda33a46987ba1bbea16cbbd8015fe0875e8661ef305480f0dbf2f633a32aed173d44d57466ecad1
-EBUILD alsa-tools-1.1.7.ebuild 3553 BLAKE2B ba97574834462eaa72a24e750ee6ae3431ef6e7ecb0368d6a5503dcfa2b061244a8c75a673dbcbe77ef8cd47ce4ee2f6c2b85148e33864665d80867dead6cd4b SHA512 8d359e5818d028d66362681ad6be69eaaaa2fbe4be65d7c78d5a2ab4d16dc32ee24f301e1933534d574ca5db42234c03aa558a82b7511e24483d0f537e8635fb
+EBUILD alsa-tools-1.1.7.ebuild 3551 BLAKE2B 4bb9c47f6316a1c39dc4220cdc8215dac6043ccbeb206ac830bb451bcb7ff5313438603c6ca910327fddc569eeec2ef090b4bc4518d6da0866c001541ece06cd SHA512 5e53d00ff59bfc547e2e23e88e0f36517a3bfd2de3c5eae8b137eaa87c3bbf19ce0f69de9d41bbd16c8ded73980a3229ff32b8b2d1ca55adb6cf684e9f91d9a7
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
index 73eb0a6576f2..110266eb8793 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="amd64 ~hppa ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~hppa ~mips ppc ppc64 sparc x86"
 
 IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
 alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 3fff70e93906..b52e24c70dde 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -10,6 +10,6 @@ DIST alsa-utils-1.1.8.tar.bz2 1262174 BLAKE2B 643017f8f31d88356a2a55b5b1249d5b70
 DIST alsa-utils-1.1.9.tar.bz2 1268833 BLAKE2B 56fe00bd7dce21969f9f91d1d82a6644da338208bfa646fc2a46d38f2d1d937b55b90acc5f75bb630aa288dee458c9f555a5727990c5cd7a59b627cb1ecf1e2c SHA512 92fa689ea5897150972d5376e7999ff060cad09cb0b06991d81c87b61a243ecec944e2a4c7ad38878596cd8b4246e44c5a3a35e5bc6452c02ebf35c9bed91970
 EBUILD alsa-utils-1.1.2.ebuild 2199 BLAKE2B 110899e375e20f25067db6dcc21b3302ac119dc9656c88946f0fa304084571f61ab6335536336d874dedad465dfcb0b4b1c39e3a7b0b502082dbb90ca5a32abf SHA512 e0253fbba1c48e7318d5b9ab5bceebccd303ac09e6e2687a3947788e90491a7c88952209128ece17ffeb6255330118d3a43e245513e4c1dca9254bbeed72394f
 EBUILD alsa-utils-1.1.6.ebuild 2249 BLAKE2B 9e754eb263685924e5897018242cea86a4a4b9d3fbc5aad66aa17e6df23d01d99854058e624139db257384d9cbd5c4d2722cf26dda8c0f89daffc4894e58c192 SHA512 14caac4da6c061bdf718e93465ffe09963aad438e7b83c5d82ce8b743620774d3e38aa0a8c91d9e949b35371a55d99fc6d10d0e52f209e3435b1d6d84f537dad
-EBUILD alsa-utils-1.1.8.ebuild 2324 BLAKE2B f060b776cbdfcc0abbc3db65ae9f248a7abea99e0fee67dc52c9459449318f713831063367ccd19554096ebebad692de238ac9639ae42bdadeb40bff138ac85e SHA512 aa64ad1cdaa7a7a8d252b6dd7d43dc0102b9512349c7fa64114aa551b526e0db4e6dd1d7ca1ef19a22a6a77631c2d2c254e0139bc6bc3e4640c5406b6a87f1c0
+EBUILD alsa-utils-1.1.8.ebuild 2322 BLAKE2B 1489975be3ec7e6f19aabbcd589cb9451cd6ef41433f8f7b1e3c4ac122cc519fb265ca7aa840cfa98ceba29fbd0ac241a6bd727ea1f69063bdd6533b60dc7416 SHA512 c1b10d7b427c14f422b372be500c031fa4c6a1c7f5c8108f5252b982833d6d659a710fd0c5328a357ba86cefc5ff00d7b2a2f0a32582b5812ac59d99afd56410
 EBUILD alsa-utils-1.1.9.ebuild 2327 BLAKE2B 62ae048c8852d50917feb356949280f22811786e3d092795c2a044f460d32cd8be5bf125f53ad7710dfda5ac057ec591da162cb2d6004621af2b4a3ff630484b SHA512 eda801263d829c4a39b6070f79ec28d895895b983572186a0de4bc6cb90219031f7f54fef0317cdd1f19624dcce8d027bdaecb3d04b5c726a631d4dd02bc29b0
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
index 0dcb43c06530..f25b06af8d7b 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index d0e36965da94..6986f9116b87 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -1,3 +1,5 @@
 DIST asunder-2.9.3.tar.bz2 275527 BLAKE2B a113fc2c380555550a5903919b78d5c7f304c3938665318d86dbbdd01d503641413bccc755621cefd948b10fb352f6995252fb548cc5730e1ff50d4b2d6a3634 SHA512 b6546e16c936285584480cf378be11e96717aeedc22a7c5163cc0791a41498597d8437369d00823710c56faabe1dea23e4be9c839eb1ee371415104f13d61296
+DIST asunder-2.9.4.tar.bz2 272740 BLAKE2B 64d0850afb0ea5f30a7522a9709f57cec4ab0d67eca235b75ae4ffac2dcc293438b99827eadd63052e9ea4d98fe97684d4b367255e24692af79a0efd1ed30ea7 SHA512 9410b96f27e7ea46e7a3f290caf17ddee69da9b92770346e10ae8e9403d21a527ba763163cf92e879cefb32f219e7d22d3f9b4dc2d81a3aab2a7676b859cfb71
 EBUILD asunder-2.9.3-r1.ebuild 914 BLAKE2B c45c833d0f76953116802aab8c345209843fa28362fd321b7e643b2d726ab8febdef70fb6795a49f1433ffc514e86dff90a09c9775c323c430ab18bfcc5a29ee SHA512 50dd1394d95d7b441fd5a128e66155b312b5d5438ce568e660248bd5e732300154826e0abfcfa073f355eac44eccbfb785b9ca57cd711948816607948ead7de3
+EBUILD asunder-2.9.4.ebuild 916 BLAKE2B d0667f09a4408d0a2506cdac7e28a7a9bf55d60660d2d583ff240e3421da12917a76711c25584b52c9e70eedca1e24f1cd8431c71df60e2820228a20fb260774 SHA512 15602f1ce1ec6be393d591c88743a34c01a15ddff8d40087077906aad551f2ee6f7cd24082b269e2b64acdbee74c4e069125a3e59aaf9742c2ff1d868bcac1a7
 MISC metadata.xml 345 BLAKE2B dc144dfa8d94c1293b6b84f24ecdedc8530c4fa19105e3deca1670ca1a43a261094635bb31abec0d027d1caaa4c72c884e4690f43d7af1b9f5b2dc9685502bf1 SHA512 aa6a8d66e2961a176722a5ab0d2db6a1edb246403ac81f2b282d14d0b4a231449d052c48c59f622c04b7582af0545fb97bb430ca89c33924ce24b354b0e2e47a
diff --git a/media-sound/asunder/asunder-2.9.4.ebuild b/media-sound/asunder/asunder-2.9.4.ebuild
new file mode 100644
index 000000000000..df537f03bf42
--- /dev/null
+++ b/media-sound/asunder/asunder-2.9.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+DESCRIPTION="Graphical Audio CD ripper and encoder with support for many output formats"
+HOMEPAGE="http://littlesvr.ca/asunder/"
+SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="flac mac mp3 musepack opus vorbis wavpack"
+
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+DEPEND=">=media-libs/libcddb-0.9.5
+	media-sound/cdparanoia
+	x11-libs/gtk+:2"
+RDEPEND="${DEPEND}
+	flac? ( media-libs/flac )
+	mac? ( media-sound/mac )
+	mp3? ( media-sound/lame )
+	musepack? ( media-sound/musepack-tools )
+	opus? ( media-sound/opus-tools )
+	vorbis? ( media-sound/vorbis-tools )
+	wavpack? ( media-sound/wavpack )"
+
+src_prepare() {
+	default
+	sed -i -e 's:cd syslogng && $(MAKE) install:true:' Makefile.in || die
+}
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index cbafc6d1ce5d..e71d51ff7e64 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,7 +1,12 @@
 AUX audacity-2.2.1-portmixer.patch 776 BLAKE2B 18e5e3a3394c2a56afd9314993bde41376a59bc7c480b159ca9d14ff812f507de32018d5b28ee9a2cdd4f3b5f1a6e420e85f3d8660c0fa0e28941f6fdce9fb6a SHA512 f00fdd46150181873bc4aa24f95b3491471198429f47fae2d4f79f0f360a642adf94936dcf63bb02e84f9581d87c05dc8d93ed37eddaf43e31d900d505b50805
 AUX audacity-2.2.2-automake.patch 916 BLAKE2B 8de3bb400bebcfcd1b2e51ce8ada2d24e9524b56219f31bd9181e6c6c6c7382aee3d32bfb2024b7d3155f9f2464c541c5e12c7e395ce3fd9197234db8347b4d1 SHA512 2e89f45595674c3388648a6aeac4f43b82fdda2f5ba8efda2d2d98a11be2a76cab5cd0d8a87d8e581810a6ed3984d88b01e7462b51544dea550952ab563defca
 AUX audacity-2.2.2-midi.patch 4999 BLAKE2B 74e99c16abbd64f4f74ccc1dc4e76a156d492e0f8d929e8e47bf12f574741fdf052ad7c9b780fb8c578790c505990d42712239470bacc5ba132dbdcb8fa3bc78 SHA512 5c0f9ca7d25ac2c15cc12a643408066eb7b320fb7c1476d9169be25128b3a4b682ed77e9d101923c7c6df187571874b9e67635d98472e875b7520053909b271a
+AUX audacity-2.3.2-Fix-building-without-midi.patch 1845 BLAKE2B 482cf34d9a43d7fcd9b9104ad5e5a0a5ebe5b744cbc9cd9f2e267e591c822781acf601c355665a0bdb95ee94a758eac72fe4d74b6f9f72cb48b40c7f0cd0a2ac SHA512 d2fcf0c57a7c9a13a15daf6c901430e114193c0cdf395fbacaaf10be6717a6c74dcb1284ede3d12eca1c418f2948483f84fc75c78e80176531c3adbfbbeeae31
+AUX audacity-2.3.2-fix_building_against_system_portaudio.patch 1991 BLAKE2B 2e9609542728d3d5c80471d95a49f3051c061a3a06290820db90a0cad346c759c666ae66a36c26b7005f727f73049c40423fbb2c86c6492f0b89023c80972bf1 SHA512 7b7612249ec7f1eb765fd40b15b89e90fe7e251cd6a49d54643c43e8e2ab6e319b5a49c8432abe6d2440a610a306c6553538835a018ecb0c832aab88cc3f033a
+DIST Audacity-2.3.2.tar.gz 61972597 BLAKE2B 968c3d877392af92e2a23d8357fe65c3eb608122185d037e741ed6165d1acb3af70fc15dce63140eff14cd032fb3e3dc1b8b4f7bca9016f8e0e56aaef8a27802 SHA512 a59d6e9e974d5f78f5ca561e3bea31fc1b3e88f9ea60b2df7ce8bcec264d886f3fdc8f20030e11a86daff8ffeb735850b5e5f73c45fbef0bfcc58692423e7cd0
 DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53 SHA512 a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
+DIST audacity-manual-2.3.2.zip 21163508 BLAKE2B 6a0ec89567db63164e897aad21af6fb31557e2519640788c781b21e885c0f704174529d9abf3e8645ccb3bca0f7b987fa708b1ce64597b282357b823e8addd44 SHA512 5e541065236badfdc2331681e43dee2564f933c33a3a588806f189acc8d8285a2c60bf9bc0c7052c6cb23fa1ee29a9f5e0428540cd556901dcf896def1c7c0ac
 DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26 SHA512 8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c
 EBUILD audacity-2.2.2.ebuild 3343 BLAKE2B 11ad65e95ea0a16b6434017246b0b5063c13df6821a856bcc4116de082f5a673394480a1a15e63065ccded4d8bdea786eb7988dc747440b11d5fbb6fb4504601 SHA512 80136688f1ef9a75424f24bdb98ccfbb8ad7c1dfdabd7a8ede9c4ba837de7039c2109e92fe7b1e13e5e0fa05e6f39af109bc779b20dc04af0ee96b93ba3af660
+EBUILD audacity-2.3.2.ebuild 3308 BLAKE2B 26a4dbfbfa65f793da903e9856925df8f5cfa3dab66f2af941862152769a591c1a1943f2375e4120548b7bbc31c09db1d0fa02209e8e989c4444551e7ac61170 SHA512 1635af065e989252de42db1cd9089d4584b7e4691b4bcb6541657e57abaefef13decc48f4aabee759b02b8471f5c93842336ce7abb77db66edc224b202c77f1f
 MISC metadata.xml 1175 BLAKE2B 4579a87e1bc8a5b420f05774e640471e859e76d0526e581d6dbfbf1f39b36462d3d87677cd98d67b458486f32c34c215c69c9318069732c722cf4ef351a7803b SHA512 5d522d5b6d837f7632f8e1bb25d13d4f134880c7ddd12c637dd1235054c234f0679d02c7b6a0e3caa0c9d20782d5621bfa312239c177e4db4298e3f38d6d80ae
diff --git a/media-sound/audacity/audacity-2.3.2.ebuild b/media-sound/audacity/audacity-2.3.2.ebuild
new file mode 100644
index 000000000000..1f561978a5fe
--- /dev/null
+++ b/media-sound/audacity/audacity-2.3.2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic wxwidgets xdg
+
+MY_P="Audacity-${PV}"
+DOC_PV="${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://web.audacityteam.org/"
+# wget doesn't seem to work on FossHub links, so we mirror
+SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
+	doc? ( https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${DOC_PV}.zip )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+	+lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
+
+RESTRICT="test"
+
+RDEPEND=">=app-arch/zip-2.3
+	dev-libs/expat
+	>=media-libs/libsndfile-1.0.0
+	>=media-libs/portaudio-19.06.00-r2[alsa?]
+	<media-libs/portaudio-20
+	media-libs/soxr
+	x11-libs/wxGTK:3.0[X]
+	alsa? ( media-libs/alsa-lib )
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( >=media-video/ffmpeg-1.2:= )
+	)
+	flac? ( >=media-libs/flac-1.3.1[cxx] )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( >=media-sound/lame-3.70 )
+	lv2? (
+		media-libs/lilv
+		media-libs/lv2
+		media-libs/suil
+	)
+	mad? ( >=media-libs/libmad-0.14.2b )
+	sbsms? ( media-libs/libsbsms )
+	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+	twolame? ( media-sound/twolame )
+	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.2-fix_building_against_system_portaudio.patch
+	"${FILESDIR}"/${PN}-2.3.2-Fix-building-without-midi.patch
+)
+
+src_prepare() {
+	default
+
+	use midi || sed -i \
+		-e 's:^\(#define EXPERIMENTAL_MIDI_OUT\):// \1:' \
+		src/Experimental.h || die
+}
+
+src_configure() {
+	local WX_GTK_VER="3.0"
+	setup-wxwidgets
+	append-cxxflags -std=gnu++14
+
+	# * always use system libraries if possible
+	# * options listed in the order that configure --help lists them
+	local myeconfargs=(
+		--disable-dynamic-loading
+		--enable-nyquist=local
+		--enable-unicode
+		--with-expat
+		--with-lib-preference=system
+		--with-libsndfile
+		--with-libsoxr
+		--with-mod-script-pipe
+		--with-mod-nyq-bench
+		--with-portaudio
+		--with-widgetextra=local
+		--with-wx-version=${WX_GTK_VER}
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable ladspa)
+		$(use_enable nls)
+		$(use_enable vst)
+		$(use_with ffmpeg)
+		$(use_with flac libflac)
+		$(use_with id3tag libid3tag)
+		$(use_with lame)
+		$(use_with lv2)
+		$(use_with mad libmad)
+		$(use_with midi portmidi local)
+		$(use_with midi "" local)
+		$(use_with portmixer)
+		$(use_with sbsms)
+		$(use_with soundtouch)
+		$(use_with twolame libtwolame)
+		$(use_with vamp libvamp)
+		$(use_with vorbis libvorbis)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Remove bad doc install
+	rm -r "${ED}"/usr/share/doc || die
+
+	# Install our docs
+	einstalldocs
+
+	if use doc ; then
+		docinto html
+		dodoc -r "${WORKDIR}"/help/manual/{m,man,manual}
+		dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html}
+		dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
+	fi
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-sound/audacity/files/audacity-2.3.2-Fix-building-without-midi.patch b/media-sound/audacity/files/audacity-2.3.2-Fix-building-without-midi.patch
new file mode 100644
index 000000000000..d4ec1a7320f6
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.3.2-Fix-building-without-midi.patch
@@ -0,0 +1,71 @@
+diff -urpN a/src/Track.h b/src/Track.h
+--- a/src/Track.h	2019-05-04 13:38:57.000000000 +0300
++++ b/src/Track.h	2019-08-27 19:32:36.937551831 +0300
+@@ -53,10 +53,6 @@ using WaveTrackConstArray = std::vector
+ 
+ using NoteTrackConstArray = std::vector < std::shared_ptr< const NoteTrack > >;
+ 
+-#if defined(USE_MIDI)
+-class NoteTrack;
+-#endif
+-
+ class TrackList;
+ 
+ using ListOfTracks = std::list< std::shared_ptr< Track > >;
+@@ -74,9 +70,7 @@ enum class TrackKind
+ {
+    None,
+    Wave,
+-#if defined(USE_MIDI)
+    Note,
+-#endif
+    Label,
+    Time,
+    Audio,
+diff -urpN a/src/menus/FileMenus.cpp b/src/menus/FileMenus.cpp
+--- a/src/menus/FileMenus.cpp	2019-05-04 13:38:57.000000000 +0300
++++ b/src/menus/FileMenus.cpp	2019-08-27 19:32:36.939551720 +0300
+@@ -141,8 +141,6 @@ AudacityProject *DoImportMIDI(
+ }
+ #endif
+ 
+-#ifdef USE_MIDI
+-
+ // Menu handler functions
+ 
+ struct Handler : CommandHandlerObject {
+@@ -480,6 +478,7 @@ void OnImportLabels(const CommandContext
+    }
+ }
+ 
++#ifdef USE_MIDI
+ void OnImportMIDI(const CommandContext &context)
+ {
+    auto &project = context.project;
+@@ -496,7 +495,7 @@ void OnImportMIDI(const CommandContext &
+    if (!fileName.empty())
+       DoImportMIDI(&project, fileName);
+ }
+-#endif
++#endif // USE_MIDI
+ 
+ void OnImportRaw(const CommandContext &context)
+ {
+diff -urpN a/src/tracks/ui/TimeShiftHandle.cpp b/src/tracks/ui/TimeShiftHandle.cpp
+--- a/src/tracks/ui/TimeShiftHandle.cpp	2019-05-04 13:38:57.000000000 +0300
++++ b/src/tracks/ui/TimeShiftHandle.cpp	2019-08-27 19:32:36.940551665 +0300
+@@ -393,12 +393,12 @@ UIHandle::Result TimeShiftHandle::Click
+                ok = false;
+             else
+                captureClips = true;
+-         },
+ #ifdef USE_MIDI
++         },
+          [&](NoteTrack *) {
+             captureClips = true;
+-         }
+ #endif
++         }
+       );
+ 
+    if ( ! ok )
diff --git a/media-sound/audacity/files/audacity-2.3.2-fix_building_against_system_portaudio.patch b/media-sound/audacity/files/audacity-2.3.2-fix_building_against_system_portaudio.patch
new file mode 100644
index 000000000000..fa785fdd6c5e
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.3.2-fix_building_against_system_portaudio.patch
@@ -0,0 +1,56 @@
+From 5f9482a191359f2c477763a36d2c865c5f186602 Mon Sep 17 00:00:00 2001
+From: Antonio Ospite <ao2@ao2.it>
+Date: Tue, 7 Nov 2017 13:06:33 +0100
+Subject: [PATCH] Fix building against the system portaudio library
+
+Building against the system portaudio results in this error:
+
+./src/AudioIO.cpp:983: undefined reference to `PaUtil_GetTime'
+audacity-AudioIO.o: In function `audacityAudioCallback(void const*, void*,
+unsigned long, PaStreamCallbackTimeInfo const*, unsigned long, void*)':
+./src/AudioIO.cpp:4630: undefined reference to `PaUtil_GetTime'
+collect2: error: ld returned 1 exit status
+Makefile:2349: recipe for target 'audacity' failed
+make[3]: *** [audacity] Error 1
+
+This is because PaUtil_GetTime is declared as a C symbol in pa_util.h
+but is resolved as a C++ symbol at link time.
+
+Audacity fixes this in the local tree with this change:
+https://github.com/audacity/audacity/commit/38fd97b8e26060332ab3e9e000a8882326a70ba7
+
+However this is not general enough for the portaudio debian package.
+
+Since PaUtil_GetTime() is the only function causing problems, just copy
+over the code where it's used.
+---
+ src/AudioIO.cpp | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+--- a/src/AudioIO.cpp
++++ b/src/AudioIO.cpp
+@@ -465,8 +465,23 @@ TimeTrack and AudioIOListener and whethe
+    #define ROUND(x) (int) ((x)+0.5)
+    //#include <string.h>
+    #include "../lib-src/portmidi/pm_common/portmidi.h"
+-   #include "../lib-src/portaudio-v19/src/common/pa_util.h"
+    #include "NoteTrack.h"
++
++PaTime PaUtil_GetTime( void )
++{
++#ifdef HAVE_MACH_ABSOLUTE_TIME
++    return mach_absolute_time() * machSecondsConversionScaler_;
++#elif defined(HAVE_CLOCK_GETTIME)
++    struct timespec tp;
++    clock_gettime(CLOCK_REALTIME, &tp);
++    return (PaTime)(tp.tv_sec + tp.tv_nsec * 1e-9);
++#else
++    struct timeval tv;
++    gettimeofday( &tv, NULL );
++    return (PaTime) tv.tv_usec * 1e-6 + tv.tv_sec;
++#endif
++}
++
+ #endif
+ 
+ #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index e80cf1741f7d..366c4e371379 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,4 +1,6 @@
 AUX beets-1.4.8-imagemagick-detection.patch 770 BLAKE2B 120e0af71fe9c63548f49bf20fa94ec20f8b0cfb8395b319d6f8e2a62b5212adb229691c35297615a3b0272b215c87e1ff861e1887d227fc9460501900edae48 SHA512 6c5da1591e0bfc0936dca52c48f74b80b57c18bb0398877d38deb7d448df9466a8544628e0ce6948204a8deae4679c8dd454dab9a2f0778a236eaa60387a1751
 DIST beets-1.4.8.tar.gz 1493539 BLAKE2B 63c44f05bbf139cd43b5f5ada972fd30beeea2303c6b479b1be35ea21fabb0039b3c8eb6e90f8f1b2a61fed36d97ce09a32c6346cbd3b84c7c978e796505f4b4 SHA512 449bed88185a5ecb4781719e092c2428ddc52fb8084033db64a4c0eca8899154192e7cea82517993d60326c7fe39b26429584ba368ffc35800f722d8d6a03217
+DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a
 EBUILD beets-1.4.8-r1.ebuild 3664 BLAKE2B 094cc8dfbf32cea571e4789db182a60ad07eeb772a47be47d45843eefe70c20e619f7524e98f533d14e899983b534d7b5c7aeeeed4e8aa00a723ec325d4449de SHA512 62f4c4d9619fc07388427830fc3a8248e7b7477c6a18a451b75e4291dd928adf40db39ddf606b2b1a9feeaa5e4728796d184b2e905aadec09ff0946a7961d8c0
-MISC metadata.xml 2395 BLAKE2B 0df8a5d3fa7b94b5b8e3e45f25e2c4dc0716c438dd51a6061f2276e20bf9779847c34bc571bcdd8948289c75c879cae6ef76fa8432a550855e9f74966fb80374 SHA512 ea2c961e7380a8c05e0e90b34f50323ca932e06ba33d5a214a633e8eba4281577993a870a7d294f286a90c0492256d3142b9e17aa02e2ea129c9c28e24bf90ec
+EBUILD beets-1.4.9.ebuild 3614 BLAKE2B ea994ce3c35058ab24813c663b5182650c06e9d5f0f3e875065ba09abdb413031a0a80047b3c9d179887be9db6d765e6ecc868b236aa550ab502b1a39227b9e4 SHA512 8185506e4c7c3b343bd072c169d352c39507fc83dcbffe9e15752a227ce03532c14439dd63e03707e98c3f17201149a1b785fd3512d9ad9aa53b0012197d6230
+MISC metadata.xml 2707 BLAKE2B f178a50b9b107e6c5083cc255750416751d0e077f95fc8111b826e458e30d72ce978fe8c8a29056ad076b121fe2690fd636212eb68c758eedb4f380afd29a6d9 SHA512 58ea485657e54c0f1aecbbed49a6c3ce683ef5560f66a02d95c7c89de597a038499b8268771db9fe344dd9baaafe4af750c9402f1725bb791c89dbf4de90d705
diff --git a/media-sound/beets/beets-1.4.9.ebuild b/media-sound/beets/beets-1.4.9.ebuild
new file mode 100644
index 000000000000..e2da8e5f2f7f
--- /dev/null
+++ b/media-sound/beets/beets-1.4.9.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_beta/-beta.}
+MY_P=${PN}-${MY_PV}
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+inherit distutils-r1
+
+DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="MIT"
+IUSE="badfiles chromaprint discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+DEPEND="
+	>=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
+	dev-python/munkres[${PYTHON_USEDEP}]
+	>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	badfiles? (
+		media-libs/flac
+		media-sound/mp3val
+	)
+	chromaprint? (
+		dev-python/pyacoustid[${PYTHON_USEDEP}]
+		media-libs/chromaprint[tools]
+	)
+	discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
+	ffmpeg? ( media-video/ffmpeg:0[encode] )
+	gstreamer? (
+		media-libs/gst-plugins-good:1.0
+		media-libs/gst-plugins-bad:1.0
+	)
+	icu? ( dev-db/sqlite[icu] )
+	lastfm? ( dev-python/pylast[${PYTHON_USEDEP}] )
+	mpd? (
+		dev-python/bluelet[${PYTHON_USEDEP}]
+		dev-python/python-mpd[${PYTHON_USEDEP}]
+	)
+	replaygain? (
+		gstreamer? (
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			media-plugins/gst-plugins-libav:1.0
+		)
+		!gstreamer? ( media-sound/mp3gain )
+	)
+	thumbnail? (
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		virtual/python-pathlib[${PYTHON_USEDEP}]
+		|| (
+			dev-python/pillow[${PYTHON_USEDEP}]
+			media-gfx/imagemagick
+		)
+	)
+	webserver? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/flask-cors[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test" # tests broken in 1.4.3 already
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	rm_use_plugins() {
+		[[ -n "${1}" ]] || die "rm_use_plugins: No use option given"
+		local use=${1}
+		local plugins=${use}
+		use ${use} && return
+		einfo "no ${use}:"
+		[[ $# -gt 1 ]] && plugins="${@:2}"
+		for arg in ${plugins[@]}; do
+			einfo "  removing ${arg}"
+			if [[ -e "beetsplug/${arg}.py" ]]; then
+				rm beetsplug/${arg}.py || die "Unable to remove ${arg} plugin"
+			fi
+			if [[ -d "beetsplug/${arg}" ]]; then
+				rm -r beetsplug/${arg} || die "Unable to remove ${arg} plugin"
+			fi
+			sed -e "s:'beetsplug.${arg}',::" -i setup.py || \
+				die "Unable to disable ${arg} plugin "
+		done
+	}
+
+	default
+
+	rm_use_plugins chromaprint chroma
+	rm_use_plugins ffmpeg convert
+	rm_use_plugins icu loadext
+	rm_use_plugins lastfm lastgenre lastimport
+	rm_use_plugins mpd bpd mpdstats
+	rm_use_plugins webserver web
+	rm_use_plugins thumbnail thumbnails
+
+	# remove plugins that do not have appropriate dependencies installed
+	for flag in badfiles discogs replaygain; do
+		rm_use_plugins ${flag}
+	done
+
+	if ! use mpd; then
+		rm test/test_player.py || die
+	fi
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cd test || die
+	if ! use webserver; then
+		rm test_web.py || die "Failed to remove test_web.py"
+	fi
+	"${EPYTHON}" testall.py || die "Testsuite failed"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman man/beet.1 man/beetsconfig.5
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	einstalldocs
+}
diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index a30fde9062e0..c94e37c4b59b 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -1,43 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-	</maintainer>
-	<longdescription lang="en">
-		The purpose of beets is to get your music collection right once and for
-		all. It catalogs your collection, automatically improving its metadata as
-		it goes using the MusicBrainz database. (It also downloads cover art for
-		albums it imports.) Then it provides a bouquet of tools for manipulating
-		and accessing your music.
+  <maintainer type="person">
+    <email>bernardo@standard.ai</email>
+    <name>Bernardo Meurer</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Gentoo Proxy Maintainers Project</name>
+  </maintainer>
+  <longdescription lang="en">
+        The purpose of beets is to get your music collection right once and for
+        all. It catalogs your collection, automatically improving its metadata as
+        it goes using the MusicBrainz database. (It also downloads cover art for
+        albums it imports.) Then it provides a bouquet of tools for manipulating
+        and accessing your music.
 
-		Because beets is designed as a library, it can do almost anything you can
-		imagine for your music collection. Via plugins, beets becomes a panacea:
-		* Embed and extract album art from files’ tags.
-		* Listen to your library with a music player that speaks the MPD protocol
-		and works with a staggering variety of interfaces.
-		* Fetch lyrics for all your songs from databases on the Web.
-		* Manage your MusicBrainz music collection.
-		* Analyze music files’ metadata from the command line.
-		* Clean up crufty tags left behind by other, less-awesome tools.
-		* Browse your music library graphically through a Web browser and play it
-		in any browser that supports HTML5 Audio.
+        Because beets is designed as a library, it can do almost anything you can
+        imagine for your music collection. Via plugins, beets becomes a panacea:
+        * Embed and extract album art from files’ tags.
+        * Listen to your library with a music player that speaks the MPD protocol
+        and works with a staggering variety of interfaces.
+        * Fetch lyrics for all your songs from databases on the Web.
+        * Manage your MusicBrainz music collection.
+        * Analyze music files’ metadata from the command line.
+        * Clean up crufty tags left behind by other, less-awesome tools.
+        * Browse your music library graphically through a Web browser and play it
+        in any browser that supports HTML5 Audio.
 
-		If beets doesn’t do what you want yet, writing your own plugin is
-		shockingly simple if you know a little Python.
-	</longdescription>
-	<use>
-		<flag name="badfiles">Validate MP3 &amp; FLAC files</flag>
-		<flag name="chromaprint">Enable support for acoustic fingerprinting plugin using <pkg>media-libs/chromaprint</pkg></flag>
-		<flag name="ffmpeg">Enable support for the convert plugin to transcode files via <pkg>media-video/ffmpeg</pkg></flag>
-		<flag name="discogs">Enable support for the discogs API plugin</flag>
-		<flag name="lastfm">Enable support for importing personal last.fm playcounts and music genres from last.fm tags</flag>
-		<flag name="mpd">Enable support for <pkg>media-sound/mpd</pkg> server emulation and statistic gathered from <pkg>media-sound/mpd</pkg></flag>
-		<flag name="replaygain">Enable support for Replay Gain metadata calculation during import</flag>
-		<flag name="thumbnail">Enable album thumbnails generation</flag>
-		<flag name="webserver">Enable embedded webserver support through <pkg>dev-python/flask</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="pypi">beets</remote-id>
-	</upstream>
+        If beets doesn’t do what you want yet, writing your own plugin is
+        shockingly simple if you know a little Python.
+  </longdescription>
+  <use>
+    <flag name="badfiles">Validate MP3 &amp; FLAC files</flag>
+    <flag name="chromaprint">Enable support for acoustic fingerprinting plugin using <pkg>media-libs/chromaprint</pkg></flag>
+    <flag name="ffmpeg">Enable support for the convert plugin to transcode files via <pkg>media-video/ffmpeg</pkg></flag>
+    <flag name="discogs">Enable support for the discogs API plugin</flag>
+    <flag name="lastfm">Enable support for importing personal last.fm playcounts and music genres from last.fm tags</flag>
+    <flag name="mpd">Enable support for <pkg>media-sound/mpd</pkg> server emulation and statistic gathered from <pkg>media-sound/mpd</pkg></flag>
+    <flag name="replaygain">Enable support for Replay Gain metadata calculation during import</flag>
+    <flag name="thumbnail">Enable album thumbnails generation</flag>
+    <flag name="webserver">Enable embedded webserver support through <pkg>dev-python/flask</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">beets</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index 033cfa9beaff..09f5a6d0bee7 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -1,5 +1,3 @@
 DIST exaile-4.0.0.tar.gz 3635774 BLAKE2B 91a5a0a4b8f3c55ec1c8f6487f30bbc8193b1e8b861bbc4bf3cba18dcef91c8a58c937e7a581378eec9da518565826c35e55b7ab157b7ee4634d36cd71a85c4e SHA512 50ab8ec7a65dc431f2bc71a302d21e59ac3d5939b89a90ec161527e1d5c0b80b8c396f8f323b2959e0b807f577e021863fe423bf26a8f7165a6dd112afca6e45
-DIST exaile-4.0.0rc3.tar.gz 3627782 BLAKE2B 1c986309798d4cb78969a7443e4c29e02ca3a9c8e316264641ffafe97dd46b6a1745988230c13469ce2d9c37aadf7b07eee5bcd5836f33b1b2d25e3ebb69f574 SHA512 d3822a7d88934c90a2856074f177a346b19896ecca54f33e7506d37a0b25170983c057feaae162c2685780e7f0d1a6edc8ce7addbcc04cacf2d2b25e0c9f36de
-EBUILD exaile-4.0.0.ebuild 1811 BLAKE2B c62c2eed506ece4a3fad27f6261de1eb0a9b04ce9364b076342fcccc5b5b75dc3761301095bfa80aad27ba87b051d6b1893c7f604ba9ae1a922bae1111f8ac9c SHA512 aadd4278b8dbf4baa484df7959101371b92e8d48fff122142b385a77a3f8ff5f7e5ff8976864c153adb10821e9fe756ad401503734064b3b61394b94f74e593f
-EBUILD exaile-4.0.0_rc3.ebuild 1862 BLAKE2B d8ba6122dffff7ce1e40d26e14aaf23515226498f6e7c2af96764da0bcc64d2b73095a3e999219764c0423ffd3a30dcdd8077955e230887ffe75a5ae12e015f4 SHA512 2eac12361e1f281e88c1473442f5810bd22e9d32685ab177884bd3d38182cb81458a6efae41e0da3cad058b6678761bb1f44aa4c606344b02027b27fbb63839d
+EBUILD exaile-4.0.0.ebuild 1809 BLAKE2B b799a034b2784190ed920d3c03cc6986be811b0d738b3ad67e632cb01edbb5f398b741d04d947c4808de4c28ea76972ce1139da89c9908e9a0638f688473ef16 SHA512 f8a6621eb7829c469db9f2cb4aa7e3860bb19c2ea664c10934b0c4438b868f9a3f0d7dd29f9e8ad1e831b9121464d8de635f7c4006d3c006d3b507913d1defac
 MISC metadata.xml 465 BLAKE2B 1524388af85ca2f4b928ad4670fa8cc2a86a69f51d72c0dc0a755ca22a05ec95587bab11cfa9f10c9f65cd9a4b08c91ec1fb445f69f9163f54b4a86e2fb99746 SHA512 4185b5a40189086940aa0139e953f39d0af627af73ef2c34f77727e7b8ce596f6f69350531cc7b85cbea4968b7b4413f923f9eda61738a8e1c1dee3b85809942
diff --git a/media-sound/exaile/exaile-4.0.0.ebuild b/media-sound/exaile/exaile-4.0.0.ebuild
index 304677b17949..57c248e3ab85 100644
--- a/media-sound/exaile/exaile-4.0.0.ebuild
+++ b/media-sound/exaile/exaile-4.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/exaile/exaile.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${PN}-${PV/_/}.tar.gz"
-	KEYWORDS="~amd64 ~sparc ~x86"
+	KEYWORDS="amd64 ~sparc x86"
 	S="${WORKDIR}/${PN}-${PV/_/}"
 fi
 
diff --git a/media-sound/exaile/exaile-4.0.0_rc3.ebuild b/media-sound/exaile/exaile-4.0.0_rc3.ebuild
deleted file mode 100644
index f16131d4e058..000000000000
--- a/media-sound/exaile/exaile-4.0.0_rc3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-inherit python-single-r1 xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/exaile/exaile.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${PN}-${PV/_/}.tar.gz"
-	KEYWORDS="amd64 ~sparc x86"
-	S="${WORKDIR}/${PN}-${PV/_/}"
-fi
-
-DESCRIPTION="GTK+ based media player aiming to be similar to Amarok"
-HOMEPAGE="https://www.exaile.org/"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-IUSE="cddb libnotify nls scrobbler"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/gobject-introspection[${PYTHON_USEDEP}]
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.13.2:3[${PYTHON_USEDEP}]
-	>=media-libs/gst-plugins-base-1.6:1.0
-	>=media-libs/gst-plugins-good-1.4:1.0
-	>=media-libs/mutagen-1.10[${PYTHON_USEDEP}]
-	media-plugins/gst-plugins-meta:1.0
-	>=x11-libs/gtk+-3.10:3[introspection]
-	cddb? ( dev-python/cddb-py )
-	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-	scrobbler? ( dev-python/pylast[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)
-"
-
-RESTRICT="test" #315589
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_compile() {
-	use nls && emake locale
-}
-
-src_install() {
-	emake \
-		PREFIX=/usr \
-		LIBINSTALLDIR=/usr/$(get_libdir) \
-		DESTDIR="${D}" \
-		install$(use nls || echo _no_locale)
-
-	python_optimize "${D}/usr/$(get_libdir)/${PN}"
-	python_optimize "${D}/usr/share/${PN}"
-}
-
-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/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index d206b92cb2ba..58d2edf4424d 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,7 @@
 DIST fluidsynth-1.1.11.tar.gz 634566 BLAKE2B ed135533c9e3e807794e0eca8117d430aa299b8772b2b6c85f6233e7e497d69f43381d9c7cf2de5ce8638f5dc616339bd28cecc3cdc23408bf5883a0b14fee79 SHA512 ad7c634426b29e5a05d67addf32d43a9ccb11a1fe3cfc09ad617416b9df3dc99a48191377f5027232521380737dde2d9b59833516d1bffb90f410bab3bbe140c
 DIST fluidsynth-2.0.4.tar.gz 1378042 BLAKE2B 0fc75ea68169c47d64bdf727b8d78e311b36cb04509832f449a52d05e085908bd1ef837dd4c5e23edc25286b8ff3fdf69a9d042520c8eb2a3234fb929bed8de5 SHA512 d58ddc5f4da9bb5954a82749617548ef32edd25f6ca5c6d5c2b06d23090784ec175d2422553a66776f543c6b253f037a6cf1e717a853344ffb899fa53752eec0
+DIST fluidsynth-2.0.6.tar.gz 1315138 BLAKE2B ce6d1717d56d61b83bef6c30254c584ddb9ee3e74fa49422881c96c969068ebe7965de507547e8bfa025da4376f52499413ff66b56607aac107576754980a0de SHA512 c160e3d7c6ad62d5cc014642eb18a0f65eb90b5ad91db4049e1b45446034e989a4f9e5b805270967d4eaf47a6e2da0e81bdb5ae95500cc80d7021e8e61cd7107
 EBUILD fluidsynth-1.1.11.ebuild 2193 BLAKE2B 4d66cef4db9220271baa5dbf8d1577e80b78fb568490cd52d2ce6bf58b3656a983be6c444a6b798b7563273c54f27a7e4dd937f1e692389fc768edc524a719cb SHA512 4f3925eb3aaf0ecf92f9ffc3435331c3f81588a46632de368d17eee9a4bd37f282772c962956882e46879526e4b79e3b7a38ee9cc0ce9302e32e96e16bf80431
 EBUILD fluidsynth-2.0.4.ebuild 1970 BLAKE2B 6f9833e43b733a366eb3e7f3b32defa96378e2a88635d43ef6b2df2f9528d9a3914ef8b232db9e17f65134e5dc79e1d6e6159a6b068e1f98fc64f170a6a43759 SHA512 6c48d02f66896260659c9d139501cb181fb468d3f4b7e4f43ffa45e3035d61194362c70db099a96b3f7713fdc415a78b92b1f2c25d8c951be18a7f790c99ecf9
+EBUILD fluidsynth-2.0.6.ebuild 2554 BLAKE2B 64d09be869880b78e7d9edaf6daadd784975ba4f77e2db30af834305a18c4db18eda6323e181692b3318a2a4dd74eacfa1eabbd8677fad5a029a286f66d02e64 SHA512 a536bc87c0826739c05df317eb23adb795684c7700e929d0eb9bb1a36d4b29dc3452f4717dab547ac8b6953a5e8a3ea0a224789c905d82100188461eb23b3df1
 MISC metadata.xml 339 BLAKE2B 4bc7678ba8ccc3e97a79dda9294b31ffc1950212619ace448def22e50852b20e3b716368d9c5b7127aff381aab85d7fa104404fcd409144452855a4b5d41b529 SHA512 abac43fa8ab39fe41adf6c34a4f0e3aa605dbe834555b2eac4abcaadb6556cc08555197aadc43e51733cf8d4e30c7f7be3efb724536d54604069055836a36980
diff --git a/media-sound/fluidsynth/fluidsynth-2.0.6.ebuild b/media-sound/fluidsynth/fluidsynth-2.0.6.ebuild
new file mode 100644
index 000000000000..1fafcdd0ad95
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-2.0.6.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib systemd
+
+DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
+HOMEPAGE="http://www.fluidsynth.org/"
+SRC_URI="https://github.com/FluidSynth/fluidsynth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa dbus debug examples ipv6 jack ladspa lash oss portaudio pulseaudio +readline +sndfile systemd"
+
+BDEPEND="
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	alsa? (
+		media-libs/alsa-lib[${MULTILIB_USEDEP}]
+		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	ladspa? (
+		media-libs/ladspa-cmt[${MULTILIB_USEDEP}]
+		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
+	)
+	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS NEWS README.md THANKS TODO doc/{fluidsynth-v20-devdoc,xtrafluid}.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-Denable-alsa=$(usex alsa)
+		-Denable-dbus=$(usex dbus)
+		-Denable-debug=$(usex debug)
+		-Denable-ipv6=$(usex ipv6)
+		-Denable-jack=$(usex jack)
+		-Denable-ladspa=$(usex ladspa)
+		-Denable-oss=$(usex oss)
+		-Denable-libsndfile=$(usex sndfile)
+		-Denable-portaudio=$(usex portaudio)
+		-Denable-pulseaudio=$(usex pulseaudio)
+		-Denable-readline=$(usex readline)
+		-Denable-systemd=$(usex systemd)
+	)
+
+	if use alsa; then
+		mycmakeargs+=( -Denable-lash=$(usex lash) )
+	else
+		mycmakeargs+=( -Denable-lash=OFF )
+	fi
+
+	if use systemd; then
+		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
+	fi
+
+	cmake-multilib_src_configure
+}
+
+install_systemd_files() {
+	if multilib_is_native_abi; then
+		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
+		insinto /etc
+		doins "${BUILD_DIR}/fluidsynth.conf"
+	fi
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	docinto pdf
+	dodoc doc/*.pdf
+
+	if use examples; then
+		docinto examples
+		dodoc doc/*.c
+	fi
+
+	if use systemd; then
+		multilib_foreach_abi install_systemd_files
+
+		elog "When using fluidsynth as a systemd service, make sure"
+		elog "to configure your fluidsynth settings globally in "
+		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
+	fi
+}
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index a494953394b0..fcaa91cc44a2 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,7 +1,7 @@
-DIST grip-3.10.0.tar.gz 980402 BLAKE2B fe5cd88d170c64916abffb69fe07b66452a11ae13d75d0f24ae1cdae3bf87c1dd811f5d30be2379cd2bcd4a47ef8e7f6603c5573ffead6c94105585533645b85 SHA512 61253be210d006b778d9a071cc8701f11f03ee2f29179a7ba69f5d9309de0e113ab7b0bca5491d8f7603d1df9b912048c4b1a502bcb38c5b54664516be4acdc6
 DIST grip-3.10.1.tar.gz 980748 BLAKE2B 75f8bd4a3a22ca0dc9c03f5a7a3d501d054a1443735a684296fefef95c4ab500034724d7f9fabab3ea1bafbb45653f068615b941d6b5845d2e0edac63270ab2d SHA512 627f55e69a06ee21ef3f21900c22903a70cdb7d25f9340d6c9bbf92317e2b0ba0160cda825bc370f9854c96ea81c96684a82bfd000f890d016d5a858095a9eb2
+DIST grip-3.10.2.tar.gz 980804 BLAKE2B d7dd2585d379733a60215705b5d91ffb3ba292bf78b6728c0ce4ccd98eeb79a5c26131b1023e884d51810857c25a18066e89e726d6d08e2b8b125840b0c30016 SHA512 ee17d5842ff4d13b812e5863ce5d0c516d6bf6bffc8131c685056e1f4bb003ebbc9cad99d48d0dc9d3657d0b13d63c2bf09a67db0d37ea47c8ce715c70cfd3fa
 DIST grip-3.9.0.tar.gz 968706 BLAKE2B 9d530b1e7c93239d4298a57a784eec38d98fe57e2c964018a04a8646ce5f1f4734b21103f31612bac4cc45c8c03eeca2080ba88d60a2cfe51d161ef61758639b SHA512 748821f59c90d7239bb711a4a7e1df4e9f2b67ff7bd5c635a2c49389efc7836cca6672cdd93e727f8b97c4e2221f895cc7b4110aa0d3419a5fbe56530ca1b1d0
-EBUILD grip-3.10.0.ebuild 1232 BLAKE2B 458a4cd5560f48c872a19d0359563054a2b961176789329c0370eb3d72093ebe826a9c048dc25c7f3133355c02464095754057a664471656d1b5059f1d9246f4 SHA512 3bceff62a4ac1c85845c318cc5e8ab43b9b17c37dbb05f6d63b4608c6232a951c2ec37748939c1fb94d979f4caf9a6c0d336622ea873ba9a8dcb5ba4f29ece9e
 EBUILD grip-3.10.1.ebuild 1232 BLAKE2B 458a4cd5560f48c872a19d0359563054a2b961176789329c0370eb3d72093ebe826a9c048dc25c7f3133355c02464095754057a664471656d1b5059f1d9246f4 SHA512 3bceff62a4ac1c85845c318cc5e8ab43b9b17c37dbb05f6d63b4608c6232a951c2ec37748939c1fb94d979f4caf9a6c0d336622ea873ba9a8dcb5ba4f29ece9e
+EBUILD grip-3.10.2.ebuild 1232 BLAKE2B 458a4cd5560f48c872a19d0359563054a2b961176789329c0370eb3d72093ebe826a9c048dc25c7f3133355c02464095754057a664471656d1b5059f1d9246f4 SHA512 3bceff62a4ac1c85845c318cc5e8ab43b9b17c37dbb05f6d63b4608c6232a951c2ec37748939c1fb94d979f4caf9a6c0d336622ea873ba9a8dcb5ba4f29ece9e
 EBUILD grip-3.9.0.ebuild 1218 BLAKE2B c6c424d05651474333d322dd1bac779418f3b446c5f28397820fa07ea4c0edca60bfe478d56825fbc5a2a669dd98e4712b191c864a10582bb0d00d2c2f1122a8 SHA512 68f067ef88b5572a6338397e7c8be9a7f200da93b7d3a49d4e2a533082ee7b65c85a8999b8110de8a8e6e69e6d2c925dc132197d9a59459fde9cfc732d323f30
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.10.0.ebuild b/media-sound/grip/grip-3.10.2.ebuild
index 4f7ac3d6b08f..4f7ac3d6b08f 100644
--- a/media-sound/grip/grip-3.10.0.ebuild
+++ b/media-sound/grip/grip-3.10.2.ebuild
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index cc839f5bbd8c..072199e01e83 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,3 +1,5 @@
 DIST kid3-3.7.1.tar.gz 1486532 BLAKE2B aec19ca9792ab5a3ae975d64b581074f6505507027bc52483a95b8570fdf7484fadd63a5cc740b59817b6b2b7227f02637aeb3e9611d206a536138c6db083198 SHA512 68b1d4978e5e984d180981d02df5efa247d50da79e5c6a41010eb3c5369b6cdc023042333865f4730e47814c4b4b69dc2f1bcbe1566396b72637fd576f5e543c
+DIST kid3-3.8.0.tar.gz 1509430 BLAKE2B 492690f4e9ba70a981c273f6fc93912d24b8e9ecf6e4d95473baee2ab581ca8a6939a88d9237ae985f34cb0a599e80c5fd9a6af7588ad35ec928089b5e205748 SHA512 ff4d5533ed9538c589d2e8a75bbbabd21add38b51d6a442987ee70f3721eda8aefb597f51e82033c2a04fd19c86d5e57c194409ec71bbf77da405626b5484d44
 EBUILD kid3-3.7.1.ebuild 1678 BLAKE2B ba1c3630a8ceabdf0e85564a714a8a7383f3627eab3757600cce110c5c4bf62befb0d560bf4039ca47ef929e07066562606dd556037b255f434711b448d5fc3a SHA512 1b03581e83c83748d027088b8ab358800d462a4ac699d1023ce938ebc747f4ed04598886327beca6a970d522dc293919468a7d41bab1e6e25f57da3cce8bbf03
+EBUILD kid3-3.8.0.ebuild 1680 BLAKE2B fa795f01b39326776e2a5fa53270ac3d9bc3abae7638bc967d9d420963b81de580ba365b9890668b6ef1fb0598b923c3f75fbac3fdb57c6069ff2ba05ade4833 SHA512 4994c5dec92a220dfc1ca1d37d3f2e8c1747ce5bb70e0f721e45ca62b8aa1ce2f21d2de95b710bbc97e17c2669b89faffe7d1d9f0f84f6076b81d0711e93bce0
 MISC metadata.xml 737 BLAKE2B eec3a25f3041a1174f4d43780344e5dcee09313461e18ecc7ad94400858d84e406934ee5924318539547ead7ad0dfc98af87e333cc62b2653a675598c15d9694 SHA512 6d4dc69756971b2db5d12116db5644b9cda51ea44f06b6e840246ca1d1cc0f53ed37240a1b71e6bd8b3cf6f31975ed9b5ec2a4f7d6a9d0d3dc5130259fce98b1
diff --git a/media-sound/kid3/kid3-3.8.0.ebuild b/media-sound/kid3/kid3-3.8.0.ebuild
new file mode 100644
index 000000000000..3ce477229e93
--- /dev/null
+++ b/media-sound/kid3/kid3-3.8.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg
+
+DESCRIPTION="Simple tag editor based on Qt"
+HOMEPAGE="https://kid3.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="acoustid flac kde mp3 mp4 +mpris +taglib vorbis"
+
+REQUIRED_USE="flac? ( vorbis )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/readline:0=
+	acoustid? (
+		media-libs/chromaprint
+		virtual/ffmpeg
+	)
+	flac? (
+		media-libs/flac[cxx]
+		media-libs/libvorbis
+	)
+	kde? (
+		kde-frameworks/kconfig:5
+		kde-frameworks/kconfigwidgets:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kwidgetsaddons:5
+		kde-frameworks/kxmlgui:5
+	)
+	mp3? ( media-libs/id3lib )
+	mp4? ( media-libs/libmp4v2:0 )
+	mpris? ( dev-qt/qtdbus:5 )
+	taglib? ( >=media-libs/taglib-1.9.1 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+RDEPEND="${DEPEND}
+	!media-sound/kid3:4
+"
+
+src_prepare() {
+	# overengineered upstream build system
+	cmake-utils_src_prepare
+	# applies broken python hacks, bug #614950
+	cmake_comment_add_subdirectory doc
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CHROMAPRINT=$(usex acoustid)
+		-DWITH_DBUS=$(usex mpris)
+		-DWITH_FLAC=$(usex flac)
+		-DWITH_ID3LIB=$(usex mp3)
+		-DWITH_MP4V2=$(usex mp4)
+		-DWITH_TAGLIB=$(usex taglib)
+		-DWITH_VORBIS=$(usex vorbis)
+	)
+
+	if use kde ; then
+		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
+	else
+		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
+	fi
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index bdfbff9ce019..adacedf6bea6 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,5 +1,5 @@
 DIST lollypop-1.0.12.tar.xz 448864 BLAKE2B 65681bc29f8256ad8f9d6dadac7a6d147150a8f779e25c85744a39428176c6887e3a9f90f0af81f432db771806351301712ec2431c3a79bcb230c8c0e6fb055b SHA512 d6ad6fb638ac994c2c0367234c8ab35b79d619b3669c46f27bc1df221e41410f464a0a157faccf0ed1b2b5fbdb9f1ecad10ec7466bdff03231e4724948c8c3a2
-DIST lollypop-1.1.4.14.tar.xz 455404 BLAKE2B f7b3f781af5b5a5a070b1fabf288056209a02cfbeafd1b07fdd54a74a28c77d716907eabd90ba1dd7c3571c7eee82aaeac5a9f6d151b30e1c0ae7d5c9bb40ca5 SHA512 868a1183b030b207f3ffadd8788d4dec97ff16a758b0752b9d366e2d04138f5782d682ee7794d263a4412e276f1eaccb13e821546b8b35fc9900c66c40219662
+DIST lollypop-1.1.4.15.tar.xz 455360 BLAKE2B 7bce337740d1f02c0b25e156a82a876726df2199c8dd1f751b58addd2fabd07674f883588ba9a26591777cc088566d38d904aed5bbc6ffaaf1e9c134e01ed5f0 SHA512 a4841006a9ebb2c385f52c91cdff0897f139035ab3d58727fb3dc91248d879f8ca99e67d025b84ad50ef3f2f8bd69ef9785d337856788b0328b0180c0e683b84
 EBUILD lollypop-1.0.12.ebuild 1402 BLAKE2B 59520ce1f04d7248a2193f6f2b7206995ab1c2bd76c407ed23c301aa0ac4e3df011070c53291ba6b155214351fbe0cb53a0754394c7ab8c79ddb906ab994ef43 SHA512 d6270ceb393b89098522143716916b0e0c1418b87ff50dbfd22a3f7aff4699f40c14be0786c77e598727a0df50c0e0839416350c120f09a337bc331fde4dff7f
-EBUILD lollypop-1.1.4.14.ebuild 1403 BLAKE2B 723694a3d546406c3d9cefb45c4964dcfdbbb40ce4f98519b08727a5c2979ee5b5f7c27fccd3773b4f643e155b982a1616e25625e4f6a8a75afd3499ad0064cb SHA512 26fc8a7758218eb480fe9f2c6828becbecb73bfc82714b50c6f45e655e2960635d61c8b24fcac1428d307c4da2f2ee967300119bb05b895a69aacc3ee7b6b82a
+EBUILD lollypop-1.1.4.15.ebuild 1403 BLAKE2B 4064f322ed95465411ece22d7829ffe219209cbded8c0219d683f8ce403b16d9474d7b6e4b4b67b068d063c357be924c94fc19c3b487bcac61c47619ac65c456 SHA512 46890cfd6315ef4a7aff1ad7d2429fc35aa6396822877643c343dedb3919f9bb7b093dad4d99ef509790e8af53cb0c5fc4d1b528ae1e00da0a9f99e534d20566
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.1.4.14.ebuild b/media-sound/lollypop/lollypop-1.1.4.15.ebuild
index fe34d473e7f4..fa4f2737c6a6 100644
--- a/media-sound/lollypop/lollypop-1.1.4.14.ebuild
+++ b/media-sound/lollypop/lollypop-1.1.4.15.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
-HASH="2ce8e3ae7569bda628da8db822d08df7"
+HASH="93fcc0dd47b06c2f4f54f88c0e67e993"
 inherit python-r1 gnome2-utils meson xdg-utils
 
 DESCRIPTION="Modern music player for GNOME"
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index da23750f35c5..b89f6049f69f 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,10 +1,10 @@
 AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e30e29e6c4d6330cc298a568ee7dd7014af6b9c1f1c4d98b8c11c96da7f74660eb4b3b522f449e7a6a431addc SHA512 01ab76466f782f538c894e460f7694553ae12804651f68aabb6aaa0dbdc89e2ff7e2b51529b0f112cee42c8053b75fc64241a9c8898def8cf1c76231b1ec5d59
 AUX mixxx-2.2.0-lilv_include_fix.patch 1006 BLAKE2B 1541ecc32cb20d02d71577615b96605938a2d38e40e04fc43e864c8a85722475b795c807ccda1df0ff86c6268d1d1425934e3b413fdedc2effcbd6a2ab584ad6 SHA512 e15980f9861a61bf965636182fe3f0d41d25d569d2d4b43e167e53e33fe7e8f533878e93db237e90551ac409811de497e3313e32fc62462bf963b7f1f29c4a11
 DIST mixxx-2.1.8.tar.gz 34652727 BLAKE2B d996bb07a5914e5a3b8f276130e1f8fb46a9493e192e45a1b65cdb961b1a7ca0e98fed69d894ace8e61ee72231a1d8ba731921e46d3601ad0d41a79aa04a47ab SHA512 c1423bec9b3a9654ece5ae68c0f72975dcd2a9cee377520e56d4f35366a3bb23157c9c64f0f2b8a61d36e5d818216b64cb6aae53ca2b8e3dfa865b8911a7e1eb
-DIST mixxx-2.2.0.tar.gz 34639153 BLAKE2B b99d05508f3f59debf026fdc5102f213eaa10a747c234e3f8f1782af9c07fb30c4641ca3c15fc634e2e8081966f8897751fb7bc72928f8b07a3c9c6d9d728530 SHA512 8174b504d236cde36c636985e0e224915f0be69b13691bf0d88c21087c20c1100ff55561b6e395d97fe5b21a0229fe9ecdac2493cb44fa99a42549c368fa2134
 DIST mixxx-2.2.1.tar.gz 34763333 BLAKE2B 246bd01fe346298ea27d1cf64a597ddf009f31fe7edb004a2b5ffd4a2c4a09843e5c47d38acb6428ed2b8f3bb4e5618b1e97d64ff1b9721682a6b34fbd49b73a SHA512 16f0f4f6a83cd18501fdba3cb8d4f7fe4ac14b980d390406cb61acb889647ba89bc4051bb342d73081f940166f1689027f47fe6928e36c72babc18bf2a0d9bf3
+DIST mixxx-2.2.2.tar.gz 35050389 BLAKE2B 7d1f7fa3de7aa31bdc4e13110ceec4a07ae776aa995c191e467ece403b66dc930ab2632fb0705d204a416b3e64b87af13583f307b227626facb02a88f777c259 SHA512 3b9365bd9d9a7d387cd8791d7d9f6315116e04322370db103998d5e055a6de5e159a4605c7de96cbcf13e7d0653cbe53140dca18a8c3f1b688b227be2c4aeb6f
 EBUILD mixxx-2.1.8.ebuild 3001 BLAKE2B e1812e508163883035ad68d507c9b186646fd8d49801cef7948dbeb3b6c3b4312285ad71ec8dd85966ce875f2706d3ee31f6233689327600f23a13eaafbda37d SHA512 858f7b5f84d9a95f48541da198d89691dae24267a3efc4846ec950602d4106a4f46df9387ca97fc6305c85fdd8b492bad48a57029f267c22b6700ad6a8351d61
-EBUILD mixxx-2.2.0.ebuild 3159 BLAKE2B 01478993c3cf731fba6ec0df3a53492cd8e932100d9b37ed398c231eb91be7179f3244715d7db0351b6a3a71dfc29c23b6f5b1e819509a90e97d4d6292b98098 SHA512 194f76c1d2aeb32a331abde710ada213879b80e0c18afe7cb2164c542ee084466496d5c7a5a21db46b07c41bc3d4a9ef439bf05e20b2f6221467d990a5d21cb6
 EBUILD mixxx-2.2.1.ebuild 3159 BLAKE2B ab14ada19b18cf85144ac82b915ce3b16e2df4516587d7b11765f2f8c7d13db2c342d1a3e6d3f79b66a58a9a1dfddd1fcaf6b8a34f2f7d3179d61c73fced3f8b SHA512 8a124c7d2fa60b726707bf181f38193f36cf77ce6608343d13bc9ef9c78e32318837dccc8115233f44da637699327a9cd6aac2f8697c04d0fd466ded07ed9622
+EBUILD mixxx-2.2.2.ebuild 3159 BLAKE2B ab14ada19b18cf85144ac82b915ce3b16e2df4516587d7b11765f2f8c7d13db2c342d1a3e6d3f79b66a58a9a1dfddd1fcaf6b8a34f2f7d3179d61c73fced3f8b SHA512 8a124c7d2fa60b726707bf181f38193f36cf77ce6608343d13bc9ef9c78e32318837dccc8115233f44da637699327a9cd6aac2f8697c04d0fd466ded07ed9622
 EBUILD mixxx-9999.ebuild 3156 BLAKE2B 9251127fa8cab40f36aa43f999478b2bda2a4e99ab7939f1f758efd59fd58716e938b4e0128820996bd9bad616e35cf209eee4c9134fe229a296910db45dfa28 SHA512 ae54684c8970ad8068fd97674e4972326c14006c1c1e48d4563ab3b574a215d140eaa3c88f2ee6fa4ad3ebe9479c3bc1ffe5e855016605106d8ea30ab71e5af1
 MISC metadata.xml 632 BLAKE2B d6c7a595841941a39b97a16a74677a1baae1a97fb4af73bb019c4fc03a96aaebf5b369b1e89a398f92c6cad4a28083620b4016cb9e5cbc99823025b776d7813c SHA512 109ee347f6a011c55858a555a93bc0d67ed6dc8a86ec7e2bcce8ad949a8742a4dedd1da3487ccaf1f928e063c6ce5750e083cddb9807d8bd732db231e2e7904f
diff --git a/media-sound/mixxx/mixxx-2.2.0.ebuild b/media-sound/mixxx/mixxx-2.2.2.ebuild
index 7de8d9c94349..87572640dcad 100644
--- a/media-sound/mixxx/mixxx-2.2.0.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 4449ea2b914f..37f96ed653ec 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -3,4 +3,4 @@ DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a
 DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf
 EBUILD moc-2.5.2.ebuild 2148 BLAKE2B 3039de5a7faa6b92c6b9c836a5268896eec61657dc9ce98075f39096df8b3b21494b2bcc1fe7b3178d6870be7505bd8db5aec1b9e08118ded7c315f4dcfec172 SHA512 9680c784f3dcf4a1ceb57c5df5b6c92e27bd3f144ff49d3805fbe8a3afb614b72c40160da15f3a204738a935d6fb84aa16dd329002c59a461e0550c15a80ed5b
 EBUILD moc-2.6_alpha3.ebuild 2311 BLAKE2B a33ac63830fb03ebeb5fe6938546e9e8ead84bd6ac6861b52fb51e0c53d0d7558ba9535fc6f852cb50f4eaabb411f2cab9d8334419f6cc1dca99490293aebd7e SHA512 b6c43e2a0be7d2eb7357f942070d875962fd4a91057db291e35a8c56df5f9886116484729ded2cf5f7d2b58dfcac266fb37fb17a00d3387232354a040c62c026
-MISC metadata.xml 596 BLAKE2B 4ebc0826f9a0352909b2dfcfcbd7712d0af6b484b5801ee8e0b73be7a5966968af27d5fc4d56893d407e0bbb3809376f8336291901bc36aeb2e43e549e60bc44 SHA512 f2ca529805ed93256100396a8ee414ba1098097eb4a8379144d52fbdf02d98a05c399cb1be861c64eb712bd5160f3286c30e73875dce05ce2e974f7123b40699
+MISC metadata.xml 532 BLAKE2B 79a7280e9bb412be2a57f13259d34ff2d2501bd3a34bc74c6fe5ce2529842dae5f199a674224b0b13883af8536fea947e98c6054c3039141a60dbc436ad4a5e2 SHA512 62746eb7250465ef0099c8b9c8e906e932d1bb5c9ac41b1a0192ee3cd4fa79698342b6fac2e7646d65197ebc9f7a504ab733eb2b889b7e84d1a8a9fadfc2ac57
diff --git a/media-sound/moc/metadata.xml b/media-sound/moc/metadata.xml
index 67fb1868a11d..5d50f496122e 100644
--- a/media-sound/moc/metadata.xml
+++ b/media-sound/moc/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="cache">Enable tags caching support</flag>
-		<flag name="magic">Use libmagic to determine mimetypes</flag>
 		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
 		<flag name="tremor">Build vorbis support using an integer implementation
 			of the vorbis library (<pkg>media-libs/tremor</pkg>)</flag>
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index e9004eadc92b..38e906a7bfd1 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -5,8 +5,10 @@ DIST mpd-0.21.10.tar.xz 670952 BLAKE2B efebbd5202b82e52800ff7e4f60fb9e7606e0b07c
 DIST mpd-0.21.11.tar.xz 671444 BLAKE2B d10e65103e9c0c6dfc44f8d4858c202ad68a5e7a44bd7dd473b7f78c697b20ab7d52d2bff0f7e7434ce06b1afb9a68e6f71ca6148efdf51e122c463506b356b2 SHA512 40e25428295f1bded618872c1450f6836c46b2e788dca06d0af134b939a25a7a9a215273bb005306df288e5dc5ccb44d4054c47e5583e54b970fa252e4b030a7
 DIST mpd-0.21.12.tar.xz 672144 BLAKE2B 06eda513314fcb028784115cfc378d0d6482174565ee843a2025af7b2af1fdd7dfadc05b08981e227d11b615aa457f979e80170bc1a91886648f464772240ece SHA512 d35eb7162cfb50c10d57d1d4b035f6c4f7088fb930add97c2159c7b29ab9d7ed33a8b4d22640af78527387305b9f5d380c7c03b98cf957dc1519f772d842e7e3
 DIST mpd-0.21.13.tar.xz 672184 BLAKE2B 5aad54f0d747034f3e43f741ecaeff8317a91192c125a4631e99978f7f9c7274a921a05b92a4496fb53f70ee428321f5ae92f96386e439733c028664d80c4dc1 SHA512 626e658b4d53408be5419ce3a93a19005da5c5386119b241c1572eaaba96a628f941d5f46977de08e1de736eeab6cd6ba274d5df8f1df3e3f4b0df064a6ec43d
+DIST mpd-0.21.14.tar.xz 673036 BLAKE2B 73eed90c0d48e26d747e26b0cd000d3e0a12dfebb015f865fe9d3ddbe5f7fa564b1655b7e0639951e9aeb2554185063b11d6bc818813ca6366688ea05705ba4a SHA512 d5ce06741444d545c7334f4c4ab32dbfacaa264df5a1ac61b73d951e0a6f952c8ea1e4df1b5bfc827e7faa35a6b8026e78cbf3a057ee35adf448fa7204389cd9
 EBUILD mpd-0.21.10.ebuild 8127 BLAKE2B b1b725c5704f4b7ae9eabd50ab31543f1f0893c2377a9eb62acb97109bdac197a898de0597dbc13778932d22a769f613890f1bd3e5b49e55312dd81779f1c8f9 SHA512 61c95152724bcc672d0dbc8597b83802928edefb74bbd6cfaf74735d06683cded78fac33a7bec08de1b5d23e3f8ea6e213e223d2a634e2f67e09d575391ad3cf
 EBUILD mpd-0.21.11.ebuild 8130 BLAKE2B 1ec6da3cd0207ab701ef1571cc2a3ec1711302104eb480b456f0c507c1819f2be28b8e8c6c9913afdc4181bae4b3d25970aab94ab51711aa6f9f865f72e4cd62 SHA512 6ec92a3c7f9d0676d733c3b14fe2c936aacce2dc585f3b6d078170964664add5a2f94ac53a978c6db417cf32791f5af7bf91c4291fe1597c98db3bca1c908c62
 EBUILD mpd-0.21.12.ebuild 8130 BLAKE2B 1ec6da3cd0207ab701ef1571cc2a3ec1711302104eb480b456f0c507c1819f2be28b8e8c6c9913afdc4181bae4b3d25970aab94ab51711aa6f9f865f72e4cd62 SHA512 6ec92a3c7f9d0676d733c3b14fe2c936aacce2dc585f3b6d078170964664add5a2f94ac53a978c6db417cf32791f5af7bf91c4291fe1597c98db3bca1c908c62
 EBUILD mpd-0.21.13.ebuild 8130 BLAKE2B 1ec6da3cd0207ab701ef1571cc2a3ec1711302104eb480b456f0c507c1819f2be28b8e8c6c9913afdc4181bae4b3d25970aab94ab51711aa6f9f865f72e4cd62 SHA512 6ec92a3c7f9d0676d733c3b14fe2c936aacce2dc585f3b6d078170964664add5a2f94ac53a978c6db417cf32791f5af7bf91c4291fe1597c98db3bca1c908c62
+EBUILD mpd-0.21.14.ebuild 8130 BLAKE2B 1ec6da3cd0207ab701ef1571cc2a3ec1711302104eb480b456f0c507c1819f2be28b8e8c6c9913afdc4181bae4b3d25970aab94ab51711aa6f9f865f72e4cd62 SHA512 6ec92a3c7f9d0676d733c3b14fe2c936aacce2dc585f3b6d078170964664add5a2f94ac53a978c6db417cf32791f5af7bf91c4291fe1597c98db3bca1c908c62
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/mpd-0.21.14.ebuild b/media-sound/mpd/mpd-0.21.14.ebuild
new file mode 100644
index 000000000000..984310bc5363
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.14.ebuild
@@ -0,0 +1,294 @@
+# 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
+	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 )
+	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)
+		-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 a4c74c827dea..b9bd1bf9d5b7 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,5 +1,7 @@
 DIST mpg123-1.25.10.tar.bz2 921219 BLAKE2B 04bfbe8915e3943ed42cc2d3597b0bd9c4686f77ee699f5845e7d1e905022206724cf23d6b0420a36e64b232f840dd9367f46f3c00dc2fe6256f44e8b83fa5b2 SHA512 a33666ae4aca7e7c1a93a6414d8c525ec19044c54f712d578180147d88e63033f7af2370b9ad22960cc3a0b454f15967b7a831cccc97e034c8855f70cdf1ab09
 DIST mpg123-1.25.11.tar.bz2 909478 BLAKE2B e821826c91acd3c0b4b9e6b83df6c5625f86611ecfdedd2dcc12b0ce8b3389199aa4cf7eea48b597e5b7f740bbe2c7612d27e75897e34bed2a2407e98b2b7a43 SHA512 986338d0f4829ec9e40990cb384746c7abfa80d3b3d5656b6dda73d03e2441c1f28ffbe7f3f82b0008a1c4ebcfa07aeffb493e95f13f7d04cbc818a09f1008ed
+DIST mpg123-1.25.12.tar.bz2 910149 BLAKE2B 4e1b6329fafb4d1e018c6f5fc0846480ef8cfb6811f92d745f7e88d45fa6a8704ad707d110b12709763ac79fe095603c8ece0bbecb54cc2cde4de819083a2078 SHA512 fa3c719c68dbe45b265fd7677d0932b07f6a14e7ffe365ede965ff1637e655c4b57c86f7e4cd60cace7df5fcc93d48e0d44f082931394b7c6ef19f5d11638eff
 EBUILD mpg123-1.25.10-r1.ebuild 2860 BLAKE2B 0d25dbccc63c6788dd6c1e0c3a15fc8766d5e5616decfbcaa8f3567a53b98c01c6fcbbf23a4aab85369b14d8eb30498be411cf3cc1a8d577bf2f73dbc08849cd SHA512 20f23de51561b06b5dc1c6ef2923afb7f855caa234033847259223d8076588197f7c9f84be7421bf70d01f2cef3bacfa6b21cdb05e36c59539e06f9d3918bd44
 EBUILD mpg123-1.25.11.ebuild 2884 BLAKE2B c3d89fc5a388dedd602be32569f3d1269d1b30b1ca4728abb5e14b979a37ae1a29c11e76b0afdb5fd231419750d6707e6b2844485e867479f9c7f3a244d64898 SHA512 95c204f1ea1e0ff2406daef4114d21cdd74d62842215f977abdec3736c6e626345e112aaa8d035d67aec0306cb121f25f5c3b02c834c874e1965883d50fd3f1b
+EBUILD mpg123-1.25.12.ebuild 2884 BLAKE2B c3d89fc5a388dedd602be32569f3d1269d1b30b1ca4728abb5e14b979a37ae1a29c11e76b0afdb5fd231419750d6707e6b2844485e867479f9c7f3a244d64898 SHA512 95c204f1ea1e0ff2406daef4114d21cdd74d62842215f977abdec3736c6e626345e112aaa8d035d67aec0306cb121f25f5c3b02c834c874e1965883d50fd3f1b
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.25.12.ebuild b/media-sound/mpg123/mpg123-1.25.12.ebuild
new file mode 100644
index 000000000000..b0eac0164fa8
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.25.12.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/musescore/Manifest b/media-sound/musescore/Manifest
index 9b645b8cd7d8..b5644b7d922c 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -3,5 +3,5 @@ AUX musescore-3.0.1-porttime.patch 637 BLAKE2B 2272e64f8b6944fd25567dc1eafcded49
 DIST MuseScore_General-0.1.3.tar.bz2 33164726 BLAKE2B 88f41b76a11bc33dcaf2c8b41571f65c495b2b35095ad02f9549e98cb4bfe820e0a38dcbfa6fc1fe956fb284288eecf72b76895fec83799a5aa8ecdc3b63d7f5 SHA512 91e38a48ecb60c010f0b833bec790071db29ffa5c7895f653a8467eea1d179139c85415e8858eefc7eba22355d0a4887f462e1a1f0cca87b054bc5e1f8e4d38b
 DIST musescore-3.0.1.tar.gz 60166011 BLAKE2B 8c8d1d063da9f14e21342313b58acffb88c375e42e2689bc572eb885be0d836cc946676482f0e58f95a773cc95ead5d767cc7a1052663389a0daad663844e1d9 SHA512 d480550b2c04c07f610d0ed7515a561fbb11a5b1af724e548827bb3817b586c78e5e9ee75730f5885c3f6ba076da52ef53713f10a9e3591e9a40a168af38d46d
 EBUILD musescore-3.0.1-r1.ebuild 2433 BLAKE2B b41f19798c7702f5b31c29f2feee04e4c2973846e40ab08d3c1b5db7449448b9a14dc90aa16f5af3374b1d359227721f853a3e5d80468087bebe502b7f5398c0 SHA512 db33d86a72952ec81318fde0775ac70ea612928ff14b5b422b770299d09c2e05ff7a79e1c2784e15ba1739e2f3990595177b43cbe1a5b0d34b07fc78e099ffd2
-EBUILD musescore-9999.ebuild 2634 BLAKE2B b97c89d8ce5b5b63c762030be4d2912d8f7c658c568fb06210d06964ea046f7f189ab9685792cd328abee7d0b9eb2cb186e639e3f40b410fe0b41a5ce38e54dd SHA512 6de966e26fe26664bf7348fa35d0ce027c6703f4f23c86c131f3419ba72dc803caee766fb821339d84521175be2691c301ccec1e8c0d6b6379f5dbd0ada58454
+EBUILD musescore-9999.ebuild 2592 BLAKE2B 79b11923eccd097e55d417755551c127eb7250b0d828f6dcf4144ea0125412094e1d016057d248e3de7d53b0f46f4b5731cf60c28b8f325d275fb6990c2a6ade SHA512 7d46cbb33797f26dc67879531d0504fd49f78ead44acf2f2352fff37146735771beefb65123c0b71ed3c6bb5d392c47be32365cfeabd04092cd4be58d06c734c
 MISC metadata.xml 685 BLAKE2B 1ab11b407c05d18fa7fea53e4965f37dad96d2845fefc0ead84dab785a8c7684866e6455e500035d88a26ab3a59d18509e85811a5cc5a291bb033a78b55455b0 SHA512 3c9ad5c65edfafa2019ffeeabe13df04bbf5ef3dcee206284cf7e8b79543782da1312f7f443e4ab569248216410c4ac302ded74e074606f6ed8a3930344f483b
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index cd2dec78e2d4..54404ac316e9 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -51,7 +51,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-	"${FILESDIR}/${PN}-3.0.1-porttime.patch"
 )
 
 src_unpack() {
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 17f07069d8ca..a37dc2b78801 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -8,6 +8,6 @@ AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-12.2.tar.xz 1665092 BLAKE2B 2e36efc5142c1e379cc2b135f4126f03a31831b26efe60f7cdf128af6e23fab25706a5609644d0b387530021055f87525fe60d527cd3a087f51bfd58e810644f SHA512 877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e
 EBUILD pulseaudio-12.2-r1.ebuild 11536 BLAKE2B 28892f7980092e0a314c5d69edcc88d5d9be7dd7a8845f4396f2d4a885ab69b1cb9298f3bb720beed253b5a3ed796ba8e55c94c63f7a4e1ec9b4ae7e369f69b5 SHA512 529c755ecbc2c8596cf295fc56c095dd7b987a5b7e1eea9b35ec04993ca0967e1afa52027e3a7a864d12f362f25d2cc1e2190b6d4c91a5cb730535c6bdd403b2
-EBUILD pulseaudio-12.2-r2.ebuild 11724 BLAKE2B dbca0d7b5fca05d32e44aa9e97f9b5a5587afe208bd836880a7b626317b4f7a79e27592aeae7fd887ff8914dde86a4d70570ecfae91b9d0bc2fa7ce01a6e2a88 SHA512 699936b7847cbe78665773f8330c237dfba7004df1c107d71c310a0b99f54d207267a4bfa2088d2eea937a1f55cc19b98f164f68e1de632498be42d1447525f0
+EBUILD pulseaudio-12.2-r2.ebuild 11719 BLAKE2B 1ad6d74fe06e3138c497dbf0020eed28ee958f41c0048b55c882516c5116a2afa49749b670ede6db471c3782b8ba99712dfa5bf45cb606e9dbd928c530576eb8 SHA512 99af1eef5dc60f3a6494329d495fa0d446893f3de7918d816089bb7349c56c88fe49eecf52f90ec167a05c319e68b3da5f710136185736547c4136df0d277db3
 EBUILD pulseaudio-12.2.ebuild 11111 BLAKE2B bd002a2bf9d7c0521eed3baec7d2b602302e8cd4bd7acd6ea22abeff54ee1be8042b44bcfd64a7f4d57f2855a958235d5b16fcf018f0377cd5f5faee040c84e2 SHA512 dd20835fb783428209dcffa07b0b4c1ec9f3e42b91faf07052df5f77f3eac388ee91dfbfe2da7f07890ae3631234a8a14bfafc41875c6716c6b8b9e839ba0f21
 MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild b/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
index 4e7497c6168c..2a4cc0e9089f 100644
--- a/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 75d43af04945..3fd2dd5c6ff9 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -3,6 +3,6 @@ DIST pulseeffects-4.6.5.tar.gz 1881685 BLAKE2B 25f9fd27f2cb66ed32664aa5aaf6e6a7f
 DIST pulseeffects-4.6.6.tar.gz 1881680 BLAKE2B 9bb1048b3870824d19f72e29da2ee274ed387bea7fae0036a104694defd47f754fda3fa1668a95ddb8c2ea066c457bb469c3c32292dc7a378625c6f19d9339ff SHA512 ed6482169bb06490bbcbc57f293723089e5750279a74d6ec5ba2693cb1a71df88262e6fd7d91c852ba5a75b07c246992f619299017e856fca38ad5c619486963
 EBUILD pulseeffects-3.2.3-r1.ebuild 1542 BLAKE2B b98afac0e18f40b4d50578aaa766cf077b73157aefb380fc766e63cd6e1c43b2ea1026ca30b9fbcdf24aa3d150b6f835664668dded8e025e9b2b4b94c558aacc SHA512 14edbfdc37cebc7bd6bf0b9f1f1ac0217da3df742e52b1762d186274eca7cb05ea953c2289059836417430c0bc528f3327859a4f2c4f8d4e5ff99f2ee2d42d4b
 EBUILD pulseeffects-4.6.5.ebuild 1804 BLAKE2B 440b75afc189ccd5efa34f187de3dd83401ea5d756e8a8bf1fbe6878d1d47ddcf1e0cc910346dbbe34ea3390924d2906c8c91a2733d80b2aca2e0aed5f42aed2 SHA512 49381d15e31c49220443f35b4f31fd1bc46f1c74d4989dc8dbc8f1b635e7ef485d0ba106c1f99cd98c129f60914ede3a7820f692114e40ca4edeacbe8fb844e2
-EBUILD pulseeffects-4.6.6.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
+EBUILD pulseeffects-4.6.6.ebuild 1803 BLAKE2B 62eb4d5b56e930df0ceda31bdeebf26ae89f80108f1754c6718342468481768dd5dcf8a5b0006a77ced1a92c3d8504142b65dc558b26defb4295caf20699e9c4 SHA512 052459a1211ea7a74265723b6d4352d0c79346195aab43136b74f3be7a3cd29a4cb8b53874b9106419d7cc3dc3e194dc36c7f7b67aa53450872eaf614f305a33
 EBUILD pulseeffects-9999.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.6.6.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.6.ebuild
index 0e6624cf2428..9ff4d83fe6d1 100644
--- a/media-sound/pulseeffects/pulseeffects-4.6.6.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.6.6.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_REPO_URI="${HOMEPAGE}"
 else
 	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 3864a887dd72..aa5a5bae9d96 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,6 +1,8 @@
 DIST qmmp-1.3.2.tar.bz2 1221919 BLAKE2B 3081aa6b3ef4712ea064d5bb23e9ac7da5e102fde820c378438c13723bd007fe8e79ac351b0ad01ca0aa22c50f6b6773965ce418742cf1386d2ae1d7ba7b1758 SHA512 5c68d87650abf10d03dc8638df73a6694e470af1121a936bb983bcbcea04d95616ad8a55d87e8874b51b7424a890dad2c5353afe65db7029f6513a382e2144e4
 DIST qmmp-1.3.3.tar.bz2 1244817 BLAKE2B 913f52915f30607044168d906b151cde8e7ac5e3c5b82c452b4f297c5e5eaa05ff2fe139c671a46beba351f34bfb013a8eb4d98483dcfe260fd63d8f6b09e244 SHA512 92deda33ed90d5e802258ae014452e5ce384c6ce0d437675b28ead8a838bcbbb2d0b4242b98b2a0f32cc922e7af69b72479fdf8a7946f1fe041a6803a6934c8c
+DIST qmmp-1.3.4.tar.bz2 1246048 BLAKE2B 8108e1b5f0098ee1338ccb72889614d6876855f22159e48cb54a3000a855e843d623a3a491ebcb2e7b627c014946190117bfed586729b424dd5a3564cfdc5ba0 SHA512 520a7b50a3e0bd17418bd3137a4e73a52f644ad38d7fe86647a8781ed3036cdbbd14d5311b9471443f8a2cb42422b5fa11e22acee72ff5b670a7508b55364bb5
 EBUILD qmmp-1.3.2.ebuild 4268 BLAKE2B 9027930e327d56248e1d4d83e69895a3ad9b0ffc9d26d67ce8ec073b72a8392de89509e59041f79e778c2e1664c4a62fdab3df8645a0cb8edf724f2879575310 SHA512 1786f3400aa0d8426744149bfd0ea1c7c2a3180be002972c52e800d33747f8beb8efca9e4a86065e944aba709b73673dc4f056ea9540828cfaacbdbf76186cf2
 EBUILD qmmp-1.3.3.ebuild 4270 BLAKE2B c9e7ba05de9d12abdca56bcaee34767960e656be3461c52c5e01dd2d6a0c7272938d245f75500e4258bb111feb3efe538bb14673fed0bf192d25fd0b5015b743 SHA512 affd8b3ecd07dffdea15558805788a8082e490f991922dfc3a612ab523010c4c21f0ff172e9f6db955c30643eb94d2a2df923c02f1878ac03a4ab36f93b99c19
+EBUILD qmmp-1.3.4.ebuild 4270 BLAKE2B c9e7ba05de9d12abdca56bcaee34767960e656be3461c52c5e01dd2d6a0c7272938d245f75500e4258bb111feb3efe538bb14673fed0bf192d25fd0b5015b743 SHA512 affd8b3ecd07dffdea15558805788a8082e490f991922dfc3a612ab523010c4c21f0ff172e9f6db955c30643eb94d2a2df923c02f1878ac03a4ab36f93b99c19
 EBUILD qmmp-9999.ebuild 4270 BLAKE2B c9e7ba05de9d12abdca56bcaee34767960e656be3461c52c5e01dd2d6a0c7272938d245f75500e4258bb111feb3efe538bb14673fed0bf192d25fd0b5015b743 SHA512 affd8b3ecd07dffdea15558805788a8082e490f991922dfc3a612ab523010c4c21f0ff172e9f6db955c30643eb94d2a2df923c02f1878ac03a4ab36f93b99c19
 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/qmmp-1.3.4.ebuild b/media-sound/qmmp/qmmp-1.3.4.ebuild
new file mode 100644
index 000000000000..13f7bd0c2f20
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.3.4.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg-utils
+[[ ${PV} = 9999 ]] && inherit subversion
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
+		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	QMMP_DEV_BRANCH="1.3"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
+gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
+
+REQUIRED_USE="
+	gnome? ( dbus )
+	shout? ( soxr vorbis )
+	udisks? ( dbus )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/taglib
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	cue? ( media-libs/libcue )
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:5 )
+	enca? ( app-i18n/enca )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		media-sound/jack-audio-connection-kit
+	)
+	ladspa? ( media-libs/ladspa-cmt )
+	mad? ( || (
+		media-libs/libmad
+		media-sound/mpg123
+	) )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	projectm? (
+		dev-qt/qtgui:5[-gles2]
+		dev-qt/qtopengl:5
+		media-libs/libprojectm
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
+	scrobbler? ( net-misc/curl )
+	shout? ( media-libs/libshout )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sndfile? ( media-libs/libsndfile )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HAL=OFF
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MODPLUG="$(usex modplug)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/sfc/Manifest b/media-sound/sfc/Manifest
deleted file mode 100644
index bafd5cf1b51d..000000000000
--- a/media-sound/sfc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sfc-0.018.tar.gz 125680 BLAKE2B e46d66196eb8686b3140b4dc5090b72ab12d07395aa335fbf6d9fd6e4f6bad0ed7906107e6c544689c5e4f1abddfe609a8d9c633fa02c2d2b8acd101b435c0ff SHA512 9007f00d19acee7150b48718a742cf05df471c69a2f36cdfa9572aece80e1711dde03f9e31ad32892ef8bfc4b33a145d17ccabc29c63cacc40bb071a8b8b6262
-EBUILD sfc-0.018-r1.ebuild 589 BLAKE2B d0217d9a297d4f5988e8ac6b929c87b7b8d1f85049e40d6c532d096e4b87fe816d1868f037d000d7fbc39a012092d8e4a403ee56057c84bba538fd2cc76ea5a9 SHA512 fd4e67b686fdca772b334265ce35e6cdb831b05ee36e1768287e7701dbbeeb5c3d48d6542e1f8a069502958ae88cf6be519f8b3632bec5b1940f7069ebddfcfa
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/sfc/metadata.xml b/media-sound/sfc/metadata.xml
deleted file mode 100644
index c870d0eef0ab..000000000000
--- a/media-sound/sfc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-sound/sfc/sfc-0.018-r1.ebuild b/media-sound/sfc/sfc-0.018-r1.ebuild
deleted file mode 100644
index 58a1f87d34c6..000000000000
--- a/media-sound/sfc/sfc-0.018-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils
-
-DESCRIPTION="SoundFontCombi is an opensource software pseudo synthesizer"
-HOMEPAGE="http://personal.telefonica.terra.es/web/soudfontcombi/"
-SRC_URI="http://personal.telefonica.terra.es/web/soudfontcombi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	media-libs/alsa-lib
-	x11-libs/fltk:1"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" configure.in || die
-	epatch_user
-	eautoreconf
-}