gentoo resync : 18.05.2019

62 files changed, 537 insertions, 518 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 56c657000827..786f1ab4d6c0 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/aacplusenc/Manifest b/media-sound/aacplusenc/Manifest
deleted file mode 100644
index 9fd6ba4d61e2..000000000000
--- a/media-sound/aacplusenc/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX aacplusenc-0.17.5-asneeded.patch 547 BLAKE2B ba572d033dbae0b43fad115b6761d798a7cd3579412c9db98ce2709d69dbc1b9a9169ccd9248d8fbcb4c681ab6162d231838954f59e4aec57096862b6262b78c SHA512 c12af07b88c012ad9d0f2c162a3b9fef74ebea3985253831b369db20a637c317ce3592b0f2a521ba8923332d3a019cc04586241bb1a03cbc9e551fc2ac395633
-AUX aacplusenc-0.17.5-libm.patch 468 BLAKE2B 7279930e55f8927497a8433f3423d821454d8a14d9ed94d5e9cfa377a9623290988a49a594e3dd3c6ac3fc6051bc0d6dde6b129759bc96791a6a7f70164a27d6 SHA512 b0e0093c6dbee03b7e9ec1100713d8329b558010b473fb1e036196f9acedd738a41e7247ee671042f319df05823e80b4e99b33e052b092eadab154259dffc4db
-DIST aacplusenc_0.17.5.tar.gz 547953 BLAKE2B d6ccf3c3a95133487c8ec450f5a06df7e2098d20c7edb5f3b1bbb6cc2da79690d78f37f0da6c4fff44e109fa685d870835e5fc4b3ff633666fda94ffbad1f611 SHA512 75dadadfcddc551217ad71f021d6f4a190271428dc32603ec64429024ad7747884f5080f0cbb43a79895db527e9802cf3693b0dbf90f8b4b7023ea7e9bb43873
-EBUILD aacplusenc-0.17.5.ebuild 1081 BLAKE2B 271aa107163bb64010e8df303e3ab7486a71f9d0ecc6ebd49ff8c1d04a43ba7d116657605b9258ea4e6bd54581d9c1f83e26242b49c15d381c392394a694a780 SHA512 4e11282d3df995e476ac29f78d60710e429b9197c458e9ca9f0ab9fafae506eb84319ebf1c36afc9b53f8332b905fa93a68f6d5b0f852dd2c479212260b2eb81
-MISC metadata.xml 332 BLAKE2B 6517f0dd66393ea793008d522a0fa42666f8813ce2e68b07ed42d6e511cc6f8cb51ecb76dfc1e0c27cd605015d9e8ab8f65cbb993e101bfff938e219fc3db626 SHA512 7a53a8170246254eb1415336165c578504c45e8e26469870b87271fccc4db0c0a887e24830dfcae05898cac688c67bc30cbcaa0f4bae5febf79eb1aace5c20a4
diff --git a/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild b/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild
deleted file mode 100644
index 122f74131ecb..000000000000
--- a/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="High-Efficiency AAC (AAC+) Encoder"
-HOMEPAGE="http://teknoraver.net/software/mp4tools/"
-SRC_URI="https://launchpad.net/~teknoraver/+archive/ubuntu/ppa/+files/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sci-libs/fftw:3.0"
-DEPEND="${RDEPEND}
-	sys-apps/sed"
-
-# 3GPP patenting issues
-RESTRICT="mirror test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-asneeded.patch"
-	"${FILESDIR}/${P}-libm.patch"
-)
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	default
-	sed \
-		-e 's:LDFLAGS:LIBRARIES:g' \
-		-e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' \
-		-e 's:ar r:$(AR) r:g' \
-		-e 's:strip:true:' \
-		-e 's:-O3 -ftree-vectorize::' \
-		-i configure Makefile lib*/Makefile || die "sed failed"
-}
-
-src_configure() {
-	tc-export AR CC
-	./configure || die "./configure failed"
-}
-
-src_compile() {
-	emake EXTRACFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake INSTDIR="${D}/usr" install
-	doman ${PN}.1
-	dodoc debian/changelog
-}
diff --git a/media-sound/aacplusenc/files/aacplusenc-0.17.5-asneeded.patch b/media-sound/aacplusenc/files/aacplusenc-0.17.5-asneeded.patch
deleted file mode 100644
index 53b7d7c62f88..000000000000
--- a/media-sound/aacplusenc/files/aacplusenc-0.17.5-asneeded.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- aacplusenc/configure.orig
-+++ aacplusenc/configure
-@@ -8,7 +8,7 @@
- 
- echo -n 'Checking for libfftw3f...'
- 
--gcc -o test-fft -Wall -x c -lfftw3f -I/usr/local/include -L/usr/local/lib - <<'EOF'
-+${CC} ${LDFLAGS} ${CFLAGS} -o test-fft -Wall -x c -lfftw3f -I/usr/local/include -L/usr/local/lib - <<'EOF'
- #include <fftw3.h>
- 
- #define N 128
-@@ -38,7 +38,7 @@
- 
- echo -n 'Detecting endianness...'
- 
--gcc -o test-endian -Wall -x c - <<'EOF'
-+${CC} ${LDFLAGS} ${CFLAGS} -o test-endian -Wall -x c - <<'EOF'
- #include <stdint.h>
- #include <stdio.h>
- 
diff --git a/media-sound/aacplusenc/files/aacplusenc-0.17.5-libm.patch b/media-sound/aacplusenc/files/aacplusenc-0.17.5-libm.patch
deleted file mode 100644
index 37a3f904fea3..000000000000
--- a/media-sound/aacplusenc/files/aacplusenc-0.17.5-libm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- aacplusenc/Makefile.orig
-+++ aacplusenc/Makefile
-@@ -5,9 +5,8 @@
- LIBS=libaacenc/libaacenc.a libbitbuf/libbitbuf.a libfr/libfr.a libsbrenc/libsbrenc.a libresamp/libresamp.a
- TARGET=aacplusenc
- 
--LDFLAGS=-lm
- LDFLAGS+=-L$(TOPDIR)/libaacenc -L$(TOPDIR)/libbitbuf -L$(TOPDIR)/libfr -L$(TOPDIR)/libsbrenc -L$(TOPDIR)/libresamp
--LDFLAGS+=-laacenc -lbitbuf -lfr -lsbrenc -lresamp
-+LDFLAGS+=-laacenc -lbitbuf -lfr -lsbrenc -lresamp -lm
- 
- ifdef FFTW3
- 	LDFLAGS+=-lfftw3f
diff --git a/media-sound/aacplusenc/metadata.xml b/media-sound/aacplusenc/metadata.xml
deleted file mode 100644
index 9c160a7a0b31..000000000000
--- a/media-sound/aacplusenc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">~teknoraver</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 83ea2660443a..cd97f8422205 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,6 +1,8 @@
 AUX abcmidi-2016.05.05-docs.patch 614 BLAKE2B f9071f832d49d8dcb679843c5724c3a554df5f8f1ac6b545be637c2db6a37096b26c5b80f0b366d4e66f33230431de3b50b1198e2b9fe939e5231321ee1aeb27 SHA512 c06436cab7dbc4eb4bf8595e561402428bd1d45be653fa652841c3378e4b78f246ae5c862addf7bffbcb21d994f11151d464837f20915e91eef31d4f66618213
 DIST abcMIDI-2018.06.23.zip 564262 BLAKE2B 0c99e5bb0787f4a41381ec77b1a64da273955997f0788eded8149297e332d05224e02eca2eb5a1b846b3314d7a62dad7eb3997ac2ed4c4aa4b13d0f099f08afb SHA512 d1f95fae383432d4ecb09fd7136212d42bb0a7b08fc7372b2511ecfbeff9fa0b51cd242f46f20827cf4122bc04e35c8a8442af4666b0e7093e6ad91302bb40ba
 DIST abcMIDI-2018.12.21.zip 558423 BLAKE2B e40e8d01744d623042445642b21aa6654d5ba087bfb426b62e9ff44ea39d20f6b3b8f1d94d406362e63ab173a3ff721c737fd945b2195e42468d458aa3d8a176 SHA512 5f338852f3c65dcdfac760c1ab50d05654930f4b02701ffe44b0f8f830e39108ede63b7b47eb751790c6c2730af74dbd1e9b3ec361c5242ecef81376259399c7
+DIST abcMIDI-2019.05.08.zip 562151 BLAKE2B 7b7413b329a69c9f8e7cf8eec9ddb2caceb055d2256d01a2e6045008b861b8aac194bb0b2507fb96a21ddcfe228a789be63c1ad322945a7b824ff39908cefcf4 SHA512 3891e10503f319b406b175d18077c353767b1025bae73fed184988427602412ffd5bb8e1ec0513b9ebff4d0debd81535558a8157b150a4e32abad099279d4312
 EBUILD abcmidi-2018.06.23.ebuild 796 BLAKE2B 649655d717cfbbd2e125112d7aba8d56bdd7fa87b699ac4e3542dbfd4d8b83b98785001489ea94f429e98edd476a315c71f2e29826cb6401786893a1b348f191 SHA512 36f77259e3cc1a6a8080999c747fc1f4932501b70039c7e7ae48b8a37e31b9f91f47d4a744f9cebfc97ca8a0a0b8107de369dc18e9950fb2d24fc24558288854
 EBUILD abcmidi-2018.12.21.ebuild 793 BLAKE2B 628537bd1682fc94b7a8f461e20d92cad70099ab9ad0b0882287cd05b62fa6e5cd9f106c9a0db4f78da0386aab9135cc7cb72a4c9b4db5655d4f8289cee6ede5 SHA512 45624d69fe30bdbedb220b551e34626409702677b5b6a139af66bd1616f484918745c1e0fe6c3a51ecf6441985f116bc53b6fbd62d2204dd1c6b4460d685da98
+EBUILD abcmidi-2019.05.08.ebuild 793 BLAKE2B 64792e08a135c9faca22b5bd3d882670f2e980bf2fc38859ec6b115f21fd501c8f1a25eafa985db4619a3edc32a2c95c78f830b10064b3816c7282528048f097 SHA512 56201e49df5d0be70b6b1b1d62ce9a7203c44a82518b80d8a6ea153a3a79c5598497f7a1a186eaccea6ec1e31f6c237a154c77f5b8a49d0dbfc1cefbb8904924
 MISC metadata.xml 326 BLAKE2B eff21376d5e8fdf74ead04fc307726b50c8d86faaaebdbb8aa748c9fc0025ed9ccbdbf90f6bbafb515d576cd837f72f44991b329eb56f003cfbe3b0ee9cac7d5 SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a
diff --git a/media-sound/abcmidi/abcmidi-2019.05.08.ebuild b/media-sound/abcmidi/abcmidi-2019.05.08.ebuild
new file mode 100644
index 000000000000..ce075821d84d
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2019.05.08.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="abcMIDI-${PV}"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
+SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch )
+	default
+
+	rm configure Makefile || die
+	sed -i "s:-O2::" configure.ac || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
+
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
+}
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 94ad77bc919c..0ea1fbae3e0e 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -5,10 +5,10 @@ AUX alsasound.initd-r6 2189 BLAKE2B f0c4b5b51aae15f5d841b4e2ea8ce6a0631f92868a12
 AUX alsasound.initd-r7 2190 BLAKE2B af02158bfa5d74c174cb5efbb8dff4c0b51ff856d7b4afdc5c5f601e5e7055710474db63ac9c6dd4145a680e94f08f8beff138d43a1ad50e3f24d52ae6bd40b7 SHA512 725153b0843bae7a4fee5ed5b1d80e0839420f18314e6a759a00ba6895176823b1842fdbacfbcdce7aa755c44892090ba9e649580e7acd7df1677d8b387df115
 DIST alsa-utils-1.1.2.tar.bz2 1193140 BLAKE2B 8c9d3baae1530a399299379963e68c50d2d4fca63045b7c59b14240d5ad6316c37f1c7d6f4a7fa2cfeb8e5ae561440b9ad689475e006ab1fcaea2065b7c33015 SHA512 38dc3331e8410123085738e74ca34c860666027ee2f6aaa21f48e726c84d8e6264043c8c7111ce2b1e158a0f38142a04d72a128ee54e00173dc4e4ba514d2f14
 DIST alsa-utils-1.1.6.tar.bz2 1203722 BLAKE2B e098ecbc5835c8ecd311a4df1ab51a709200b0d3666437f7f059d3842f07e1200a934b951e8e2c8ecedbe0aef4e2c766d875df577662eb21ce989807941ab6b7 SHA512 24d0ffaeeccecb3276d7d35ef51e6de6026a63fa5a1a1e4605b024f54d8097717e97ec9d33cfe50830ad17e4a89268ca24b065039b0df7f9fbe02b570617aa58
