gentoo resync : 08.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-08 09:04:53 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-08 09:04:53 +0100
commit: 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch)
tree: 2878053f3e7faed19a1f82c733d3bd29df69991e /media-sound
parent: 2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff)
62 files changed, 507 insertions, 1285 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 92a125ee1c63..939ca63355dc 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index c13b567b73f3..3473bd1d1ced 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -1,3 +1,6 @@
+AUX abcde-2.9.3-Makefile.patch 528 BLAKE2B 7568595d6f67b47bbe6dd84cb829ac2b5f37c32a1a4c275cb073f0e6c03d78868b18821bd5ebc87aa8428708b94477c53e674ea9bfd051852a34ff866bad5815 SHA512 1438f8654f41e8681f0f2887d403ba6c2f85a70dc813f19c93c51aeea2e481dc80cde4d73807aad2e5f01f479224f4f9f4eec85bf6ed81ce442d873386b63d12
 DIST abcde-2.8.1.tar.gz 149238 BLAKE2B 0adb1ea164e72292ee1e5b7e99c6bd9a92342f9eb5036280b91ad43ab62e5b0ef79652d094a81f38f4052c749d874e12da76eaf74134d07517fc8fac1f0d7e64 SHA512 18e9e46ec69d0b99fc5e2b71ec549e3961e5f6d7f88cef1a6c8da154689554a70cc8bc748c1ef78f81583a510f8b03906b8a4fec454aa0b06f0169d0bc4a7b36
+DIST abcde-2.9.3.tar.gz 160876 BLAKE2B cb3ebc372b4bfcf002beda567c2aa91dba11e77fdaeee8ec0d351fe907d6209ccb9013135db2a3ea0f85148eeaaa91f06243c607ac732a1b13f7a0a54d721fb0 SHA512 51a1dfa1f1d2dab6b8dad7d9f70d0139938151bc2dae0e9fc80da5385b4bba4d71c89a4d1b2dec5bd24787a542cb0caeacbef423cf32b8014cf6320c391b4236
 EBUILD abcde-2.8.1.ebuild 1749 BLAKE2B 667eab5834dfb542bba2d825152de1bd4b4a30a6464cf868cef5ad20c5bbbbe97a4fc5678d7029ca6e435bb3d5716c7e8e31860f9002bf753c29e14485a37f60 SHA512 74bd3b26110ffb38a45aee0a4f2ff720ae841bba1bc59deb35e39676acb279de5554895dc4a32b05abcb50d9387b43a90ed771f514caff01770a0d6055c04c60
-MISC metadata.xml 588 BLAKE2B d6639ce0154b4d8b2ad0c7df4d203c7da5650687e24c79ec92977a8e7534539ac62f597b31a3488f976d8f1f11a07f4a77c9b936c56b09ad8e965076e89aa1e8 SHA512 375d7d28e8fb20a86cc92df73927b27e065a975c850aa23575f0f1ea7cc88b46e8eb92013a8b1ff44d5cc150c0082da8142fa41bec49d642c14844ef1a5b1cb1
+EBUILD abcde-2.9.3.ebuild 1840 BLAKE2B 962a38ff5ab4a5bfaf619c3e9ad322d5674171047843848c4abb86a172e76eae129e252eff8ae5f2da1586e69c577f40ebefa17521362fdfb12d8a398ddb2461 SHA512 696dc08762035bc18c24baf013110943af9242e3bf5a02557f10e6291ac839da0f896681edf79727898ad0be835248e2ce8ffd9a734d6c640e6cadca783c6c31
+MISC metadata.xml 687 BLAKE2B 003c2762435868462c70ea9a6d21e7c50b7db96f10cdf3ee68788d027f92e6e656046dcd070f3054888c473dc0fdc273462f36067c2ebbe48b64fe4a8cfa95cf SHA512 42995ba554653993a07ab04e6ad8f8a50ed2fcf3319869fc54b76480a61fe2c22c1186c39354f9a5920ed4b065cf8ef52fa10e67cfa258199dae6da9db3a9581
diff --git a/media-sound/abcde/abcde-2.9.3.ebuild b/media-sound/abcde/abcde-2.9.3.ebuild
new file mode 100644
index 000000000000..571175963651
--- /dev/null
+++ b/media-sound/abcde/abcde-2.9.3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command line CD encoder"
+HOMEPAGE="https://abcde.einval.com/"
+SRC_URI="https://abcde.einval.com/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+# Enable MP3 related flags by default
+IUSE="aac aiff cdr flac +id3tag +lame mac musepack musicbrainz normalize opus replaygain speex vorbis wavpack"
+
+# See `grep :: abcde-musicbrainz-tool` output for USE musicbrainz dependencies
+RDEPEND="
+	media-sound/cd-discid
+	net-misc/wget
+	virtual/eject
+	|| (
+		dev-libs/libcdio-paranoia
+		media-sound/cdparanoia
+		media-sound/dagrab
+	)
+	aac? (
+		media-libs/faac
+		|| (
+			media-video/atomicparsley
+			media-video/atomicparsley-wez
+		)
+	)
+	aiff? ( virtual/ffmpeg )
+	cdr? ( virtual/cdrtools )
+	flac? ( media-libs/flac )
+	id3tag? (
+		dev-python/eyeD3:0.7
+		>=media-sound/id3-0.12
+		media-sound/id3v2
+	)
+	lame? ( media-sound/lame )
+	mac? (
+		media-sound/apetag
+		media-sound/mac
+	)
+	musepack? ( media-sound/musepack-tools )
+	musicbrainz? (
+		dev-perl/MusicBrainz-DiscID
+		>=dev-perl/WebService-MusicBrainz-1.0.4
+		virtual/perl-Digest-SHA
+		virtual/perl-Getopt-Long
+	)
+	normalize? ( >=media-sound/normalize-0.7.4 )
+	opus? ( media-sound/opus-tools )
+	replaygain? (
+		lame? ( media-sound/mp3gain )
+		vorbis? ( media-sound/vorbisgain )
+	)
+	speex? ( media-libs/speex )
+	vorbis? ( media-sound/vorbis-tools )
+	wavpack? ( media-sound/wavpack )
+"
+
+PATCHES=( "${FILESDIR}/${P}-Makefile.patch" )
+
+src_prepare() {
+	default
+	sed -e 's:etc/abcde.co:etc/abcde/abcde.co:g' -i abcde || die
+	sed -e '/^prefix/s/=/?=/' -e '/^sysconfdir/s/=/?=/' -i Makefile || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="/usr" sysconfdir="/etc/abcde" install
+
+	dodoc changelog FAQ README
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/media-sound/abcde/files/abcde-2.9.3-Makefile.patch b/media-sound/abcde/files/abcde-2.9.3-Makefile.patch
new file mode 100644
index 000000000000..01b6e9c329aa
--- /dev/null
+++ b/media-sound/abcde/files/abcde-2.9.3-Makefile.patch
@@ -0,0 +1,11 @@
+--- a/Makefile	2019-02-05 11:19:03.000000000 +0100
++++ b/Makefile	2019-06-04 23:14:03.410131738 +0200
+@@ -19,8 +19,6 @@
+ 	$(INSTALL) -m 755 abcde cddb-tool abcde-musicbrainz-tool $(DESTDIR)$(bindir)
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(sysconfdir)
+ 	$(INSTALL) -m 644 abcde.conf $(DESTDIR)$(sysconfdir)
+-	$(INSTALL) -d -m 755 $(DESTDIR)$(docdir)
+-	$(INSTALL) -m 644 changelog COPYING FAQ README $(DESTDIR)$(docdir)
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL) -m 644 abcde.1 cddb-tool.1 $(DESTDIR)$(mandir)/man1
+ 
diff --git a/media-sound/abcde/metadata.xml b/media-sound/abcde/metadata.xml
index 658ab9a36efa..3069c6bba43c 100644
--- a/media-sound/abcde/metadata.xml
+++ b/media-sound/abcde/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<use>
+		<flag name="aiff">Enable support for Audio Interchange File Format (AIFF) output encoding</flag>
 		<flag name="id3tag">Support ID3, ID3v2 tagging of audio files</flag>
 		<flag name="mac">Enable support for Monkey's Audio files</flag>
 		<flag name="normalize">Add support for normalizing audio file volume levels</flag>
diff --git a/media-sound/abcm2ps/Manifest b/media-sound/abcm2ps/Manifest
index bf9306280572..a6181bb957ed 100644
--- a/media-sound/abcm2ps/Manifest
+++ b/media-sound/abcm2ps/Manifest
@@ -1,14 +1,3 @@
-DIST abcm2ps-8.12.9.tar.gz 238669 BLAKE2B 09e6c1c78fefed3b563a67e8ce232a2c75bd690aee04b17c85edef639756c5f3566b78afcbfdfb1af181d11d08f44e0538705a4415051173bcdf34bf3eb099b1 SHA512 77aa36fccfe508dcd132619c1a372d2b5a22957a58795610aec4eed0e4f5c9dc268298dcd86691a26b8e0b126d38c4c61ba4766a5a39adbd8279985a74229cd5
-DIST abcm2ps-8.13.10.tar.gz 249235 BLAKE2B b3a4fe8b1b3f41e1b35b3ce0574826719eb8586fc321d2ab87da7b778395850afc6635fa77840b2f710d2cc18003c5dfbec3d4634150ed6ff9bcc7e99ce9e5d2 SHA512 21e5c985c9b4ac0ba49973661f74bd6244a386030622919b6c8d5a220e5064b933929ddda0d025ad02638413d0b34c2687bb5370a858604c6a5e9a6b084369a4
-DIST abcm2ps-8.13.11.tar.gz 249332 BLAKE2B 6ae96a64f5e0ef9e46222645f3013f85e1501b5d9f5b3ddce40af65be371f3dca3162c8d2cd72ade5bc9608a9c657d341d45b2a27adf976b74eeb29ff56eaa0c SHA512 857102194fbc00a0ad21f36776a6fc3cdf0256a20f9a344440eff5e9e060e78dd32178948b53a33517964e75ba9e2954e96e857daf076ca296fa123388879056
-DIST abcm2ps-8.13.12.tar.gz 249460 BLAKE2B 2383d0f71d68dc8d8131aa5ffb5d756f2ded6a9773a5d6e5d7cde46c9c819628ac76c2504cc8dd6febf86f17e3a3da9f35db47564ed237b367ef427a657727b9 SHA512 3d708f02e358bde56b3f5407cd9f7d5a3645c6d0158f600ca7f2aef2a6c6ad03733d310e75375a65c8352a5a688c3b7841b74c014e857992d6eb128b81069f6b
-DIST abcm2ps-8.13.9.tar.gz 248893 BLAKE2B 94744aa81c3b91b438af8f86b4c6cb65d72645a1735175aab9397d23e6a8fe2be1afe70e1c741f68df33bc1c075416cf475a63713fc3f7e1ec801a31bc615889 SHA512 7ce6efe605c073674ec7f30d26a34848e22a5c9f97058431243ee17598e35ebc991b760bc99847294f860f6b936e3ae2f504d2de842a487f226e32c47fac438e
 DIST abcm2ps-8.14.4.tar.gz 258383 BLAKE2B 7f9163309cb7a31eaecf443b5bd754c7389b4717ed891e2082f618499b4491428ae0fff7b4804d2c21c8ff3d948557c9d649afb0c2a9ae9407aad39545ed66d5 SHA512 7ba5a25ef7ad18a46bdd45393836a0ede2838af2c24822ecf3c1759328619663fe600eaf607de900527f88fa4a9c21d1da8965cafa45f4aa6dc5754b37ae3722
