gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /media-sound
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
105 files changed, 1711 insertions, 1403 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 21dbf4c21c42..016c4c2d3528 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index ca192bc9f9da..83ea2660443a 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,10 +1,6 @@
 AUX abcmidi-2016.05.05-docs.patch 614 BLAKE2B f9071f832d49d8dcb679843c5724c3a554df5f8f1ac6b545be637c2db6a37096b26c5b80f0b366d4e66f33230431de3b50b1198e2b9fe939e5231321ee1aeb27 SHA512 c06436cab7dbc4eb4bf8595e561402428bd1d45be653fa652841c3378e4b78f246ae5c862addf7bffbcb21d994f11151d464837f20915e91eef31d4f66618213
-DIST abcMIDI-2018.02.22.zip 561032 BLAKE2B 30bd7c8bf048d1713fc8b538c47ee6c391e429915659b4fdd1e7ab9464f6bc99ef2922678df28fc361e91cbec84fb4911ed390cb6b51fad3a3f4b23fcb976dc6 SHA512 d389b88cad6c7df152fd120f65dd5b02419f7bc2f94f68ab1995712c06ab9ab9cc99f81ec1d49a788cb968e8d3934d9953bc45c0732e87f76cc5b6dfbf1cf07c
-DIST abcMIDI-2018.03.21.zip 562177 BLAKE2B d7467ef5785999daa18f4701c2168ad3679c806f2e7c7227d999fe6af7afe821d2b17ea015616c5d355758195ed2180dd567f9eaa23782dcb4e38d95d0efb491 SHA512 3701b284f4e97102eb048234e0975219b827ed438faf36fef72136e16114538b0094cb576d93183f00968c8d243ab890ab4cb749d2da3f1fd363eda2590853d5
-DIST abcMIDI-2018.04.01.zip 562436 BLAKE2B 819e6a8f872cc4a2e2ef5f5e38b307355eefa63388866b54e114fdfcf94e24df757b209adfb46c81896f0bb7d4f2f893cbfe6ec24400c0c89465fbc1fe22dd70 SHA512 e82942bb531a11a64b0eb3cde1a8f48f366d888bb0c1a4d78a9aa44997c7f793f8e49ae6510e56405092ed717372a086e66e3bebda26b43386f573b0c2e04e45
 DIST abcMIDI-2018.06.23.zip 564262 BLAKE2B 0c99e5bb0787f4a41381ec77b1a64da273955997f0788eded8149297e332d05224e02eca2eb5a1b846b3314d7a62dad7eb3997ac2ed4c4aa4b13d0f099f08afb SHA512 d1f95fae383432d4ecb09fd7136212d42bb0a7b08fc7372b2511ecfbeff9fa0b51cd242f46f20827cf4122bc04e35c8a8442af4666b0e7093e6ad91302bb40ba
-EBUILD abcmidi-2018.02.22.ebuild 796 BLAKE2B 649655d717cfbbd2e125112d7aba8d56bdd7fa87b699ac4e3542dbfd4d8b83b98785001489ea94f429e98edd476a315c71f2e29826cb6401786893a1b348f191 SHA512 36f77259e3cc1a6a8080999c747fc1f4932501b70039c7e7ae48b8a37e31b9f91f47d4a744f9cebfc97ca8a0a0b8107de369dc18e9950fb2d24fc24558288854
-EBUILD abcmidi-2018.03.21.ebuild 796 BLAKE2B 649655d717cfbbd2e125112d7aba8d56bdd7fa87b699ac4e3542dbfd4d8b83b98785001489ea94f429e98edd476a315c71f2e29826cb6401786893a1b348f191 SHA512 36f77259e3cc1a6a8080999c747fc1f4932501b70039c7e7ae48b8a37e31b9f91f47d4a744f9cebfc97ca8a0a0b8107de369dc18e9950fb2d24fc24558288854
-EBUILD abcmidi-2018.04.01.ebuild 796 BLAKE2B 649655d717cfbbd2e125112d7aba8d56bdd7fa87b699ac4e3542dbfd4d8b83b98785001489ea94f429e98edd476a315c71f2e29826cb6401786893a1b348f191 SHA512 36f77259e3cc1a6a8080999c747fc1f4932501b70039c7e7ae48b8a37e31b9f91f47d4a744f9cebfc97ca8a0a0b8107de369dc18e9950fb2d24fc24558288854
+DIST abcMIDI-2018.12.21.zip 558423 BLAKE2B e40e8d01744d623042445642b21aa6654d5ba087bfb426b62e9ff44ea39d20f6b3b8f1d94d406362e63ab173a3ff721c737fd945b2195e42468d458aa3d8a176 SHA512 5f338852f3c65dcdfac760c1ab50d05654930f4b02701ffe44b0f8f830e39108ede63b7b47eb751790c6c2730af74dbd1e9b3ec361c5242ecef81376259399c7
 EBUILD abcmidi-2018.06.23.ebuild 796 BLAKE2B 649655d717cfbbd2e125112d7aba8d56bdd7fa87b699ac4e3542dbfd4d8b83b98785001489ea94f429e98edd476a315c71f2e29826cb6401786893a1b348f191 SHA512 36f77259e3cc1a6a8080999c747fc1f4932501b70039c7e7ae48b8a37e31b9f91f47d4a744f9cebfc97ca8a0a0b8107de369dc18e9950fb2d24fc24558288854
+EBUILD abcmidi-2018.12.21.ebuild 793 BLAKE2B 628537bd1682fc94b7a8f461e20d92cad70099ab9ad0b0882287cd05b62fa6e5cd9f106c9a0db4f78da0386aab9135cc7cb72a4c9b4db5655d4f8289cee6ede5 SHA512 45624d69fe30bdbedb220b551e34626409702677b5b6a139af66bd1616f484918745c1e0fe6c3a51ecf6441985f116bc53b6fbd62d2204dd1c6b4460d685da98
 MISC metadata.xml 326 BLAKE2B eff21376d5e8fdf74ead04fc307726b50c8d86faaaebdbb8aa748c9fc0025ed9ccbdbf90f6bbafb515d576cd837f72f44991b329eb56f003cfbe3b0ee9cac7d5 SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a
diff --git a/media-sound/abcmidi/abcmidi-2018.03.21.ebuild b/media-sound/abcmidi/abcmidi-2018.03.21.ebuild
deleted file mode 100644
index 2c8a0b2744b8..000000000000
--- a/media-sound/abcmidi/abcmidi-2018.03.21.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/abcmidi/abcmidi-2018.04.01.ebuild b/media-sound/abcmidi/abcmidi-2018.04.01.ebuild
deleted file mode 100644
index 2c8a0b2744b8..000000000000
--- a/media-sound/abcmidi/abcmidi-2018.04.01.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/abcmidi/abcmidi-2018.02.22.ebuild b/media-sound/abcmidi/abcmidi-2018.12.21.ebuild
index 2c8a0b2744b8..f07ab78a3882 100644
--- a/media-sound/abcmidi/abcmidi-2018.02.22.ebuild
+++ b/media-sound/abcmidi/abcmidi-2018.12.21.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
diff --git a/media-sound/adplay/Manifest b/media-sound/adplay/Manifest
index 3176a9d8cd78..7c182aa7e094 100644
--- a/media-sound/adplay/Manifest
+++ b/media-sound/adplay/Manifest
@@ -1,4 +1,6 @@
 AUX adplay-1.7-fix-c++14.patch 615 BLAKE2B d6e3a8f50257a7c6dcf3d058c7637645f7ff2cb0812998aefc0d912cc46c38244eb532820374ddf7fa4b2e80b37729b16149f116311ebd1238183c068ee101a3 SHA512 aa18046f09493ae98ea2bfa6b2f3b39a4ccc8e24c5dbf584a90765b8962dbc6b037100844d0ad63b57e1ff60e78b45cc02dc10c9ca374d661d6caa87abfcd5ec
 DIST adplay-1.7.tar.bz2 264340 BLAKE2B ea9231c66a8233ee1d026bccd073440cbbc0e8868469aee33ec0e18c7d893fa24dd20bb4fe960f908db0666e7ee5c6a4afd14051b851b011418796cc0cc2c939 SHA512 854a9bee1057d3a42308d9149e74a8abae0b6bdfda5e1466086df9d6aeed4bbc92a045bca02917fc699b43195572b39c6316ddf56ee3441add1a01d6cbbdfcbe
+DIST adplay-1.8.tar.bz2 333582 BLAKE2B e5d0e3baf3f37adb1a2f42eee368fbbcb3947b0c651415b60d5f1d648d004789eae0ef75b7e6ac8ad9f90ac9941332e713e36555167648a40a871659083d1b59 SHA512 6a82b10fa73ad9317303da03d2fcb1fa97772d850f3f78f53c554b9daaa9ae5d04bc2f0a1b1d25fd5d3a1eab073641d6fa0589070721612987d57762f03363c7
 EBUILD adplay-1.7.ebuild 749 BLAKE2B 10c474d7f9f47f00ca55b3cd32568c5387156671f64943cbde06f98dd7694417e26ab3801fa1627b6cad0a5d7e730a1bf18646f26f0225ee48363ab18c9a3b9c SHA512 b54d9e6672fbe0cd86fe86fc33bda8159e016c9a8d06198b4a0dd0a42dd2651ebfe13421e16de3d655c89ae2d319cd0309c2faddec12bb3102a2ad832a2a4a56
-MISC metadata.xml 329 BLAKE2B 27c4b8b5676c1d5f9b3c2d38b397d2edf65dd28fbdca6ea12feb61870a6758f1cd27ab50670674bcb5561f6a70515596b170600dcdf592897edb35153a12142a SHA512 a865c199afa30a18b4b810b4bdd981dfd77fd5843740a43dffc59c10b2e151c66a8e39d73bea04024f544e83f24400ae10aedc9ae3e93db9a67694adf886a073
+EBUILD adplay-1.8.ebuild 727 BLAKE2B 0372362b9b94acab18f6218505e12a7d871d600af2d23d159493b5120839f528fa62592cfb5599c62df3bd269bd6c80f16cec84dc75737b9b9198b6f7e05e9c0 SHA512 05e8162462884a0a91f11363a9a26a0435f6dccf68c710ea831b9aeb03ac393d944e4b56d7399ecb266c3447b38e1060bb0ae98a1a2193b1c0b0bd19b06a4bd5
+MISC metadata.xml 387 BLAKE2B e8dec98b4529ad29a4254bd8bb45b79264ec513b5d5b6368fa00c6755842835e84cd7b709ff884abe892656ee38d1c2640a884b9936876fb5b01ae3371c9e41e SHA512 98c5710d7d8677c0e6152d5ab7ca43b835aa6a8718352047c3424907e390662d714a6083a80cfc6b502c8d504d666deadeb20a917d8ace168411247e531d8af4
diff --git a/media-sound/adplay/adplay-1.8.ebuild b/media-sound/adplay/adplay-1.8.ebuild
new file mode 100644
index 000000000000..76afd8fa9a6c
--- /dev/null
+++ b/media-sound/adplay/adplay-1.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A console player for AdLib music"
+HOMEPAGE="https://adplug.github.io/"
+SRC_URI="https://github.com/adplug/adplay-unix/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa ao oss sdl"
+
+RDEPEND=">=media-libs/adplug-2.2.1
+	dev-cpp/libbinio
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	sdl? ( media-libs/libsdl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--disable-output-esound \
+		$(use_enable alsa output-alsa) \
+		$(use_enable ao output-ao) \
+		$(use_enable oss output-oss) \
+		$(use_enable sdl output-sdl)
+}
diff --git a/media-sound/adplay/metadata.xml b/media-sound/adplay/metadata.xml
index 3be2784242d4..dc329baaf1bf 100644
--- a/media-sound/adplay/metadata.xml
+++ b/media-sound/adplay/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">adplug</remote-id>
+		<remote-id type="github">adplug/adplay-unix</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/ario/Manifest b/media-sound/ario/Manifest
index 02aaee14dbff..59ddb7a8efb5 100644
--- a/media-sound/ario/Manifest
+++ b/media-sound/ario/Manifest
@@ -1,4 +1,4 @@
 AUX ario-1.5.1-single-includes2.patch 16062 BLAKE2B 1cacda4c7fcf04de122d3a0b960605b384239de7fb779b593f9de3dc13d5aa32cbae0018ca60f32ab003cc282f1d3800e08e6d4efd759d77367a0cea19646b90 SHA512 f832498f2445f2f937a1b9636ba6c75fce3a75e706296a315e0c33c3a852140ba829f6972d8cc2ade3fa4a45f21a964eef8134b315fdfe1155cd221e9ee0cbb2
 DIST ario-1.5.1.tar.gz 1135444 BLAKE2B 2d91a7b8ce9c6c6069ec7230e10e7c358a146272474d0dbb298e038a3fb31d524c6ad7a8428af12f580853bbc6ea484ce3ffa6919cd454060d19e9f4cde42200 SHA512 78c3d881d51c3109b73252da0742da2a77bcc24ec21ff2ff02fd3527d62d49a75e412bf092051a9035863d645cba73e6cd2fc674d97629909b931ae9d3ec002b
-EBUILD ario-1.5.1-r1.ebuild 1559 BLAKE2B 92c7a8911826bbad9e44f9d7396c5b724eed6993f472b188b0c0668419c75f2dd826dd15a4a26a5d964403f79c459e2b6efdf50504a52dbd1613e149db283fa5 SHA512 8f401913bd6930d2f1979055bbe05f0612b3061bcafe601652399e0b1d4d6644b679db4feb9ad21e2fd211187e860ad1a5a346eb25c3e0e130e8fd9063815275
-MISC metadata.xml 436 BLAKE2B 28bde8096b7f396729ff603e618638c57c460f3b8a7a5bc6bd8da207701155978cd3e13efdeb027aef6c1ac501287f249d64aae8069b047473e6a0c5a118557c SHA512 25031895d05402f35f2979f8bce734142d539b21ce602c17ee21bb3b49b9d3e097f948020b9a104c314f16dd22fc0436cc8ac65a927eb76442f66907311ad7bd
+EBUILD ario-1.5.1-r1.ebuild 1554 BLAKE2B 124e80d5a4714b1251775ae82ad6b6c19864ddfcd39f29e56644e02a141a1b305a51aecceeeaffd47f668ebc52f9d338d51c26121d6db74576dca5ff9ed8b723 SHA512 6d2a5d70b2974412b2fb9f1d3bc365e8b4eac81fa72da6d192ec2a03969e27a4bc24dd9d2cbadfa6dbf6e2baa4aa8fbb6b543c61abacbc61b627191738e87e31
+MISC metadata.xml 464 BLAKE2B 9f5fbd62fe7ff0cb5a5b73f0aac544f123f26282124d1cd3356f995ab142579bed554c3ac9562b02990aac53ae1f1ed5211a82796487dc32c701ed6c77f09844 SHA512 c520f4984e3b00675e1f79981ee213cdf43af380c3ce86ade4f16848aa80502f4bd7fd3e48804287ab14e269d68d6ab9442d536a443d6121f1bdbf52c429b7c7
diff --git a/media-sound/ario/ario-1.5.1-r1.ebuild b/media-sound/ario/ario-1.5.1-r1.ebuild
index 403cf04a8be5..0d303e6f0e3d 100644
--- a/media-sound/ario/ario-1.5.1-r1.ebuild
+++ b/media-sound/ario/ario-1.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,14 +7,14 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit autotools gnome2 python-any-r1
 
-DESCRIPTION="a GTK2 MPD (Music Player Daemon) client inspired by Rythmbox"
+DESCRIPTION="GTK2 MPD (Music Player Daemon) client inspired by Rythmbox"
 HOMEPAGE="http://ario-player.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}-player/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="audioscrobbler dbus debug +idle libnotify nls python taglib zeroconf"
+IUSE="dbus debug +idle libnotify nls python scrobbler taglib zeroconf"
 
 RDEPEND=">=dev-libs/glib-2.14:2
 	dev-libs/libgcrypt:0=
@@ -24,11 +24,11 @@ RDEPEND=">=dev-libs/glib-2.14:2
 	net-misc/curl
 	net-libs/gnutls
 	>=x11-libs/gtk+-2.16:2
-	audioscrobbler? ( net-libs/libsoup:2.4 )
 	dbus? ( dev-libs/dbus-glib )
 	libnotify? ( x11-libs/libnotify )
 	python? ( dev-python/pygtk:2
 		dev-python/pygobject:2 )
+	scrobbler? ( net-libs/libsoup:2.4 )
 	taglib? ( media-libs/taglib )
 	zeroconf? ( net-dns/avahi )"
 DEPEND="${RDEPEND}
@@ -56,13 +56,13 @@ src_configure() {
 		--enable-search \
 		--enable-playlists \
 		--disable-deprecations \
-		$(use_enable audioscrobbler) \
 		$(use_enable dbus) \
 		$(use_enable debug) \
 		$(use_enable idle mpdidle) \
 		$(use_enable libnotify notify) \
 		$(use_enable nls) \
 		$(use_enable python) \
+		$(use_enable scrobbler audioscrobbler) \
 		$(use_enable taglib) \
 		$(use_enable zeroconf avahi)
 }
diff --git a/media-sound/ario/metadata.xml b/media-sound/ario/metadata.xml
index 6e2b5222d277..f3c1d73810aa 100644
--- a/media-sound/ario/metadata.xml
+++ b/media-sound/ario/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<use>
-		<flag name="audioscrobbler">Enable song tracking via last.fm</flag>
 		<flag name="idle">Enable experimental support for MPD's idle command to reduce bandwidth and cpu usage, requires MPD 0.14</flag>
+		<flag name="scrobbler">Enable audioscrobbler/last.fm support <pkg>net-libs/libsoup</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">ario-player</remote-id>
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 06d4afa53330..9a356c94d318 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -4,9 +4,8 @@ AUX audacious-3.10-use-after-free.patch 1301 BLAKE2B 6b36392901f75cfbb118a8ec7dc
 AUX audacious-3.10-volume-slider-boundaries.patch 896 BLAKE2B 222a1b45f3dfdb4f97f232a290a804d3c78ceeb634fd4db7a0d64f4f86eaf2d14d2806c91695eb99f943ca743fb1521f402c58473b24eeb1d2832f6ec20d9348 SHA512 c565f3dc776e4093acb7d19a3e000b5575fb93b6f275d12f0d23e77802522fb7944a18056cadd0fff3b23262892a2b9feea93e6fcba5c9ae7ce969095730d4d3
 DIST audacious-3.10.tar.bz2 563531 BLAKE2B cde59bd5aff8e0530f76f3bdde20b48f829592a0a67cc03e8b7c08a8892259e99e9de2b1608698ff28819b7a6d0341d5237491f7591c4380566512076a0889b9 SHA512 513d5f9608c1ebeae9cf9bb95128244e990e66c74bf49aff6570ec557d537809f3ebf93c400f5df2708ff61cf04ecc95da183b111f5a757735cef5a68dd9907f
 DIST audacious-3.9-gtk3.tar.bz2 600249 BLAKE2B 08559eafc85236e8e881d0cbe6f08e29c82baf0fc46b9209f1d3eee290460260bfa99e6e8f26940f8c6854f3782da24061226ebdb416b6249d10914093e16276 SHA512 6ff98d027c13b30ea9600a9aba914ec993c69826199b8dc303cb60cebdf2af06a7e3dd4af1d34a86343be5485848a57c8a29e48d2a45a33945585550de4e5f9c
-DIST audacious-3.9.tar.bz2 599488 BLAKE2B 2288fe6919c1770cd283af809629fda72186cc0b87a42821f5fb9b7a20c8e7cd5bc00611d10677a82877c5ebc8a1b5ad728626027b95cc875b66dda732b8747f SHA512 d8ef24c91c84bfa80831075cd9a12fc4bf02cec8bc96bcfa5a941254d194cccdc482482b1c015bc63e1142718c2221034c0f3a87e2cb6e4daf3b4cc428328aaa
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
-EBUILD audacious-3.10.ebuild 1850 BLAKE2B 8ec899c2b73a5c747f270ed9e51926817611c1c79b050a42f859bd3c4f6631895fc114aa0e1090f99b9d4b65e146fad244a8feeadb05bb30ef548cd1d91b575c SHA512 2c903bb9aacc3e68ca1278efa914aae7cf44cd02978f8928c50a23febd8f461019ce88acd2420444f6aff24d45d4a0c268c2f65460c80e93332df9d746bc3e8b
-EBUILD audacious-3.9.ebuild 2118 BLAKE2B a56f92b3c6b166cfbb8a32f8819ac54b055a9bdf193049e20b450f4ce7f7e149db255876b9ae826abf5083afaabdcec4c6c757117691f50dd587721c106cb226 SHA512 6f65840eb3b70d0f9cc0aae6617754c5563e014db904a572b159cd5746c21baae0ad71d575e5b8756d869edb743f8da25410522c0d4d3e1c7e9da798dec0fbdc
-EBUILD audacious-9999.ebuild 2102 BLAKE2B ce1cfbe19b142f4e4273fc040e5e1ba60f65805fb6b29bb00c2a96236c7ad9b87283bf59c28684fa6605e920e4b7a1ad784913f7fbf38bca9d12574b65055dfb SHA512 408ebe7cfe721e90e6fc35d628fd61657049f8ab4920c3c7e94a35c97bac947ccd2963c84ccf451c9f4f83730bd6760a4b7bdf3caafe3f5a4742d037a90f6143
-MISC metadata.xml 486 BLAKE2B 982e0b5a578375d9d67369cf92edcef934c8227e6469aca89417634aca805dea8eba386033a575458d55cce34aceb6adf1de8fdcf3fb3a255c853d6c3be7629d SHA512 365b810cf7b096c86804a87d06a522b5a151559035a1ff5694153081426f5565d6465000bc9618acefc403bda9f675a048aea4dbd3af7dfc25200dd16a1c1dec
+EBUILD audacious-3.10-r1.ebuild 2132 BLAKE2B cf5784125886dd7ccc73b7f60e9d158caeaeda4e10b8381dc458a274ef4bde8129889f28454bdd23c00a10432afabd1ded250263571ed81f9894098369543171 SHA512 6c6ab6ebccfb2942e29ea1dbc6151fab0a9531f05779c1444156f73238d563b29b5e0793d16ae100412434a26da735d55cf1b3337b1eb31220473fa9e3dcdd10
+EBUILD audacious-3.9-r1.ebuild 1585 BLAKE2B 5b3acabf06f46c95cb4fcce6ecc58768ca55fe7b71195efda2e96d8563218f3b40e3e940a53e9b32bea873bc349769d971e40415d2b58882654df8e0a620c90f SHA512 ae3133d291ce0b855f7308b9c050a6bc4c6c189afd5f4d975d1c531d0217ccb6ddb82693b433556401eea30540f791986a8b5340edd8d239987747e80f4d90fa
+EBUILD audacious-9999.ebuild 1954 BLAKE2B 169cf845913b32a57bcb0fd720a096ad873056926c56aa24142568afb3c89ae5afd97f34db43da3962feed1be421b4aaed238a490f7622156336de509bd43f87 SHA512 2214d35e85b1c43e8ae2fe063e79d4d98735885aaf1081c6f489601cafe340350d02ec9e3e2540cdd3a1d321e5bb85d757f7b2f63043aedf63d5dcee43551e9c
+MISC metadata.xml 443 BLAKE2B aa56800edc8a8f1724c41e949081a2198776ac0e8d946e5a8190ec8934f4714fc98c1895d96be35343ed9ce668792c16eb8e329946d323eb3c50129a7ddf7ba0 SHA512 67fc7af1979f3e6377bf96ab610f14dd69d27ec416f98987ead762fa811edbbc977fc9b92fcf6ab722402326956807b51723bd0ebe21531fb1776dfddb486f68
diff --git a/media-sound/audacious/audacious-3.10.ebuild b/media-sound/audacious/audacious-3.10-r1.ebuild
index 926f5853cae9..624ecd083faa 100644
--- a/media-sound/audacious/audacious-3.10.ebuild
+++ b/media-sound/audacious/audacious-3.10-r1.ebuild
@@ -3,13 +3,7 @@
 
 EAPI=6
 
-inherit gnome2-utils xdg-utils
-
 MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
@@ -18,22 +12,28 @@ else
 	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 fi
+inherit gnome2-utils xdg-utils
 
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/"
 SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="nls"
+IUSE="nls qt5"
 
 RDEPEND="
 	>=dev-libs/dbus-glib-0.60
 	>=dev-libs/glib-2.28
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
 	>=x11-libs/cairo-1.2.6
 	>=x11-libs/pango-1.8.0
 	virtual/freedesktop-icon-theme