-DIST alsa-utils-1.1.7.tar.bz2 1205754 BLAKE2B 419fa61fe85750ed26ab2b1dfe87adc7898f8c95dfe082993c0d5ee7755c4cb6563000555f44267608a2138d033e7011e7c67d98b714fdf1884cc03a8fd50ed3 SHA512 5da9b03e219d67634307bd5bb06b76734db5286221bec11658ce9c4dfca8ed639a4155ed90450f1d6c8db322960bb023ced0873e276500ce24f14fab17ceeb65
 DIST alsa-utils-1.1.8.tar.bz2 1262174 BLAKE2B 643017f8f31d88356a2a55b5b1249d5b705daa7bd38e6d5e8835a21a9aefeca2fb1a7444c5709516ace0eecdfd5b410b5b24008abebb7ca917763108637bbcca SHA512 f877b491840126420dd9847347d0af865b6d03eccac2e2c3853cdbc76e91899f5a5139753cc41a4db942e7999c8d53cf9bd57d2fd5e1d32c872871b2d25146d9
+DIST alsa-utils-1.1.9.tar.bz2 1268833 BLAKE2B 56fe00bd7dce21969f9f91d1d82a6644da338208bfa646fc2a46d38f2d1d937b55b90acc5f75bb630aa288dee458c9f555a5727990c5cd7a59b627cb1ecf1e2c SHA512 92fa689ea5897150972d5376e7999ff060cad09cb0b06991d81c87b61a243ecec944e2a4c7ad38878596cd8b4246e44c5a3a35e5bc6452c02ebf35c9bed91970
 EBUILD alsa-utils-1.1.2.ebuild 2199 BLAKE2B 110899e375e20f25067db6dcc21b3302ac119dc9656c88946f0fa304084571f61ab6335536336d874dedad465dfcb0b4b1c39e3a7b0b502082dbb90ca5a32abf SHA512 e0253fbba1c48e7318d5b9ab5bceebccd303ac09e6e2687a3947788e90491a7c88952209128ece17ffeb6255330118d3a43e245513e4c1dca9254bbeed72394f
 EBUILD alsa-utils-1.1.6.ebuild 2249 BLAKE2B 9e754eb263685924e5897018242cea86a4a4b9d3fbc5aad66aa17e6df23d01d99854058e624139db257384d9cbd5c4d2722cf26dda8c0f89daffc4894e58c192 SHA512 14caac4da6c061bdf718e93465ffe09963aad438e7b83c5d82ce8b743620774d3e38aa0a8c91d9e949b35371a55d99fc6d10d0e52f209e3435b1d6d84f537dad
-EBUILD alsa-utils-1.1.7.ebuild 2266 BLAKE2B 55f1b932f6812fb453d7f5fd2cf432b046297bd90a998c85fa338e0ece9b45f06ce7083988f48876ab481851a5e5e5de94a7291cd602f935b3c89ff3122f0c87 SHA512 6ff5c859af866ce59d46952fc25d1f4f5402ed1aa458ec2798a51647c9cc1a5424f0f3c3a1b0b4327f501f239f8bd25eae9880f7d414a2774581b720a1a207f2
 EBUILD alsa-utils-1.1.8.ebuild 2324 BLAKE2B f060b776cbdfcc0abbc3db65ae9f248a7abea99e0fee67dc52c9459449318f713831063367ccd19554096ebebad692de238ac9639ae42bdadeb40bff138ac85e SHA512 aa64ad1cdaa7a7a8d252b6dd7d43dc0102b9512349c7fa64114aa551b526e0db4e6dd1d7ca1ef19a22a6a77631c2d2c254e0139bc6bc3e4640c5406b6a87f1c0
+EBUILD alsa-utils-1.1.9.ebuild 2327 BLAKE2B a6dbd0cedb1f3c9be217caa581f6e3219590f0ec9928d86bb6dadaecc5994c0bb6d805f45b91f5df44c116a9058da1cf560c296114d6975220ee9b2c77962bc5 SHA512 b1b97a5e3ebbafe230187da5bb8563fd680da4e414c0fb5797904fd9e594491496a8500f95e886573fe91e93b551f20d95cf330f48d0898674dec8597f61016b
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.7.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild
index 80b674c26780..bcc1f868e6d6 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.7.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.9.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
@@ -23,6 +23,10 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-alsa )"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
+)
+
 src_configure() {
 	local myeconfargs=(
 		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index cacd57b86c79..30fdb115d37b 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-music-3.26.2.tar.xz 1563244 BLAKE2B 5a5d27b34470a49a752cb67a1040e227595fd15c6ca4f7656818636d614dfef8ec082dc014ea05c271f512f7c362dc2f81a38359ef04e0663467f62ff3ac2423 SHA512 e8efe31003a54b6cfea151c5402c4d06e48928be7b79332f7f9fb8a567ff7d0d42a43e943398ad6cb7e391d0162322c7fde74922a4b16e52ec24691cc1bfc5b0
 DIST gnome-music-3.30.2.tar.xz 3027580 BLAKE2B 9cd5a10fecbf7fb962455bec7ee5392a305f3bab9ebb3e2f0d24066ffd6975377c57a722e850ee340e2990f61b06456f1fe963b80d57030416af7ea3b7f92b32 SHA512 b9fa33ccb76d747e22e1144b2c77dc88432386fdfd4f52720cb1ae3230c06fb899fec654dc1e126103e393eb0358a4385099743abe26505b9b7dcffe2d04a8c8
 EBUILD gnome-music-3.26.2.ebuild 1624 BLAKE2B d6db41f12fa7722e78ba7e1f16071c7afb16df1d29c7b2cf5e859a86ed74e7b5b09570db32fcabe49fac782fca1099982fd6a63b29086ee32b001d3e20924074 SHA512 66619a886cf9e5b544d967a0c708abe3a4ab7ba7429f70cb151b298679bb6001e27b6f9be214ba6542643704a3184d3531d90032455c7b2a8a33f0502bcd004c
-EBUILD gnome-music-3.30.2.ebuild 1932 BLAKE2B 9fad7b0fd067fc454cd8b095fffae6e4f7654a61188ca645c7ba51ee9d8f21a410468dbc6041b0f60698f712692e1d63dc623495bec3f2e3a3729faaad20f76d SHA512 1cf767c757b120d9258bb4893a519bbbf196bff764c5965db81a30a40617ed19c844286888ed2b1bca086c00a4a7b764a79d8702e6daa2d7ff909a6394aa94ef
+EBUILD gnome-music-3.30.2.ebuild 1930 BLAKE2B 13988a73d9e75e80595c41881a7a0fa339786fa0cc14d76da1bcb084db6be7f70a580712a482aee543967f2b70576f067ba6cf28e5d3f9e64acb156162de1a3c SHA512 656e1a91687791a5ff1254285733e6b5ff6538c10b8eb3b3148781db3c0f4c2919591db2896260d502f1cf9cb397708761c903111426582e7e8c64300fb6d8cb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.30.2.ebuild b/media-sound/gnome-music/gnome-music-3.30.2.ebuild
index 16c1ca157fcf..a47833a7bf95 100644
--- a/media-sound/gnome-music/gnome-music-3.30.2.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.30.2.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # At 3.30.2 libdazzle only used from .ui file, thus introspection not needed
 COMMON_DEPEND="${PYTHON_DEPS}
diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index 7f52ed972933..ddd19ac1b6b5 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-sound-recorder-3.24.0.1.tar.xz 452240 BLAKE2B 37b2b81255af5aff4de08e92bf7db216b229885b1aeee87d91a1210412634b62641758c6132290b75494f780d304d78dee4c3d5d7e08de46736750c2730b20d0 SHA512 00e190e8d6a1a3961122485742705da4d85ef926453ff8098718566771600690562597f012f7cd9dc61b5910b4e75cc7518e86a092f052c3fc40a96310ab3c3f
 DIST gnome-sound-recorder-3.28.2.tar.xz 454216 BLAKE2B 9f9a5a7c0a5a34c2a5ba00ed6d83736a0facb2dd7ffbe86b9c482e7bc50b282f9e20a8800591238e74a45c3c8eb2adf27c66dea59d0551d87c8997b2ef53d24c SHA512 1f4022d96d636391d4973bdc1285286a61a28107b9f875e66b4b2def767b4f2900ba2fe4b92166b1cdb61dc0b5afe65c0f81ffa7304aa38c1f510108dcd8b70f
 EBUILD gnome-sound-recorder-3.24.0.1.ebuild 1083 BLAKE2B d9df40ebe569a1c0f3edfb91c57ff26b8d6345f56c9d5122c42abeda635df851f679009e21cce1dced73deb7ed7f529df036bc1aa5e2a5a4143200cface68a3e SHA512 499c05e1955bad18123c5a3f994da3034b7df4d0d6816718f39ca43df1da1cde7dc8212ca84193474a832c5d9976b996ab6394009a52420f1a0d96a88c7b2691
-EBUILD gnome-sound-recorder-3.28.2.ebuild 1082 BLAKE2B f549983172742bbd2d8c47754410fbad4bc68e663f06f846d8c0467d3bac5cd658a9855cc3613743febc3f3731bb4d235c3ffa381c743751568de6a02f6a6e7f SHA512 e3c2a4267d968815e21ff5b75ce48fb78a7bb0ade398e7f34bb6bdf1dd383d3f3187024025e14843862caef7ae685d74cd310c3fe76d25f02693cbad410d941d
+EBUILD gnome-sound-recorder-3.28.2.ebuild 1080 BLAKE2B 1a0f4da7e721c2d71a04d9058d479567e4387cd973c0b9bc94987831997a1b5dec408afb563b7aa01cb31f821c7222dce482ab3df4caa7e84035f2005cb95d23 SHA512 b9d90776b7a38e7f6944097a2cda69124da6c82d3eb2a0c0aa537c7360987d5d0314c922f4477affa8549209200c5659154873d391a3733184aa1a255b2172a7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.28.2.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.28.2.ebuild
index 3a1a0f652494..285fecc6e10e 100644
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.28.2.ebuild
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.28.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest
index a2235abd9c9e..f393cffb0c8b 100644
--- a/media-sound/gsm/Manifest
+++ b/media-sound/gsm/Manifest
@@ -2,5 +2,5 @@ AUX gsm-1.0.12-64bit.patch 591 BLAKE2B f72688a27c9e52bd3e0b40018f2e035da4284c40e
 AUX gsm-1.0.12-memcpy.patch 301 BLAKE2B 887d9dd0c9220284f1ef69bad73e5e311994fb020bc06742cd931fead416937ae25d0e3364432be5c4cc408c57fad80bb524fddf7db75bf53e70158da4a8f089 SHA512 922999a35a5d8f646ebe61d7b7aacadbd75848a5446462a8173e040f7d4b0748c55196c1be0653752f076a01d7eb07e5bfce3fe23b81a38f1ee9f97d61cd6200
 AUX gsm-1.0.13-shared.patch 3723 BLAKE2B 4bd926e470d7c120560fe2378dd87496e47760efe293db5e9b1b61cf5075cb737425ca1e7c6b7a92068c95416603b3a5c46741e04f30a477c8d39b0b0c33e63f SHA512 0872ddb6c93ab6f7082f4a999a39439ceaa8337bf72c0a690ebbf1561a605d2664ceec14eba81a36ab244c3cfe3f3edafe3ee76869a68aeffe6fcc3f12026957
 DIST gsm-1.0.13.tar.gz 65318 BLAKE2B 22bb79e3afd9a2e99041693288342b55969207223486200d4aebc61908930040b6b766a9bf673ec6b484eeb95833684c79f34c95d32da17cfb4c36d025004858 SHA512 0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa
-EBUILD gsm-1.0.13-r1.ebuild 1528 BLAKE2B a72475ebfc63d3b44e1043424d589425495901cab5c5032a1b290199ea1c51c45486ae1100d97729a0424a4a92e5f8bae201a1bd2e6c932f93f692ec550936fe SHA512 4190283c89dda514b5bd36f96d58a87d91aabdfe659797f28884384a856373d2c5c6ac60badef73480226ebd16f3e1a56f4809e7b6b9ec1e76d86d61f6a31722
+EBUILD gsm-1.0.13-r1.ebuild 1524 BLAKE2B ac250cfdf262d5ead139784fddcd404d7738450fe1fc69e90d86bd67ee5cc6c61be6286bc5c559c42c393028ed15d58b9cc0cb37578b857f207e6ca3b6ab6fad SHA512 65c2e3c601d9ad63a769eb23086321070776d732c9ec8013a0ac23252af77efd3aeeac0f866b9ca30301dab52d5aeff7293bfbb481a709e29a91e8759909aa34
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gsm/gsm-1.0.13-r1.ebuild b/media-sound/gsm/gsm-1.0.13-r1.ebuild
index ef87e2afa1a6..354c2a094ba0 100644
--- a/media-sound/gsm/gsm-1.0.13-r1.ebuild
+++ b/media-sound/gsm/gsm-1.0.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="gsm"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}/${PN}-"$(replace_version_separator 2 '-pl' )"
diff --git a/media-sound/id3ed/Manifest b/media-sound/id3ed/Manifest
index 70c5546e0fa2..4d20147275f2 100644
--- a/media-sound/id3ed/Manifest
+++ b/media-sound/id3ed/Manifest
@@ -1,4 +1,3 @@
 DIST id3ed-1.10.4.tar.gz 31610 BLAKE2B 4bb013fe8205a91fe9b25012390707c25b1879ef34322ce85430dcd4fcfc4545e2d2637c113d4779a054815d90951052db4ec4c4b16f0ab7658ad5bbc70a6d4c SHA512 c96716dd24e8fc0aafbb5f0befe1a401ff7ed13821c71470945a5251a553316d17d5eeca3df5d3bd9775d12386078ab2b88d47a7ab9e9f32cd3d209934e31d56
-EBUILD id3ed-1.10.4-r1.ebuild 728 BLAKE2B f0aa26f40a9029e676a08f2eca9a336aaec2594bb8a35435fb1e822fef2259293d5668829753aacc82ea5c21467a3d6f043577636dbf4e759e818c9011166ca4 SHA512 320ccc148afb7ee99991bd6b7f12d9d44280ec18bf370b10874b898789a82d67812ea4b3dd0cfea2b64f832d14dc7d1bbb8698c1d64afb49065922e1853b37ab
-EBUILD id3ed-1.10.4.ebuild 741 BLAKE2B d828a7818eea749d5129d2508f49c2f5302335de215ad833edc46ff3ff72dcb9a3adfc24b9b80d9bf44044192d7059911e5ea09f895ff2dc1dce6a302f0b13fb SHA512 b7631fb269284409b77d9c315893bc66795ee99264f0d0ae44d2d452c548b2d461712d46e803cf14d8521ca2e11c8bcfeddcea1b6b4175bca2ed9e1f9057b844
+EBUILD id3ed-1.10.4-r1.ebuild 727 BLAKE2B e58dab0a56c7798234a2095b0599a3382f1657d097d868730bc5c8227c0d71e39e6fb162bff8fe7ab744f33bc13e03de026caaf536539a419d32aedc627adc20 SHA512 ad52b51f4850c4b54355ac99bd7162e01ce5595d8b7943257bc5d0a592676fb8126613d15600a0197336fb1a8b7399b607faf833d3941652f24d1bce29b613c5
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/id3ed/id3ed-1.10.4-r1.ebuild b/media-sound/id3ed/id3ed-1.10.4-r1.ebuild
index 0cfd2a879da8..45fd013ab93d 100644
--- a/media-sound/id3ed/id3ed-1.10.4-r1.ebuild
+++ b/media-sound/id3ed/id3ed-1.10.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://code.fluffytapeworm.com/projects/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 
 DEPEND="sys-libs/ncurses:0=
 	sys-libs/readline:0="
diff --git a/media-sound/id3ed/id3ed-1.10.4.ebuild b/media-sound/id3ed/id3ed-1.10.4.ebuild
deleted file mode 100644
index dc9d2c770c56..000000000000
--- a/media-sound/id3ed/id3ed-1.10.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit toolchain-funcs
-
-DESCRIPTION="ID3 tag editor for mp3 files"
-HOMEPAGE="http://code.fluffytapeworm.com/projects/id3ed"
-SRC_URI="http://code.fluffytapeworm.com/projects/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-
-DEPEND="sys-libs/ncurses
-	sys-libs/readline"
-
-src_prepare() {
-	sed -i \
-		-e '/install/s:-s::' \
-		-e 's:$(CXX) $(CXXFLAGS):$(CXX) $(LDFLAGS) $(CXXFLAGS):' \
-		Makefile.in || die
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)" CFLAGS="${CFLAGS} -I./" || die
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/man/man1
-	emake DESTDIR="${D}" install || die
-	dodoc README || die
-}
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index eeca1eb69ab3..8399acda2402 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -1,4 +1,4 @@
 AUX jack-audio-connection-kit-0.125.0-freebsd.patch 533 BLAKE2B 1e99c1a0f722a2aa94ea5862026b3493a89beb7cb76b444f269c56c47f98d297f15842cf468e81a28014664eb09007e4adb93a4636e955cd690ccc8ac28b140c SHA512 23ff3f34b7891d0725b32faf515a138fd1220199bba6aceebc232a9647be99658f922c6d4a42f1c3b6f98bb9619cf470e2ec213fe906a9189b43163d21f47316
 DIST jack-audio-connection-kit-0.125.0.tar.gz 1217977 BLAKE2B 4037b76a5a6814f30adb4145282e2295bd7b2502934ec7b3cc41ed9bc1a1319855a60d739d72641c0e18a3ee1d8bcb829a637fabf7df7a4525271bff8933f09c SHA512 acdac0588c8a6b79763177677885b6e7bfa8ee3cd9556b33bfe09512bc1191414bb4f97eed62c3c71567b13b4eb69d95ec6b438e5a9d2e22a956c073d500c46f