-DIST transpose_abc.pl 21045 BLAKE2B 08a28cd9021410ed461283e057ce89000846b9e733edd36343a476189c854a96007057a8fc4207a06504ad94e802b42a246ae4a0a1ed080909b60cc941ab724a SHA512 dc2623608a7b59d7e0c4d25160e69f696f170e9938dc3e035edbaf6f0163b4c6139892ec8734ea2aaba997507dcf32208562e898690600dc3c199046d4d151f3
-EBUILD abcm2ps-8.12.9.ebuild 926 BLAKE2B f1f268ce6ef144df2babcbf9c0df3add68432b770178d3691a292a3f9f88ca2396299eefad816286a0ed967a135a909327f8a7162ffc510ce72582429149b9a8 SHA512 322377f6f6e14a0e77685c9ab0af1d68676d8e846bc7ee9d134655a43ce5e10385ef08050952242a8fe155ae9a0e11be88a2a7c87885c2a36006bf4615fd95f1
-EBUILD abcm2ps-8.13.10.ebuild 928 BLAKE2B 9d8011958b30d0a15d5a010c6c142e277b804f724757b59b726df1cff84be4b397ef5ef82be2a180b670a1a1bbb89d8904f21bd2967edb57fa1f9b1278a7ab4d SHA512 114dd7423b6035d2f890e5b5325704eefd2ab7f5dec1ba0073cfdbbcee9feea99e7aae1e7e99c3d9156dcc3b782cdb2f3267a8aa54565c2e678739564783a54c
-EBUILD abcm2ps-8.13.11.ebuild 928 BLAKE2B 9d8011958b30d0a15d5a010c6c142e277b804f724757b59b726df1cff84be4b397ef5ef82be2a180b670a1a1bbb89d8904f21bd2967edb57fa1f9b1278a7ab4d SHA512 114dd7423b6035d2f890e5b5325704eefd2ab7f5dec1ba0073cfdbbcee9feea99e7aae1e7e99c3d9156dcc3b782cdb2f3267a8aa54565c2e678739564783a54c
-EBUILD abcm2ps-8.13.12.ebuild 934 BLAKE2B 6fd161bbca70c60e3546172aab6e9704f8c4bc07a39c8296fe03eced7d8a545d4ff75702ce4809d7af638a500f5e77e78a3b382f671fecea2a527c04278fca23 SHA512 c0e3fb4e054aab640a77c61cb9b7874fbec64d47ae5a4c80141e3b3e5c89381365307b1745e37218971150e2d8d74d8f2a9397059cb531d04aa26994f38bc24d
-EBUILD abcm2ps-8.13.9.ebuild 928 BLAKE2B 9d8011958b30d0a15d5a010c6c142e277b804f724757b59b726df1cff84be4b397ef5ef82be2a180b670a1a1bbb89d8904f21bd2967edb57fa1f9b1278a7ab4d SHA512 114dd7423b6035d2f890e5b5325704eefd2ab7f5dec1ba0073cfdbbcee9feea99e7aae1e7e99c3d9156dcc3b782cdb2f3267a8aa54565c2e678739564783a54c
-EBUILD abcm2ps-8.14.4.ebuild 876 BLAKE2B 4736ba1d5fab17fe909e206be14c5bbc3db54a571dae2e012db8bc55a527185d2cb0806a2745455f56c6806f56369fea2ff4f0d8ea33fc2d42e0c2d70b04e0c9 SHA512 d3f70c0d2a4d5258bd3174670ec80eba024b3c58532a4515ebadb5e646bac3b5a693f554aa5871e1229cd5709556216bd91773e22c561e5fc8e04aeb8b170459
+EBUILD abcm2ps-8.14.4.ebuild 878 BLAKE2B 5fcd6a249f5dd7ae3c476a61fc0c38da2d7490a2162c4e6f0dd1d1dea79e8478d10493e723ba296e3fbf7d9be61b3e7e45868f92182cdb3795641b8fbfe24a95 SHA512 059ad7c4a783a8127701eba3e09f45c770c1b535198a996060038d689f1bbf95b6eda4256962f54a64f7c8930bd614a9e54db518f2f65973940a7757038c2db6
 MISC metadata.xml 360 BLAKE2B d590a7cb36ab74b8880f987b711b24df69a96e9a1fb9e7a5e8a0ff08ad65a5646596aeb866af37a2f4a4acd9984a211acbcedffd855ac5b88506e627d02515ed SHA512 7612e5473e6185cac8f54baf6e1bc1bb75e9e6b252d2cd59ed8865c190e0fee1924cbe6e6fc79c03fedfbcf5f9228d45244483b7ec2ccd7a8bd4997c4b6893c9
diff --git a/media-sound/abcm2ps/abcm2ps-8.12.9.ebuild b/media-sound/abcm2ps/abcm2ps-8.12.9.ebuild
deleted file mode 100644
index 3b031f5eec3b..000000000000
--- a/media-sound/abcm2ps/abcm2ps-8.12.9.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="A program to convert abc files to Postscript files"
-HOMEPAGE="http://moinejf.free.fr/"
-SRC_URI="http://moinejf.free.fr/${P}.tar.gz
-	http://moinejf.free.fr/transpose_abc.pl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="examples pango"
-
-RDEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--enable-a4 \
-		--enable-deco-is-roll \
-		$(use_enable pango)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin abcm2ps
-
-	insinto /usr/share/${PN}
-	doins *.fmt
-
-	dodoc Changes README *.txt
-
-	if use examples ; then
-		docinto examples
-		dodoc *.{abc,eps}
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	docinto contrib
-	dodoc "${DISTDIR}"/transpose_abc.pl
-}
diff --git a/media-sound/abcm2ps/abcm2ps-8.13.10.ebuild b/media-sound/abcm2ps/abcm2ps-8.13.10.ebuild
deleted file mode 100644
index 2d4a35b58897..000000000000
--- a/media-sound/abcm2ps/abcm2ps-8.13.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="A program to convert abc files to Postscript files"
-HOMEPAGE="http://moinejf.free.fr/"
-SRC_URI="http://moinejf.free.fr/${P}.tar.gz
-	http://moinejf.free.fr/transpose_abc.pl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples pango"
-
-RDEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--enable-a4 \
-		--enable-deco-is-roll \
-		$(use_enable pango)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin abcm2ps
-
-	insinto /usr/share/${PN}
-	doins *.fmt
-
-	dodoc Changes README *.txt
-
-	if use examples ; then
-		docinto examples
-		dodoc *.{abc,eps}
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	docinto contrib
-	dodoc "${DISTDIR}"/transpose_abc.pl
-}
diff --git a/media-sound/abcm2ps/abcm2ps-8.13.11.ebuild b/media-sound/abcm2ps/abcm2ps-8.13.11.ebuild
deleted file mode 100644
index 2d4a35b58897..000000000000
--- a/media-sound/abcm2ps/abcm2ps-8.13.11.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="A program to convert abc files to Postscript files"
-HOMEPAGE="http://moinejf.free.fr/"
-SRC_URI="http://moinejf.free.fr/${P}.tar.gz
-	http://moinejf.free.fr/transpose_abc.pl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples pango"
-
-RDEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--enable-a4 \
-		--enable-deco-is-roll \
-		$(use_enable pango)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin abcm2ps
-
-	insinto /usr/share/${PN}
-	doins *.fmt
-
-	dodoc Changes README *.txt
-
-	if use examples ; then
-		docinto examples
-		dodoc *.{abc,eps}
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	docinto contrib
-	dodoc "${DISTDIR}"/transpose_abc.pl
-}
diff --git a/media-sound/abcm2ps/abcm2ps-8.13.12.ebuild b/media-sound/abcm2ps/abcm2ps-8.13.12.ebuild
deleted file mode 100644
index e934502071a0..000000000000
--- a/media-sound/abcm2ps/abcm2ps-8.13.12.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Program to convert abc files to Postscript files"
-HOMEPAGE="http://moinejf.free.fr/"
-SRC_URI="http://moinejf.free.fr/${P}.tar.gz
-	http://moinejf.free.fr/transpose_abc.pl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE="examples pango"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--enable-a4 \
-		--enable-deco-is-roll \
-		$(use_enable pango)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin abcm2ps
-
-	insinto /usr/share/${PN}
-	doins *.fmt
-
-	dodoc Changes README *.txt
-
-	if use examples ; then
-		docinto examples
-		dodoc *.{abc,eps}
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	docinto contrib
-	dodoc "${DISTDIR}"/transpose_abc.pl
-}
diff --git a/media-sound/abcm2ps/abcm2ps-8.13.9.ebuild b/media-sound/abcm2ps/abcm2ps-8.13.9.ebuild
deleted file mode 100644
index 2d4a35b58897..000000000000
--- a/media-sound/abcm2ps/abcm2ps-8.13.9.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="A program to convert abc files to Postscript files"
-HOMEPAGE="http://moinejf.free.fr/"
-SRC_URI="http://moinejf.free.fr/${P}.tar.gz
-	http://moinejf.free.fr/transpose_abc.pl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples pango"
-
-RDEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--enable-a4 \
-		--enable-deco-is-roll \
-		$(use_enable pango)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin abcm2ps
-
-	insinto /usr/share/${PN}
-	doins *.fmt
-
-	dodoc Changes README *.txt
-
-	if use examples ; then
-		docinto examples
-		dodoc *.{abc,eps}
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	docinto contrib
-	dodoc "${DISTDIR}"/transpose_abc.pl
-}
diff --git a/media-sound/abcm2ps/abcm2ps-8.14.4.ebuild b/media-sound/abcm2ps/abcm2ps-8.14.4.ebuild
index 4b808b9d06d6..644672be443e 100644
--- a/media-sound/abcm2ps/abcm2ps-8.14.4.ebuild
+++ b/media-sound/abcm2ps/abcm2ps-8.14.4.ebuild
@@ -11,13 +11,15 @@ SRC_URI="https://github.com/leesavide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="examples pango"
 
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	pango? (
+		media-libs/freetype:2
+		x11-libs/pango
+	)"
 RDEPEND="${DEPEND}"
 
 src_configure() {
diff --git a/media-sound/adplay/Manifest b/media-sound/adplay/Manifest
index 13cc74e22fff..495b64576e5a 100644
--- a/media-sound/adplay/Manifest
+++ b/media-sound/adplay/Manifest
@@ -2,5 +2,5 @@ AUX adplay-1.7-fix-c++14.patch 615 BLAKE2B d6e3a8f50257a7c6dcf3d058c7637645f7ff2
 DIST adplay-1.7.tar.bz2 264340 BLAKE2B ea9231c66a8233ee1d026bccd073440cbbc0e8868469aee33ec0e18c7d893fa24dd20bb4fe960f908db0666e7ee5c6a4afd14051b851b011418796cc0cc2c939 SHA512 854a9bee1057d3a42308d9149e74a8abae0b6bdfda5e1466086df9d6aeed4bbc92a045bca02917fc699b43195572b39c6316ddf56ee3441add1a01d6cbbdfcbe
 DIST adplay-1.8.tar.bz2 333582 BLAKE2B e5d0e3baf3f37adb1a2f42eee368fbbcb3947b0c651415b60d5f1d648d004789eae0ef75b7e6ac8ad9f90ac9941332e713e36555167648a40a871659083d1b59 SHA512 6a82b10fa73ad9317303da03d2fcb1fa97772d850f3f78f53c554b9daaa9ae5d04bc2f0a1b1d25fd5d3a1eab073641d6fa0589070721612987d57762f03363c7
 EBUILD adplay-1.7.ebuild 749 BLAKE2B 10c474d7f9f47f00ca55b3cd32568c5387156671f64943cbde06f98dd7694417e26ab3801fa1627b6cad0a5d7e730a1bf18646f26f0225ee48363ab18c9a3b9c SHA512 b54d9e6672fbe0cd86fe86fc33bda8159e016c9a8d06198b4a0dd0a42dd2651ebfe13421e16de3d655c89ae2d319cd0309c2faddec12bb3102a2ad832a2a4a56
-EBUILD adplay-1.8.ebuild 726 BLAKE2B 53febc1166be82279e9fee04d8065d2f349c294a3d426c5ad3673c3b0ba22f04490f33e60b9c86fa8895c57ecf6546a36e14ea78b2db45b9a8e622829dca75e0 SHA512 268beedbaa61b6abcede8be30626fcb30874f05535ba30c60dbb657f4985aff3ddc822db0a9916eded5f2c35bebb760d1f5dcf48697bfbe0e77b8c0def05f742
+EBUILD adplay-1.8.ebuild 725 BLAKE2B debd4c46c2a3c24ad521160601133526de195480c9d2e19f9f45763a313250ee8d0cb292b41f09a734f8afbdd5ae481c11bed0d32a10d27ede1495895f07e1ef SHA512 76eb8711f41e7a83e18e35d923fd66751fdf7949184b37e865c0949ca8f3e7808b4fc0bb146052541842387494c7fe8393d42228c0cef4a48a254ce310bc1498
 MISC metadata.xml 387 BLAKE2B e8dec98b4529ad29a4254bd8bb45b79264ec513b5d5b6368fa00c6755842835e84cd7b709ff884abe892656ee38d1c2640a884b9936876fb5b01ae3371c9e41e SHA512 98c5710d7d8677c0e6152d5ab7ca43b835aa6a8718352047c3424907e390662d714a6083a80cfc6b502c8d504d666deadeb20a917d8ace168411247e531d8af4
diff --git a/media-sound/adplay/adplay-1.8.ebuild b/media-sound/adplay/adplay-1.8.ebuild
index 81cb182a77f8..8803bc8d8db7 100644
--- a/media-sound/adplay/adplay-1.8.ebuild
+++ b/media-sound/adplay/adplay-1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/adplug/adplay-unix/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="alsa ao oss sdl"
 
 RDEPEND=">=media-libs/adplug-2.2.1
diff --git a/media-sound/awesfx/Manifest b/media-sound/awesfx/Manifest
index 7d7b6e76e6ee..674e3304f962 100644
--- a/media-sound/awesfx/Manifest
+++ b/media-sound/awesfx/Manifest
@@ -1,7 +1,5 @@
 AUX sfxload.confd 165 BLAKE2B b183f16572379c928417dbc6037bce0739462def9cde600d1298677b4e55bddcf5df0407124c966519946c960847dcdeb1c44fe62e25192d361400df7fc4e959 SHA512 9725e28b10f512e6e8e3cf121f8d442b3f0148795e676760b434a02c9a4e19945915fd93d6fa012448f041d17819d32b38445a0946819e398647bfd5ce31c38e
 AUX sfxload.initd 398 BLAKE2B 90c2c51638531b7d51092b70af966db961889f0991a60ee8ffccfa36f73fb7e7df722e7914eb39c1a3c08b32b8da6cd1d58abfa8d3b0ba427a9748aefac7b801 SHA512 dd3522d112a0efefa1786ce37b9f9be3ee07eb50b0a618d7adb386ff007d9e9e907dcd9e184ed5122118723d702caeadc190018f0af5ad393c931eb0a549f31c
-DIST awesfx-0.5.1d.tar.bz2 282981 BLAKE2B 1d8e656a4645a24c62e355bb091b0c666ca63b8921e27e53eaefe7d7944bd33eba6595d2509946c58bbfd5a0a28e981e4b31b23d364c5744ed5c36482bcebeb3 SHA512 50cd27ca4da8bd38fd11fcdbb2eb8806ea8956c834433c92cb094e0a6ee143175ba85be4665431527133abf8430e6fb60eb69ee35b0afed81d11db517cbb3758
 DIST awesfx-0.5.1e.tar.bz2 307929 BLAKE2B a3bee0750ca44ab2e732f6bdb2c119104521330226e243be1b0ab9c19e2bfd87176ad2dc039f26b9552be621a7af2ef86852e2f31f8d0b9158b093712d2447e1 SHA512 f70e631b6ab6ec6dcbde7773c1da5cba72763d2198c2ac51f4bde0fee80f057f296cabc915aed805e744f7b2323b4e2b20b6d894c79cf5682457a3fc6a9be11d
-EBUILD awesfx-0.5.1d.ebuild 874 BLAKE2B 18627c40d0b192598d797979e7690cb91ac9153b225907f492db3b891010c2007f518c089217fc6e74ee9d5d5f4348cb6bd8db93f1d38a0b72b774401f015de4 SHA512 2a784d392ec1da69b4ae90a19db5f1629dbe253671b13345e33f3b2afdf325d49238b3c24a89fb9892b2aff8fb62c344ad82d9f7df705cc8570ab34a4b0d763e
-EBUILD awesfx-0.5.1e.ebuild 875 BLAKE2B ffc1153dfdbbf85816e604b071c6ba7caaf85779d753a6a1b722255fb18cef6359b4042f88923be9b49d2781d2ec6ca670fe0b2bc88b59ff09863340de2f2e17 SHA512 14daabad2d25195479f2c8c67a23bbeed1f80ed672e06cc73c39893768ef8430910de3a4720502f421d467012e3c363b1d461aa1f22023833ab05b13464eca2b
+EBUILD awesfx-0.5.1e.ebuild 874 BLAKE2B 94eec36a39990400606f6b0ae723cc9979ff20cbc34d83d249be442d6cb4399871bc27532fcebd262947d8d13c0968e6613a830c59888f05561fa955a3c31441 SHA512 d2454c980f20345313aee66e3d47e4036f1e890b4246822e19b51b6906e67b17d34d971670d0ede3792b8c304fee5115e719112b4e8d750f244b6723aa7473f8
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/awesfx/awesfx-0.5.1d.ebuild b/media-sound/awesfx/awesfx-0.5.1d.ebuild
deleted file mode 100644
index c0150488b671..000000000000
--- a/media-sound/awesfx/awesfx-0.5.1d.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="AWE32 Sound Driver Utility Programs"
-HOMEPAGE="http://ftp.suse.com/pub/people/tiwai/awesfx"
-SRC_URI="http://ftp.suse.com/pub/people/tiwai/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="media-libs/alsa-lib"
-DEPEND="${RDEPEND}"
-
-BANK_LOC="${EPREFIX}/usr/share/sounds/sf2"
-
-DOCS=( AUTHORS ChangeLog README SBKtoSF2.txt samples/README-bank )
-
-src_configure() {
-	econf \
-		--with-sfpath=${BANK_LOC}
-}
-
-src_install() {
-	default
-
-	rm -f "${ED}"/usr/share/sounds/sf2/README-bank
-	newinitd "${FILESDIR}"/sfxload.initd sfxload
-	newconfd "${FILESDIR}"/sfxload.confd sfxload
-}
-
-pkg_postinst() {
-	elog "Copy your SoundFont files from the original CDROM"
-	elog "shipped with your soundcard to ${BANK_LOC}."
-}
diff --git a/media-sound/awesfx/awesfx-0.5.1e.ebuild b/media-sound/awesfx/awesfx-0.5.1e.ebuild
index d8c776ff4dbc..47f55331e13c 100644
--- a/media-sound/awesfx/awesfx-0.5.1e.ebuild
+++ b/media-sound/awesfx/awesfx-0.5.1e.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.suse.com/pub/people/tiwai/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND="media-libs/alsa-lib"
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 781fec2c5f0c..3d6f36a2e700 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,3 +1,5 @@
 DIST elisa-0.3.0.tar.xz 1248496 BLAKE2B 8a52c35ca1e7a81927d8e95020854725407700e93e15bb778366946e7c19578df6939daec058743d9dffeece43dbb946c0f0ce6612c9ae50ff51c3c023cece1d SHA512 8097f8f2bbcb6199adf856d0786e77a33c46c3ead8f55fb29839862ec96db5ba957a8181af013650e4d8c9ecf32b104f17c26921204e6c7478c0a3a7152c9b9a
+DIST elisa-0.4.0.tar.xz 1272596 BLAKE2B ed11dcba82766e11581806f1153d64c157c8bd8549a374e32fcb5c28369bed853b4a6a18ae42c6d3dab86d297d2699a292fad2de62b0ab9fec97b9cb1f1d3e1f SHA512 976370b9f0395b990d05cc1d5adebe150398090c5f1df94e1ad5761a8af36c0c83ed14087a3bc02e09c21740724f1505b99c4ab5f4995f0c46f21948f4705e61
 EBUILD elisa-0.3.0-r1.ebuild 1411 BLAKE2B 43edb77ed78a798787dac60534278659637b35fa47b7a1d312bf4ccf0269d7f2ea58d5d16266d28cfd5cdf0ea61ccdc95d68834d484423ae19c7d64c4abb35fb SHA512 db066616b3f067a629fe077bf3fc6f287041a428d63ca6c3d36431a24e07785382a5d54a5478b0af6db627b904e1f537462cd6f4485f3a496e79476e5616f866
-MISC metadata.xml 313 BLAKE2B 76e574d16964ee300bbfd452a53738f99626f7e572847cc923e8b1688dd3e55843a7f4aa5511525eed8e6a9513bc687f131b2a50d173901b54ce94d080d4103f SHA512 17fba6644e9931a1bda042c4ae7e9ad414276c0b159418630c6d20013f4d4b68cd62f150c5076f99e3c719d93f0103fba824fcbbfeebab1478aeddb19181c2f6
+EBUILD elisa-0.4.0.ebuild 1517 BLAKE2B 7f9013fdf4d739e4e587c34b0d00f028c2f3b44b5698b2461c1325c260bd01b2440d41870d28a3280e6fa1b83be43811d062da8c7fdde23fc10f9160f30a019e SHA512 e4cf1afc6846c64947ef62755366f0821d06f7f876c090573f43bcecf577c0da6635ef17b80b1fb86a103ce5f3f916bfb849d9171638e5cc8f2670ff23bdd998
+MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-0.4.0.ebuild b/media-sound/elisa/elisa-0.4.0.ebuild
new file mode 100644
index 000000000000..59c4f96313ab
--- /dev/null
+++ b/media-sound/elisa/elisa-0.4.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+KDE_HANDBOOK="optional"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Simple music player by KDE"
+HOMEPAGE="https://community.kde.org/Elisa"
+LICENSE="LGPL-3+"
+IUSE="mpris semantic-desktop vlc"
+
+BDEPEND="sys-devel/gettext"
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kfilemetadata)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kirigami)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtmultimedia 'gstreamer')
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	mpris? (
+		$(add_frameworks_dep kdbusaddons)
+		$(add_qt_dep qtdbus)
+	)
+	semantic-desktop? (
+		$(add_frameworks_dep baloo)
+	)
+	vlc? ( media-video/vlc:= )
+"
+RDEPEND="${DEPEND}
+	$(add_qt_dep qtgraphicaleffects)
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtquickcontrols2)
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package mpris KF5DBusAddons)
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake-utils_use_find_package vlc LIBVLC)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-sound/elisa/metadata.xml b/media-sound/elisa/metadata.xml
index 22e16aa35e94..2f9a4280caf9 100644
--- a/media-sound/elisa/metadata.xml
+++ b/media-sound/elisa/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="mpris">Enable MPRIS support</flag>
+		<flag name="vlc">Use <pkg>media-video/vlc</pkg> for output rather than <pkg>dev-qt/qtmultimedia</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/gmusicbrowser/Manifest b/media-sound/gmusicbrowser/Manifest
index 443c13e2ba5d..7db14288211e 100644
--- a/media-sound/gmusicbrowser/Manifest
+++ b/media-sound/gmusicbrowser/Manifest
@@ -1,6 +1,4 @@
-DIST gmusicbrowser-1.1.15.tar.gz 2349451 BLAKE2B 8967e404360dd59b8cb59bfdfde8a9b8771be9deb2d449800fd2515b65c5b06d935db828030aeb8e839305781f799e1fd2ee8f975c1ce479ed0211fa71a84731 SHA512 9176be8f2b1b6c832099feff87a7a526efaa3c512c9b7b6d433f1a157ac1185adb05185f52f9ce1b3b41afc967c37345d216a090b472927a661747e25479cbdc
 DIST gmusicbrowser-1.1.15_p20160530.tar.gz 1305616 BLAKE2B e67d239a4483624d298814c75442ecdbe6f243549e77ac73e511a123aa038c78dc1c7bd6a707df6a4085d66e6ffe720fc518babe29d382f960e95fb47cd56f29 SHA512 980446a873fab39c5b880e289e2ff61df112f5336dfd19b0ac3b3b6a346ddebaaca8718f169926404f38cc518817f115a38ab210ae7f4eab05962506d70d3f3b