+	!qt5? ( x11-libs/gtk+:2 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -48,6 +48,21 @@ PATCHES=(
 	"${FILESDIR}/${P}-volume-slider-boundaries.patch"
 )
 
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+	default
+	if ! use nls; then
+		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
+	fi
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
 src_configure() {
 	# D-Bus is a mandatory dependency, remote control,
 	# session management and some plugins depend on this.
@@ -57,9 +72,9 @@ src_configure() {
 	econf \
 		--disable-valgrind \
 		--enable-dbus \
-		--enable-qt \
-		--disable-gtk \
-		$(use_enable nls)
+		$(use_enable nls) \
+		$(use_enable !qt5 gtk) \
+		$(use_enable qt5 qt)
 }
 
 src_install() {
diff --git a/media-sound/audacious/audacious-3.9.ebuild b/media-sound/audacious/audacious-3.9-r1.ebuild
index dea37f7b001f..593acf1e62be 100644
--- a/media-sound/audacious/audacious-3.9.ebuild
+++ b/media-sound/audacious/audacious-3.9-r1.ebuild
@@ -1,32 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+MY_P="${P/_/-}-gtk3"
 inherit gnome2-utils xdg-utils
 
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+DESCRIPTION="Lightweight and versatile audio player"
 HOMEPAGE="https://audacious-media-player.org/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
-else
-	SRC_URI="
-		!gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
-		gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
+	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="gtk gtk3 nls qt5"
-REQUIRED_USE="^^ ( gtk gtk3 qt5 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
 
 RDEPEND="
 	>=dev-libs/dbus-glib-0.60
@@ -34,29 +22,21 @@ RDEPEND="
 	>=x11-libs/cairo-1.2.6
 	>=x11-libs/pango-1.8.0
 	virtual/freedesktop-icon-theme
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)"
+	x11-libs/gtk+:3
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	nls? ( dev-util/intltool )"
+	nls? ( dev-util/intltool )
+"
 PDEPEND="~media-plugins/audacious-plugins-${PV}"
 
-src_unpack() {
-	default
-	if use gtk3; then
-		mv "${MY_P}"{-gtk3,} || die
-	fi
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-}
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	default
-	[[ ${PV} == *9999 ]] && eautoreconf
+	if ! use nls; then
+		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
+	fi
 }
 
 src_configure() {
@@ -68,9 +48,8 @@ src_configure() {
 	econf \
 		--disable-valgrind \
 		--enable-dbus \
-		$(use_enable $(usex gtk gtk gtk3) gtk) \
-		$(use_enable nls) \
-		$(use_enable qt5 qt)
+		--enable-gtk \
+		$(use_enable nls)
 }
 
 src_install() {
diff --git a/media-sound/audacious/audacious-9999.ebuild b/media-sound/audacious/audacious-9999.ebuild
index 47a2fb255287..282261cbea55 100644
--- a/media-sound/audacious/audacious-9999.ebuild
+++ b/media-sound/audacious/audacious-9999.ebuild
@@ -1,32 +1,26 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit gnome2-utils xdg-utils
-
 MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
 else
-	SRC_URI="
-		!gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
-		gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
+	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 fi
+inherit gnome2-utils xdg-utils
 
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/"
 SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="gtk gtk3 nls qt5"
-REQUIRED_USE="^^ ( gtk gtk3 qt5 )"
+IUSE="nls qt5"
 
 RDEPEND="
 	>=dev-libs/dbus-glib-0.60
@@ -34,28 +28,31 @@ RDEPEND="
 	>=x11-libs/cairo-1.2.6
 	>=x11-libs/pango-1.8.0
 	virtual/freedesktop-icon-theme
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
+	!qt5? ( x11-libs/gtk+:2 )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
-	)"
+	)
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	nls? ( dev-util/intltool )"
+	nls? ( dev-util/intltool )
+"
 PDEPEND="~media-plugins/audacious-plugins-${PV}"
 
+S="${WORKDIR}/${MY_P}"
+
 src_unpack() {
 	default
-	if use gtk3; then
-		mv "${MY_P}"{-gtk3,} || die
-	fi
 	[[ ${PV} == *9999 ]] && git-r3_src_unpack
 }
 
 src_prepare() {
 	default
+	if ! use nls; then
+		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
+	fi
 	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
@@ -68,8 +65,8 @@ src_configure() {
 	econf \
 		--disable-valgrind \
 		--enable-dbus \
-		$(use_enable $(usex gtk gtk gtk3) gtk) \
 		$(use_enable nls) \
+		$(use_enable !qt5 gtk) \
 		$(use_enable qt5 qt)
 }
 
diff --git a/media-sound/audacious/metadata.xml b/media-sound/audacious/metadata.xml
index 5eeba2c5c268..56e2b754081b 100644
--- a/media-sound/audacious/metadata.xml
+++ b/media-sound/audacious/metadata.xml
@@ -10,6 +10,6 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<use>
-		<flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of version 2 (x11-libs/gtk+)</flag>
+		<flag name="qt5">Build with Qt5 interface instead Gtk+</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/aumix/Manifest b/media-sound/aumix/Manifest
index 6538f71a9b90..2181a34ef61c 100644
--- a/media-sound/aumix/Manifest
+++ b/media-sound/aumix/Manifest
@@ -1,4 +1,4 @@
 AUX aumix.rc6 1037 BLAKE2B ba9842705caa5e78c7d5886afa6c8408a50169ec79a788d49ca04a8c90bcf581dcb96f4b11c8b6004370143ee6a92d9e0b660132826b2b9e167a07a6dfe73001 SHA512 8960c6c5e61e15e981bfafff7b03aded627971c11d6c21ce9e0d953737f440885fb5dda6a9f942112697c344b4f3ad9f222e2a7cfa493a504dc75a8f4c8cf1c9
 DIST aumix-2.9.1.tar.bz2 231622 BLAKE2B b96075d310b1d04bfc697a9097fd656d85705f68f1b06b1e6ee5bc0ca2b2a3614df67980d0f6e293c4d99adb9d12fae3608ac446eefd1cdf4f04de7f4a5fd1db SHA512 bd063dc9dab8455f467fbe9e4ea1baa5cef914923e66ab5a8fca1e6964cac7851e3755f054bfe41657371e221920fe9a52f9807457996244f4bcd5db4659b21d
-EBUILD aumix-2.9.1.ebuild 995 BLAKE2B 0f08ef78ab18554ff8a0290cc94ab821bcc8b4a4fa9740ec7157b26a2190067ad4fe7c24955608224885b487d3736f627596952836d4899954c978ba9e4ef95b SHA512 fa10366e6e09a6c6da69786417a6661f222bc99772033c12050343aba5fb07d26d5882ff03c5512037e5f982f0c417478aaecc63886203d621b70619e666ac86
+EBUILD aumix-2.9.1.ebuild 924 BLAKE2B a12d1ccea387fffdc81812b4e8563fb446914444dc7362fdfdec2a6867ee8afb9a2c1993723d7d6d82ee24675550228db8de4b8f3d1478716525f61e33d11daa SHA512 99bb83a33f82b18d203d07c754c0f948206545b1639fdc41c74ef04f66e84758503e5212e89fd4c4a3ae4392566b8275dcde51543a518812c518a8c1d91dd347
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/aumix/aumix-2.9.1.ebuild b/media-sound/aumix/aumix-2.9.1.ebuild
index 08f14da30e30..fc6bf40487e4 100644
--- a/media-sound/aumix/aumix-2.9.1.ebuild
+++ b/media-sound/aumix/aumix-2.9.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=7
+
+inherit desktop
 
 DESCRIPTION="Aumix volume/mixer control program"
 HOMEPAGE="http://jpj.net/~trevor/aumix.html"
@@ -13,7 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
 IUSE="gpm gtk nls"
 
-RDEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses:0
 	gpm? ( sys-libs/gpm )
 	gtk? ( x11-libs/gtk+:2 )
 	nls? ( virtual/libintl )"
@@ -34,8 +35,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
+	default
 
 	newinitd "${FILESDIR}"/aumix.rc6 aumix
 
diff --git a/media-sound/baudline/Manifest b/media-sound/baudline/Manifest
index edd7bac12168..11853e29ca82 100644
--- a/media-sound/baudline/Manifest
+++ b/media-sound/baudline/Manifest
@@ -3,4 +3,4 @@ DIST baudline_1.08_linux_ppc.tar.gz 2369780 BLAKE2B 45bb73d76860f7cfb608ffb42e4e
 DIST baudline_1.08_linux_s390.tar.gz 459868 BLAKE2B 41cb33a5def0caacdf2850e04c3a348bb1181d010b5c2e06387c6a36c55473c44d99d3058614cdae104b04f2f94c0150c81a64c2ee509774ce15c82948fdb658 SHA512 636380e7b67b7885676ab9ae89a2ee97ac5a7934c1636f984ecbabc3bc78a3d1cd2b15a7e0572bb0f7a78d65a69df60550edad424dd102b5b85e244ae87ea5c7
 DIST baudline_1.08_linux_x86_64.tar.gz 2270546 BLAKE2B 722318b4d3a1e244c8e6c57555a29b9b1305c26a3f7711cd13deef3e2f57ed78bdd624947a9db1c10cda2f807c0248e14cd1a0fc28da0a7a0511e41d75fb84cc SHA512 d0cb5dc0e6cc3fd79dbc2a37e7a1b9bbb050c953d1d2893f24f87a45f301fbc69ba4ba3b2f32903caec391ed0ca6913d2c320ca82039bb41185b21e100a754c4
 EBUILD baudline-1.08-r1.ebuild 1696 BLAKE2B a4d06c26321c9396d153595181c157e9e956c4a474612670940669ad594bf1ab976319f645a71e6f708e53c162a209e49d15e4d4c8b5ab0ffe47cf341292c767 SHA512 f3a6e8a3f732a6a81db95eed6bc1b8da310edad1320fc0f2aa0a7524d11a4496a9e5b6146aeea2f74ec7fcf00eac444557d5e5d8b4749b2e5c22771421381902
-MISC metadata.xml 854 BLAKE2B f58105540f8ff3adb265cb0e52b7b8105294c0e0088efa2c910571c19014d42f63a1bff08a8405f0aac65f590595828e4e454b6972b52a6ddf2c945e835e60da SHA512 ad0defc486701f1265e64df7ce28b589d37e990d6ca4a9342f549ecf01ac8a522d5201334234c3c6878a4c0e5a9d6e22526ea2dac1428d9607a26ff93b887fae
+MISC metadata.xml 783 BLAKE2B 1091fa7f98ee5a548e558bb0faf1f1a354575d0832ddca9dd6d3137f9b1c6d848a9ddd14d22f22b57d8fe5f88a18456a0a0f3da1249756826d67c60e5c29ea72 SHA512 f58c345d9ac036c5c3170d9093f5b8edf15db9a302e37675588ab734bb3898533dbdeaaa8d59a889843d456f7717996071810d811d58426ee43e4c3e0d354c5d
diff --git a/media-sound/baudline/metadata.xml b/media-sound/baudline/metadata.xml
index 13c289ccad72..f9d9c0fca82e 100644
--- a/media-sound/baudline/metadata.xml
+++ b/media-sound/baudline/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 Baudline is a time-frequency browser designed for scientific visualization of the spectral domain.  Signal analysis is performed by Fourier, correlation, and raster transforms that create colorful spectrograms with vibrant detail.  Conduct test and measurement experiments with the built in function generator, or play back audio files with a multitude of effects and filters.  The baudline signal analyzer combines fast digital signal processing, versatile high speed displays, and continuous capture tools for hunting down and studying elusive signal characteristics.
 </longdescription>
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index b9ccc698a9ef..770f8af54fed 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -1,8 +1,6 @@
 AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fce5cade63163376f9b6400a1a4aaed90a09b8c87650e90f1c84f98199844e32f05b0d387ba3db4971e SHA512 6ddf5c4e82d30c1c56cdcdd0207d353dca4398d2e7e5e514b9dc1dd55bf1053876d0c12b3fd77dd7dff2c348b60bcf6f215f57f0c72aaf1b29e735e86f060406
 AUX bluealsa-init.d 368 BLAKE2B 62558866adfed1fffafa47f15d0704d228d31e38529c542093b21dc1e82d459068a545e3e033cec32ec2ac9c8185459365846ce97a4f1264535533a6e55a186f SHA512 d0ffcd77d6aa7fd97d72b3cdb4b938c98a59344c8e710e6063adcf46091a9c33077edc913caecd65443ff5e9062998b1299b20b5c3866825640f33f662d8c88d
-DIST bluez-alsa-1.3.0.tar.gz 86109 BLAKE2B 0a026c590a3e8f655db367e38891142d757eabc8ba647c655451e7b5ff9beabcc71ec33e16522ee7818be7513c9ecc4c5512ce6a2358651b4d8e77cd90f6a25f SHA512 f355873622290bc0193799a77660adf1e3622d3ad77a8e0cbf46d59b3c015009c8b3318c414b855c569d40bbe450a490f53c8d5382350beadfff6e65ab8e58bc
 DIST bluez-alsa-1.3.1.tar.gz 87333 BLAKE2B 0479baa103b9e6e5c26d061df59b0a36a24a74ee04c882a888d63458da96a980bc9f39a6219cd4ad9f8c04b0d58fb337a960584eb7b93455474111a71ddbeb9f SHA512 2b2f7b26b7b8cff70517bf8a24170330038be40f1a5a2fc75d20853b7beca6c9f9e2e6068f6b0f4fa9b6fc61f374ff59961434be8daa3b4d283abfd165be9cbf
-EBUILD bluez-alsa-1.3.0.ebuild 1409 BLAKE2B c0b782b57eb208b6724b34f70987d75592e0047b011ff9981baa5c6ba7aa2cd432ac79cb1c73bcac9cb2f82431bfa14270e608675bfbd5f2bca40ea789046dc8 SHA512 31e1228184456459f1440c98ec3edf2704ea1ae76650b2c7a69273483cfe4277ac39a70c4da31fac860b19c6408869bfd878208964969954a1540ccf1f7bbacc
-EBUILD bluez-alsa-1.3.1.ebuild 1409 BLAKE2B c0b782b57eb208b6724b34f70987d75592e0047b011ff9981baa5c6ba7aa2cd432ac79cb1c73bcac9cb2f82431bfa14270e608675bfbd5f2bca40ea789046dc8 SHA512 31e1228184456459f1440c98ec3edf2704ea1ae76650b2c7a69273483cfe4277ac39a70c4da31fac860b19c6408869bfd878208964969954a1540ccf1f7bbacc
-EBUILD bluez-alsa-9999.ebuild 1409 BLAKE2B c0b782b57eb208b6724b34f70987d75592e0047b011ff9981baa5c6ba7aa2cd432ac79cb1c73bcac9cb2f82431bfa14270e608675bfbd5f2bca40ea789046dc8 SHA512 31e1228184456459f1440c98ec3edf2704ea1ae76650b2c7a69273483cfe4277ac39a70c4da31fac860b19c6408869bfd878208964969954a1540ccf1f7bbacc
+EBUILD bluez-alsa-1.3.1.ebuild 1408 BLAKE2B 5fcb2a033a68053edd7351c7ca02d9131637c5160659a93fa11d428fc5bedc17947c1dada2748d2a5053e28b36e050c509a75ffb14170e0044812e557dcac976 SHA512 073d4600fbcaa8f92ade4d3fd3b037f4b89a9593b52d529a34c4f2d9e0d3684016ada86fd43390ef059aa70b833809bcbbccb82747af47bffb2f725f15ec8ee5
+EBUILD bluez-alsa-9999.ebuild 1408 BLAKE2B 5fcb2a033a68053edd7351c7ca02d9131637c5160659a93fa11d428fc5bedc17947c1dada2748d2a5053e28b36e050c509a75ffb14170e0044812e557dcac976 SHA512 073d4600fbcaa8f92ade4d3fd3b037f4b89a9593b52d529a34c4f2d9e0d3684016ada86fd43390ef059aa70b833809bcbbccb82747af47bffb2f725f15ec8ee5
 MISC metadata.xml 429 BLAKE2B 63f3e964e9b2aeed132b919848f9250cc5241c1a5c72b8deb6c4034313e38e92d0b54abdd08553046ef0b7b3862bb23e5eec9ce6845e991f6dd20a61e46ba74d SHA512 3d78a456405cffae4f5995197ca02dfeaf447d3ec417ddb00494cb07defc294329254c227aec5d24ed6c144a97606547b8fca184653e3882ec0c229f19621a8c
diff --git a/media-sound/bluez-alsa/bluez-alsa-1.3.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-1.3.0.ebuild
deleted file mode 100644
index 6c59d2ee4e2f..000000000000
--- a/media-sound/bluez-alsa/bluez-alsa-1.3.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib-minimal
-
-DESCRIPTION="Bluetooth Audio ALSA Backend"
-HOMEPAGE="https://github.com/Arkq/bluez-alsa"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Arkq/${PN}"
-else
-	SRC_URI="https://github.com/Arkq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="aac debug hcitop static-libs"
-
-RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
-	>=media-libs/alsa-lib-1.0[${MULTILIB_USEDEP}]
-	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
-	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
-	aac? ( >=media-libs/fdk-aac-0.1.1[${MULTILIB_USEDEP}] )
-	hcitop? (
-		dev-libs/libbsd
-		sys-libs/ncurses:0=
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-rfcomm
-		$(use_enable aac)
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable hcitop)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-
-	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
-	newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
-}
-
-pkg_postinst() {
-	elog "Users can use this service when they are members of the \"audio\" group."
-}
diff --git a/media-sound/bluez-alsa/bluez-alsa-1.3.1.ebuild b/media-sound/bluez-alsa/bluez-alsa-1.3.1.ebuild
index 6c59d2ee4e2f..bb62cc607f2e 100644
--- a/media-sound/bluez-alsa/bluez-alsa-1.3.1.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
 	>=media-libs/alsa-lib-1.0[${MULTILIB_USEDEP}]
 	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
 	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
-	aac? ( >=media-libs/fdk-aac-0.1.1[${MULTILIB_USEDEP}] )
+	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
 	hcitop? (
 		dev-libs/libbsd
 		sys-libs/ncurses:0=
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index 6c59d2ee4e2f..bb62cc607f2e 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
 	>=media-libs/alsa-lib-1.0[${MULTILIB_USEDEP}]
 	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
 	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
-	aac? ( >=media-libs/fdk-aac-0.1.1[${MULTILIB_USEDEP}] )
+	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
 	hcitop? (
 		dev-libs/libbsd
 		sys-libs/ncurses:0=
diff --git a/media-sound/brutefir/Manifest b/media-sound/brutefir/Manifest
index 6a3ed9a02769..1f5e0d220258 100644
--- a/media-sound/brutefir/Manifest
+++ b/media-sound/brutefir/Manifest
@@ -1,5 +1,4 @@
 AUX brutefir-1.0k-ld.patch 4655 BLAKE2B 56ae2cf653311030e5552e50653082b059baa39bf00d1d9a2692e319b459a88b4bef4e0a1aa01aedd2ec9c97f19de0f03b966d10c6faeeccd6ef907d91b12a59 SHA512 606d32f1b76901e3cb6d106259d19c64e3a6f841fd5d0791623ad824c7264ff3ecd7178073fe488c7f1d26b996b9900f9661406f987f2443e9eb8ef9eeb6491a
 DIST brutefir-1.0k.tar.gz 246987 BLAKE2B 3db08c1f51e8febb63b293d1a242342e7d9f4fa4b447b46da37bc3de594bef8a6ee15cd8330ef73673011186dcfe47a5b056ec3c177f3982cd1837a582f050a1 SHA512 5eb81a18935fc3f014613b74c30b2e9a3acfe0ab58b72358f0428b60f0296ab54796b99fa00b12a671935b57589d710dd81b1e0ca675bd2b841c9e932a2c94ef
-EBUILD brutefir-1.0k-r1.ebuild 1217 BLAKE2B 0dd758e2e3d319e0b376b9f00f7ade1bbef1dc74a5a5f399dc516ae311ff9671a4a91e355d06cdbaa1835318c1778321dd7568999c862aaf6f795a6f38681437 SHA512 86a2d22827c14dd89105976676f7c9e48143a610b07e3ea53e5cf7536716ee4acaec0eea1ebd78d3879b0c1c6c45e2fbe30983d57bb14409232453df02951dae
-EBUILD brutefir-1.0k-r2.ebuild 1108 BLAKE2B 6cb5824eea3e58cac26ff40c9cc412dc081e39f35bd85aa9cda77e268f422f9a82587c622f85f86cacd5972614708d5fd0e513dce2d3e6bdada8428c527af6b7 SHA512 1fd4f6f28008770336559eca2077af00185c6b91f6bf72deac652a6934548ade23ceabc69fd87f1a194b6f20767e99e622e243a253aa151444b0e29a4e8f27ec
+EBUILD brutefir-1.0k-r2.ebuild 1103 BLAKE2B fa456a16de2a0014236595bbc49a5b158536a758a184d87d351053e4d898c509515f2440dce18bfc2ef6db50709314e6f527fc9777353afed53d554098ae362b SHA512 b9203230a0686522331f196fdfb3f0fb3daef3ca35ca6fc5f13b30e85906e9bef4254af5228fcaa68db9498e45ae125359844c489d763e964adcefc401e03e24
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/brutefir/brutefir-1.0k-r1.ebuild b/media-sound/brutefir/brutefir-1.0k-r1.ebuild
deleted file mode 100644
index 1ec006053754..000000000000
--- a/media-sound/brutefir/brutefir-1.0k-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Software convolution engine for applying long FIR filters"
-HOMEPAGE="http://www.ludd.luth.se/~torger/brutefir.html"
-SRC_URI="http://www.ludd.luth.se/~torger/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="media-libs/alsa-lib
-	media-sound/jack-audio-connection-kit
-	sci-libs/fftw:3.0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ld.patch
-}
-
-src_compile() {
-	tc-export AS CC
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" \
-		install || die "emake install failed"
-	dodoc CHANGES README
-
-	insinto /usr/share/${PN}
-	doins xtc_config directpath.txt crosspath.txt massive_config \
-		bench1_config bench2_config bench3_config bench4_config \
-		bench5_config || die "doins failed"
-}
-
-pkg_postinst() {
-	elog "Brutefir is a complicated piece of software. Please"
-	elog "read the documentation first! You can find"
-	elog "documentation here: http://www.ludd.luth.se/~torger/brutefir.html"
-	elog "Example config files are in /usr/share/brutefir"
-}
diff --git a/media-sound/brutefir/brutefir-1.0k-r2.ebuild b/media-sound/brutefir/brutefir-1.0k-r2.ebuild
index c4bc957fd6f7..5c205ce75718 100644
--- a/media-sound/brutefir/brutefir-1.0k-r2.ebuild
+++ b/media-sound/brutefir/brutefir-1.0k-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.ludd.ltu.se/~torger/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="media-libs/alsa-lib
 	media-sound/jack-audio-connection-kit
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 7c119ea7d34e..a33638a729aa 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,7 +1,5 @@
 AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df
 AUX cantata-2.3.2-opusfile.patch 1529 BLAKE2B fdfd27280f757ba4fa017fde4d52514dbbece6219feede3e35f9304de783787a75e43f6a1ecabc2d9bdd773c1c5db3e6d85dc206ed5e0d8425c23a37b52d0213 SHA512 e6b8d714ca6a37fd096ad77fb187e9552058dae98c73ebed9f30e04dd03f8467a27ce0cf1afa9a868e86cb5c8aad05599bafb6b56929de9753251e2bb22c6b78
-DIST cantata-2.2.0.tar.bz2 2251649 BLAKE2B 9b28a4e3a77245fcf00f81780adecdc51e066f068798f92300ef8527872313f5fb56d4b90a6f5511caf951ba9fcd5c094dd5e9062fe3d314b75412b3e8e03d37 SHA512 519a2e24c8b2a1c98a2006a1f590945e1bd5e98a2c3a1b5da23e40f2297f1477d48d69b48ec669219f5ab8fdc955486fe29db6914abeef1fba2a47377f694ecd
 DIST cantata-2.3.2.tar.bz2 2440595 BLAKE2B d77a41752ff9660f27da11748497b394667f456edf52d785b3ebf31446045a4de2bcc9b22ac2d68dfd4e0f00d10a53ae9e79643e116783879eb68bab48b59589 SHA512 d55ee5f2194626db3465d8c499459bac82656e12bdb5f771581eef9d6a42ee25fc9b31e8bb5cea8913cbd47a967141f990efddb353797f81e722b7b99a73b1a4
-EBUILD cantata-2.2.0.ebuild 2906 BLAKE2B afc79b29d42719e018485c8742a21bfe596925b2ff83fd8de69bd699bdff03b7dcf8c4a1b0ac69df26fb140b64457485b62ca542c0632b2ec436a064a29b7532 SHA512 62a3a89fe9661db39cc7a8682fd4df72f8fa911a25a4cb1db66cc8f0cd0acdd00912b60a43442832b2dc01df69ab4015e817b345dbe0dc3b71418f52334ee03a
 EBUILD cantata-2.3.2.ebuild 3231 BLAKE2B eb0e61fe493625c48e813a5bfef9f783ee18228f4d0834e773d090f9e222039827cfad373cec47ac73cf6c588446d5f6097c3388c4e2fd7168519a52d8a10880 SHA512 5a5a92ca899306963e8740a6000b5333ac71bfb10086a1b6e35c7ce598275fc9a21b16b4881b80353a786e13f70b388785119f18bc05c9c2b35cf42b2144a5d0
 MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97
diff --git a/media-sound/cantata/cantata-2.2.0.ebuild b/media-sound/cantata/cantata-2.2.0.ebuild
deleted file mode 100644
index 388cff4d5613..000000000000
--- a/media-sound/cantata/cantata-2.2.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs de en_GB es fr hu it ja ko pl ru zh_CN"
-inherit cmake-utils gnome2-utils l10n qmake-utils xdg
-
-DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
-HOMEPAGE="https://github.com/CDrummond/cantata"
-SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks"
-REQUIRED_USE="
-	?? ( cdda cdio )
-	cdda? ( udisks || ( cddb musicbrainz ) )
-	cddb? ( || ( cdio cdda ) taglib )
-	cdio? ( udisks || ( cddb musicbrainz ) )
-	mtp? ( taglib udisks )
-	musicbrainz? ( || ( cdio cdda ) taglib )
-	replaygain? ( taglib )
-"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	|| ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
-	sys-libs/zlib
-	virtual/libudev:=
-	cdda? ( media-sound/cdparanoia )
-	cddb? ( media-libs/libcddb )
-	cdio? ( dev-libs/libcdio-paranoia )
-	mtp? ( media-libs/libmtp )
-	musicbrainz? ( media-libs/musicbrainz:5= )
-	replaygain? (
-		media-libs/libebur128
-		media-sound/mpg123
-		virtual/ffmpeg
-	)
-	streaming? ( media-video/vlc:0= )
-	taglib? (
-		media-libs/taglib[asf(+),mp4(+)]
-		media-libs/taglib-extras
-		udisks? ( sys-fs/udisks:2 )
-	)
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	dev-qt/linguist-tools:5
-"
-
-# cantata has no tests
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-headers.patch" )
-
-src_prepare() {
-	remove_locale() {
-		rm "translations/${PN}_${1}".ts || die
-	}
-
-	cmake-utils_src_prepare
-
-	# Unbundle 3rd party libs
-	rm -r 3rdparty/{ebur128,qtsingleapplication} || die
-
-	l10n_find_plocales_changes "translations" "${PN}_" ".ts"
-	l10n_for_each_disabled_locale_do remove_locale
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
-		-DENABLE_CDPARANOIA=$(usex cdda)
-		-DENABLE_CDDB=$(usex cddb)
-		-DENABLE_CDIOPARANOIA=$(usex cdio)
-		-DENABLE_HTTP_SERVER=$(usex http-server)
-		-DENABLE_MTP=$(usex mtp)
-		-DENABLE_MUSICBRAINZ=$(usex musicbrainz)
-		-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
-		-DENABLE_FFMPEG=$(usex replaygain)
-		-DENABLE_MPG123=$(usex replaygain)
-		-DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
-		-DENABLE_TAGLIB=$(usex taglib)
-		-DENABLE_TAGLIB_EXTRAS=$(usex taglib)
-		-DENABLE_DEVICES_SUPPORT=$(usex udisks)
-		-DENABLE_REMOTE_DEVICES=OFF
-		-DENABLE_UDISKS2=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_pkg_postinst
-
-	has_version media-sound/mpd || \
-		elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_pkg_postrm
-}
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 360d13cf6994..a1c16b3f58f1 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,8 +1,8 @@
-AUX clementine-1.3.1_p20181112-no-dbus.patch 1356 BLAKE2B eda2e90798f5028cc5406df9b5ba5b2be01c16d6644d6f2a2416af46e8e8dbadf6a7fd7b5b6e6d32393589ef9d3e2b73ee5a37290f8265fbb7f3e03405825224 SHA512 a001f42b6c4352a0d01eea769959383b4674a1988ae07d6754bd85546b8343f793f8ab86a865c86a6bb7ce2a4c8f99f921e7e1cc61b624bdae4f5bf36865d6b2
+AUX clementine-1.3.1_p20181201-cmake.patch 5224 BLAKE2B bd5ca791fc6d67f2ae1e73389b8c947b55ab7d4f0ab4a2187cb9c8473486d0e9466493afd33c0d4d403c6209c16288edb7fcadb4e950005715e746b46584b144 SHA512 c65970a2278e2b62d46ac6349fce53213b57efcb5621fb6459c123d6dbea806c34849ab68e6e85ba1e1a003e5d50e0d6f51949cf80466f58383940e37d69bf76
 AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195a7016a7dcd0f01128dc24a22c10ea5cba0cc302852272ca4d45844c0003572809fa8d8c1a2e37524d2e8c75e64d96290f SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a
 DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 37412428cf030a71f0011ba68a7ce71a3bbdc59402dc6d6349cca8ee44b208052cee9add1597a9577e5a6ed4bb2ebf16c4e1f79612d12be265f637caffd02a76 SHA512 8f38554571c637d9f79df43679ac2a76383f7a9b4ee8e921a16175889180e72afadc352dd40d73a671aa8ae9b01f6a251ae7b94b010043f8bcb8d8f42dcfff62
-DIST clementine-1.3.1_p20181112.tar.gz 8526632 BLAKE2B da3f155006ef5e94233104011aadad41e974ec339827b91bd3c5c0c2420b23199be852a9d0cb7c9b0112ba2d43ff3e3e87388db92679f8e64da5c3fa3e578c1d SHA512 eed16cec7323b142e4602a4bd81d7363e9cf4fc203c3b8b341aadbe883fdbd571dff0792260eec8af2f91e79fe905c3510d1e7ce1b06e9d4698016820cc771fa
+DIST clementine-1.3.1_p20181201.tar.gz 8535075 BLAKE2B c4b6660ee9718054cc13c6b4fc2e1dccf9c117319f5b682dc5de2861fc40cc129e079449e1c2e15733faf14b6e18b42f37c228000a8e6c121b7fdcb2e48bc7b9 SHA512 fcc062857b95a5cabc41449143bb876df9955cdaaa59868f147d7a165dea13e2e4e1c11ea23f4309c8af7bef42d694a82867420245513af8e4dfbd91ab6f9a2c
 EBUILD clementine-1.3.1_p20180416.ebuild 5175 BLAKE2B b66494abab89a91ed12929a31c5253ab9c2190f3a95f5443a15ec8244a51704cafa734d754dc6928393addccfbfe1f081c9ecfe217a83e15e808a79207878e8e SHA512 302a93dc77c533bc65c10de9f82d1ed5da2f42c40c83392b4b1a32da3fd4e25f530e07edcf704780a93abce026ddc41c4b3054ea94964f4a1cc79658eb5e5ad7
-EBUILD clementine-1.3.1_p20181112.ebuild 5219 BLAKE2B acda6fd2baaaa86a1366bbc8f3be825fffd0238e70a14529b991aae4637a63a6770726eeb7ec357cabc08e9d38bbc9d28231fee57351f31032ed826bf27fb1ce SHA512 083866c2400177d690263387dbe6384a33b24fda7822bc6f687b5214511ec4ac74cdd88aca6faa0c77af2dc5a0e603736a6d33fa7b9c00b9493179289cfb5f8a
+EBUILD clementine-1.3.1_p20181201.ebuild 5254 BLAKE2B 71f4a4ac2cdbcd23cf1a5e4f9e098e0841872306db1fef39189ee53ff2e18aa086095cbdcaf1977932e61be509213edbcd0783054b683ec9d7dcdc78ba8f2178 SHA512 40a9aa0d2bf16e68cd4b749adfeb0ebf46987a84554371f3c85d959f3c46eaf8c48067a9643cfb827850d0a2a3b51e82fb2eb5d90598386bf4394b6bdf2358e7
 EBUILD clementine-9999.ebuild 5106 BLAKE2B 173f32354a9891b77909bee7e617b39b6b90005d7dc40a1da8e271dbc7aeb28421e7b9aeaaf1e075de0be9801df98a8233e89e4b669efb2891854ec3b5fae55b SHA512 6b2a173785f473e5290f673a42d55092bf1e184eff3eed0fabef238758395f7a21d9a090cd29efb36e3db3fd2b52dc55d53a271edf1c8d7038ff5a516cefe39a
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-1.3.1_p20181112.ebuild b/media-sound/clementine/clementine-1.3.1_p20181201.ebuild
index 0840a685935d..3d3061880f8c 100644
--- a/media-sound/clementine/clementine-1.3.1_p20181112.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20181201.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
 	GIT_ECLASS="git-r3"
 else
-	COMMIT=b8eea8ccc116388b67e4b042a5b81e87bf7a24e5
+	COMMIT=d87307fbc718a57ca38b5354f196db05b560036c
 	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
@@ -50,7 +50,6 @@ COMMON_DEPEND="
 	>=media-libs/taglib-1.11.1_p20181028
 	sys-libs/zlib
 	virtual/glu
-	virtual/opengl
 	x11-libs/libX11
 	cdda? ( dev-libs/libcdio:= )
 	dbus? ( dev-qt/qtdbus:5 )
@@ -61,6 +60,7 @@ COMMON_DEPEND="
 	projectm? (
 		media-libs/glew:=
 		>=media-libs/libprojectm-1.2.0
+		virtual/opengl
 	)
 "
 # Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
@@ -81,7 +81,6 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-cpp/gtest-1.8.0
 	dev-libs/boost
 	dev-qt/linguist-tools:5
-	dev-qt/qtopengl:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
 	sys-devel/gettext
@@ -89,6 +88,7 @@ DEPEND="${COMMON_DEPEND}
 	box? ( dev-cpp/sparsehash )
 	dropbox? ( dev-cpp/sparsehash )
 	googledrive? ( dev-cpp/sparsehash )
+	projectm? ( dev-qt/qtopengl:5 )
 	pulseaudio? ( media-sound/pulseaudio )
 	seafile? ( dev-cpp/sparsehash )
 	skydrive? ( dev-cpp/sparsehash )
@@ -104,7 +104,7 @@ S="${WORKDIR}/${PN^}-${COMMIT}"
 
 DOCS=( Changelog README.md )
 
-PATCHES=( "${FILESDIR}"/${P}-no-dbus.patch )
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
 
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
@@ -142,7 +142,7 @@ src_configure() {
 		-DLINGUAS="$(l10n_get_locales)"
 		-DENABLE_BOX="$(usex box)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DENABLE_DBUS="$(usex dbus)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
 		-DENABLE_DROPBOX="$(usex dropbox)"
 		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
 		-DENABLE_LIBGPOD="$(usex ipod)"
diff --git a/media-sound/clementine/files/clementine-1.3.1_p20181112-no-dbus.patch b/media-sound/clementine/files/clementine-1.3.1_p20181112-no-dbus.patch
deleted file mode 100644
index d03db2451ad3..000000000000
--- a/media-sound/clementine/files/clementine-1.3.1_p20181112-no-dbus.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From d940136d0ae2a98ea72d842df0099bebcd361426 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Fri, 2 Nov 2018 12:58:08 +0100
-Subject: [PATCH] Fix build without Qt5DBus
-
----
- CMakeLists.txt     | 2 +-
- src/CMakeLists.txt | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c1de26e3e..eaf794c27 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -304,7 +304,7 @@ endif ()
- if(WIN32)
-   set(QT_LIBRARIES Qt5::Core Qt5::OpenGL Qt5::Sql Qt5::Network Qt5::Xml Qt5::Widgets Qt5::Concurrent)
- else(WIN32)
--  set(QT_LIBRARIES Qt5::Core Qt5::OpenGL Qt5::Sql Qt5::Network Qt5::Xml Qt5::Widgets Qt5::Concurrent Qt5::X11Extras Qt5::DBus)
-+  set(QT_LIBRARIES Qt5::Core Qt5::OpenGL Qt5::Sql Qt5::Network Qt5::Xml Qt5::Widgets Qt5::Concurrent Qt5::X11Extras)
- endif(WIN32)
- 
- # Remove GLU and GL from the link line - they're not really required
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 120f09949..88f1ac6c3 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1249,6 +1249,10 @@ target_link_libraries(clementine_lib
-   Qocoa
- )
- 
-+if (HAVE_DBUS)
-+  target_link_libraries(clementine_lib Qt5::DBus)
-+endif ()
-+
- if(ENABLE_VISUALISATIONS)
-   target_link_libraries(clementine_lib ${LIBPROJECTM_LIBRARIES})
- endif(ENABLE_VISUALISATIONS)
--- 
-2.19.1
-
diff --git a/media-sound/clementine/files/clementine-1.3.1_p20181201-cmake.patch b/media-sound/clementine/files/clementine-1.3.1_p20181201-cmake.patch
new file mode 100644
index 000000000000..633bf39be9d1
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.3.1_p20181201-cmake.patch
@@ -0,0 +1,165 @@
+From 940fcb260b345d2598d04fd07c6718566b3adda1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 1 Dec 2018 23:29:43 +0100
+Subject: [PATCH 1/3] Qt5::Test is not required in the global QT_LIBRARIES
+ definition
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e660a376a..e18e008c0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -110,7 +110,7 @@ if(WIN32)
+   find_package(Qt5 REQUIRED COMPONENTS WinExtras)
+ endif()
+ 
+-set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Sql Qt5::Xml Qt5::OpenGL Qt5::Test)
++set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Sql Qt5::Xml Qt5::OpenGL)
+ 
+ if(DBUS_FOUND)
+   set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::DBus)
+-- 
+2.19.2
+
+
+From 4e11613088d24f248046d449f63bfd245f1e82cc Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 1 Dec 2018 23:44:35 +0100
+Subject: [PATCH 2/3] Qt5::DBus had already been optional, drop bogus pkgconfig
+ search
+
+This partially reverts commit 4321ecf7d26c5eed577a97d230786bb9f56ea37f.
+---
+ CMakeLists.txt | 17 +++++++----------
+ 1 file changed, 7 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e18e008c0..0d1403e04 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,7 +52,6 @@ find_package(PkgConfig REQUIRED)
+ find_package(Protobuf REQUIRED)
+ find_package(FFTW3)
+ find_package(ALSA)
+-pkg_check_modules(DBUS dbus-1)
+ if (NOT APPLE)
+   find_package(X11)
+ endif()
+@@ -96,13 +95,10 @@ find_path(SPARSEHASH_INCLUDE_DIRS google/sparsetable)
+ # QT
+ set(QT_MIN_VERSION 5.6.0)
+ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Concurrent Widgets Network Sql Xml OpenGL Test)
++find_package(Qt5DBus ${QT_MIN_VERSION})
+ if(X11_FOUND)
+   find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras)
+ endif()
+-if(DBUS_FOUND)
+-  find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS DBus)
+-  get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt5::qdbusxml2cpp LOCATION)
+-endif()
+ if(APPLE)
+   find_package(Qt5 REQUIRED COMPONENTS MacExtras)
+ endif()
+@@ -112,8 +108,9 @@ endif()
+ 
+ set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Sql Qt5::Xml Qt5::OpenGL)
+ 
+-if(DBUS_FOUND)
++if(Qt5DBus_FOUND)
+   set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::DBus)
++  get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt5::qdbusxml2cpp LOCATION)
+ endif()
+ if(X11_FOUND)
+   set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::X11Extras)
+@@ -286,19 +283,19 @@ optional_component(LIBLASTFM ON "Last.fm support"
+ )
+ 
+ optional_component(DBUS ON "D-Bus support"
+-  DEPENDS "D-Bus" DBUS_FOUND
++  DEPENDS "Qt5DBus" Qt5DBus_FOUND
+ )
+ 
+ optional_component(WIIMOTEDEV ON "Wiimote support"
+-  DEPENDS "D-Bus support" DBUS_FOUND
++  DEPENDS "D-Bus support" Qt5DBus_FOUND
+ )
+ 
+ optional_component(DEVICEKIT ON "Devices: DeviceKit backend"
+-  DEPENDS "D-Bus support" DBUS_FOUND
++  DEPENDS "D-Bus support" Qt5DBus_FOUND
+ )
+ 
+ optional_component(UDISKS2 ON "Devices: UDisks2 backend"
+-  DEPENDS "D-Bus support" DBUS_FOUND
++  DEPENDS "D-Bus support" Qt5DBus_FOUND
+ )
+ 
+ if (CRYPTOPP_FOUND OR HAVE_SPOTIFY_BLOB)
+-- 
+2.19.2
+
+
+From 21e9f8be5b986581ab04869d28c335f949423ef5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 2 Dec 2018 00:21:17 +0100
+Subject: [PATCH 3/3] Find X11 only once, in root CMakeLists.txt
+
+Since we have HAVE_X11, use HAVE_X11 in cmake.
+---
+ 3rdparty/qxt/CMakeLists.txt | 1 -
+ CMakeLists.txt              | 4 ++--
+ src/CMakeLists.txt          | 1 -
+ 3 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/3rdparty/qxt/CMakeLists.txt b/3rdparty/qxt/CMakeLists.txt
+index 8fd9220ae..73c67a9fa 100644
+--- a/3rdparty/qxt/CMakeLists.txt
++++ b/3rdparty/qxt/CMakeLists.txt
+@@ -10,7 +10,6 @@ set(QXT-MOC-HEADERS
+   qxtglobalshortcut.h
+ )
+ 
+-find_package(X11)
+ include_directories(${X11_INCLUDE_DIR})
+ include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
+ 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0d1403e04..bd191b59e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -96,7 +96,7 @@ find_path(SPARSEHASH_INCLUDE_DIRS google/sparsetable)
+ set(QT_MIN_VERSION 5.6.0)
+ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Concurrent Widgets Network Sql Xml OpenGL Test)
+ find_package(Qt5DBus ${QT_MIN_VERSION})
+-if(X11_FOUND)
++if(HAVE_X11)
+   find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras)
+ endif()
+ if(APPLE)
+@@ -112,7 +112,7 @@ if(Qt5DBus_FOUND)
+   set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::DBus)
+   get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt5::qdbusxml2cpp LOCATION)
+ endif()
+-if(X11_FOUND)
++if(HAVE_X11)
+   set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::X11Extras)
+ endif()
+ if(APPLE)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 0eb14e28c..4a612d5bd 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1364,7 +1364,6 @@ if (UNIX AND NOT APPLE)
+   # command but they're actually used by libraries that appear after them, so
+   # they end up getting ignored.  This appends them to the very end of the link
+   # line, ensuring they're always used.
+-  find_package(X11)
+   if (FREEBSD)
+     target_link_libraries(clementine_lib ${X11_X11_LIB})
+   else ()
+-- 
+2.19.2
+
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index 8096384dc767..131a8ede9295 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,3 +1,4 @@
 DIST cmus-2.8.0_rc0.tar.gz 315613 BLAKE2B b5f44b724176ecca61376866da20614ba34e741b8295b8d21ba0eb13226024812dd6dfafe98f08ed367fd9454e787da5ba623b238b5944f5ae69fe58b02a224c SHA512 0379f18497d6510fad35a2d905c932d12f2726a5694d3ab272ce139e9ea4520cb4dd1cf3fafe890f6ada8a64285f8c04ef7571647a66c2d44df17e2dca80f869
 EBUILD cmus-2.8.0_rc0.ebuild 3300 BLAKE2B f4af7df639feff9d976cda04f6bcb9b3cdb2592046ca3ce8600845b0200f34b0541042edb0785010698296775864fc9221876e887f4acd1d675c05dbae4002f3 SHA512 306d304bc131a67960188573ad46da113539c86eb40e7bf78762214065fb69c8653f2af8e19ac140499ad199139c0c12a82249e6f6d13d632704fd99cf49d2a8