-EBUILD jack-audio-connection-kit-0.125.0.ebuild 2072 BLAKE2B 79635f9caf09e9039d6255b2ccc1d51bc5953c2c59ddda23f554faf4868fad4f5b55c09d84b5b16bd58552e69b0ca5c5ff589bbb548e12bf4a9403c123625940 SHA512 8bbfe83f51639da5838e41aa29ced5302137950d4a5ea96fbf803def178257a8bd71f0f50cd3569f6f3ae8c0e341044daaddf04a54915f256b351a1bed9cb34c
+EBUILD jack-audio-connection-kit-0.125.0.ebuild 2068 BLAKE2B 6e8848a8e5c13564277a30f19892f9f3d5091eca3c6ad6f2e5514a843cbb9fa542715d5266112fcff942dcb55ff8396a6e2ae7b0f4986e18c0b1d83c728524b1 SHA512 48ddb4368b3b954e11a2900352f0d3f4dcf251fa619113c21be65e0bde3e01f649c64ac8f063511435fd4203b6de401e2a9a5c37f0349b99da3ae4e3a00cd486
 MISC metadata.xml 450 BLAKE2B 660a876764f17ce9963bbef4d0092acf7649513ea591c47eaf988ba23f0fea8a1cb2dd1bc3087a4c5175cee4e447725d3b90d22552c0a51ee5c423a88ada30d3 SHA512 13e6a976f07d7d3535ec19b5f7716d21203d08455c2b835f776ff3517749f7f3b3ec97725d6b9cc2375fcd8e51b95a46d1e8f7e17a1acbf2a71c4416c04fd7b0
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
index 8dcbeddc5265..ca29625d9585 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam"
 
 # readline: only used for jack_transport -> useless for non native ABIs
diff --git a/media-sound/jtagger/Manifest b/media-sound/jtagger/Manifest
deleted file mode 100644
index fd9879668cb5..000000000000
--- a/media-sound/jtagger/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jtagger-1.0.zip 458575 BLAKE2B c2d1b7f698820cc7c25b905ddb96fb91038c7630e50e3805cb03d3b60eb3759d61eb0e413ee4b6bf0262c1e4e6eea2d174ab775e303a6aa358832ae975d97cb7 SHA512 abd6a6b2025b292520c302ca82d3e26ebf1243421749bf62406880d5566390c3dda8ec878b21dce1c5bf697c409a0b213b5243d32a5d040fe7f4d83f03a9ebcd
-EBUILD jtagger-1.0-r1.ebuild 1468 BLAKE2B 55dea112e9d2a513a62c94dd0cea174b7c429a80aadfb47ae6dfc4b6c4f2c4c9b7e08860b0700b8d3346bb4c7227f6f0c142445c8fe0063a5ab649914d47bfd0 SHA512 18573ecce782b5a8052146bfb1fd9b26eeb3c48a89db427bdbd37cc8998ed6c4e9d50db7a5b766ee1a2decd6b271673d2312eeb0ddcf5d912d34889e42bcc37b
-MISC metadata.xml 562 BLAKE2B e3d3b173b3aef472391bdf5234dce009f8f7948dc996c32b8f7a50e962af7595be97f869960d08b909c65c6298ecad1cab0f8387baea1b2bede9a7415240cf65 SHA512 fdec62b1f5798efb3d644d57d3d785ec97f3fba1ac54a4e9633f7b751bf3b33b80fb133ab19d63dc799907c1cc9b585c20a3fc0b8d289908999b6a8fbc18cd03
diff --git a/media-sound/jtagger/jtagger-1.0-r1.ebuild b/media-sound/jtagger/jtagger-1.0-r1.ebuild
deleted file mode 100644
index 9f5583040cad..000000000000
--- a/media-sound/jtagger/jtagger-1.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source test"
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Powerful MP3 tag and filename editor"
-HOMEPAGE="http://dronten.googlepages.com/jtagger"
-SRC_URI="http://dronten.googlepages.com/${PN}.zip -> ${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-COMMON_DEP="dev-java/jlayer:0
-	>=dev-java/jid3-0.46-r1:0"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	app-arch/unzip:0"
-
-S="${WORKDIR}"
-
-java_prepare() {
-	unzip -q ${PN}.jar || die
-
-	# Fix for bug #231571 comment #2. This removes real @Override annotations but safer.
-	sed -i -e "s/@Override//g" $(find . -name "*.java") || die "failed fixing for Java 5."
-
-	rm -vr ${PN}.jar javazoom  org META-INF || die
-	find . -name '*.class' -delete || die
-}
-
-src_compile() {
-	local classpath="$(java-pkg_getjars jid3,jlayer)"
-
-	find . -name '*.java' > sources.list
-	ejavac -encoding latin1 -cp "${classpath}" @sources.list
-
-	find . -name '*.class' -o -name '*.png' > classes.list
-	touch myManifest
-	jar cmf myManifest ${PN}.jar @classes.list || die "jar failed"
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	java-pkg_dolauncher jtagger --main com.googlepages.dronten.jtagger.JTagger
-
-	use source && java-pkg_dosrc com
-
-	newicon com/googlepages/dronten/jtagger/resource/jTagger.icon.png ${PN}.png
-	make_desktop_entry jtagger "jTagger MP3 tag editor"
-}
diff --git a/media-sound/jtagger/metadata.xml b/media-sound/jtagger/metadata.xml
deleted file mode 100644
index e5f1fb3bb547..000000000000
--- a/media-sound/jtagger/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription lang="en">
-		jTagger is an powerful MP3 tag and filename editor. It can update
-		tags and filenames in different batch editing modes. Basic MP3
-		playback is supported. jTagger can write tags with unicode characters
-		(optional). It is recommended that you dont use that with id3v1 tags.
-	</longdescription>
-</pkgmetadata>
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index 9e9044105baf..b0d22ce92fdf 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -3,5 +3,5 @@ AUX lame-3.98-gtk-path.patch 8523 BLAKE2B 9b5231402293a61f8366383a704056e60edbcb
 AUX lame-3.99.5-msse.patch 557 BLAKE2B 76b1201e0909ee408a9556ffeb3d41b4bd749407b17ab0dc98582c01b027d492ac6e2f09c8758a59a6bb2649fa1c7a55e96fccab0525b0dcb70b6ea44a034dc0 SHA512 9bf5a1b0f8955aeedff6effcab7f657961ad60ce00b5f455c05ce39ad5b03c2a809ba7225a3a33b61b84a36665fafac53e35b14e0d357289e66194a4f0ef9807
 AUX lame-3.99.5-tinfo.patch 768 BLAKE2B 3fbbd31b0b5752ee4c2dad573d053edcbfb80d24b68a876c2092cae37d3450ac6044ec14d26b180a46197093151d614be8400f33ff7b1f6968130412daacefa5 SHA512 504428e0a0b43c467848296c219ac855ffc9bd83fadb54107e8f6b99290b91bc36457635a092fc121972a3c89918f2d81b42f98f6d007f9b571c7bc3f9c2895e
 DIST lame-3.100.tar.gz 1524133 BLAKE2B 6954d30cfd3951ea07762ba5dd7ff27038b78455f423099a225ebf748abddf9970e444456ca5a6179bd381e2205b32293392cb757c203901674860710fe2c183 SHA512 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b