-EBUILD gmusicbrowser-1.1.15-r3.ebuild 1674 BLAKE2B a3e1f4009928db8f10561e06e353e0d706533060d0c9ac2b5fff97872da89822aca223fbd6e1ce59eb347751132eea2a2743fc2d112c81871a773dbc6e720f37 SHA512 02c101547fc328b22c4504e3be3d089e5cbef29b104d1cb4ed1b5fa697d6d6d096384d3585d19118d5413c7fbd044549800c6ea90fad99ba6fddf075d54d8ef0
-EBUILD gmusicbrowser-1.1.15_p20160530.ebuild 1736 BLAKE2B 7fd8ffdfd09ff37aa681b6a4dd4d8b9ab11478f4a4053b3c3322f22ca09d66fa4da3141975fa4405928d74aa7e535c62e0982facb960d3b9bd5b736f5153fa6b SHA512 ba837fc226673b0b5a1ad1972fc5ccdf8223df5f96e7dbac6bd9cd63649ed594ced80656ae7042edbe9482c92ffe3d77f909373ca8289c1e8d32cadd1ee9640e
+EBUILD gmusicbrowser-1.1.15_p20160530.ebuild 1739 BLAKE2B 013e8256f27e0b9f4ddd9640d85d87a50a10d9f92cd14636bbda07e370cb4a08daca6658005a1fb1bb9f49aad5a7a2f933a3540cce86fd47bcae8aa0baaed956 SHA512 b52b905916fbed1875c74222626150f8a2bcee8552aee9515d2e854cc4898015312d3520c14b78696d6d09b5b3fc57817848dac77911f4ee85399a8bbb83bb6f
 EBUILD gmusicbrowser-9999.ebuild 1735 BLAKE2B c2548f44165b32fb7937a1174e0a7c370ff1718cecabb6219f7e358f743a9fb415107ef56732f9b38bc1d80dd323b34b497b7698cea29f7ff3c79b80761fdec7 SHA512 5b3b4a4e109816a1071577bb4977c15b3b0f4b56317307b5cc3eea93be55d76b31640c16157ff487df4653b26bf5afe99412f70096068dd0e91d05b994a5ef84
 MISC metadata.xml 465 BLAKE2B 53caced65e537cd80208bd2dad2853b72efb79925ddbf4009153483207f17bc7337312870d47e65ea971b3c944286875882d06d1bfc7b7e9c0bb88695d5f8ce3 SHA512 ff760d056bb2f67c021cfca327ad1f7f5be33264a6f03ec657e83a4ea7c14800d6f51340cb6ecad895bf2dfb8db38767982e63b030a9923de16820b7558f8497
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r3.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r3.ebuild
deleted file mode 100644
index 439186eb3b9d..000000000000
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
-HOMEPAGE="https://gmusicbrowser.org/"
-SRC_URI="https://${PN}.org/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus doc extras gstreamer libnotify mplayer"
-
-GSTREAMER_DEPEND="dev-perl/Glib-Object-Introspection"
-MPLAYER_DEPEND="media-video/mplayer"
-MPV_DEPEND="media-video/mpv"
-OTHER_DEPEND="
-	media-sound/alsa-utils
-	media-sound/flac123
-	|| ( media-sound/mpg123 media-sound/mpg321 )
-	media-sound/vorbis-tools"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Gtk2
-	virtual/perl-MIME-Base64
-	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
-	dbus? ( dev-perl/Net-DBus )
-	gstreamer? ( ${GSTREAMER_DEPEND} )
-	mplayer? ( || ( ${MPLAYER_DEPEND} ${MPV_DEPEND} ) )
-	!gstreamer? ( !mplayer? ( ${OTHER_DEPEND} ) )
-	extras? ( dev-perl/gnome2-wnck )
-	libnotify? ( dev-perl/Gtk2-Notify )"
-DEPEND="sys-devel/gettext"
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		iconsdir="${D%/}/usr/share/icons/hicolor" \
-		install
-
-	use doc && local HTML_DOCS=( layout_doc.html )
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-
-	elog "Gmusicbrowser supports gstreamer, mplayer, mpv and mpg123/ogg123..."
-	elog "for audio playback. Needed dependencies:"
-	elog "  Gstreamer: ${GSTREAMER_DEPEND}"
-	elog "  mplayer: ${MPLAYER_DEPEND}"
-	elog "  mpv: ${MPV_DEPEND}"
-	elog "  mpg123/ogg123...: ${OTHER_DEPEND}"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild
index 5812aee33a2a..6e832b7bc9fa 100644
--- a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild
@@ -9,11 +9,11 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
 	inherit git-r3
 	SRC_URI=""
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 x86"
 else
 	GIT_COMMIT="853840eb9dad0b59ad2dac5d303f5929b2f09f21"
 	SRC_URI="https://github.com/squentin/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
 fi
 