+EBUILD cmus-9999.ebuild 3621 BLAKE2B 51bc89fc599042b367f0fc790aabf7202a57bcf3a688dc32b075dc82ebdbe6acd69a9953543fe02169c6e83dc4caa35360fa1d9f6f0a082fe8147c655c2a4c61 SHA512 7f94ef69e91eb456abea984db4240e833d484d9bae03bbdf4de027331e1c11e5a5524dcf7b11909954855b002b1e478b1c51b49f7c35648d56b7d44ef4824702
 MISC metadata.xml 793 BLAKE2B a7f7b70d43eca969e128e92ce3375b14fcd0d65fae8c744c4ecc3e235dbebf112ee068a98597afa4eb882c6992461ae354d7880303fe7c78950c25af0df5b715 SHA512 4074bc35433dc4c9dec0902c0a792f005fdeddc81b886be2c7ca5191423488182b6159445b5a29ad20a10740539d5e1e1dcc60253d724a1a2e8f80c65b2f5b36
diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild
new file mode 100644
index 000000000000..bf501b22bd38
--- /dev/null
+++ b/media-sound/cmus/cmus-9999.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/cmus/cmus.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+fi
+
+DESCRIPTION="A ncurses based music player with plugin support for many formats"
+HOMEPAGE="https://cmus.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac alsa ao cue cdio cddb discid debug examples ffmpeg +flac jack libsamplerate
+	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio tremor +unicode
+	+vorbis wavpack"
+
+S="${WORKDIR}/${P/_/-}"
+
+CDEPEND="sys-libs/ncurses:0=[unicode?]
+	aac? ( media-libs/faad2 )
+	alsa? ( >=media-libs/alsa-lib-1.0.11 )
+	ao? ( media-libs/libao )
+	cue? ( media-libs/libcue )
+	cdio? ( dev-libs/libcdio-paranoia )
+	cddb? ( media-libs/libcddb )
+	discid? ( media-libs/libdiscid )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac )
+	jack? ( media-sound/jack-audio-connection-kit )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( >=media-libs/libmad-0.14 )
+	mikmod? ( media-libs/libmikmod:0 )
+	modplug? ( >=media-libs/libmodplug-0.7 )
+	mp4? ( >=media-libs/libmp4v2-1.9:0 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	pulseaudio? ( media-sound/pulseaudio )
+	tremor? ( media-libs/tremor )
+	!tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) )
+	wavpack? ( media-sound/wavpack )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	pidgin? ( net-im/pidgin dev-python/dbus-python )"
+
+# Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs
+REQUIRED_USE="tremor? ( vorbis )
+	mp4? ( aac )" # enabling mp4 adds -lfaad
+
+DOCS="AUTHORS README.md"
+
+my_config() {
+	local value
+	use ${1} && value=a || value=n
+	myconf="${myconf} ${2}=${value}"
+}
+
+src_configure() {
+	local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n CONFIG_SNDIO=n CONFIG_WAVEOUT=n CONFIG_VTX=n CONFIG_ROAR=n"
+
+	use debug && debuglevel=2
+
+	my_config cddb CONFIG_CDDB
+	my_config cdio CONFIG_CDIO
+	my_config discid CONFIG_DISCID
+	my_config flac CONFIG_FLAC
+	my_config mad CONFIG_MAD
+	my_config modplug CONFIG_MODPLUG
+	my_config mikmod CONFIG_MIKMOD
+	my_config musepack CONFIG_MPC
+	my_config vorbis CONFIG_VORBIS
+	my_config tremor CONFIG_TREMOR
+	my_config opus CONFIG_OPUS
+	my_config wavpack CONFIG_WAVPACK
+	my_config mp4 CONFIG_MP4
+	my_config aac CONFIG_AAC
+	my_config ffmpeg CONFIG_FFMPEG
+	my_config cue CONFIG_CUE
+	my_config pulseaudio CONFIG_PULSE
+	my_config alsa CONFIG_ALSA
+	my_config jack CONFIG_JACK
+	my_config libsamplerate CONFIG_SAMPLERATE
+	my_config ao CONFIG_AO
+	my_config oss CONFIG_OSS
+
+	./configure prefix="${EPREFIX}"/usr ${myconf} \
+		exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
+		libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
+}
+
+src_compile() {
+	tc-export_build_env BUILD_CC
+	emake V=2 \
+		CC="$(tc-getCC)" LD="$(tc-getCC)" \
+		HOSTCC="${BUILD_CC}" HOSTLD="${BUILD_CC}" \
+		HOST_CFLAGS="${BUILD_CFLAGS}" HOST_LDFLAGS="${BUILD_LDFLAGS}"
+}
+
+src_install() {
+	default
+
+	use examples || rm -rf "${ED}"/usr/share/doc/${PF}/examples
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/_cmus
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+
+	if use pidgin; then
+		newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
+	fi
+}
+
+pkg_postinst() {
+	einfo "USE flag 'wma' was replaced by 'ffmpeg'"
+	einfo "Details here - https://bugs.gentoo.org/show_bug.cgi?id=553834"
+}
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index fba574a9e7f0..793bf5218169 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,9 +1,4 @@
-AUX easytag-2.1.8-desktop.patch 476 BLAKE2B f66ffc053de79bad4e9e61a60fcd4d0afe79470ce915ca29a46740f6b85e6e3785249a5ce76ee4322f41625d4042ffba761e8c2db192dcaeb71053ab04d091a6 SHA512 82bdc8af5958150037e344f90c06384dfca0597e044a7ad24cf8138fde8212af0d4b2448a1f10f7c78a4bf2324fb5618110763c7ad632578744edd7410129f08
-AUX easytag-2.1.8-docs.patch 270 BLAKE2B 5f8eb00d9ce7c0b97fe523035de4f8535ba4b4f1e37cc24dd546464253430d3cd14cc56e4b54432528f94c6020ed49126635acb2a11f2fb6bb83ac90f2fad928 SHA512 282f0eda4ea992833c8869040b914505bf079408739727e148f32e800f9b95b412d034f92462030760aaa30224f3241f549eefb6bb6ac07038b089f4974e9bb5
-AUX easytag-2.1.8-taglib.patch 398 BLAKE2B 1019cd65b2814ebfa069cbec329e9a389a43d4d5c816b4eeddf4634afeeebbf725c1584cf0887dab7b4092c625e150b2b592ce00fff9d7b20d96ee113bb3fb25 SHA512 eb9c80664c61cf4974b198c4800ffbf5252c5765c1b7069bf442408c89522c86fc272df22d2ac0b1758e0070b4bb2fd1fa9cee8374445d2db34ef37d08386ec2
-AUX easytag-2.1.8-werror.patch 547 BLAKE2B 5b3a07bae07084ba9e73660052cb78332d8230a273ec2e1fde01278a08ff777b67fc4561431731870fd8c2f0ccb8b197ce0b56b9d8bce1348aa8c023d80152c7 SHA512 0367944be501f741e75c61872840282fddbd2503b3bc25f5d5f392a9cb05fa451623acc157dad2f3b415af0f6c396aab23f4927306c15fea5f1b10435a200e2c
-DIST easytag-2.1.8.tar.xz 2459496 BLAKE2B 4ba27728071a3a87af72a37cd0337d361ae690c42a70690ef935d4a0fdf27904c0928b448f64fac61194e02f18e04ea26c600f65365e8ea7aa4d76128f7a5d82 SHA512 cf5d92902276b8d462c695aaa0d1072684d60cbfc45d07fb2ac7b345907a775b94665612088b33f3272db22d4b4eb78f4a4e36f2caf6e151a08f640841208e48
+AUX easytag-2.4.3-ogg-corruption.patch 7233 BLAKE2B e0123a9d195a85d80136fc831cdfe1a870346a2f0cf0213a53e0ef51bc82e72db390898df0c8d02ba8865c3571e5d2f8b8faafe0b3750b6cd123e3fe065cc65f SHA512 f25cedb0f09edf987317f395133195f115549503a6c02edfce7e49f1f24d2e5d01920c9b48f41addb2b632d68bb329cbdefc25aec4e56239daa4f7980d33bd10
 DIST easytag-2.4.3.tar.xz 1381084 BLAKE2B 22358cd15e53a51f2786ad2a62e5d9eea78e9c8b8127d2820dbd5657d734a9a0e694a6d180ad730b87c8c236e3d3396c9ea4c651df4080d0f4b4dc0e212b945c SHA512 ef596341772ce7da3b7feec2c82a20ca29d25c2496074c469be5b8dd75d2b2718e689310e0d61de53bc29a4f54ce9f853a336e1a35076046fd107afd28699087
-EBUILD easytag-2.1.8.ebuild 1443 BLAKE2B 4e6892fd7c7df21400e032c1863af21ed09106a3aa24498a6da1418a26cccf1ff77de76de2712ea10a2e7724727b7472adbb6336cde5e8417e9a7d96547d8459 SHA512 c55dc94db97b55b0f3f50c1fe0d40749e87ad8620e460a4422dce3cdeabd0ca2c850fb315a40168e0802146ce0f1b6db18152db88183972efd950845c58d5568
-EBUILD easytag-2.4.3.ebuild 1645 BLAKE2B 8ba8ed176a87b9189d6ce6c5ea0cd09cc0b01a3d1e4b5747e5c763f1af5e4bcd241d901470924f3a20518df36f8bfa1b7d6a6a942f7b3fc52970b843d5c2ab80 SHA512 c722d39fd6f08e9999b71914af9e6efe8f263bde9063707a330cfb26c1e200f54e50a2a344f2056d62ad316df8576b00cd5c389078ff7fb26e5771c4cfa12404
-MISC metadata.xml 423 BLAKE2B 8265687f0456937b9ba2700d2d7078e237b5d0dbc04905eec92ee94364c20f9dd4655321b4a5a5788b128b1771e161f5319d056ffaca350f93a988995eae608d SHA512 6cd8c3b87e91a7b0b6b8f6aa4d8e38ab7400fb53fc3653a6f898eec609cd5ce6cb07bab1e3b67ee0c4e1fb91fcaa6e6fb835ce26dcd38cc7090bea5942e71da0
+EBUILD easytag-2.4.3-r1.ebuild 1773 BLAKE2B 35b268fae476589810cb824bb2dbce3fa22e8d34620e968b3c6e8b6e92b4ec1e60733906758f2f963477acc3b7b89c78fb9638b84860985673252452988963ca SHA512 8b91a196a3e34c4c60695d3ff554040db3cbcb4587f53a5c87e3042e1dcb94721296a6ddba046d8d2e25ab45bde25de98c5bbd4a5680d2e2b0b749b60f146d5e
+MISC metadata.xml 514 BLAKE2B b5fdb67baedcef2a155492cf00b63b35ae13c7fe214ba657722043bf824e607dfdf3d50deeb24c4ebb2cc704b7deb41d66c8ea8aa2f3b5911a72cb833b9e05a4 SHA512 eb53f395ef50eb4a86865629809332930907f459cd3b7b2d052727e4c25a27fd9e1acd9660fc354eb16ce7f6ff41e323689548e8b8a671e0878344cc0eb9ddc9
diff --git a/media-sound/easytag/easytag-2.1.8.ebuild b/media-sound/easytag/easytag-2.1.8.ebuild
deleted file mode 100644
index b7b085725ffe..000000000000
--- a/media-sound/easytag/easytag-2.1.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools gnome.org xdg-utils
-
-DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
-HOMEPAGE="https://projects.gnome.org/easytag/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="flac mp3 mp4 nls speex vorbis wavpack"
-
-RDEPEND=">=x11-libs/gtk+-2.24:2
-	mp3? (
-		>=media-libs/id3lib-3.8.3-r7
-		media-libs/libid3tag
-		)
-	flac? (
-		media-libs/flac
-		media-libs/libvorbis
-		)
-	mp4? ( media-libs/taglib[mp4(+)] )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	speex? (
-		media-libs/speex
-		media-libs/libvorbis
-		)"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-desktop.patch
-	epatch "${FILESDIR}"/${P}-werror.patch
-	epatch "${FILESDIR}"/${P}-taglib.patch
-	epatch "${FILESDIR}"/${P}-docs.patch
-	eautoreconf
-}
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable mp3) \
-		$(use_enable mp3 id3v23) \
-		$(use_enable vorbis ogg) \
-		$(use_enable speex) \
-		$(use_enable flac) \
-		$(use_enable mp4) \
-		$(use_enable wavpack)
-}
-
-pkg_postinst() { xdg_desktop_database_update; }
-pkg_postrm() { xdg_desktop_database_update; }
diff --git a/media-sound/easytag/easytag-2.4.3.ebuild b/media-sound/easytag/easytag-2.4.3-r1.ebuild
index c5aaafa076ea..630be7217fa0 100644
--- a/media-sound/easytag/easytag-2.4.3.ebuild
+++ b/media-sound/easytag/easytag-2.4.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-GNOME2_LA_PUNT="yes"
 
+GNOME2_LA_PUNT="yes"
 inherit gnome2
 
 DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
@@ -13,7 +13,7 @@ LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
-IUSE="flac mp3 mp4 opus speex test vorbis wavpack"
+IUSE="flac mp3 mp4 nautilus opus speex test vorbis wavpack"
 REQUIRED_USE="
 	opus? ( vorbis )
 	speex? ( vorbis )
@@ -27,34 +27,37 @@ RDEPEND="
 	mp3? (
 		>=media-libs/id3lib-3.8.3-r8
 		>=media-libs/libid3tag-0.15.1b-r4
-		)
+	)
 	mp4? ( >=media-libs/taglib-1.9.1[mp4(+)] )
+	nautilus? ( gnome-base/nautilus )
 	opus? (
 		>=media-libs/opus-1.1
 		>=media-libs/opusfile-0.4
-		)
+	)
 	speex? ( >=media-libs/speex-1.2_rc1 )
 	vorbis? (
 		>=media-libs/libogg-1.3.1
 		>=media-libs/libvorbis-1.3.4
-		)
+	)
 	wavpack? ( >=media-sound/wavpack-4.70 )
 "
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.4
 	app-text/yelp-tools
+	dev-util/glib-utils
 	dev-libs/libxml2
 	dev-libs/libxslt
 	>=dev-util/intltool-0.50
 	>=sys-devel/gettext-0.18.3.2
 	virtual/pkgconfig