-EBUILD lame-3.100-r1.ebuild 2131 BLAKE2B 4fb2b1ca5d25ba25c7ecbab7be0daa8211cc5fa351900dc1bf78c014b8f0437b6074d112f3b639745946b48631aa6a2243f56c201be5034c9c7d4dc2242b58d2 SHA512 100a6a434b6fae6cc78d0b0853ec3abb8616666dbb615d519e8ee25f30e4aa615dd4cac2da22fd2717f67121a0e825ba333cc699d9d470f01824d20fc353129e
+EBUILD lame-3.100-r1.ebuild 2127 BLAKE2B ffb3fc3586ce7afea7fa25fbac1bb87b1756a2de64f1b2c6618d50fdb43bd8aaf3f6d149111fbb9e11e450f238fc838766f4cf07a67c1cbc7690533ded83bf3f SHA512 3e60dea3a3372b75ccad158a5a663fa7beaeed548c599df33e52c893eb38e30cd1628905d463c426e16748f80c9d08bd782f455facf0c08705619375fb32eef5
 MISC metadata.xml 542 BLAKE2B 726f3dfefda9c1905739448f1a3124e05ddc90e261d147da12a7839185ef3eeb440678d185510a6bdd4bb71ab987b7a24f52ed108f7c646ca6b651434f9fade1 SHA512 8fc2e2658ae34d146894786f1c66800eecf818e2bd9bb807c6b32a8e132340c1568e9f47220be3daaabce2ab6e1e1d5aa817157f2c0131ed01944abbab6593fb
diff --git a/media-sound/lame/lame-3.100-r1.ebuild b/media-sound/lame/lame-3.100-r1.ebuild
index 7b26d856a52c..7a8352297488 100644
--- a/media-sound/lame/lame-3.100-r1.ebuild
+++ b/media-sound/lame/lame-3.100-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
 
 # These deps are without MULTILIB_USEDEP and are correct since we only build
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index ad393ca93264..df514b5c5179 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -1,5 +1,5 @@
 AUX murmur.confd 172 BLAKE2B 1f25ce417f1b9f504ea59d4e5216774f8eb2b00450577a1d137f645fbbd69f0991b510c35bad81ac739c868ce128f4de0c6b4e4095edcd977d3822fac622524c SHA512 4a05e2a640abf3f7a74c63b47ab87774718ad4e86f985c5308a2ba3167d816abedd9c35b07b8572f7789309ba91fa37bc0c1938493cc8d78844ecdeed7bd4171
-AUX murmur.initd-r1 503 BLAKE2B fab0c9c97effb35098470664e381be19b85f9224bab21cfeb4a5f6b4d2a000839de48314436ec48c96cdb8554c22a5079b0329f4832ce27d576330567cf854c2 SHA512 e841a8bc275cea5fe7306566977a15388dfea1fc70ca681c9f222f762aa5a08e42c40240c34eeaff8af2ca427a2acb2a37cd553752eed5ac842ab1c80a74e66c
+AUX murmur.initd-r1 506 BLAKE2B fd483f5f1c43f1778a909c725abee43b7299251e70e3f4e365804e7da94f674035dbb953167f2143c2d00dfbb4e23d5ed3d378c8aa2acbafbae8e7cf93fab263 SHA512 e1178a42c10f4a62f9b937e977b9e13059cae501851a377aea221ae2bd2bf031a1574e1f29f6df1b0ee08406a6a88fae8fbffd8acd0546f9ff6b27189ef55653
 AUX murmur.logrotate 127 BLAKE2B eadd1ac994ff194a160ec609c4781d4b69c23eff405abc38fd9786f82cd2c1574759a5b11e7265bd5658e9f48fd0012746659facff7a8790ff6aed47a54ec04a SHA512 89f105c11da6da67d5e84faac2124840e0c447df492a80b71c277a2e3c9197d747bc31de0a26c80b79384838f1e0a20811fe1ffa66c74f3192eec1164f3f1911
 AUX murmurd-dbus.service 297 BLAKE2B 30ca5427de360cacab404cfff42d8e2355f14def67156039ceff85cbdf77a89cde03f6c096eba0b9d0cce52283f039ea222298e3aa9a8eead7fb8b638ee5aa8c SHA512 e81031efa7cc2736748d5a5fdd001e28cf81430cf25f9f83b9aa8b94714dc787842e76c17c00e3b7a26192d8b4932f1e14bfdde207ee89680f2a696d4f9990a6
 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
@@ -8,5 +8,5 @@ DIST mumble-1.3.0-rc1.tar.gz 8638701 BLAKE2B 6c97c528e8b598bb86a7318e99706770621
 DIST mumble-1.3.0_pre20190313.tar.xz 2904672 BLAKE2B 4f7b9b63b35c04ee646364cdccd8dd171ba63e41cdede79098ae68d551dd2aee7d2ee74711f92eb0da9998a199061d4438bebdaa1807f980cdfdfccf7e0460b6 SHA512 623103c846103e306ce9fb527130ecda8b65f8486819cc189fb21a4b313fbf987b29a63838c1eb29d0cbd71ae464b2acba4110fb500365115636c3d23827eec0
 EBUILD murmur-1.3.0_pre20190313.ebuild 3270 BLAKE2B 8356bcd481d999a52957462819ff502eab5690c049978967ca2a19c02d4fd82a697bb980d2b77002419b97fd8e577ccc7243c784317855b88b70c3e4dff911c2 SHA512 10c1708d5297ec1e94621d669990031d9e1e76ae9102dd7479c1915d84294ee35a772b1c2b00840f45a705f918f71edb625ab6b737d52317911f01315be81f00
 EBUILD murmur-1.3.0_rc1.ebuild 3361 BLAKE2B dde9b4c4867d3e5d6adc5fa3d631fd24073091bbef922df6cd3cbc4392eee61447f395ba12b7fb6f14683387c0967dba7415a034261a6a7221c7fae1152a6799 SHA512 e45eee4631d7a4c08ceff5b3e91601332dac18778495dae837d744a8af2d9bf8645653be14ded76dd30af18a4eed25d110e5253293f09db08a7f4add05302e15
-EBUILD murmur-9999.ebuild 3361 BLAKE2B dde9b4c4867d3e5d6adc5fa3d631fd24073091bbef922df6cd3cbc4392eee61447f395ba12b7fb6f14683387c0967dba7415a034261a6a7221c7fae1152a6799 SHA512 e45eee4631d7a4c08ceff5b3e91601332dac18778495dae837d744a8af2d9bf8645653be14ded76dd30af18a4eed25d110e5253293f09db08a7f4add05302e15
+EBUILD murmur-9999.ebuild 3228 BLAKE2B 40e5005a5712d410597999e0fade3fa93493c9dd4370a3862098a36f96036e2b6f383792ff7dd048ac029c92da5f6831f2e31960446602038d879d432b8a6842 SHA512 917b727fdae6f66654cd3b16e587def9be5f70234d7f9e46232b2bba912471225a4120f7cc5ec06a243932d722b719f961dd2562db862498a7bacd7d913e6234
 MISC metadata.xml 597 BLAKE2B 6eece3d62949bfb7c01c6249764ee6e47ca0273972ed0aa2bae704ed7acb9267e7cef706d2c3eeafb5becd4695d8665c975f67e577ef3ce4def50e78ba1ce273 SHA512 d7ffb25e7b3919cb27417debe5b2f84f2f2c330e1a238583f154bb44b697a3b3c3749794baf896807874633b0659076e93c2845a56e49acb24047958d29d2beb