diff --git a/media-sound/gogglesmm/Manifest b/media-sound/gogglesmm/Manifest
index b56fe322d527..a524526445f7 100644
--- a/media-sound/gogglesmm/Manifest
+++ b/media-sound/gogglesmm/Manifest
@@ -1,3 +1,3 @@
-DIST gogglesmm-1.1.9.tar.gz 1419421 BLAKE2B c170da80c46b25e86060376e19cecdfe10ce91ce48d92c370cf9f2b6ccce0afba6f917185286f3226d082dc0d791863595be4ebc0d118dd4f1af7f0699582cde SHA512 54de949b37e272a2235cf2f910890590f18b12c2b3199cb87bbe393ae659a3a9b7bd47f5a5f43ce035e94b87098c07d534efee2a6c17ebabb9bbed3453126e2e
-EBUILD gogglesmm-1.1.9.ebuild 1039 BLAKE2B e423cb8152f2db398ae97c55ebf7bf0c68c538d1a7d6e62f8289eebd95ee14b3b2e866732ddb6dea0ab184848cd93ff60cc9e6fe8bcfa31c0e1c0f64e297c747 SHA512 88c46448dc1fcb2f7afa9180e981f14104088e54cbc946692c293c322d6962d4161d81826eae1b63907561b40325226d9264a09b389abb1de3210ade4b04dcb8
+DIST gogglesmm-1.2.1.tar.gz 3015072 BLAKE2B 6a33ba6b678bc23e449898e4f492064301ca9c37239d713fa5ccb857d51bb4c4cf5dc1d4576f2f6dc745eaff607f4400e5600f45c4cbdde8c43cee5ca1fc34f4 SHA512 c165ddde463afcf863b74f00dfa1566077007f51617fa00a95dfcdeeab49da9ee87406f6bdc7779c597002d1e587886c7992e9e892ce4988f3bb14f015336547
+EBUILD gogglesmm-1.2.1.ebuild 1054 BLAKE2B 849e203f8510809c8e9d4fdd053b0052c62d20f842738cd94b1e52d3df1cbe60c0952ba5793154fe1d46b0d5354ebbb097c41f616e62d8c12996de2951a50f38 SHA512 7636616b6395079653257fd90c9ffada53f40ac6e584d948e69cd9b5e3e38e5c13c425cc6dedb59692cf56c4537c8975d9a3ffd4fc3d0588bca797f44f007f1d
 MISC metadata.xml 448 BLAKE2B 4a31050a18310ba35f5357159e9ada1671feda06dc71635617acf8825073a3a822aa95a3d3110545ff9ccdd809d317ab45000f5aaab5d8f52a8dad0c6133a03a SHA512 349f8b931b5a24ea7b588f63f67b38ac00e752491031cf434802719bd4d4d62aa5c7d277cf5e6a3dee72c570c121606b6a108e080262b1070de538c384552858
diff --git a/media-sound/gogglesmm/gogglesmm-1.1.9.ebuild b/media-sound/gogglesmm/gogglesmm-1.2.1.ebuild
index cfb7abc6800e..683ddf4f799e 100644
--- a/media-sound/gogglesmm/gogglesmm-1.1.9.ebuild
+++ b/media-sound/gogglesmm/gogglesmm-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,6 +37,7 @@ src_configure() {
 		-DWITH_DBUS="$(usex dbus)"
 		-DWITH_OPENGL="$(usex opengl)"
 		-DWITH_NLS="$(usex nls)"
+		-DWITH_CFOX=OFF
 	)
 	cmake-utils_src_configure
 }
diff --git a/media-sound/gtick/Manifest b/media-sound/gtick/Manifest
index dffe6ab90efa..4f4872d320fa 100644
--- a/media-sound/gtick/Manifest
+++ b/media-sound/gtick/Manifest
@@ -1,5 +1,3 @@
-DIST gtick-0.5.0.tar.gz 650541 BLAKE2B ecffe2ce04438352f3c294eee550d3d73268102960e9447bdea03c9ddfce20a223fb018f8dc92ab98a778f9a24718e2d740a2631d130da8eb4ea065761da0110 SHA512 916295cb4101e6b958e1a51195dcc0cc0e088f0b2a2e52afaf8becd93782277cbf9cd51ae4e0b3edbbc66994912b6f7be755632ff85a47aabb8fb87b4acb14ef
 DIST gtick-0.5.4.tar.gz 641902 BLAKE2B f1832f46b559908ae0c40bd0f6a08e145a0ba58a6cf2f8e7235b4f3f0b9141ea514cf52c51cef24d745ce360423daab855c42b5f6719664be65bf5f254650c1d SHA512 28ea6f38952c376f1f684e7b598d1032063f7fdf3454cdb86735cb835079312c0d1c30dfeade7272f5399296f2a2ede5b81524036a9ac0d91e0878865fab446e
-EBUILD gtick-0.5.0.ebuild 743 BLAKE2B 019c11b01476e74c91e5d78a073b8dc1ec53e1f6d80a1a4f52b99118bb31972b84979bd1df849d34b3b34d13da87041edbc48266dde7dc8d0a77552c8986f6e2 SHA512 7afb0f2bde050105746fedcf2cae36e83afeb90c5b1decfe94b96ad0f81a3908cddb388031f88fcfe5f68d84e630b1eea341ba3913ab64a53390f26ede5f2e2f
-EBUILD gtick-0.5.4.ebuild 827 BLAKE2B 171bf2365a9accf0543cac3caf44e2e9027ed2c8e9a5504da196d463825744fd078d37b962f968f5cc0d08414046c9692a7a63a61da0d54cf88607a4a819ddcf SHA512 731fce81d55c27b385872c6ca51ec4f3c0ca97052a25de6975a15ad51a5f3a8c81795885ca6267aa3d3436d568cc2ae33e21c711be634c7f8aedc600e6a98eea
+EBUILD gtick-0.5.4.ebuild 826 BLAKE2B 8ec62ac0b57c42acd9d69f36f4c2aba0ad7e015fb3297409244a9333b14be6aa0a9bc2ba722a5d39210b775d45746e2b064c28fa5a63691f163fd228e4bb2f48 SHA512 6762af90b089c1e86d6fd42eee4f6b64b5bb54d578a54880a99327ed1358fa561f0d77064c53eddcb028c206367781a6ee9541c6f471ff0e8aed641cf9ecf1e6
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/gtick/gtick-0.5.0.ebuild b/media-sound/gtick/gtick-0.5.0.ebuild
deleted file mode 100644
index 01b14460e320..000000000000
--- a/media-sound/gtick/gtick-0.5.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="a metronome application supporting different meters and speeds ranging"
-HOMEPAGE="https://www.antcom.de/gtick"
-SRC_URI="https://www.antcom.de/gtick/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
-IUSE="nls sndfile"
-
-RDEPEND="x11-libs/gtk+:2
-	media-sound/pulseaudio
-	sndfile? ( media-libs/libsndfile )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with sndfile)
-}
-
-src_install() {
-	default
-	newicon src/icon48x48.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "GTick"
-}
diff --git a/media-sound/gtick/gtick-0.5.4.ebuild b/media-sound/gtick/gtick-0.5.4.ebuild
index 41c400eac1f3..72c0cef645a5 100644
--- a/media-sound/gtick/gtick-0.5.4.ebuild
+++ b/media-sound/gtick/gtick-0.5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.antcom.de/gtick/download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
 IUSE="nls sndfile"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/media-sound/modplugtools/Manifest b/media-sound/modplugtools/Manifest
index 476af5b4f12b..ae8b770cf8e3 100644
--- a/media-sound/modplugtools/Manifest
+++ b/media-sound/modplugtools/Manifest
@@ -1,5 +1,3 @@
-DIST modplugtools-0.5.1.tar.gz 337382 BLAKE2B aa04a7fbe0b4be1e8be2bf5ac1d9ca9641fbc99f16ce1e9cc8bf65bd89f42e6cba1e1ef5fed3323bd49c086d7a5ed199fcbfdc29ccfa0845244f6177a848139c SHA512 58e2bfda90630bc0a4762fdde4afc48865a921beea41419a0f57e7a2e4120579d4a1bf734b1c7925b27fa3fe83a665a35a3e4a22a30c0035854e9fe35f6fd759
 DIST modplugtools-0.5.3.tar.gz 342603 BLAKE2B f66d985769c3f8f311aff539bdf88c9c63a1e0e86e5a63e8d5b287140c113c6443fe48ef9bef8b7fc598b488cfb5a4618c42a432607e9aed58896d7cc23aed7a SHA512 82f3787dfd6188c722d2b2dac315ee40f46795704769575695d7d71cd504b88e0e2dc39bc2d9d803dd84473b86d09019be9aa6c5dc713c72bcfa6ca1c1340e9d
-EBUILD modplugtools-0.5.1.ebuild 482 BLAKE2B 96fd6fa5bc83e973bfacaa51024ec7b1f070a65059cf9c4c8cb817ddbff935106b64b3b97c84e717545d91a49feaeca60a05e945b205f0a70a3d0057ed94257b SHA512 06ca01846a7b4073324fcd069d3dd221290b31a38f74027c3a0c20f692fa2bf96bf06f35ac6ed1dc0840d4cacd7375e591e842d64759b6bb3ee943ac107cf52e
-EBUILD modplugtools-0.5.3.ebuild 480 BLAKE2B 4fb7096f4fb8014b218da07f5eef714c1c92e0dbe19e3ca1420fd8c7323683b74727fcf23576f014019da2cfe288aba8841ac9a10ebec7cc72018bcbb450ec45 SHA512 510906c1f5d3a2a7d826e37f09adabc7141629ce1effddc22a3620eb18116258a8bdbc3926a0aadfdb3aa89c0fa4c56e1d421a8a5a3aba7817ce0e746ad0ba1b
+EBUILD modplugtools-0.5.3.ebuild 479 BLAKE2B 95af6a009caa37dd5febedabc834722a78b34136421baaf1ca171056ebaeff3f6622480b8f61bb265d51af3bc77ae38c6ac05438f37975f9738c2fd0a92e8a52 SHA512 5566d3446284aaf9082c2b608245c382a165d6fd180aaa11a85a7b7da97b5f1937668d31a0e924fe723b4e883bb06cae8ac83ba054ffbd37c29c3c1794c10e0e
 MISC metadata.xml 335 BLAKE2B 8d72f4d71a61dcb53528381c1661c06f4a4229dec58ba437e43478cc65b3f7d92133cfcc8cb49e5e411176da08ed3311aee58c0490882b90b8922a38f47c1546 SHA512 ff5cc9078858678f75ede9fed227b75f852d2caa6471dc1af1ea6827d30895bd59a7f4a7bb3414625d86af528fe2ca358debcc77887d34bfa51ddff618569d33
diff --git a/media-sound/modplugtools/modplugtools-0.5.1.ebuild b/media-sound/modplugtools/modplugtools-0.5.1.ebuild
deleted file mode 100644
index 83d5fb42dd38..000000000000
--- a/media-sound/modplugtools/modplugtools-0.5.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="libmodplug based module players modplug123 and modplugplay"
-HOMEPAGE="http://modplug-xmms.sourceforge.net/"
-SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libao-0.8.0
-	>=media-libs/libmodplug-0.8.8.1
-	!media-sound/modplugplay"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/media-sound/modplugtools/modplugtools-0.5.3.ebuild b/media-sound/modplugtools/modplugtools-0.5.3.ebuild
index 7f83d99bac6f..16d99a42a461 100644
--- a/media-sound/modplugtools/modplugtools-0.5.3.ebuild
+++ b/media-sound/modplugtools/modplugtools-0.5.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libao-0.8.0
diff --git a/media-sound/mp3info/Manifest b/media-sound/mp3info/Manifest
index a9a2d5151129..59c8b7484e0a 100644
--- a/media-sound/mp3info/Manifest
+++ b/media-sound/mp3info/Manifest
@@ -2,6 +2,6 @@ AUX mp3info-0.8.5a-format-security.patch 507 BLAKE2B e3a26ec3df15f24436d7c463f69
 AUX mp3info-0.8.5a-ldflags.patch 466 BLAKE2B 77cd382d37bd35cf4cb06996946cd61c98918395eb7cbba021a98084db90ae1024f8729413c1073e619e2de72de5b7f70706280e2d75b1f3eb100021c12b5ca8 SHA512 868b62dd4565e1f59a057bb4af06ba6618ba320f1a28104b936ae889ca851c344c3a221afedcb309bf11287079c86f44d5f92b6cfcdd8a6ef2e4a72508ed052c
 AUX mp3info-0.8.5a-tinfo.patch 195 BLAKE2B b8b25093c6b320d5f635d35b958699072d13498e93921dd7221aa0c5454deaf3ae77fb4a7d5fd7aeaea0a27b2d1737c22749c8a326fd8d9af52aeb5fb1584e92 SHA512 3e2deb03559afa3029c673a7c9bb165c6c3419b19a629f9b55e20f96e49b8132c2d454274a8f5c64e20330c148351c4ef51e92164d230124b9d3a6d90d2b2653
 DIST mp3info-0.8.5a.tgz 127482 BLAKE2B 303b7fb798604693c58e6412e5e282fbfb1ae126166a7c3d12c335953669c6e8482fb287313d6f44fb802545d728a58ae5f58c4e25bcea1d530879fe87910577 SHA512 30e0ef62deaa090fc115317f6c372f408077dfceed7e05faa6744b8516291e38d21f1742732f6532585f0c3d8c705d8c7026c2bed84c97e1f497d433637affd2