-	!<dev-util/pkgconfig-0.27
 	test? (
 		dev-libs/appstream-glib
 		>=dev-util/desktop-file-utils-0.22
-		)
+	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-ogg-corruption.patch" )
+
 src_configure() {
 	gnome2_src_configure \
 		--disable-Werror \
@@ -62,6 +65,7 @@ src_configure() {
 		$(use_enable test tests) \
 		$(use_enable mp3) \
 		$(use_enable mp3 id3v23) \
+		$(use_enable nautilus nautilus-actions) \
 		$(use_enable vorbis ogg) \
 		$(use_enable opus) \
 		$(use_enable speex) \
diff --git a/media-sound/easytag/files/easytag-2.1.8-desktop.patch b/media-sound/easytag/files/easytag-2.1.8-desktop.patch
deleted file mode 100644
index 6cc72765a65d..000000000000
--- a/media-sound/easytag/files/easytag-2.1.8-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- easytag.desktop.in
-+++ easytag.desktop.in
-@@ -6,7 +6,7 @@
- Type=Application
- Icon=easytag
- Categories=GTK;AudioVideo;AudioVideoEditing;
--MimeType=x-directory/normal;inode/directory;audio/x-mp3;audio/x-mpeg;audio/mpeg;application/ogg;audio/x-vorbis+ogg;audio/x-flac;audio/x-musepack;audio/x-ape;
-+MimeType=audio/x-mp3;audio/x-mpeg;audio/mpeg;application/ogg;audio/x-vorbis+ogg;audio/x-flac;audio/x-musepack;audio/x-ape;
- Exec=easytag %F
- Terminal=false
- StartupNotify=true
diff --git a/media-sound/easytag/files/easytag-2.1.8-docs.patch b/media-sound/easytag/files/easytag-2.1.8-docs.patch
deleted file mode 100644
index 1ecb076d0d36..000000000000
--- a/media-sound/easytag/files/easytag-2.1.8-docs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.am
-+++ Makefile.am
-@@ -197,11 +197,6 @@
- 	$(AM_V_at)$(POST_UNINSTALL)
- 	test -n "$(DESTDIR)" || $(UPDATE_ICON_CACHE) "$(iconthemedir)"
- 
--dist_doc_DATA = \
--	HACKING \
--	THANKS \
--	TODO
--
- dist_noinst_DATA = \
- 	$(desktop_in_files) \
- 	$(easytag_headers) \
diff --git a/media-sound/easytag/files/easytag-2.1.8-taglib.patch b/media-sound/easytag/files/easytag-2.1.8-taglib.patch
deleted file mode 100644
index d565a7615d77..000000000000
--- a/media-sound/easytag/files/easytag-2.1.8-taglib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- easytag-2.1.8/configure.ac
-+++ easytag-2.1.8/configure.ac
-@@ -202,7 +202,7 @@
- TAGLIB_DEPS="taglib_c >= 1.6.0"
- AS_IF([test "x$enable_mp4" != "xno"],
-       [PKG_CHECK_EXISTS([$TAGLIB_DEPS], [have_taglib=yes], [have_taglib=no])],
--      [have_wavpack=no])
-+      [have_taglib=no])
- 
- AS_IF([test "x$have_taglib" != "xno"],
-       [AC_DEFINE([ENABLE_MP4], [], [Define for taglib MP4 support])],
diff --git a/media-sound/easytag/files/easytag-2.1.8-werror.patch b/media-sound/easytag/files/easytag-2.1.8-werror.patch
deleted file mode 100644
index d7a770665033..000000000000
--- a/media-sound/easytag/files/easytag-2.1.8-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -239,7 +239,7 @@
-      AC_MSG_RESULT([$have_ws2])])
- 
- dnl Check that the compiler accepts the given warning flags.
--warning_flags="-Wall -Wstrict-prototypes -Wnested-externs -Werror=missing-prototypes -Werror=implicit-function-declaration -Werror=pointer-arith -Werror=init-self -Werror=format-security -Werror=format=2 -Werror=missing-include-dirs -Werror=declaration-after-statement"
-+warning_flags="-Wall -Wstrict-prototypes -Wnested-externs"
- 
- realsave_CFLAGS="$CFLAGS"
- for option in $warning_flags; do
diff --git a/media-sound/easytag/files/easytag-2.4.3-ogg-corruption.patch b/media-sound/easytag/files/easytag-2.4.3-ogg-corruption.patch
new file mode 100644
index 000000000000..7c4a9f619c31
--- /dev/null
+++ b/media-sound/easytag/files/easytag-2.4.3-ogg-corruption.patch
@@ -0,0 +1,246 @@
+From e5c640ca3f259f1b74e716723345521987a7bd68 Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+Date: Wed, 9 Nov 2016 17:29:34 +0000
+Subject: Do not maintain an open handle on Ogg files
+
+Only keep a file open for reading long enough to read the necessary
+items from the file. Remove the file input stream from EtOggState, as
+it is no longer preserved across function calls.
+
+ src/tags/vcedit.c | 92 ++++++++++++++++++++++---------------------------------
+ 1 file changed, 36 insertions(+), 56 deletions(-)
+
+--- b/src/tags/vcedit.c
++++ a/src/tags/vcedit.c
+@@ -35,6 +35,7 @@
+ struct _EtOggState
+ {
+     /*< private >*/
++    GFileInputStream *in;
+ #ifdef ENABLE_SPEEX
+     SpeexHeader *si;
+ #endif
+@@ -125,6 +126,11 @@
+     }
+ #endif /* ENABLE_OPUS */
+ 
++    if (state->in)
++    {
++        g_object_unref (state->in);
++    }
++
+     memset (state, 0, sizeof (*state));
+ }
+ 
+@@ -239,7 +245,6 @@
+ 
+ static gboolean
+ _fetch_next_packet (EtOggState *s,
+-                    GInputStream *istream,
+                     ogg_packet *p,
+                     ogg_page *page,
+                     GError **error)
+@@ -269,8 +274,8 @@
+         while (ogg_sync_pageout (s->oy, page) <= 0)
+         {
+             buffer = ogg_sync_buffer (s->oy, CHUNKSIZE);
++            bytes = g_input_stream_read (G_INPUT_STREAM (s->in), buffer,
++                                         CHUNKSIZE, NULL, error);
+-            bytes = g_input_stream_read (istream, buffer, CHUNKSIZE, NULL,
+-                                         error);
+             ogg_sync_wrote (s->oy, bytes);
+ 
+             if(bytes == 0)
+@@ -303,7 +308,7 @@
+ 
+         g_assert (error == NULL || *error == NULL);
+         ogg_stream_pagein (s->os, page);
++        return _fetch_next_packet (s, p, page, error);
+-        return _fetch_next_packet (s, istream, p, page, error);
+     }
+ }
+ 
+@@ -402,13 +407,14 @@
+         return FALSE;
+     }
+ 
++    state->in = istream;
+     state->oy = g_slice_new (ogg_sync_state);
+     ogg_sync_init (state->oy);
+ 
+     while(1)
+     {
+         buffer = ogg_sync_buffer (state->oy, CHUNKSIZE);
++        bytes = g_input_stream_read (G_INPUT_STREAM (state->in), buffer,
+-        bytes = g_input_stream_read (G_INPUT_STREAM (istream), buffer,
+                                      CHUNKSIZE, NULL, error);
+         if (bytes == -1)
+         {
+@@ -648,7 +654,7 @@
+         }
+ 
+         buffer = ogg_sync_buffer (state->oy, CHUNKSIZE);
++        bytes = g_input_stream_read (G_INPUT_STREAM (state->in), buffer,
+-        bytes = g_input_stream_read (G_INPUT_STREAM (istream), buffer,
+                                      CHUNKSIZE, NULL, error);
+ 
+         if (bytes == -1)
+@@ -670,14 +676,11 @@
+ 
+     /* Headers are done! */
+     g_assert (error == NULL || *error == NULL);
+-    /* TODO: Handle error during stream close. */
+-    g_object_unref (istream);
+ 
+     return TRUE;
+ 
+ err:
+     g_assert (error == NULL || *error != NULL);
+-    g_object_unref (istream);
+     vcedit_clear_internals (state);
+     return FALSE;
+ }
+@@ -699,7 +702,6 @@
+     char *buffer;
+     int bytes;
+     int needflush = 0, needout = 0;
+-    GFileInputStream *istream;
+     GOutputStream *ostream;
+     gchar *buf;
+     gsize size;
+@@ -707,22 +709,11 @@
+ 
+     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ 
++    fileinfo = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_SIZE,
++                                  G_FILE_QUERY_INFO_NONE, NULL, error);
+-    istream = g_file_read (file, NULL, error);
+-
+-    if (!istream)
+-    {
+-        g_assert (error == NULL || *error != NULL);
+-        return FALSE;
+-    }
+-
+-    fileinfo = g_file_input_stream_query_info (istream,
+-                                               G_FILE_ATTRIBUTE_STANDARD_SIZE,
+-                                               NULL, error);
+-
+     if (!fileinfo)
+     {
+         g_assert (error == NULL || *error != NULL);
+-        g_object_unref (istream);
+         return FALSE;
+     }
+ 
+@@ -783,8 +774,7 @@
+         }
+     }
+ 
++    while (_fetch_next_packet (state, &op, &ogin, error))
+-    while (_fetch_next_packet (state, G_INPUT_STREAM (istream), &op, &ogin,
+-                               error))
+     {
+         if (needflush)
+         {
+@@ -960,7 +950,7 @@
+     {
+         /* We copy the rest of the stream (other logical streams)
+          * through, a page at a time. */
++        while(1)
+-        while (1)
+         {
+             result = ogg_sync_pageout (state->oy, &ogout);
+ 
+@@ -999,7 +989,7 @@
+ 
+         buffer = ogg_sync_buffer (state->oy, CHUNKSIZE);
+ 
++        bytes = g_input_stream_read (G_INPUT_STREAM (state->in), buffer,
+-        bytes = g_input_stream_read (G_INPUT_STREAM (istream), buffer,
+                                      CHUNKSIZE, NULL, error);
+ 
+         if (bytes == -1)
+@@ -1017,19 +1007,11 @@
+         }
+     }
+ 
++
+ cleanup:
+     ogg_stream_clear (&streamout);
+     ogg_packet_clear (&header_comments);
+ 
+-    if (!g_input_stream_close (G_INPUT_STREAM (istream), NULL, error))
+-    {
+-        /* Ignore the _close() failure, and try the write anyway. */
+-        g_warning ("Error closing Ogg file for reading: %s",
+-                   (*error)->message);
+-        g_clear_error (error);
+-    }
+-
+-    g_object_unref (istream);
+     g_free (state->mainbuf);
+     g_free (state->bookbuf);
+     state->mainbuf = state->bookbuf = NULL;
+@@ -1063,13 +1045,41 @@
+     buf = g_memory_output_stream_steal_data (G_MEMORY_OUTPUT_STREAM (ostream));
+     size = g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (ostream));
+ 
++    /* At least on Windows, writing to a file with an open-for-reading stream
++     * fails, so close the input stream before writing to the file. */
++    if (!g_input_stream_close (G_INPUT_STREAM (state->in), NULL, error))
++    {
++        /* Ignore the _close() failure, and try the write anyway. */
++        g_warning ("Error closing Ogg file for reading: %s",
++                   (*error)->message);
++        g_clear_error (error);
++    }
++
++    g_object_unref (state->in);
++    state->in = NULL;
++
+     /* Write the in-memory data back out to the original file. */
+     if (!g_file_replace_contents (file, buf, size, NULL, FALSE,
+                                   G_FILE_CREATE_NONE, NULL, NULL, error))
+     {
++        GError *tmp_error = NULL;
++
+         g_object_unref (ostream);
+         g_free (buf);
+ 
++        /* Re-open the file for reading, to keep the internal state
++         * consistent. */
++        state->in = g_file_read (file, NULL, &tmp_error);
++
++        if (!state->in)
++        {
++            g_warning ("Error opening Ogg file for reading after write failure: %s",
++                       tmp_error->message);
++            g_clear_error (&tmp_error);
++            g_assert (error == NULL || *error != NULL);
++            return FALSE;
++        }
++
+         g_assert (error == NULL || *error != NULL);
+         return FALSE;
+     }
+@@ -1077,6 +1087,16 @@
+     g_free (buf);
+     g_object_unref (ostream);
+ 
++    /* Re-open the file, now that the write has completed. */
++    state->in = g_file_read (file, NULL, error);
++
++    if (!state->in)
++    {
++        g_assert (error == NULL || *error != NULL);
++        return FALSE;
++    }
++
++
+     return TRUE;
+ }
+ 
+-- 
+cgit v0.12
+
diff --git a/media-sound/easytag/metadata.xml b/media-sound/easytag/metadata.xml
index 7636046d6e23..1c503c1ab663 100644
--- a/media-sound/easytag/metadata.xml
+++ b/media-sound/easytag/metadata.xml
@@ -5,5 +5,8 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-	<longdescription>a utility for viewing and editing tags for MP3, MP2, FLAC, AAC, MP4 and OGG files. It features a simple and attractive GTK+ interface</longdescription>
+	<longdescription>Utility for viewing and editing tags for MP3, MP2, FLAC, AAC, MP4 and OGG files. It features a simple and attractive GTK+ interface</longdescription>
+	<use>
+		<flag name="nautilus">Build <pkg>gnome-base/nautilus</pkg> extension</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 44d3d1c71ec8..0e3261d74bfe 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,3 +1,3 @@
-DIST elisa-0.2.1.tar.xz 1488948 BLAKE2B 91c885f0c95cff634570ce283be31ab3ae71119561d5cd309ddb663df050eb0117a7b6a59adb0e334b39d408485762665a07ea0cf316aca7ff30b9278b76a20c SHA512 39701f5c840ed4539e9b4093cccce9c27f728500ef0c7687585a17fabfb9498dda2649664e9613961ef8d514ef2257858bf0c815c0f05b593eb0b42f87ef4e25
-EBUILD elisa-0.2.1-r1.ebuild 1463 BLAKE2B 62feace67b61c37c0bc3dddf647094d86194d5a45512c3ecee3be46e64762fd75dab55f85df0a8b8730239d86815c40d94e86d88e8b6ac137f4cb023362fdc4d SHA512 8a4cc2f63dc34359d85b13668e268951b231b7ca9d3508e0341727b4ff150cdb74eaf747da1011515e49816c64237475fa4c45cff0bfa8ede545ed415b306cbd
+DIST elisa-0.3.0.tar.xz 1248496 BLAKE2B 8a52c35ca1e7a81927d8e95020854725407700e93e15bb778366946e7c19578df6939daec058743d9dffeece43dbb946c0f0ce6612c9ae50ff51c3c023cece1d SHA512 8097f8f2bbcb6199adf856d0786e77a33c46c3ead8f55fb29839862ec96db5ba957a8181af013650e4d8c9ecf32b104f17c26921204e6c7478c0a3a7152c9b9a
+EBUILD elisa-0.3.0.ebuild 1440 BLAKE2B be33c90af6256abbe8503462555df35f4c56f7500cdb91998499cf2f65629c1658237e29ebbca2b8ed8b699bbebb2dcbe04758dad382e0b53b708bf5549d43d6 SHA512 53a2245ea670c93ed0f661f6c732ca1a14147212efc82e1d58f1f63ad44920d53860875cae1a0496fc55fffa389df8a2217d87e6d9eb33e7616ccc42a555a185
 MISC metadata.xml 313 BLAKE2B 76e574d16964ee300bbfd452a53738f99626f7e572847cc923e8b1688dd3e55843a7f4aa5511525eed8e6a9513bc687f131b2a50d173901b54ce94d080d4103f SHA512 17fba6644e9931a1bda042c4ae7e9ad414276c0b159418630c6d20013f4d4b68cd62f150c5076f99e3c719d93f0103fba824fcbbfeebab1478aeddb19181c2f6
diff --git a/media-sound/elisa/elisa-0.2.1-r1.ebuild b/media-sound/elisa/elisa-0.3.0.ebuild
index 15da92ebbfac..1c81c1161797 100644
--- a/media-sound/elisa/elisa-0.2.1-r1.ebuild
+++ b/media-sound/elisa/elisa-0.3.0.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 KDE_TEST="forceoptional"
 KDE_HANDBOOK="optional"
-QT_MINIMAL="5.11.1"
 inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
diff --git a/media-sound/jack-smf-utils/Manifest b/media-sound/jack-smf-utils/Manifest
index 3907d3d213cc..b223dae4f268 100644
--- a/media-sound/jack-smf-utils/Manifest
+++ b/media-sound/jack-smf-utils/Manifest
@@ -1,3 +1,3 @@
 DIST jack-smf-utils-1.0.tar.gz 120497 BLAKE2B e9b0b334231a135337164af40bae797d2a0a384cbe8c204c586a864bd5cdb1e7c8f3649478212b128d0eb85a4a8fc851d6323a5f36593562cd5afc0e25f11043 SHA512 ee88fe4d77beadf94444ef40f2627a6aafc553e823f54bd33f2355ea553016182da714f34062f3260c5ff030e8f5ea0a6013b8584ec10e5d4d0089dc8d686b64
-EBUILD jack-smf-utils-1.0.ebuild 755 BLAKE2B 0f36725bd9beca86a60767797adfd380d0ce238f9628de3243bcbfff963e630b1a7cd8c0d40b4fc7a6b03d49a45e05f338e89c03d7975e97c158299471998b18 SHA512 180ddcbe8e4030dd092bcdcbdaafa04cac1fb523edcf4dfe5a2db037324871aa59988f74952a37a90eadc912f84ddf5a4185bc146f7a408b7b05ed73611e1790
+EBUILD jack-smf-utils-1.0-r1.ebuild 626 BLAKE2B 6a85aa17614607d93ffb4a2fc988ac6003778d9783e04c1eac2da15b5144cedd52865d9a82bb56cf135ea3953f7a109263548114641adea57bc5817689f8ef85 SHA512 4f6a4da09bbcb0270eb9781d85e4db58e46084351e5e33095af6b2bde0ffd29d623335749156361573a449239f05062e1a0172a09afa95d472a4e432a4bfdbf2
 MISC metadata.xml 764 BLAKE2B e5e6433f8906eaa7b375fc9d9c0fc6506e9c417ca0171b147e9bbfdbd496a16fa200dbfbe59066e63cd18769987d498230a914200da4d4995db18d4792ea050b SHA512 e12045d41a608c40304c646f70207dcbf10fcca29c81f4c774e8e4fb3517f6f10b61ee3be113122c56c52028aaeecb654a19c044f9f61a573f77d05e213b2717
diff --git a/media-sound/jack-smf-utils/jack-smf-utils-1.0-r1.ebuild b/media-sound/jack-smf-utils/jack-smf-utils-1.0-r1.ebuild
new file mode 100644
index 000000000000..edaef45d9e2c
--- /dev/null
+++ b/media-sound/jack-smf-utils/jack-smf-utils-1.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Utilities for MIDI streams and files using Jack MIDI"
+HOMEPAGE="https://sourceforge.net/projects/jack-smf-utils/"
+SRC_URI="https://sourceforge.net/projects/jack-smf-utils/files/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lash readline"
+
+RDEPEND="
+	dev-libs/glib
+	virtual/jack
+	lash? ( media-sound/lash )
+	readline? ( sys-libs/readline:0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		$(use_with lash) \
+		$(use_with readline)
+}
diff --git a/media-sound/jack-smf-utils/jack-smf-utils-1.0.ebuild b/media-sound/jack-smf-utils/jack-smf-utils-1.0.ebuild
deleted file mode 100644
index c8fe7a6a7c96..000000000000
--- a/media-sound/jack-smf-utils/jack-smf-utils-1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Utilities for MIDI streams and files using Jack MIDI"
-HOMEPAGE="http://pin.if.uz.zgora.pl/~trasz/jack-smf-utils/"
-SRC_URI="http://pin.if.uz.zgora.pl/~trasz/jack-smf-utils/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lash readline"
-
-RDEPEND="readline? ( sys-libs/readline )
-	>=dev-libs/glib-2.2
-	>=media-sound/jack-audio-connection-kit-0.102
-	lash? ( media-sound/lash )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_compile() {
-	econf $(use_with readline) \
-		$(use_with lash)
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS TODO
-}
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 4021d690c0b0..c1802ee43467 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,5 +1,4 @@
 DIST jack2-1.9.12.tar.gz 6487135 BLAKE2B 9140b3892d2321576a7329fbef2f23e340be4b9be967ec173edbbc7a43952c9a3712ead05dbe57f958b88c1e29c8a912a937c0bd34e0122ecc600ac9d48f147d SHA512 f0271dfc8f8e2f2489ca52f431ad4fa420665816d6c67a01a76da1d4b5ae91f6dad8c4e3309ec5e0c159c9d312ed56021ab323d74bce828ace26f1b8d477ddfa
-EBUILD jack2-1.9.12-r1.ebuild 2322 BLAKE2B 586c6938eeccdd8304a9f6d93d69eedaa73664a4b8ce6c01d4bca46400f8529083e7cacb1c988e95cebb1d071c06a1b1bfa7178e66bf94535732514c842a6586 SHA512 ed3a07bc3cdad2bed8dd70ac13eca389cd795dfd9421c56146af01f2c00d8408164f7e9e16bc7a5f9eb3bd9fbd824c64d0d0ddc151bdabf5a0a5ff4a34a40e5e
-EBUILD jack2-1.9.12.ebuild 2248 BLAKE2B 11df609c926f433493d6e68b799d12a19ab225e5e7152998a1cae4cd2aab88e91f7f602a27d65cdba3a9a34e3f299f77b226a31e6845c2003e3c82e61becd750 SHA512 cc0daf80bbe50f81e931b4572e219d97b7166fa7ffdd5cf12eda5f1925e4554a750a8fa4cf1c6ead747e5a52eb0c510aeca90c6234af4c5fed75e1952606c792
+EBUILD jack2-1.9.12-r1.ebuild 2248 BLAKE2B df3c7d95bdd19ebac930330209a968ea175fa410e88f792c6a2c2d514a4958c1d761916dee23c183f43c148d440381bcb3368aab43cbc158876065d9cec9af79 SHA512 fd3261aa55103089325e372af16d53a73035dde0b06ec048f04b0c4fe9ff376e05ac5184ec6de9db7f76270a3f32f13ebbc34ab12b719efcc190b7994a6633d4
 EBUILD jack2-9999.ebuild 2265 BLAKE2B d33ab3cddf7396a1f5c8a9888d7337e3aa2f3df55dd4af4e55261b6d6e95bcc9bfbd882b1b8b4de6d0687e7a715bf2dacc17aaf5974ccc2ef4400a6a9f91009f SHA512 06b07335899ddabf08656c8208223c1f7af92fa2e977c061b9ce1fb9437707ae1744f5fa0570a2b7940a57bb5bdedece4e75aa2662974dcd66a1744c8fa44542
-MISC metadata.xml 586 BLAKE2B 2caab3f98d8d74d03b85391c12b3432430544379e3379144e3a39cd36ab2335f81779cb3029726dafbff2dfbedec203dde78bc6bbe5678fed44cc6c0fe296ec1 SHA512 92ba1eb5d693bfab1f53b6e4bb2a11fa523681db94dbe92b39847e24144c4fa0181f4c3d7f49bb0738fce348fb87a79bf3f8b927f25aab10e240a021ae50a920
+MISC metadata.xml 506 BLAKE2B ba66e2cbd670da4a3eb56f611f624ae64214475c131d53a54436c1dc1cb8f47585a31af583c44aa03bcd497b662d9bb91ae434b0d246bd4fd18519efb6ecbc35 SHA512 61c4dbd8d78c20d61fb52468ced23f4c77b0432bb066e32395b0f26b5bbf3d17231045451cbb3b390a978c9598d313d08df13389262c424bad78bcdf7cab528e
diff --git a/media-sound/jack2/jack2-1.9.12-r1.ebuild b/media-sound/jack2/jack2-1.9.12-r1.ebuild
index 4856ae84043a..31014abf76d3 100644
--- a/media-sound/jack2/jack2-1.9.12-r1.ebuild
+++ b/media-sound/jack2/jack2-1.9.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="alsa celt +classic dbus doc ieee1394 libsamplerate opus pam readline sndfile"
+IUSE="alsa +classic dbus doc ieee1394 libsamplerate opus pam readline sndfile"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -34,7 +34,6 @@ CDEPEND="${PYTHON_DEPS}
 	media-libs/libsndfile
 	sys-libs/readline:0=
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
 	dbus? (
 		dev-libs/expat[${MULTILIB_USEDEP}]
 		sys-apps/dbus[${MULTILIB_USEDEP}]
@@ -62,7 +61,7 @@ multilib_src_configure() {
 		$(usex dbus --dbus "")
 		$(usex classic --classic "")
 		--alsa=$(usex alsa yes no)
-		--celt=$(usex celt yes no)
+		--celt=no
 		--doxygen=$(multilib_native_usex doc yes no)
 		--firewire=$(usex ieee1394 yes no)
 		--freebob=no
diff --git a/media-sound/jack2/jack2-1.9.12.ebuild b/media-sound/jack2/jack2-1.9.12.ebuild
deleted file mode 100644
index 5295a98e976e..000000000000
--- a/media-sound/jack2/jack2-1.9.12.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-single-r1 waf-utils multilib-minimal
-
-DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="http://jackaudio.org/"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
-	KEYWORDS=""
-else
-	MY_PV="${PV/_rc/-RC}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="alsa celt dbus doc opus pam +classic sndfile libsamplerate readline"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( classic dbus )"
-
-CDEPEND="media-libs/libsamplerate
-	media-libs/libsndfile
-	sys-libs/readline:0=
-	${PYTHON_DEPS}
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
-	dbus? (
-		dev-libs/expat[${MULTILIB_USEDEP}]
-		sys-apps/dbus[${MULTILIB_USEDEP}]
-	)
-	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	pam? ( sys-auth/realtime-base )
-	!media-sound/jack-audio-connection-kit:0"
-
-DOCS=( ChangeLog README README_NETJACK2 TODO )
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local mywafconfargs=(
-		--htmldir=/usr/share/doc/${PF}/html
-		$(usex dbus --dbus "")
-		$(usex classic --classic "")
-		--alsa=$(usex alsa yes no)
-		--celt=$(usex celt yes no)
-		--doxygen=$(multilib_native_usex doc yes no)
-		--firewire=no
-		--freebob=no
-		--iio=no
-		--opus=$(usex opus yes no)
-		--portaudio=no
-		--readline=$(multilib_native_usex readline yes no)
-		--samplerate=$(multilib_native_usex libsamplerate yes no)
-		--sndfile=$(multilib_native_usex sndfile yes no)
-		--winmme=no
-	)
-
-	waf-utils_src_configure ${mywafconfargs[@]}
-}
-
-multilib_src_compile() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
-}
-
-multilib_src_install() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-}
diff --git a/media-sound/jack2/metadata.xml b/media-sound/jack2/metadata.xml
index 73e09bb1a19e..7956a5fa4618 100644
--- a/media-sound/jack2/metadata.xml
+++ b/media-sound/jack2/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>proaudio@gentoo.org</email>
-    <name>Gentoo ProAudio Project</name>
-  </maintainer>
-  <use>
-    <flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
-    <flag name="celt">Support CELT low delay audio codec</flag>
-    <flag name="classic">Enable building of jackd</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">jackaudio/jack2</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jackaudio/jack2</remote-id>
+	</upstream>
+	<use>
+		<flag name="classic">Enable building of jackd</flag>
+		<flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
index 3be96e2d786e..8383365e8ae4 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -1,5 +1,7 @@
 AUX linuxsampler-2.0.0-lv2-automagic.patch 727 BLAKE2B 23d836320c5bdd8e022599c65d26c3c757828a348e9ce87d158e1bdc9f3fb82ae174cc08a7ee4b4981378c4fd556fb932b2dcd4cf7bdb88c27920fb8a2033f8f SHA512 95f7b2bf01b293c58dc673cd40d6846d50d3a430a2874260fc268de7afe414a4970d4a443801f5d16417c14c6c16732e4bfdc58f7f997b7a3dd0bc1dc7ac8ddd
 AUX linuxsampler-2.0.0-nptl-hardened.patch 654 BLAKE2B 1e3f06d78cce3a67847bf3bedbb40b4ee7d28d410997444506d21d4ed0e646106ddcc78c770c3e214d73e474e6138f436841d3ce1703c9da2f06df3df921e9ce SHA512 cc75f55d80264d939650ea87c967e206110ae07245ae8e00dd83bed63a4e0aa75aa2a18b3b384ca3557896e44b2a13bd34deb3cc6f5487d7516b09b2c05e1594
 DIST linuxsampler-2.0.0.tar.bz2 1318939 BLAKE2B 75454863e0c56518f2a423ee11567758e1605c450389e6c723d76913319d6bd7ad25c4853d9f1982551c256848fd671f257004f1fc77fb6928b252007830c0f3 SHA512 f4a57117dbec3eeb9d6d670fec76e928ef9d9e49a1a8c6bd654d6114efdc203861e7865005f06265c172e29b5e0a948eac160377dcdabc5244caed5e5ca7e441
+DIST linuxsampler-2.1.0.tar.bz2 1154834 BLAKE2B 1be8a14bb6c13d90f4068cc2e25211dccc8253a114234ba560136d9da9a806d101db49116698fe53353a649c77513d244700d7bb65be04d0eb4d10ef057898d6 SHA512 503db074437b07e3e8dc8d1cb0aa3a510a62d183148157c1a4757681a4319e531bd6a1486a83c0ab9721dde82e27306150f3be87476c9298b2335438670e19a7
 EBUILD linuxsampler-2.0.0-r2.ebuild 1239 BLAKE2B 36ad9b046dffaa8822d2754fb6b86416f035fdb11f942bd2e7ff9bf314759ffcd572fd1dd01e2e017d1f3508ffd8260cfbb36b189befc5a6e3d52d3e695bc23c SHA512 a2b299f2a9484fc156bdb07d1e5144504a2464c987ad093d33aeb27664367844c006a734b5c3c1041a48a99249a09710cbcb5c82ab8f40976b175c7e21611f9c
-MISC metadata.xml 334 BLAKE2B a0d4a45770908849dd11881a34f753bb6e9d7fe4532df9fdc0a92b4c0d4fb68c7866cb64fd2d09955a6afe3a95951948037092c6a14a2c3c6a45323ba5c55c21 SHA512 046a72ac6899e0f8e9362a8960bd5839fbc6f915673a95698ea02a9fcf3ad2325968a036340d32f1732ec9dfdc0591c3eba8e09665399bb51d5ff0f031a33716
+EBUILD linuxsampler-2.1.0.ebuild 1680 BLAKE2B 68947407aee89f1c052dbe90bc1e44508c2a23b8427d5b6fc609c18716d8d71a3c2a439d74a76b50545e3c19e9be633503b57ba8f181d9b073fc29de43212691 SHA512 707d00fe926eb04d2e4ab5781093c065ff5ba70fa3bec2e83ed32591bba3b5c8cc803fb828bca35a99eb2584d2fde962891c5bd453a53b03d0d5eac1a4798c09
+MISC metadata.xml 391 BLAKE2B 61588190c31aaa0c88b7f4ad84cb3fe01cc41e6bf8d6dc3c607647fb30a36557f373525bc69cd927fcb5a425633bd751bf5347862ce23fa07d945ae01dae3aed SHA512 06d0561b1b0689da35775b4483e6738eb98ee2c4f9773cdaa0220d3e200eb37c6760d58a9993a1dc4e2110adbddb1d2764425aac3619d8c1af715cc368fc4fc4
diff --git a/media-sound/linuxsampler/linuxsampler-2.1.0.ebuild b/media-sound/linuxsampler/linuxsampler-2.1.0.ebuild
new file mode 100644
index 000000000000..b277175098e2
--- /dev/null
+++ b/media-sound/linuxsampler/linuxsampler-2.1.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Software audio sampler engine with professional grade features"
+HOMEPAGE="https://www.linuxsampler.org/"
+SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa doc jack lv2 sf2 sqlite"
+REQUIRED_USE="|| ( alsa jack )"
+
+RDEPEND="
+	>=media-libs/libgig-4.1.0
+	media-libs/libsndfile[-minimal]
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	lv2? ( media-libs/lv2 )
+	sqlite? ( >=dev-db/sqlite-3.3 )
+"
+DEPEND="${RDEPEND}
+	media-libs/dssi
+	media-libs/ladspa-sdk
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.0-nptl-hardened.patch"
+	"${FILESDIR}/${PN}-2.0.0-lv2-automagic.patch"
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	default
+	# Force regeneration of the file to let it build with all bison
+	# versions, bug #556204
+	rm src/network/lscpparser.cpp || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-arts-driver
+		--disable-static
+		$(use_enable alsa alsa-driver)
+		$(use_enable jack jack-driver)
+		$(use_enable lv2)
+		$(use_enable sqlite instruments-db)
+		$(use_enable sf2 sf2-engine)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	use doc && emake docs
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	# lscp files conflict with nilfs-utils, bug #556330
+	mv "${D}/usr/bin/lscp" "${D}/usr/bin/lscp-${PN}" || die
+	mv "${D}/usr/share/man/man1/lscp.1" "${D}/usr/share/man/man1/lscp-${PN}.1" || die
+}
diff --git a/media-sound/linuxsampler/metadata.xml b/media-sound/linuxsampler/metadata.xml
index 188b388f69c6..f1a8718cd39b 100644
--- a/media-sound/linuxsampler/metadata.xml
+++ b/media-sound/linuxsampler/metadata.xml
@@ -1,11 +1,12 @@
 <?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>
-  <use>
-    <flag name="lv2">Add support for Ladspa V2</flag>
-  </use>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="lv2">Add support for Ladspa V2</flag>
+		<flag name="sf2">Add support for SoundFont 2 sound bank files</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 0e983fa9a332..4852df72b6c4 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,6 +1,7 @@
+AUX lmms-1.2.0_rc4-qt-5.11.patch 855 BLAKE2B 755c3ca48e1b8ab90105764e534f01efcbd52dc2eb6d0e9d47e23409b3b8682f891920a06c0be1b4c161d0f40613956225dfde9c6143021d84f11a75ac012577 SHA512 6505f27e6113a623669ec80be6eea0071097b718c56c4f2cf8432363e8b74bdfe480b7160fe72956bbc8e854032d57e400b39cbb1ea58f100897639f4fe7c0f7
 DIST lmms-1.1.90.tar.gz 16580373 BLAKE2B 7ae6025647f949aa015dc64cb6595e1e13b21c9a9d72699f464c4ab15f3213aff353df840cf520ea48611f45d0aba2cec7c2fbb6ac9610ff816dfe9c81d57ea9 SHA512 4e8bc4ec70c613b69ff14e463860e6f86236cb7b238529d41c4e9cc1b9642590110d1d07f87b9e2a4e139454c3a1f851f95a5eaef12e95660b50dd6ea17aa486
 DIST lmms-1.2.0_rc4.tar.gz 16596115 BLAKE2B ec8a132f900417749899b084915d31348e267aebcded218d919559f195ce4826091bc3576932d2fa9115c2e040ba73b84db05eeaca3fbcf33b930791241de990 SHA512 8f102f2a4f157da1b8477d4f73bd5b86e7d11453491f6764deed1c61654c0836e612e19d1dac33d154ed9d1b0a0c65084a0537be832c94e72b904264269b6a96
 EBUILD lmms-1.1.90.ebuild 2001 BLAKE2B edbfb370f068786cb2d2d2bd39a3d3203a3c200c52846ac76f5e3f4727a2ce32be8e4585c52a955cbc6eb71e95c0a7a5fca1f99c6549513c8ac52cf465ee6ccf SHA512 0bd83dc94431a467567174d65361c4b381a1286b3941e319d33a72297cccde9ddcec6a885938a51cf4e0c3ffebca0d45d4c0c6004c5e46077a16bdcbf0f42474