diff --git a/media-sound/murmur/files/murmur.initd-r1 b/media-sound/murmur/files/murmur.initd-r1
index 43ffb3a0a648..fe49b32f1410 100644
--- a/media-sound/murmur/files/murmur.initd-r1
+++ b/media-sound/murmur/files/murmur.initd-r1
@@ -13,7 +13,7 @@ depend() {
 }
 
 start_pre() {
-	checkpath -d -o ${MURMUR_USER} ${pidfile%/*}
+	checkpath -q -d -o ${MURMUR_USER} ${pidfile%/*}
 }
 
 reload() {
diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild
index 4ee163ac142e..b7bdfc669100 100644
--- a/media-sound/murmur/murmur-9999.ebuild
+++ b/media-sound/murmur/murmur-9999.ebuild
@@ -124,12 +124,8 @@ src_install() {
 	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
 	newconfd "${FILESDIR}"/murmur.confd murmur
 
-	if use dbus; then
-		systemd_newunit "${FILESDIR}"/murmurd-dbus.service "${PN}".service
-		systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
-	else
-		systemd_newunit "${FILESDIR}"/murmurd-no-dbus.service "${PN}".service
-	fi
+	systemd_dounit scripts/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
 
 	keepdir /var/lib/murmur /var/log/murmur
 	fowners -R murmur /var/lib/murmur /var/log/murmur
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index aa6502d63d6c..8cd22eca7dcc 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,4 +1,6 @@
 AUX ncmpc-0.33-mandir.patch 884 BLAKE2B efe04cbaecc0c44511f9a4e9eb0bcc29da1ab53a72418cadfcf467ffe13490e243e05d268cddb7aea6150033df03bb01f2b49ecfee5854eaaa776f15d2e1259d SHA512 ca6afc19c2bf900abb770ed915ed8dd583bb0ad04d29291796f8b7bf083d6de1fecac2168aa0ca72413534ce74bf598132521c5b9c59c6aace51c20598935b23
 DIST ncmpc-0.33.tar.xz 226344 BLAKE2B d52fdcb17adda1d3d61645715029552804edbf8ed95d2f19e0a25ba11f66cf0e7921748aebceb63e8e32b8d31fbc2d387dfbed6bd5c6a735d5ffa4b17d9b4fa3 SHA512 47730003c9a8ad5b6e682de4b4d3c8882d3266659fcd73ea131d1bba3d6b4d9ac66bb1a3522d63cb238ca9e22d8035907b9d7621a0b5106763770b17325f53b9
+DIST ncmpc-0.34.tar.xz 227892 BLAKE2B 19d9d9abe3d85cb2567a222c8ce108889d4517272e2bb82f4064ef76af68d610ff4c7516102b976f66380e0e3d3ee7ed00023116cb6b2d1628e3d38796705a09 SHA512 e206cc2d61799a97edf1182de4cee1c0fa447bd1fac136dc48670cb624a7efc903c693b0c541fbc00fcb94e055c83be1ca6370386c99131a1b571f47b67c35f4
 EBUILD ncmpc-0.33-r1.ebuild 2070 BLAKE2B e33419a69883824503a54b47a52d95a9f1ffe2ebe7f5c70fa457918198072d90305366236a8dea0c1b9ccbcb738273366aed8830c8e3d3c89c42b350003b140f SHA512 b9f8c0220bcee0a2b6e7deee2960b350b086eeae8a3dc6d1fcbb50790447a7b3fc4754f6e92d9c153ba4beaf4e95044f0043001cd83080afe55d47fd65d05894
+EBUILD ncmpc-0.34.ebuild 2029 BLAKE2B 55343ff919bf9bea000d6a82f6e8f4331bb40756269b80e751f5229025deff346cfafdce20697b12b0a77baa8b718a409943e3ac3580d55208baad5178d95144 SHA512 f09cb501e27d1e6d0c054af77f47e6dd8a650b9727ba195db9ffd84f3f7dd4ea5338641c793b6cad9aff01efcb2fae8c537bfe5963b47cc973f8b5101b1901fb
 MISC metadata.xml 947 BLAKE2B de28ab3a9263d21b8a2727fb80a70467d4c086c18712bcc6ee51c434f512a7daab42832728a150a677a4552f36950038e08076fd2c1eaf0ec5c2f7e82408efed SHA512 19a555b3375402a4ff9931e2d1c17bb3146d963f3c4665216e9e63deb61b99313267eb9e3815aa9f6d3f4dabee1734131b9ee71ff41562b7e9aa881fe10b1760
diff --git a/media-sound/ncmpc/ncmpc-0.34.ebuild b/media-sound/ncmpc/ncmpc-0.34.ebuild
new file mode 100644
index 000000000000..fdb5a17612dc
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.34.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Ncurses client for the Music Player Daemon (MPD)"
+HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+"
+RDEPEND="
+	>=media-libs/libmpdclient-2.9
+	sys-libs/ncurses:0=[unicode]
+	lirc? ( app-misc/lirc )
+	pcre? ( dev-libs/libpcre )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.62
+"
+
+src_prepare() {
+	default
+
+	# use correct docdir and don't install license file
+	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
+		-e "s/'COPYING', //" \
+		-i meson.build || die
+
+	# use correct (html) docdir
+	sed -e "/install_dir:.*doc/s/meson.project_name()/'${PF}'/" \
+		-i doc/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dcurses=ncursesw
+		-Dcolors=true
+		-Dmini=false
+		-Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
+		-Dasync_connect=$(usex async-connect true false)
+		-Dchat_screen=$(usex chat-screen true false)
+		-Ddocumentation=$(usex doc enabled disabled)
+		-Dhelp_screen=$(usex help-screen true false)
+		-Dkey_screen=$(usex key-screen true false)
+		-Dlibrary_screen=$(usex library-screen true false)
+		-Dlirc=$(usex lirc enabled disabled)
+		-Dlocale=$(usex nls enabled disabled)
+		-Dlyrics_screen=$(usex lyrics-screen true false)
+		-Dmouse=$(usex mouse enabled disabled)
+		-Dmultibyte=$(usex nls true false)
+		-Dnls=$(usex nls enabled disabled)
+		-Doutputs_screen=$(usex outputs-screen true false)
+		-Dregex=$(usex pcre enabled disabled)
+		-Dsearch_screen=$(usex search-screen true false)
+		-Dsong_screen=$(usex song-screen true false)
+	)
+
+	meson_src_configure
+}
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 1fb96edf9ce2..61c1690b5406 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 11539 BLAKE2B 25943f683cf0d62785d762508efb202aa7bb4609bb4411582b57ed4418f956caa06403d01d041d3f48651ecac14e3f686650dc304311dda77f5bab70a03d3f8b SHA512 b83f459ae4a5b1978c1598cf2636b96baaa3013975804a5f1bde85fe5548a139f4ee59b1b0a183d1de31972b6d927ced5c8babe9e59ef59e9c569ca6c4460a50
+EBUILD pulseaudio-12.2-r1.ebuild 11538 BLAKE2B 977d51791300cf193ec766d898aedd35961e6fc15ffbaeef6083134e23b1943485dce10dbe3e5bbb72c4599b6079110717e26a08090a3a3c246f331f6c47cd52 SHA512 d12b057f4d95a4267ae0f3f6cc29df6f083edf2c6908fc16f5c308a2df87bee8b24e33c10777305f307e24ad1c43b4ad7e1fb82662340ccf3c39746b56e23bfb
 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 45fd8f297ab3..a81af22636f9 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 f9b2ebd080c3..10a424b6f362 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -2,8 +2,10 @@ AUX qmmp-1.3.0-projectm-3.1.patch 3549 BLAKE2B ad650249ef621a84fe1fe359ae03c62df
 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 4270 BLAKE2B 0e4a4bdab7e45fdd23db669d2a8e69703e6ca16ecf96f5c06097156aa3feda3c67bd97bb410aa036123cf1ea8c8129ce54d43ec7ffbd9a044651108434dcc142 SHA512 ef99784cbeeba0d8bfcb19c49884033df7e217d92d5b343d77be0bf222ef11aac6601dcca7fb2b78fef129908df5ffc7af9d71acd05455da89e48135e8f06f34
 EBUILD qmmp-9999.ebuild 4223 BLAKE2B 03bba4b756908e7ff5d7d0eeaf7afa2752591ebe0294b5bf904bbc12ec6e735d61cdaf989e52f3f3645ad5758ab7fab1ff06883af6b2d473b3cb97071908edaa SHA512 11268db2ee4019b9ade8a795a2edcb46ed90e66c1db529c44bf3349b88cf910fd3fa993909474dc30aeb4849e2fe27ba3ec94a93a86cf6a82a78d668aa8d2a76
 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/qmmp-1.3.2.ebuild b/media-sound/qmmp/qmmp-1.3.2.ebuild
new file mode 100644
index 000000000000..611727b19b0e
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.3.2.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg-utils
+[[ ${PV} = 9999 ]] && inherit subversion
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
+		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	QMMP_DEV_BRANCH="1.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/qsynth/Manifest b/media-sound/qsynth/Manifest
index 487a6b22b509..b5d584a23deb 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -4,5 +4,5 @@ DIST qsynth-0.5.4.tar.gz 268106 BLAKE2B e7e17c1427cbb6105fc6fbaa511325fcfbed0d06
 DIST qsynth-0.5.5.tar.gz 269061 BLAKE2B e17bb0ced40764c5bef9ae7c793f7ba1ebfe4edd761f434ad129f338d30384c639f27d697ecfdaa93d7fff52c38bed0a3b95cf51fbdad25e13c14abe795d49dd SHA512 4e90b38d428c6b49a78b648ac9604e683f32623898205abe3a98c4136c5b29ab27c101cf63207dbbfdcba105913de2dcb5cc7669a6433def71d071f39cf68429
 EBUILD qsynth-0.5.3.ebuild 1328 BLAKE2B 61f84dd2f5da070ed3c18c93e0b0c111673998326f25ec0816126a5bcf5458f4d78932e2fe40735bdb5ceb936b3abf0a1f209d297d5bbf6f07949798874494e9 SHA512 53bee67b1ca4be0d938be720fcb6b4d6a8fe1be52345b61349729d5ff19c85d8cc2f0e5de57f8d0cadf02d47f7852d6509ab67a13a0ade3618b85e01024438bb
 EBUILD qsynth-0.5.4.ebuild 1306 BLAKE2B 49f580815944ad797dd264781e8d58c222338cd4c162556246941e1e8d33f1d3370b3846fc78df2c2d09dff712c1e27235c6e3b9bd1aecc68bb6503a18446e63 SHA512 12595163c9f3a1ea7b7fea0a93a933cdbeca42976a8f56fcb13cd40d382de90f270ba3404d3c9c87a0d42cdd161e03ba6d61f24a8a4c60e5f449c1b530852cfb
-EBUILD qsynth-0.5.5.ebuild 1303 BLAKE2B 8d03befa17b78a2014071b76ebfa19290331616d4b184461503b21145dc01faa8f19ee7c87c5f722b4e210105fb20c2b92f87a5e61e9d32bcaedffb9e8fdc46b SHA512 56faea03030d1146c338dd22d9e6477ffbb01d3531feb38dfbf0cfa4ceccc5ef451235977e0b99b824a6f0d07dd69b69ddfd5e4e2948ca02bc6be7ce1b09b9e1
+EBUILD qsynth-0.5.5.ebuild 1302 BLAKE2B 28bc375b9c0e1bc8cf630c73011afa165a98aa5633b141ac40f8ad84398c2bcd1b4fb9b46a4827f548a17ed253c6caad0b3c5b430d09d550eacdcbaa7eab83e3 SHA512 688ead81f1a2d0bffb9d5ba1de237c495a6b6a98d114b43be193cf09e8e4df4fbee4d7e698ba7270e633d43f48ac646c02bffa11348252c5790c67a17efedf44
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.5.5.ebuild b/media-sound/qsynth/qsynth-0.5.5.ebuild
index 8c607d5d7f0c..32a04a34d400 100644
--- a/media-sound/qsynth/qsynth-0.5.5.ebuild
+++ b/media-sound/qsynth/qsynth-0.5.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="alsa debug jack pulseaudio"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 7e8b831ec1d4..1c96fe2c45a7 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -2,5 +2,5 @@ AUX rhythmbox-3.4.2-gstreamer-1.14.patch 16445 BLAKE2B 0adc6ea739a5a420d8817117c
 DIST rhythmbox-3.4.2.tar.xz 6909436 BLAKE2B f5714485b253370a161f2255030d85bc8a697d795f97011c2acf6acbf8c9312f5180c0ec06ebe2d6e70730dc3fd4e97289b1f3a5e4dd4989a4e8135433430aab SHA512 275f7c6344c88c7331d433895d479517e7a4b854f6ae660abd79b3c324f5e7a06132fa44387443ec9ce50b20187e1abf1ec9683ec4bedbd4b17da6efece8399b
 DIST rhythmbox-3.4.3.tar.xz 6410600 BLAKE2B 0df8ac37ac0815468414c5b8118da6d07276e0c15f08812a46af7f377c29418416e1a24d7398aec10772887ae98922f6fb9fa9eaecc6ae15115cd7ca1c4b67a4 SHA512 a3585c026037674345909e2050a4ccb22a75084f830f351b926f7fbfc84d200c8246b8da4bd72804e595929ab06d3c7b53d362675dde193746f40b0f38b7c493
 EBUILD rhythmbox-3.4.2.ebuild 3441 BLAKE2B d2e56df3485478b8398e478130d3457d2ed50b79b843fcca2ae7b7532dc224a2ee7ad06fe7f0100c8188be9b45f96e56cbb0b95935e43003fefd88dd562a2411 SHA512 ccb33aa6378a9801a43ab68aaeaed523453e574432152924d6b2e26cb9e9598444a1c1f1446c42e33dc09e19691aac7b82a2d6faed4644a0166c5240edae1a94
-EBUILD rhythmbox-3.4.3.ebuild 3373 BLAKE2B b6893b3fe6d7a959ff46717c158c45bf237505fbb093b0894c2c01f83d2d200251c2c6b3ddf48502b8053fccf13158dde443a0de84e768575978bf84c843564a SHA512 2d5d5bb2bc8322aa61c52076e51800188800176daa812fabeaf60087a1e99bca915bc7193cc45eebd863a913965185c3aa617e7b858b5de7f3c93f963e2dec75
+EBUILD rhythmbox-3.4.3.ebuild 3371 BLAKE2B 5e01913300ef35132df218f4cabf37b38f9a5a796953f4276e6aa500d816da728eed790a9ef2934bc4410200d8729d33a72bea4bcca68fa19a450e33dff25212 SHA512 e1846abf3d30e99d1140906c328f9162ae1ce859e9d24302a8b8c5c3c984ad9cb1bb67ac17dd93a3a9fea5809ccfedbcb330a3741d7a618c1c7f96b4a266dfa8
 MISC metadata.xml 545 BLAKE2B 541f660e1607a2e02779487edf290dbd8d8262184c2b0f245eabea4490165a0b019b1a989ad9a27acea26a15edc1ba39b4669756a9b17464b9592191e4498a99 SHA512 a734430876806e8bc114e3058c6b5cdabe87372af71a478f333dd7449faa63af011dc2c7115293049e74da8df742ed6a03f03c8e2a56a2d56b2aa4c547bd6065
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
index 81de16305f75..89c3a913df8c 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 74e5d4f031f7..f639635fd46c 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -2,5 +2,5 @@ AUX rosegarden-17.04-cmake-3.9.1.patch 934 BLAKE2B a59bb497c2fa23f5161ff2953b233
 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 1213 BLAKE2B 04dfcfd72fb5b670bc534640e4c0c0d9876a5c6221d08413f5b08341ecdd7ba1ab1e860494e5f00e9c8f247bd44f48003cb43cd6019678a56dbdd440edd57c8c SHA512 266c5ff6c4d949c831988ae305b349c419462bfde898df9b7c15339e994f164975a2010859546ee33c6bf6446d29f2962cd4190b8389c42359fcd47364789ea9
+EBUILD rosegarden-17.12.1.ebuild 998 BLAKE2B 49ee99784594c188f2a896f186ff9d8cbceea7b459737ffe2bdb88a9d387ac7f282c1ec312b3d81f78e9dea21f90a0e8771affc439009d5c8e474985aa9b31c8 SHA512 cf4cad1a1146c4dca6c1190e8d05e1f4704e04fba3f9b998ab2d8159c20e52c211626873a161ef601043fcac543065e01bb2fd7c562c61f67f426e39e1812a30
 MISC metadata.xml 349 BLAKE2B 0f31b6c7f0aef5e0b487ddcdf963c1701cc3429870464de30409dd788422964adbf05172089315a6543ac858f4d5ae64773c52728f24da4dc06dfe9b1dcabf9e SHA512 1790ba05a4f13f358de6890c908b2f1eb0581143063b7237220dd05aba31d16d68f2cf6c4712a08894909b7de5306d592807e9f3171b66b72fd867bd339a0cee
diff --git a/media-sound/rosegarden/rosegarden-17.12.1.ebuild b/media-sound/rosegarden/rosegarden-17.12.1.ebuild
index 2e2fb9280351..a62b21c7fa70 100644
--- a/media-sound/rosegarden/rosegarden-17.12.1.ebuild
+++ b/media-sound/rosegarden/rosegarden-17.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils xdg-utils
+inherit cmake-utils xdg
 
 DESCRIPTION="MIDI and audio sequencer and notation editor"
 HOMEPAGE="https://www.rosegardenmusic.com/"
@@ -14,6 +14,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="lirc"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -35,30 +39,16 @@ RDEPEND="
 	lirc? ( app-misc/lirc:= )
 "
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
 	dev-qt/qttest:5
-	virtual/pkgconfig
 "
 
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
 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/twolame/Manifest b/media-sound/twolame/Manifest
index fdfb391605c6..b833bc3a6267 100644
--- a/media-sound/twolame/Manifest
+++ b/media-sound/twolame/Manifest
@@ -1,4 +1,4 @@
 AUX 0.3.13-perl-tests.patch 779 BLAKE2B eba221a58a16dc22ec7e6a10388045db6a2b2535a9f0a55e47a01315aa0c0121c1473aa6ff9f53b7bcf4b70a849a0b19bfe3125213f558c17ecb1d4fd1349376 SHA512 1c483daf75991fa6d390360d9108803f65fa894745140d3955f73ce8e87eb813a068efa810988ac462ed22ae0bf3d0f95b63feb5c823ce3bfa3a0dc9b9a8f413
 DIST twolame-0.3.13.tar.gz 660415 BLAKE2B 741e91983546241b984ce95ef3b1c3b00ff2c1e84f496961749b13b932a1c3fdcd44a3fde3a24e44d9a3ff9e859e64780ad60949f827d986608c51c1afe44912 SHA512 241ae5faebf05cb919959bb0545cb89e9b71cfb07f92a7118d864499ea4f0065ddaa646ab1482ffbcbca427d52c2436764074bd67fd19a1eb9979987f23163f7
-EBUILD twolame-0.3.13-r2.ebuild 1261 BLAKE2B 20a6322e8e62e9f8a4d7b5cd26db1278062cd3079821a161fcb61c83136cf0441e47a2fc9671c05b4e608d4d9b083db68014d5dfdd6866e015b3a4577e315479 SHA512 3287ad1c81f237be46ef79a2197e0d7d22edf805da6cec5360be8319c46edc9a5144e944b388f82d3fb0a0813705bb62ea037adf4fb841b36f486db741a550a4
+EBUILD twolame-0.3.13-r2.ebuild 1257 BLAKE2B 782644eec5de1359844090723c0a147f4c8495615ea782f05a1e70564d0866b7b891d1183f90ff891b87025c81a7f0af04faa92e1c9edc93fc0650a464e82c7f SHA512 f9edd745053e414f1c551d98a00f830b03f93a99391ab857b4586576a6b449c58ec982a8e98d65522260d8912abab4a486bed22247e12371c1a22e78cb8341aa
 MISC metadata.xml 330 BLAKE2B 71d39da341e5e41047c01d3b77c1090a4d1304c7ae915832d6cebe103c52cee3d0d27dd0b09c66d775efb4ee3bec3696bd6f27ca5cb78acc2a563f3992a26fc2 SHA512 4ef98f0ddd18034ac0ea2e93a84560e62b02c3ee6186f980b20733d88f68e36f3724f2b2b8c138393f9c6da1b4b943f318fcc85b5f57817fbaac33d68e4b6ea8
diff --git a/media-sound/twolame/twolame-0.3.13-r2.ebuild b/media-sound/twolame/twolame-0.3.13-r2.ebuild
index e9b23313266b..8894f10ca4a9 100644
--- a/media-sound/twolame/twolame-0.3.13-r2.ebuild
+++ b/media-sound/twolame/twolame-0.3.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]"
diff --git a/media-sound/umix/Manifest b/media-sound/umix/Manifest
index abc7cd7972bf..25ae573e6402 100644
--- a/media-sound/umix/Manifest
+++ b/media-sound/umix/Manifest
@@ -1,5 +1,4 @@
 AUX umix-1.0.2-tinfo.patch 381 BLAKE2B b54721623167ae634b5e6e0243ffe9fb57c7af3f99236e23317163aa95926bf2c2a56b07eed1bdd228c7d92c21e0009dd5044e551e9d06bd3488bbb47a9666db SHA512 acd5f8c6a22ed857182fabba848b1718d1031cd6b7c15456e25f37387ed8cb6c354accd1e83781954c9beed88337889538dc1e38992a4ddadabc3077941c048e
 DIST umix-1.0.2.tar.gz 225866 BLAKE2B 8ab2b3246440fcab64edea366dafd5d8f734c42483fd78410a1f884c2b046a27fdb6959023d6c537900c64409ad0f606e7d2c2e91f23bdd03dda61940ba7d29b SHA512 9e59a26c0b6cd60bbcfa715694ed58e023c119840080ccb46d9e6b17a9613fd42c1346233a5185d02ece77e3f3e456e18be25573fd34e2f265c5b0b3dc593468
-EBUILD umix-1.0.2-r1.ebuild 696 BLAKE2B 71cd2da90f3a1dc5b0ff4da2784da21eabca8f5f7a3b9aac9513ad4c43545ee82ffd77d4755257433fed1240bdf5fb0a35dbffe340455d476862dac21d4505b1 SHA512 618b58c883ef95d79f28c61a4c28b10039030da667507707d8834b5122d0bd98047edb206e4183cf3505d3ffb4780b35c8cf30d26db2778849169e37cb750fb8
-EBUILD umix-1.0.2.ebuild 627 BLAKE2B f08396b4ac2659b8511bcc8c1b44653cd07f657aa2a27b021a6f55cbab861301ecc95817d6898fe066deaf9cd9b9783f3903b89c78374bd5fdb974e84a085c9f SHA512 00c36690b96c9f6106657b229c884e7e7ee0d6a94e367c26e2bcddfd7645303be054d319c994c4204664441471f2fe655af747b31deae55efe6fb722c796a548
+EBUILD umix-1.0.2-r1.ebuild 695 BLAKE2B 5dc3f8ed24cce98b8003f9177fb94ffb283e5938c6023cbdadc24ffb02d6019d85ced87ddf49fe1a57480735c4b2488ec868c122e4d10de5ad6ddf09044c0b1d SHA512 580c93be4b9800b579dd0295bb1fe26ed38fac035d635badc1df48d6c757f12b8d96315848ceeda3ce7b46ca51ce7a416c4f627b9f1af1d7e7bff877e9653c36
 MISC metadata.xml 327 BLAKE2B 8c7901bd5f9eac11aa6e16d5df9e6a2ea87475effc0623deb6fc73d741f1ea92b8dc00f77f5edc95b05fe9ef643478497aeb9ebf28274155c4d21b6ebec783ee SHA512 e46843a6b8a9feb294b713eb1766900dbebf7211212423c9e791f0ffa59faeb9fb0c909c4268d13d737d80818fc343d6c067b8dc3bf369515083e7f1fc3abb71
diff --git a/media-sound/umix/umix-1.0.2-r1.ebuild b/media-sound/umix/umix-1.0.2-r1.ebuild
index 7a92f8ab81e8..14b60cbf318d 100644
--- a/media-sound/umix/umix-1.0.2-r1.ebuild
+++ b/media-sound/umix/umix-1.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc sparc ~x86"
+KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE="ncurses oss"
 
 DEPEND="ncurses? ( >=sys-libs/ncurses-5.2:= )"
diff --git a/media-sound/umix/umix-1.0.2.ebuild b/media-sound/umix/umix-1.0.2.ebuild
deleted file mode 100644
index d283cbbf03d7..000000000000
--- a/media-sound/umix/umix-1.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-IUSE="ncurses oss"
-
-DESCRIPTION="Program for adjusting soundcard volumes"
-HOMEPAGE="http://umix.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc sparc x86"
-
-DEPEND="ncurses? ( >=sys-libs/ncurses-5.2 )"
-
-src_compile() {
-	local myconf
-	use ncurses || myconf="--disable-ncurses"
-	use oss || myconf="${myconf} --disable-oss"
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index 048df569a4c1..1520c544a907 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -6,5 +6,5 @@ AUX wavpack-5.1.0-CVE-2018-7254.patch 3004 BLAKE2B 2c744a5675a8b8c3f6b8e956ff3b6
 AUX wavpack-5.1.0-armv7.patch 805 BLAKE2B dc69a643e3dde75cce1d5a23176cb09fecc513a98835242437659b0724de8ba2cb97a59fb1cb3dc050454ff95bc2669e6b19f10fd03fadaf06e4c859c063277c SHA512 b152f8081b712c24ae8db641f4755798ab4c7412a298054449883255fa76571ffbd0c580848a274ce1c44401f69102a0b2c66137ae36d9323e9e5330ee20856e
 AUX wavpack-5.1.0-memleaks.patch 800 BLAKE2B 601e81daad4208d109bd980cbe63ce0c638577d53fe01fa133469090faed7f641d00efd44f906732905599615513b0dddf918dc9ce13f927b3e889a1dbd0d13d SHA512 ac5f8473314939c1b07019617f8881e4675bab2d4a0f61dd95c5389ec9915a8573f3291a5c29547e8e5a300483600d36f3c53f9ee7380c5f0691860cef6a3594
 DIST wavpack-5.1.0.tar.bz2 824331 BLAKE2B 736dcb3cc0bee4ebcf76b8a7df178aa1b797ec6858358bf289a3e151f62d2ce8f430d163d46a84c0b5a7501c732ac639955c867e53fd9217ca7f213b601a8697 SHA512 4c31616ae63c3a875afa20f26ce935f7a8f9921e2892b4b8388eca3ccd83b2d686f43eed8b9ec1dead934a1148401b9dced3b05f509b7942c48d7af31cf80a54
-EBUILD wavpack-5.1.0-r1.ebuild 992 BLAKE2B c6988e13c7a91624ba16275d14c4b82372e2785df3f1dc2b62e9110391169e3e66228a48104db0811398f3765ed676c579eaf2f97678b1f0bd208d787ef75c1b SHA512 cdfdc9df7b8cc54cbca444a170283afe1c15379df8de4855ea4b3bbada34df94e08dc0a0be3b366091317efb7f9b7a585f07e14b210f6d38d0f6b03d713f6300
+EBUILD wavpack-5.1.0-r1.ebuild 988 BLAKE2B f814ccce82ff920b417f63428b640d1f473675c1460639b4a836871a2ce2249cf0c7e06bbe0caf008ee6449a3341274d17320baf7c35a4b363633b7e60ce3cdf SHA512 42afa02f257b569aa6bb8b27758c2027399f465c22c2ca6bfc247e459bbc07b80e925516b6b4ad9f071f79549c73ec9d02595604e5f693bcae394d9eceec64b1
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/wavpack/wavpack-5.1.0-r1.ebuild b/media-sound/wavpack/wavpack-5.1.0-r1.ebuild
index 744cf57100ea..2bfc5691ce79 100644
--- a/media-sound/wavpack/wavpack-5.1.0-r1.ebuild
+++ b/media-sound/wavpack/wavpack-5.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=virtual/libiconv-0-r1"
diff --git a/media-sound/yarock/Manifest b/media-sound/yarock/Manifest
index c6e7024fdec8..f4caf6d3131f 100644
--- a/media-sound/yarock/Manifest
+++ b/media-sound/yarock/Manifest
@@ -1,5 +1,3 @@
-AUX yarock-1.3.1-desktop.patch 237 BLAKE2B 3271ee7d08d4a897dcdb51d504653e2472af1db3ba34279d7b101b84c30821a451ccd268ac3d1d7474f1238f3d1bf75ddcd8c9b251558f87ca3333b1591aad8d SHA512 023edebc269b860731a17ff1ae2006b4570848449d9994f61f8d81a1e82779d59fbfb55623fd1855223de74201d3ad4960fbe3a8bc7109c15053f92a29cd0e0d
-AUX yarock-1.3.1-phonon.patch 1259 BLAKE2B 48ee6d115342463015707ad4b79ff2ebb416e36879c365add52c1a6bb0245c8f444c0bb88bd21fa9713d788ef6aeeb2a9a442247fdcc37b92362dfcd142affb7 SHA512 387f88c0f86102fb67fc0914297b5d15f438997f0212d3d9afa19fb00abf2b2aca575493be3f2d7aad42420a1fe6eb092bebcad68e5c195c5875f0f71f9fec1c
-DIST Yarock_1.3.1_Sources.tar.gz 734280 BLAKE2B 3bb8a452a3a7bd27792f67b6fcb2765494738c7a0149248b658333a64f38494880891e8a9d43ef7367d7748e5c0b6a2d9349dc1dd73dd0fecd94d88f21eec020 SHA512 a59837609c5004005360a272b45794143c64373d13c2783f84299ab0b849223aac2be3d87703e1925d66ed4301bcc2e7254228d34f556bce0447d949539acf2e
-EBUILD yarock-1.3.1.ebuild 1056 BLAKE2B 75c7a958102332e39634551cc6bd404c55b4bab67ff4403758381d5868c4f9c638a1a7baae9991647b10ab90420acdbd3dc2c50be4cc0b20749567648806b1a6 SHA512 02bf3138130be288cf16c3a1ef1e73070502b84ef79f73e96d81adaeb752fb642839a4012fc6b55168485167dac987fe37d096e29f47ae1894d393a66e18ad40
-MISC metadata.xml 376 BLAKE2B b3e63f3aed251bf2410912dd48c7933cb85aa4679c3e8dab637d58bff69c018503e68b1e0aabb08734b6101bfa433d4b6a536770537ef077eec4add8f9e1acd8 SHA512 3d21dc4fe86b41b86d253184ae1be5de6c63169b4e0751f22f9733014b5f04895dd09c2ac23bc308ded24fcf61e54e5ab1022307b3a4658187398424a6c3a32a
+DIST Yarock_1.4.0_Sources.tar.gz 735399 BLAKE2B e54e995a419e1837b746374d3d7c6655e750d5142cce4d573dc268010b7bcf9da1a15531991769c16693f8b587228da445d4a14a89499600708309876f83bb5f SHA512 39ad470cd53fef738166ca635ca96da0868db406b62be92d276062acc568724a62886b7779eb47fc6a3e6d2825fe417753e9e6b87a978b9009e09d7ea5866f00
+EBUILD yarock-1.4.0.ebuild 983 BLAKE2B b8ddce0cafd4d71bcaef43ed39adf933127d367f32d020d28a6c8bcb8b6fc038dbb251cc32288d2bcd956ff2df85e120f7e194aca77342c66973ae455dd50c87 SHA512 7a940a8126ec028b83cf8666bc5c3eacec7a723390c338a2084c22256971b8e7156bef77616b39aa65afb5cc77057c3b1246c2976a15f597211cc92a2adb66d7
+MISC metadata.xml 477 BLAKE2B 8f41c22740fb729d50042c0e06585fef7bfc1d17333d2a76357d11fe898d6b8deaebeba2b9c8f4242b6db8997d9f4c5b6661eff9a29b84d196f5295d32620e8e SHA512 17dbd3112993095260668fd1aa35dac9928ee1e44d2dac722ff78a6d901c21e15f586ffe0986f02c8c071ec3770bbd084cdb4448cb3cf6c01bb9d723f8f66a2e
diff --git a/media-sound/yarock/files/yarock-1.3.1-desktop.patch b/media-sound/yarock/files/yarock-1.3.1-desktop.patch
deleted file mode 100644
index 3131c072dfbb..000000000000
--- a/media-sound/yarock/files/yarock-1.3.1-desktop.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/data/yarock.desktop	2017-12-24 08:48:55.000000000 +0100
-+++ b/data/yarock.desktop	2018-10-04 18:18:37.700722758 +0200
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Version=1.3.0
- Name=Yarock
- Comment=Play your music collection
- TryExec=yarock
diff --git a/media-sound/yarock/files/yarock-1.3.1-phonon.patch b/media-sound/yarock/files/yarock-1.3.1-phonon.patch
deleted file mode 100644
index 53bbf834cbca..000000000000
--- a/media-sound/yarock/files/yarock-1.3.1-phonon.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/src/core/player/phonon/engine_phonon.h	2017-11-04 17:06:43.000000000 +0100
-+++ b/src/core/player/phonon/engine_phonon.h	2018-10-04 18:23:29.079923850 +0200
-@@ -27,12 +27,12 @@
- #include <QPixmap>

- 

- // Phonon

--#include <phonon/mediasource.h>

--#include <phonon/mediaobject.h>

--#include <phonon/audiooutput.h>

--#include <phonon/path.h>

--#include <phonon/effect.h>

--#include <phonon/volumefadereffect.h>

-+#include <phonon4qt5/phonon/mediasource.h>

-+#include <phonon4qt5/phonon/mediaobject.h>

-+#include <phonon4qt5/phonon/audiooutput.h>

-+#include <phonon4qt5/phonon/path.h>

-+#include <phonon4qt5/phonon/effect.h>

-+#include <phonon4qt5/phonon/volumefadereffect.h>

- 

- #include "core/player/engine_base.h"

- #include "core/mediaitem/mediaitem.h"

---- a/src/core/player/phonon/engine_phonon.cpp	2017-11-11 07:29:42.000000000 +0100
-+++ b/src/core/player/phonon/engine_phonon.cpp	2018-10-04 18:23:29.084923716 +0200
-@@ -29,9 +29,9 @@
- #include <QtPlugin>

- 

- // phonon

--#include <phonon/backendcapabilities.h>

--#include <phonon/effect.h>

--#include <phonon/effectparameter.h>

-+#include <phonon4qt5/phonon/backendcapabilities.h>

-+#include <phonon4qt5/phonon/effect.h>

-+#include <phonon4qt5/phonon/effectparameter.h>

- 

- #include <cmath>

- 

diff --git a/media-sound/yarock/metadata.xml b/media-sound/yarock/metadata.xml
index 2263346cdc5d..789a20e09848 100644
--- a/media-sound/yarock/metadata.xml
+++ b/media-sound/yarock/metadata.xml
@@ -6,6 +6,8 @@
 		<name>Andreas Sturmlechner</name>
 	</maintainer>
 	<use>
-		<flag name="phonon">Use <pkg>media-libs/phonon</pkg> backend instead of <pkg>media-video/vlc</pkg></flag>
+		<flag name="mpv">Enable <pkg>media-video/mpv</pkg> backend</flag>
+		<flag name="phonon">Enable <pkg>media-libs/phonon</pkg> backend</flag>
+		<flag name="vlc">Enable <pkg>media-video/vlc</pkg> backend</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/yarock/yarock-1.3.1.ebuild b/media-sound/yarock/yarock-1.4.0.ebuild
index 97723a60ef20..7d9acc2b0a02 100644
--- a/media-sound/yarock/yarock-1.3.1.ebuild
+++ b/media-sound/yarock/yarock-1.4.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
@@ -13,8 +13,11 @@ SRC_URI="https://launchpad.net/${PN}/1.x/${PV}/+download/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="phonon"
+IUSE="mpv phonon vlc"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 RDEPEND="
 	dev-cpp/htmlcxx
 	dev-qt/qtcore:5
@@ -26,11 +29,10 @@ RDEPEND="
 	dev-qt/qtxml:5
 	media-libs/taglib
 	x11-libs/libX11
-	!phonon? ( media-video/vlc:= )
 	phonon? ( >=media-libs/phonon-4.10.1 )
+	vlc? ( media-video/vlc:= )
 "
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtx11extras:5
 "
@@ -39,17 +41,12 @@ DOCS=( CHANGES.md README.md )
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-desktop.patch"
-	"${FILESDIR}/${P}-phonon.patch"
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_QT5=ON
-		-DENABLE_MPV=OFF
-		-DENABLE_PHONON=$(usex phonon ON OFF)
-		-DENABLE_VLC=$(usex phonon OFF ON)
+		-DENABLE_MPV=$(usex mpv)
+		-DENABLE_PHONON=$(usex phonon)
+		-DENABLE_VLC=$(usex vlc)
 	)
 
 	cmake-utils_src_configure
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index eedf60147ca9..fa84d07fd42e 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,6 +1,4 @@
-AUX yoshimi-1.5.10-cxxflags.patch 2471 BLAKE2B 0e3d614e4cb9ccb1eb7a25665794fb22db89ca877d613fe4806afebd3692fafa422c2bcba7c9d28080e37a0e7004fcbefeedd0532c5541220e77e4149f8551f6 SHA512 cd15dd79b324ae27c80745c84720bf6b04d7d78c3bed3f2541ab84f82e60928865a49ded6f7fb383cdb5fdc61a05fb8d9fc02869d4846f734eab332f040fa7d0
-DIST yoshimi-1.5.10.tar.bz2 9406870 BLAKE2B e665f6a30094e8396fcadb2e423ccb74e07226d02a51811466fa4a04ee266364d6d9fa9f6bdef6712d24616888b9042bd7c818d21e41fde1d2f41b1eaad47c01 SHA512 1d6371f1d82438dc8b65fdb21b0460d998616c4a27bcee4f3e450542eb346eeb87e59a9448ef210fa45a119efdfc3d6dd7a6acd20ef3ad5a29d982f218704d48
-DIST yoshimi-1.5.8.2.tar.bz2 7537329 BLAKE2B d26619742f351a48f0457468c5c3f2a85cb04c479a8fe5b88616e4738092875df6e5d27be91d2fca42693e2e32d6c6f4b76308b93d99496dc5fff7d16da1712d SHA512 398fb57c171ee72d160b680cbb3de9db226cd281972a1a518cb52fdae617ba89e72b7d5fd1c6666e4bcd2df2d17789daf46aff2299c103429f07db0c83160d84
-EBUILD yoshimi-1.5.10.ebuild 1224 BLAKE2B cc6bfae99aa65e76e3b7b4037832d3b7fae68e5ccbfdc40c3ddb0b8013474ea8a44fed1de95f51bf278f6a8796c74e84c18907ce913e968cff0034be5f8de9ea SHA512 55de53bd5189d84d1832fae1ae8eb2048e84eff2e61305862e5f14e01769d11acb16a1e573b1d57dedd6d7bea7cb8dd45a01a5f69aa068f5922a0888f192d99b
-EBUILD yoshimi-1.5.8.2.ebuild 1032 BLAKE2B 3d2293725a28d677eee7846e86370f7b4b48f2a45bb5c7f37be2df15eeca6fdd76b8b99a1d1e4c7444967346b3aa9d02b6189f29150a81512545057374246496 SHA512 68c13d8841deb26933ae05c9dcf6cd7212d0a8768989062209361539f123dd268b68035b4954848652cafeaa223569fc137ba989217ab3ba546f0e56d173c7c6
-MISC metadata.xml 397 BLAKE2B 2c4e07b154aa3dc9c5cfac332fe039e9dc6251673aaf29e256aae8ddb146851174bde3d16e892ecfcda54d53d544514cc36f8f46373764c907e98d2f0cf5ed5a SHA512 1fbabe7286878f7ae5877cf95384b7574a8cd7656c6dc8296608af2bb2bd0004379b6f7fe920005baa00d00687b56511f90b79709ff71145384cb748bd45f231
+AUX yoshimi-1.5.10.2-cxxflags.patch 2592 BLAKE2B 383784742913ad2a2d711a1999269438eea525da3ed54fdd24fbad46932e05e781b18b2cbad1bd1e5bbe3ef160762f865517bbcda9ea6f5c4df4eb413af8b278 SHA512 78c3e2a84f44e9220b2f3fcc1cbac1b243a4fd19036d32f0ded794c90f83e5797ff3cddcb57ae3612656be27954b1db69b92d4b2107d8c18ffbdbd984abb87bd
+DIST yoshimi-1.5.10.2.tar.gz 9668476 BLAKE2B 1b443a51e952123abaf54b992902113533461064f2fc99032ac89f28a25ba4687176a97013ea118283e8ca2b7d92f44c105380e3d6cecb66560db7a0a8ef6532 SHA512 a39ba123f304e43d70833648ce224733794cb43c160fd2e6cf29bb4a782bea355c4bbfa1c33bf20c98a8c1f5d049788154aaf906a3daa56f288719a0b019139c
+EBUILD yoshimi-1.5.10.2.ebuild 1031 BLAKE2B e85d3901df224cab2e75e96fd4a948560248a6e2de09968db84ba2d1143a905f123cb6f39b86a93a7cd9955a5bf285455eabaf23864a2c5839746c389cddebcc SHA512 dd071adf610f54381324379f0a52fb7c63b4479cbeb709590ef40df5ace03fb74415f9533c9947a5ffd4b21dc95a776e2a7c036d71827198cda52cbb9f16be7b
+MISC metadata.xml 400 BLAKE2B b3d1fcfb88b7ec80023ff3ed78ddf0f31845cb4524402d7ebb24bd294857e4459f18b7f526687a163c6a2c08609325e60f85c17cd1055e32214fd415ab9968a6 SHA512 ba28fba7667eb3ef9f1e9b611c79b89e552f19cea6deefacd7bc7dc0bcc916c2d738adfa453e873ac7872d6a2d2a04aacba5a54c443d3009021940f944996dac
diff --git a/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch b/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch
deleted file mode 100644
index 7e64e1fdc729..000000000000
--- a/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Respect user CXXFLAGS setting.
-
---- yoshimi-1.5.10/src/CMakeLists.txt
-+++ yoshimi-1.5.10/src/CMakeLists.txt
-@@ -302,27 +302,27 @@
- set (YOSHI_INCLUDES ${FLTK_INCLUDE_DIR})
- 
- # set platform specific compiler flags
--if (BuildFor0ld_X86)
--    set (CMAKE_CXX_FLAGS ${BuildOptions_X86})
--else (BuildFor0ld_X86)
--    if (BuildForAMD_X86_64)
--        set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64AMD})
--    else (BuildForAMD_X86_64)
--        if (BuildForCore2_X86_64)
--            set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64Core2})
--        else (BuildForCore2_X86_64)
--            if (BuildForNEON)
--                set (CMAKE_CXX_FLAGS ${BuildOptions_NEON})
--            else (BuildForNEON)
--                if (BuildForThisCPU)
--                    set (CMAKE_CXX_FLAGS ${BuildOptionsThisCPU})
--                else (BuildForThisCPU)
--                    set (CMAKE_CXX_FLAGS ${BuildOptionsBasic})
--                endif (BuildForThisCPU)
--            endif (BuildForNEON)
--        endif (BuildForCore2_X86_64)
--    endif (BuildForAMD_X86_64)
--endif (BuildFor0ld_X86)
-+#if (BuildFor0ld_X86)
-+    #set (CMAKE_CXX_FLAGS ${BuildOptions_X86})
-+#else (BuildFor0ld_X86)
-+    #if (BuildForAMD_X86_64)
-+        #set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64AMD})
-+    #else (BuildForAMD_X86_64)
-+        #if (BuildForCore2_X86_64)
-+            #set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64Core2})
-+        #else (BuildForCore2_X86_64)
-+            #if (BuildForNEON)
-+                #set (CMAKE_CXX_FLAGS ${BuildOptions_NEON})
-+            #else (BuildForNEON)
-+                #if (BuildForThisCPU)
-+                    #set (CMAKE_CXX_FLAGS ${BuildOptionsThisCPU})
-+                #else (BuildForThisCPU)
-+                    #set (CMAKE_CXX_FLAGS ${BuildOptionsBasic})
-+                #endif (BuildForThisCPU)
-+            #endif (BuildForNEON)
-+        #endif (BuildForCore2_X86_64)
-+    #endif (BuildForAMD_X86_64)
-+#endif (BuildFor0ld_X86)
- 
- if (BuildForDebug)
-     set (CMAKE_BUILD_TYPE "Debug")
-@@ -330,8 +330,8 @@
-     message (STATUS "DEBUG Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
- else (BuildForDebug)
-     set (CMAKE_BUILD_TYPE "Release")
--    set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
--    message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
-+    #set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
-+    message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS}")
- endif (BuildForDebug)
- 
- configure_file(
diff --git a/media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch b/media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch
new file mode 100644
index 000000000000..dc5544339b54
--- /dev/null
+++ b/media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch
@@ -0,0 +1,66 @@
+Respect user CXXFLAGS setting.
+
+--- a/src/CMakeLists.txt	2019-05-06 15:09:19.010755505 +0200
++++ b/src/CMakeLists.txt	2019-05-06 15:14:11.668510627 +0200
+@@ -307,28 +307,28 @@
+ endif(READLINE_FOUND)
+ 
+ # set platform specific compiler flags
+-if (BuildFor0ld_X86)
+-    set (OurCxxFlags ${BuildOptions_X86})
+-else (BuildFor0ld_X86)
+-    if (BuildForAMD_X86_64)
+-        set (OurCxxFlags ${BuildOptions_X86_64AMD})
+-    else (BuildForAMD_X86_64)
+-        if (BuildForCore2_X86_64)
+-            set (OurCxxFlags ${BuildOptions_X86_64Core2})
+-        else (BuildForCore2_X86_64)
+-            if (BuildForNEON)
+-                set (OurCxxFlags ${BuildOptions_NEON})
+-            else (BuildForNEON)
+-                if (BuildForThisCPU)
+-                    set (OurCxxFlags ${BuildOptionsThisCPU})
+-                else (BuildForThisCPU)
+-                    set (OurCxxFlags ${BuildOptionsBasic})
+-                endif (BuildForThisCPU)
+-            endif (BuildForNEON)
+-        endif (BuildForCore2_X86_64)
+-    endif (BuildForAMD_X86_64)
+-endif (BuildFor0ld_X86)
+-set (CMAKE_CXX_FLAGS "${OurCxxFlags} ${CMAKE_CXX_FLAGS}")
++# if (BuildFor0ld_X86)
++#     set (OurCxxFlags ${BuildOptions_X86})
++# else (BuildFor0ld_X86)
++#     if (BuildForAMD_X86_64)
++#         set (OurCxxFlags ${BuildOptions_X86_64AMD})
++#     else (BuildForAMD_X86_64)
++#         if (BuildForCore2_X86_64)
++#             set (OurCxxFlags ${BuildOptions_X86_64Core2})
++#         else (BuildForCore2_X86_64)
++#             if (BuildForNEON)
++#                 set (OurCxxFlags ${BuildOptions_NEON})
++#             else (BuildForNEON)
++#                 if (BuildForThisCPU)
++#                     set (OurCxxFlags ${BuildOptionsThisCPU})
++#                 else (BuildForThisCPU)
++#                     set (OurCxxFlags ${BuildOptionsBasic})
++#                 endif (BuildForThisCPU)
++#             endif (BuildForNEON)
++#         endif (BuildForCore2_X86_64)
++#     endif (BuildForAMD_X86_64)
++# endif (BuildFor0ld_X86)
++# set (CMAKE_CXX_FLAGS "${OurCxxFlags} ${CMAKE_CXX_FLAGS}")
+ 
+ if (BuildForDebug)
+     set (CMAKE_BUILD_TYPE "Debug")
+@@ -330,8 +330,8 @@
+     message (STATUS "DEBUG Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
+ else (BuildForDebug)
+     set (CMAKE_BUILD_TYPE "Release")
+-    set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
+-    message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
++    # set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
++    message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS}")
+ endif (BuildForDebug)
+ 
+ configure_file(
diff --git a/media-sound/yoshimi/metadata.xml b/media-sound/yoshimi/metadata.xml
index cda9c5467dbb..1b622256a8da 100644
--- a/media-sound/yoshimi/metadata.xml
+++ b/media-sound/yoshimi/metadata.xml
@@ -9,6 +9,6 @@
 		<flag name="lv2">Add support for Ladspa V2</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">yoshimi</remote-id>
+		<remote-id type="github">Yoshimi/yoshimi</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/yoshimi/yoshimi-1.5.10.ebuild b/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild
index e7de48192156..4acbf0c9ea5c 100644
--- a/media-sound/yoshimi/yoshimi-1.5.10.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild
@@ -1,48 +1,46 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils xdg-utils
+inherit cmake-utils xdg
 
-DESCRIPTION="A software synthesizer based on ZynAddSubFX"
-HOMEPAGE="http://yoshimi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+DESCRIPTION="Software synthesizer based on ZynAddSubFX"
+HOMEPAGE="https://yoshimi.github.io/"
+SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+lv2"
 
-RDEPEND="
+BDEPEND="virtual/pkgconfig"
+DEPEND="
 	>=dev-libs/mxml-2.5
 	>=media-libs/alsa-lib-1.0.17
 	media-libs/fontconfig
 	media-libs/libsndfile
-	>=media-sound/jack-audio-connection-kit-0.115.6
 	sci-libs/fftw:3.0=
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
-	sys-libs/zlib:0=
+	sys-libs/zlib
+	virtual/jack
 	x11-libs/cairo[X]
 	x11-libs/fltk:1[opengl]
 	lv2? ( media-libs/lv2 )
 "
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
 
 CMAKE_USE_DIR="${WORKDIR}/${P}/src"
+
 PATCHES=( "${FILESDIR}"/${P}-cxxflags.patch )
 
 DOCS=( Changelog README.txt )
 
 src_prepare() {
+	cmake-utils_src_prepare
 	# respect doc dir
 	sed -e "s#/doc/yoshimi#/doc/${PF}#" -i src/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
 }
 
 src_configure() {
@@ -51,13 +49,3 @@ src_configure() {
 	)
 	cmake-utils_src_configure
 }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild b/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild
deleted file mode 100644
index c5fd3cc38be7..000000000000
--- a/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A software synthesizer based on ZynAddSubFX"
-HOMEPAGE="http://yoshimi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+lv2"
-
-RDEPEND="
-	>=dev-libs/mxml-2.5
-	>=media-libs/alsa-lib-1.0.17
-	media-libs/fontconfig
-	media-libs/libsndfile
-	>=media-sound/jack-audio-connection-kit-0.115.6
-	sci-libs/fftw:3.0
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	x11-libs/cairo[X]
-	x11-libs/fltk:1[opengl]
-	lv2? ( media-libs/lv2 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-"
-
-CMAKE_USE_DIR="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	mv Change{l,L}og || die
-	sed -i \
-		-e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
-		-e "s:lib/lv2:$(get_libdir)/lv2:" \
-		src/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLV2Plugin=$(usex lv2)
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 62a09d723b34..d3a18b61401b 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,4 +1,7 @@
 AUX zynaddsubfx-3.0.3-docs.patch 414 BLAKE2B 7988269f161ae948e63a05f9d84b986cf2a5c8644c594d14b431bb3366ac3e468d1668d1b03d1ad3e899e93a992c2b9722338f1a6ea1052994613ff7acce8eff SHA512 867cb63e0b057bf0930f8a2d7dfe50a547df740cb135dc21824b986f194c2384dd57e882f0ed2617c1e1306a88804849878eee4d825bf02908378acf0e00fb75
+AUX zynaddsubfx-3.0.5-docs.patch 436 BLAKE2B 23724992b4ce5a58961984481bcf9782a7960ca033a6abe7f71f061e8c7e4026de470b71080e5eb58f67f882a6138824d893949acd44d95ed026df24eaf95e3a SHA512 958d4f7bbb6b267b4aae2295df99eaad5f41f574183c1bb03ed6499475cb8ac3a2c52edaae60fce5a552e8d53dbed9f6677fa6c67aec4ec4dfa4436e591eae84
 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
 MISC metadata.xml 427 BLAKE2B 80fb772abd373ede6be0c3b99fd252f059ebbc6efa5ab1dffee1c0a517289cb199a7ca58c7db4942565dd96c2749fbecf0a9e82382a2387e5c785ced868b4312 SHA512 dc8afdd20a8f6e7d052dc69f4a17698b481db997ef36e199fce32e8ed586a0a0c6d9c881fc378bcd20e57ffe0f4ec1389680ee9ed0fa04ad8b13aa082112e490
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-docs.patch
new file mode 100644
index 000000000000..44060eaf4824
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-docs.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,9 +28,6 @@ include(CTestConfig.cmake)
+ add_subdirectory(src)
+ add_subdirectory(doc) # Doxygen only
+
+-install(FILES AUTHORS.txt COPYING HISTORY.txt README.adoc
+-	DESTINATION share/doc/zynaddsubfx
+-	)
+ install(FILES zynaddsubfx-jack-multi.desktop zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop zynaddsubfx-oss.desktop
+     DESTINATION share/applications)
+ install(FILES zynaddsubfx.svg
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
new file mode 100644
index 000000000000..e2fb4d3256b9
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Software synthesizer capable of making a countless number of instruments"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa doc dssi +fltk jack lash portaudio"
+
+REQUIRED_USE="|| ( alsa jack portaudio )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	>=dev-libs/mxml-2.2.1
+	media-libs/liblo
+	sci-libs/fftw:3.0
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	dssi? ( media-libs/dssi )
+	fltk? (
+		>=x11-libs/fltk-1.3:1
+		x11-libs/libX11
+		x11-libs/libXpm
+	)
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )
+	portaudio? ( media-libs/portaudio )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-docs.patch )
+
+DOCS=( ChangeLog HISTORY.txt README.adoc )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! use dssi; then
+		sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die
+	fi
+	if ! use jack; then
+		sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die
+	fi
+	if ! use lash; then
+		sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die
+	fi
+	if ! use portaudio; then
+		sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die
+	fi
+
+	# FIXME upstream: sandbox error
+	sed -i -e '/add_subdirectory(bash-completion)/d' doc/CMakeLists.txt || die
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+
+	local mycmakeargs=(
+		-DPluginLibDir=$(get_libdir)
+		$(cmake-utils_use_find_package alsa Alsa)
+		$(cmake-utils_use_find_package doc Doxygen)
+		$(cmake-utils_use_find_package fltk FLTK)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile doc
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake-utils_src_install
+	insinto /usr/share/${PN}
+	doins -r instruments/*
+}