-EBUILD mp3info-0.8.5a-r1.ebuild 927 BLAKE2B a7faefe420a7493931d94b469b305db1bd7d7fa228f949908fd30b1114ef78073b223b82c5cdfca40352d75547e71f80121ab1f012d4dcb4b889178175717c8d SHA512 1cf7636c1d67720e45bd925b2164e644a53e8b4b311a54ce963d0e8ec821ef3aa4b7f34c902facb7be9ce3d35b402bed1480a7db6d7f45d70b6feea767ad2b51
+EBUILD mp3info-0.8.5a-r1.ebuild 926 BLAKE2B 892de79112e0ef86c88ac7aee47a7728d6e9c6b4a3dc46b5e25b061f8d7d585578d0be4578f4ba7d1a39260b0c15df8f085cd79ce494e2c927ba180c5cc14758 SHA512 eb9ff8c4176304db565053e238ff0dce3e0287810ab64fd28e4e72b8589b636d1903d829297c40d31c840fdd4fa1e3b0447a5135248ced6cf533c81f24775fb3
 EBUILD mp3info-0.8.5a.ebuild 901 BLAKE2B 3db0a926a9e7b8f26778f0a9cfcd5a7b019c4b966ff6f23684343463810ce4f5f9ace1896ddc52cef1c35fc2e633462e1a11e5365b1b5bf58ccfb6413d0cfc5e SHA512 3ea667a13f1b618a7370686b9d2b0e184a3a87677d45c6fe541a25a45bdabcb206f89e244d6fa16b78bff9166dd6588afc702a961d3247714f784edd9fb9abd6
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild b/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
index e027778e9ece..e8ab93b246f3 100644
--- a/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
+++ b/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ibiblio.org/pub/linux/apps/sound/mp3-utils/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="gtk"
 
 BDEPEND="
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index a16f7005d709..1d7df2c7e5fb 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,12 +1,14 @@
 AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20d60eecf3a62ce6c3eb0e6a8c29252ef6e3045a96af6e8cd12d7c27dfbdf8a79fa3ed025258b8c9cb7b05d SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5
 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
 AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57e4614727d7425e9323836db997a6876ae4b8266182f34cbb72199f8db5ef8aed79f5beb4fb5ea483 SHA512 ad67bee1e614b2901e977e0a7a9bfea7ec9bdf3af9546664f42c1d1426eb5e7990028546390219912e724eeca8ad063a2ac39a048be281527b19b0a79e819961
+DIST mpd-0.21.10.tar.xz 670952 BLAKE2B efebbd5202b82e52800ff7e4f60fb9e7606e0b07cb157cf0bf04859887316a8466976095bc1cb83479f76f4a54074967ecfd3bbd1bf703e6ff6d5b8ad75a7816 SHA512 42272ab5f767c5a6b907f5dd922ca35abc759dfbb4769a235261fdf0433a0f70494f503255403d41dfd34902bd6aff21f48291b24fd5bc260a5fdef53800c991
 DIST mpd-0.21.4.tar.xz 663648 BLAKE2B c9226d2b02b1035091d3af535c269aec3fead779bf17d95b858706affb84089ca85250452884ed5ee96008724735abf80cdfa4d2de14d9928748284d753a4638 SHA512 454fde206f98f89a58ac773037963ac895ee6ce3e7d1032c49b980a3bfbbb69782a62900a5c09e4b39f24b2d1bcd380d7b520935563dd3b8d02f701389389ca7
 DIST mpd-0.21.5.tar.xz 667624 BLAKE2B d4de4c55306a42caf4f79ee469db2037c0217563d50d7a4ed349d0c2c61cab1c6e519da96f552f38692bedf18ffbdb2032ae0a3314a05b2f2461c2da526f85e5 SHA512 b3a938f43cd554e0e761890ca7ea910e21b8f98f54f5bfceb0efcbef4df46db0d110d1bbc24a233021b463e3424d6246c1013f5a6ebdfc85a418008d49ced7a4
 DIST mpd-0.21.6.tar.xz 669272 BLAKE2B ffd50c35e431791503e5d0137abdb93beb42cf48f7638ac0f394d8c4198ce96f915220c92d078ce99cfe7c9866f8e35e58106b801a6d83cdf0a121442f12976a SHA512 20e752a8db2f8ae0b2419b35018557c37a64c6baff25666ba35fce89cfd354e4df5064c25685791f3fcca7ba9e6e6acef0e4653c0c0ffafde2847085dc51b3fa
 DIST mpd-0.21.7.tar.xz 670268 BLAKE2B 1dc6b923e6c6f66ec1f0769b6c4d785761a798659c192184801cee5cd6df361fba0107275650da3e5982ebad5370fb6fe1fe4f7bb9da8986e9c359e4ec2a7815 SHA512 a6e8848c851ca464cfd26284d6479d561f127bc102128e8a41274bc1d62d87a3720843ff1922b5b64b33280217a6036b512f7aa0ce7d7f6b90cbed9fe787c5ca
 DIST mpd-0.21.8.tar.xz 670508 BLAKE2B 04df23007e5cedd00259b1d5f7d301c36b52993ce8352bf784c794150340e4bf2d0a606eb02de3abedcbb9a76f01aca9dc9191d95efd49d0868a32af385821d2 SHA512 034f1cfe431ce163ed808660bee90c2a63926fcc95ab22f55fd566f24c126878fe0fd6521f3008612ea5dca7b448cc5e5d895e0b0156c768bf632674ea982901
 DIST mpd-0.21.9.tar.xz 671092 BLAKE2B 87e1d8afe42b4ca59b1aa47cc0f6260af2d1c161928411cefdcd1f9e6c1013869cffccd729d2cefcc4ddff4fde18bab887407b1b71c6c46457c930c7802f3337 SHA512 e4c5561df881874a16716b32bc1381b6e3bd3690eac07cf3923d1e273937b9594cf387d1e1aa3b02c7f0d19bd30c4575f43863e11d9a69b6a647205009593a9e
+EBUILD mpd-0.21.10.ebuild 8210 BLAKE2B 6d8dc4bfe296f70ee0fade0a0c77059500da0a7e6fc880a329973620d823496519da8b94598757a327966f209c6c20f3f4b30bebcb99eef74849f0dc8984efa0 SHA512 18ebeaedad356600acb15badd8b5cdc3d81708ca3c62505a00fe77aa538c114accd650c439f1ea29ceb9df40cc4b8c34821abfec575bfc091a84b53bf8dc5118
 EBUILD mpd-0.21.4-r1.ebuild 8174 BLAKE2B 35bc9bb4ccf75ab510065b1eee80ad626d1359654a3faadfd0ba8e3d09eb3ab3bca37836f2d540704f1914b2a25fe90dbcc80ad1333e6b57970e0f6b2c227f09 SHA512 b347f5939053b35bc95c1600706a364a762e4e81a3a238d31e38a884970df9d1db8892c6b943d8895cd7a115e21310fab646bb0c13a2731f7037e93ac21dddd2
 EBUILD mpd-0.21.5.ebuild 8185 BLAKE2B bf1f75190482eb97a199b068376af40f32369ff51dc47643d3a1f65a2521611ed2373c9cd4ebb5b6a6496f781e35457e7352173e46106dae9585d781b716b960 SHA512 f3230bafb050bc68308fe99d567e4ee593907b8087bf45343ac07307d0253132a04e96a3b26e8c74f7a890914c3fac6d12a1a6155a0d46caada7fc8c2384d915
 EBUILD mpd-0.21.6.ebuild 8185 BLAKE2B bf1f75190482eb97a199b068376af40f32369ff51dc47643d3a1f65a2521611ed2373c9cd4ebb5b6a6496f781e35457e7352173e46106dae9585d781b716b960 SHA512 f3230bafb050bc68308fe99d567e4ee593907b8087bf45343ac07307d0253132a04e96a3b26e8c74f7a890914c3fac6d12a1a6155a0d46caada7fc8c2384d915
diff --git a/media-sound/mpd/mpd-0.21.10.ebuild b/media-sound/mpd/mpd-0.21.10.ebuild
new file mode 100644
index 000000000000..969b82d84813
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.10.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
+	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd tcpd
+	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	adplug? ( media-libs/adplug:= )
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">=dev-util/meson-0.49.2
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Ddebug=$(usex debug true false)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dlibwrap=$(usex tcpd enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		-Dadplug=$(usex adplug enabled disabled)
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=false
+		-Dsndio=disabled #not yet in the tree
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	doman doc/mpd.1
+	doman doc/mpd.conf.5
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
+}
diff --git a/media-sound/mpdas/Manifest b/media-sound/mpdas/Manifest
index 87778969c96f..e29cae497c1f 100644
--- a/media-sound/mpdas/Manifest
+++ b/media-sound/mpdas/Manifest
@@ -1,8 +1,4 @@
 AUX mpdas.init 429 BLAKE2B c1f85ad5006945a8d388b65c9fcc43168cb426b1afec6ca3674d2c706fed837fe3a6f24472831f783368ce6da8ed66a2604faa33f5b8197c1140b8f0bd192913 SHA512 0d2f7393abe0119cbb43dfaaa7593eff03456e8aa188eb879692108ced01b1980812e8336479e2ee94594537b77f2a9267e34c9a274d1a815bde77e2b3b8f8fc
-DIST mpdas-0.4.0.tar.gz 15113 BLAKE2B f8aa7fd7cf2eb2c960eae28e566e01b55931aa2d6a08819697d2bb7bf54365708aed5a9b5687858f6e2a0837becd1933129c3895acf6dce68be530657592ea20 SHA512 0e5643cc2c690b05477b64e8f1761332d53e17809d61ec5ec17ab41f4f0b7b2d6b4013d3b946d3289f02f470b4afef1df8206bd0fab61345cd8431bb2c66742f
-DIST mpdas-0.4.1.tar.gz 15117 BLAKE2B 0d1c527434aeecf822f686e50ca43bf684c4ed528dea4be8a2f6b4ada0fa10c3495313b5fbff7a7a495d854eef22e7a6f257e652fb7958240d6a8b021e84321f SHA512 746ca106f76cbd24fc8460b9c2a7debcb5faf49e65e5307adb1bdf530dab8f99b2e0118ce1324e5bf2af1d08465c3a6f015675dcfb7d1b6d799e228e8ecffd64
 DIST mpdas-0.4.2.tar.gz 15695 BLAKE2B 907417050ab1b3d6577311e633b060dad2ff834b5436b7ed086ab5cb9ef291004916fc07cbe18ba4b80eeec8573775cc8e212b93d4ed103cbab3ce81082a18ae SHA512 cebd3c027002ac5283834edf3a1338b449c4a78261690cb5d25c57f767f1b0b81ff8ca5c64d79d6aecf5e86ba0c7b63a51131f6cc9031f2922e92eeddcada353