-EBUILD lmms-1.2.0_rc4.ebuild 2196 BLAKE2B 787ecdc79503e230b29af3097fa7b77db645f63ee593e871f1f20df13da50dbf7964c39adb4818193bafd7652d935e526f70097d04ab990f5c0e8658c5dd5c93 SHA512 fc471f52db5555c85970aa66acfeeeb553df13c0bacf946d8612cf30cd45ec6bfc70e8e8d8103e97fdd12a5e46da3ea8bdad5dbeffb28d48ef9ca5ba66bf144b
+EBUILD lmms-1.2.0_rc4.ebuild 2239 BLAKE2B 63acb53d7d68b73631efb1be036106f7bd4b0ac8d6e20e470f90312570a6ddfbb04aaa48b2656d8615912c7235392d14ddfdbf7998fd09a6052093a3c018899d SHA512 21c51bb41fe5c85c5a6d9e5f6f3552ff890ac1161041676b718a795fe7690bf45bc85b2f4c0cd3af4143a2f59532c5d7a98c17cb66b9fa343971eea66b94f1fe
 EBUILD lmms-9999.ebuild 2256 BLAKE2B c48c85ee481f7ed320d2e1b4106a0cca8f9ea68589d54d9f078e0203ba7d34673da0fabd2e36f8ea1e86874c34ea2e45b7fd793993c34899ae25617d7c15daa8 SHA512 60a7a9f3db22e4f6f1e5c2e7bdb4a308ea7aaf45fccf22ab63a1340c4a42083f3b704e443bf5d9b4357dca2d1fd31ec489bf864ceba609d2d5e72c6ecf3694e1
 MISC metadata.xml 956 BLAKE2B 0146d8de32c1f9aaa1b111f10e48de20bde5e3634527b4da37ec14d2a148e6eb974bf6665e4fe6254732dff28ec24e3ca7fd1d7b860928453a223bd183895715 SHA512 d96540b061f24e031f1cbb381c05f4eb368e207f8300e8b68e57a36deb2bfb6108453e8428e2534e895927a738d74d8692fc918d8456e0f01b5ec971d4400acc
diff --git a/media-sound/lmms/files/lmms-1.2.0_rc4-qt-5.11.patch b/media-sound/lmms/files/lmms-1.2.0_rc4-qt-5.11.patch
new file mode 100644
index 000000000000..ee1328e8c962
--- /dev/null
+++ b/media-sound/lmms/files/lmms-1.2.0_rc4-qt-5.11.patch
@@ -0,0 +1,22 @@
+From daa3f535158f321e7a01ea531fc3085f2d26ab37 Mon Sep 17 00:00:00 2001
+From: Hyunjin Song <tteu.ingog@gmail.com>
+Date: Wed, 23 May 2018 14:59:45 +0900
+Subject: [PATCH] Fix compilation with Qt 5.11 (#4374)
+
+Add extends attribute for custom widget RowTableView per upstream uic change http://code.qt.io/cgit/qt/qtbase.git/commit/?id=058474884c2505a8a00d4c59b4922bfcd3597c2f
+---
+ src/gui/Forms/EffectSelectDialog.ui | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/gui/Forms/EffectSelectDialog.ui b/src/gui/Forms/EffectSelectDialog.ui
+index a9c6de0191..f8e7734862 100644
+--- a/src/gui/Forms/EffectSelectDialog.ui
++++ b/src/gui/Forms/EffectSelectDialog.ui
+@@ -102,6 +102,7 @@
+  <customwidgets>
+   <customwidget>
+    <class>RowTableView</class>
++   <extends>QTableView</extends>
+    <header>RowTableView.h</header>
+   </customwidget>
+  </customwidgets>
diff --git a/media-sound/lmms/lmms-1.2.0_rc4.ebuild b/media-sound/lmms/lmms-1.2.0_rc4.ebuild
index 354ba7ece7b3..a85c255a0f3e 100644
--- a/media-sound/lmms/lmms-1.2.0_rc4.ebuild
+++ b/media-sound/lmms/lmms-1.2.0_rc4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -61,6 +61,8 @@ RDEPEND="${COMMON_DEPEND}
 
 DOCS=( README.md doc/AUTHORS )
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
 src_configure() {
 	local mycmakeargs+=(
 		-DUSE_WERROR=FALSE
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 7062930b3edb..f5c46d8ae7c5 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,5 +1,5 @@
-DIST lollypop-0.9.605.tar.xz 451556 BLAKE2B 520cb54398839c24bebf3cd53b69de07174d5c674f1e6c72a100949bbd1cb04045b8f87799fd6f118af9191b1a552b9db098c6a72d6af5fdea604ec4970c29ea SHA512 0f377e7f1db1becf2edc7d15a1bae01665e11f87adc693118e778bf85659968de210912db7618f022cf123a458b156fd7fafbfdadbb2cb905dc1049a436d4d96
 DIST lollypop-0.9.610.tar.xz 451924 BLAKE2B aebea02009264292248ab036d8cf2eb793618e4952d2930b7bd9e9a6a196ce2a67c42fcb12efd5d7c241c32cbd2ac063d235d5b4fafb13bf4af01119bf39d224 SHA512 de86c641ff4efa12311e08f7b11bcb3de602361f2a848034ff59aa22f83e2bb6deb3ec76b95acee1e7eb3feabb13f290463620b2347a0680366e35a9b638bf48
-EBUILD lollypop-0.9.605-r1.ebuild 1332 BLAKE2B 567e9f9097c2c18f0150ef0f2abbb2248ee6e407a52f13fa6bbaefa7be5ab137d5fc5cbdf2d822980ec80443b8fa9d573c66116d41c34a373dcd52ae50d8dd20 SHA512 1d5d96fe1fa372ea732fe671ee7f6501a19d1711f2ef4fceee7e38f8680795eed7ff7ab8777d3dc6be9f38f1c56d3e409b7dbe46246c5dcbb47445a79ce0d682
+DIST lollypop-0.9.612.tar.xz 452072 BLAKE2B 784a7df8baa0b87fb34b6ab8b506d5ce1c90e78e959c6dbd07809c2765e4528c67bf358efc0eaeb03542640290b9fe181f99b2cc19cef3a3fbbb6a9bfc07afdc SHA512 dd61d38f245e6a8ad8eb5fad35fb23aa4a31399c2d2f628266b19aa00f6b615de82a6af33f2f4ae40f768a3786fb991e5f48dbcb0d7ba075579c6779fd05a371
 EBUILD lollypop-0.9.610.ebuild 1332 BLAKE2B 7fd5abbb834893d4b6a5616c267c4d8a73d15cf6cce8444eb9dd0ab698109befd5dab232edb6a79846cf656b349e5857a0d4910f769081e2d55e37729e5fd8bd SHA512 d4d9800c11290dd2f281428f278f1bb3c70eab6d9e0f7f0c32ad7e4aa3c37f74bf15543a0772279ad591f53f3fda4bc1c9bb0728d1a68b2f63aa9410ee75fdc9
+EBUILD lollypop-0.9.612.ebuild 1332 BLAKE2B 2e92e7d2f1f7ef4811a9b20c92f17178ad21964c5679236cb298e1a24e001a4b5e74620b8cd7fe861474d91ae5059fae5fdc4f9119ba476298e0787ae90a5582 SHA512 f4b33867027ca9ca2a219a18299a00daaa857d89cfa9aba63401442fab2c2c665bb2a6f05fb2eb45332347915a5608f37924013cfa7ebbc0c444bf910fd651b8
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-0.9.605-r1.ebuild b/media-sound/lollypop/lollypop-0.9.612.ebuild
index 16b08b545fe8..d6af6551036a 100644
--- a/media-sound/lollypop/lollypop-0.9.605-r1.ebuild
+++ b/media-sound/lollypop/lollypop-0.9.612.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
-HASH="7e56defb7152c6cd7140e9ea98df4ce7"
+HASH="bff1777a53b289e2fbf4e92a13b14a1b"
 inherit python-r1 gnome2-utils meson xdg-utils
 
 DESCRIPTION="Modern music player for GNOME"
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 08a467233506..5177a40a047a 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -3,9 +3,7 @@ AUX mpd-0.20.21.logrotate 112 BLAKE2B 2fd60db81c39d3b7eb1cd375450b5902d6e31734e3
 AUX mpd-0.20.4.init 681 BLAKE2B 36f48fe4f2432f659c455e75c3e6a773e7d49b9194fea75cd08251cc661b4885fe4ca16cc1008b679cb441ce8eb6a309c60b132570b89e4cf8f9560e130e71be SHA512 e9dbbab915e0e84dec9bd084347e608db7802386b281dc35fa1a9401bd3a40652735a02c98a8d51074c061cbe05ff038e0a16f379638c133b6ae8a6a70ca8f39
 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
 DIST mpd-0.20.21.tar.xz 800476 BLAKE2B 0c807ae8d79abd9400aa417b516c709073b23390aeed2b385c716e20f8c4f93376a235b54fe5f5cfcd451b04c76e105b41acbd180d294281432d4d1b6a427a15 SHA512 d44fb326ea6213ecf46721ca81efdfffaec4faa5a66e627185fd5ab7c4f0c5a380f4d04aed5c2909746a37b33987cb61f62dc2d747365da06629fbb78bf7c7d6
-DIST mpd-0.21.2.tar.xz 664408 BLAKE2B da1cde9b5f87c3e52c90d9a743ec8bf7acbcf52f3bf28969414bcc0f3f29151fd47157dc153a094844c94f6eb50e5a3564baf66a2e87d840b7b34efc8d0f760b SHA512 a98ff2636a22f7f0e377f814d0312b03344624317a68fcd89a7c5f33a40629908cd19f8bfff5dde1eef96cebd93e92cef63153bf60b02791803532357a38e020
 DIST mpd-0.21.3.tar.xz 664992 BLAKE2B 42e2bef46f4eb99e43c4078373dab4301cafa3062459abfed08e9f4b448a1fcfaa40da5a53941b49b426abecf2f31278fdb0857293b24156fa77845c56cbd095 SHA512 c6ce513ea641d026594cd7ae6e9051bd0060e45f5839d89b350ba144cc9094a8e1490052df4d024cbc92d88680ee8e8bae14fc8037431394771018a75c3ee3d7
 EBUILD mpd-0.20.21-r1.ebuild 7308 BLAKE2B a4579b515ea1904f2973f5b424f205cc08286aec7e516c33ba3aa035c2fca93117c8ede03818d3534a7cedba6b547fb1320039771f000a989ba218a60dcb7b87 SHA512 f7601f95f10158f112a65ac7625840f5a199bb349323c662dc6477e7a9b1498a593bff8cff289c1a37b78ebb80647136e843f8816bf77a5d7e1b8a0fc1624d66
-EBUILD mpd-0.21.2.ebuild 8234 BLAKE2B a0f7578c2062368f60916d22c4b403fe192e1048bba733a9f17bed900bccc20f86dae23e1241d7ee84acc5a4cadd7ba7a40b397b536c6e85a6ffa242812c8464 SHA512 254d6ec58bca9086aed9c3bb0b858bcf4fabd74e4cd4a4a991e0a7a61a0839d31cf50cd997e4d5b7ce71817521b83c518cb6390a798552959577ff5c3a4c854f
 EBUILD mpd-0.21.3.ebuild 8234 BLAKE2B a0f7578c2062368f60916d22c4b403fe192e1048bba733a9f17bed900bccc20f86dae23e1241d7ee84acc5a4cadd7ba7a40b397b536c6e85a6ffa242812c8464 SHA512 254d6ec58bca9086aed9c3bb0b858bcf4fabd74e4cd4a4a991e0a7a61a0839d31cf50cd997e4d5b7ce71817521b83c518cb6390a798552959577ff5c3a4c854f
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/mpd-0.21.2.ebuild b/media-sound/mpd/mpd-0.21.2.ebuild
deleted file mode 100644
index 1b27c1b94a14..000000000000
--- a/media-sound/mpd/mpd-0.21.2.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info meson systemd user
-
-MESON_AUTO_DEPEND="no"
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
-	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
-	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
-	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd tcpd
-	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
-	zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	upnp? ( expat )
-	webdav? ( curl expat )
-	"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	adplug? ( media-libs/adplug:= )
-	alsa? (
-		media-libs/alsa-lib
-		media-sound/alsa-utils
-	)
-
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile:= )
-
-	cdio? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-
-	chromaprint? ( media-libs/chromaprint )
-	curl? ( net-misc/curl )
-	dbus? ( sys-apps/dbus )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-
-	flac? ( media-libs/flac )
-	fluidsynth? ( media-sound/fluidsynth )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? (  dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	lame? ( network? ( media-sound/lame ) )
-	libmpdclient? ( media-libs/libmpdclient )
-	libsamplerate? ( media-libs/libsamplerate )
-	libsoxr? ( media-libs/soxr )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	network? ( media-libs/libshout )
-	nfs? ( net-fs/libnfs )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	qobuz? ( dev-libs/libgcrypt:0 )
-	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-mpd )
-	sid? ( || (
-		media-libs/libsidplay:2
-		media-libs/libsidplayfp
-	) )
-	sndfile? ( media-libs/libsndfile )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( sys-apps/tcp-wrappers )
-	twolame? ( media-sound/twolame )
-	udisks? ( sys-fs/udisks:2 )
-	upnp? ( net-libs/libupnp:0 )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.58:=
-	test? ( dev-cpp/gtest )"
-
-BDEPEND=">dev-util/meson-0.47.1
-	 virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-)
-
-pkg_setup() {
-	enewuser mpd "" "" "/var/lib/mpd" audio
-
-	if use eventfd; then
-		CONFIG_CHECK+=" ~EVENTFD"
-		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
-	fi
-
-	if use signalfd; then
-		CONFIG_CHECK+=" ~SIGNALFD"
-		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
-	fi
-
-	if use inotify; then
-		CONFIG_CHECK+=" ~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-	fi
-
-	if use eventfd || use signalfd || use inotify; then
-		linux-info_pkg_setup
-	fi
-
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make
-	sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dbzip2=$(usex bzip2 enabled disabled)
-		-Dcdio_paranoia=$(usex cdio enabled disabled)
-		-Dchromaprint=$(usex chromaprint enabled disabled)
-		-Dcue=$(usex cue true false)
-		-Dcurl=$(usex curl enabled disabled)
-		-Ddbus=$(usex dbus enabled disabled)
-		-Ddebug=$(usex debug true false)
-		-Deventfd=$(usex eventfd true false)
-		-Dexpat=$(usex expat enabled disabled)
-		-Dicu=$(usex icu enabled disabled)
-		-Did3tag=$(usex id3tag enabled disabled)
-		-Dinotify=$(usex inotify true false)
-		-Dipv6=$(usex ipv6 enabled disabled)
-		-Diso9660=$(usex cdio enabled disabled)
-		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
-		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
-		-Dlibwrap=$(usex tcpd enabled disabled)
-		-Dmms=$(usex mms enabled disabled)
-		-Dnfs=$(usex nfs enabled disabled)
-		-Dsignalfd=$(usex signalfd true false)
-		-Dsmbclient=$(usex samba enabled disabled)
-		-Dsoxr=$(usex libsoxr enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
-		-Dsystemd=$(usex systemd enabled disabled)
-		-Dtest=$(usex test true false)
-		-Dudisks=$(usex udisks enabled disabled)
-		-Dupnp=$(usex upnp enabled disabled)
-		-Dwebdav=$(usex webdav enabled disabled)
-		-Dzeroconf=$(usex zeroconf avahi disabled)
-		-Dzlib=$(usex zlib enabled disabled)
-		-Dzzip=$(usex zip enabled disabled)
-		)
-
-	emesonargs+=(
-		-Dalsa=$(usex alsa enabled disabled)
-		-Dao=$(usex ao enabled disabled)
-		-Dfifo=$(usex fifo true false)
-		-Djack=$(usex jack enabled disabled)
-		-Dopenal=$(usex openal enabled disabled)
-		-Doss=$(usex oss enabled disabled)
-		-Dpipe=$(usex pipe true false)
-		-Dpulse=$(usex pulseaudio enabled disabled)
-		-Drecorder=$(usex recorder true false)
-	)
-
-	if use samba || use upnp; then
-		emesonargs+=( -Dneighbor=true )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	if use network; then
-
-	emesonargs+=(
-		-Dshine=disabled
-		-Dshout=enabled
-		-Dvorbisenc=$(usex vorbis enabled disabled)
-		-Dhttpd=true
-		-Dlame=$(usex lame enabled disabled)
-		-Dtwolame=$(usex twolame enabled disabled)
-		-Dwave_encoder=$(usex audiofile true false)
-	)
-	fi
-
-	emesonargs+=(
-		-Dadplug=$(usex adplug enabled disabled)
-		-Daudiofile=$(usex audiofile enabled disabled)
-		-Dfaad=$(usex faad enabled disabled)
-		-Dffmpeg=$(usex ffmpeg enabled disabled)
-		-Dflac=$(usex flac enabled disabled)
-		-Dfluidsynth=$(usex fluidsynth enabled disabled)
-		-Dgme=$(usex gme enabled disabled)
-		-Dmad=$(usex mad enabled disabled)
-		-Dmikmod=$(usex mikmod enabled disabled)
-		-Dmodplug=$(usex modplug enabled disabled)
-		-Dmpcdec=$(usex musepack enabled disabled)
-		-Dmpg123=$(usex mpg123 enabled disabled)
-		-Dopus=$(usex opus enabled disabled)
-		-Dsidplay=$(usex sid enabled disabled)
-		-Dsndfile=$(usex sndfile enabled disabled)
-		-Dvorbis=$(usex vorbis enabled disabled)
-		-Dwavpack=$(usex wavpack enabled disabled)
-		-Dwildmidi=$(usex wildmidi enabled disabled)
-
-	)
-
-	emesonargs+=(
-		-Dqobuz=$(usex qobuz enabled disabled)
-		-Dsoundcloud=$(usex soundcloud enabled disabled)
-		-Dtidal=$(usex tidal enabled disabled)
-	)
-
-	emesonargs+=(
-		--libdir="/usr/$(get_libdir)"
-		-Ddocumentation=false
-		-Dsndio=disabled #not yet in the tree
-		-Dsolaris_output=disabled
-
-		-Ddatabase=true
-		-Ddsd=true
-		-Dtcp=true
-
-		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
-		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-		)
-
-	if use icu; then
-		emesonargs+=( -Diconv=enabled )
-	else
-		emesonargs+=( -Diconv=disabled )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}-0.20.4.init ${PN}
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	doman doc/mpd.1
-	doman doc/mpd.conf.5
-
-	keepdir /var/lib/mpd
-	keepdir /var/lib/mpd/music
-	keepdir /var/lib/mpd/playlists
-
-}
-
-pkg_postinst() {
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
-}
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index f04969c424cf..2da136295a5b 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,9 +1,10 @@
-AUX musescore-2.1.0-pch.patch 1044 BLAKE2B 884fd6a532ace31f878c0a0e17323792871e7f297a340b605edf3a8cbc1591669c73d58610ba24b2104dc030e7a2599b60df6c553ab2e9a69a12a33dd97a87ed SHA512 daf676955df4947c119904e93452a2fa81e877951d6e509e250e7cb88b406a5533fb7b3463613c1b27bf4708586484ce65786572aaade3a616197c2dfc76115d
+AUX musescore-2.1.0-pch.patch 1045 BLAKE2B c6deca9a34f687d5f8f9048e91049a0706a39c5f9299c2a244193337b3cd1047efc145c12ee0abac01b936958b835f9946c01ad4cb271b8ea8f9a2df535d5bc7 SHA512 9fdbf8a8f9903051196c01513395dc38585ba64f216140bb728e7adb72cbb71669b414338ac9b7f0b53f8c98bf63b2a19d4c6b195c3ad110590db768927d01d1
 AUX musescore-2.1.0-qt-5.11.patch 575 BLAKE2B 1dd0dfea52f73dc3d031dcead6ba07ac55195b264f393c39f0c411d6fc3f9d974f78a6948a9918ca67381e5c2c0b67750a5ccf0ac4a2ed2a8d1000434157d8a8 SHA512 5a6ec5aedaae257223fec6137dcc5ded44d6a4478f183c61220cd7d3c4b96c0fe591ff12070e4962979bb5c6d93a8c87a3003d3bcb449b1fe0977072e55615ed
+AUX musescore-2.1.0-qt-5.12.patch 2451 BLAKE2B 5c4f0143f262a451551f438607d8d09ff98f2fb23bbea09a74c00b1699ac9d284e582acacbcb224e0a02878a65744a2c202ae80e8a9045056abe68888b52a6a5 SHA512 529d48f961c21b89195dcad44c9d5105724c71bacbd30846dfc183f0ff5654b20a58cdffbe0b8fc7730f851d39652e4315dbb407ebd91994ebc061c6dcee2447
 AUX musescore-2.1.0-qtsingleapplication.patch 1176 BLAKE2B 6218c930ba69595f6ad674d225b95a34e8b7fec4b93f9bd23ca7f0c3201c4af04056c1b23c191be2764d350afae36d1f586555358141e9efb50e6a622ab9c5ab SHA512 fc1300940b6101f985a607fa3c1e3ebc2d3b88335f57bb9cb2b442e0253c24cc31a5d1d07c1dfc507234a0146bfd480ea546ac8b63ffbfcef1635d5086326bf0
 DIST musescore-2.1.0-fix-buildsystem.patch.bz2 3736 BLAKE2B da2b1fa72c6fb59ff3d969ac8cf088bf034313ec8fe584f5f5fe335c7fd663a8f078d4d12a2ad439a086665384cfe7b24901c80707dd80403e1cdac1c2ebef1a SHA512 5f712ec046c0f53c24d61b43c79cd5e3e604c499ca95f47c79f29c5442b54d1867f699ea689de9328b5bece432ddaa4da557328ed6d069347870eba8e8695ffc
 DIST musescore-2.1.0.tar.gz 51131549 BLAKE2B 208377e786b83122402140bad2a9ac024d56a66316c74f52b7ca4d71f3dec9f91c3f0a7dd1b1c92e2bd5a81a63722593c2b41ac5f7af5dcb712e5de078df8852 SHA512 c8696685713cd4c4943f1ec2b69a6a93217449fa330105ed1ffb569918af293c1d6ef19cabe1e487f65ceadf27dff78185e286e82ac4517cd2b4de594a67beb2
 DIST musescore-9999-fix-buildsystem.patch.bz2 4019 BLAKE2B 0a80141d36fe8cf1bb4ac92f330c0b401a8686fa661b02842f49ee67d5fdeef339ae6909091637e22c81dddfa128b884c9bdaecdc540274896251424b40b78ae SHA512 6ac113314e3dc93856002df5b89f86728873869075db5e2b99f29f6b69c5ddbd178f89305656370b09d8180eb44b7a56623f06a8e674a522390c8dc59e32ad89
-EBUILD musescore-2.1.0-r1.ebuild 2058 BLAKE2B 6d0dc4398e40241cd2a4eb8a1931e01bef710e506142c1fb88dc75e459c8b46139f2f4619dd4256301fcb56c91cf5302e9849f403aa3513d5e470f91725bf91d SHA512 92e3574b1e6b1754598e3831326586554a574af543569d85fbe6c21251076bb5d04ca57d44fdd8d4cca11bbc7182813b49dd19aa5e1b2087d21abd3805e7a497
+EBUILD musescore-2.1.0-r1.ebuild 2089 BLAKE2B bc9bb75457814eb081a678140065da6e2b9dce7f33f2047f81fe87960573631af79418eeefa52da485b2c60e809b6091e4347683e4803a59d7cf0758d97d1582 SHA512 d9279a30d2820169719a861702107d39d4a10ca055ddb29c16342a9bc23b09f7c65ad7e70b5afcadd13943ea0cc26a9073c177b9a1dc6ee4ea67ce87bb4ea569
 EBUILD musescore-9999.ebuild 2050 BLAKE2B 8c7c0f41b3c956c6a960b791db44b8c9d39f7ba6d3fb12b2b18253c5160e272fd3f6e75abf421fdbe2caf34628c8f55775d4b18b28b92d7717ca5fdcd5c8be06 SHA512 550226b2ea764ee2f03c8ca71ff601adeb5822dd629e94fc52435879a069128e886ccdd1e9f42feba482f193129113e0b16173d07379709c5cd123e79177c29d
 MISC metadata.xml 685 BLAKE2B 1ab11b407c05d18fa7fea53e4965f37dad96d2845fefc0ead84dab785a8c7684866e6455e500035d88a26ab3a59d18509e85811a5cc5a291bb033a78b55455b0 SHA512 3c9ad5c65edfafa2019ffeeabe13df04bbf5ef3dcee206284cf7e8b79543782da1312f7f443e4ab569248216410c4ac302ded74e074606f6ed8a3930344f483b
diff --git a/media-sound/musescore/files/musescore-2.1.0-pch.patch b/media-sound/musescore/files/musescore-2.1.0-pch.patch
index d69d1cd2f654..6cce1bd81cfe 100644
--- a/media-sound/musescore/files/musescore-2.1.0-pch.patch
+++ b/media-sound/musescore/files/musescore-2.1.0-pch.patch
@@ -28,4 +28,4 @@ index 66b0ddfce8..7fdfffcc9b 100644
 +    COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h
      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
      )
