gentoo resync : 15.09.2018

47 files changed, 250 insertions, 701 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 3de6849dc334..78a37e69e369 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index d7d5c631f9a8..b9ccc698a9ef 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -1,9 +1,8 @@
-AUX bluealsa-conf.d 107 BLAKE2B c67419746ec00b3beb279f21bb4adc86baebe8a14b489c1e3603ac03fc55262315ceed6a4bcf60280830aae07c1e94fb0ec8bce7e12b1f500456bc235f393209 SHA512 3cac8c573ccc3dfe95e66df17e7af99601bb3672f950828eae17ab80ec00a2ead96923559a9c65ddcf666cc0afaabb12a7a9d0b07e771110d972f6676c49dd62
 AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fce5cade63163376f9b6400a1a4aaed90a09b8c87650e90f1c84f98199844e32f05b0d387ba3db4971e SHA512 6ddf5c4e82d30c1c56cdcdd0207d353dca4398d2e7e5e514b9dc1dd55bf1053876d0c12b3fd77dd7dff2c348b60bcf6f215f57f0c72aaf1b29e735e86f060406
 AUX bluealsa-init.d 368 BLAKE2B 62558866adfed1fffafa47f15d0704d228d31e38529c542093b21dc1e82d459068a545e3e033cec32ec2ac9c8185459365846ce97a4f1264535533a6e55a186f SHA512 d0ffcd77d6aa7fd97d72b3cdb4b938c98a59344c8e710e6063adcf46091a9c33077edc913caecd65443ff5e9062998b1299b20b5c3866825640f33f662d8c88d
-DIST bluez-alsa-1.2.0.tar.gz 63662 BLAKE2B 79549c9848f910e083b88058e6798e10d193a3bfcbc087b41e17aa5f43444f425b5932c6440a5c7416068bd0c562a744f3cbfb3008582f56988e756ee74395a3 SHA512 a6bf0068b3fb88acaa11990db411f1d3be7ad19219e7bdfd091fe81acc2ba5d5992dfb377e4fcc332ac330bb7e5ab5e4f4a9cee3e700e366fd983e81a272a5b4
 DIST bluez-alsa-1.3.0.tar.gz 86109 BLAKE2B 0a026c590a3e8f655db367e38891142d757eabc8ba647c655451e7b5ff9beabcc71ec33e16522ee7818be7513c9ecc4c5512ce6a2358651b4d8e77cd90f6a25f SHA512 f355873622290bc0193799a77660adf1e3622d3ad77a8e0cbf46d59b3c015009c8b3318c414b855c569d40bbe450a490f53c8d5382350beadfff6e65ab8e58bc
-EBUILD bluez-alsa-1.2.0.ebuild 1316 BLAKE2B 71457c1ab0f83f7a888344dfc59dd1963b006c3be83c50137f62541aaa2b7ae07f6ce5dc41a07742d89df276d40e090f1cab607c3ea830505e20d9d792437121 SHA512 fe23b6623c76bf44dd695ac4b4b2af7b10eb4a5f3fbfc9b8a88643e69c1cbc846948d5f26e6e2a65bae2c2c8581fd7deb6ac156f90273ebadc0b07984d1e1b6c
+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
 MISC metadata.xml 429 BLAKE2B 63f3e964e9b2aeed132b919848f9250cc5241c1a5c72b8deb6c4034313e38e92d0b54abdd08553046ef0b7b3862bb23e5eec9ce6845e991f6dd20a61e46ba74d SHA512 3d78a456405cffae4f5995197ca02dfeaf447d3ec417ddb00494cb07defc294329254c227aec5d24ed6c144a97606547b8fca184653e3882ec0c229f19621a8c
diff --git a/media-sound/bluez-alsa/bluez-alsa-1.2.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-1.3.1.ebuild
index 8b3787db68d9..6c59d2ee4e2f 100644
--- a/media-sound/bluez-alsa/bluez-alsa-1.2.0.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-1.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils multilib-minimal
+EAPI=7
+inherit autotools multilib-minimal
 
 DESCRIPTION="Bluetooth Audio ALSA Backend"
 HOMEPAGE="https://github.com/Arkq/bluez-alsa"
@@ -17,19 +17,18 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="aac debug hcitop"
+IUSE="aac debug hcitop static-libs"
 