-EBUILD mpdas-0.4.0-r1.ebuild 713 BLAKE2B 457d000fb43cfa63a8d897dd9b4ea9c7fab52f9e2b3a875616104a2c5988c78d6bdb43c67a7a8753610dcdd79504f5fa42b077db8a752058ec3f665ab197eade SHA512 6ff9c4c330e1a0cd2da0082469f2c4e194e9861a252f6733c427cb62c85b5e3d8ffd63528439296817614e0f7c9c3e4ee6341106823a5718fedc22f88f82f49c
-EBUILD mpdas-0.4.1.ebuild 715 BLAKE2B 5cdbecdd1167865e850733c2f4bcc7ad598c4bafcba46e35afb17e8ddf941ae2137d9e192c5212ce1bbce5c9d58376acd1d808e768551ece2f3c2b786d304ba4 SHA512 79b9bc6753ae2d6a19c07b72ea4d2848b4d34a5e94033c28b8c7aa75e32145903d715c70da3e7ac2c24095e5d43a8ef60b8ce12f764cb20ed7853ca8cc02b7af
-EBUILD mpdas-0.4.2.ebuild 787 BLAKE2B e79468b91ed36841072ba5f40ecc798d099ecde07bbe6b5d05c998a06984ba3142cc190cff49ef172daa40e117dbbf369c461a80d05ee33bbac3c2ce345cb12b SHA512 5cd39afc8f260664ba55dadb1ed771cdad448e01195ace5b8a2fe88ea0316006908200758951129e399e3545b8b5e93af3f885253ebd8e86c2d580a51d945665
+EBUILD mpdas-0.4.2.ebuild 786 BLAKE2B 2f7e22d31ead4fa20720e24068d880bd63e795394adf2f722d5fab3825bfdbdd030da5185e8d4c8575deb89abb88ab4ded35fd6752b970412d85a603c9a39747 SHA512 c58934b9d6cf1606fe844ed01486abc079e19ac206078627ab91fe38c0faa9af6bb5dc041e7f37aa515fd0b0c18674657e0bd3cb086e5d0f23e9183e10a05bb7
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/mpdas/mpdas-0.4.0-r1.ebuild b/media-sound/mpdas/mpdas-0.4.0-r1.ebuild
deleted file mode 100644
index 99e9d70a110f..000000000000
--- a/media-sound/mpdas/mpdas-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="An AudioScrobbler client for MPD written in C++"
-HOMEPAGE="http://50hz.ws/mpdas/"
-SRC_URI="http://50hz.ws/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/libmpdclient
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_compile() {
-	tc-export CXX
-	emake CONFIG="/etc"
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-	dodoc mpdasrc.example README
-}
-
-pkg_postinst() {
-	elog "For further configuration help consult the README in"
-	elog "${EPREFIX}/usr/share/doc/${PF}"
-}
diff --git a/media-sound/mpdas/mpdas-0.4.1.ebuild b/media-sound/mpdas/mpdas-0.4.1.ebuild
deleted file mode 100644
index 02431e9668fa..000000000000
--- a/media-sound/mpdas/mpdas-0.4.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="An AudioScrobbler client for MPD written in C++"
-HOMEPAGE="http://50hz.ws/mpdas/"
-SRC_URI="http://50hz.ws/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/libmpdclient
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_compile() {
-	tc-export CXX
-	emake CONFIG="/etc"
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-	dodoc mpdasrc.example README
-}
-
-pkg_postinst() {
-	elog "For further configuration help consult the README in"
-	elog "${EPREFIX}/usr/share/doc/${PF}"
-}
diff --git a/media-sound/mpdas/mpdas-0.4.2.ebuild b/media-sound/mpdas/mpdas-0.4.2.ebuild
index e5dd45d3bd91..75709c41d58f 100644
--- a/media-sound/mpdas/mpdas-0.4.2.ebuild
+++ b/media-sound/mpdas/mpdas-0.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://50hz.ws/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/media-sound/paprefs/Manifest b/media-sound/paprefs/Manifest
index daabc6598975..a9b319d0bc7c 100644
--- a/media-sound/paprefs/Manifest
+++ b/media-sound/paprefs/Manifest
@@ -1,5 +1,3 @@
-DIST paprefs-0.9.11_pre20180621.tar.xz 221100 BLAKE2B d8f79865a0ce6d4491ea252fdef65e700d1ad4cfc253d8b0415a6cd454fe60685a3d647c8720cb50f85033a7bb0d411c404b4d50c43b320bd728390a8056c1de SHA512 650e365b77d9d9beee4dc62b7ba5d367b55a9f0e95f39ca1e75d210dab05820b4d3485a34366e6e341fafe55b5c6ee458088666937e0220c3d91bd68aa327c53
 DIST paprefs-1.1.tar.xz 69144 BLAKE2B 9809bb73156be1e4020679637c1203524a0ccc5f5e1fb3696724925bb196cd397e433c22e993e7353cfaadd38260980676af6ace2cac795c0b615298d1d85805 SHA512 4203fcb485b40223a5c8672fdbbd2875a25d05d85366773015728f54a17020098ee9e9fd1c02180c01799e100b99389c970855fc1bd69921d32d8e43c749ce76