- 
-\ No newline at end of file
+ 
diff --git a/media-sound/musescore/files/musescore-2.1.0-qt-5.12.patch b/media-sound/musescore/files/musescore-2.1.0-qt-5.12.patch
new file mode 100644
index 000000000000..9d9a1cca7ef0
--- /dev/null
+++ b/media-sound/musescore/files/musescore-2.1.0-qt-5.12.patch
@@ -0,0 +1,48 @@
+From ff014657939f30c0052a1d2d66d87d13833c5255 Mon Sep 17 00:00:00 2001
+From: Joachim Schmitz <jojo@schmitz-digital.de>
+Date: Tue, 18 Sep 2018 14:42:43 +0200
+Subject: [PATCH] changes needed for MuseScore to build with Qt 5.12 (Alpha)
+
+One needed for MSVC only (and only since Alpha, not with the previous
+preview), the other needed for MSVC and MinGW.
+Neither seems to cause issues with Qt 5.9 (like AppVeyor and Travis CI
+prove)
+---
+ mscore/editstringdata.cpp | 4 ++--
+ mscore/prefsdialog.ui     | 1 -
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/mscore/editstringdata.cpp b/mscore/editstringdata.cpp
+index 21a621bac0..a86207e5db 100644
+--- a/mscore/editstringdata.cpp
++++ b/mscore/editstringdata.cpp
+@@ -52,7 +52,7 @@ EditStringData::EditStringData(QWidget *parent, QList<instrString> * strings, in
+                   strg = (*_strings)[numOfStrings - i - 1];
+                   _stringsLoc.append(strg);
+                   QTableWidgetItem *newCheck = new QTableWidgetItem();
+-                  newCheck->setFlags(Qt::ItemFlag(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
++                  newCheck->setFlags(Qt::ItemFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
+                   newCheck->setCheckState(strg.open ? Qt::Checked : Qt::Unchecked);
+                   stringList->setItem(i, 0, newCheck);
+                   QTableWidgetItem *newPitch = new QTableWidgetItem(midiCodeToStr(strg.pitch));
+@@ -168,7 +168,7 @@ void EditStringData::newStringClicked()
+             _stringsLoc.insert(i, strg);
+             stringList->insertRow(i);
+             QTableWidgetItem *newCheck = new QTableWidgetItem();
+-            newCheck->setFlags(Qt::ItemFlag(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
++            newCheck->setFlags(Qt::ItemFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
+             newCheck->setCheckState(strg.open ? Qt::Checked : Qt::Unchecked);
+             stringList->setItem(i, 0, newCheck);
+             QTableWidgetItem *newPitch = new QTableWidgetItem(midiCodeToStr(strg.pitch));
+diff --git a/mscore/prefsdialog.ui b/mscore/prefsdialog.ui
+index 5dd493fdc7..21af750846 100644
+--- a/mscore/prefsdialog.ui
++++ b/mscore/prefsdialog.ui
+@@ -4276,7 +4276,6 @@ Adjusting latency can help synchronize your MIDI hardware with MuseScore's inter
+    </item>
+   </layout>
+  </widget>
+- <pixmapfunction>getPixmap</pixmapfunction>
+  <customwidgets>
+   <customwidget>
+    <class>Awl::ColorLabel</class>
diff --git a/media-sound/musescore/musescore-2.1.0-r1.ebuild b/media-sound/musescore/musescore-2.1.0-r1.ebuild
index 56805b5d0079..d2c6bf1f0939 100644
--- a/media-sound/musescore/musescore-2.1.0-r1.ebuild
+++ b/media-sound/musescore/musescore-2.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -51,6 +51,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-qt-5.11.patch"
 	"${FILESDIR}/${P}-qtsingleapplication.patch"
 	"${FILESDIR}/${P}-pch.patch"
+	"${FILESDIR}/${P}-qt-5.12.patch"
 )
 
 S="${WORKDIR}/MuseScore-${PV}"
diff --git a/media-sound/paprefs/Manifest b/media-sound/paprefs/Manifest
index 854bd74be468..045f9dc400ac 100644
--- a/media-sound/paprefs/Manifest
+++ b/media-sound/paprefs/Manifest
@@ -1,5 +1,5 @@
 DIST paprefs-0.9.10.tar.xz 163444 BLAKE2B c3e8d2ab6fef51313c188282f41e1a7dc556e792e78687da7300ff29133768cfaee8c53bb72da3822cdf0cd7e845dd6fae6c4a3651523f8a4a60e1d51c0a1e53 SHA512 51823fc28b82559f948361c62e3c9a0b6ca9f4c3b483d4a63258d9e061d0b4fb01d7282f6cb5bfe2679a676d63737c0282fe183cf4de9a0d5afd2c9a901e20cc
 DIST paprefs-0.9.11_pre20180621.tar.xz 221100 BLAKE2B d8f79865a0ce6d4491ea252fdef65e700d1ad4cfc253d8b0415a6cd454fe60685a3d647c8720cb50f85033a7bb0d411c404b4d50c43b320bd728390a8056c1de SHA512 650e365b77d9d9beee4dc62b7ba5d367b55a9f0e95f39ca1e75d210dab05820b4d3485a34366e6e341fafe55b5c6ee458088666937e0220c3d91bd68aa327c53
 EBUILD paprefs-0.9.10.ebuild 891 BLAKE2B b33128757db5f8336cb380223046a649a9d31124ec4b484588fe9a91275b7da74618111b687650f74c1604f5d32e2f36d2194906ee8f3aa4242b699e636420e9 SHA512 3f8fc067216fcba9b673b33bce256958d19b8c2a528e2c2b6ff3d6ce37b0eef21ffe34d1ca0581ac57e2d58420872d4ab978ebb9636cd770df6d6887ad4cde4c
-EBUILD paprefs-0.9.11_pre20180621.ebuild 1075 BLAKE2B 4e335f9c6f7cc978b2ce3d4038ba2633415e9eddeda392423f0dd2e6c276333e6c4d92e14726506760fe3768b73f3520deab733186c607d8015b691b1ac2b22c SHA512 5e9112fbb9326d02274a4b3240ed1b2ae276cd1c538be0bee9cb04cd3c693d812b465ebf7d54848f4caf0566547d4dadd3d98f3c6db6d7ac57f292a53e374c94
+EBUILD paprefs-0.9.11_pre20180621.ebuild 1070 BLAKE2B 834097d5a7696c4ec3a079b2e59290fd7c519c8c154b8a9c1cf40f3713187d9186f428d50d813075f54aa0e2f2e5ecfa37361a24169b4e70b9dc93be89adc88a SHA512 2aecf44049793efa91cc7497c5c539cb26476c1c2e68523e1571478250db6f7f0ab9e41febac757a5767285704d350ce8d9c66b09b6810749086ea5ed41a0178
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/paprefs/paprefs-0.9.11_pre20180621.ebuild b/media-sound/paprefs/paprefs-0.9.11_pre20180621.ebuild
index 7c4909ecdd77..bfcbdffdf1fe 100644
--- a/media-sound/paprefs/paprefs-0.9.11_pre20180621.ebuild
+++ b/media-sound/paprefs/paprefs-0.9.11_pre20180621.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="nls"
 
 RDEPEND="dev-cpp/glibmm:2
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 88d436dc975f..a0c378df47d7 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,6 +1,8 @@
 AUX picard-2.0.3-crashfix.patch 639 BLAKE2B 2476104b4d1cb73cf1a88f006d88dcb598a5394794b9d28281b51a9661e5d8bed3a6693c98d8e84420980b98aabebae8430d6dc92478c2ab2c6d2d4a85a03cc6 SHA512 80380f0151b0ea5c3eea03d4f0e1a318c422d454324bdd403788e1553b129d9e3c41d79ffe4f74f492f752fb8e66ae6a53817ae4469a9066d2adc31e869b4ee8
 AUX picard-2.0.3-iteration-error.patch 904 BLAKE2B dfd8f64219a17cfa3ed5550eb5dfe4b268eaa09b28f493ccdb37da865d8d8d59f218a0c4d87b15013954bf3cf272d5776cc722a6fd47254a35d54f7d17d68e85 SHA512 b13e65e46a8fe0930473a76e414ac55443bf32516728221f902767510442807d5d2ddf70e15df1a851a31458876f578a270e630c0402379ff8f517b84be01865
 DIST picard-2.0.3.tar.gz 2748358 BLAKE2B ff71f9d7836b9f797a539db772e2ffcb8cb9ba4c25997c01590292bf1b7b5d311089174313af86f1eb0e82af48bc8f350578ae6bdffba3c6b3bf98b934481f8d SHA512 759252fa3c43af1bfc09d85ef90fe451e674bfebaee31838bd2779380d1b8ad817f899896baeccf583464566eb2acfe886c8288d1757faaaff2dc17c3b8ef6ae
+DIST picard-2.0.4.tar.gz 2759058 BLAKE2B e8a2a5aed7b8c99e31c1765906481432d310fd41fa01a611c7d82b182468cf4bfeb5a5aaab74c96c0971f21af3ba690537212c29c75433296cab6a1a409edf6d SHA512 cdc5f1ddeb84705fc792fb77a6d0ba06a5baf812799054ac0fd4959dfe788009f25b6f89ad0c28720f1c7c85af61534ca4f1e9e8efd6ec3cc78578d0f0b3ab32
 EBUILD picard-2.0.3.ebuild 1860 BLAKE2B ae08290f7560ae4cc709c6d09864076b3167c335399ea92950b8ec4464ab700f8285124c77605ada1491404e4509bcf405b040e65316541a91b1f3e434b6b3f0 SHA512 d9113e15846984d10eca61bb0181a2615c80055034aa07b30d54e1aac12865bf4a86bd41e95561dcf59a7676951b244e1c228dedacf8d137bdbd3f050a1859cd
-EBUILD picard-9999.ebuild 1698 BLAKE2B e2a3f8d9f18bc4560afa0dd926487d5a7ba1d609870c67cfd569c71ba25f623613796ee3fe61c3d2884670af6c64a609e12d7ba2667f64a6bcb87eb1724eea6d SHA512 d780f2c5855f59314d86089eed73b60c35dbe0083198b38bb4b61231affa31c3a7fc184083c593e3fde6c39cb4f4e561d2bc10d4bd57cd7226187bd9e3c60b75
+EBUILD picard-2.0.4.ebuild 1756 BLAKE2B a551d93dd338e98f190d4e269d99eee1b3ad9dff50c7579640636cb38f1966dd1727c2d9c487f02dc27a63e83a8be5814c69d8092845f625e8211babea7bb53a SHA512 79f78d8a674966554680593d0cf45054ee36430baa7462ced01736a658fa87e91e5d3e0129e56d3d400ccdf49fbd51b6a86a1d0009b3fa44310b097ae998ea2f
+EBUILD picard-9999.ebuild 1696 BLAKE2B 0923250ae18bc8d129649750325e0d8cbe0a9de61caa574f3f73a6023d5b915de3d4615447961ae5c9be24162ed4f6e2cdf69d263b3f80347f92337d0380faa7 SHA512 f85dfa4b86c95e3dcc3cecc4ab04efc14d0cda35e402850b3f2bae56fd278ac9bc9cbb9091367a6c6b1393b16ce055f0618f2e44aa16daa83d2e589ff5ac05e7
 MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d
diff --git a/media-sound/picard/picard-2.0.4.ebuild b/media-sound/picard/picard-2.0.4.ebuild
new file mode 100644
index 000000000000..760daf7633e6
--- /dev/null
+++ b/media-sound/picard/picard-2.0.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+DISTUTILS_SINGLE_IMPL=1
+DISABLE_AUTOFORMATTING=true
+inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="Cross-platform music tagger"
+HOMEPAGE="https://picard.musicbrainz.org"
+SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+	dev-qt/qtgui:5[accessibility]
+	>=media-libs/mutagen-1.38"
+DEPEND="
+	nls? ( dev-qt/linguist-tools:5 )
+"
+
+RESTRICT="test" # doesn't work with ebuilds
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+python_compile() {
+	local build_args=(
+		--disable-autoupdate
+	)
+	if ! use nls; then
+		build_args+=( --disable-locales )
+	fi
+	distutils-r1_python_compile ${build_args[@]}
+}
+
+python_install() {
+	local install_args=(
+		--disable-autoupdate
+		--skip-build
+	)
+	if ! use nls; then
+		install_args+=( --disable-locales )
+	fi
+	distutils-r1_python_install ${install_args[@]}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable
+calculation and lookup of AcoustID fingerprints.
+
+Install optional package dev-python/python-discid to enable
+calculation and lookup of compact disc identifiers (disc IDs).
+
+If you are upgrading Picard and it does not start, try removing
+Picard's settings:
+	rm ~/.config/MusicBrainz/Picard.conf"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/picard/picard-9999.ebuild b/media-sound/picard/picard-9999.ebuild
index 89f14c4bd17f..e29c2cbc2b5c 100644
--- a/media-sound/picard/picard-9999.ebuild
+++ b/media-sound/picard/picard-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 DISTUTILS_SINGLE_IMPL=1
 DISABLE_AUTOFORMATTING=true
-
 EGIT_REPO_URI="https://github.com/metabrainz/picard"
 inherit distutils-r1 git-r3 gnome2-utils readme.gentoo-r1 xdg-utils
 
diff --git a/media-sound/playerctl/Manifest b/media-sound/playerctl/Manifest
index e13f329e7e31..00f0f2e82266 100644
--- a/media-sound/playerctl/Manifest
+++ b/media-sound/playerctl/Manifest
@@ -2,9 +2,9 @@ AUX playerctl-0.6.1-doc-typesfile-path-fix.patch 1127 BLAKE2B d41f347717cbd49fb9
 DIST playerctl-0.5.0.tar.gz 17015 BLAKE2B 5da1d0fd4e442ac5f124bd693ae14222624c5239c9fad72e57d43977467339522344bc8d8c37b0f2bfda51c61861dc33d7e35e4a730ce59a87b691b5657ec729 SHA512 307cad5eeea7efa0c97c885660f49468f442fe907ef2495b56ac512e0551c7248750897b6d00934cbfcfcb35f486a101a238b276ef71d2ef866132ca3cc0932c
 DIST playerctl-0.6.0.tar.gz 22124 BLAKE2B 6bb90586c56e21a00b5e6e1769248b9782a8211b01dacf590857fe4fe199d6d3fa7aa46a36cba9a8e198a1aad0bf17973fc15140db11c484edfb0275971d3d08 SHA512 8023b5704ca2a428510df6228850b616061289764cc3c4190c0c46f79d6a20e499495f2d773bd821357653ba63bca40eac70f7cc3a11251da3c6a4f7781db739
 DIST playerctl-0.6.1.tar.gz 22921 BLAKE2B d2f5874280e1a99b318bc83c40a38ee31d9c68426cb63e1e16e8ded26bac1a894d78a929f46d45d631af70e37476a4151c520eb69c94e80026689a12c682f0ad SHA512 07c302eb06a96bf3b8aa180e68e85ef6f9fdb5933b80fbce8ee5f9a36c1d961eaf5638e319ff0b26475984acc57a447a4aa8e705667f77e4bd393364cdbfb284
-DIST playerctl-2.0.0_rc1.tar.gz 42452 BLAKE2B e9a5d2b12b2687d0f06993860cd242551c15e66fb7a58e3b034350c8be9d29f5506a3c588cb2a7e7a7932011aeaa19b600060bc2ed78f994382a10f768fe5d43 SHA512 a38e5a0f729b305ac2d87ea34995dedf3c083599d8960fcc55a0273b0ced26ad72eface57a859a9e7b61ed3a2e4a0e8a419c5523087f2349ed4d32099e4512f1
+DIST playerctl-2.0.1.tar.gz 43700 BLAKE2B 9df01bdb5f71a589a40462ed807b0f150d8c90921d1e0ef96bf99f20d9e58345307af35b39cc95e8ab37fcf9e5686935d856e050b61210188008b65281e63557 SHA512 6a5807abc79358bab0ad30a11897a8109121d5eb7d9e17d2c695221ef83942c3c7235fc738ab27c9dd2d3364c04737355e9c88ec5d49f999565565fb4494f720
 EBUILD playerctl-0.5.0.ebuild 909 BLAKE2B 4b4149e81209610d4de900f59860270d9bee8d97821350f5a9dd921869c6987b0952d93e958f662ded41a08ba58709dfb9af5b4c71e9b5ce209cbbde8c1135b7 SHA512 81bd0b13240357151302d2ba9bc28631e634b25437a19112b3b10e0d1939141c9acb0cf26f62d795bfff8f0d0d70c0a74149aeafa0185a2cae6a67ee8c8db666
 EBUILD playerctl-0.6.0.ebuild 919 BLAKE2B 9023af5a6c9fe937c5096e12720b676c434e45c21238326d957dd50f33d4a44ed20abd2f541386ae471ce6835efdfad1f406fcb220ae6833cc94544aeec2445f SHA512 898d55b119f86d63a9b46dab9b10f53017caa728ba484c7ab814b58f936ae4a25d168b407d86e560099b478b4dfa10fcef01ea5c9c4ecb1d8367cc833cc26e28
 EBUILD playerctl-0.6.1.ebuild 973 BLAKE2B a6f3a4432d1b42984a3426977b05f4e94b303afc755a061f121196e882704cf440c8606b9829099ff91d3e01653ecf75e2beee121b9d0683c6e3c4c0c1b8032c SHA512 0c57ffda7cedd332b10cc566967f35c9a89b0cf732025fe9b4febedb89801332b7a357fb281520dfeee668ae1cea95b1d9c26e9a5cde6fdf0536bdbe9f355d5e
-EBUILD playerctl-2.0.0_rc1.ebuild 1089 BLAKE2B 40c7f8aa4f46ff0ce97afc04ef49c54f1d81a6a6bc1ab507bf1ff9949288e58cf8636333da0446a2b44714b0b2281ca83f5faf0e5e57706141c4c1eb02e20a1a SHA512 a454a5cb4fe8bb366cba3af673698b108de63e7053185526b9ad8de2cae154af8f1eefff998552f67084855f22fcf66d2e2c5a7263bdbdc0a54349a56388ec60
+EBUILD playerctl-2.0.1.ebuild 1053 BLAKE2B 2d5414790ca1e1745e6c86bf2524718c37c843c162050f688072ca9385d23054fb63494a9ac41fb89579eb5b28717650186f70b2ff10cdf0093b52c26dc0aa0f SHA512 d2b1bd2e41f60fb5c61923ec8088986ac5acd695462a5d4dd7be6b7689792072e8846de0da4071c26bb00add72e19f33ee063302760a26547948f4ce7782a84d
 MISC metadata.xml 487 BLAKE2B 26a06ce93634d362dee7b3a595d5257ef946c27a17c181f758fa3c0acd33aeb45c825643311da3739791f80402e38b8fd618ea43655ec60689978cf2e0f2f30f SHA512 f97cd3597a70b86c784f11ffcc5c7c8fb5c16a124cb871907f8e3f216b7ff26d7e2954a52f52a5640fc8a8f41300a4419c527c57f410350a322ed36b1fa2e77f
diff --git a/media-sound/playerctl/playerctl-2.0.0_rc1.ebuild b/media-sound/playerctl/playerctl-2.0.1.ebuild
index 990d1ddebffb..18ed3cb3fc51 100644
--- a/media-sound/playerctl/playerctl-2.0.0_rc1.ebuild
+++ b/media-sound/playerctl/playerctl-2.0.1.ebuild
@@ -7,7 +7,7 @@ inherit meson xdg-utils
 
 DESCRIPTION="A CLI utility to control media players over MPRIS"
 HOMEPAGE="https://github.com/acrisci/playerctl"
-SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
@@ -27,8 +27,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-S="${WORKDIR}/${PN}-${PV/_/-}"
-
 src_configure() {
 	local emesonargs=(
 		$(meson_use doc gtk-doc)
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 13d74723ca28..d8cd829484f3 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -9,5 +9,5 @@ AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f90
 DIST pulseaudio-11.1.tar.xz 1648924 BLAKE2B eea767efb6529436a6c2aa7d5ccaccdbda2338ad8db639ad333598b1589d259acf71ef34e904a240710f5343864fa868789eaa7f7cae1b07902ebd989fe83e12 SHA512 8863d8d7aede0d9a4d158e84e7bece91747c335f9ac98c7b21fafe76b762f8817e1125307aa46e561e540d2c40525e91f51a55ec34ac55d58fd5980199856a7a
 DIST pulseaudio-12.2.tar.xz 1665092 BLAKE2B 2e36efc5142c1e379cc2b135f4126f03a31831b26efe60f7cdf128af6e23fab25706a5609644d0b387530021055f87525fe60d527cd3a087f51bfd58e810644f SHA512 877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e
 EBUILD pulseaudio-11.1-r1.ebuild 10988 BLAKE2B 891673695478f3296371fad34b7e77dadf9fe21f228961ce30a08e50f4f5d2acd0888e7a78ed4194253d6eb3bf3ddf86ceff485cf215fcbd4b88672610dea5a7 SHA512 bb1e952c43c219b26cbe19fdec6df394bc407cfc829d9b78e4ad2c08535296dd890173f3afb6bb7c0dabd4be1ca384837ea8faa72efd37b082705afc328371be
-EBUILD pulseaudio-12.2.ebuild 11122 BLAKE2B 9e08ab99e4eff95a16e905e4cef66d55a3cc91fa651e2fb965e3a239605fbc5612d679def64401e6ee07ea97b3dea77349214fe620af341c9d676fe3ffad6420 SHA512 782d235efbc4ca48deab1b987918efc41db4f704bb145d8bfb5f55ddc2e77fabb0f1a348a2d77fbbebdfb296391eb880dd982aefed0c2a3886563f065f5db837
+EBUILD pulseaudio-12.2.ebuild 11112 BLAKE2B a424b18535d1d72892bd0e89ba35c53fc61069e19a62e81f74a764c516b9df04f3cb528de83aa2bd2edee0ac325fba82c718c65dcb24841ecf76a1761481abea SHA512 a0abd15216cd5d6b3cebd70703e8cb00bf2125f6f0e17d35f1622288821c8edb6d1020b587370827595293abf1cb63c810f7e56c602eee58c1302d17a1e9e272
 MISC metadata.xml 3739 BLAKE2B da9e8c870669921600e4c2e3377dbabde19bd8e177741478b72da7f58a985c001268686e941b2dbcf557ac301056c0c9ff3dddc952ea3f12acd43cee955962b1 SHA512 673b98d8140d2b0ba0253d09e9066c7dddcc5a6d3ab4342579c4aba09cc1b0c3345c26dfa7e14868a0a3c1b1783e96971ccd56ebfe8105122bd9dc25d72d64c0
diff --git a/media-sound/pulseaudio/pulseaudio-12.2.ebuild b/media-sound/pulseaudio/pulseaudio-12.2.ebuild
index df7688118c99..f9dbd9e4b1fc 100644
--- a/media-sound/pulseaudio/pulseaudio-12.2.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 gconf +gdbm
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 385bc6cb1dfc..95456dff4156 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,7 +1,9 @@
 DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
 DIST pulseeffects-4.4.0.tar.gz 1019903 BLAKE2B 613975539436df9c15efd4e513cdaba92db96ada32936a30cff699826734af79a1a819c2cf95c575ea1928ba66987a27d0b0a70cedc257d82b782e348fedbba8 SHA512 48c4534a2667e38b12729c37600a87aaf00e71ca709d0420d3cbb7633ade04b3e33c1b4bbb140b975e2585b5e8ac2314a0857dc26db74308e6c77e465a943bcc
+DIST pulseeffects-4.4.1.tar.gz 1035274 BLAKE2B c8fd9b6e73ef2abc07837560faa10661a0f46f503b6a6023a9cde08086fafdea18cdc73b99c8fd5176942e066629ffc085e47e591831c034fd8b739ff4975347 SHA512 11ff0a689c6bf718d95eb0202fb73e06d194a71be9393685a2b444c3fc22bfac5f022ee177a73d786e6704f56173fd702f30005e7ace48fb825f3180f0dfe99a
 EBUILD pulseeffects-3.2.3-r1.ebuild 1568 BLAKE2B b50ff96cee7ea244dc499c46bfd9dc382e3fa22d03b1d74c25614a5fcd9b540521bc4b7c50a42cd11e19286f5f86c82b7ab5cb93c44da0e29a9d87c2bb4157ba SHA512 704a2e5d1bc7abc1ab31d48092cd825a140a571e5ee0034bf4a9041615183c91383fb5b4051275a4b598be35e638b375e63de3d117d0fdbc63fdfb341c57e05e
 EBUILD pulseeffects-3.2.3.ebuild 1492 BLAKE2B 959ccbff4ddd3376895dd833d7a36ba81b8b2d46381a7cc14aa73ab2701d01910fcc340fffe0058099f31e80332670182671c3c737d0b41746af5a386b2e6182 SHA512 281ff12ecc62b6c75db6ffaa290517ab24c8110db4333c54221d87f2283feab60a5ff2e0e02ead2193bafcb7d4a8c6b990e67cd1925e9afa5ee16aa5b49decd2
 EBUILD pulseeffects-4.4.0.ebuild 1684 BLAKE2B 968769997ea15381297a4845118fe0408b82097245b83bda760933b024a9792df73e3dc1c15c60e02195b5a4d457c7c9b7c4a13a342a5585e2b27bad4762122e SHA512 b526e120bb7b6caf08d16e503d117728695ea19adba16e8ccc85a11900dc808b20911de9c34b1c7122f1abca5deec10fb0f656cf9ae510daec4b0ca6875d9796
+EBUILD pulseeffects-4.4.1.ebuild 1684 BLAKE2B 968769997ea15381297a4845118fe0408b82097245b83bda760933b024a9792df73e3dc1c15c60e02195b5a4d457c7c9b7c4a13a342a5585e2b27bad4762122e SHA512 b526e120bb7b6caf08d16e503d117728695ea19adba16e8ccc85a11900dc808b20911de9c34b1c7122f1abca5deec10fb0f656cf9ae510daec4b0ca6875d9796
 EBUILD pulseeffects-9999.ebuild 1684 BLAKE2B 968769997ea15381297a4845118fe0408b82097245b83bda760933b024a9792df73e3dc1c15c60e02195b5a4d457c7c9b7c4a13a342a5585e2b27bad4762122e SHA512 b526e120bb7b6caf08d16e503d117728695ea19adba16e8ccc85a11900dc808b20911de9c34b1c7122f1abca5deec10fb0f656cf9ae510daec4b0ca6875d9796
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.4.1.ebuild b/media-sound/pulseeffects/pulseeffects-4.4.1.ebuild
new file mode 100644
index 000000000000..edcf67ece621
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.4.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="${HOMEPAGE}"
+else
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf mda-lv2 rubberband"
+
+#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
+RDEPEND="
+	>=dev-libs/boost-1.41
+	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/gtkmm-3.20:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=x11-libs/gtk+-3.18:3
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
+	calf? ( >=media-plugins/calf-0.90.0[lv2] )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	rubberband? ( media-libs/rubberband )
+	>=media-libs/zita-convolver-3.0.0
+	media-libs/libebur128
+	media-sound/pulseaudio
+	sys-apps/dbus"
+# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
+# and sys-devel/gettext depends reasoning
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-libs/appstream-glib
+	sys-devel/gettext
+"
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index c7ac54eedfd7..b798de44e4a5 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,6 +1,8 @@
 DIST qmmp-1.2.3.tar.bz2 1187718 BLAKE2B f57eae68d25d709413a9cd33c48d82488be4e357eb472b19169f821ab96eba6babd75cf6d4492bade95ee590c17cb3dc789018782b136ee0829d337fb391008c SHA512 8daeae416b7c985450c7876145a896b88163608afd971f05eca9e4cbdea65039f21833836fe88cf1ceff253434370e3880c3ee7f30fe3ee7207fa8656a473d1e
 DIST qmmp-1.2.4.tar.bz2 1189587 BLAKE2B eff6d52456a79373434b793fc2303eea2ba42675626466c9842606075da8469587b850ea63a814624cb334ea66491578be134ff138594aecab9cba1c4f953b5e SHA512 086dec09700ffda8aec04c5b3c0f062cb0cde72c47902452751443fd54c8f563fc31d02f4fbf73cc0831d65aa32026c884477397d53a8e761227ab8c46be4874
+DIST qmmp-1.2.5.tar.bz2 1181154 BLAKE2B 12a0b3d47a2c844dfecf4c4236147bb3b53b18a37442b61502bc7c8388e7ca180fe744211100314fb9f2abda30174b4cf47810a3e9435262fa977faa3b246ddc SHA512 85000561ed8055e78342eeeea47064fdbac3a97d62fea26d10d7c8a19d762c73c2bdce0eea89ce2886d027cb64c127792c0848cf73ea427957cc4fd07d0f3842
 EBUILD qmmp-1.2.3.ebuild 4172 BLAKE2B 9db4f2b3d25b782c9e27eae6ae8d2f64b247634863ee3b58362401746c0004a66d9444f8a21efb86d79841136f5a22a10d40838e98ab83b4bce04ccce5d4dae4 SHA512 911c14441c370ae4494da1e9b0dacc28ad9b469eaab72fb99a5210af73760f2597c63a1ff844c10b0a2d8a17f270f6ec3b9196b0d08ed738ce9c640e061be6e8
 EBUILD qmmp-1.2.4.ebuild 4171 BLAKE2B 83e5f7bf60a315e55491b571bdd7440edd0023b3e3bf61aa2484c6ddb06873606ecbefea24499eaef252ce4fda770b368b2c0804d88801cc43853f36fc8794fb SHA512 fb1c6f1c21b84a6ef507a8dd218ff469172861cff6b6970652bf78538859e1ebf217c21f9e60167296c8bd87dbe40bba36ffbd423708f9cafa0fd6c2d13855b5
-EBUILD qmmp-9999.ebuild 4174 BLAKE2B f89b2d24351b45622cd4f09b8883d549eb90f1b3d963c3dad4f9230e45fcbf720caa11a97acae7e881414dae61a2939da30a37dac3e24e9a09782fe303b9072f SHA512 7db78b91c76d766f8c5d0251ba3c1d5ee94a47427865b75bcf386f0d0d01969bb4ad169196b7acb8932dfd4d93b40eeb39c8b2e4e8cf4699ed5e92be1bd38b16
+EBUILD qmmp-1.2.5.ebuild 4223 BLAKE2B 03bba4b756908e7ff5d7d0eeaf7afa2752591ebe0294b5bf904bbc12ec6e735d61cdaf989e52f3f3645ad5758ab7fab1ff06883af6b2d473b3cb97071908edaa SHA512 11268db2ee4019b9ade8a795a2edcb46ed90e66c1db529c44bf3349b88cf910fd3fa993909474dc30aeb4849e2fe27ba3ec94a93a86cf6a82a78d668aa8d2a76
+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.2.5.ebuild b/media-sound/qmmp/qmmp-1.2.5.ebuild
new file mode 100644
index 000000000000..70985023af4a
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.2.5.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils xdg-utils
+[[ ${PV} = 9999 ]] && inherit subversion
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
+		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	QMMP_DEV_BRANCH="1.2"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
+gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
+
+REQUIRED_USE="
+	gnome? ( dbus )
+	shout? ( soxr vorbis )
+	udisks? ( dbus )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/taglib
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	cue? ( media-libs/libcue )
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:5 )
+	enca? ( app-i18n/enca )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		media-sound/jack-audio-connection-kit
+	)
+	ladspa? ( media-libs/ladspa-cmt )
+	mad? ( media-libs/libmad )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	projectm? (
+		dev-qt/qtgui:5[-gles2]
+		dev-qt/qtopengl:5
+		media-libs/libprojectm
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
+	scrobbler? ( net-misc/curl )
+	shout? ( media-libs/libshout )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sndfile? ( media-libs/libsndfile )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HAL=OFF
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MODPLUG="$(usex modplug)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index f7eff28d1dbe..70985023af4a 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,8 @@ inherit cmake-utils xdg-utils
 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"
+	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"
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 0bd9849a0c7d..3413dec89bc5 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,9 +1,4 @@
-DIST qsampler-0.4.0.tar.gz 243065 BLAKE2B 7a51b15ddc9ca80180eba8134dae400cb1cf15cbd73214ac827cf33cc5669e9d6d8cd12aa3f28fe1c11206102c76837c991732257317af6acf5eaf5314fc2f04 SHA512 42c235396cf68bd811fa251fd6f112a835ce1769130823163fa1a0e517431922b941aa56bc88f22890e6d6326b38765a2f3ced8e67a78d3420600f85e827d467
-DIST qsampler-0.4.1.tar.gz 243377 BLAKE2B 521dddf1e07c11bee489148f82b33663c0bfdc0357fe146548e88075de23a1224673b5ae40ea6cb0c5a45bfc6f8808d7854cb0e7c9420e6d0e8ebc6d4c5e9e19 SHA512 ffa6e2feb11f9a96580fb1803b6ddb5c56ae475c1f04b5bfa94b1403c29ed0e14f8f60e9166ca166d5b478184c37337b0de0e098a54f74a90f951260d070ce14
-DIST qsampler-0.4.2.tar.gz 244794 BLAKE2B 1b94c2a60537d20e62c31e05e4fb235b832b1bb808d508e10b1390fe039f5323280dd402f0bcd8df1e345f2b199f73baa6e16cc4e257ee9a92dea25d5738f88b SHA512 edebbc801e177cce44aa4e8cdc9db9e9e5c6cb35b75f33c4c15cae5920fa869053748075179c3b4d68956e30b05e5c94513419af567e60f27ca222f77fa41f30
-DIST qsampler-0.4.3.tar.gz 246314 BLAKE2B 8e4415aa8cfec8922881b569afde5cea4d6fbea27cc5518ef2abafb4a174d95031d235b7d226bde8074bd306ca09063bc5a09fb66fc56878521752dbfb7f6f58 SHA512 015b747bd7c796341c6516fec68dd3b12725f461f7e5e3898b24862af556d69d67d73354f0aaf3bfbca069ebe67de34121350dcd3ee8161ec12e6bae80227fb9
-EBUILD qsampler-0.4.0-r1.ebuild 963 BLAKE2B cab3f430d50fee97f4765cb97ebc688ff2f30e8c7659d1754a8d85e0c75ee9a88114ebeddd628432836ed88ff71cd8276e77c292a6685920ea58685556b08f2b SHA512 7b70af07ebf5d221140b208d58801c7df7ec772d0e99ec84c1b099b5dbfbfe55cde3516d1e30060bdd9149901a46bf107302e563fe999a3e00d6c9f721b69d98
-EBUILD qsampler-0.4.1.ebuild 946 BLAKE2B 7bf1a210b4090f134e8c922cf04565547ec83f79b8c7b63f0aa4949cfbf4153209a32a2fc3dc94fdd7b641c4ffd6aad941e3c844bf84511b51567ab1c11f22fc SHA512 a9b3ab3e38b00cf0188f1e35e0d9fc4df1b0035ef71d882e886105d4a0b4f3c3e76f288f109cdcff21be84ddb244f0b0288670c28fc1fcc0f7a9e766ab415a6e
-EBUILD qsampler-0.4.2.ebuild 946 BLAKE2B 7bf1a210b4090f134e8c922cf04565547ec83f79b8c7b63f0aa4949cfbf4153209a32a2fc3dc94fdd7b641c4ffd6aad941e3c844bf84511b51567ab1c11f22fc SHA512 a9b3ab3e38b00cf0188f1e35e0d9fc4df1b0035ef71d882e886105d4a0b4f3c3e76f288f109cdcff21be84ddb244f0b0288670c28fc1fcc0f7a9e766ab415a6e
-EBUILD qsampler-0.4.3.ebuild 978 BLAKE2B c2bbf6aaf288a947211ddad21c99365094eaa2b97e948318b7bdfe533bb33ddf0e708ce4301c5597049c6d67ddba3595049c7ac99401440d521200d71bdcb24e SHA512 50d4038e18d83d3fa9473b5dc03acee1e6fe1070250168dc3a05826ce3c7252e7e35b3f6d3a8bb13ab220c6ff60e66c2744824de8bc26c7e47bc4e539f176187
+AUX qsampler-0.5.3-Makefile.patch 466 BLAKE2B 17d8ac1e29f6668a02fc7734d51f40e9f5a161da799fdeb2ddc5eaa89a69c607de6183fab78a13f4bec5a0efc002081589ca141f3232f37cc0051218f440fd5b SHA512 6f02c41941bacce8b49837471f5699960b069bd48e99b116402afa5452116890fa26da340a2e85b036d2051906b5eb828832598925b1d314de2a866eec47f155
+DIST qsampler-0.5.3.tar.gz 259144 BLAKE2B 9efad81f6392cc6412e7d73c0701bdd2deab635a2857825248f003a594deb1a655201ed8e313b95cfaf066b71369f910a6634252b7ad7f2c636aa089c563f33a SHA512 0d870e1df1b20aac09b11667541767ebcadb8a9a8fb458aa3f48d4d4b2ff55b32e4e56e6d00b0330ab854120ace93b57f524a5126962456223026c7e69178bfe
+EBUILD qsampler-0.5.3.ebuild 1174 BLAKE2B f8fd1a22bb4cc9df434ae72a686bbb447ac936dfdad21a0120b176f5098005eaf67383c93f1900fe5203d84dd6fe98214967a4a5d3e400c78dccf7795c1c30fb SHA512 da85ec4df4096fb7f6c05633ddfe54ff653b9f0948b20ce9d5b9c882879baad016beb9bde8af43b54f4b862c2aa2d95ded8a8cf3dbd21907e8285ca10cfb1d0f
 MISC metadata.xml 493 BLAKE2B 4df149f56c8c138f3a0037470860cc03040d482a75dfde7d27fa71526003c1fcfd42915cc822dc8d7de93aa73f034cb0c72e8882937770b7872d1db72ab6419d SHA512 1e64ef3cc6a1389548e5c88f676d68567f034cebcfbcdf14c369d5c73d914059fb2a8eff2f7e66b5700400b92560d042097ecf91b39712b8552f74fe1e75e6cd
diff --git a/media-sound/qsampler/files/qsampler-0.5.3-Makefile.patch b/media-sound/qsampler/files/qsampler-0.5.3-Makefile.patch
new file mode 100644
index 000000000000..7f23e78b669a
--- /dev/null
+++ b/media-sound/qsampler/files/qsampler-0.5.3-Makefile.patch
@@ -0,0 +1,10 @@
+--- a/Makefile.in	2018-12-16 23:40:26.001395069 +0100
++++ b/Makefile.in	2018-12-16 23:46:00.210638503 +0100
+@@ -109,7 +109,6 @@
+ 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
+ 	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
+ 	@install -v -m 0644 $(name)*.1 $(DESTDIR)$(mandir)/man1
+-	@gzip -vf $(DESTDIR)$(mandir)/man1/$(name)*.1
+ 
+ uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
+ 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
diff --git a/media-sound/qsampler/qsampler-0.4.0-r1.ebuild b/media-sound/qsampler/qsampler-0.4.0-r1.ebuild
deleted file mode 100644
index f64b383de284..000000000000
--- a/media-sound/qsampler/qsampler-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qmake-utils
-
-DESCRIPTION="A graphical frontend to the LinuxSampler engine"
-HOMEPAGE="http://www.linuxsampler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +libgig"
-
-DEPEND="media-libs/alsa-lib
-	>=media-libs/liblscp-0.5.6:=
-	x11-libs/libX11
-	libgig? ( >=media-libs/libgig-3.3.0:= )
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}
-	>=media-sound/linuxsampler-0.5"
-DEPEND="${DEPEND}
-	dev-qt/linguist-tools:5"
-
-src_configure() {
-	ac_qmake="$(qt5_get_bindir)/qmake" \
-		econf $(use_enable debug) \
-		$(use_enable libgig) \
-		--disable-qt4 \
-		--enable-qt5
-	cd "${S}/src"
-	eqmake5 src.pro -o Makefile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README TODO TRANSLATORS
-	doman ${PN}.1
-}
diff --git a/media-sound/qsampler/qsampler-0.4.1.ebuild b/media-sound/qsampler/qsampler-0.4.1.ebuild
deleted file mode 100644
index 4dca71da49fa..000000000000
--- a/media-sound/qsampler/qsampler-0.4.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qmake-utils
-
-DESCRIPTION="A graphical frontend to the LinuxSampler engine"
-HOMEPAGE="http://www.linuxsampler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +libgig"
-
-DEPEND="media-libs/alsa-lib
-	>=media-libs/liblscp-0.5.6:=
-	x11-libs/libX11
-	libgig? ( >=media-libs/libgig-3.3.0:= )
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}
-	>=media-sound/linuxsampler-0.5"
-DEPEND="${DEPEND}
-	dev-qt/linguist-tools:5"
-
-src_configure() {
-	ac_qmake="$(qt5_get_bindir)/qmake" \
-		econf $(use_enable debug) \
-		$(use_enable libgig) \
-		--disable-qt4
-	cd "${S}/src"
-	eqmake5 src.pro -o Makefile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README TODO TRANSLATORS
-	doman ${PN}.1
-}
diff --git a/media-sound/qsampler/qsampler-0.4.2.ebuild b/media-sound/qsampler/qsampler-0.4.2.ebuild
deleted file mode 100644
index 4dca71da49fa..000000000000
--- a/media-sound/qsampler/qsampler-0.4.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qmake-utils
-
-DESCRIPTION="A graphical frontend to the LinuxSampler engine"
-HOMEPAGE="http://www.linuxsampler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +libgig"
-
-DEPEND="media-libs/alsa-lib
-	>=media-libs/liblscp-0.5.6:=
-	x11-libs/libX11
-	libgig? ( >=media-libs/libgig-3.3.0:= )
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}
-	>=media-sound/linuxsampler-0.5"
-DEPEND="${DEPEND}
-	dev-qt/linguist-tools:5"
-
-src_configure() {
-	ac_qmake="$(qt5_get_bindir)/qmake" \
-		econf $(use_enable debug) \
-		$(use_enable libgig) \
-		--disable-qt4
-	cd "${S}/src"
-	eqmake5 src.pro -o Makefile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README TODO TRANSLATORS
-	doman ${PN}.1
-}
diff --git a/media-sound/qsampler/qsampler-0.4.3.ebuild b/media-sound/qsampler/qsampler-0.4.3.ebuild
deleted file mode 100644
index 6eebb29abc59..000000000000
--- a/media-sound/qsampler/qsampler-0.4.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qmake-utils
-
-DESCRIPTION="A graphical frontend to the LinuxSampler engine"
-HOMEPAGE="http://qsampler.sourceforge.net http://www.linuxsampler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +libgig"
-
-DEPEND="media-libs/alsa-lib
-	>=media-libs/liblscp-0.5.6:=
-	x11-libs/libX11
-	libgig? ( >=media-libs/libgig-3.3.0:= )
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}
-	>=media-sound/linuxsampler-0.5"
-DEPEND="${DEPEND}
-	dev-qt/linguist-tools:5"
-
-src_configure() {
-	ac_qmake="$(qt5_get_bindir)/qmake" \
-		econf $(use_enable debug) \
-		$(use_enable libgig) \
-		--disable-qt4
-	cd "${S}/src"
-	eqmake5 src.pro -o Makefile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README TODO TRANSLATORS
-	doman ${PN}.1
-}
diff --git a/media-sound/qsampler/qsampler-0.5.3.ebuild b/media-sound/qsampler/qsampler-0.5.3.ebuild
new file mode 100644
index 000000000000..b6f28fce46ce
--- /dev/null
+++ b/media-sound/qsampler/qsampler-0.5.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="Graphical frontend to the LinuxSampler engine"
+HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +libgig"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	>=media-libs/liblscp-0.5.6:=
+	x11-libs/libX11
+	libgig? ( >=media-libs/libgig-3.3.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=media-sound/linuxsampler-0.5
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
+
+PATCHES=( "${FILESDIR}/${P}-Makefile.patch" )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable libgig)
+	)
+	ac_qmake="$(qt5_get_bindir)/qmake" \
+		econf "${myeconfargs[@]}"
+
+	cd src || die
+	eqmake5 src.pro -o Makefile
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/shntool/Manifest b/media-sound/shntool/Manifest
index eb172b44bd71..49f4f0eaea60 100644
--- a/media-sound/shntool/Manifest
+++ b/media-sound/shntool/Manifest
@@ -1,3 +1,3 @@
 DIST shntool-3.0.10.tar.gz 216061 BLAKE2B b662c64992409c1a12dd3fffab5f39c69b2c1f8fb958cba590009f599e4363403aa1d353efdec8ab7529fc22cfac0b908368a132b60f7e5acd55dcae932909e2 SHA512 2150d7123860abb54a56a1615bda991ed3713d73c338723f28b7d01a63c49a47809be16dc57b5b4edeee1567b003f9a4b54945c1cd08440f9503d22b91eaa06d
 EBUILD shntool-3.0.10-r1.ebuild 778 BLAKE2B 8dd9c0a67bc2fa0f5ff32d995f169abf6720d63dec8feb7fcd5556de0f6faba3935c789db74302d480b0c93846070784bf7483c315f60b1943a92148afb93253 SHA512 13ee328557b2f40c6177cf8b230eb55a3335b59102df8238490e6fd98d3d72a9c0779a4024bdd7d68743b28ab21e8a8ac47f37e5e40d0668a4c999298c338c16
-MISC metadata.xml 419 BLAKE2B ee01913318798b80d3bfd0b80eafaa243251f697b067105b204b2bd07a67ff27c81e1a0a2a7f53796495699cbd4b0335e263e1782b8fdc43acf19c9f16495c01 SHA512 6776c4523ec29fd9704ad9ae663d099d51eda469b2fe063bafa8c9a1f37da3ffe62f1e7f506534d28131db2fe0db98d815d81d8d0840e685a6f07449aecf65dc
+MISC metadata.xml 496 BLAKE2B 2a2e3262f4ff6fc070d1f4693db8610e00c85317232b21799b897a40f353f15d5b8effcace525c99ea556ff51316d8d40da923c9372684510247d48f316f3e2d SHA512 81a78997d73d8356ccfa4d2a8a37b8c114cd80e6ccafd4705be1741e5ee7abdbf3eb77373f45c529dcf1bc67c4ba3f4ed147cffd790606189a233daac66dac66
diff --git a/media-sound/shntool/metadata.xml b/media-sound/shntool/metadata.xml
index a9eb444807a7..372b7fd68e56 100644
--- a/media-sound/shntool/metadata.xml
+++ b/media-sound/shntool/metadata.xml
@@ -8,5 +8,6 @@
   <use>
     <flag name="mac">Add support for Monkey's Audio files</flag>
     <flag name="alac">Add support for Apple Lossless Audio Codec files</flag>
+    <flag name="shorten">Add support for the shorten audio compressor</flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest
index ed8885aa3b01..52fb2f41261d 100644
--- a/media-sound/snapcast/Manifest
+++ b/media-sound/snapcast/Manifest
@@ -4,6 +4,6 @@ AUX snapclient.initd 381 BLAKE2B defa09df346dac279f1ed903adaf88842b060b34d774cfd
 AUX snapserver.confd 1010 BLAKE2B 9d29348f1618dd399c5a9c500d1ec89fd6719243f472dbb666cfa16e6128411a83c9ac9401a1754b79ae4b560643d1f38c3f00f6f6d0a2301ad6e3fa2168c884 SHA512 98818d75e965d54082b33fa36769b74810b3137f07693eac00d10313c3716e72170e9148faa0ac25fefc7868bb7a206ac5ca6d18396fa71d1a74efcc14485548
 AUX snapserver.initd 386 BLAKE2B a88d150fd5dc0e11b20fad8d07111ca9ef0074bd79d66179fc952b636296ee1b1d151a90d8774ad419cd7ec982305da3da3ddda43d55f5ad47c45d98adb72649 SHA512 d8f6b72d1a5be5f2ddd9266fac33b6d24b046993c532f204e68824919ed09f41988923a59ba722c3c9c748b87c1fdda1c91026f8e591993f34188ef3c488f379
 DIST snapcast-0.15.0.tar.gz 667452 BLAKE2B 0bf7e28ba52356c8fff8066ded3d741243c2ba88cdc6cefda113c0d6866fe14b2fea6198d7809e564cd61d32a336a2c30ee22f6f5d6ae77368a6f3e254cc5065 SHA512 3751eeaa9be4ffd5c7633b8770f36e87360ab83004f090a8350e377f60a79d9502b92b92c5c9c35f513705e6484d113de9942f0a896824d7c5f806ba0010e84e
-EBUILD snapcast-0.15.0-r1.ebuild 2027 BLAKE2B 3b59f8b92af313d4be43e94cf6f96b80b0bef11bd13ad7d131b1af700929665c39c2916b5f48b996a4a39df6c4f194b5b3accf434f378ad11e4a23e81bb887be SHA512 1fbc1e71107ba90abbd03a61d67ffdcc684e5fbd59e611c0f79c4f2197d3cf83634bbfee6391ef83dfbc2837b54eceb1f5a4496d3c3bf495952b8d7ff0836cc6
-EBUILD snapcast-9999.ebuild 1966 BLAKE2B 9a5cd3681ad18305dd558d99baabe9a1630f817d1569fe9a30b77a160603fe52d941eb8398c99ce8f943995dedab370ccf141e8d7bc94c11df1883b697a854f8 SHA512 d824679b93e13117a206d69a2cb5c7978619ef25308bbe75d28685630435238fa4496d473bf54477ddb7b53b48c327aebb19de6a4ce393909249eb335392a599
+EBUILD snapcast-0.15.0-r1.ebuild 2036 BLAKE2B 6221864068dd147e0c642269a979969d0ab3d13b929c0724dfa69963404c8af29d1c1476db4dac01548256e6a37c2319f0f724b702f651b62ed89d60e7a057e0 SHA512 48a7583b6bebb86f55663a37465b7614f99e8eaac0412ff67837ada3f6124a212d1d4c773b3cd4eb6af625aa27eb8ed0dda2ab76b4992e1b0d70cae32cb6c0ef
+EBUILD snapcast-9999.ebuild 1975 BLAKE2B 6c93cb43de41804b2b4a89b22605b42ccc897c8f40eff5d0cd067e4691c72a9b1ad1851e6d2db3178336b78a79e8349c4e75de86b01736ecb78fd5a7dca987e7 SHA512 4a378e359b9727a45b8cb5c2a2ae7169848e5d89617ed5d89de62d89d847226fdaa8e00a665d624ef19608093d7a1848592b5c033cc3f67d36ba6774e2df2681
 MISC metadata.xml 1161 BLAKE2B 6274c692ae99e43490e09e0c900a95a90ac423b4cd13a5399ab629023a594ba0d4c313df31d040760e46daee4cca8df23d497dd47052dbab86071156fc183624 SHA512 fce326e7afc1989206d24a970d38ddf1860368e8a69fceab5336b87558274eaace21214885f942ca40aca7031eef0abb0f0dc3b8f1d4ebde93ebe1bd8848a766
diff --git a/media-sound/snapcast/snapcast-0.15.0-r1.ebuild b/media-sound/snapcast/snapcast-0.15.0-r1.ebuild
index a664ea01e296..ee8268aab953 100644
--- a/media-sound/snapcast/snapcast-0.15.0-r1.ebuild
+++ b/media-sound/snapcast/snapcast-0.15.0-r1.ebuild
@@ -21,15 +21,15 @@ fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+avahi +client +flac +server static-libs tremor +vorbis"
+IUSE="+client +flac +server static-libs tremor +vorbis +zeroconf"
 
 REQUIRED_USE="|| ( server client )"
 
-RDEPEND="avahi? ( net-dns/avahi[dbus] )
-	client? ( media-libs/alsa-lib )
+RDEPEND="client? ( media-libs/alsa-lib )
 	flac? ( media-libs/flac )
 	tremor? ( media-libs/tremor )
-	vorbis? ( media-libs/libvorbis )"
+	vorbis? ( media-libs/libvorbis )
+	zeroconf? ( net-dns/avahi[dbus] )"
 DEPEND="${RDEPEND}
 	>=dev-cpp/aixlog-1.2.1
 	>=dev-cpp/asio-1.12.1
@@ -50,7 +50,6 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_WITH_AVAHI=$(usex avahi)
 		-DBUILD_CLIENT=$(usex client)
 		-DBUILD_WITH_FLAC=$(usex flac)
 		-DBUILD_SERVER=$(usex server)
@@ -58,6 +57,7 @@ src_configure() {
 		-DBUILD_TESTS=no
 		-DBUILD_WITH_TREMOR=$(usex tremor)
 		-DBUILD_WITH_VORBIS=$(usex vorbis)
+		-DBUILD_WITH_AVAHI=$(usex zeroconf)
 	)
 
 	cmake-utils_src_configure
diff --git a/media-sound/snapcast/snapcast-9999.ebuild b/media-sound/snapcast/snapcast-9999.ebuild
index 6bfe033cdb5e..09e72be8ff2e 100644
--- a/media-sound/snapcast/snapcast-9999.ebuild
+++ b/media-sound/snapcast/snapcast-9999.ebuild
@@ -21,15 +21,15 @@ fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+avahi +client +flac +server static-libs tremor +vorbis"
+IUSE="+client +flac +server static-libs tremor +vorbis +zeroconf"
 
 REQUIRED_USE="|| ( server client )"
 
-RDEPEND="avahi? ( net-dns/avahi[dbus] )
-	client? ( media-libs/alsa-lib )
+RDEPEND="client? ( media-libs/alsa-lib )
 	flac? ( media-libs/flac )
 	tremor? ( media-libs/tremor )
-	vorbis? ( media-libs/libvorbis )"
+	vorbis? ( media-libs/libvorbis )
+	zeroconf? ( net-dns/avahi[dbus] )"
 DEPEND="${RDEPEND}
 	>=dev-cpp/aixlog-1.2.1
 	>=dev-cpp/asio-1.12.1
@@ -48,7 +48,6 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_WITH_AVAHI=$(usex avahi)
 		-DBUILD_CLIENT=$(usex client)
 		-DBUILD_WITH_FLAC=$(usex flac)
 		-DBUILD_SERVER=$(usex server)
@@ -56,6 +55,7 @@ src_configure() {
 		-DBUILD_TESTS=no
 		-DBUILD_WITH_TREMOR=$(usex tremor)
 		-DBUILD_WITH_VORBIS=$(usex vorbis)
+		-DBUILD_WITH_AVAHI=$(usex zeroconf)
 	)
 
 	cmake-utils_src_configure
diff --git a/media-sound/spek/Manifest b/media-sound/spek/Manifest
index 34e053b8bde2..0d118f537fb7 100644
--- a/media-sound/spek/Manifest
+++ b/media-sound/spek/Manifest
@@ -5,4 +5,4 @@ AUX spek-0.8.3-replace-gnu+11-with-c++11.patch 248 BLAKE2B 90872d7bec32e44f4a792
 AUX spek-0.8.3-stdlib.patch 472 BLAKE2B 3007ae0f366b366b67c3168e9e33cb18a72632e68886f8fcab428cde126c82fb84d7fc7d9b81fd0d8f77f81da49bcfdefd140d31afde4063a0b169d837d658e6 SHA512 d42906e7fbb0707fb8eefc3e3cc19a18c28f4af9b56995cdfa486fd3fab92c11cc313bc3b76fd115e99ada892e3191ff80f33020b0c4cc56fb26a0540b526ea4
 DIST spek-0.8.3.tar.gz 1349573 BLAKE2B ce783c319741c43f27462caf9dcd27e71f4c8fbc9d3a3d2ac0b977189cca4cf8ed14f258958bbf59532c4cae97562fa20819222ae68567e9e607f243a2777000 SHA512 a4b54746316d295574bc963e650728b23b3730ee6bcc8d78b043a5678baac70a0e859870120de2b0e6a17059e9e3757075f4691e2abde98c083afc393e93e17c
 EBUILD spek-0.8.3-r1.ebuild 1146 BLAKE2B 6b2894d1a7768c605297da03a96a9345aa1b865c57f13220f9357d7bd0c1dd36e00b8fb5e58a256286930e00fc45324a9bb522f3b70d459689329f609780fbca SHA512 82acede7bcd11c44d2c86eb9c92e6c75780f99e34db96c928e99f216c218085fd99bb03b06063b320a9cb7fc7832f5371fd9f0f8513fd696c237d26afdcf16d6
-MISC metadata.xml 369 BLAKE2B 2b328b343d6949c6c5ae31f4a894aa6b8f95aab1013a8c3eac806619c36390c5ecbaf2a241e7fed682da7fd1e3af483567a43ae8c0c1087460feb524112f580f SHA512 004106612127320eb7094fbf59b4e0dda0eba73520c37e54094439a27c1bfe2705f2f89183712ac9bbebc268c625c407ecb0ab628ab598f8f1c7b30ec1fbde14
+MISC metadata.xml 293 BLAKE2B fab72d60cfe06b97698b72a5c6949612f92696a41a1a32077e2d0e544a51c82d8429c0d823f6dc2fbb0ae17dc04a0a8471c2ffc202f1eaf5fbac18004ce1a509 SHA512 737aac30952de1d589f19e6e9643b7ccfff0773b07322efda37e6d18c5dfd4e6845bc938ab2faa605633610a62340f561eb67a5b011562caf153b8bd9f3b603f
diff --git a/media-sound/spek/metadata.xml b/media-sound/spek/metadata.xml
index b809ea2b22b0..2f596d797027 100644
--- a/media-sound/spek/metadata.xml
+++ b/media-sound/spek/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">spek</remote-id>
 		<remote-id type="github">alexkay/spek</remote-id>
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 2312eb83fa8a..415c7dfcabde 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,7 +1,5 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
-DIST spotify-client_1.0.80.480.g51b03ac3-13_amd64.deb 97542898 BLAKE2B a89f3f607c9fb03327886fc1b6eb8d433b32913aa7ff32e95f626a8ef7710c4d6102721b76e9a83f1342d1ac6f6941d85376b4cb878cf641f42f3c3756582eb9 SHA512 a46b1d28e6c40dbe9a86a38794186f2cdf31341fff953eaa5a5fdbb37c27c00ffe14a918b2552df0996d2842f009e6700bf8683e0667fc671dfd5b343251f20e
-DIST spotify-client_1.0.92.390.g2ce5ec7d-18_amd64.deb 102410368 BLAKE2B df78d6db545a86066425340f0afd77a3492a2d1debeaacc49e01a0961182be9118c210320214c92a2780f2b2f86de88f1018f293ac608bdeb94ee9717e503c0b SHA512 590cb5d599e6e8a2cfa03fa0bbc34f90c54daed33fa013eb71b6152028296d26b86a75f53f9853cc8678474cf12b7265e6b37cb28a3da8ce9cbc2432ef50794b
+DIST spotify-client_1.0.94.262.g3d5c231c-9_amd64.deb 104191924 BLAKE2B 75d5067fee6333897e33dd43f3bea11f0811df30f9d3d35a537298675516e6e9c8af609460daaf2a79be91133b45a4b76c9539abee9cdbc04362caeefbbea27a SHA512 e6aa650a207fb636cd789055d4b17bc9c0fec1f6421877e4e80d3d5239f1a1bb881c5bfa4788a6cbe7748175e6c731af66a3395d2089d2d9a94dabfe5d07b09f
 EBUILD spotify-1.0.72-r1.ebuild 3204 BLAKE2B 8844b7707b35537320da75bd7417c320559abbc668249cc652e9e2d481cfc9a00328458a8ee8c242acc46e832a81127686f0a3bb93ee6d4e4cc2e9e24f8c18d7 SHA512 8f194869be7f6aa8a9330d8597e8a4419a19203f4dbe387de1aeeda9350de13e4596a01290ed452c358d72fc8e20e249b4fcbf17a1f38a688315e0c189e0cc4c
-EBUILD spotify-1.0.80-r1.ebuild 3430 BLAKE2B dfbc156cab69baa232ad25bae50df7446988d41445652a6c011aa3a52335b521466bf441a89dad8c8ea3143323444579b5efd68d4ab297f25269304a0e1b71cc SHA512 d26ec49937e49ab355ccc968e51c46b65dcfc5ea46f8bccf0150ad1691928cc90a967eb2907f3b7939fbfe7b40af24a6215fbf05c2c5c5f8e6eb0f1d8827e14b
-EBUILD spotify-1.0.92.ebuild 3430 BLAKE2B 19acd45c4f257918b2febae756ce60b84b28b16adf031bbd421365d26f2066fa3428e284ea184875e249770b31cc1b88e2632b73cc7e133683c13a9a83ab742d SHA512 119767de73d9327144528619038eca43e95116e3e4d059c68c986044186a49cb31c9a1ca3105cffcc0c0ec80bcf0184307cc51177bcf0b75d58a011aeb03f585
+EBUILD spotify-1.0.94.ebuild 3429 BLAKE2B 13dd3c2f7bc09032bb9d42f20b502ec6448d54d4b51ca370a52beaaa66e8355d44e01850f15cddd1e237a267348edc5a91507931be3c0d92a3e6bae1fbfa67ef SHA512 38f275b7f5d77357d13cbfadda4b4e00605f1613421d5de755eee3d4fda08ac3ebad067183d07d443af25ebc5a64897374af7a764bedf051c7fb8bde664569bf
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.0.92.ebuild b/media-sound/spotify/spotify-1.0.92.ebuild
deleted file mode 100644
index ecc6f04660d3..000000000000
--- a/media-sound/spotify/spotify-1.0.92.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils pax-utils unpacker xdg-utils
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="390.g2ce5ec7d-18"
-#BUILD_ID_X86=""
-#SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
-#	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )"
-SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libnotify systray pax_kernel pulseaudio"
-RESTRICT="mirror strip"
-
-DEPEND=">=dev-util/patchelf-0.9_p20180129"
-# zenity needed for filepicker
-RDEPEND="
-	dev-libs/openssl:0
-	dev-libs/nss
-	gnome-base/gconf
-	gnome-extra/zenity
-	media-libs/alsa-lib
-	media-libs/harfbuzz
-	media-libs/fontconfig
-	media-libs/mesa
-	net-misc/curl[ssl]
-	net-print/cups[ssl]
-	x11-libs/gtk+:2
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	dev-python/pygobject:3
-	dev-python/dbus-python
-	libnotify? ( x11-libs/libnotify )
-	pulseaudio? ( media-sound/pulseaudio )
-	systray? ( gnome-extra/gnome-integration-spotify )"
-	#sys-libs/glibc
-
-S=${WORKDIR}/
-
-QA_PREBUILT="opt/spotify/spotify-client/spotify"
-
-src_prepare() {
-	# Fix desktop entry to launch spotify-dbus.py for systray integration
-	if use systray ; then
-		sed -i \
-			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-			usr/share/spotify/spotify.desktop || die "sed failed"
-	fi
-	default
-
-	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
-	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
-		|| die "failed to patch libcurl library dependency"
-}
-
-src_install() {
-	gunzip usr/share/doc/spotify-client/changelog.gz || die
-	dodoc usr/share/doc/spotify-client/changelog
-
-	SPOTIFY_PKG_HOME=usr/share/spotify
-	insinto /usr/share/pixmaps
-	doins ${SPOTIFY_PKG_HOME}/icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r ${SPOTIFY_PKG_HOME}/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify || die
-		#! /bin/sh
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 512; do
-		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/spotify/spotify-1.0.80-r1.ebuild b/media-sound/spotify/spotify-1.0.94.ebuild
index 665c6b832bf2..f202a28edd3a 100644
--- a/media-sound/spotify/spotify-1.0.80-r1.ebuild
+++ b/media-sound/spotify/spotify-1.0.94.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils pax-utils unpacker xdg-utils
 DESCRIPTION="Spotify is a social music platform"
 HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
 SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="480.g51b03ac3-13"
+BUILD_ID_AMD64="262.g3d5c231c-9"
 #BUILD_ID_X86=""
 #SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
 #	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )"
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index 0277005ee19f..beb575c28332 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -2,5 +2,5 @@ AUX supercollider-3.8.0-no-opengl.patch 2146 BLAKE2B 0697fcad3f277072459d4067550
 AUX supercollider-3.8.0-no-qtpositioning.patch 1840 BLAKE2B cf4ee13c08e81f3ae19d50b23f8416a5045bd60ab64f8b6c0903f40addf7701b30792f9d4de0c57f3b4f4b2b661eec19eb5b8faa520997b263215dfee6df5a8e SHA512 df86ee0e3c190283b9ed79a3bc4f1108ee0279c1d6f44bea6ffdeb7fc77b38163f2d9ab199b8124e2f06d436d68d217995b46c580740951e5e13cbd56618b635
 AUX supercollider-3.8.0-no-qtsensors.patch 2675 BLAKE2B 0fae3883eddbf2bc025e7dab0600915d3770e20c28fedc51522d1dff7e9b3fab2e4d920762b252d2af711ea4f2b010e8b532d90595c4594a757437cbc6a907ce SHA512 4574101c4c41522ebeb7a747f29734beec7a7d4eb0751d959718e0a040e1fb7fc76685d53e2cdf5e027ad91b7a0c7465714acc951bd4d4d8023145008f0b314c
 DIST SuperCollider-3.9.3-Source-linux.tar.bz2 11060240 BLAKE2B 5da51bece13d2a3e4ca1ff6b79637122a46c1f590aa7e4ebf52d7a663506c6f4bae4f3d618bb7f947c73828402f329be68e435a4de2ecc092c312cb2c993742c SHA512 5b0c29941907d5ca45c1676e34184664c03891051bba0ee50d9e8311400824054de7b6daba6d29fd875ff38f42ee9654504ea2f0b5bf0a36ae9605e6a79a0841
-EBUILD supercollider-3.9.3-r1.ebuild 2830 BLAKE2B 0dff8c6d9b3cb9fc53f06c1b99cea728d7eee0aa4f6e2650a6551522199e65a6f207db87ea1d31d1165af9acd915eda1b3fca37953ef6e16e8473f6994fec187 SHA512 604f01e53eeefd9b70ab4582221cb66076d1c033bf74c04a44efddb01c9d28c4a38dfab43399a96347f4cfcb2232e66f2b1498a1367bcc693b8256bd646bb2c6
+EBUILD supercollider-3.9.3-r1.ebuild 2836 BLAKE2B 164dd68cf7178fca42bb1a650ddee93dc9ff90db43f4f4c95a09530ac02305c176a450430fa956d094a6368e6e0e81ab1d379cf10ea6e801a9e762edc61fb9c8 SHA512 25ca2d3f3a14fc11db4cb6626bbdaa43ded4e1ee2bf2a616e3c83cf34e171eff22ce831ca6d4087477140fcb92a3f2283a1dff6374a5d2d4a65226e3da23060f
 MISC metadata.xml 840 BLAKE2B 261014eccb171924a9a70a4972d9ea1cb9ad36f6ac2b7ecb40ebc2eee59d535871957109e239b90500d26073769cf58cd475cf221af0d2caf42033a2e0e56911 SHA512 a8ce15c95e8b04624301b814156ebe84195071b2ec80b223444c733e8b4de8137d4d70397f3a84d2894bdc635fff5d15ba66a9409749c02b3f3acb40d9479895
diff --git a/media-sound/supercollider/supercollider-3.9.3-r1.ebuild b/media-sound/supercollider/supercollider-3.9.3-r1.ebuild
index af5984979652..637cfe5bced5 100644
--- a/media-sound/supercollider/supercollider-3.9.3-r1.ebuild
+++ b/media-sound/supercollider/supercollider-3.9.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,8 +11,8 @@ SRC_URI="https://github.com/supercollider/supercollider/releases/download/Versio
 
 LICENSE="GPL-2 gpl3? ( GPL-3 )"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="avahi cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim zeroconf"
 RESTRICT="mirror"
 
 RDEPEND="
@@ -20,7 +20,6 @@ RDEPEND="
 	sys-libs/readline:0=
 	x11-libs/libX11
 	x11-libs/libXt
-	avahi? ( net-dns/avahi )
 	fftw? ( sci-libs/fftw:3.0= )
 	jack? ( virtual/jack )
 	!jack? ( media-libs/portaudio )
@@ -35,6 +34,7 @@ RDEPEND="
 	)
 	server? ( !app-admin/supernova )
 	sndfile? ( media-libs/libsndfile )
+	zeroconf? ( net-dns/avahi )
 "
 DEPEND="${RDEPEND}
 	dev-libs/icu
@@ -63,7 +63,7 @@ src_configure() {
 		-DINSTALL_HELP=ON
 		-DSYSTEM_BOOST=OFF
 		-DSYSTEM_YAMLCPP=OFF
-		-DNO_AVAHI=$(usex !avahi)
+		-DNO_AVAHI=$(usex !zeroconf)
 		-DFFT_GREEN=$(usex !fftw)
 		-DNO_GPL3=$(usex !gpl3)
 		-DNO_LIBSNDFILE=$(usex !sndfile)
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index 5995e11aeb22..3dee88187639 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -4,7 +4,7 @@ AUX ts3db_mariadb.ini.sample 99 BLAKE2B 8b81805ac580ea892d4b05fc55787b850202545b
 AUX ts3server-bin 323 BLAKE2B ab3fb5522ffef33d4517d76f01c91091cb1322e1433ac158c2aaaf18c56f44a74875e3ae82e7c39209207291a668104bc4d08d54dbff7042e4faebc0e54104cf SHA512 578bee3c35fc6bc5a06ceebbab1aaeab6201fdb32a13e9c2473dffd78282690f57b1bc277a973006fb573cf9f1a11c0643c0479ff1a9e1318c015437086c6c42
 AUX ts3server.ini-r1 723 BLAKE2B 3c5f77686b602ec052477c32e2b38ecc6812760b487ce4e6cd7616bd8aa57ef3aa186374805a1f5a073e755429a98bdb677ba400c7db3b833edc1e2e3db3a729 SHA512 cf1eb76d4fe7a8305b758439925be56ea4f34254ee3c66e796a3ba7cec38dd40009f455672429906c31631f4877fc70d6fde16a904239da2fa62d121b43d0481
 AUX ts3server_mariadb.ini.sample-r1 764 BLAKE2B 3d8b9e88194b54cddb945860c77d497fe8e4bd537a39a101d2658a44b72568a671e301bbb1888099907cbc36c2aba42b89a2215f19ffa8e0acfd3f417a08ba8d SHA512 861f0074e4521947fa44e2decfff172bb14f9b905c37dfc37afedcd5f42d864de7712aa0a6ff7eb17b8f885098abb720b29b16c658955c3c8aab73e451def6a8
-DIST teamspeak3-server_linux_amd64-3.5.0.tar.bz2 8455959 BLAKE2B 1569716e80187a5de0316b8305d55c0a3b094553145a494ed7e1d0599fb1ebb0c3585b9e59a11340e6f1e4537a0502ca11124203e814a39e9650a6a0ae5122c6 SHA512 692b88d1a2a43232fe52927b6c2a70039d814ff02bfc2f1bf69138d256a2242100145fe6d7133d5745d7f945f79e24a1f3f40caf1da3697ae766cab493af9b8d
-DIST teamspeak3-server_linux_x86-3.5.0.tar.bz2 8326197 BLAKE2B 792e9429f1eb6ab9cb49f304fd8159927ca8b3d6a9fa4ceffc830d76712202b8a79fb8c5ded6cd4219a779bab7662c47fe43e2d589edf69334ee631c32f17213 SHA512 efae8d3315ccd7b36b7a031e65496bde37596e3bdd4f84a5836971d246996f92071b8dd48aab1053acc00f98a38a3a0a6bea399de0c4536194a6d1988b96cfd7
-EBUILD teamspeak-server-3.5.0.ebuild 3103 BLAKE2B 60ca145f36cd21e0f132e6b46dac673311c96d07d4e1ceaa653dd4df81bc167649b71a0a0f8b38c48f3086ff60d78073c6c91617fee21a82ee2fce0f0c88b899 SHA512 c6ec9da9ef15d7469ce4eab3a47e9932aebf4b6ecd9239e8de1869db3c1fc62bf0db3740eb20c90ced1862cc0e852f9adb5686cee8123ce1a318bea42ca190c3
+DIST teamspeak3-server_linux_amd64-3.5.1.tar.bz2 8455161 BLAKE2B 3a85c00982567be779279877868b814101ec543f3f58046ca49b45e2d94a9d4aaab2b2de057302e5125dd3a2f5c831715a426f9d30a26e0164845d205cb5d842 SHA512 f4091aa594636dc6556204fc3a4b86d3e7a6fa4e3f889585326e025db7fc1944fa416be5378829abd60a44a71714ead5712e002825abe352f907cefaa91cea9f
+DIST teamspeak3-server_linux_x86-3.5.1.tar.bz2 8326316 BLAKE2B 7533d44b6bdb54edf22b932797890563f50ad520a2ebcb9305c328559dcddfc5ac41bbfe892014ddd9201018f2b715ec69b8c655585761883928833b6106ea6a SHA512 03c9b3aecc962c968b954da440fea5186612c63d00ae8927af539e2e09e0b7a3b07289f3645933e69c742ad9a4ff57c5cb7617aa37d0ddfff765da4123a8c21c
+EBUILD teamspeak-server-3.5.1.ebuild 3103 BLAKE2B 60ca145f36cd21e0f132e6b46dac673311c96d07d4e1ceaa653dd4df81bc167649b71a0a0f8b38c48f3086ff60d78073c6c91617fee21a82ee2fce0f0c88b899 SHA512 c6ec9da9ef15d7469ce4eab3a47e9932aebf4b6ecd9239e8de1869db3c1fc62bf0db3740eb20c90ced1862cc0e852f9adb5686cee8123ce1a318bea42ca190c3
 MISC metadata.xml 822 BLAKE2B ac5c32d28c089f00c7ac508d60d90fff40313dcb4758145401d4ebc76dd53f449834373475e7437c37b8892be6d121be5c2ff1b20cbbdde9c110cab4e1a1f760 SHA512 7265c0f252a1b7e1e4e2901773b81fc7e96d0b6da39475f1e7c65a37c75188f86ce3da13b39a1cf8be46b9ad80945fc3a5755135d6bb2c63829d13a0d3c1dc10
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.5.0.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.5.1.ebuild
index dda16c3b435a..dda16c3b435a 100644
--- a/media-sound/teamspeak-server/teamspeak-server-3.5.0.ebuild
+++ b/media-sound/teamspeak-server/teamspeak-server-3.5.1.ebuild
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index f4accf8f1969..52ee5358935a 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -2,11 +2,13 @@ AUX xmms2-0.8-ffmpeg2.patch 455 BLAKE2B 4009dd67794554c3dd98199944410f435f978d1e
 AUX xmms2-0.8-rtvg.patch 1539 BLAKE2B b359db6f477f0ca6a8e528645f731ccb33ec13067ff4c9fa1ca2ce1f13108c8c42b242562d08bd9997c06845873bb8efaba0f04e23bb2a79cb863c76223a86af SHA512 b8c6b908f48ab239c2c734452eebd2b9a4a2f4f2b98278bb0951d9a97e0d3df03b5443bc3a6bb92ff3133894d7b6239373b3323251f34c6852eee988aae5205f
 AUX xmms2-0.8DrO_o-waflib-fix-perl.patch 1693 BLAKE2B 6057da2c8493ea7887ea03322d16d45ca0726174e7deb1a64f76b289fdeaba02c7659944803a23d7a32a0a74de7a39de1404d5566b43dd3306004a29876af038 SHA512 0f7f86cebd0ff75ed53366776f8c93abb54adf5942f53d7424183a4bd6913b73493882d4d3caadba6a959ddf22da0a22fa53d0fc18ce5b8508eb5670482e8c92
 AUX xmms2-0.8_p20161122-be-hash.patch 1075 BLAKE2B 7c9678016751b207a5ef48c0f7963bc0a2e3e99fb461e52b5745bc5e2dde6c329bb358e58802c127aef96d5912e22a7df7a64f719286e9cf7787703765c4b18f SHA512 051e22907315bb6bda201497e1c2ef84d919fc7d39aefac187b3616c5f6c41e768cdd79cfe197fbadfdda3863f9e9c96b5f72fa07d5e1655451328cde8ba5781
+AUX xmms2-0.8_p20161122-cpp-client.patch 2326 BLAKE2B a59da287dafafe8a3a177c11673eb7de5918fc6efef2e32c707832d7ea202091493e41f907f3e2dc370cd34d990571eed1d274fddf05f715dff7462973fb802f SHA512 095f2878afe9616bc7982037c0a9b0cc610164e04d116d40fe138df0280160680c19f6bf5c2f9aed6e9d31d42ee2f310570aefae28872ee15496f886d20ee2e9
 AUX xmms2-0.8_p20161122-mac-4.patch 1632 BLAKE2B 5bc5c7d499df5faee2fc6b4307af18269b784360bbbcaef33b1db4b880704f88e8dad06168e3737a43fcdb71ba722da1ffb5ba77f3f61ecf07674e1ad0988f5a SHA512 d2fe5f9a0c59205c787386e7b219c3fa9a334c30787b9a343214cc1c4dbf9f5d47f5dad9b2efd7deac1e96a227c827cc66198215a89b0e788c9d856cff51b16b
 AUX xmms2-0.8_p20161122-perl-no-local.patch 697 BLAKE2B 86ab6bb3594fd45e9a9bdbd07d85d3740ed206eea24652161c7fbbdf620c98a6b002b646aba65a3f017e263bb82d6dc7b933fb53540012c2005d65dd2e667b06 SHA512 eb5afb39409c7c199a844d9452ab829a653d2a1ce8f5d9f1361fa995e851914d5a962d25d8116947a265fabc649f8560aa1947a24cf45d954da7743954fc3cd7
 AUX xmms2-0.8_p20161122-tarball.patch 2764 BLAKE2B 1d6ea9bc40db3145460a8ef06c732114475087ea05eef65fd837d6c3bf346478579d7c6ab0bf33387d2228a319245e0e4d2562935be75a58abd04e88205d4373 SHA512 5b03d129a55ac14462a68e47ecba29c2817eb83d122a3614c624c743ecc29a7bac066644aa61d5ac74f9cb59808d1a9bac077dc360c507da722c206b948301ac
 DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb
 EBUILD xmms2-0.8_p20161122-r3.ebuild 7519 BLAKE2B ad7093c0b9af101e3f29ad81b6eda1fac3842cbeaf7dd2322704ed8ff2394038c141d72a9bcc6b4ab14ee12d36d2af3e12b8fc9851fdb2ec17bd5bdb5c107c93 SHA512 3fe26a7e0f1542ef9ec787d87d4ff7ee5c6ad19543c66d1a6c31ceae5d921ad5bd48c20b5d7a546aea69a87b1877e0144d1cdee7ac8c06eba96826185f982185
 EBUILD xmms2-0.8_p20161122-r4.ebuild 7577 BLAKE2B 449e5421e5bd4c1febb2403b1fabf53af35ed8c22a06488805fff23fef27b8691cda0cfd2d7b6fe230160929d3549c081581fb736d9fb34b6ebad4c28325959a SHA512 189a0fe53beb27adac0326c3370d147706c3072f933fb0d09d0bc3503555108b2d8acd8f2046902b59e20a3078c19262632241722bd2e9f1028b42b188941eb6
+EBUILD xmms2-0.8_p20161122-r5.ebuild 7701 BLAKE2B 825f60294354e9779581c4e74a936672ecfcd513a3b420c026dbe1dd50db87e066c6b519c8fc02fc6dfd7d92adcb3ebf4dd0da27309922d5a1687ab5a3689330 SHA512 8d24d878b985fd8a9eff773bae5fd53cb28d7a0e995089ca04ca103088e480c4ea03c5bb6e11f25923c4b2925527bed4555c0660c41e8dc4a248c78d0ecac7a1
 EBUILD xmms2-0.8_p20161122.ebuild 7389 BLAKE2B bb82ad9ed821fefab30cb8a3f9a4b77e50ec6cc219b297506e8e2fbe8aba2b347c1da0a1b675d072b8bd97263dd03c47bcb8589daddeea8e3d0e7a85020c44c2 SHA512 2c09816bf4c22b89e885b4c6c64f0bbf42729eba0f77834451d9fc943057aba9a15f0362b81458192d21c48e61918f689d7f9b0fd7dea22e416b96598caa293d
 MISC metadata.xml 2560 BLAKE2B 267abaaa9bf07aa218ef3d2613c4ff94c183f84f5caf2525a1d902dbdecebc724e94bdf84f09bd820cec2579bb293478777459b2a0d801e560f853270746d576 SHA512 f92c04cad82b65f335aa44d0890f133df1f1bbdba97592f1c69bb90e9fa2a8d8827029ff10998cb4fb8ab936dc1f2c9a7402b6259e5000e2644467e89b23b26e
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch
new file mode 100644
index 000000000000..cedc87fcc469
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch
@@ -0,0 +1,68 @@
+https://github.com/xmms2/xmms2-devel/pull/5
+
+From 82741bf3094c8e0bca8eb1b7f3bc147eeb51ea06 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Thu, 6 Dec 2018 07:19:08 +0000
+Subject: [PATCH] OTHER: fix c++ client dangling reference
+
+On #xmm2 Chewi reported c++/tut7 to be broken at start:
+
+```
+GLib-WARNING **: glib-2.56.2/glib/giounix.c:410
+Error while getting flags for FD: Bad file descriptor (9)
+```
+
+valgrind shows the problem as read of uninitialized data:
+
+```
+$ valgrind ./tut7
+
+==32268== Conditional jump or move depends on uninitialised value(s)
+==32268==    at 0x49DC36B: xmmsc_mainloop_gmain_init (xmmsclient-glib.c:80)
+==32268==    by 0x49E11BE: Xmms::GMainloop::GMainloop(xmmsc_connection_St*) (xmmsclient++-glib.cpp:11)
+==32268==    by 0x10C64D: main (in /home/slyfox/dev/git/xmms2-devel/doc/tutorial/c++/tut7)
+==32268==  Uninitialised value was created by a stack allocation
+==32268==    at 0x49E119A: Xmms::GMainloop::GMainloop(xmmsc_connection_St*) (xmmsclient++-glib.cpp:8)
+```
+
+This happens due to use of dangling C++ reference to stack variable:
+
+```
+// somewhere in src/include/xmmsclient/xmmsclient++/mainloop.h
+class MainloopInterface {
+    MainloopInterface( xmmsc_connection_t* conn ) :
+        running_( false ), conn_( conn ) { }
+  protected:
+    bool running_;
+    xmmsc_connection_t*& conn_;
+}
+```
+
+Note: `conn_` refers to dangling local variable of
+`MainloopInterface::MainloopInterface` constructor.
+
+The fix is to pass through pointer reference.
+`MainLoop::MainLoop()` already does it.
+
+Reported-by: James Le Cuirot
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ src/include/xmmsclient/xmmsclient++/mainloop.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/include/xmmsclient/xmmsclient++/mainloop.h b/src/include/xmmsclient/xmmsclient++/mainloop.h
+index de97e20d..268ca6f7 100644
+--- a/src/include/xmmsclient/xmmsclient++/mainloop.h
++++ b/src/include/xmmsclient/xmmsclient++/mainloop.h
+@@ -41,7 +41,7 @@ namespace Xmms
+ 			 *  @note The constructor should only initialize the
+ 			 *        mainloop, not start it!
+ 			 */
+-			MainloopInterface( xmmsc_connection_t* conn ) :
++			MainloopInterface( xmmsc_connection_t*& conn ) :
+ 				running_( false ), conn_( conn ) { }
+ 
+ 			/** Destructor.  Should also stop the loop.
+-- 
+2.19.2
+
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
new file mode 100644
index 000000000000..d6d2392bada7
--- /dev/null
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit eutils multiprocessing python-single-r1 ruby-single toolchain-funcs
+
+# generated as 'python2 ./utils/gen-tarball.py' from clean git tree
+MY_P="${P%_p*}DrO_o-949-gca15e830"
+
+DESCRIPTION="X(cross)platform Music Multiplexing System. Next generation of the XMMS player"
+HOMEPAGE="https://xmms2.org/wiki/Main_Page"
+#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2"
+LICENSE="GPL-2 LGPL-2.1"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+
+IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth ices
+jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss
+perl phonehome pulseaudio python ruby samba +server sid sndfile speex
+test valgrind +vorbis vocoder wavpack xml zeroconf"
+
+RDEPEND="server? (
+		>=dev-db/sqlite-3.3.4
+
+		aac? ( >=media-libs/faad2-2.0 )
+		airplay? ( dev-libs/openssl:0= )
+		alsa? ( media-libs/alsa-lib )
+		ao? ( media-libs/libao )
+		cdda? ( dev-libs/libcdio-paranoia
+			>=media-libs/libdiscid-0.1.1
+			>=media-sound/cdparanoia-3.9.8 )
+		curl? ( >=net-misc/curl-7.15.1 )
+		ffmpeg? ( virtual/ffmpeg )
+		flac? ( media-libs/flac )
+		fluidsynth? ( media-sound/fluidsynth )
+		ices? ( media-libs/libogg
+			media-libs/libshout
+			media-libs/libvorbis )
+		jack? ( virtual/jack )
+		mac? ( media-sound/mac )
+		mms? ( virtual/ffmpeg
+			>=media-libs/libmms-0.3 )
+		modplug? ( media-libs/libmodplug )
+		mad? ( media-libs/libmad )
+		mp3? ( >=media-sound/mpg123-1.5.1 )
+		musepack? ( media-sound/musepack-tools )
+		ofa? ( media-libs/libofa )
+		opus? ( media-libs/opus
+			media-libs/opusfile )
+		pulseaudio? ( media-sound/pulseaudio )
+		samba? ( >=net-fs/samba-4.2 )
+		sid? ( media-sound/sidplay
+			media-libs/resid )
+		sndfile? ( media-libs/libsndfile )
+		speex? ( media-libs/speex
+			media-libs/libogg )
+		vorbis? ( media-libs/libvorbis )
+		vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate )
+		wavpack? ( media-sound/wavpack )
+		xml? ( dev-libs/libxml2 )
+		zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	)
+
+	>=dev-libs/glib-2.12.9
+	cxx? ( >=dev-libs/boost-1.32 )
+	perl? ( >=dev-lang/perl-5.8.8 )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+"
+
+DEPEND="${RDEPEND}
+	dev-lang/python
+	virtual/pkgconfig
+	perl? ( dev-perl/Module-Build
+		virtual/perl-Module-Metadata )
+	python? ( >=dev-python/cython-0.15.1
+		dev-python/pyrex )
+	test? ( dev-util/cunit
+		valgrind? ( dev-util/valgrind ) )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# used both for building xmms2 and
+	# optionally linking client library
+	# against python
+	python-single-r1_pkg_setup
+}
+
+# use_enable() is taken as proto
+# $1 - useflag
+# $2 - xmms2 option/plugin name (equals to $1 if not set)
+
+xmms2_flag() {
+	[[ -z $1 ]] && eerror "!!! empty arg. usage: xmms2_flag <USEFLAG> [<xmms2_flagname>]."
+
+	local UWORD=${2:-$1}
+
+	case $1 in
+		ENABLED)
+			echo ",${UWORD}"
+			;;
+		DISABLED)
+			;;
+		*)
+			use $1 && echo ",${UWORD}"
+			;;
+	esac
+}
+
+src_prepare() {
+	./waf # inflate waf
+	cd .waf* || die
+	# needs port
+	#epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778
+	eapply "${FILESDIR}/${PN}"-0.8_p20161122-perl-no-local.patch
+	cd "${S}"
+
+	eapply "${FILESDIR}/${PN}"-0.8-ffmpeg2.patch #536232
+
+	eapply "${FILESDIR}/${PN}"-0.8-rtvg.patch #424377
+
+	# required to build tarball from git tree
+	eapply "${FILESDIR}/${P}"-tarball.patch
+
+	# fix hash to be the same on LE/BE platforms
+	eapply "${FILESDIR}/${P}"-be-hash.patch
+
+	# handle mac-3 -> -4 API change
+	eapply "${FILESDIR}/${P}"-mac-4.patch
+
+	# C++ client dangling reference: https://github.com/xmms2/xmms2-devel/pull/5
+	eapply "${FILESDIR}/${P}"-cpp-client.patch
+
+	eapply_user
+}
+
+src_configure() {
+	# ./configure alike options.
+	local waf_params="--prefix=/usr \
+			--libdir=/usr/$(get_libdir) \
+			--with-target-platform=${CHOST} \
+			--mandir=/usr/share/man \
+			--infodir=/usr/share/info \
+			--datadir=/usr/share \
+			--sysconfdir=/etc \
+			--localstatedir=/var/lib"
+
+	local optionals=""
+	local plugins=""
+	if ! use server ; then
+		waf_params+=" --without-xmms2d"
+	else
+		# some fun static mappings:
+		local option_map=(	# USE		# sorted xmms2 option flag (same, as USE if empty)
+					"phonehome	et"
+					"ENABLED	launcher"
+					"mlib-update	medialib-updater"
+					"ENABLED	nycli"
+					"		perl"
+					"ENABLED	pixmaps"
+					"		python"
+					"		ruby"
+					"DISABLED	tests"
+					"DISABLED	vistest"
+					"cxx		xmmsclient++"
+					"cxx		xmmsclient++-glib"
+					"DISABLED	xmmsclient-cf"
+					"DISABLED	xmmsclient-ecore" # not in tree
+
+					"test		tests"
+				)
+
+		local plugin_map=(	# USE		# sorted xmms2 plugin flag (same, as USE if empty)
+					"		alsa"
+					"		airplay"
+					"		ao"
+					"ffmpeg		apefile"
+					"ffmpeg		avcodec"
+					"		asf"
+					"ENABLED	asx"
+					"		cdda"
+					"DISABLED	coreaudio" # MacOS only?
+					"		curl"
+					"ENABLED	cue"
+					"zeroconf	daap"
+					"ENABLED	diskwrite"
+					"ENABLED	equalizer"
+					"aac		faad"
+					"ENABLED	file"
+					"		flac"
+					"		fluidsynth"
+					"ffmpeg		flv"
+					"ffmpeg		tta"
+					"DISABLED	gme" # not in tree
+					"DISABLED	gvfs" # obsolete #647604
+					"ENABLED	html"
+					"		ices"
+					"ENABLED	icymetaint"
+					"ENABLED	id3v2"
+					"		jack"
+					"ENABLED	karaoke"
+					"ENABLED	m3u"
+					"		mac"
+					"		mms"
+					"		mad"
+					"ENABLED	midsquash"
+					"		mp4" # bug #387961 (aac, mp3, ape can sit there)
+					"mp3		mpg123"
+					"		modplug"
+					"		musepack"
+					"DISABLED	nms" # not in tree
+					"ENABLED	normalize"
+					"ENABLED	null"
+					"ENABLED	nulstripper"
+					"		ofa"
+					"		opus"
+					"		oss"
+					"ENABLED	pls"
+					"pulseaudio	pulse"
+					"ENABLED	replaygain"
+					"xml		rss"
+					"		samba"
+					"DISABLED	sc68" #not in tree
+					"		sid"
+					"		sndfile"
+					"		speex"
+					"DISABLED	sun" # {Open,Net}BSD only
+					"DISABLED	tremor" # not in tree
+					"		vorbis"
+					"		vocoder"
+					"ffmpeg		tta"
+					"ENABLED	wave"
+					"DISABLED	waveout" # windows only
+					"		wavpack"
+					"xml		xspf"
+					"ENABLED	xml"
+				)
+
+		local option
+		for option in "${option_map[@]}"; do
+			optionals+=$(xmms2_flag $option)
+		done
+
+		local plugin
+		for plugin in "${plugin_map[@]}"; do
+			plugins+=$(xmms2_flag $plugin)
+		done
+	fi # ! server
+
+	# pass them explicitely even if empty as we try to avoid magic deps
+	waf_params+=" --with-optionals=${optionals:1}" # skip first ',' if yet
+	waf_params+=" --with-plugins=${plugins:1}"
+	waf_params+=" $(use_with valgrind)"
+
+	CC="$(tc-getCC)"         \
+	CPP="$(tc-getCPP)"       \
+	AR="$(tc-getAR)"         \
+	RANLIB="$(tc-getRANLIB)" \
+	CXX="$(tc-getCXX)"       \
+	    ./waf configure ${waf_params} || die "'waf configure' failed"
+}
+
+src_compile() {
+	# waf is very keen to run tests in build phase (bug #424377) but
+	# it does not bother running tests twice, so the hack below works:
+	./waf --verbose build || ./waf --verbose build || die "waf build failed"
+}
+
+src_test() {
+	# rerun tests
+	./waf --alltests || die "waf --alltests failed"
+}
+
+src_install() {
+	./waf --without-ldconfig --destdir="${D}" install || die "'waf install' failed"
+	dodoc AUTHORS TODO
+}
+
+pkg_postinst() {
+	elog "This version is built on experimental development code"
+	elog "If you encounter any errors report them at https://bugs.xmms2.org"
+	elog "and visit #xmms2 at irc://irc.freenode.net"
+	if use phonehome ; then
+		einfo ""
+		einfo "The phone-home client xmms2-et was activated"
+		einfo "This client sends anonymous usage-statistics to the xmms2"
+		einfo "developers which may help finding bugs"
+		einfo "Disable the phonehome useflag if you don't like that"
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /media-sound
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)