-RDEPEND=">=dev-libs/glib-2.16[dbus,${MULTILIB_USEDEP}]
+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[${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}
-	net-libs/ortp
 	virtual/pkgconfig"
 
 src_prepare() {
@@ -38,19 +37,22 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable aac) \
-		$(use_enable debug) \
+	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
-	prune_libtool_files --modules
+	find "${ED}" -name "*.la" -delete || die
 
 	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
-	newconfd "${FILESDIR}"/bluealsa-conf.d bluealsa
+	newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
 }
 
 pkg_postinst() {
diff --git a/media-sound/bluez-alsa/files/bluealsa-conf.d b/media-sound/bluez-alsa/files/bluealsa-conf.d
deleted file mode 100644
index feb2e1e6a662..000000000000
--- a/media-sound/bluez-alsa/files/bluealsa-conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-# Config file for /etc/init.d/bluealsa
-
-# Allow additional options to be set
-BLUEALSA_CONF="--disable-hsp"
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 79423cd0e0a5..e7e1a181fa2d 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,7 +1,3 @@
 DIST fluidsynth-1.1.11.tar.gz 634566 BLAKE2B ed135533c9e3e807794e0eca8117d430aa299b8772b2b6c85f6233e7e497d69f43381d9c7cf2de5ce8638f5dc616339bd28cecc3cdc23408bf5883a0b14fee79 SHA512 ad7c634426b29e5a05d67addf32d43a9ccb11a1fe3cfc09ad617416b9df3dc99a48191377f5027232521380737dde2d9b59833516d1bffb90f410bab3bbe140c
-DIST fluidsynth-1.1.6.tar.gz 958735 BLAKE2B 9be1e72238545d78f2aded9e98336639ba83d2272b3247ac86609e84331fb8517eb29b505d269719196468bdbf645496c9f4f4426ac232b16f19b3b8b1c3450f SHA512 2dcb8a8a1634273cc93c45b6e21b87ac45a023c768cffdadda0a4e611eab8d5bbea0e1ba59e5f147488054cfa6fcaf561399ae275a665c76082b8738a80778bb
-DIST fluidsynth-1.1.9.tar.gz 630651 BLAKE2B 2e6faa1126778a98b1960146046490331f943dfe78dcbf66aeaac16deda3ea0bca2eca747e7041ba752d136360b2003ae89b0d936df78a6cd9d5024bd3cd834e SHA512 9bbe9143dc55a0e10e33efd62698e28b598a7ede95d44f193a93c5e29920c7b6d08f7f5ba96bd2c1c42a4b184134d4e811f643fdc0077be714c0cf72635de235
-EBUILD fluidsynth-1.1.11.ebuild 2198 BLAKE2B 006cf09b65a09a35dd20f04026f5e3d03c0eacaf079d326ed10295bbfd74ad6414b5685368d34418fb95c479e43a8d21bd7818a812a5f9b4ca7225f09626e320 SHA512 41e3126ebdb46a9b380581dafc15295208e2b3740343da506f1ec0983df7511f254c505d9dc6366cc2ebceccd2393f0d1dbd8397b242217392493bf9bea2fdc3
-EBUILD fluidsynth-1.1.6-r1.ebuild 2161 BLAKE2B 86ab6aac8b65c858cfb4a72ba4c153040c9303f2ed8e655983b47472f1a6d7d4b8c6a66a2c0da25006bb1a4de6199897e53266d414ae7518e1b762fb47ac366b SHA512 9949a64762e561bcb6e77e38fef18c8882898a20a0bdcfa6b95478e1a251bf22a54818ef5b63b8fea8e1a714fe435a48c7af8b701917e60dd60a9de37108c38c
-EBUILD fluidsynth-1.1.9.ebuild 2253 BLAKE2B 47c026d1d29245f63395a93e81e719da1f88b8b7fc483954702e5b2a8bcbe30fe2fa2ff5c700d37c65a7c862c53e6d529984b6224443edbc2662fb6f152cba1b SHA512 272838ed901704d279f38e12c6a5fdbdd2b46db2184dbe6d528b95f65648af2ed97caa6af565e7a370e0064bac0ba7dc4e89705d0980cf1238fcff53e1e19717
+EBUILD fluidsynth-1.1.11.ebuild 2197 BLAKE2B cde965d0f41bdbf48390819e03d8a0021465072a25f81a7942c7148d97678dbd2fc3b1accb3e52e2d19e7945d6ce0bf76a41a07fa817eb27003c006ab9fdbe23 SHA512 d825aab0d67b1e48e83ef4ec9c5c5dd075830f2cace5f5d9271c7e3412595414ae76806d68467ffd0b9699a7a7a71df797ed62ac45afb4cd1956f86c266cbf41
 MISC metadata.xml 339 BLAKE2B 4bc7678ba8ccc3e97a79dda9294b31ffc1950212619ace448def22e50852b20e3b716368d9c5b7127aff381aab85d7fa104404fcd409144452855a4b5d41b529 SHA512 abac43fa8ab39fe41adf6c34a4f0e3aa605dbe834555b2eac4abcaadb6556cc08555197aadc43e51733cf8d4e30c7f7be3efb724536d54604069055836a36980
diff --git a/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild b/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild
index 376658b069ee..54c7ef35b394 100644
--- a/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/FluidSynth/fluidsynth/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash portaudio pulseaudio readline sndfile"
 
 RDEPEND="
diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6-r1.ebuild b/media-sound/fluidsynth/fluidsynth-1.1.6-r1.ebuild
deleted file mode 100644
index 548b86383860..000000000000
--- a/media-sound/fluidsynth/fluidsynth-1.1.6-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="http://www.fluidsynth.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="alsa dbus debug examples jack ladspa lash portaudio pulseaudio readline sndfile"
-
-RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}]
-		lash? ( >=media-sound/lash-0.5.4-r2[${MULTILIB_USEDEP}] ) )
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}]
-		>=media-libs/ladspa-cmt-1.16-r3[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
-	readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
-	sndfile? ( >=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-src_configure() {
-	# autotools based build system has AC_CHECK_LIB(pthread, pthread_create) wrt
-	# bug #436762
-	append-flags -pthread
-
-	mycmakeargs=(
-		$(cmake-utils_use alsa enable-alsa)
-		$(cmake-utils_use dbus enable-dbus)
-		$(cmake-utils_use debug enable-debug)
-		$(cmake-utils_use jack enable-jack)
-		-Denable-ladcca=OFF
-		$(cmake-utils_use ladspa enable-ladspa)
-		$(cmake-utils_use sndfile enable-libsndfile)
-		$(cmake-utils_use portaudio enable-portaudio)
-		$(cmake-utils_use pulseaudio enable-pulseaudio)
-		$(cmake-utils_use readline enable-readline)
-		)
-
-	if use alsa; then
-		mycmakeargs+=( $(cmake-utils_use lash enable-lash) )
-	else
-		mycmakeargs+=( -Denable-lash=OFF )
-	fi
-
-	cmake-multilib_src_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	dodoc AUTHORS NEWS README THANKS TODO doc/*.txt
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	if use examples; then
-		docinto examples
-		dodoc doc/*.c
-	fi
-}
diff --git a/media-sound/fluidsynth/fluidsynth-1.1.9.ebuild b/media-sound/fluidsynth/fluidsynth-1.1.9.ebuild
deleted file mode 100644
index 18d329d31b20..000000000000
--- a/media-sound/fluidsynth/fluidsynth-1.1.9.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="http://www.fluidsynth.org/"
-SRC_URI="https://github.com/FluidSynth/fluidsynth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa dbus debug examples ipv6 jack ladspa lash portaudio pulseaudio readline sndfile"
-
-RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}]
-		lash? ( >=media-sound/lash-0.5.4-r2[${MULTILIB_USEDEP}] ) )
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}]
-		>=media-libs/ladspa-cmt-1.16-r3[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
-	readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
-	sndfile? ( >=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-src_configure() {
-	# autotools based build system has AC_CHECK_LIB(pthread, pthread_create) wrt
-	# bug #436762
-	append-flags -pthread
-
-	mycmakeargs=(
-		$(cmake-utils_use alsa enable-alsa)
-		$(cmake-utils_use dbus enable-dbus)
-		$(cmake-utils_use debug enable-debug)
-		$(cmake-utils_use ipv6 enable-ipv6)
-		$(cmake-utils_use jack enable-jack)
-		-Denable-ladcca=OFF
-		$(cmake-utils_use ladspa enable-ladspa)
-		$(cmake-utils_use sndfile enable-libsndfile)
-		$(cmake-utils_use portaudio enable-portaudio)
-		$(cmake-utils_use pulseaudio enable-pulseaudio)
-		$(cmake-utils_use readline enable-readline)
-		)
-
-	if use alsa; then
-		mycmakeargs+=( $(cmake-utils_use lash enable-lash) )
-	else
-		mycmakeargs+=( -Denable-lash=OFF )
-	fi
-
-	cmake-multilib_src_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	dodoc AUTHORS NEWS README.md THANKS TODO doc/*.txt
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	if use examples; then
-		docinto examples
-		dodoc doc/*.c
-	fi
-}
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index c828c40122c2..00dd7678b801 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -5,5 +5,5 @@ DIST grip-3.9.0.tar.gz 968706 BLAKE2B 9d530b1e7c93239d4298a57a784eec38d98fe57e2c
 EBUILD grip-3.4.3.ebuild 1207 BLAKE2B 014b3ae549e72ae4960820532e746337a3d821684f98e19619ab9314441c2be743df3e7049885c921bd5d09f837d275a661116a9c258cfce1008f7978a5fcb00 SHA512 e6fff5d8728217b346a200ee84bec062212be2a2b37e5e942f730d897e53983df66e032a72e7540be6aa83732cd9bd0bdf20566b66ebf6a37a21f1e909a6f44c
 EBUILD grip-3.7.1.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
 EBUILD grip-3.8.1.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
-EBUILD grip-3.9.0.ebuild 1224 BLAKE2B 3c07d1e91920ad522cd7f5bc91e10aa97fc62f74a253818118552cad76c88b004b0db2a94bc1ffa2013481142cdf0cee0a2dc12b027aaa8c340ecad0fef3dc36 SHA512 31bdd7c3a03d9b45ffbfa007affcbbb88627cb56fd975580e6afc667878aa785925affbc80dac85e3dc2213fcb14cf5d1d7215ed27bba47506648977b4daec7e
+EBUILD grip-3.9.0.ebuild 1223 BLAKE2B 07454e777fa6f14c229603090040b89349da02f0a5aeb38cb76cc2a59ccacf9467120ba4a7fbba2bad48ca6bbb44a59457e55e6f53014be961c01c9175a8855e SHA512 dfc5240ede6b26b2ef026923e7444672cdf3f1bffa98d8920e8f0d84caea2561f9deaf8ed0c5517504b15514fe4bfa7ed7ab6b8692d6eddddbf70ec97f39f230
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.9.0.ebuild b/media-sound/grip/grip-3.9.0.ebuild
index a6f2a40b36cf..8d544186c922 100644
--- a/media-sound/grip/grip-3.9.0.ebuild
+++ b/media-sound/grip/grip-3.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="vorbis"
 
 # lame and vorbis-tools are no real RDEPENDs. But without them
diff --git a/media-sound/id3v2/Manifest b/media-sound/id3v2/Manifest
index 06850a8434e9..88dbd94d7a77 100644
--- a/media-sound/id3v2/Manifest
+++ b/media-sound/id3v2/Manifest
@@ -1,4 +1,3 @@
 DIST id3v2-0.1.12.tar.gz 121476 BLAKE2B 421e95211048a6e17559736aadee2b40b4c817373f83790a23b4206aa2715ef8473bc9ae83dad480b1edac29cfe20cb8686f2d78773a2929c5f9c97bf4e718ea SHA512 f9c74ab6ffbb50ab7ae7af64dcde78a0766bcbf71308d4c9fb480543b5790e2690ae096d6a2ecaffb01b7497a18841b5235500177cf5eaa8e668cf443abc726a
-EBUILD id3v2-0.1.12-r1.ebuild 551 BLAKE2B 0d2b30d77c60491150350297e347d7c3d2a429a17e26e5ba4949aff90831669e24460cb0a01dcedced0961ae23d6107db071620f9dd242d68384eee42442adac SHA512 4ac862901daf987b711e03fcc76824125c4d61ce22630a3df8b5bfb7c015d82c8bd09a5d90ac42511648aeb5320207e8cfee608c679667073b0c6d10b70ceab6
-EBUILD id3v2-0.1.12.ebuild 574 BLAKE2B 6c95ec7c5f3e8994dd2482f6a1db98ff94eef981ec35d07954469458dfe267cd7e83a019b6742bff4ec4b8700b112cc50b169842c494515f57e8f5b375ae7a28 SHA512 9e18aaf6999451310a479e0ccfa76fbcc51fc50d8c05857c5102532b36b34c33499de51c6082118df262601978b463016cccecaad577fa5e8dd473acfc4a9ee5
+EBUILD id3v2-0.1.12-r1.ebuild 547 BLAKE2B ec9ec6f5d1458f1b397d596af1e9e985a59a985dbeb16c99f35ca045e400b73894bef5a9ec9ff8c677694049e73c95100009756f400c4714df83648ab16d853a SHA512 18a51c410c8cc9342cf1e68d14b1a2a2f21ce186a82b17ef80cb6f4a77ef0d84fa252b6ca481a8a7626c9aef8523c4db8bef380deb40b6c460c93776655accb1
 MISC metadata.xml 328 BLAKE2B 42e0653aa87bd9f00be18dcdeac17ccbb61d5a6e1399d8a246f2b2745431f84f81175a61d77780899bcd48868c9f66df8e93d7a89ae6660151cd768a45560881 SHA512 d813858c55feb67797a7c5226debd484291e153994ebfe42a3038690c6fcc18a2b70ec0324fec1fba2a8eadb49fadeee419f279c7ea105a355eedb8178e615bd
diff --git a/media-sound/id3v2/id3v2-0.1.12-r1.ebuild b/media-sound/id3v2/id3v2-0.1.12-r1.ebuild
index 425d6e7587fa..b312ca8b9708 100644
--- a/media-sound/id3v2/id3v2-0.1.12-r1.ebuild
+++ b/media-sound/id3v2/id3v2-0.1.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/id3v2/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-fbsd"
 
 DEPEND="media-libs/id3lib"
 RDEPEND="${DEPEND}"
diff --git a/media-sound/id3v2/id3v2-0.1.12.ebuild b/media-sound/id3v2/id3v2-0.1.12.ebuild
deleted file mode 100644
index 1231b1e3443a..000000000000
--- a/media-sound/id3v2/id3v2-0.1.12.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit toolchain-funcs
-
-DESCRIPTION="A command line editor for id3v2 tags"
-HOMEPAGE="http://id3v2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/id3v2/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="media-libs/id3lib"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	emake clean || die
-}
-
-src_configure() {
-	tc-export CC CXX
-}
-
-src_install() {
-	dobin id3v2 || die
-	doman id3v2.1 || die
-	dodoc README || die
-}
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 2ee3624088ae..0c886aa115e0 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,7 +1,9 @@
 AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e30e29e6c4d6330cc298a568ee7dd7014af6b9c1f1c4d98b8c11c96da7f74660eb4b3b522f449e7a6a431addc SHA512 01ab76466f782f538c894e460f7694553ae12804651f68aabb6aaa0dbdc89e2ff7e2b51529b0f112cee42c8053b75fc64241a9c8898def8cf1c76231b1ec5d59
 DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166 SHA512 c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20
 DIST mixxx-2.1.3.tar.gz 34471372 BLAKE2B 88b634003a6014ebe746cf0f5f2b3d3de6775c6b2a5298898e70c55feb1ae5a54a692f9428103419943e829438b2ac2fdbfa93c45d4624a7aede59f8ecbe98ae SHA512 3aaf207963cb7380d98c9458f9c1d85c2c72bc0bc2197758a47af50ea38a80158c1abacc70ef50398ccd89a4bd4c30d93c65d70112332e529f3a3aed31509324
+DIST mixxx-2.1.4.tar.gz 34470998 BLAKE2B d442bddbab97f45c1de4f38317f5e24c2aabd8ffd351596db52ffa1e086f363ef0cfe30e169790e7f672a81474170e650b197dbd05456a83f9d196442aa9fc51 SHA512 082062ac2dde7893ff38a8b58c5d602b563de6efe94050568602b755f1dabdc9e5b311251653a3bf7a441acc456fb40f4ba063733ee7091faa6ec080122124d8
 EBUILD mixxx-2.1.1-r1.ebuild 3004 BLAKE2B a1718363b127fe5515d616bf8daf6a354c9ee4798514327fee5b90d8f9d397a1b59ca5ec6423d1949ebc3863b24beeb6f8f154cf6610dd1ae3e7fcb527a329b1 SHA512 db6c3550d8453e36e0b469a283317235e27fae69f2ec7c40b893e4e2345a7a4c5295d6ab7fe4572c91867311067697a602cd8173e771f2b10319fcfc453d3bd9
 EBUILD mixxx-2.1.3.ebuild 3006 BLAKE2B 0c393607bc1db7e23d986a55c4b72c966ea00d317884a24cea3550414e5fb04963a0a5085a717a0f9a3e3ed7564909162e7fa699f43d38256afe6862ceb34b3a SHA512 1df37aec5a1d8c5bce3b2bb352328b9da488235baaf2121704ed17fa1cfb82b9ff5d813e5c44c94b9618438c4cdfba52f933ecbf4827d2165d27ee19358fdc36
+EBUILD mixxx-2.1.4.ebuild 3006 BLAKE2B 0c393607bc1db7e23d986a55c4b72c966ea00d317884a24cea3550414e5fb04963a0a5085a717a0f9a3e3ed7564909162e7fa699f43d38256afe6862ceb34b3a SHA512 1df37aec5a1d8c5bce3b2bb352328b9da488235baaf2121704ed17fa1cfb82b9ff5d813e5c44c94b9618438c4cdfba52f933ecbf4827d2165d27ee19358fdc36
 EBUILD mixxx-9999.ebuild 3006 BLAKE2B 0c393607bc1db7e23d986a55c4b72c966ea00d317884a24cea3550414e5fb04963a0a5085a717a0f9a3e3ed7564909162e7fa699f43d38256afe6862ceb34b3a SHA512 1df37aec5a1d8c5bce3b2bb352328b9da488235baaf2121704ed17fa1cfb82b9ff5d813e5c44c94b9618438c4cdfba52f933ecbf4827d2165d27ee19358fdc36
 MISC metadata.xml 642 BLAKE2B 125facf06db489fe7e3f4663b1664a4e0c4288cad028b9d0e73db345c8e6a8004383b4efb70e7b5315028fba769fb790cb2b39949980b5adc6f3de2178c0f7c9 SHA512 e336e472a4ee405e18a2521cbd296917a1c555c444eb3794eea602a36ec30f5eab99e9dcad36a08c9852c228253721311d957ef632ae0d14c96391a95ad4dd5e
diff --git a/media-sound/mixxx/mixxx-2.1.4.ebuild b/media-sound/mixxx/mixxx-2.1.4.ebuild
new file mode 100644
index 000000000000..465a2c26cdea
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.1.4.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic scons-utils toolchain-funcs
+
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://www.mixxx.org/"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
+else
+	#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
+	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-release-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac doc ffmpeg hid mp3 mp4 opus shout wavpack"
+
+# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
+# got fixed
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib:2
+	dev-libs/protobuf:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5[scripttools]
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint
+	media-libs/flac
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libsndfile
+	>=media-libs/libsoundtouch-1.5
+	media-libs/libvorbis
+	>=media-libs/portaudio-19_pre
+	media-libs/portmidi
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	sci-libs/fftw:3.0=
+	sys-power/upower
+	virtual/libusb:1
+	virtual/opengl
+	x11-libs/libX11
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	hid? ( dev-libs/hidapi )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2:= )
+	opus? (	media-libs/opusfile )
+	shout? ( media-libs/libshout )
+	wavpack? ( media-sound/wavpack )
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.0-docs.patch
+)
+
+src_prepare() {
+	# use multilib compatible directory for plugins
+	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
+
+	default
+}
+
+src_configure() {
+	local myoptimize=0
+
+	# Required for >=qt-5.7.0 (bug #590690)
+	append-cxxflags -std=c++11
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #591968
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		if [[ ${i} = native ]] ; then
+			myoptimize="native"
+			break
+		fi
+	done
+
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
+		faad="$(usex aac 1 0)"
+		ffmpeg="$(usex ffmpeg 1 0)"
+		hid="$(usex hid 1 0)"
+		hifieq=1
+		m4a="$(usex mp4 1 0)"
+		mad="$(usex mp3 1 0)"
+		optimize="${myoptimize}"
+		opus="$(usex opus 1 0)"
+		qt5=1
+		shoutcast="$(usex shout 1 0)"
+		vinylcontrol=1
+		wv="$(usex wavpack 1 0)"
+	)
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
+}
+
+src_install() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
+		install_root="${ED%/}"/usr install
+
+	dodoc README Mixxx-Manual.pdf
+}
diff --git a/media-sound/mpc/Manifest b/media-sound/mpc/Manifest
index 7f1fbc20b666..f58a4ac622b3 100644
--- a/media-sound/mpc/Manifest
+++ b/media-sound/mpc/Manifest
@@ -1,5 +1,5 @@
 DIST mpc-0.28.tar.xz 109172 BLAKE2B de0155bd1d723c0affc02055fe8923a174d6a393e431bd71399e0c0833dda5488569fa90bbdb0c650a367bbc0c384d91215bc0997f013a372c0eae015d7acc27 SHA512 1d0c96c3c7cee2eac2d3cf25f09d74b5807b8ea56ff7dfc033b8fa690fd4d42de726a641e4f2552550d8a1c1b2840575aec5c595166ca5ae5776fcc93c8fb7cf
 DIST mpc-0.30.tar.xz 41968 BLAKE2B e7d1156f4fe933c360196a1fdaadeb7b51f12b3c6d7bd2f98f80359485acb9d55ea7afb98c82696078b325ab3662bf33b20653d5e0edf0f52c64624c679dd0b6 SHA512 72d6f742de87ca1a9a09c73987786fa7c93b2829242135b210a9a2269e0319ba9e37367dae1043461ea870087faf5c349425025ce6c02aa9dd513ae90cbe8221
 EBUILD mpc-0.28.ebuild 777 BLAKE2B 156d8519d7412e6b6bec0fcf9210230a11e37ddb53d9a2e098ce11d1050ae01d7587503c383982210daf12737ab95cad6dca7877d83e7d869de814bb1cc07ce9 SHA512 1a4f3c5d3e9ad024c55b3009be36d4e7db8a901a01c855e8c7f3a325cebbe3a4025a9b75eb502bee21d176c1584f30104a8e9409f57ced33448f5a637da70274
-EBUILD mpc-0.30.ebuild 835 BLAKE2B b2082f4676d0724ae7e4eed0d7c67727457384ee8089d17c1ec251c82c0c6da001aaaccb024066f9b237ce928ac81c92ba46e09951f5e75a68e43ad0711c33aa SHA512 9ea96f3546a6b59a13d3995612095fba2a81b1416d30c41f57154183143136eff08654f1cf5a2a03359249cccd5acdc15ec844fc447a0177261364cf451b4f94
+EBUILD mpc-0.30.ebuild 835 BLAKE2B 3c52f9d004475e2630b8b0811a1b68b63b887fab8736839294ab1e45130844fe402cf59a80adbe33c67a6c5704b5560a3ad0dbf4e7b2bd570bc16fb2687842bb SHA512 c09b5a781fb56714a14724734e0976eaa284affa32cf9b4a457850439d1bcfe2bc31a901815f89490703321b8a4e5d28fa59c1b2f42e42b66a89f4d223439014
 MISC metadata.xml 252 BLAKE2B 1b1288d9f4dd3db772b8fb0fedeaa7eade5e741424e44bbf206e13adc7917181f47e8c0cd76a19f6e115ea34d1da1cd5c5f0eef9e19e141cc79a903fd8a4f961 SHA512 8e302ca809c5fd04740c71e5d9e53786edbe46c487fcff77625a027b7922c099a4d187e853ad76965567e1d5a201ac98c6f3cef9ffe7e285b6dfde0c6df0cbdb
diff --git a/media-sound/mpc/mpc-0.30.ebuild b/media-sound/mpc/mpc-0.30.ebuild
index ba3eaf1311a8..edabc4d0253f 100644
--- a/media-sound/mpc/mpc-0.30.ebuild
+++ b/media-sound/mpc/mpc-0.30.ebuild
@@ -24,8 +24,8 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local emesonargs=(
-		-Dtest=$(usex iconv true false)
-		-Diconv=$(usex test true false)
+		-Dtest=$(usex test true false)
+		-Diconv=$(usex iconv true false)
 	)
 	meson_src_configure
 }
diff --git a/media-sound/mpdscribble/Manifest b/media-sound/mpdscribble/Manifest
index d6bac8387f5c..21adcee837a3 100644
--- a/media-sound/mpdscribble/Manifest
+++ b/media-sound/mpdscribble/Manifest
@@ -1,5 +1,5 @@
 AUX mpdscribble.rc 475 BLAKE2B f57a87b042cd60d87119ea396bd84bdf846a04fcfadff69b6bfa6700cd177dd95cb5e7c753fc51eb4916410a64e20d42dff1a9e0b5024f2ad1d1d7e3ed3751f9 SHA512 b82d3e5678aba145a5c8d172ebf74960d164e3e934426cc755948d795743bb07158f502705d40c1730a40b6a6d73e84c5792419adaf6ab83ec7c33756f0abb43
 DIST mpdscribble-0.22.tar.bz2 116981 BLAKE2B 13b15ca9e49faa3e5d254bc2864de4a0c409d8767db586def3a7bee415c67f84ddffbd7fce6093afe4aba5d5e66db8182aed52d9a141bebf4094a400f2ababe3 SHA512 bedd93392a4d5a0609dcaf7aefeeff3851f3084da8c34a4fc1f8fde51c2ba10b8370ac52cc8d55f0c9a96fffed975827a0935087c2c51880b7bfef8d79182dc8
-EBUILD mpdscribble-0.22.ebuild 727 BLAKE2B 785104db57b846d178275dd628a794c99f3af16cc5064a53e503cd8b6f3d0382ecf9d5948dbd77a11d7ee09c5e7de96e3bccba455edf8fb41199cc61de0f9073 SHA512 651a12cfb02bc5e0747610636d046dbf471a5e38c345af9df1356f9d4270114f65759d1f7988bb8000ef82caab884e88f29b2c6ed985839c174ad200ee51997c
-EBUILD mpdscribble-9999.ebuild 759 BLAKE2B 9ec4371e52f1f1e92337e16ef24a3a09416de36e67117c8226c536f9cdf740433d1933e967bff00a2ebea7df39476e9564af9ae9e90b676ea4dc1c442cef9506 SHA512 017433dabcf0084b1f8a76c83210cea918561a5ec82c09832fe80b14bf7149b6eae00a4450365c5c4aa24d76bccb56b72fdff83e9853f9ca867247d7dc0c8ceb
+EBUILD mpdscribble-0.22.ebuild 716 BLAKE2B b658f75d4fb18afa68cb63eda76dc5f4ec9fdfdc65583719c39ba7d8db9fc27af043a58048e48bb6c079791a08169af401d537b0f0c99272b8ae747ad68b1325 SHA512 8884c7a2393f83788331e01f4bf6ed7933146872ff581c99d7219ac874a9f5866c7c5e1ab8f855e0b47d71ca7faab170ef73113aa0ed384b4189e7e02e9c2f64
+EBUILD mpdscribble-9999.ebuild 764 BLAKE2B e35259c4ac7ee6500a43f2d64139c5b36577b29703b2abd28ef52a2a1d8ce71c46b928edad256f3ab2fdebc877c136e9b41bd66b9e9d703e68704e3460e8119f SHA512 642d0f4699710df0da80f7bb65f86618e3c598002080277c829a2bfe5695bac82842b3ec0909c8c9f5ba3013fcaee40aece4e26a43d22600d63eb32cd449d1a1
 MISC metadata.xml 783 BLAKE2B 8c5f5cfa0903908465f562d6379f046287cac7d72f95c314c467c5e5bf67fdf452fe2e4d77292e4c1df9461dccddd3276818087a321afe42e43a0b89aff55149 SHA512 e6ec23af50371a4e1e1b8ef904ea89a71c5ad2fd52b96bf23a1b9c1625fcddc72cf2c398a908cb7a6f07649630b2dc5ccc8fa8aaa57fcbb6d395ef270f478a44
diff --git a/media-sound/mpdscribble/mpdscribble-0.22.ebuild b/media-sound/mpdscribble/mpdscribble-0.22.ebuild
index ac6c4ddf73ea..21a952be25b2 100644
--- a/media-sound/mpdscribble/mpdscribble-0.22.ebuild
+++ b/media-sound/mpdscribble/mpdscribble-0.22.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils
 
 DESCRIPTION="An MPD client that submits information to Audioscrobbler"
 HOMEPAGE="https://www.musicpd.org/clients/mpdscribble/"
@@ -13,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 ~hppa ~ppc x86"
 IUSE="+curl"
 
-RDEPEND="dev-libs/glib
+RDEPEND="dev-libs/glib:2
 	media-libs/libmpdclient
 	curl? ( net-misc/curl )
 	!curl? ( net-libs/libsoup:2.4 )"
@@ -28,5 +27,5 @@ src_configure() {
 src_install() {
 	default
 	newinitd "${FILESDIR}/mpdscribble.rc" mpdscribble
-	dodir /var/cache/mpdscribble
+	keepdir /var/cache/mpdscribble
 }
diff --git a/media-sound/mpdscribble/mpdscribble-9999.ebuild b/media-sound/mpdscribble/mpdscribble-9999.ebuild
index 81294c5dbbe7..639a5eb9e342 100644
--- a/media-sound/mpdscribble/mpdscribble-9999.ebuild
+++ b/media-sound/mpdscribble/mpdscribble-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit git-r3 autotools
 
 DESCRIPTION="An MPD client that submits information to Audioscrobbler"
@@ -13,7 +14,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="+curl"
 
-RDEPEND="dev-libs/glib
+RDEPEND="dev-libs/glib:2
 	media-libs/libmpdclient
 	curl? ( net-misc/curl )
 	!curl? ( net-libs/libsoup:2.4 )"
@@ -33,5 +34,5 @@ src_configure() {
 src_install() {
 	default
 	newinitd "${FILESDIR}/mpdscribble.rc" mpdscribble
-	dodir /var/cache/mpdscribble
+	keepdir /var/cache/mpdscribble
 }
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 9df53957a4e4..d016e87f4854 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,7 +1,7 @@
 DIST mpg123-1.25.10.tar.bz2 921219 BLAKE2B 04bfbe8915e3943ed42cc2d3597b0bd9c4686f77ee699f5845e7d1e905022206724cf23d6b0420a36e64b232f840dd9367f46f3c00dc2fe6256f44e8b83fa5b2 SHA512 a33666ae4aca7e7c1a93a6414d8c525ec19044c54f712d578180147d88e63033f7af2370b9ad22960cc3a0b454f15967b7a831cccc97e034c8855f70cdf1ab09
 DIST mpg123-1.25.6.tar.bz2 919169 BLAKE2B 7b330d67465f332f608fa7efbfbfe1bbe69f8912a5678f72c56080b2deb44407d66bac6af23fb8c1359373eb90966ba67901235555f1776a00dc27e66167b0a5 SHA512 0b129c38c19462f7fbe3f56ea2b856222f8a1a3ba76ef8109ca759c9a9c668432cc0ec76059f9a7a3c37228ce615e4c628c7de3b1663073302cc7c8fc93f249c
 DIST mpg123-1.25.8.tar.bz2 920677 BLAKE2B bbffa9fa36c40557abb6c70af942b63a43739462c86a22839363b36a39e1a2f16ce3f4e5462f9be9cea2addda1b46af6fdd58b24b5a0b31949efc604ef475c19 SHA512 f226317dddb07841a13753603fa13c0a867605a5a051626cb30d45cfba266d3d4296f5b8254f65b403bb5eef6addce1784ae8829b671a746854785cda1bad203
-EBUILD mpg123-1.25.10-r1.ebuild 2866 BLAKE2B 011b510ab5ae2ef22b95fa9d9ea9c24af778c5032f774fcc0c7c437fc31a5c5ae04061dc4412df339058a45a5c6577954cc3704eccd76a5735a6e7bdf9489922 SHA512 9fd464f4f0543f98922457b1574f2f5413f2293763eb23f6e7d41c75b5f2d185d32d52799d264726801263290132dcf24a16b6d8c2e562c28fa40da0e49c090d
+EBUILD mpg123-1.25.10-r1.ebuild 2865 BLAKE2B ee34d7bd0083892e6a27a65ef687abaec79c178435bc32b989e7ba3008fe3206e65fb7fc26d54f0114b59d9ccd8d25ca8f4c5a9b8d34038b0c99ccec0e5e7afd SHA512 96cd43e88c9f7d93a424e1e441dba6f38c7f5a76a941d7bdf55c0ba99f7264f816b286c0f52be24aca6ff0493f4dd50a4e452ccfba2f25dde0fc16c27db12194
 EBUILD mpg123-1.25.6.ebuild 2897 BLAKE2B 2c75049f7218b4247dafd05ead9e494d7cefe8dcabac640c0bb96c249c16be6ef0661d98409d0dd4ef1c99342247fbf146bdbeae570dcf199e6cf93c800f1ad0 SHA512 f051bc85bfa74ae50005369cea98f76cd30d92e6345d02b219da0a147c9c5e8a18f88a0b52461d5d14a2ebce5b2f84bf12cbf79fc1d27bcc92aea7a67791c5d1
 EBUILD mpg123-1.25.8.ebuild 2906 BLAKE2B 6f668c24fff43f542baec764d6dcb4f26e2d03361cfc78c91c635ee48f665fc71ad0f00413827b15334b3381f4509d0159d456e36baa5b82bc1c0a6b57f7c47b SHA512 8afd4947959627b1d97285e49753bb44177d1353ee209de8e99e2afe6ed5eba88554bb70cd129a2069e509944cce17b2da4ca8f804f04a035072f1aef3a4cddd
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.25.10-r1.ebuild b/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
index 0c248cb9fa1e..297083cc9dab 100644
--- a/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index 8350c2845afc..faa180a67201 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,10 +1,5 @@
-AUX ax_require_defined.m4 1217 BLAKE2B beacd1bb572f080ede4e4dfbaa2271307be579897c5abeb4539246969094363ac84675a325aa05b6bb86262d17e0f32114327946861c3e680ffe4641bc53b3de SHA512 40fc950b353f37580a2e8aea71b5b7a6681d753b91ef386bebcaf4541f814ec016e2cc13b187d6fbe22727c669a2965fe8ac8a80b18ba449ea99e62493a9cc4e
-AUX ncmpc-0.24-tinfo.patch 1427 BLAKE2B a9a5d6cbcbde96f62dcb125b9afc12029701336fef55b9254ff5d2505e031c16f607e60c90fed94cc3f7e1fb425e1892d00e724072fc1ddf9cb78a9455e63b75 SHA512 545da277aac7cc4b176efe3c33bf1ad777c245a56abbcf05a8a7b30a8cf10a03dfd58bef03f09aada95afe9924e6cee9588efa1da2e4013a480cd03d599acb12
-DIST ncmpc-0.24.tar.xz 298012 BLAKE2B 0f09258d3cf490ff32182f7a803ada8a79c9f0c314c668b165a611a1514e86169784f22e457a311dec4936ebfabf8b0578d75452b50a52275a0215a12bbf4921 SHA512 852bedec9d1e0f13748d00ded8a57b7824a3907fa4aef441cd016c13b3a4229e630957ee965d9f5cf7c1a0c47bfa3bb040058d32c6fcf6b4474acc57f834d929
-DIST ncmpc-0.25.tar.xz 298128 BLAKE2B 2b9eb104f8c56d4bf9faae5d27b20a725b2144ab938e91d79cfa99c982b5e1822387bf26cebe4c08a2f2be39c3f191c06cdc5e9ab16f060a946bca8bd2ec04a3 SHA512 8c871db367a70ec3b68c1337d6ec26b8ca4982cd11f674abd17bf6c5df429d366a7b531f8668d4665688b5ae9a4f5f2ba92bb1a36cf491bf8dd3f8874699b0b3
 DIST ncmpc-0.27.tar.xz 302636 BLAKE2B 95cedfdcd93d011aa21b773c3a91a20cf9c816dfa421e95802b6cc73e39d39e80bed7734764caf8e29102df6b734dcc0c64be6ef3060de8ac590dc1229b63fd4 SHA512 255b5529a5eae14d89d9419dfb06d91c50b68a9e05f2e124fc07035e2a4619c7b6801c08d52c639d934b50f939cf1dc58f3c5265805ce8eeeba211803108f663
-EBUILD ncmpc-0.24-r2.ebuild 1864 BLAKE2B 2df07bc3d9dc367b3dfe99c875b25579e7b79437718b60a4bafafccb3bb631bf6ad2ff9fbaf87d2469a01ba9f863dc8fb4dfcbfeeec7315eb83524dbfd53e658 SHA512 037dd7f277c3cc38ae1c45a1ea947756c6ab210aa3892c7a98449c48f4419fd9d2d217b5d039c57ad938e07248f4990134691c646d5f420c84d454c1e9c49004
-EBUILD ncmpc-0.24.ebuild 1580 BLAKE2B 89db7324c3117d87a963b18999bc551e41819ab094ec37478cdc6e94cc4f53a539db6a954aa855ecd0766cfa76fb33387679e23d0be534fbea8017e41c3fb123 SHA512 bbbc40e35639dce7530fbde2482174adf2179cf5bfa395d0a244f8dab5fad57221d6d5ed0ad110cc7364498d38ddf939a5a5b0d812d5039fea2d80fb95b7a81b
-EBUILD ncmpc-0.25.ebuild 1802 BLAKE2B 519dd80a50f7d8794a16f70643ac63bcc461fc6af8a5d61ea1c5a5110179a1b390983d614d52859da9026b37a4a9afad593eb193180b2bd6a2b63fa9eb707be6 SHA512 600335344c070661612fcc4850c4e1c21763398a11cb1d8110c5bc18474b770ef74dae15f989acab50d1feb9e7adeee35768075afb2a3972b5354f6734aea331
-EBUILD ncmpc-0.27.ebuild 1560 BLAKE2B 73b96a699136a54a2b33894e3472a82beb3c5ba431f126c4fa0bcdd95ada1a50a31b0e8d20582d7490440f574023bc71cc2ae6f9ccf7f8edad186704b6106090 SHA512 e5ea5beed6a3d954d3a0b5d48512dd269d1fe17e0cb406e6e6cbb935619f77063f06f51249b7d87b4178e560a96839c08d2859e71c92e15965245e885056aaa1
-MISC metadata.xml 868 BLAKE2B 4c98ffdbeb104ce22444ab038076c8d7b885797773fe6537f456b1ca00e00480297021c883ea93dd4556e517c157e72f8bf7e142598dfa5f8750ad6139cd74c6 SHA512 835dff8f4b6427a48fdd117631ca4363a28ba8601873d51382b1687e55bf7d2ce4303e40e794a3a85855d85a7b16ebb3e9d87b8b0d529d8e60439aa4daef86e1
+DIST ncmpc-0.30.tar.xz 245212 BLAKE2B 9e64188ec5d209a682f10587c033d1e958501ed84660bc8cc0a00ff3650a1509464e48431240eebe4a061dc154acbc7d6f552cb48b208107ecdc5c0e6807d9ee SHA512 bc92c51c78f7919eb6b5cebaac8bda1231701fd9011fcadd6da8bbc5cc16e5dbe30d33d6e2f7d4cc07399299bcd3de572c9516f90d0376212771fd2c3af8afc7
+EBUILD ncmpc-0.27.ebuild 1556 BLAKE2B feb8ae8cec6b8f2613453c7396b3f4986aad39aa2958365b9d87ee07aa2666704f8dc38636d370258260f4fba5a5c68145d490ba75616f81c57f3ec27672868e SHA512 eaca37338463b79c500b0d1fdeb89e10910764b457c18e1c8fc866308b0e56df81a8103a23346594c2e1a752193114ec7a48445cef86b1d2381c18cc95bb913a
+EBUILD ncmpc-0.30.ebuild 1791 BLAKE2B 0f018ecb992a4138c178f8ec1c59d2621098468e8bbe96eaea3b7760a6367e5d920ce3ef557819292f884060b4c012362645a5af0b3c3a9cf4bfab367a470e3c SHA512 95d536c33c0da807c42d5eeb488102926dc1200fd7cab6614ca3f8d71f4542a6072d6b70d102713f91d77fb6f2cc5139b6617e170be15b65d96c8b5547e8f0b2
+MISC metadata.xml 1040 BLAKE2B 465e51e6825b3d3f9c1f0538d42a98cb8f0ba90d71f2adfbfcf07474eed25514cb8e75f4b9aa3a38334fc33a8b00acfef302589b3dfcfc7d5f9828545fc0fb06 SHA512 d998c855bd6cb4b115a12bf9067836645fe60f4dab17b8612c7150f9f61958d49cfba61b7515f032b23839fda3a74d22fe21de11cc6440464b18e4aeb9ef03e7
diff --git a/media-sound/ncmpc/files/ax_require_defined.m4 b/media-sound/ncmpc/files/ax_require_defined.m4
deleted file mode 100644
index cae11112d901..000000000000
--- a/media-sound/ncmpc/files/ax_require_defined.m4
+++ /dev/null
@@ -1,37 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_require_defined.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_REQUIRE_DEFINED(MACRO)
-#
-# DESCRIPTION
-#
-#   AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
-#   been defined and thus are available for use.  This avoids random issues
-#   where a macro isn't expanded.  Instead the configure script emits a
-#   non-fatal:
-#
-#     ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
-#
-#   It's like AC_REQUIRE except it doesn't expand the required macro.
-#
-#   Here's an example:
-#
-#     AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
-#
-# LICENSE
-#
-#   Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 1
-
-AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
-  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
-])dnl AX_REQUIRE_DEFINED
diff --git a/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch b/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch
deleted file mode 100644
index 5c11e7682b59..000000000000
--- a/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 2d79f35..b82dd49 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,11 +17,8 @@ AC_CONFIG_MACRO_DIR([m4])
- dnl Check for programs
- AC_PROG_CC_C99
- AC_PROG_INSTALL
--AX_WITH_CURSES
-+PKG_PROG_PKG_CONFIG
- 
--AS_IF([ test "x$ax_cv_curses" = xno ],
--	[AC_MSG_ERROR([No curses support detected.])
--	])
- 
- dnl =======================================================
- dnl initialize variables
-@@ -83,6 +80,19 @@ mingw32* | windows*)
- esac
- AM_CONDITIONAL([HAVE_WINDOWS], [test $HAVE_WINDOWS -eq 1])
- 
-+dnl ncursesw
-+
-+PKG_CHECK_MODULES([ncursesw], [ncursesw],[
-+	LIBS="$LIBS $ncursesw_LIBS"
-+	ax_cv_curses_color=yes
-+	ax_cv_curses_mouse=yes
-+	ax_cv_curses_enhanced=yes
-+	AC_DEFINE([HAVE_NCURSES_H], [1], [Define to 1 if the Ncurses library is present])
-+	AC_SUBST([CURSES_LIB],[$ncursesw_LIBS])
-+	],
-+	[AC_MSG_ERROR([No curses support detected.])])
-+
-+
- dnl multi-byte character support
- 
- AC_ARG_ENABLE([multibyte],
-@@ -207,12 +217,6 @@ AM_CONDITIONAL(ENABLE_HELP_SCREEN, test x$enable_help_screen = xyes)
- 
- dnl Optional - curses getmouse support
- 
--dnl AC_CHECK_LIB depends on being able to prepend a '-l', remove the '-l' from CURSES_LIB first
--AC_CHECK_LIB([$(expr substr $CURSES_LIB 3 99)],
--		[getmouse],
--		[ax_cv_curses_mouse=yes],
--		[ax_cv_curses_mouse=no])
--
- AC_ARG_ENABLE([mouse], 
- 	AS_HELP_STRING([--enable-mouse],
- 		[Enable curses getmouse support @<:@default=yes@:>@]),
diff --git a/media-sound/ncmpc/metadata.xml b/media-sound/ncmpc/metadata.xml
index e4c0bc23acce..204c72476004 100644
--- a/media-sound/ncmpc/metadata.xml
+++ b/media-sound/ncmpc/metadata.xml
@@ -7,14 +7,17 @@
 	</maintainer>
 	<use>
 		<flag name="artist-screen">Enable artist screen</flag>
+		<flag name="async-connect">Enable asynchronous connect</flag>
 		<flag name="chat-screen">Enable the chat screen</flag>
 		<flag name="colors">Enable color support</flag>
 		<flag name="help-screen">Enable the help screen</flag>
 		<flag name="key-screen">Enable key editor screen</flag>
 		<flag name="lyrics-screen">Enable lyrics screen</flag>
 		<flag name="mouse">Enable curses getmouse support</flag>
+		<flag name="outputs-screen">Enable the outputs screen</flag>
 		<flag name="search-screen">Enable search screen</flag>
 		<flag name="song-screen">Enable song viewer screen</flag>
+		<flag name="tcp">Enable TCP support</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">MusicPlayerDaemon/ncmpc</remote-id>
diff --git a/media-sound/ncmpc/ncmpc-0.24-r2.ebuild b/media-sound/ncmpc/ncmpc-0.24-r2.ebuild
deleted file mode 100644
index d43221242006..000000000000
--- a/media-sound/ncmpc/ncmpc-0.24-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils multilib
-
-DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen"
-
-RDEPEND=">=dev-libs/glib-2.12:2
-	>=media-libs/libmpdclient-2.3
-	sys-libs/ncurses:*[unicode]
-	lirc? ( app-misc/lirc )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README doc/config.sample doc/keys.sample )
-
-src_prepare() {
-	# default ax_with_curses.m4 produces automagic dependency on ncursesw
-	# also, ncursesw is required for colors (bug #554245), so we force it here
-	epatch "${FILESDIR}"/${PN}-0.24-tinfo.patch
-	eapply_user
-
-	cp "${FILESDIR}"/ax_require_defined.m4 m4/ || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# upstream lirc doesn't have pkg-config file wrt #250015
-	if use lirc; then
-		export LIBLIRCCLIENT_CFLAGS="-I/usr/include/lirc"
-		export LIBLIRCCLIENT_LIBS="-llirc_client"
-	fi
-
-	# use_with lyrics-screen is for multilib
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable artist-screen) \
-		$(use_enable chat-screen) \
-		$(use_enable colors) \
-		$(use_enable debug) \
-		$(use_enable help-screen) \
-		$(use_enable key-screen) \
-		$(use_enable lirc) \
-		$(use_enable lyrics-screen) \
-		$(use_enable mouse) \
-		$(use_enable nls locale) \
-		$(use_enable nls multibyte) \
-		$(use_enable nls) \
-		$(use_enable search-screen) \
-		$(use_enable song-screen) \
-		$(use_with lyrics-screen lyrics-plugin-dir /usr/$(get_libdir)/ncmpc/lyrics)
-}
diff --git a/media-sound/ncmpc/ncmpc-0.24.ebuild b/media-sound/ncmpc/ncmpc-0.24.ebuild
deleted file mode 100644
index aba8b2f4b0b9..000000000000
--- a/media-sound/ncmpc/ncmpc-0.24.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib
-
-DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-IUSE="artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen"
-
-RDEPEND=">=dev-libs/glib-2.12:2
-	>=media-libs/libmpdclient-2.3
-	sys-libs/ncurses:*
-	lirc? ( app-misc/lirc )
-	nls? ( sys-libs/ncurses:*[unicode] )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README doc/config.sample doc/keys.sample )
-
-src_configure() {
-	# upstream lirc doesn't have pkg-config file wrt #250015
-	if use lirc; then
-		export LIBLIRCCLIENT_CFLAGS="-I/usr/include/lirc"
-		export LIBLIRCCLIENT_LIBS="-llirc_client"
-	fi
-
-	# use_with lyrics-screen is for multilib
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable artist-screen) \
-		$(use_enable chat-screen) \
-		$(use_enable colors) \
-		$(use_enable debug) \
-		$(use_enable help-screen) \
-		$(use_enable key-screen) \
-		$(use_enable lirc) \
-		$(use_enable lyrics-screen) \
-		$(use_enable mouse) \
-		$(use_enable nls locale) \
-		$(use_enable nls multibyte) \
-		$(use_enable nls) \
-		$(use_enable search-screen) \
-		$(use_enable song-screen) \
-		$(use_with lyrics-screen lyrics-plugin-dir /usr/$(get_libdir)/ncmpc/lyrics)
-}
diff --git a/media-sound/ncmpc/ncmpc-0.25.ebuild b/media-sound/ncmpc/ncmpc-0.25.ebuild
deleted file mode 100644
index 23bdfa52ca9e..000000000000
--- a/media-sound/ncmpc/ncmpc-0.25.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen"
-
-RDEPEND=">=dev-libs/glib-2.12:2
-	>=media-libs/libmpdclient-2.3
-	sys-libs/ncurses:*[unicode]
-	lirc? ( app-misc/lirc )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README doc/config.sample doc/keys.sample )
-
-src_prepare() {
-	# default ax_with_curses.m4 produces automagic dependency on ncursesw
-	# also, ncursesw is required for colors (bug #554245), so we force it here
-	local PATCHES=( "${FILESDIR}"/${PN}-0.24-tinfo.patch )
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# upstream lirc doesn't have pkg-config file wrt #250015
-	if use lirc; then
-		export LIBLIRCCLIENT_CFLAGS="-I/usr/include/lirc"
-		export LIBLIRCCLIENT_LIBS="-llirc_client"
-	fi
-
-	# use_with lyrics-screen is for multilib
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable artist-screen) \
-		$(use_enable chat-screen) \
-		$(use_enable colors) \
-		$(use_enable debug) \
-		$(use_enable help-screen) \
-		$(use_enable key-screen) \
-		$(use_enable lirc) \
-		$(use_enable lyrics-screen) \
-		$(use_enable mouse) \
-		$(use_enable nls locale) \
-		$(use_enable nls multibyte) \
-		$(use_enable nls) \
-		$(use_enable search-screen) \
-		$(use_enable song-screen) \
-		$(use_with lyrics-screen lyrics-plugin-dir /usr/$(get_libdir)/ncmpc/lyrics)
-}
diff --git a/media-sound/ncmpc/ncmpc-0.27.ebuild b/media-sound/ncmpc/ncmpc-0.27.ebuild
index e85ba9b0cb52..3f602e28d29a 100644
--- a/media-sound/ncmpc/ncmpc-0.27.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.27.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen"
 
 RDEPEND=">=dev-libs/glib-2.30:2
diff --git a/media-sound/ncmpc/ncmpc-0.30.ebuild b/media-sound/ncmpc/ncmpc-0.30.ebuild
new file mode 100644
index 000000000000..737d9ce04b02
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.30.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson
+
+DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
+HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
+SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+artist-screen async-connect chat-screen doc +help-screen key-screen lirc lyrics-screen outputs-screen search-screen +song-screen +mouse nls tcp"
+
+RDEPEND="dev-libs/glib:2
+	 media-libs/libmpdclient
+	 sys-libs/ncurses:0=[unicode]
+	 lirc? ( app-misc/lirc )"
+
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx
+	       app-doc/doxygen )
+	virtual/pkgconfig"
+
+DOCS=( doc/. AUTHORS README.rst )
+
+src_prepare() {
+	default
+	sed -i -e '/'-Wl,--gc-sections'./d' meson.build || die "sed failed"
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dcurses=ncursesw
+		-Dcolors=ncursesw
+		-Dmini=false
+		-Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
+		-Dartist_screen=$(usex artist-screen true false)
+		-Dasync_connect=$(usex async-connect true false)
+		-Dchat_screen=$(usex chat-screen true false)
+		-Ddocumentation=$(usex doc true false)
+		-Dhelp_screen=$(usex help-screen true false)
+		-Dkey_screen=$(usex key-screen true false)
+		-Dlyrics_screen=$(usex lyrics-screen true false)
+		-Doutputs_screen=$(usex outputs-screen true false)
+		-Dsearch_screen=$(usex search-screen true false)
+		-Dsong_screen=$(usex song-screen true false)
+		-Dlocale=$(usex nls true false)
+		-Dmultibyte=$(usex nls true false)
+		-Dnls=$(usex nls true false)
+		-Dlirc=$(usex lirc true false)
+		-Dmouse=$(usex mouse true false)
+		-Dtcp=$(usex tcp true false)
+		)
+	meson_src_configure
+}
diff --git a/media-sound/pnmixer/Manifest b/media-sound/pnmixer/Manifest
index 363dc8c1307c..7b9e41b14599 100644
--- a/media-sound/pnmixer/Manifest
+++ b/media-sound/pnmixer/Manifest
@@ -1,10 +1,6 @@
 AUX pnmixer-0.6_pre20111213-build.patch 1571 BLAKE2B a1133b3c0d916397c2d29eb9676189719bf837094b288785ee73596bdded44eb54fae399e65430ef2002057debe5737c97961c14f84c11b140162f87dbbdcd02 SHA512 c0ad5ab5e9e5b89d6f4b1af736381f4acfcaf259ed4b3291c8eeab8519825896233d074af1abda73e5bb6ecfa878bd5d36b115dd6bf3a77684ccc354d75a87ad
 AUX pnmixer-0.6_pre20111213-desktopfile.patch 328 BLAKE2B 283d3e2e791b0ef3de7a2ad4f0980c923dc48adda1839bed00ad1606dfed2adfbaa338636f4e76669761a51ad6f5418e25010eeeb94b27a2dca01aaaee2c49ff SHA512 ee9eee6503291e9bfeddbb5e5758aea496785e50722246fc9119bc69fd285e9145d63d9e61c4f01a52769f3142a12211d01c32a7c6a9edd31bc3a7e1fa044657
-DIST pnmixer-0.6_pre20111213.tar.xz 131328 BLAKE2B dabfa6e8270116eb325dc6dfd59c6f650975f1efce27603b0495f11efebd743aaba17ad19efba82d4c1d75753418a89295277853c9095d6a4fffdf6b17c5b9fe SHA512 967a685593256f9f2e8ab2ef955a91a03c3710d96956087ac55301d5232e6f01897efbb064bd6dc1804836af1b66c038cb3d04203043462de5246e4f14dd37c4
-DIST pnmixer-0.7.1.tar.gz 237949 BLAKE2B 87b309f3dd844009abe5f5bb2c5ca16ba80069932c2833a9d472130a6f0d7c36a050dc393bca097372c44fca5f90742cfad07c40a6f51ff877080f5eee25b2d2 SHA512 08d83424d921ef6112700fe8c3b55e147ace7767698a9d3ee4bb79ed0e727be7bcc82d55d3debc4b805e75f07c5702443be157e1bccce44d76072c36f8825816
 DIST pnmixer-v0.7.2.tar.gz 237972 BLAKE2B 368d149d9e803b52c7b0edac9ba8996312da7122f10f536095cffcdf31d319159494fa3aab0005e6dedb4e7e0b46d58bc73dd89285c7bddca4750d29539fa489 SHA512 9f43a56d17f4c16465113d4355a546ba71ca4d208e384812cf84625a51bd9bb6fa0e93f3e40fd0a2d157c4ee2b27f64082a47bbd4135c168a95b3fcbeebf6186
-EBUILD pnmixer-0.6_pre20111213.ebuild 955 BLAKE2B 37cf36212e41748bddc0a8231c1d791616f558391f2360b632f0368108e49071b27cf23c4a2d57141fd20ad379458b022f6c5118deccfe29778fc9c62ef7bb86 SHA512 d8a62a6cee60a1095167a60c78ee11b509f68a7f3f925083bd0c079ac8129bbc867af63fe0132133fb49589ecf04202e59a0e0ee6b39f1b3e48d87aebb1234f5
-EBUILD pnmixer-0.7.1.ebuild 822 BLAKE2B c850a1505199c93ec357e4b48d614e4fe7adc38770e0d904b3380c3676fb0bac5e77d16a3f9c3b038dc09cebf0b6c71c92f8843ad17cae86a0681a9fc4f46754 SHA512 b7e0aeb58745a2f90c01b5c0e83bda74c78ae1a06df62bb3eb7ac39f8cf02a288717e6e6e893a8703530faeb073350483ef4df5032f2e5dd3e34f51a00e38608
-EBUILD pnmixer-0.7.2.ebuild 1011 BLAKE2B 1c5377add2b165f28b9b6ecce20708ea7a7a5d8077f2c62fba07d6386c83b7edcb4d77b3512faec4abc9ccb08c9f986e4f008de3d6df7ded44914872568ef930 SHA512 d7046ec707e330ce05d41ed8c53db1cc4ac2a0cd5573066c42adcdaf6d99b3aaba0eceeb37887f614585e9f4c4681af8abe0406473f071901a6560e6fffff9da
+EBUILD pnmixer-0.7.2.ebuild 1010 BLAKE2B 38e73b4665b30b1401f44b5f8257b2b37dc6ba39c401e45f26558f5943718574efb90f470c26a3fdd550b3d5246bf1cc986829e0c94c4360b9c5ca33ce3259a8 SHA512 762319ccacd5e8e08921603bfa85cd147c2455cd53c8739be709bbad966f580d41ae307f353b04ac8d8b37b9f7c5ddb0bc9b4d69c976331afb539c157cc7e34d
 EBUILD pnmixer-9999.ebuild 819 BLAKE2B f11e945d77d82fd0d22b3c8f62f67bc563f7d5672528c71c1ad04d778d35cef8516a372e5586387afa1b5caca2ffe0c70a97af176b058d87a871df4da80c86c6 SHA512 126ae9a4c6e539fc34dec05d9210ceffe01fd1279958e4e89df7295c8cc4e6dcb95c81cef9f8c0839190ed826b0b143f38538310190d0e8fa16372d0c7094189
 MISC metadata.xml 2311 BLAKE2B 15ea04569ba81121b6f5965c2214a3b165f0f82ad9410b91fdcdafa03477fb5429abe4dd8e2f93dd78acb0f4d725d62c7927b74b1112bcda5a7e1699675ee68f SHA512 e2b368365561ca414b44a7228dcdab0bb4cd31d26aaa9ea24ec87bce012edabe701c77e6930b7ffc11710e5372e817fb0f5a46accc2318218e10677f9a710a5e
diff --git a/media-sound/pnmixer/pnmixer-0.6_pre20111213.ebuild b/media-sound/pnmixer/pnmixer-0.6_pre20111213.ebuild
deleted file mode 100644
index 090b3915ff7e..000000000000
--- a/media-sound/pnmixer/pnmixer-0.6_pre20111213.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="Alsa volume mixer for the system tray"
-HOMEPAGE="https://github.com/nicklan/pnmixer"
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug libnotify"
-
-RDEPEND="media-libs/alsa-lib
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	libnotify? ( x11-libs/libnotify )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-{build,desktopfile}.patch
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_with libnotify)
-}
-
-src_install() {
-	default
-	newicon -s 128 pixmaps/${PN}-about.png ${PN}.png
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/pnmixer/pnmixer-0.7.1.ebuild b/media-sound/pnmixer/pnmixer-0.7.1.ebuild
deleted file mode 100644
index a2496770d3d6..000000000000
--- a/media-sound/pnmixer/pnmixer-0.7.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Volume mixer for the system tray"
-HOMEPAGE="https://github.com/nicklan/pnmixer"
-SRC_URI="https://github.com/nicklan/pnmixer/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="libnotify"
-
-RDEPEND="dev-libs/glib:2
-	media-libs/alsa-lib
-	>=x11-libs/gtk+-3.12:3
-	x11-libs/libX11
-	libnotify? ( x11-libs/libnotify )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${PV/_rc/-rc}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_LIBNOTIFY="$(usex libnotify)"
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/pnmixer/pnmixer-0.7.2.ebuild b/media-sound/pnmixer/pnmixer-0.7.2.ebuild
index 1b1841456cfb..ed3446af74c8 100644
--- a/media-sound/pnmixer/pnmixer-0.7.2.ebuild
+++ b/media-sound/pnmixer/pnmixer-0.7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/nicklan/${PN}/releases/download/${MY_PV}/${MY_P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc libnotify nls"
 
 RDEPEND="dev-libs/glib:2
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 055496241a8b..bc031611289c 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,6 +1,4 @@
 AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
-DIST qsynth-0.4.4.tar.gz 260482 BLAKE2B c36e80bbe71960e83ef2bb7a9f0383625b12bb1f3755319218d8144d3a6749a807634b6babd40891f2ad0fca045b2be55dcbe0c60bdcbd150d32177c38046bdd SHA512 8995881ab992b8d02f83797093d406391327a362d0c331d0c8e023e1695baff5acb589be08427a25563f159067a8965c89be114ce74583db98e5a816f73aa9f0
 DIST qsynth-0.5.0.tar.gz 260537 BLAKE2B def589a1cfb76517fa34811fe75a8379043d7e0f9fc661dd456b49414042662c3a3b8f57e2d0de5fae99cbdb60062b12d9b73b93032115648b9a21921766fbeb SHA512 3c7026edfef3115fae8e2167bb961f5e32d886c8d75b3534a3f110d921264cd270953145a4737f9d6660c55fccce81d7306ec0ce4064df6e7226598b52399298
-EBUILD qsynth-0.4.4.ebuild 1271 BLAKE2B e134f5acd249f36e9a216c11dd5ff015c148b7721d942723a2414e68af08a8d46e046ef630e0dac07c906eaf4fdeeefdfce09141e319a7daa4322f2a93be81ab SHA512 3c2d79cefc61fc432cc1b515004dcf05964d3adc39b0a4892920a8f0a37675594e1dd558c912946813637427764a9fc0a1ef5156f7a9b72f95bde779e2523478
-EBUILD qsynth-0.5.0.ebuild 1273 BLAKE2B b18f4d30b82f444f8a1a17e43eb91a88cb01a2d7ef799a665ecd4229b109c2f11ddd00ae4aa8c745abf3bf636597dc292f56becb8b6e2f075cc4a2fdfd955878 SHA512 3bda963746bf43ed2e4844355b99f356e5beae590c026bc1bc021b8d0eecc12fa716b143a9c7e2ad02afa9a388eda504e00111fe7ae2d986a7eeb805778b3044
+EBUILD qsynth-0.5.0.ebuild 1271 BLAKE2B b8bbfd868583056ced958ac07010ac886d17e2a502230fa56a8eb832e5b355e80a59745cacbead86144b5607046e1154cf7e03e494038528dd074bcaa7b5b3dd SHA512 6d3c40d98862d8031fd97953e5fcf84dcedebb8f3dae93f344939c7028bc39448270ec3ab5f54cdfc5176de74ec855897b3a4e31e5dc931734c2e05b1b205382
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.4.4.ebuild b/media-sound/qsynth/qsynth-0.4.4.ebuild
deleted file mode 100644
index a2a3d524b3d7..000000000000
--- a/media-sound/qsynth/qsynth-0.4.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic qmake-utils
-
-DESCRIPTION="A Qt application to control FluidSynth"
-HOMEPAGE="http://qsynth.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug jack alsa pulseaudio"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-sound/fluidsynth[jack?,alsa?,pulseaudio?]
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		$(use_enable debug) \
-		--with-qt5=$(qt5_get_bindir)/..
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_install () {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${ED}usr/share/applications/qsynth.desktop" || die
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
diff --git a/media-sound/qsynth/qsynth-0.5.0.ebuild b/media-sound/qsynth/qsynth-0.5.0.ebuild
index a702cf026ffe..cea03459dc6d 100644
--- a/media-sound/qsynth/qsynth-0.5.0.ebuild
+++ b/media-sound/qsynth/qsynth-0.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug jack alsa pulseaudio"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	dev-qt/qtcore:5
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 61959b9e0ceb..76f9a9b7c255 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,4 +1,3 @@
-AUX qtractor-0.9.1-qt-5.11.patch 961 BLAKE2B 392220acdf078d0011a91c77a3e2f15ea395f41d8f206a28cd8d4632752943ad1d7b6ae6f14f2c8457e4548045ba3de5ecb3706ab7fdd0534ecec19e2113e0ed SHA512 b7dd5a429693d5a4944a9b4a7ba252e7bcb5879e95ffab3caa828d3934cb3ecac30f29fb627241073fe2b40f2de523de638c2d9aa7c686dd30b53ef870c6af07
-DIST qtractor-0.9.1.tar.gz 1763699 BLAKE2B a1d03361266a91abc6c0425d71ee2fa53fd5ec6299a23f15ba1599e480d43c30180334defaa50fcc73a02b7ddafd694bfaf6a00fa14fbdd767276c05b7ec56b8 SHA512 c40a7535740bc8315ffc640f791b640a12a4ba135070502682681c3022923f1edb62738127cae0c523a6410cb163b4cac2828544ae629b42fc93946f3d4d8a59
-EBUILD qtractor-0.9.1.ebuild 1504 BLAKE2B 2f6c75da0d150666fe377dd46244df3bf98a6d40caeb61868e5ae20fa8e2503fd4b4d729186e8d211c070a16ed15c73ac5464734b49375acce2f587156703404 SHA512 cad2ef21a1577b9df0ba76d93a0f3d60a3da16702ce8919eea29c25f6204eecd8b3dd5149914dfc21cd81a9ab07166afcd6f39d4c5da1b662143446dbc899f02
+DIST qtractor-0.9.2.tar.gz 1789514 BLAKE2B 0e314fd04c908d0916d9979de6df940225a5a9f522289e80c1956902c05478c7655a8bc2ef1827bc36472d2b4dd3885de67cda801596057dec58a10ac3235ac2 SHA512 7dbc23afb05465251daea3e56a72ed6e7814a74e6a0a844b251d8bb4f864f606bfcae5aeb3847e5227589b313777268034590a566dd74eff5cc221f081653c33
+EBUILD qtractor-0.9.2.ebuild 1458 BLAKE2B 758f3136c14495070fe2280496ff059c300592ca3ea70a5d4c1a221a0af15c9c702b6d1ff6231fa45fdd7a4d609f75550a05971a678af49dd4e25a6cad289f54 SHA512 44da8f2563db8d62c40db833ecbf41f79d581dcbf5593bb2b67277b8d166dfc5d3fdb1502e0406daa2d5aae393e80a55fe3387c4e749cccdf071bf417930920a
 MISC metadata.xml 542 BLAKE2B bc7330f8b5f775ebbab52dcf034130ee6016eada843baca1529e58d3c72ac19ce7fcd13b3483e4bf15b3620e8ee4c379520730146a39ec72d6ea1aaba094d93b SHA512 002d353914af0071fae342598619aef3b0dfe099d500da0bc98f40c209689f123dbbd93ca80a89a53c6257a54ee808798a858987d80a0443e2cc723dbfdedb7b
diff --git a/media-sound/qtractor/files/qtractor-0.9.1-qt-5.11.patch b/media-sound/qtractor/files/qtractor-0.9.1-qt-5.11.patch
deleted file mode 100644
index c30166ea368f..000000000000
--- a/media-sound/qtractor/files/qtractor-0.9.1-qt-5.11.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b49da1c4c44e668f3ae9ceba3002d77d10694c85 Mon Sep 17 00:00:00 2001
-From: daviddavid <geiger.david68210@gmail.com>
-Date: Wed, 30 May 2018 06:49:13 +0200
-Subject: [PATCH] Fix build with Qt5 >= 5.11.0
-
----
- src/qtractorMeter.cpp       | 1 +
- src/qtractorTrackButton.cpp | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/src/qtractorMeter.cpp b/src/qtractorMeter.cpp
-index d1b826c5..14c38366 100644
---- a/src/qtractorMeter.cpp
-+++ b/src/qtractorMeter.cpp
-@@ -29,6 +29,7 @@
- 
- #include "qtractorObserverWidget.h"
- 
-+#include <QAction>
- #include <QHBoxLayout>
- #include <QVBoxLayout>
- #include <QPainter>
-diff --git a/src/qtractorTrackButton.cpp b/src/qtractorTrackButton.cpp
-index 488eb831..5a314dd8 100644
---- a/src/qtractorTrackButton.cpp
-+++ b/src/qtractorTrackButton.cpp
-@@ -26,6 +26,8 @@
- 
- #include "qtractorMidiControlObserver.h"
- 
-+#include <QAction>
-+
- 
- 
- //----------------------------------------------------------------------------
--- 
-2.18.0
-
diff --git a/media-sound/qtractor/qtractor-0.9.1.ebuild b/media-sound/qtractor/qtractor-0.9.2.ebuild
index 1595ca670dfa..4b56566c5bd6 100644
--- a/media-sound/qtractor/qtractor-0.9.1.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.2.ebuild
@@ -41,8 +41,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
 src_configure() {
 	append-cxxflags -std=c++11
 	econf \
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index a762d2b9bda7..670b13d89687 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,7 +1,7 @@
 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.88.353.g15c26ea1-14_amd64.deb 103367590 BLAKE2B 90de37c58643cd864b35e26f2d97507872adfa3a6d9b7832d46d0caf9d3383673c67b2e4d7d7015075912cc2ae3754f575f968bd6b743760d7a910d90581d25c SHA512 30592c34a2b1b9d546c753d03a8ead7459d83bd5f420e1dab92a1f2ff40ac2daa0f4f447b95cd499a30328aea1afe8949e05fdd0668b9caf637abdecf5e45742
+DIST spotify-client_1.0.89.313.g34a58dea-5_amd64.deb 103077554 BLAKE2B 21377d7836cc25bdba325ded3bbaefcd1cf5fb3525c541bbd846dc4cf021f680a50789a8c88b5ad8cfa7ea90a1bbccfa0c6fada5709eb7d4ea4dd5bc04df3c8d SHA512 ff7e8b5bc9889fe8b1a81eba789a84edb75cbfec9cd09eb1a55a56e16e9bd762342ecdf2960667521b12deab2b971e700fa971c89ff8aaae40657aeda01a43a8
 EBUILD spotify-1.0.72.ebuild 3153 BLAKE2B 9b6a5885f84ad3380abbdceff28cdc0c124fb8b5e49b98ad07afcb0155b07ffcc22b5b8600408bd3a80a94122830cc084b8f976aeda933ee9958635e21885105 SHA512 be69b2a2ac5258244123132a10035acaeab07ade9ff36a9dcea282a1ec08ed262866238333142ebf2b43dee1c4c5b7febccc7f7a4c7db1a1e9d2b7b9e718082e
 EBUILD spotify-1.0.80.ebuild 3379 BLAKE2B da3e12406fd9d04ca447a8a8f690262c05c76b7397be06e40169c435d1883330d4c2800797e3d58976513c8fedadaa20f49e3b114f72a77a325f400f5cba0782 SHA512 cea23c3af5d75616742273f55468b45c72a38c359b3f0758ae6b5d54545ee868ef68f8f1ab7d5443dee2b1f707b38f6d62aea91744c4ec3ad6d80732fc545d5e
-EBUILD spotify-1.0.88-r1.ebuild 3379 BLAKE2B 9c4f894b4900725fd22fd17d193d050f8184e7ecd614aef00a3855fa26d002fbd62bd5d573f4e8ec1d69a7a98a9cc2d9b4a57ff2ed48bdf9741f22876c2dfa1e SHA512 7343ae6120d9cbee976619497ad0a143cc7eebd6c766777139dd8b3fc73876117f11f647a10b58ff681072e9efe04d79377c49ca673765352cc8313187cd19f4
+EBUILD spotify-1.0.89.ebuild 3378 BLAKE2B 004b343716ef0a6851b95674e788e12417f04682e63f60aef941a4013cc03c7be9b8ed90cca6a04602130fec637f3d22d4136b437bd755303fd7783a7894a6a0 SHA512 932c89d6f6c18869e2fea6a11386889020c95f07927f31b9929d987e329ccf23566378ad35dd6b49aa19e0e2f5dfca9320e91bf5bc10d6af852ad67e2c6d603a
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.0.88-r1.ebuild b/media-sound/spotify/spotify-1.0.89.ebuild
index 8bff5d699d5b..412043be197f 100644
--- a/media-sound/spotify/spotify-1.0.88-r1.ebuild
+++ b/media-sound/spotify/spotify-1.0.89.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="353.g15c26ea1-14"
+BUILD_ID_AMD64="313.g34a58dea-5"
 #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/wavpack/Manifest b/media-sound/wavpack/Manifest
index c99cc7c78c96..f62ac9ab9f70 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -6,6 +6,6 @@ AUX wavpack-5.1.0-CVE-2018-7254.patch 3004 BLAKE2B 2c744a5675a8b8c3f6b8e956ff3b6
 AUX wavpack-5.1.0-armv7.patch 805 BLAKE2B dc69a643e3dde75cce1d5a23176cb09fecc513a98835242437659b0724de8ba2cb97a59fb1cb3dc050454ff95bc2669e6b19f10fd03fadaf06e4c859c063277c SHA512 b152f8081b712c24ae8db641f4755798ab4c7412a298054449883255fa76571ffbd0c580848a274ce1c44401f69102a0b2c66137ae36d9323e9e5330ee20856e
 AUX wavpack-5.1.0-memleaks.patch 800 BLAKE2B 601e81daad4208d109bd980cbe63ce0c638577d53fe01fa133469090faed7f641d00efd44f906732905599615513b0dddf918dc9ce13f927b3e889a1dbd0d13d SHA512 ac5f8473314939c1b07019617f8881e4675bab2d4a0f61dd95c5389ec9915a8573f3291a5c29547e8e5a300483600d36f3c53f9ee7380c5f0691860cef6a3594
 DIST wavpack-5.1.0.tar.bz2 824331 BLAKE2B 736dcb3cc0bee4ebcf76b8a7df178aa1b797ec6858358bf289a3e151f62d2ce8f430d163d46a84c0b5a7501c732ac639955c867e53fd9217ca7f213b601a8697 SHA512 4c31616ae63c3a875afa20f26ce935f7a8f9921e2892b4b8388eca3ccd83b2d686f43eed8b9ec1dead934a1148401b9dced3b05f509b7942c48d7af31cf80a54
-EBUILD wavpack-5.1.0-r1.ebuild 994 BLAKE2B f47a7af550f64a0fe89db81e1265ef704834a58aec2dff772ed7b043dc09134cc8024e508e98f8a83042238d7ae10712fd160bfcd3436463b8fb2b33361f6713 SHA512 559edac7d7a26ef740c981c53f50fa180299f83b2ee9fe8bf6cd4332950efcd23cf2763477c75cb3b04affbc21e299f2bb415ab19468787c3c8b48b0e7f5bbc5
+EBUILD wavpack-5.1.0-r1.ebuild 993 BLAKE2B 19b75f5335d4569338c0ebee2538f9114d79e7765edc47e27de205625a37f8e994646247586726c29bda5a75ee306a9bfcd26092b1cda2dc7c67d9f22e30e892 SHA512 0c2f6a66213b9e28a0525e64e52db348dede2c26a4a6a1d43c782ccec7ad4d734397971faa6ebbcadd440a9b62311acde6b7f433f07734896b40891206a2e13a
 EBUILD wavpack-5.1.0.ebuild 752 BLAKE2B a519797a235fbc6d8d0f99accc418475058fb08491cac1018efc50acf347d707bf270c7cbc11c34ebdf4ae19e7d2584bf08c857152c5b47d6600e170c2d16b9c SHA512 033c8ab3e49644faf65709af4048a5d673c33c00f5df6c1128a08358d93808fa0ad1e88ae73ea0262f838e56223b8232e3bee41759ba1837fbc0ad376da79a32
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/wavpack/wavpack-5.1.0-r1.ebuild b/media-sound/wavpack/wavpack-5.1.0-r1.ebuild
index 1c6e4a0825d0..6450108f7794 100644
--- a/media-sound/wavpack/wavpack-5.1.0-r1.ebuild
+++ b/media-sound/wavpack/wavpack-5.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=virtual/libiconv-0-r1"
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 456d2238db4b..dc7356170b3b 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -7,6 +7,6 @@ AUX xmms2-0.8_p20161122-perl-no-local.patch 697 BLAKE2B 86ab6bb3594fd45e9a9bdbd0
 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 7578 BLAKE2B f6e14dbadb3292107c596d206c4149582fa39e29ef6883e03ec47387f91c56915e2ca9f294641debf31c0578968f2515b3295c62cea7c6ec838b32b6d95ab219 SHA512 b7bd69e5c75a83f8ca8fcb45a715b019fb66b42ebc39d5ee5a8fdfba7ab491f8427945539223420b705fb5be536005ea0c1b6625eeb514d24a9e3f6cfec9c9ae
+EBUILD xmms2-0.8_p20161122-r4.ebuild 7577 BLAKE2B 449e5421e5bd4c1febb2403b1fabf53af35ed8c22a06488805fff23fef27b8691cda0cfd2d7b6fe230160929d3549c081581fb736d9fb34b6ebad4c28325959a SHA512 189a0fe53beb27adac0326c3370d147706c3072f933fb0d09d0bc3503555108b2d8acd8f2046902b59e20a3078c19262632241722bd2e9f1028b42b188941eb6
 EBUILD xmms2-0.8_p20161122.ebuild 7389 BLAKE2B bb82ad9ed821fefab30cb8a3f9a4b77e50ec6cc219b297506e8e2fbe8aba2b347c1da0a1b675d072b8bd97263dd03c47bcb8589daddeea8e3d0e7a85020c44c2 SHA512 2c09816bf4c22b89e885b4c6c64f0bbf42729eba0f77834451d9fc943057aba9a15f0362b81458192d21c48e61918f689d7f9b0fd7dea22e416b96598caa293d
 MISC metadata.xml 2619 BLAKE2B db882bae1912243670ae3f8a075704ac0398f50a66f0ce990b4283b26b0c99846ea4d491375d9d920b320bb49da9ced1209bcfc86dd341f1e4cbc0a3649bd38d SHA512 f4477bdfc7575b104a7852dfcc789178631c0f0b470a968af7b763c8b7d70ab6cea8a4ff739b3b9adea280838cc5d8cb773337d899b20ecc0797a9d16ef38e97
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
index b59e71f168cb..89d7d42efb0c 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
@@ -18,7 +18,7 @@ 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"
+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