-EBUILD paprefs-0.9.11_pre20180621.ebuild 1070 BLAKE2B 834097d5a7696c4ec3a079b2e59290fd7c519c8c154b8a9c1cf40f3713187d9186f428d50d813075f54aa0e2f2e5ecfa37361a24169b4e70b9dc93be89adc88a SHA512 2aecf44049793efa91cc7497c5c539cb26476c1c2e68523e1571478250db6f7f0ab9e41febac757a5767285704d350ce8d9c66b09b6810749086ea5ed41a0178
-EBUILD paprefs-1.1.ebuild 946 BLAKE2B 398cf50aacecb1f5de7f088914249742fba86c0a097c748c8d7d967dec1ba8dc54fd6cff79c375f898a8a780ff68daa4b2124c1b07f9d249b31788f1cafe560e SHA512 c296fba3d1e1b56ea1074bbca6548801fe4d75b24a15f161ec84feee4920b0a0d15aab428e98892477cd16b333c2ce8503a8818d065320d30a19c92e293ae18f
+EBUILD paprefs-1.1.ebuild 945 BLAKE2B 7607bc874caf102f46827a5a51ded94ffda45a367729d44c2d25faecedce9a97d4a0f19b117adcc48aefd995ffa309384d617e7ee7adf9e8dd64f656c15562fe SHA512 2c0657ddf7f98b3382e8f5549f8a0b8224ff9a0c627954c70ff183ad4da7728d58429b19b121f8542b19809af0a6be19832e288cad288d616529d0e479ea06e5
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/paprefs/paprefs-0.9.11_pre20180621.ebuild b/media-sound/paprefs/paprefs-0.9.11_pre20180621.ebuild
deleted file mode 100644
index bfcbdffdf1fe..000000000000
--- a/media-sound/paprefs/paprefs-0.9.11_pre20180621.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic xdg
-
-DESCRIPTION="PulseAudio Preferences, configuration dialog for PulseAudio"
-HOMEPAGE="https://freedesktop.org/software/pulseaudio/paprefs"
-#SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="nls"
-
-RDEPEND="dev-cpp/glibmm:2
-	dev-cpp/gtkmm:3.0
-	dev-libs/dbus-glib
-	>=dev-libs/libsigc++-2.2:2
-	>=media-sound/pulseaudio-12.0-r1[glib]
-	|| (
-		x11-themes/tango-icon-theme
-		x11-themes/adwaita-icon-theme
-	)"
-DEPEND="${RDEPEND}
-	nls? (
-		sys-devel/gettext
-		dev-util/intltool
-	)
-	virtual/pkgconfig"
-
-src_configure() {
-	append-cxxflags -std=c++11 #568590
-	local myeconfargs=(
-		--disable-lynx
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	docinto html
-	dodoc -r doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/paprefs/paprefs-1.1.ebuild b/media-sound/paprefs/paprefs-1.1.ebuild
index 1c96b3c2a120..7c72a37b0939 100644
--- a/media-sound/paprefs/paprefs-1.1.ebuild
+++ b/media-sound/paprefs/paprefs-1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-cpp/atkmm
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 61c1690b5406..99e3ebd22f4f 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -4,6 +4,6 @@ AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-12.2.tar.xz 1665092 BLAKE2B 2e36efc5142c1e379cc2b135f4126f03a31831b26efe60f7cdf128af6e23fab25706a5609644d0b387530021055f87525fe60d527cd3a087f51bfd58e810644f SHA512 877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e
-EBUILD pulseaudio-12.2-r1.ebuild 11538 BLAKE2B 977d51791300cf193ec766d898aedd35961e6fc15ffbaeef6083134e23b1943485dce10dbe3e5bbb72c4599b6079110717e26a08090a3a3c246f331f6c47cd52 SHA512 d12b057f4d95a4267ae0f3f6cc29df6f083edf2c6908fc16f5c308a2df87bee8b24e33c10777305f307e24ad1c43b4ad7e1fb82662340ccf3c39746b56e23bfb
+EBUILD pulseaudio-12.2-r1.ebuild 11536 BLAKE2B 28892f7980092e0a314c5d69edcc88d5d9be7dd7a8845f4396f2d4a885ab69b1cb9298f3bb720beed253b5a3ed796ba8e55c94c63f7a4e1ec9b4ae7e369f69b5 SHA512 529c755ecbc2c8596cf295fc56c095dd7b987a5b7e1eea9b35ec04993ca0967e1afa52027e3a7a864d12f362f25d2cc1e2190b6d4c91a5cb730535c6bdd403b2
 EBUILD pulseaudio-12.2.ebuild 11111 BLAKE2B bd002a2bf9d7c0521eed3baec7d2b602302e8cd4bd7acd6ea22abeff54ee1be8042b44bcfd64a7f4d57f2855a958235d5b16fcf018f0377cd5f5faee040c84e2 SHA512 dd20835fb783428209dcffa07b0b4c1ec9f3e42b91faf07052df5f77f3eac388ee91dfbfe2da7f07890ae3631234a8a14bfafc41875c6716c6b8b9e839ba0f21
 MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild b/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild
index a81af22636f9..2768e832e130 100644
--- a/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 82d06da2160a..91a2fd83fb9b 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,11 +1,4 @@
-AUX qmmp-1.3.0-projectm-3.1.patch 3549 BLAKE2B ad650249ef621a84fe1fe359ae03c62df67deceee0c78c0a64ef00895ab3853bb072b0877ee5cae7aaf62eae617b439c97e1628c2060def5900c0904a6791620 SHA512 c21b3f3ce63479fa3f53b7a3079b5e3e4b998899f45c11ad1d7da6724ad48c80a7227958f73a2b4f141c9c814765b97b86e1ca29af8818f331f7291f28f8c3bf
-DIST qmmp-1.2.6.tar.bz2 1181291 BLAKE2B fb039d8abcc0e2c6e2e1aa64c603f1f8b81858c48332eaa480d9d71e77958af52352772394fe5c22be653fcb01bc2acc44011e5cf30ab38863f2a2deca6c0ef2 SHA512 c816f530a7b4dabfbe327f4c726c3412c8c22bc9713a288df0f0b405d9831f4958be01b3f9abd35818e54f03e5568eb79cec85bf154ac9ed8075c0bf3fd5a442
-DIST qmmp-1.3.0.tar.bz2 1220426 BLAKE2B 0a64b36876ed672c380c097897aa69f6d44f9d5fc7fdc2006ece63c91438fc72f3df67cf4c63d17dab526d8e67c45593b035df0e1ccfc1c179824807637aa812 SHA512 e91dc40ca8e96c1a5527ca73443e192bb8f2198a449f46911894b0e2779011766b2c6fd3b1786d2fbe3d87ccc7ee6b987ece0a3260144981bb74b96b3b7c3bb3
-DIST qmmp-1.3.1.tar.bz2 1221322 BLAKE2B ab0a4ecf5746926f2778a99d076f2756883621a4962f8f78a57d5eacb9977def9e8c3d186576715735763d991e6ee88d1ecd6f02e601a4b302ccd7ddf4176866 SHA512 936928bbe058253dc8cf95fb17b5ba840b3b51240d68ed9fefe4f09fd918d0908d1fc7ec816b7b08386c3da72fe78da73316e36b1b52018017d2a23fd8275556
 DIST qmmp-1.3.2.tar.bz2 1221919 BLAKE2B 3081aa6b3ef4712ea064d5bb23e9ac7da5e102fde820c378438c13723bd007fe8e79ac351b0ad01ca0aa22c50f6b6773965ce418742cf1386d2ae1d7ba7b1758 SHA512 5c68d87650abf10d03dc8638df73a6694e470af1121a936bb983bcbcea04d95616ad8a55d87e8874b51b7424a890dad2c5353afe65db7029f6513a382e2144e4
-EBUILD qmmp-1.2.6.ebuild 4221 BLAKE2B 7c67cfa55ac6cf2fdeabfee469ea7e492b81e8acb560a70a2890dae2704daf6963de5ee00d9a25de04c6b84433c91e3462a23786dbb2d26ece85b4d23d316d12 SHA512 d54e4e481244f1abc5817d45f7487e19e4d88ef6d17a42f72e55df62817d2994c499167004f05d8eb6e1e607573d1145454403251ef31c488f219b868a4f9ffc
-EBUILD qmmp-1.3.0.ebuild 4322 BLAKE2B 45ab0e243e10901cd0456c8459b4f751484da95b797c68b2e648ce4a7963ce77613f352dfe23fb4fe98b22f83338c177035a2a16326d8469e6843840d659e693 SHA512 e54d1867d000359ee22b41761e5b4ae7708639aab24b3a05faf3adfd1e8e095e67ed2c3c74a878a131d11b73a6a97e90c8aafed94db3432970e7da99fb4c61ea
-EBUILD qmmp-1.3.1.ebuild 4270 BLAKE2B 0e4a4bdab7e45fdd23db669d2a8e69703e6ca16ecf96f5c06097156aa3feda3c67bd97bb410aa036123cf1ea8c8129ce54d43ec7ffbd9a044651108434dcc142 SHA512 ef99784cbeeba0d8bfcb19c49884033df7e217d92d5b343d77be0bf222ef11aac6601dcca7fb2b78fef129908df5ffc7af9d71acd05455da89e48135e8f06f34
-EBUILD qmmp-1.3.2.ebuild 4269 BLAKE2B 293b9ee67741158812b5de962afe246b0f2c30a5aceeeabfb48817c0c571b5eb07283943f4b6c2d7aa7627ffbee6639480eee1b558c899170ec7128d1250915c SHA512 afd972d018e0e4263b54c373de893ac950f876033f0721aec12ef195e733285fe1533962ed27597b24a4562c86420246e9803032f1343d4358182a745695b8ea
+EBUILD qmmp-1.3.2.ebuild 4268 BLAKE2B 9027930e327d56248e1d4d83e69895a3ad9b0ffc9d26d67ce8ec073b72a8392de89509e59041f79e778c2e1664c4a62fdab3df8645a0cb8edf724f2879575310 SHA512 1786f3400aa0d8426744149bfd0ea1c7c2a3180be002972c52e800d33747f8beb8efca9e4a86065e944aba709b73673dc4f056ea9540828cfaacbdbf76186cf2
 EBUILD qmmp-9999.ebuild 4223 BLAKE2B 03bba4b756908e7ff5d7d0eeaf7afa2752591ebe0294b5bf904bbc12ec6e735d61cdaf989e52f3f3645ad5758ab7fab1ff06883af6b2d473b3cb97071908edaa SHA512 11268db2ee4019b9ade8a795a2edcb46ed90e66c1db529c44bf3349b88cf910fd3fa993909474dc30aeb4849e2fe27ba3ec94a93a86cf6a82a78d668aa8d2a76
 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/files/qmmp-1.3.0-projectm-3.1.patch b/media-sound/qmmp/files/qmmp-1.3.0-projectm-3.1.patch
deleted file mode 100644
index 0db7359bff47..000000000000
--- a/media-sound/qmmp/files/qmmp-1.3.0-projectm-3.1.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Index: qmmp/src/plugins/Visual/projectm/CMakeLists.txt
-===================================================================
---- qmmp/src/plugins/Visual/projectm/CMakeLists.txt	(revision 8708)
-+++ qmmp/src/plugins/Visual/projectm/CMakeLists.txt	(revision 8709)
-@@ -15,6 +15,12 @@
-   MESSAGE(WARNING "Unsuppoted OpenGL implementation, projectM disabled")
- ENDIF(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GL)
- 
-+pkg_search_module(PROJECTM_31 libprojectM>=3.1.0)
-+
-+IF(PROJECTM_31_FOUND)
-+ADD_DEFINITIONS(-DPROJECTM_31)
-+ENDIF(PROJECTM_31_FOUND)
-+
- find_file(PROJECTM_CONFIG config.inp
-           PATHS "/usr/share/projectM/" "/usr/local/share/projectM/")
- 
-Index: qmmp/src/plugins/Visual/projectm/projectm.pro
-===================================================================
---- qmmp/src/plugins/Visual/projectm/projectm.pro	(revision 8708)
-+++ qmmp/src/plugins/Visual/projectm/projectm.pro	(revision 8709)
-@@ -13,6 +13,8 @@
- 
- RESOURCES = translations/translations.qrc
- 
-+#DEFINES += PROJECTM_31
-+
- unix {
-     PKGCONFIG += libprojectM
-     target.path = $$PLUGIN_DIR/Visual
-Index: qmmp/src/plugins/Visual/projectm/projectmwrapper.cpp
-===================================================================
---- qmmp/src/plugins/Visual/projectm/projectmwrapper.cpp	(revision 8708)
-+++ qmmp/src/plugins/Visual/projectm/projectmwrapper.cpp	(revision 8709)
-@@ -1,5 +1,5 @@
- /***************************************************************************
-- *   Copyright (C) 2013 by Ilya Kotov                                      *
-+ *   Copyright (C) 2013-2019 by Ilya Kotov                                 *
-  *   forkotov02@ya.ru                                                      *
-  *                                                                         *
-  *   This program is free software; you can redistribute it and/or modify  *
-@@ -40,8 +40,16 @@
-         projectM::selectPreset(index);
- }
- 
-+#ifdef PROJECTM_31
-+void ProjectMWrapper::presetSwitchedEvent(bool isHardCut, size_t index) const
-+{
-+    Q_UNUSED(isHardCut);
-+    emit currentPresetChanged(index);
-+}
-+#else
- void ProjectMWrapper::presetSwitchedEvent(bool isHardCut, unsigned int index) const
- {
-     Q_UNUSED(isHardCut);
-     emit currentPresetChanged(index);
- }
-+#endif
-Index: qmmp/src/plugins/Visual/projectm/projectmwrapper.h
-===================================================================
---- qmmp/src/plugins/Visual/projectm/projectmwrapper.h	(revision 8708)
-+++ qmmp/src/plugins/Visual/projectm/projectmwrapper.h	(revision 8709)
-@@ -1,5 +1,5 @@
- /***************************************************************************
-- *   Copyright (C) 2013 by Ilya Kotov                                      *
-+ *   Copyright (C) 2013-2019 by Ilya Kotov                                 *
-  *   forkotov02@ya.ru                                                      *
-  *                                                                         *
-  *   This program is free software; you can redistribute it and/or modify  *
-@@ -40,7 +40,11 @@
-     void selectPreset(int index);
- 
- private:
-+#ifdef PROJECTM_31
-+    void presetSwitchedEvent(bool isHardCut, size_t index) const override;
-+#else
-     void presetSwitchedEvent(bool isHardCut, unsigned int index) const override;
-+#endif
- 
- 
- };
-Index: qmmp
-===================================================================
---- qmmp	(revision 8708)
-+++ qmmp	(revision 8709)
-
-Property changes on: qmmp
-___________________________________________________________________
-Modified: svn:mergeinfo
-## -0,0 +0,1 ##
-   Merged /trunk/qmmp:r8708
diff --git a/media-sound/qmmp/qmmp-1.2.6.ebuild b/media-sound/qmmp/qmmp-1.2.6.ebuild
deleted file mode 100644
index 81b05993cbeb..000000000000
--- a/media-sound/qmmp/qmmp-1.2.6.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# 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.2"
-	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/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 )
-	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/qmmp/qmmp-1.3.0.ebuild b/media-sound/qmmp/qmmp-1.3.0.ebuild
deleted file mode 100644
index a895b3e7408a..000000000000
--- a/media-sound/qmmp/qmmp-1.3.0.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# 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.2"
-	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 )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-projectm-3.1.patch
-)
-
-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/qmmp/qmmp-1.3.1.ebuild b/media-sound/qmmp/qmmp-1.3.1.ebuild
deleted file mode 100644
index 611727b19b0e..000000000000
--- a/media-sound/qmmp/qmmp-1.3.1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# 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.2"
-	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/qmmp/qmmp-1.3.2.ebuild b/media-sound/qmmp/qmmp-1.3.2.ebuild
index ddf529cdf62d..479ae90ea42c 100644
--- a/media-sound/qmmp/qmmp-1.3.2.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.2.ebuild
@@ -11,7 +11,7 @@ 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"
+	KEYWORDS="amd64 x86"
 else
 	QMMP_DEV_BRANCH="1.2"
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index f639635fd46c..0c240dfbcefd 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,6 +1,3 @@
-AUX rosegarden-17.04-cmake-3.9.1.patch 934 BLAKE2B a59bb497c2fa23f5161ff2953b2338c69d49bd5a5c8d73eefe542dc74c657079ca96d45a2f4db830206d5b71cce66667cf1257a9914da04658136993ce72d8ed SHA512 f3f285597be964aeb9625be9df2443c98ca902f7fe3f7db82ea84f96f0ab461be4762912a6cad30e2c085125394ba37cb0048fca3f8543e1ff41d7776eb671a8
-DIST rosegarden-17.04.tar.bz2 6454603 BLAKE2B cc028a4108f4c51c9f3559bb454a8344d03f31280db6fd51e98a0b39bdc10e29add97272e7dace848dc4b4ac384ba787ade6664d991aed14fa3101b4fdce2743 SHA512 23240522cba8cc3b5d0e3b29ee5b871c911c7634d74f65d04b353f59747bdf6a1bfd9985f16ab331ea2399a797e66b2ebd110e192bb52ba4df453d42d7b8f73b
 DIST rosegarden-17.12.1.tar.bz2 6692715 BLAKE2B 698ecfb58754ee292e589e0fb3618e2076a6e59dde1f06d15ed3bad43313cc79ed03307364350f5cd2323350173119ccc71b42c839d8498d360461a19801a96a SHA512 8bd4a464bbf2825d6c2fb8d36123e68d94de7f4e997c6ed8efc5670e87799781eb8251995890979c9d107d4fc58c636fe73e699c859c8e95aa567c4289958495
-EBUILD rosegarden-17.04.ebuild 1236 BLAKE2B 57352999fe5e4779206b9c9b562ff651fb38a8f102718c8aaa9d583084b908101816c560171dc50335e6032172254b92e6ff4525b4f6b06a1dd1a649c5f0963a SHA512 6fe801a1b33637361a583047d7c1b3a1335efac616699137f1a8dd4d00f2a206e66e9386ec8332265c980ab757b85c652aa530dd66aa737e9680a7e7618daf04
-EBUILD rosegarden-17.12.1.ebuild 998 BLAKE2B 49ee99784594c188f2a896f186ff9d8cbceea7b459737ffe2bdb88a9d387ac7f282c1ec312b3d81f78e9dea21f90a0e8771affc439009d5c8e474985aa9b31c8 SHA512 cf4cad1a1146c4dca6c1190e8d05e1f4704e04fba3f9b998ab2d8159c20e52c211626873a161ef601043fcac543065e01bb2fd7c562c61f67f426e39e1812a30
+EBUILD rosegarden-17.12.1.ebuild 996 BLAKE2B 955ae5c825df0b675211d7fae021280f7ea8896bd3dde778fb847d02cae59291e8ed6f382d87e1bf39f125564626e5b72aa68fbe477bbd7e5bd745f1a0627a39 SHA512 52527e0803bc198cc7f6167091aad55317e6dfcda6d2322e90932b4ef8d66713455bc57117c6fd83212955243fe52c98aeb5faf7993c2c87bbddb5b76e962952
 MISC metadata.xml 349 BLAKE2B 0f31b6c7f0aef5e0b487ddcdf963c1701cc3429870464de30409dd788422964adbf05172089315a6543ac858f4d5ae64773c52728f24da4dc06dfe9b1dcabf9e SHA512 1790ba05a4f13f358de6890c908b2f1eb0581143063b7237220dd05aba31d16d68f2cf6c4712a08894909b7de5306d592807e9f3171b66b72fd867bd339a0cee
diff --git a/media-sound/rosegarden/files/rosegarden-17.04-cmake-3.9.1.patch b/media-sound/rosegarden/files/rosegarden-17.04-cmake-3.9.1.patch
deleted file mode 100644
index bc587a729773..000000000000
--- a/media-sound/rosegarden/files/rosegarden-17.04-cmake-3.9.1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: fix svnversion.h dependency to permit parallel building
- With CMake 3.9.1 and parallel building enabled, the incorrect specification
- of the output filename when creating svnversion.h can lead to a race condition
- such that the package fails to build.
-Author: Stuart Prescott <stuart@debian.org>
-Bug: https://sourceforge.net/p/rosegarden/bugs/1552/
-Bug-Debian: https://bugs.debian.org/871213
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -810,7 +810,7 @@
- add_custom_target(svnheader ALL DEPENDS svn_header) # svn_header never gets created, it's just a unique string
- 
- # creates svnheader.h using cmake script
--add_custom_command(OUTPUT svn_header ${CMAKE_CURRENT_BINARY_DIR}/svnheader.h
-+add_custom_command(OUTPUT svn_header ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
-     COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-                          -P ${CMAKE_CURRENT_SOURCE_DIR}/buildkey.cmake)
- 
diff --git a/media-sound/rosegarden/rosegarden-17.04.ebuild b/media-sound/rosegarden/rosegarden-17.04.ebuild
deleted file mode 100644
index 53c373ddd12c..000000000000
--- a/media-sound/rosegarden/rosegarden-17.04.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="MIDI and audio sequencer and notation editor"
-HOMEPAGE="https://www.rosegardenmusic.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="lirc"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/alsa-lib:=
-	>=media-libs/dssi-1.0.0:=
-	media-libs/ladspa-sdk:=
-	media-libs/liblo:=
-	media-libs/liblrdf:=
-	media-libs/libsamplerate:=
-	media-libs/libsndfile:=
-	sci-libs/fftw:3.0
-	sys-libs/zlib:=
-	virtual/jack
-	x11-libs/libSM:=
-	lirc? ( app-misc/lirc:= )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${P}-cmake-3.9.1.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		"-DDISABLE_LIRC=$(usex lirc OFF ON)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/rosegarden/rosegarden-17.12.1.ebuild b/media-sound/rosegarden/rosegarden-17.12.1.ebuild
index a62b21c7fa70..34f80417db54 100644
--- a/media-sound/rosegarden/rosegarden-17.12.1.ebuild
+++ b/media-sound/rosegarden/rosegarden-17.12.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="lirc"
 
 BDEPEND="
diff --git a/media-sound/rplay/Manifest b/media-sound/rplay/Manifest
index c232178bd5f8..c30654a8c998 100644
--- a/media-sound/rplay/Manifest
+++ b/media-sound/rplay/Manifest
@@ -5,5 +5,5 @@ DIST rplay_3.3.2-12.diff.gz 25322 BLAKE2B dc66fd94076e7ac3ffe863db98b326ce0272bd
 DIST rplay_3.3.2-16.debian.tar.xz 25456 BLAKE2B 34c69d95c964465a04681d7cb4c1a66b34d486e540486d1b47d9590fb893e574381405c15a48bfec272f3b566f5b3ab6ce88806497f8d1533f441cbf9481a3a8 SHA512 8d5db7862267fd0ec7f27896b6a76708304e54b9f2c8a52621c0a92c4688511e07a7820b2468c93032dab15f27f5dda1f8931e35d95e724501e2586a5851486b
 EBUILD rplay-3.3.2-r1.ebuild 972 BLAKE2B 894346d8cdc7ea39a3f7e69e92b3a3645df8848699be6258518b2b1a28e1605e1a9febf8cd7384003dbde0dcdfe799ec8e8cabc3781316e5e09203a7fbf13762 SHA512 d9dc52fe82472426e6d8217003fd0d46bf4dc4af7b57fb67b7356821b39604be10a5429973606b62e0949c60b030df2e5ff99e9c0249e53d27ec962a5f0d5bfd
 EBUILD rplay-3.3.2-r2.ebuild 1125 BLAKE2B 24522fbbbcbb42cda98f1692853708beef98a42fc50f998aeae58bd8234bdff1f75fa34fef2412e71044bbbbb3d4b8275416c110694a5bb1c3ec6b2427d2cc40 SHA512 8b949b1f97bf29b94cc9eac103a1cb365bee26da8f3dd91f2c6ac187cf0254366e36bf062d95fe0cef79dee0f3797faee54342430ecd3719c6e3c22fceb73785
-EBUILD rplay-3.3.2-r3.ebuild 1219 BLAKE2B eff8616537fc314a29a3df8048854c9a3bd2cf9fa025e0fb13a14e970b28f901f95e69f6b99cc121c53a9110c259fd64eca89813e07b05c9dc5b8d2e531f4007 SHA512 687299901457889f9d6dcb56099ea0dc73c73578c22c9378f36b1e48335441e521af5d7260e54c8a93698a7788e315f10ceb301e4f48071274faff0aad0290d9
+EBUILD rplay-3.3.2-r3.ebuild 1211 BLAKE2B 05288821d87accc586edcfdf7aab14410beae3899bdf76a099f13a83d94ae27983ff1817298928f585f24cda7b8df99869a1a69c3fd8845ea264d8fd6a47c6cf SHA512 daaf85de722d2c2932a6d7dd988bb5d50fd8231f2cb19ce70366ac69b2fdbe66d2a9487df6e1df794ada117270231582dbd3405d27da200733060e6b7f7e7647
 MISC metadata.xml 602 BLAKE2B 12db89459ab4cc0696d1c6ede006c6f0365854801e2a67ae060fe0a807fc8021d5d4c0b992ee1adc21951bba7aaf5734aa7c4742feff563d8b009322f58cc5d7 SHA512 2133c5096ee010c0470667238f9d600c4617b9659615b3302abd81eb7b4b84107cfe9efa2070d5536d91aa11a90be1865703cdd5f92d0ea1f8718336a65cb272
diff --git a/media-sound/rplay/rplay-3.3.2-r3.ebuild b/media-sound/rplay/rplay-3.3.2-r3.ebuild
index f94e25893517..6302124d1878 100644
--- a/media-sound/rplay/rplay-3.3.2-r3.ebuild
+++ b/media-sound/rplay/rplay-3.3.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}dist/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="media-sound/gsm"
diff --git a/media-sound/sexypsf/Manifest b/media-sound/sexypsf/Manifest
index e4d5eaf8b8d3..e2ed3ed1068f 100644
--- a/media-sound/sexypsf/Manifest
+++ b/media-sound/sexypsf/Manifest
@@ -2,5 +2,5 @@ AUX sexypsf-0.4.7-misc.patch 7770 BLAKE2B ec617d75c15378dea9546b4a098430d9904258
 DIST sexypsf-0.4.7.tar.bz2 83001 BLAKE2B f2c74374f68cda1837ab4f91e338377dee539f60ca28efdc31b10a48d1028aa54892f5a2e2e6e23b145dea88a1e20e9b2a6c0155547c9d7fe10b6a5f415ab72e SHA512 5b4fe7662769e668e15bea0db8785c5355a803dfe39f86eeba6dfce5df573f342525e10bc5317e1cd2b1ef70730ee4cf766c9d02cc9f404b0e39defbb30c364c
 DIST sexypsf-0.4.8.tar.bz2 82954 BLAKE2B ce710cfe20372f81e5c4f18857b46e7eef1837b87469bdf999dd677f617802da0f7cb0ff9ff1a0ee78f6424b179b33cc111ba98619dde4a03b178c63397749a4 SHA512 bb95cdb40cf7172fdf815d6a2083adc4f684973534625d76c4fdb04752888acecfdd5ba329f9e2eed64311f30eb4400c8913ace13e4fa371c89c774905dc35d0
 EBUILD sexypsf-0.4.7.ebuild 1029 BLAKE2B 87a2c5e8d5e95a067b6ae9919620f7e1fb377f51ceef9a3ab4015a5a93d575dc21cb11ed001fa4a24dcf23971abadda9c99d1bd9f5da6196c1344c427e97834e SHA512 30840716a6885ea9aca3f87cbaed4a43fce6342f10645f515e14a22fe2cfaa7150fc22eb5a0cce6a6d86aaa0bc4b7ef449dd4ada6edaf7c2e55701833d547326
-EBUILD sexypsf-0.4.8.ebuild 504 BLAKE2B 48099fb68d6ea4681e583429679ca7c2c7ca0f549fb4148203851aacc23dfbbe18737a5538964a5fa4726edf0708f3ddadeb73c473b812beb20729aa81362d95 SHA512 5cc64d72bd233c8b796ad7dc68debfb0cc7cc8997fc1265d6e201f7ef800a71db784968b7f50952084028d98c1b3f374d2c3e7753f0a59f5e87c08f50bae7500
+EBUILD sexypsf-0.4.8.ebuild 503 BLAKE2B af80d45dc051c55562414f5c956a7e34f4246bc49ea5d2e2a1de01a9b11cdb4f5527a0fb9365e8b8d783d91956b902177350e33c1435c29cec18fc987aa0cbfd SHA512 2fe3a6dfec41d33f5148a05e87e811479065e2ad41e92fd5df61a22f204a8cf20bdcb96bbb352dbe7d4b858651cd5cc2e04bbc175cd15304f02a6988236e6741
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/sexypsf/sexypsf-0.4.8.ebuild b/media-sound/sexypsf/sexypsf-0.4.8.ebuild
index 0eaf52342bce..427a0518e2ca 100644
--- a/media-sound/sexypsf/sexypsf-0.4.8.ebuild
+++ b/media-sound/sexypsf/sexypsf-0.4.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://projects.raphnet.net/sexypsf/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="sys-libs/zlib"
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index dc0d7b619669..e04eeb7a975b 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -3,5 +3,5 @@ DIST spotify-client_1.0.98.78.gb45d2a6b-10_amd64.deb 105135826 BLAKE2B e1641a738
 DIST spotify-client_1.1.5.153.gf614956d-16_amd64.deb 113728674 BLAKE2B bc7930a1935c0a05dba262abc384a699720be53e3bec83393c962761bee647a247d2ddf475a6812bdb969fc1f59e9d2c283de0da398a9b8f7ddfff8f1232fef1 SHA512 db354f161c35b5f1a2d633282fad8fccf565e0061e7d258012f28422d766630391d47d4dafe22448fb60f850bf4ccbfdf82443cf107e03727c077b2c62e524be
 EBUILD spotify-1.0.72-r1.ebuild 3204 BLAKE2B 8844b7707b35537320da75bd7417c320559abbc668249cc652e9e2d481cfc9a00328458a8ee8c242acc46e832a81127686f0a3bb93ee6d4e4cc2e9e24f8c18d7 SHA512 8f194869be7f6aa8a9330d8597e8a4419a19203f4dbe387de1aeeda9350de13e4596a01290ed452c358d72fc8e20e249b4fcbf17a1f38a688315e0c189e0cc4c
 EBUILD spotify-1.0.98.ebuild 3429 BLAKE2B 436b23f7857907ba883d7ade7eedfe1ecbfe15f2b2f787c1a832bc4d888c13aa5098b9a495f38c200795775476501465d6fb63e39e1b0cbf5e6da9093ee76c48 SHA512 9f431988b6adf74319efce9aee404684bf495604db5d5b1a0cfa241c43cd026e4646bfc19ad1d66572bf451423be832761750ebfda1a43b10d50f283b37d70f2
-EBUILD spotify-1.1.5-r1.ebuild 3078 BLAKE2B 248485abac1f97b0f4cdfcdad4d6269b4ec9023f29a2b5332c7596899ef0deff97c37f8be7f3d63ca1bf37b162611f2825f792026bdb407359495f30e0e91f3c SHA512 72ed085363ad74d5ad4b1492936f885242d749d8432b616a8a7d39414d9cbfa2e14f25f6af427d737d45a9d854117f3f57530d073a7a7f60d724f6b7db4d3f09
+EBUILD spotify-1.1.5-r1.ebuild 3139 BLAKE2B 1ee1b89ab15fcbdc964636cdcb2630d72ed1b6a4830761c98465686aa9a06e09659dca2a1afd5b0f6f4f65e3e7a6fa4ee9613b78232bf34b4109ba5480c94664 SHA512 412165d9e270d0a3a1ebf0338a307e0fdc6a22d760aeefb46427dcbb3b9dcc906d9be40bdeed986588a9096bdb45465018f22e2752e8adb56c7e43a844a77433
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.1.5-r1.ebuild b/media-sound/spotify/spotify-1.1.5-r1.ebuild
index 6bb9251f650c..5fe58e2255fc 100644
--- a/media-sound/spotify/spotify-1.1.5-r1.ebuild
+++ b/media-sound/spotify/spotify-1.1.5-r1.ebuild
@@ -12,19 +12,20 @@ SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
 LICENSE="Spotify"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libnotify systray pax_kernel"
+IUSE="libnotify libressl systray pax_kernel"
 RESTRICT="mirror strip"
 
 BDEPEND=">=dev-util/patchelf-0.10"
 # zenity needed for filepicker
 RDEPEND="
 	dev-libs/nss
-	dev-libs/openssl:0
 	dev-python/dbus-python
 	dev-python/pygobject:3
 	gnome-base/gconf
 	gnome-extra/zenity
 	libnotify? ( x11-libs/libnotify )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	media-libs/alsa-lib
 	media-libs/fontconfig
 	media-libs/harfbuzz
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index d3a18b61401b..b5937545625e 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -3,5 +3,5 @@ AUX zynaddsubfx-3.0.5-docs.patch 436 BLAKE2B 23724992b4ce5a58961984481bcf9782a79
 DIST zynaddsubfx-3.0.3.tar.bz2 7989258 BLAKE2B 7b71dc358ed3d0248eafb1c4638b05cc7ea8dbb05fd36c40643bb8f9160ee462c229d1604a52e795b6787d9131cea92512ad783c137c9cbe17cf8d56461a581f SHA512 e60e22656388d444114959859c12014ec79d7ba555b0d217ad98ad06e273916eea0eee521bb9dbfdef5be34205280d355b44a8f15760eeff06b16410d560b5d7
 DIST zynaddsubfx-3.0.5.tar.bz2 8141703 BLAKE2B 61f28a62d5ef8c17b5e38febb8ad1ecd40c80f87b26d90804131b97b57534adf5ad96a1f54980b75fd5e71185e2d5376a7df35696c7bcfd593b5d8e34bd2e386 SHA512 1e4d5a6393937e6c7103e6d0e97df76f2d129350854c2f338aa888591091b1508c63e9b52c8e5a176e282ff2f6b72c6a87de54875c412771aff26e8ece2c84e8
 EBUILD zynaddsubfx-3.0.3-r1.ebuild 1918 BLAKE2B 501fa7c5c93f9cf71722e1a3db38857ecdb90a58552c5d4218c641b4ebf8708100d73eb9fcacd87a9c39e645c667ffb6b51af4b36637fdc57b92f6b28efdaa5c SHA512 b42788152ab56c7df2ea4ecddfcecf486bc5ad5166656b1657ffceb8ead452a41c12488b169c1d6e12785608d9510ea27021c80fe6cc7c429bbce490968a7e9d
-EBUILD zynaddsubfx-3.0.5.ebuild 2030 BLAKE2B d6b862b358ae22aa983de0aaa35e066b46b44939745c1efc0053452235bfdfdfe563b9473c3350ae820756157e9f49c601c2b537ab070efe2fa3a0c1a7368334 SHA512 8d94bc1b24d85a3df288110238b1464a6880bf56713835854cf6eaffe94a4153bd0ae1080679c8a4b0740b2f035f6d4df9781379cac1a7023d7813cc006c8db5
+EBUILD zynaddsubfx-3.0.5.ebuild 2029 BLAKE2B 4d2683782c8df03c57384934cf30e1445301a601bcb7e24d51d8c58a01e45a59fa49c236e7b633e81aa76673e6156b81e672aa5b94c39dfcfbbc4136343b322c SHA512 04ffdb4f907618c1e23f159cb8f1754f21642116bf9c9c70398f76fe6a5201b393ff75a56b6bd99dae6d388150789f6b1886773e419cedbc7c7340a6b59f87a8
 MISC metadata.xml 427 BLAKE2B 80fb772abd373ede6be0c3b99fd252f059ebbc6efa5ab1dffee1c0a517289cb199a7ca58c7db4942565dd96c2749fbecf0a9e82382a2387e5c785ced868b4312 SHA512 dc8afdd20a8f6e7d052dc69f4a17698b481db997ef36e199fce32e8ed586a0a0c6d9c881fc378bcd20e57ffe0f4ec1389680ee9ed0fa04ad8b13aa082112e490
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
index e2fb4d3256b9..e3cbf1ed9217 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="alsa doc dssi +fltk jack lash portaudio"
 
 REQUIRED_USE="|| ( alsa jack portaudio )"
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-08 09:04:53 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-08 09:04:53 +0100
commit	73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch)
tree	2878053f3e7faed19a1f82c733d3bd29df69991e /media-sound
parent	2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff)