gentoo resync 08.09.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-09-08 10:50:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-09-08 10:50:14 +0100
commit: 3f71901f8c228f4de570abed1831ce3ee425343e (patch)
tree: a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /media-sound
parent: 12bb627384ddfd47382b9f1b6464481a58d01ebb (diff)
76 files changed, 536 insertions, 2418 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 85daecc527fd..3de6849dc334 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index a46b82b00a82..8fce5d6ad15f 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,3 +1,3 @@
-DIST beets-1.4.3.tar.gz 1428494 BLAKE2B 29adc617c4efbb304b05c6bc027a09fd34c11af70b22a86a329fe9048de31828f729114db929e97b103a6f6d8210c0b74716f327f8b4f853f745433fea5f1e14 SHA512 b95a9056abae5da3db7786342e8969b4f9c86c2c4589dd48bad244d28ef3d3da4900d3d3eaee1e45964960c62ecaa8d754a33829e0d7f497f01ecc763c0f492d
-EBUILD beets-1.4.3-r1.ebuild 3039 BLAKE2B 8bb9b66ba6d8f888fce8c2cf12be4f3f2058b34f5a224b98875b43062f1a472dd3dc3c300d1710bd500e4ff1a830d5517fb7fa66640aa518a444bd79a12c0adb SHA512 57d2023f68f873622b74526840de782953fd2230a0afe2bb874c0a010d137322129af288d42489904b10b277497349fc910a7e4d9994c3f0bfbf2491da47bf9a
-MISC metadata.xml 2577 BLAKE2B dcd49b8888d4e54b9a6ad53f18864773285aeb4d98dd98bba680968d217a474d141d2730126c27f7778a4d984e113445c390a538ceaa7961227289916905aebf SHA512 7a6178f3e0f60ac36bbf2408c2a5b98ddbb3407d2aa6e44317c7b71bba917079bd71b777d837e2921f5eb4dad7cee35a276aab020db610551b5da314810e52a5
+DIST beets-1.4.7.tar.gz 1458621 BLAKE2B f7dd19a7dd92415c29e9b1a7932ba33cb5d43000d35a58b2f42c1487db68c6374dd159960f67e1ac68722693d91d364b24297fb2c0c86a39b82fe5b40a1e739d SHA512 6663a2ffece208a510fce9f5d3dd9c8e617cab60cdb994f7bdb13fd759cfea8882290c75c3cdf4f6de9c7d9b78845b6ed29f98b41c787c89ff8782e4ac3ec152
+EBUILD beets-1.4.7.ebuild 3546 BLAKE2B 58368f23a27a357214b86b767f8317f01dfbd7fe82f8d71a6cf3bef0e1867003ea0ab133c546cd9cb36c2d0f090511abd20c84617f5c3ccdbe50ff0140c6d9e4 SHA512 a592d5cc11ecf49aea157a44bbc574f79be4b887ef06283eba9d520cf4684b94fa3d1e851865c2bb275722095547fe2efa2ce2b9ed3dd40ffb4eec16e729080e
+MISC metadata.xml 2395 BLAKE2B 0df8a5d3fa7b94b5b8e3e45f25e2c4dc0716c438dd51a6061f2276e20bf9779847c34bc571bcdd8948289c75c879cae6ef76fa8432a550855e9f74966fb80374 SHA512 ea2c961e7380a8c05e0e90b34f50323ca932e06ba33d5a214a633e8eba4281577993a870a7d294f286a90c0492256d3142b9e17aa02e2ea129c9c28e24bf90ec
diff --git a/media-sound/beets/beets-1.4.3-r1.ebuild b/media-sound/beets/beets-1.4.3-r1.ebuild
deleted file mode 100644
index 20b305abb9c1..000000000000
--- a/media-sound/beets/beets-1.4.3-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-inherit distutils-r1 eutils
-
-MY_PV=${PV/_beta/-beta.}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="MIT"
-IUSE="badfiles bpd chroma convert doc discogs flac gstreamer lastgenre lastimport mpdstats ogg opus replaygain test thumbnails web"
-REQUIRED_USE="replaygain? ( gstreamer )"
-
-RDEPEND=">=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]
-	dev-python/jellyfish[${PYTHON_USEDEP}]
-	dev-python/munkres[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-	>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
-	badfiles? ( media-sound/mp3val media-libs/flac )
-	bpd? ( dev-python/bluelet[${PYTHON_USEDEP}] )
-	chroma? ( dev-python/pyacoustid[${PYTHON_USEDEP}] )
-	convert? ( media-video/ffmpeg:0[encode] )
-	discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	mpdstats? ( dev-python/python-mpd[${PYTHON_USEDEP}] )
-	lastgenre? ( dev-python/pylast[${PYTHON_USEDEP}] )
-	lastimport? ( dev-python/pylast[${PYTHON_USEDEP}] )
-	replaygain? (
-		gstreamer? ( media-libs/gstreamer:1.0[introspection]
-			media-libs/gst-plugins-good:1.0
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			ogg? ( media-plugins/gst-plugins-ogg )
-			flac? ( media-plugins/gst-plugins-flac:1.0 )
-			opus? ( media-plugins/gst-plugins-opus:1.0 ) )
-		)
-	thumbnails? (
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-		dev-python/pathlib[${PYTHON_USEDEP}]
-		|| ( dev-python/pillow[${PYTHON_USEDEP}] media-gfx/imagemagick )
-		)
-	web? ( dev-python/flask[${PYTHON_USEDEP}] dev-python/flask-cors[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# remove plugins that do not have appropriate dependencies installed
-	for flag in bpd chroma convert discogs lastgenre lastimport mpdstats replaygain thumbnails web; do
-		if ! use ${flag}; then
-			rm -r beetsplug/${flag}.py || \
-			rm -r beetsplug/${flag}/ ||
-				die "Unable to remove ${flag} plugin"
-		fi
-	done
-
-	for flag in bpd lastgenre web; do
-		if ! use ${flag}; then
-			sed -e "s:'beetsplug.${flag}',::" -i setup.py || \
-				die "Unable to disable ${flag} plugin "
-		fi
-	done
-
-	use bpd || rm -f test/test_player.py
-
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	cd test
-	if ! use web; then
-		rm test_web.py || die "Failed to remove test_web.py"
-	fi
-	"${PYTHON}" testall.py || die "Testsuite failed"
-}
-
-python_install_all() {
-	doman man/beet.1 man/beetsconfig.5
-	use doc && dohtml -r docs/_build/html/
-}
diff --git a/media-sound/beets/beets-1.4.7.ebuild b/media-sound/beets/beets-1.4.7.ebuild
new file mode 100644
index 000000000000..580bf88dca80
--- /dev/null
+++ b/media-sound/beets/beets-1.4.7.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_REQ_USE="sqlite"
+inherit distutils-r1
+
+MY_PV=${PV/_beta/-beta.}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="MIT"
+IUSE="badfiles chromaprint doc discogs ffmpeg gstreamer lastfm mpd replaygain test thumbnail webserver"
+
+RDEPEND="
+	dev-python/jellyfish[${PYTHON_USEDEP}]
+	dev-python/munkres[${PYTHON_USEDEP}]
+	>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	badfiles? (
+		media-libs/flac
+		media-sound/mp3val
+	)
+	chromaprint? (
+		dev-python/pyacoustid[${PYTHON_USEDEP}]
+		media-libs/chromaprint[tools]
+	)
+	discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	ffmpeg? ( media-video/ffmpeg:0[encode] )
+	lastfm? ( dev-python/pylast[${PYTHON_USEDEP}] )
+	mpd? (
+		dev-python/bluelet[${PYTHON_USEDEP}]
+		dev-python/python-mpd[${PYTHON_USEDEP}]
+		gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
+	)
+	replaygain? (
+		gstreamer? (
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			media-libs/gst-plugins-good:1.0
+			media-plugins/gst-plugins-meta:1.0[ffmpeg]
+		)
+		!gstreamer? ( media-sound/mp3gain )
+	)
+	thumbnail? (
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		virtual/python-pathlib[${PYTHON_USEDEP}]
+		|| (
+			dev-python/pillow[${PYTHON_USEDEP}]
+			media-gfx/imagemagick
+		)
+	)
+	webserver? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/flask-cors[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+RESTRICT="test" # tests broken in 1.4.3 already
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	rm_use_plugins() {
+		[[ -n "${1}" ]] || die "rm_use_plugins: No use option given"
+		local use=${1}
+		local plugins=${use}
+		use ${use} && return
+		einfo "no ${use}:"
+		[[ $# -gt 1 ]] && plugins="${@:2}"
+		for arg in ${plugins[@]}; do
+			einfo "  removing ${arg}"
+			if [[ -e "beetsplug/${arg}.py" ]]; then
+				rm beetsplug/${arg}.py || die "Unable to remove ${arg} plugin"
+			fi
+			if [[ -d "beetsplug/${arg}" ]]; then
+				rm -r beetsplug/${arg} || die "Unable to remove ${arg} plugin"
+			fi
+			sed -e "s:'beetsplug.${arg}',::" -i setup.py || \
+				die "Unable to disable ${arg} plugin "
+		done
+	}
+
+	default
+
+	rm_use_plugins chromaprint chroma
+	rm_use_plugins ffmpeg convert
+	rm_use_plugins lastfm lastgenre lastimport
+	rm_use_plugins mpd bpd mpdstats
+	rm_use_plugins webserver web
+	rm_use_plugins thumbnail thumbnails
+
+	# remove plugins that do not have appropriate dependencies installed
+	for flag in badfiles discogs replaygain; do
+		rm_use_plugins ${flag}
+	done
+
+	if ! use mpd; then
+		rm -f test/test_player.py || die
+	fi
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cd test || die
+	if ! use webserver; then
+		rm test_web.py || die "Failed to remove test_web.py"
+	fi
+	"${PYTHON}" testall.py || die "Testsuite failed"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman man/beet.1 man/beetsconfig.5
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	einstalldocs
+}
diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index 46b548c1ee8c..a30fde9062e0 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -28,17 +28,14 @@
 	</longdescription>
 	<use>
 		<flag name="badfiles">Validate MP3 &amp; FLAC files</flag>
-		<flag name="bpd">Enable support for <pkg>media-sound/mpd</pkg> server emulation</flag>
-		<flag name="chroma">Enable support for acoustic fingerprinting plugin using <pkg>media-libs/chromaprint</pkg></flag>
-		<flag name="convert">Enable support for the convert plugin which makes it possible to transcode files</flag>
+		<flag name="chromaprint">Enable support for acoustic fingerprinting plugin using <pkg>media-libs/chromaprint</pkg></flag>
+		<flag name="ffmpeg">Enable support for the convert plugin to transcode files via <pkg>media-video/ffmpeg</pkg></flag>
 		<flag name="discogs">Enable support for the discogs API plugin</flag>
-		<flag name="lastgenre">Enable support for importing music genres from last.fm tags</flag>
-		<flag name="lastimport">Enable support for importing your last.fm playcounts</flag>
-		<flag name="mpdstats">Enable support for collecting statistic about listening habits from <pkg>media-sound/mpd</pkg></flag>
-		<flag name="opus">Enable opus support in gstreamer-based replaygain</flag>
+		<flag name="lastfm">Enable support for importing personal last.fm playcounts and music genres from last.fm tags</flag>
+		<flag name="mpd">Enable support for <pkg>media-sound/mpd</pkg> server emulation and statistic gathered from <pkg>media-sound/mpd</pkg></flag>
 		<flag name="replaygain">Enable support for Replay Gain metadata calculation during import</flag>
-		<flag name="thumbnails">Generate thumbnails for albums</flag>
-		<flag name="web">Enable embedded webserver support through <pkg>dev-python/flask</pkg></flag>
+		<flag name="thumbnail">Enable album thumbnails generation</flag>
+		<flag name="webserver">Enable embedded webserver support through <pkg>dev-python/flask</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="pypi">beets</remote-id>
diff --git a/media-sound/brutefir/Manifest b/media-sound/brutefir/Manifest
index 3636c685c4ec..6a3ed9a02769 100644
--- a/media-sound/brutefir/Manifest
+++ b/media-sound/brutefir/Manifest
@@ -1,4 +1,5 @@
 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
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/brutefir/brutefir-1.0k-r2.ebuild b/media-sound/brutefir/brutefir-1.0k-r2.ebuild
new file mode 100644
index 000000000000..c4bc957fd6f7
--- /dev/null
+++ b/media-sound/brutefir/brutefir-1.0k-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Software convolution engine for applying long FIR filters"
+HOMEPAGE="https://www.ludd.ltu.se/~torger/brutefir.html"
+SRC_URI="https://www.ludd.ltu.se/~torger/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="media-libs/alsa-lib
+	media-sound/jack-audio-connection-kit
+	sci-libs/fftw:3.0"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ld.patch )
+
+src_compile() {
+	tc-export AS CC
+	emake
+}
+
+src_install() {
+	emake LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" \
+		install
+	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
+}
+
+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/cantata/Manifest b/media-sound/cantata/Manifest
index f4efd8c63e87..548bc88a0a49 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,8 +1,7 @@
 AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df
-AUX cantata-2.2.0-qtsql-5.10.patch 745 BLAKE2B d0c5e3586bb3303983f6d57bacba275e7b0895c56b43ebde69d7664f4bd57f8e1726982389b3da81487918d41085459f6bb2d9bbf2168f5737d7860d6ee68402 SHA512 1622fe94c814544192453d6ee2fa3158cc19d414e37dd76e88724c5056ff290d0070bb251c2f46a83dace906490625b43bcd51ffafa51c65e2dd500c971ea570
+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.1.tar.bz2 2414702 BLAKE2B c44f7e95091dd4f84e630236e7f681d2ea47cd90705cdeeb17d3e892d4e0b978f88d4cb648841543494670c5dbc1a00ba9e2377dfd684b2fdee9223d4b6b28e3 SHA512 8199b08b1f3d2111fc50fbc4e5b1edced6ac480fd213a11eee569deeebf3a3f1167c2b53c3117bb90b2b81b46792c56b99b65eae5d2b290c0f3b3f90736108e5
-EBUILD cantata-2.2.0-r2.ebuild 3024 BLAKE2B 869cf24f897fe456aaaa04cad85054f8c0099ba05d068688ed778d5dc898da2c87ea3fbbb88160b809b98a9094b66292c018ab62c1fc84e8fe692d1e56622836 SHA512 5a38a9b09f843edf652e75dde23ccd26fe4555041ceeb111ee27105ef927536971430ef59f07877ab9fb369869531cd7edcb570df61c449d1620b04f1dff20cc
+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.1.ebuild 3134 BLAKE2B 37fc9a2d95cf654d6ade61216cb01d641a03c796bbc320156c11a5efb8392393a9155dfe53c0afbb272dfdd6238b6e2461a7863c943895394223f5f0131cc465 SHA512 529a4ac20e556b7ba7a4079c47d489f08da3377fcbc6562d59f2c9076073d7fab210db3f47c256cecc338aac015c01b7a5386ceb9c77285107102ec6f3315079
+EBUILD cantata-2.3.2.ebuild 3178 BLAKE2B 47e139fb262e84e8cd63acdd7634a634bd533c65fd63b15343023ea5ba6b288fc11eaa9e5a99e6eed31a8740532be409b2ff9efafdde9233d17b133b38f3d97c SHA512 e80b43f055b28b5d0c5e8e411b6709c5add03dd35311441ec3d76bd868ae2c5bc9375959c61618b55a4d51d792ec364aaab4c79ff285b6a11a9d146809e73f4e
 MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97
diff --git a/media-sound/cantata/cantata-2.2.0-r2.ebuild b/media-sound/cantata/cantata-2.2.0-r2.ebuild
deleted file mode 100644
index c9cd47b8623e..000000000000
--- a/media-sound/cantata/cantata-2.2.0-r2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 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 )
-"
-
-COMMON_DEPEND="
-	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 )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl[ithreads]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qtconcurrent:5
-	dev-qt/linguist-tools:5
-"
-
-# cantata has no tests
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-headers.patch"
-	"${FILESDIR}/${P}-qtsql-5.10.patch" # bug 642196
-)
-
-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/cantata/cantata-2.3.1.ebuild b/media-sound/cantata/cantata-2.3.2.ebuild
index 4bc76c731c18..db85ccf2fbc9 100644
--- a/media-sound/cantata/cantata-2.3.1.ebuild
+++ b/media-sound/cantata/cantata-2.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PLOCALES="cs da de en_GB es fr hu it ja ko pl ru zh_CN"
+PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
 inherit cmake-utils gnome2-utils l10n qmake-utils xdg-utils
 
 DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
@@ -46,7 +46,7 @@ COMMON_DEPEND="
 		media-sound/mpg123
 		virtual/ffmpeg
 	)
-	streaming? ( media-video/vlc:0= )
+	streaming? ( dev-qt/qtmultimedia:5 )
 	taglib? (
 		media-libs/taglib[asf(+),mp4(+)]
 		udisks? ( sys-fs/udisks:2 )
@@ -66,6 +66,7 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.0-headers.patch"
+	"${FILESDIR}/${P}-opusfile.patch"
 )
 
 src_prepare() {
diff --git a/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch b/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch
deleted file mode 100644
index 16cb6d8c2d1f..000000000000
--- a/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 4da7a9128f2c5eaf23ae2a5006d300dc4f21fc6a Mon Sep 17 00:00:00 2001
-From: Craig Drummond <craig.p.drummond@gmail.com>
-Date: Tue, 28 Nov 2017 22:37:01 +0000
-Subject: [PATCH] Create QSqlQuery, then call prepare Issue #1130
-
----
- db/librarydb.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/db/librarydb.cpp b/db/librarydb.cpp
-index 603d8abc1..4f75dc28f 100644
---- a/db/librarydb.cpp
-+++ b/db/librarydb.cpp
-@@ -453,7 +453,8 @@ class SqlQuery
-         if (limit>0) {
-             sql+=" LIMIT "+QString::number(limit);
-         }
--        query=QSqlQuery(sql, db);
-+        query = QSqlQuery(db);
-+        query.prepare(sql);
- 
-         for (const QVariant &value: boundValues) {
-             query.addBindValue(value);
diff --git a/media-sound/cantata/files/cantata-2.3.2-opusfile.patch b/media-sound/cantata/files/cantata-2.3.2-opusfile.patch
new file mode 100644
index 000000000000..956edf1d5133
--- /dev/null
+++ b/media-sound/cantata/files/cantata-2.3.2-opusfile.patch
@@ -0,0 +1,22 @@
+From cdf4363df91475b091ad20000078ca8ef21ce91f Mon Sep 17 00:00:00 2001
+From: Craig Drummond <craig.p.drummond@gmail.com>
+Date: Sat, 11 Aug 2018 08:31:40 +0100
+Subject: [PATCH] Add '.opus' to list of recognised extensions for local files.
+
+---
+ models/playqueuemodel.cpp | 2 +-
+ 1 file changed, 1 insertions(+), 1 deletion(-)
+
+diff --git a/models/playqueuemodel.cpp b/models/playqueuemodel.cpp
+index deaaa78f3..c6c4c4130 100644
+--- a/models/playqueuemodel.cpp
++++ b/models/playqueuemodel.cpp
+@@ -89,7 +89,7 @@ QSet<QString> PlayQueueModel::constFileExtensions = QSet<QString>()
+                                                   << QLatin1String("m4b") << QLatin1String("mp4") << QLatin1String("m4p") << QLatin1String("wav") << QLatin1String("wv")
+                                                   << QLatin1String("wvp") << QLatin1String("aiff") << QLatin1String("aif") << QLatin1String("aifc") << QLatin1String("ape")
+                                                   << QLatin1String("spx") << QLatin1String("tta") << QLatin1String("mpc") << QLatin1String("mpp") << QLatin1String("mp+")
+-                                                  << QLatin1String("dff") << QLatin1String("dsf")
++                                                  << QLatin1String("dff") << QLatin1String("dsf") << QLatin1String("opus")
+                                                   // And playlists...
+                                                   << QLatin1String("m3u") << QLatin1String("m3u8") << constPlsPlaylist << constXspfPlaylist;
+ 
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index c06aac04549e..d4142132a45f 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -1,4 +1,4 @@
 DIST cdparanoia-III-10.2-patches-2.tbz2 6242 BLAKE2B 6eb0f3c3a331421497e406df969de61d42590f4e8ffff13ffc212ec4a03170b1e02e00322c5c4f2042e5cc4be2cffff58ec8b9b57d851d5df8bebc3fb88ac913 SHA512 523a9ef9f3de263236aad6da102b807a6620cde8767e297e54dcd552f59077d959a89187bc82ad71c577fa66c4862d7c651e922b8b8b8369dd63685cbda9cb74
 DIST cdparanoia-III-10.2.src.tgz 183236 BLAKE2B 295065388e45371329ea7b04bac03c90fd854478d34eb46fa95db03054a1a21effe7863e5065a9148e558796c352d5087b6ef1c3c4c20342e66abd7d2c9eef85 SHA512 4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4eeddb9e8baea675fe51c06138d913342afc8bed167d9fa55672fa25a2763ce21f7e24c1232e4739aff20733a7
-EBUILD cdparanoia-3.10.2-r6.ebuild 1336 BLAKE2B 05debcc5289e52452dcea2f94f338edeb04c9da5bbbcb7368c86f8b3778ecc96226765282988ef29a9cb4791a986fdc65b4cfd826eaf82c6504d0d8eca45cc17 SHA512 1e660f1ed240f1abbc9416a5306bb2a5a774e820d7df1c2214fd1170295387df2fe621c88f232b6c07f4f85177e7a50ac912ddc3e296a27fcca757f85c13f597
+EBUILD cdparanoia-3.10.2-r6.ebuild 1325 BLAKE2B cf1ce4c6aa1df6a613f86d2247b388fee280393079a284f6aa00ea5aa94b0823f8edd924ff2b2c2a40b7ab5e3d389c160c5714c0c9eebc35dccafed37ae467bb SHA512 1229f4b9749fc5e78c85148c4ab72183fc92d04fec13c623b4860c7e9b62733ead9d9378059c9d1cd351f8ae19a277fe77df24055b3e90b9a638edba4ed24809
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
index cca256c3959b..ef62f7fc786e 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${MY_P}.src.tgz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-eselect/eselect-cdparanoia"
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index 594b081817a5..e991ef27ab78 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,11 +1,5 @@
-AUX chuck-1.2.1.1-hid-smc.patch 3066 BLAKE2B c18bbb0bbf344a4a32f90c19e11df0c7a67ef5660570b0c87091f49f81faada3573931c7997fa117b8dca847a9ce9ac72d43f10cf0e36cec2e99612854b52cfe SHA512 854e2134f49b29f928f2752ab5228879f5fb2be4eab07ad68d2a66effcc8b0e6cb798bcd499a7cef6f3476923ae9f4dafe9e299c714a22020094074d2cbd3482
-AUX chuck-1.3.5.1-makefile.patch 865 BLAKE2B 6ffdc0d542d5dfda67b75824ed0f3e7b554825323a4e24aeca19a9864a7c0ebb1dc5c3e20cb37306e6eeecb439e9fecc90e58c17a9acd781186e25e52ea7e010 SHA512 3b338b8f744e273ad90d8982a5df0c516eef070c27c604d22c9c091ff2f6ac713305ac6f52db121f3bb224b4171bfa6996d16f1e364532386bf17d05267450f2
 AUX chuck-1.4.0.0-hid-smc.patch 2937 BLAKE2B 5bc65ffc74409860218983635501c319f4a69448e93340671ad252cd4bb5edd3d4765aa196b3618d7af37897aff40267e7d8538672560dc4de9650a12a5964b6 SHA512 09b04441e9bbd11a15e798878b79010598dd97513a64f6df21e5ed066147382d6021a496e1d1a33b2268d04caa972a1a94afe48c44a226439e3334da35f47be0
 AUX chuck-1.4.0.0-makefile.patch 929 BLAKE2B 1bb70bc169faf5138b3e0d4b60c60366bc6e60a366f2eee3d18c3093b5f2d99e821e0fc948b6a79205500884b8babd12a6676d31c65435f37bf73dedbf5aec74 SHA512 4ceda974263f3a043f187f7d95aae7a16fc65936c7a687f6fa0003a51493caa6eebc8e932075a274373fd319a1c0fb329e1764fc756c4b1691c1dfd8443be836
-DIST chuck-1.3.5.1.tgz 14686970 BLAKE2B 4ce0427d26070ed86b2ec3f788eff88944bf32eec42790a1126641e111bb41abe4e67b4a16b61a6a93524eb2b34d4460fa7ccb9b3656bdcc60cc23189a67ec3b SHA512 450237207150b285954dc2661d6f7829424d4353cdc457a7dce637b6877247b106ad0ed58bdbded17c1f7558e0f01daa7a06642f2727136f6edca5a64d202f73
-DIST chuck-1.3.5.2.tgz 14687476 BLAKE2B 35c3803ba1291bbfedd31d7c2845d20e32af4e91ea77e0790f429465b98d6d3ff91e321f036e3c2294d900d746741d987ac3a231bd6db01e3edaab006d507c97 SHA512 00407b0f20fa9adcd9d0c31078ef7593f8a5b026f19086942c3fa56128fd07e202848651e5e8f41f1d70566de766e84f4a049ca4013e65a61b6f6fb10d69ffbc
 DIST chuck-1.4.0.0.tgz 14664130 BLAKE2B 2009cc3f6905c7e4361aefdbcc89cab08d21328c6fe8ea366aad32a862428a5ffb16d45b1717e849d174f52e104ff0394a0aa2f93cfceed066e7b393edaabb1e SHA512 198b3c08a79bbbd2c0cdd5d9a7a11b8b58f09e949a3f5dd3f330af7d80fdb2861ca53dce807df555aed6ba917e72001ef7147b62a3ada57c34154102388dece1
-EBUILD chuck-1.3.5.1.ebuild 1929 BLAKE2B 0449896f8ce0053063cf5bad18fdfbbcb78b3520eda472ddd435248a1ba5f041b9b5b019b8f8ee28fff0a23525a5d4247828b3728f4f00552dc2e06d67e733a3 SHA512 e220556b04dc04e84accecddc815fe7e38ce856eca1731e8eb22d49daae7bfb54a8844c5454f4a311b423354cb70f70ae7cd329995f0671d2118c4b310bfafa5
-EBUILD chuck-1.3.5.2.ebuild 1918 BLAKE2B baa283c1ea0193ed834660ddfbab1d2fdf6a7ec298ce1cc766f314e45939f4188404c0acb3205644fc88bb347027b652d1e79b8b61eacb1cff015a9c8feb6a8e SHA512 45e6e77187cc65a4e4740b84a6e18212b62f98a7be100b0d374102b6ae30c554a5ac1d5f6ed62b6266a542c821eaab61c603d6d56e122b4e79e23a7610168c8f
 EBUILD chuck-1.4.0.0.ebuild 1892 BLAKE2B cd70d52af6b1e789a4eff89f7d92d96263e6d472586bf796c285c69f5c70d121d9d6e0573375b186264f95bd02c1d7ad60dcc836349a1f2059a92cd14b78ffe9 SHA512 a5a5d49048ad3ea97f0e522712142272bc8c04e11f20b113bbf8524db7108e836f96533de0e9100a4ad024d8be5cb5987a0e45cfbef46ea59723e2dfd82d2278
 MISC metadata.xml 967 BLAKE2B 505781d22a20892538d6bcdda07f1a1ecaecb56c8574cc6745d4fddfa2b4d3ab643947c1403827bc306eb0082434327beccd0eb583287eea9a488bf6adc4ad21 SHA512 9d4c5d826ec6f90bf81a84e389f2ecca527b5116693fc5c32ccb456f5cb29f7daa42f4d655d57d4ed11a0c7625ec65904777e765a64217a4c3b5ad8a9e17b6e0
diff --git a/media-sound/chuck/chuck-1.3.5.1.ebuild b/media-sound/chuck/chuck-1.3.5.1.ebuild
deleted file mode 100644
index 249ca778cb9a..000000000000
--- a/media-sound/chuck/chuck-1.3.5.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="Strongly-timed, concurrent, and on-the-fly audio programming language"
-HOMEPAGE="http://chuck.cs.princeton.edu/"
-SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa jack examples"
-REQUIRED_USE="|| ( alsa jack )"
-
-RDEPEND="app-eselect/eselect-chuck
-	media-libs/libsndfile
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.1.1-hid-smc.patch \
-		"${FILESDIR}"/${PN}-1.3.5.1-makefile.patch
-}
-
-compile_backend() {
-	backend=$1
-	pushd "${S}/src" &>/dev/null || die
-	einfo "Compiling against ${backend}"
-	emake  CC=$(tc-getCC) CXX=$(tc-getCXX) linux-${backend}
-	mv chuck{,-${backend}}
-	emake clean
-	popd &>/dev/null || die
-}
-
-src_compile() {
-	# when compile with athlon or athlon-xp flags
-	# chuck crashes on removing a shred with a double free or corruption
-	# it happens in Chuck_VM_Stack::shutdown() on the line
-	#   SAFE_DELETE_ARRAY( stack );
-	replace-cpu-flags athlon athlon-xp i686
-
-	use jack && compile_backend jack
-	use alsa && compile_backend alsa
-}
-
-src_install() {
-	use jack && dobin src/chuck-jack
-	use alsa && dobin src/chuck-alsa
-
-	dodoc AUTHORS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
-	docinto doc
-	dodoc doc/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}/
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	elog "Chuck now can use multiple audio engines, so you can specify"
-	elog "the preferred audio engine with chuck-{jack,alsa}"
-	elog "Or you can use 'eselect chuck' to set the audio engine"
-
-	einfo "Calling eselect chuck update..."
-	eselect chuck update --if-unset
-}
diff --git a/media-sound/chuck/chuck-1.3.5.2.ebuild b/media-sound/chuck/chuck-1.3.5.2.ebuild
deleted file mode 100644
index fd5abfa7224b..000000000000
--- a/media-sound/chuck/chuck-1.3.5.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Strongly-timed, concurrent, and on-the-fly audio programming language"
-HOMEPAGE="http://chuck.cs.princeton.edu/"
-SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa jack examples"
-REQUIRED_USE="|| ( alsa jack )"
-
-RDEPEND="app-eselect/eselect-chuck
-	media-libs/libsndfile
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.1.1-hid-smc.patch
-	"${FILESDIR}"/${PN}-1.3.5.1-makefile.patch
-)
-
-compile_backend() {
-	backend=$1
-	pushd "${S}/src" &>/dev/null || die
-	einfo "Compiling against ${backend}"
-	emake CC=$(tc-getCC) CXX=$(tc-getCXX) linux-${backend}
-	mv chuck{,-${backend}} || die
-	emake clean
-	popd &>/dev/null || die
-}
-
-src_compile() {
-	# when compile with athlon or athlon-xp flags
-	# chuck crashes on removing a shred with a double free or corruption
-	# it happens in Chuck_VM_Stack::shutdown() on the line
-	#   SAFE_DELETE_ARRAY( stack );
-	replace-cpu-flags athlon athlon-xp i686
-
-	use jack && compile_backend jack
-	use alsa && compile_backend alsa
-}
-
-src_install() {
-	use jack && dobin src/chuck-jack
-	use alsa && dobin src/chuck-alsa
-
-	dodoc AUTHORS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
-	docinto doc
-	dodoc doc/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}/
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Chuck now can use multiple audio engines, so you can specify"
-		elog "the preferred audio engine with chuck-{jack,alsa}"
-		elog "Or you can use 'eselect chuck' to set the audio engine"
-	fi
-	eselect chuck update --if-unset
-}
diff --git a/media-sound/chuck/files/chuck-1.2.1.1-hid-smc.patch b/media-sound/chuck/files/chuck-1.2.1.1-hid-smc.patch
deleted file mode 100644
index e5dcef9da811..000000000000
--- a/media-sound/chuck/files/chuck-1.2.1.1-hid-smc.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -ru chuck-1.2.1.1~/src/util_hid.cpp chuck-1.2.1.1/src/util_hid.cpp
---- chuck-1.2.1.1~/src/util_hid.cpp	2008-03-29 23:24:21.000000000 +0100
-+++ chuck-1.2.1.1/src/util_hid.cpp	2008-03-29 23:24:54.000000000 +0100
-@@ -7175,14 +7175,139 @@
- int WiiRemote_send( const HidMsg * msg ){ return -1; }
- const char * WiiRemote_name( int wr ){ return NULL; }
- 
-+#define SYSFS_TILTSENSOR_FILE "/sys/devices/platform/applesmc/position"
-+#define TILTSENSOR_BUF_LEN 32
-+
-+static struct t_TiltSensor_data
-+{
-+	union
-+	{
-+		struct t_macbook
-+		{
-+			int x;
-+			int y;
-+			int z;
-+		} macbook;
-+	} data;
-+	int dataType;
-+	int detected;
-+	int refcount;
-+
-+	t_TiltSensor_data()
-+	{
-+		refcount = 0;
-+		dataType = -1;
-+		detected = 0;
-+	}
-+
-+} TiltSensor_data;
-+enum
-+{
-+	linuxAppleSMCMacBookDataType
-+};
-+static int TiltSensor_detect()
-+{
-+	int fd;
-+
-+	fd = open(SYSFS_TILTSENSOR_FILE, O_RDONLY);
-+
-+	if (fd > 0)
-+	{
-+		TiltSensor_data.dataType = linuxAppleSMCMacBookDataType;
-+		TiltSensor_data.detected = 1;
-+		close(fd);
-+		return 1;
-+	}
-+
-+	TiltSensor_data.detected = -1;
-+
-+	return 0;
-+}
-+
-+static int TiltSensor_do_read()
-+{
-+
-+	switch(TiltSensor_data.dataType)
-+	{
-+		case linuxAppleSMCMacBookDataType:
-+			char buf[TILTSENSOR_BUF_LEN];
-+			int ret, fd;
-+			fd = open(SYSFS_TILTSENSOR_FILE, O_RDONLY);
-+
-+			if (fd < 0) {
-+				return -1;
-+			}
-+			ret = read(fd, buf, TILTSENSOR_BUF_LEN);
-+			if (ret < 0) {
-+				close(fd);
-+				return -1;
-+			}
-+			if (sscanf(buf, "(%d,%d,%d)\n", &TiltSensor_data.data.macbook.x, &TiltSensor_data.data.macbook.y, &TiltSensor_data.data.macbook.z) != 3) {
-+				close(fd);
-+				return -1;
-+			}
-+			close(fd);
-+			break;
-+		default:
-+			return 0;
-+	}
-+	return 1;
-+}
- void TiltSensor_init(){}
- void TiltSensor_quit(){}
- void TiltSensor_probe(){}
--int TiltSensor_count(){ return 0; }
--int TiltSensor_open( int ts ){ return -1; }
--int TiltSensor_close( int ts ){ return -1; }
--int TiltSensor_read( int ts, int type, int num, HidMsg * msg ){ return -1; }
--const char * TiltSensor_name( int ts ){ return NULL; }
-+int TiltSensor_count()
-+{
-+	if(TiltSensor_data.detected == 0)
-+		TiltSensor_detect();
-+
-+	if(TiltSensor_data.detected == -1)
-+		return 0;
-+	else if(TiltSensor_data.detected == 1)
-+		return 1;
-+
-+	return 0;
-+}
-+int TiltSensor_open( int ts )
-+{
-+	if(TiltSensor_data.detected == 0)
-+		TiltSensor_detect();
-+
-+	if(TiltSensor_data.detected == -1)
-+		return -1;
-+
-+	TiltSensor_data.refcount++;
-+
-+	return 0;
-+}
-+int TiltSensor_close( int ts )
-+{
-+	TiltSensor_data.refcount--;
-+
-+	return 0;
-+}
-+int TiltSensor_read( int ts, int type, int num, HidMsg * msg )
-+{
-+
-+	if(TiltSensor_data.detected == -1)
-+		return -1;
-+
-+	if(!TiltSensor_do_read())
-+		return -1;
-+
-+	if(TiltSensor_data.dataType == linuxAppleSMCMacBookDataType)
-+	{
-+		msg->idata[0] = TiltSensor_data.data.macbook.x;
-+		msg->idata[1] = TiltSensor_data.data.macbook.y;
-+		msg->idata[2] = TiltSensor_data.data.macbook.z;
-+	}
-+
-+	return 0;
-+}
-+const char * TiltSensor_name( int ts )
-+{
-+	return "Apple Sudden Motion Sensor";
-+}
- 
- 
- #endif
-Only in chuck-1.2.1.1/src: util_hid.cpp.orig
diff --git a/media-sound/chuck/files/chuck-1.3.5.1-makefile.patch b/media-sound/chuck/files/chuck-1.3.5.1-makefile.patch
deleted file mode 100644
index e714d20e6b92..000000000000
--- a/media-sound/chuck/files/chuck-1.3.5.1-makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- chuck-1.3.5.1/src/makefile
-+++ chuck-1.3.5.1/src/makefile
-@@ -40,8 +40,6 @@
- 
- ifneq ($(CHUCK_DEBUG),)
- CFLAGS+= -g
--else
--CFLAGS+= -O3
- endif
- 
- ifneq ($(USE_64_BIT_SAMPLE),)
---- chuck-1.3.5.1/src/makefile.alsa
-+++ chuck-1.3.5.1/src/makefile.alsa
-@@ -1,4 +1,4 @@
- 
--CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
-+CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
- LDFLAGS+= -lasound -lstdc++ -ldl -lm -lsndfile -lpthread
- 
---- chuck-1.3.5.1/src/makefile.jack
-+++ chuck-1.3.5.1/src/makefile.jack
-@@ -1,4 +1,4 @@
- 
--CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
-+CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
- LDFLAGS+= -lasound -ljack -lstdc++ -ldl -lm -lsndfile -lpthread
- 
diff --git a/media-sound/id3v2/Manifest b/media-sound/id3v2/Manifest
index a9af0ddba2e0..06850a8434e9 100644
--- a/media-sound/id3v2/Manifest
+++ b/media-sound/id3v2/Manifest
@@ -1,3 +1,4 @@
 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
 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
new file mode 100644
index 000000000000..425d6e7587fa
--- /dev/null
+++ b/media-sound/id3v2/id3v2-0.1.12-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+DEPEND="media-libs/id3lib"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	emake clean
+}
+
+src_configure() {
+	tc-export CC CXX
+}
+
+src_install() {
+	dobin id3v2
+	doman id3v2.1
+	einstalldocs
+}
diff --git a/media-sound/jalv/Manifest b/media-sound/jalv/Manifest
index a2974044b136..7e786caa11d8 100644
--- a/media-sound/jalv/Manifest
+++ b/media-sound/jalv/Manifest
@@ -2,6 +2,5 @@ AUX jalv-1.6.0-qt-5.7.0.patch 906 BLAKE2B 86d7f74c8a80dd4308c5ec4c67d866ae1c6917
 AUX jalv-1.6.0-stdin.patch 2008 BLAKE2B 0fca98631638a2713cf9caa127ca4dce715d81441071fbe695654d9902639c9836398de5adc878f242c45fd52af73238621065cceb4ec0cf685c25debe1b02e5 SHA512 aab7ccb29a63ebaafe1c05852a9533930181e2c34c6015aff9b4d608bfa95a6d4218849736e960adcaef635f4ecb0c3188bcaf2c1f3feb02a5eaff8866a1cacd
 AUX jalv-1.6.0-suil-qt5.patch 1159 BLAKE2B 8e319a59d00946f42586ea9b048b78725ed295d5ae55f6c87bf1739e5aad7319aa9eb7624aee7638b07d45dd757b7859745030d0419ac446367cf8a16bc024bc SHA512 22fd7452af3fcfd2c71a24cce218ce2fbcfccc2eaa224d54594a014ca184a72e80fb5489a868c298ff4ac3884805f2fd2bc827dd63eaa22df081804f0b355fc2
 DIST jalv-1.6.0.tar.bz2 157726 BLAKE2B d1d35ccc3c0234d0005b83fca89ba0570f747f65568da6b5ea4ef0a0974bbd729540555e3cdcd77f3f5b7a8de9f987c7743e258d7544c8d70c7c51aaae84f9a5 SHA512 70453404788846774ef88b43653379f97140301e09e8de61779683df9ee85120485bebf03c959624639dc4d8dd71ce83db2a89b14b66be17696a88d1820ac1b3
-EBUILD jalv-1.6.0-r1.ebuild 1362 BLAKE2B 526f0468a7c547973035bd1aeac9f1de84bbb2be731bc07162732d18d8cdaf118c77348c235741a68e5f03d535463fb3dcea219591dadc059a72342eccfcda32 SHA512 12f810c07ed4a7090cfee9dc46d1439595d5b4d9dc194547cf5d4367052ca9a4e2cc043bd062e6e6482dec11fdd17acbbc20c12f08d9c534c4514d93327bf84b
 EBUILD jalv-1.6.0-r2.ebuild 1437 BLAKE2B 0148beb0670011112756a18ef93c56cc77b9a1f314aa8da99b995f71f6fd766a9774e31882fc069615196f0021c04a408914997cdd8232d0a5515f042567bbd6 SHA512 905639f8fd8b92569fa07554ee00ba90c6605e0c13877ab527a861fd1e8f5940f2259bbe142c95978f7dc7f5881bb6370c67bc4cf9eb32d98282a0b3305a4da1
 MISC metadata.xml 1152 BLAKE2B c5969351b829ace0f2e54d452526a3f77939f99f721acd846c34ce84ca2264ca2c6996725969c034721df7de41abbf9dfbfcbdde9ade5b375f845479ec66d3ac SHA512 e9b1e1f84df16a830785b7020eeb35369d0c0465b82b3033cc0714f4df706b0b63a946c0dc1051d3c1a3b185e5c9563189a05482c2e1013462592d3b1150b29c
diff --git a/media-sound/jalv/jalv-1.6.0-r1.ebuild b/media-sound/jalv/jalv-1.6.0-r1.ebuild
deleted file mode 100644
index 76a06677aae4..000000000000
--- a/media-sound/jalv/jalv-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-any-r1 qmake-utils waf-utils
-
-DESCRIPTION="Simple but fully featured LV2 host for Jack"
-HOMEPAGE="http://drobilla.net/software/jalv/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gtk gtk2 gtkmm portaudio qt5"
-
-RDEPEND=">=media-libs/lv2-1.6.0
-	>=media-libs/lilv-0.24.0
-	>=dev-libs/serd-0.14.0
-	>=dev-libs/sord-0.12.0
-	>=media-libs/suil-0.6.0
-	>=media-libs/sratom-0.6.0
-	gtk? ( >=x11-libs/gtk+-3.0.0:3 )
-	gtk2? ( >=x11-libs/gtk+-2.18.0:2 )
-	gtkmm? ( >=dev-cpp/gtkmm-2.20.0:2.4 )
-	portaudio? ( media-libs/portaudio )
-	!portaudio? ( virtual/jack )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.7.0.patch" )
-
-src_configure() {
-	use qt5 && export PATH="$(qt5_get_bindir):${PATH}"
-	waf-utils_src_configure \
-		"--docdir=/usr/share/doc/${PF}" \
-		--no-qt4 \
-		$(use qt5       || echo --no-qt5)       \
-		$(use gtk       || echo --no-gtk3)      \
-		$(use gtk2      || echo --no-gtk2)      \
-		$(use gtkmm     || echo --no-gtkmm)     \
-		$(use portaudio && echo --portaudio)
-}
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index ee1c8ccfc13b..2bc2776a103a 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,5 +1,7 @@
 AUX kid3-3.3.2-libdir.patch 1506 BLAKE2B 1265271633d61cab6d4ebb49284645a1528dedde7700145fb59c100b9fc209a84a021c2069291b6fcfb3030e0afa569016151e0545ce6f5375cc485881ecec44 SHA512 b987463eb82b499af757ba2865bfe57f9f9d405eb005822d08521f89700bfcfbb1bd46f9caa8c436b6d73d0b12284db08299d5425299f5803612e7b75b6c12ec
 AUX kid3-3.4.4-deps.patch 1485 BLAKE2B a2c4b9ac6e956dcc2e6415b502e0ca34814d668ceb3e2e315f4da8da382041cf55f6b5531d298ecc00ee242433c09d2095e4357a9814fd9eda60d501672c5a74 SHA512 af386071836e542e178cda38297091817943a3f754e4d14b3cca2ec628bd7c13980932e77b1f9e3c578b095d88ea2b24e89e58b6f726c6f656989fc08bc8a808
 DIST kid3-3.6.1.tar.gz 1428799 BLAKE2B 055743c06bf28188c16e627556e1c23cb724f6a1601975f259a912445063a23f3c6d8101cbb3f582fac66c56bbcbaf243e637132b20930f718f2c5b1056b7dc9 SHA512 026be02c3dea1f05af0f24a26ee9d6b775f7e408db6de8afbb3dda5f66ee465263fb1c3763d4e8ab52b1856a58c1ea21228d24cdb754508e68c04f7d5cccfb77
+DIST kid3-3.6.2.tar.gz 1430880 BLAKE2B f27d8e332639b72ccc0ace8afe05391c3edc0b470430477407138a90a2b3b0a6cefe0e740b0862d29cc61c866503b5df9b1333f26cd1f7f67797007d6117ce58 SHA512 96e9686d5af8c06867bc4d3b2ca51ddf89b6ba9a622236f79de53bef6b3ef518ef64fef3ab9af4e63ac9161bea8dc1c79d0417fe1ac433a9dfe36331089ab548
 EBUILD kid3-3.6.1.ebuild 2039 BLAKE2B 916f9cc8c38797be544521a1547f32bfdfb92b657eb82ee7cbf04caaab44aedc2aa210c343dc07e061d832ca86ff9540d9926f79cd9977b05c805f4162a55ca3 SHA512 3c9579683274c70f5ab977887eab2973da50fce3aad59ecbc58cdeb653689422cbc3d87fe31aae262fde7241f5f41dedfd79bf52cfb99b5b4a269dd1a07661cb
+EBUILD kid3-3.6.2.ebuild 2003 BLAKE2B 20a0e16d6f891f9324d48a8473aee6261008dcab59611cd2fa62d113dc0c655a00f5a84b7f2bb313c13c74fbcbc13a132ae958ad12c80d04c6035754b16fc060 SHA512 8925b27536284c425677e45bf9f87881f663ff366939aed729d21443e95f55ab40d98d10922b893d1d07d6e13f8ed816b488a6d322998c87975094e545f7b37b
 MISC metadata.xml 661 BLAKE2B 5a16df625ed1a34a04f7cd00cae636ec4dc2867cf1bab477c4a2fd99e21777ac949391c0c940da1235ee976a00b3812a84db1fb58c8c089aed983668f9ff49fb SHA512 d27b8c077e8363864d6d4baa217bd7813a01c520cba943bf25996823b944ed07c7b78205d5c77c1610566e2aa55cf03624633e4abef86e4378f6386b7bfb89c9
diff --git a/media-sound/kid3/kid3-3.6.2.ebuild b/media-sound/kid3/kid3-3.6.2.ebuild
new file mode 100644
index 000000000000..59ad6ac10814
--- /dev/null
+++ b/media-sound/kid3/kid3-3.6.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ECM_KDEINSTALLDIRS="false"
+KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
+inherit kde5
+
+DESCRIPTION="Simple tag editor based on Qt"
+HOMEPAGE="https://kid3.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
+
+REQUIRED_USE="flac? ( vorbis )"
+
+COMMON_DEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtmultimedia)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	sys-libs/readline:0=
+	acoustid? (
+		media-libs/chromaprint
+		virtual/ffmpeg
+	)
+	flac? (
+		media-libs/flac[cxx]
+		media-libs/libvorbis
+	)
+	kde? (
+		$(add_frameworks_dep kconfig)
+		$(add_frameworks_dep kconfigwidgets)
+		$(add_frameworks_dep kcoreaddons)
+		$(add_frameworks_dep kwidgetsaddons)
+		$(add_frameworks_dep kxmlgui)
+	)
+	mp3? ( media-libs/id3lib )
+	mp4? ( media-libs/libmp4v2:0 )
+	taglib? ( >=media-libs/taglib-1.9.1 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!media-sound/kid3:4
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep linguist-tools)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.2-libdir.patch"
+)
+
+src_prepare() {
+	# overengineered upstream build system
+	# kde5 eclass src_prepare leads to compile failure
+
+	# only enable handbook when required
+	if ! use_if_iuse handbook ; then
+		cmake_comment_add_subdirectory ${KDE_DOC_DIR}
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_PHONON=OFF
+		-DWITH_QT4=OFF
+		-DWITH_QT5=ON
+		-DWITH_CHROMAPRINT=$(usex acoustid)
+		-DWITH_FLAC=$(usex flac)
+		-DWITH_ID3LIB=$(usex mp3)
+		-DWITH_MP4V2=$(usex mp4)
+		-DWITH_TAGLIB=$(usex taglib)
+		-DWITH_VORBIS=$(usex vorbis)
+	)
+
+	if use kde ; then
+		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
+	else
+		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
+	fi
+
+	kde5_src_configure
+}
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index d60b0b4ec628..9e9044105baf 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -3,5 +3,5 @@ AUX lame-3.98-gtk-path.patch 8523 BLAKE2B 9b5231402293a61f8366383a704056e60edbcb
 AUX lame-3.99.5-msse.patch 557 BLAKE2B 76b1201e0909ee408a9556ffeb3d41b4bd749407b17ab0dc98582c01b027d492ac6e2f09c8758a59a6bb2649fa1c7a55e96fccab0525b0dcb70b6ea44a034dc0 SHA512 9bf5a1b0f8955aeedff6effcab7f657961ad60ce00b5f455c05ce39ad5b03c2a809ba7225a3a33b61b84a36665fafac53e35b14e0d357289e66194a4f0ef9807
 AUX lame-3.99.5-tinfo.patch 768 BLAKE2B 3fbbd31b0b5752ee4c2dad573d053edcbfb80d24b68a876c2092cae37d3450ac6044ec14d26b180a46197093151d614be8400f33ff7b1f6968130412daacefa5 SHA512 504428e0a0b43c467848296c219ac855ffc9bd83fadb54107e8f6b99290b91bc36457635a092fc121972a3c89918f2d81b42f98f6d007f9b571c7bc3f9c2895e
 DIST lame-3.100.tar.gz 1524133 BLAKE2B 6954d30cfd3951ea07762ba5dd7ff27038b78455f423099a225ebf748abddf9970e444456ca5a6179bd381e2205b32293392cb757c203901674860710fe2c183 SHA512 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b
-EBUILD lame-3.100-r1.ebuild 2142 BLAKE2B a733e4bf5610e8d246e2648a500252315b09e4149d3c1c454d67bc91e5b6f097e43e59fc7298dc75a0d41331bf7f5f448f2097416339ffc5d987c01f77f12e78 SHA512 58d0897f2c5591aefc38e4ab872787d3b08dade10dc56983a8b127b7250c245dbea11ad2624ef623948881d95bfaa4f0a6f483b4b3c334dd1a3bbd223cd6cc9f
+EBUILD lame-3.100-r1.ebuild 2131 BLAKE2B 4fb2b1ca5d25ba25c7ecbab7be0daa8211cc5fa351900dc1bf78c014b8f0437b6074d112f3b639745946b48631aa6a2243f56c201be5034c9c7d4dc2242b58d2 SHA512 100a6a434b6fae6cc78d0b0853ec3abb8616666dbb615d519e8ee25f30e4aa615dd4cac2da22fd2717f67121a0e825ba333cc699d9d470f01824d20fc353129e
 MISC metadata.xml 542 BLAKE2B 726f3dfefda9c1905739448f1a3124e05ddc90e261d147da12a7839185ef3eeb440678d185510a6bdd4bb71ab987b7a24f52ed108f7c646ca6b651434f9fade1 SHA512 8fc2e2658ae34d146894786f1c66800eecf818e2bd9bb807c6b32a8e132340c1568e9f47220be3daaabce2ab6e1e1d5aa817157f2c0131ed01944abbab6593fb
diff --git a/media-sound/lame/lame-3.100-r1.ebuild b/media-sound/lame/lame-3.100-r1.ebuild
index 662dd8835736..7b26d856a52c 100644
--- a/media-sound/lame/lame-3.100-r1.ebuild
+++ b/media-sound/lame/lame-3.100-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
 
 # These deps are without MULTILIB_USEDEP and are correct since we only build
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 20da1dbbdb16..2ee3624088ae 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,20 +1,7 @@
-AUX mixxx-2.0.0-chromaprint-1.4.patch 1518 BLAKE2B ead525e69d7c031b81aa00f969a1e569182eb958d794a6715d809d46dc8d5789b71e7d4dbd8a6ce8987013d614f3fd1b4b0a63fa488c7e2f48136614c3bafea8 SHA512 31da87b64646188be144611fc6f601d58edfcf9e63b5382060f5088797c24d61ff4b48a4e80c5c3b919b7291287d3977c0f61829ddfe7a43f9fbae7db3b735c0
 AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e30e29e6c4d6330cc298a568ee7dd7014af6b9c1f1c4d98b8c11c96da7f74660eb4b3b522f449e7a6a431addc SHA512 01ab76466f782f538c894e460f7694553ae12804651f68aabb6aaa0dbdc89e2ff7e2b51529b0f112cee42c8053b75fc64241a9c8898def8cf1c76231b1ec5d59
-AUX mixxx-2.0.0-eliminate-unnecessary-heap-allocation-of-qtime.patch 1615 BLAKE2B 08a41664f1941ac100b8fbee0c92e064813f0eb549cfd17e766541034954c73ea8b5ca9c759d98edb1f3513447719313790000c92f47c53ef54e0b74fe8c7f6c SHA512 825599d1bdfbcc673c64226bde25f2ae56b046d32139c3347cb2aae698aa27158b17609dd097ce772e62bcd58b7f711d352386069683239541f3f4160dc6d915
-AUX mixxx-2.0.0-fix-formatting-of-time-durations.patch 866 BLAKE2B 04c26b07097adbcac2236d19c1443e1337a988d592abf460548823aa2b66133c1a05967ebc6ef7fa0a1a00b4184f9a4811341cf85db61ccaa88a617fd26b9062 SHA512 4850724ba1a6809a242976dcec5337b1f9c6c8c93c60c3ce5fa9cf6b6b714aa83485e58e7b97f849720da17e664c89adf33ed53d73d13d249a01700f638de3e2
-AUX mixxx-2.0.0-fix-formatting-of-time-durations2.patch 5912 BLAKE2B 5ae56d5ee1813ec08996df98a54f01e6f530c66bc458eb0581221f5646cfe16be51b47ebcc1029077b5abf366fbf84d535904da702fcbc8cc79452c0d175fb90 SHA512 c7e7480fb6880e3543ade9455cafa9ef1cfdde0af813cb54c8dc3cd98ad964dcdf7b2c4b209dac89d7654551e54dc0bd185fb00783c0f0507f0f72f21d61a599
-AUX mixxx-2.0.0-fix-missing-pointer-initialization.patch 9702 BLAKE2B 72f6beab3927eee78a17bb9a8437597ae6b764fcc8627917b3a663bd2864cab2bd95d9bdafd3dbd42e614b77fbe333433ef52b7c654436ae3f5b94e66f147bf1 SHA512 048f74fb3c0079f5935f41a4a3b5c04a691f6eaec199a8261dba119e8fa2efe15c4f8e6c24befbfadb7cf1af3db49c75ac52b3a265f52480889d4f9c9ad89eba
-AUX mixxx-2.0.0-gcc62.patch 726 BLAKE2B c480db47ddabf8f1fa40ed615b1b6eb63c0459c61e5f926191ef18a84a2928a01908d65d40e231186e7b0bcd8a7c8a7e419d810f35581ab2ad8c5431f7795275 SHA512 cd0469d29ebf3b0d30154bc178b60383d52abfe5c6a34ed6de83da3ed425ed55630d0bf4159e00b7bd9ddc9822e98a9805051a29b2372f2ae952a43cced34c47
-AUX mixxx-2.0.0-move-definition-of-time-formatseconds-into-dot-cpp-file.patch 3113 BLAKE2B e3bd72182b36c8a93dd635f73bf4b5d982f74af89d212b7dea223da1d0163d952ba40a06b7bebe06c06487ee53a827da75e0638dd19b5b6f9d085b069e8b2d61 SHA512 73ea80adbc32cf8c087cd97d8c8225f1d94ea138835557dac1f8b9cd8e4415ae0f6eb4548a6581aa4a8d3bada01f7c6ad3a538d3907c233a69327f4b3d31b316
-AUX mixxx-2.0.0-rmx2-backport-controller-scripts.patch 10840 BLAKE2B 18054948e2a9e2c737ae4fe0a9c05ae1da17c66ba33e8aa36cdbc236c08b5a5fdaca3f6bc7968e1cb0a6a85dd2239edc7ec9eff8beb98c0c402fa6cc9441e15c SHA512 6ffced1c2368b1c5ad2cadf72fd21c917626318784cfcdbaf2d85ac63955ecdb96aefafd268a005962ced766cf8150b3daf409d587edab6a8b854ab6c7e812c5
-AUX mixxx-2.0.0-sqlite3.patch 345 BLAKE2B 2c06cea5358df63d0c5e690fb700766b8a3631f7cd8a239e22fee7b7c2b31b57218173367fbffda127a066e163f62fce7d2aafb6ced3b60624c646f820f994ff SHA512 18e390daf6ec7530614e7601f0695f2e42a4742d4502992b2d86d98a5c0d357c424325fd4e6fec4dad11333730afc34aaf9f3be1d3b6e4c26250e4817468345b
-DIST mixxx-2.0.0-ffmpeg30.patch 714 BLAKE2B 00c5cdc233262e64fa52abcc97fc15d1347a391d411b5a0e2650bc3d06f1ef994b28c1f5bd942026201850925f6959fa0b3896c5dff48fbad1c28df8bcd8067b SHA512 60788ecab1fa92b825815fff5dfdfefe02fb097e46f7f55f318bb8a8677da42e4601cce51eaaec51988990eebb72d59346d1ec45ed76cac3c8a7f9a9d1e8cf54
-DIST mixxx-2.0.0-ffmpeg31.patch 2844 BLAKE2B ee44c1da8af553cff478d12bc4fb05ae50bd788340ba5e414b6a535873a3c1868363762697ab21580bfa8f4006c0314acdc2c778f80a910c316a49d91c3e0205 SHA512 7207ad72d0ea851b1425ff7472aafe5f828ca70aad0821a1ef1eb54845527532489ac7913f6584e3af5fb53bf3459abc173fbf482f83be8a22358d28b1b5cf74
-DIST mixxx-2.0.0-src.tar.gz 25300881 BLAKE2B a0dbc03350bf6d6a8ce5abd06df50bf58cf3d75fcc3f8614873c807ad8a77d1afb12a8715944ebba80da5750e4c6d6570ea60a5afb83b87f8cc54c7c4d0ccb00 SHA512 8878c0f785e4c5f67724deeca61154d2587969a81d28aef8fa9d526aec8419a218ce2a7ef88d6fcf468d30fa13d31ac9a56ca9082431a35b7e4e040a7ccfbb1a
 DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166 SHA512 c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20
 DIST mixxx-2.1.3.tar.gz 34471372 BLAKE2B 88b634003a6014ebe746cf0f5f2b3d3de6775c6b2a5298898e70c55feb1ae5a54a692f9428103419943e829438b2ac2fdbfa93c45d4624a7aede59f8ecbe98ae SHA512 3aaf207963cb7380d98c9458f9c1d85c2c72bc0bc2197758a47af50ea38a80158c1abacc70ef50398ccd89a4bd4c30d93c65d70112332e529f3a3aed31509324
-EBUILD mixxx-2.0.0-r5.ebuild 3717 BLAKE2B 3e838a7dff793c2ef3bb4c99803746e3dd85fc19e837f4022d15189b8527eb6c775627c8e95c8dda42c875e33e1e89737791469f0df17784c2f15f318adfde6d SHA512 429289d7d632a723bc3919740f9f8fcde60707923e1c4b384ce4dbeea843a110b954c95519b3e91bff5fa7084179982736008e5ae207a4b018af2a087a32be21
-EBUILD mixxx-2.1.1-r1.ebuild 3005 BLAKE2B e806ef891917a0abb00a5f9295e454fb98c6f7dbe9e7ad70731acf6b6aae8c7be35fba41f355cc8d45aa9d290c9078901cbb1a8795301747509d3bf2ea0c5fa4 SHA512 2d11acf52aad36769d209d137f94484c99a8106087d8cf4a864864171bea9255b65facc65a35e2efa3a8d8cfe89fe218f0f5db917e3dec531f23b23c02c2318c
+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-9999.ebuild 3006 BLAKE2B 0c393607bc1db7e23d986a55c4b72c966ea00d317884a24cea3550414e5fb04963a0a5085a717a0f9a3e3ed7564909162e7fa699f43d38256afe6862ceb34b3a SHA512 1df37aec5a1d8c5bce3b2bb352328b9da488235baaf2121704ed17fa1cfb82b9ff5d813e5c44c94b9618438c4cdfba52f933ecbf4827d2165d27ee19358fdc36
 MISC metadata.xml 642 BLAKE2B 125facf06db489fe7e3f4663b1664a4e0c4288cad028b9d0e73db345c8e6a8004383b4efb70e7b5315028fba769fb790cb2b39949980b5adc6f3de2178c0f7c9 SHA512 e336e472a4ee405e18a2521cbd296917a1c555c444eb3794eea602a36ec30f5eab99e9dcad36a08c9852c228253721311d957ef632ae0d14c96391a95ad4dd5e
diff --git a/media-sound/mixxx/files/mixxx-2.0.0-chromaprint-1.4.patch b/media-sound/mixxx/files/mixxx-2.0.0-chromaprint-1.4.patch
deleted file mode 100644
index 77827f3d8d81..000000000000
--- a/media-sound/mixxx/files/mixxx-2.0.0-chromaprint-1.4.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Backported chromaprint-1.4 API changes based on the fix suggested in:
-https://github.com/mixxxdj/mixxx/pull/1073
-
-and the work done by Charlie Gehlin in:
-https://bugs.gentoo.org/604528
-
---- mixxx-2.0.0/src/musicbrainz/chromaprinter.cpp
-+++ mixxx-2.0.0/src/musicbrainz/chromaprinter.cpp
-@@ -25,6 +25,16 @@
- 
- QString ChromaPrinter::calcFingerPrint(const Mixxx::SoundSourcePointer& pSoundSource) {
- 
-+    // Type declarations of *fprint and *encoded pointers need to account for Chromaprint API version
-+    // (void* -> uint32_t*) and (void* -> char*) changed in versions v1.4.0 or later -- alyptik 12/2016
-+    #if (CHROMAPRINT_VERSION_MINOR > 3) || (CHROMAPRINT_VERSION_MAJOR > 1)
-+	typedef uint32_t* uint32_p;
-+	typedef char* char_p;
-+    #else
-+	typedef void* uint32_p;
-+	typedef void* char_p;
-+    #endif
-+
-     // this is worth 2min of audio, multiply by 2 because we have 2 channels
-     // AcoustID only stores a fingerprint for the first two minutes of a song
-     // on their server so we need only a fingerprint of the first two minutes
-@@ -57,12 +67,12 @@
-     }
-     chromaprint_finish(ctx);
- 
--    void* fprint = NULL;
-+    uint32_p fprint = NULL;
-     int size = 0;
-     int ret = chromaprint_get_raw_fingerprint(ctx, &fprint, &size);
-     QByteArray fingerprint;
-     if (ret == 1) {
--        void* encoded = NULL;
-+        char_p encoded = NULL;
-         int encoded_size = 0;
-         chromaprint_encode_fingerprint(fprint, size,
-                                        CHROMAPRINT_ALGORITHM_DEFAULT,
diff --git a/media-sound/mixxx/files/mixxx-2.0.0-eliminate-unnecessary-heap-allocation-of-qtime.patch b/media-sound/mixxx/files/mixxx-2.0.0-eliminate-unnecessary-heap-allocation-of-qtime.patch
deleted file mode 100644
index 04538a01e15a..000000000000
--- a/media-sound/mixxx/files/mixxx-2.0.0-eliminate-unnecessary-heap-allocation-of-qtime.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -dNur a/src/analyserwaveform.cpp b/src/analyserwaveform.cpp
---- a/src/analyserwaveform.cpp	2015-12-29 17:10:41.000000000 +0100
-+++ b/src/analyserwaveform.cpp	2017-02-04 21:12:30.127952910 +0100
-@@ -1,6 +1,3 @@
--#include <QImage>
--#include <QtDebug>
--#include <QTime>
- #include <QtDebug>
- 
- #include "analyserwaveform.h"
-@@ -40,7 +37,6 @@
-         }
-     }
- 
--    m_timer = new QTime();
-     m_analysisDao = new AnalysisDao(m_database, pConfig);
- }
- 
-@@ -48,14 +44,13 @@
-     qDebug() << "AnalyserWaveform::~AnalyserWaveform()";
-     destroyFilters();
-     m_database.close();
--    delete m_timer;
-     delete m_analysisDao;
- }
- 
- bool AnalyserWaveform::initialise(TrackPointer tio, int sampleRate, int totalSamples) {
-     m_skipProcessing = false;
- 
--    m_timer->start();
-+    m_timer.start();
- 
-     if (totalSamples == 0) {
-         qWarning() << "AnalyserWaveform::initialise - no waveform/waveform summary";
-@@ -320,7 +315,7 @@
- #endif
- 
-     qDebug() << "Waveform generation for track" << tio->getId() << "done"
--             << m_timer->elapsed()/1000.0 << "s";
-+             << m_timer.elapsed()/1000.0 << "s";
- }
- 
- void AnalyserWaveform::storeIfGreater(float* pDest, float source) {
-diff -dNur a/src/analyserwaveform.h b/src/analyserwaveform.h
---- a/src/analyserwaveform.h	2015-12-29 17:10:41.000000000 +0100
-+++ b/src/analyserwaveform.h	2017-02-04 21:12:45.367713395 +0100
-@@ -171,7 +171,7 @@
-     EngineFilterIIRBase* m_filter[FilterCount];
-     std::vector<float> m_buffers[FilterCount];
- 
--    QTime* m_timer;
-+    QTime m_timer;
-     QSqlDatabase m_database;
-     AnalysisDao* m_analysisDao;
- 
diff --git a/media-sound/mixxx/files/mixxx-2.0.0-fix-formatting-of-time-durations.patch b/media-sound/mixxx/files/mixxx-2.0.0-fix-formatting-of-time-durations.patch
deleted file mode 100644
index 654c01f53b9d..000000000000
--- a/media-sound/mixxx/files/mixxx-2.0.0-fix-formatting-of-time-durations.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 76c53b0f0a2be7b5cf85fa523f3521a5725affb2 Mon Sep 17 00:00:00 2001
-From: Uwe Klotz <uwe_klotz@web.de>
-Date: Fri, 8 Jan 2016 18:22:33 +0100
-Subject: [PATCH] Fix formatting of time durations
-
----
- src/util/time.h | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/time.h b/src/util/time.h
-index 29187ad..7b38eb4 100644
---- a/src/util/time.h
-+++ b/src/util/time.h
-@@ -75,7 +75,9 @@ class Time {
-         const int days = static_cast<int>(dSeconds) / kSecondsPerDay;
-         dSeconds -= days * kSecondsPerDay;
- 
--        QTime t = QTime().addMSecs(dSeconds * kMillisPerSecond);
-+        // NOTE(uklotzde): Time() constructs a 'null' object, but
-+        // we need 'zero' here.
-+        QTime t = QTime(0, 0).addMSecs(dSeconds * kMillisPerSecond);
- 
-         QString formatString =
-                 (days > 0 ? (QString::number(days) %
diff --git a/media-sound/mixxx/files/mixxx-2.0.0-fix-formatting-of-time-durations2.patch b/media-sound/mixxx/files/mixxx-2.0.0-fix-formatting-of-time-durations2.patch
deleted file mode 100644
index f8c041e4043e..000000000000
--- a/media-sound/mixxx/files/mixxx-2.0.0-fix-formatting-of-time-durations2.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -dNur a/src/library/basesqltablemodel.cpp b/src/library/basesqltablemodel.cpp
---- a/src/library/basesqltablemodel.cpp	2015-12-29 17:10:41.000000000 +0100
-+++ b/src/library/basesqltablemodel.cpp	2017-02-04 21:33:39.403861857 +0100
-@@ -559,7 +559,7 @@
-             if (column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_DURATION)) {
-                 int duration = value.toInt();
-                 if (duration > 0) {
--                    value = Time::formatSeconds(duration, false);
-+                    value = Time::formatSeconds(duration);
-                 } else {
-                     value = QString();
-                 }
-diff -dNur a/src/library/browse/browsethread.cpp b/src/library/browse/browsethread.cpp
---- a/src/library/browse/browsethread.cpp	2015-12-29 17:10:41.000000000 +0100
-+++ b/src/library/browse/browsethread.cpp	2017-02-04 21:32:23.605066421 +0100
-@@ -185,8 +185,7 @@
-         item->setData(item->text(), Qt::UserRole);
-         row_data.insert(COLUMN_COMMENT, item);
- 
--        QString duration = Time::formatSeconds(qVariantValue<int>(
--                tio.getDuration()), false);
-+        QString duration = Time::formatSeconds(tio.getDuration());
-         item = new QStandardItem(duration);
-         item->setToolTip(item->text());
-         item->setData(item->text(), Qt::UserRole);
-diff -dNur a/src/library/cratefeature.cpp b/src/library/cratefeature.cpp
---- a/src/library/cratefeature.cpp	2015-12-29 17:10:41.000000000 +0100
-+++ b/src/library/cratefeature.cpp	2017-02-04 21:30:54.962474898 +0100
-@@ -493,7 +493,7 @@
-             crateListTableModel.index(row, durationColumn)).toInt();
-         m_crateList.append(qMakePair(id, QString("%1 (%2) %3")
-                                      .arg(name, QString::number(count),
--                                          Time::formatSeconds(duration, false))));
-+                                          Time::formatSeconds(duration))));
-     }
- }
- 
-diff -dNur a/src/library/playlistfeature.cpp b/src/library/playlistfeature.cpp
---- a/src/library/playlistfeature.cpp	2015-12-29 17:10:41.000000000 +0100
-+++ b/src/library/playlistfeature.cpp	2017-02-04 21:33:06.920378091 +0100
-@@ -168,7 +168,7 @@
-             playlistTableModel.index(row, durationColumn)).toInt();
-         m_playlistList.append(qMakePair(id, QString("%1 (%2) %3")
-                                         .arg(name, QString::number(count),
--                                             Time::formatSeconds(duration, false))));
-+                                             Time::formatSeconds(duration))));
-     }
- }
- 
-diff -dNur a/src/trackinfoobject.cpp b/src/trackinfoobject.cpp
---- a/src/trackinfoobject.cpp	2015-12-29 17:10:41.000000000 +0100
-+++ b/src/trackinfoobject.cpp	2017-02-04 21:42:36.423323807 +0100
-@@ -293,7 +293,7 @@
-     int iDuration = m_iDuration;
-     lock.unlock();
- 
--    return Time::formatSeconds(iDuration, false);
-+    return Time::formatSeconds(iDuration);
- }
- 
- void TrackInfoObject::setLocation(const QString& location) {
-diff -dNur a/src/util/time.cpp b/src/util/time.cpp
---- a/src/util/time.cpp	2017-02-04 21:29:44.439595305 +0100
-+++ b/src/util/time.cpp	2017-02-04 21:37:54.739803100 +0100
-@@ -1,5 +1,7 @@
- #include "util/time.h"
- 
-+#include "util/assert.h"
-+
- // static
- LLTIMER Time::s_timer;
- // static
-@@ -8,7 +10,7 @@
- qint64 Time::s_testElapsed_nsecs = 0;
- 
- // static
--QString Time::formatSeconds(double dSeconds, bool showCentis) {
-+QString Time::formatSeconds(double dSeconds, Precision precision) {
-     if (dSeconds < 0) {
-         return "?";
-     }
-@@ -24,13 +26,14 @@
-             (days > 0 ? (QString::number(days) %
-                          QLatin1String("'d', ")) : QString()) %
-             QLatin1String(days > 0 || t.hour() > 0 ? "hh:mm:ss" : "mm:ss") %
--            QLatin1String(showCentis ? ".zzz" : "");
-+            QLatin1String(Precision::SECONDS == precision ? "" : ".zzz");
- 
-     QString timeString = t.toString(formatString);
- 
-     // The format string gives us milliseconds but we want
-     // centiseconds. Slice one character off.
--    if (showCentis) {
-+    if (Precision::CENTISECONDS == precision) {
-+        DEBUG_ASSERT(1 <= timeString.length());
-         timeString = timeString.left(timeString.length() - 1);
-     }
- 
-diff -dNur a/src/util/time.h b/src/util/time.h
---- a/src/util/time.h	2017-02-04 21:29:44.439595305 +0100
-+++ b/src/util/time.h	2017-02-04 21:41:01.476833822 +0100
-@@ -55,10 +55,17 @@
-         s_testElapsed_nsecs = elapsed * 1000000;
-     }
- 
--    // The standard way of formatting a time in seconds. Used for display of
--    // track duration, etc. showCentis indicates whether to include
--    // centisecond-precision or to round to the nearest second.
--    static QString formatSeconds(double dSeconds, bool showCentis);
-+    enum class Precision {
-+        SECONDS,
-+        CENTISECONDS,
-+        MILLISECONDS
-+    };
-+
-+    // The standard way of formatting a time in seconds. Used for display
-+    // of track duration, etc.
-+    static QString formatSeconds(
-+            double dSeconds,
-+            Precision precision = Time::Precision::SECONDS);
- 
-   private:
-     static LLTIMER s_timer;
-diff -dNur a/src/widget/wnumberpos.cpp b/src/widget/wnumberpos.cpp
---- a/src/widget/wnumberpos.cpp	2015-12-29 17:10:41.000000000 +0100
-+++ b/src/widget/wnumberpos.cpp	2017-02-04 21:41:57.023950430 +0100
-@@ -92,10 +92,10 @@
-     QString valueString;
-     if (valueMillis >= 0) {
-         valueString = m_skinText % Time::formatSeconds(
--                valueMillis / Time::kMillisPerSecond, true);
-+                valueMillis / Time::kMillisPerSecond, Time::Precision::MILLISECONDS);
-     } else {
-         valueString = m_skinText % QLatin1String("-") % Time::formatSeconds(
--                -valueMillis / Time::kMillisPerSecond, true);
-+                -valueMillis / Time::kMillisPerSecond, Time::Precision::CENTISECONDS);
-     }
-     setText(valueString);
- }
diff --git a/media-sound/mixxx/files/mixxx-2.0.0-fix-missing-pointer-initialization.patch b/media-sound/mixxx/files/mixxx-2.0.0-fix-missing-pointer-initialization.patch
deleted file mode 100644
index 3364995ce4f5..000000000000
--- a/media-sound/mixxx/files/mixxx-2.0.0-fix-missing-pointer-initialization.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-diff -dNur a/src/analyserwaveform.cpp b/src/analyserwaveform.cpp
---- a/src/analyserwaveform.cpp	2017-02-04 21:14:33.266016824 +0100
-+++ b/src/analyserwaveform.cpp	2017-02-04 21:19:09.205671982 +0100
-@@ -11,8 +11,8 @@
- 
- AnalyserWaveform::AnalyserWaveform(ConfigObject<ConfigValue>* pConfig) :
-         m_skipProcessing(false),
--        m_waveformData(NULL),
--        m_waveformSummaryData(NULL),
-+        m_waveformData(nullptr),
-+        m_waveformSummaryData(nullptr),
-         m_stride(0, 0),
-         m_currentStride(0),
-         m_currentSummaryStride(0) {
-@@ -37,14 +37,13 @@
-         }
-     }
- 
--    m_analysisDao = new AnalysisDao(m_database, pConfig);
-+    m_pAnalysisDao = std::make_unique<AnalysisDao>(m_database, pConfig);
- }
- 
- AnalyserWaveform::~AnalyserWaveform() {
-     qDebug() << "AnalyserWaveform::~AnalyserWaveform()";
-     destroyFilters();
-     m_database.close();
--    delete m_analysisDao;
- }
- 
- bool AnalyserWaveform::initialise(TrackPointer tio, int sampleRate, int totalSamples) {
-@@ -115,7 +114,7 @@
- 
-     if (trackId != -1 && (missingWaveform || missingWavesummary)) {
-         QList<AnalysisDao::AnalysisInfo> analyses =
--                m_analysisDao->getAnalysesForTrack(trackId);
-+                m_pAnalysisDao->getAnalysesForTrack(trackId);
- 
-         QListIterator<AnalysisDao::AnalysisInfo> it(analyses);
-         while (it.hasNext()) {
-@@ -130,7 +129,7 @@
-                     missingWaveform = false;
-                 } else if (vc != WaveformFactory::VC_KEEP) {
-                     // remove all other Analysis except that one we should keep
--                    m_analysisDao->deleteAnalysis(analysis.analysisId);
-+                    m_pAnalysisDao->deleteAnalysis(analysis.analysisId);
-                 }
-             } if (analysis.type == AnalysisDao::TYPE_WAVESUMMARY) {
-                 vc = WaveformFactory::waveformSummaryVersionToVersionClass(analysis.version);
-@@ -140,7 +139,7 @@
-                     missingWavesummary = false;
-                 } else if (vc != WaveformFactory::VC_KEEP) {
-                     // remove all other Analysis except that one we should keep
--                    m_analysisDao->deleteAnalysis(analysis.analysisId);
-+                    m_pAnalysisDao->deleteAnalysis(analysis.analysisId);
-                 }
-             }
-         }
-@@ -273,13 +272,13 @@
-     tio->setWaveform(ConstWaveformPointer());
-     // Since clear() could delete the waveform, clear our pointer to the
-     // waveform's vector data first.
--    m_waveformData = NULL;
-+    m_waveformData = nullptr;
-     m_waveform.clear();
- 
-     tio->setWaveformSummary(ConstWaveformPointer());
-     // Since clear() could delete the waveform, clear our pointer to the
-     // waveform's vector data first.
--    m_waveformSummaryData = NULL;
-+    m_waveformSummaryData = nullptr;
-     m_waveformSummary.clear();
- }
- 
-@@ -295,7 +294,7 @@
-         m_waveform->setDescription(WaveformFactory::currentWaveformDescription());
-         // Since clear() could delete the waveform, clear our pointer to the
-         // waveform's vector data first.
--        m_waveformData = NULL;
-+        m_waveformData = nullptr;
-         m_waveform.clear();
-     }
- 
-@@ -306,7 +305,7 @@
-         m_waveformSummary->setDescription(WaveformFactory::currentWaveformSummaryDescription());
-         // Since clear() could delete the waveform, clear our pointer to the
-         // waveform's vector data first.
--        m_waveformSummaryData = NULL;
-+        m_waveformSummaryData = nullptr;
-         m_waveformSummary.clear();
-     }
- 
-diff -dNur a/src/analyserwaveform.h b/src/analyserwaveform.h
---- a/src/analyserwaveform.h	2017-02-04 21:14:33.266016824 +0100
-+++ b/src/analyserwaveform.h	2017-02-04 21:20:17.308598419 +0100
-@@ -4,12 +4,14 @@
- #include <QTime>
- #include <QImage>
- #include <QSqlDatabase>
-+
- #include <limits>
- 
- #include "configobject.h"
- #include "analyser.h"
- #include "waveform/waveform.h"
- #include "util/math.h"
-+#include "util/memory.h"
- 
- //NOTS vrince some test to segment sound, to apply color in the waveform
- //#define TEST_HEAT_MAP
-@@ -173,7 +175,7 @@
- 
-     QTime m_timer;
-     QSqlDatabase m_database;
--    AnalysisDao* m_analysisDao;
-+    std::unique_ptr<AnalysisDao> m_pAnalysisDao;
- 
- #ifdef TEST_HEAT_MAP
-     QImage* test_heatMap;
-diff -dNur a/src/util/memory.h b/src/util/memory.h
---- a/src/util/memory.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/src/util/memory.h	2017-02-04 22:19:41.846922929 +0100
-@@ -0,0 +1,149 @@
-+// Taken from https://github.com/bstreiff/cppbits
-+// Thank you Brandon Streiff!
-+
-+// Implementation of C++14's make_unique for C++11 compilers.
-+//
-+// This has been tested with:
-+// - MSVC 11.0 (Visual Studio 2012)
-+// - gcc 4.6.3
-+// - Xcode 4.4 (with clang "4.0")
-+//
-+// It is based off an implementation proposed by Stephan T. Lavavej for
-+// inclusion in the C++14 standard:
-+//    http://isocpp.org/files/papers/N3656.txt
-+// Where appropriate, it borrows the use of MSVC's _VARIADIC_EXPAND_0X macro
-+// machinery to compensate for lack of variadic templates.
-+//
-+// This file injects make_unique into the std namespace, which I acknowledge is
-+// technically forbidden ([C++11: 17.6.4.2.2.1/1]), but is necessary in order
-+// to have syntax compatibility with C++14.
-+//
-+// I perform compiler version checking for MSVC, gcc, and clang to ensure that
-+// we don't add make_unique if it is already there (instead, we include
-+// <memory> to get the compiler-provided one). You can override the compiler
-+// version checking by defining the symbol COMPILER_SUPPORTS_MAKE_UNIQUE.
-+//
-+//
-+// ===============================================================================
-+// This file is released into the public domain. See LICENCE for more information.
-+// ===============================================================================
-+
-+#ifndef MIXXX_UTIL_MEMORY_H
-+#define MIXXX_UTIL_MEMORY_H
-+
-+// If user hasn't specified COMPILER_SUPPORTS_MAKE_UNIQUE then try to figure out
-+// based on compiler version if std::make_unique is provided.
-+#if !defined(COMPILER_SUPPORTS_MAKE_UNIQUE)
-+   // Compiling with -std=c++11 sets __cplusplus=201103L and disables
-+   // std::make_unique() from C++14! We need to take this into account.
-+   #define CPLUSPLUS_SUPPORTS_MAKE_UNIQUE (__cplusplus > 201103L)
-+   #if defined(_MSC_VER)
-+      // std::make_unique was added in MSVC 12.0
-+      #if _MSC_VER >= 1800 // MSVC 12.0 (Visual Studio 2013)
-+         #define COMPILER_SUPPORTS_MAKE_UNIQUE
-+      #endif
-+   #elif defined(__clang__)
-+      // std::make_unique was added in clang 3.4, but not until Xcode 6.
-+      // Annoyingly, Apple makes the clang version defines match the version
-+      // of Xcode, not the version of clang.
-+      #define CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
-+      #if defined(__APPLE__) && CLANG_VERSION >= 60000 && CPLUSPLUS_SUPPORTS_MAKE_UNIQUE
-+         #define COMPILER_SUPPORTS_MAKE_UNIQUE
-+      #elif !defined(__APPLE__) && CLANG_VERSION >= 30400 && CPLUSPLUS_SUPPORTS_MAKE_UNIQUE
-+         #define COMPILER_SUPPORTS_MAKE_UNIQUE
-+      #endif
-+   #elif defined(__GNUC__)
-+      // std::make_unique was added in gcc 4.9
-+      #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-+      #if GCC_VERSION >= 40900 && CPLUSPLUS_SUPPORTS_MAKE_UNIQUE
-+         #define COMPILER_SUPPORTS_MAKE_UNIQUE
-+      #endif
-+   #endif
-+#endif
-+
-+#if defined(COMPILER_SUPPORTS_MAKE_UNIQUE)
-+
-+// If the compiler supports std::make_unique, then pull in <memory> to get it.
-+#include <memory>
-+
-+#else
-+
-+// Otherwise, the compiler doesn't provide it, so implement it ourselves.
-+
-+#include <cstddef>
-+#include <memory>
-+#include <type_traits>
-+#include <utility>
-+
-+namespace std {
-+
-+template<class _Ty> struct _Unique_if {
-+   typedef unique_ptr<_Ty> _Single_object;
-+};
-+
-+template<class _Ty> struct _Unique_if<_Ty[]> {
-+   typedef unique_ptr<_Ty[]> _Unknown_bound;
-+};
-+
-+template<class _Ty, size_t N> struct _Unique_if<_Ty[N]> {
-+   typedef void _Known_bound;
-+};
-+
-+//
-+// template< class T, class... Args >
-+// unique_ptr<T> make_unique( Args&&... args);
-+//
-+
-+#if defined(_MSC_VER) && (_MSC_VER < 1800)
-+
-+// Macro machinery because MSVC 11.0 doesn't support variadic templates.
-+// The _VARIADIC_EXPAND_0X stuff is defined in <xstddef>
-+#define _MAKE_UNIQUE( \
-+   TEMPLATE_LIST, PADDING_LIST, LIST, COMMA, X1, X2, X3, X4) \
-+   template<class _Ty COMMA LIST(_CLASS_TYPE)> inline \
-+      typename _Unique_if<_Ty>::_Single_object make_unique(LIST(_TYPE_REFREF_ARG)) \
-+   { \
-+      return unique_ptr<_Ty>(new _Ty(LIST(_FORWARD_ARG))); \
-+   } \
-+
-+_VARIADIC_EXPAND_0X(_MAKE_UNIQUE, , , , )
-+#undef _MAKE_UNIQUE
-+
-+#else // not MSVC 11.0 or earlier
-+
-+template<class _Ty, class... Args>
-+   typename _Unique_if<_Ty>::_Single_object
-+   make_unique(Args&&... args) {
-+      return unique_ptr<_Ty>(new _Ty(std::forward<Args>(args)...));
-+   }
-+
-+#endif
-+
-+// template< class T >
-+// unique_ptr<T> make_unique( std::size_t size );
-+
-+template<class _Ty>
-+   typename _Unique_if<_Ty>::_Unknown_bound
-+   make_unique(size_t n) {
-+      typedef typename remove_extent<_Ty>::type U;
-+      return unique_ptr<_Ty>(new U[n]());
-+   }
-+
-+// template< class T, class... Args >
-+// /* unspecified */ make_unique( Args&&... args ) = delete;
-+
-+// MSVC 11.0 doesn't support deleted functions, so the best we can do
-+// is simply not define the function.
-+#if !(defined(_MSC_VER) && (_MSC_VER < 1800))
-+
-+template<class T, class... Args>
-+   typename _Unique_if<T>::_Known_bound
-+   make_unique(Args&&...) = delete;
-+
-+#endif
-+
-+} // namespace std
-+
-+#endif // !COMPILER_SUPPORTS_MAKE_UNIQUE
-+
-+#endif /* MIXXX_UTIL_MEMORY_H */
diff --git a/media-sound/mixxx/files/mixxx-2.0.0-gcc62.patch b/media-sound/mixxx/files/mixxx-2.0.0-gcc62.patch
deleted file mode 100644
index c19c914b330e..000000000000
--- a/media-sound/mixxx/files/mixxx-2.0.0-gcc62.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/util/math.h	2015-12-29 17:10:41.000000000 +0100
-+++ b/src/util/math.h	2016-09-25 12:54:18.345291146 +0200
-@@ -3,8 +3,20 @@
- 
- // Causes MSVC to define M_PI and friends.
- // http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx
-+// Our SConscript defines this but check anyway.
-+#ifdef __WINDOWS__
-+#ifndef _USE_MATH_DEFINES
- #define _USE_MATH_DEFINES
--#include <cmath>
-+#endif
-+#endif
-+
-+#include <math.h>
-+#include <cmath> 
-+// Note: Because of our fpclassify hack, we actualy need to inlude both, 
-+// the c and the c++ version of the math header.  
-+// From GCC 6.1.1 math.h depends on cmath, which failes to compile if included 
-+// after our fpclassify hack 
-+
- #include <algorithm>
- 
- #include "util/assert.h"
diff --git a/media-sound/mixxx/files/mixxx-2.0.0-move-definition-of-time-formatseconds-into-dot-cpp-file.patch b/media-sound/mixxx/files/mixxx-2.0.0-move-definition-of-time-formatseconds-into-dot-cpp-file.patch
deleted file mode 100644
index 9a95a5d675ec..000000000000
--- a/media-sound/mixxx/files/mixxx-2.0.0-move-definition-of-time-formatseconds-into-dot-cpp-file.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From c2af9e6eeb469718b9aa069b90a719fac80dd0d9 Mon Sep 17 00:00:00 2001
-From: Uwe Klotz <uwe_klotz@web.de>
-Date: Fri, 8 Jan 2016 19:25:58 +0100
-Subject: [PATCH] Move definition of Time::formatSeconds() into .cpp file
-
----
- src/util/time.cpp | 30 ++++++++++++++++++++++++++++++
- src/util/time.h   | 29 +----------------------------
- 2 files changed, 31 insertions(+), 28 deletions(-)
-
-diff --git a/src/util/time.cpp b/src/util/time.cpp
-index 998fa73..d8a122b 100644
---- a/src/util/time.cpp
-+++ b/src/util/time.cpp
-@@ -6,3 +6,33 @@ LLTIMER Time::s_timer;
- bool Time::s_testMode = false;
- // static
- qint64 Time::s_testElapsed_nsecs = 0;
-+
-+// static
-+QString Time::formatSeconds(double dSeconds, bool showCentis) {
-+    if (dSeconds < 0) {
-+        return "?";
-+    }
-+
-+    const int days = static_cast<int>(dSeconds) / kSecondsPerDay;
-+    dSeconds -= days * kSecondsPerDay;
-+
-+    // NOTE(uklotzde): Time() constructs a 'null' object, but
-+    // we need 'zero' here.
-+    QTime t = QTime(0, 0).addMSecs(dSeconds * kMillisPerSecond);
-+
-+    QString formatString =
-+            (days > 0 ? (QString::number(days) %
-+                         QLatin1String("'d', ")) : QString()) %
-+            QLatin1String(days > 0 || t.hour() > 0 ? "hh:mm:ss" : "mm:ss") %
-+            QLatin1String(showCentis ? ".zzz" : "");
-+
-+    QString timeString = t.toString(formatString);
-+
-+    // The format string gives us milliseconds but we want
-+    // centiseconds. Slice one character off.
-+    if (showCentis) {
-+        timeString = timeString.left(timeString.length() - 1);
-+    }
-+
-+    return timeString;
-+}
-diff --git a/src/util/time.h b/src/util/time.h
-index 7b38eb4..b4e2c2d 100644
---- a/src/util/time.h
-+++ b/src/util/time.h
-@@ -67,34 +67,7 @@ class Time {
-     // The standard way of formatting a time in seconds. Used for display of
-     // track duration, etc. showCentis indicates whether to include
-     // centisecond-precision or to round to the nearest second.
--    static QString formatSeconds(double dSeconds, bool showCentis) {
--        if (dSeconds < 0) {
--            return "?";
--        }
--
--        const int days = static_cast<int>(dSeconds) / kSecondsPerDay;
--        dSeconds -= days * kSecondsPerDay;
--
--        // NOTE(uklotzde): Time() constructs a 'null' object, but
--        // we need 'zero' here.
--        QTime t = QTime(0, 0).addMSecs(dSeconds * kMillisPerSecond);
--
--        QString formatString =
--                (days > 0 ? (QString::number(days) %
--                             QLatin1String("'d', ")) : QString()) %
--                QLatin1String(days > 0 || t.hour() > 0 ? "hh:mm:ss" : "mm:ss") %
--                QLatin1String(showCentis ? ".zzz" : "");
--
--        QString timeString = t.toString(formatString);
--
--        // The format string gives us milliseconds but we want
--        // centiseconds. Slice one character off.
--        if (showCentis) {
--            timeString = timeString.left(timeString.length() - 1);
--        }
--
--        return timeString;
--    }
-+    static QString formatSeconds(double dSeconds, bool showCentis);
- 
-   private:
-     static LLTIMER s_timer;
diff --git a/media-sound/mixxx/files/mixxx-2.0.0-rmx2-backport-controller-scripts.patch b/media-sound/mixxx/files/mixxx-2.0.0-rmx2-backport-controller-scripts.patch
deleted file mode 100644
index a82f27166abc..000000000000
--- a/media-sound/mixxx/files/mixxx-2.0.0-rmx2-backport-controller-scripts.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-diff -dNur a/res/controllers/Hercules-DJ-Console-RMX-2-scripts.js b/res/controllers/Hercules-DJ-Console-RMX-2-scripts.js
---- a/res/controllers/Hercules-DJ-Console-RMX-2-scripts.js	2015-12-29 17:10:41.000000000 +0100
-+++ b/res/controllers/Hercules-DJ-Console-RMX-2-scripts.js	2017-02-04 22:01:01.629506434 +0100
-@@ -1,128 +1,159 @@
--/*╔══:::Made Lovingly By Circuitfry:::═════════════════════════════════╗
--  ║     Hercules DJConsole RMX 2 Mapping Scripts v. 0.1.3              ║
--  ╚════════════════════════════════════════════════════════════════════╝
--  * Version 0.1.0: Basic Midi Wizard Mapping
--  * Version 0.1.1: Partially-Functional platters (version 1).
--  * Version 0.1.2: Functional platters (version 1)
--  * Version 0.1.3: Functional EQ Kill/Pitch Bending buttons
--                   Functional Looping/Sample/Effect pads
--                   Bugfix: Source 2 Gain knob doesn't load tracks.
--                   Overhaul: MIDI Scripting file.
--    Worklog: Need to implement Microphone/Source1/Source2 input.
--  * Note 1: [DEP] Means the command is meant for Mixxx v1.10.x + below.
--  * Note 2: [FUT] Means the command is meant for Mixxx v1.11.x + above.
--*/
--function DJCRMX2(){}
--DJCRMX2.scratching = [];
-+/* ╔══:::Made Lovingly By Circuitfry:::═════════════════════════════════╗
-+ * ║     Hercules DJConsole RMX 2 Mapping Scripts                       ║
-+ * ╚════════════════════════════════════════════════════════════════════╝
-+ */
- 
--/*  [ Function init ] - Version 0.1.3
--  * Initiates some global variables and assigns an ID. Required.
--*/
--DJCRMX2.init = function(id){	
-- DJCRMX2.id = id;
-- DJCRMX2.scratching[1]=false;
-- DJCRMX2.scratching[2]=false;
-- engine.setValue("[Microphone]","enabled",0);
-- engine.setValue("[Microphone]","talkover",0);
-+function DJCRMX2() {}
-+DJCRMX2.decks = [];
-+
-+/* [ Function init ]
-+ * Initiates some global variables and assigns an ID. Required.
-+ */
-+DJCRMX2.init = function (id) {
-+    DJCRMX2.id = id;
-+    DJCRMX2.decks[1] = new DJCRMX2.Deck(1);
-+    DJCRMX2.decks[2] = new DJCRMX2.Deck(2);
-+    engine.setValue("[Microphone]", "enabled", 0);
-+    engine.setValue("[Microphone]", "talkover", 0);
- }
- 
--/*  [ Function wheelPress ] - Version 0.1.2
--  * Detects whether a jog wheel is pressed or not and sets a specific
--  * variable on and off accordingly.
--*/
--DJCRMX2.wheelPress = function (channel, control, value, status, group){
-- if (status == 0x90) // If status #144 is active (2 possibilities)
-- {
--  if (value == 0x7F) // And the jog wheel is pressed down:
--  {  /*  engine.scratchEnable(int,int,float,float,float,bool);
--       * [ int deck ]              Which track/platter is playing?
--       * [ int intervalsPerRev ]   # of MIDI signals sent in 1 spin.
--       * [ float rpm ]             Imaginary vinyl rotation speed.
--       * [ float alpha ]           Just a fine-tuning variable.
--       * [ float beta ]            Just a fine-tuning variable.
--       * [ bool ramp ]             As far as I know, nothing...
--     */
--      var alpha = 1.0/8;
--      var beta = alpha/32;
--      if(group=="[Channel1]")
--      {
--       engine.scratchEnable(1, 250, 50, alpha, beta);
--       DJCRMX2.scratching[1] = true; //[DEP]
--	  }
--	  if(group=="[Channel2]")
--	  {
--	   engine.scratchEnable(2, 250, 50, alpha, beta);
--	   DJCRMX2.scratching[2] = true; //[DEP]
--	  }
--      
--  }
--  if (value == 0x00 ) // If the jog wheel is released:
--  {
--   if(group=="[Channel1]")
--   {
--    DJCRMX2.scratching[1] = false; // <- v1.10.x and below
--    engine.scratchDisable(1);
--   }
--   if(group=="[Channel2]")
--   {
--    DJCRMX2.scratching[2] = false; // <- v1.10.x and below
--   engine.scratchDisable(2);
--   }
--  }
-- }
-- else //Default setting where button is not held down.
-- {
--  DJCRMX2.scratching[1] = false;  // Only for v1.10.x and below
--  DJCRMX2.scratching[2] = false;  // Only for v1.10.x and below
--  engine.scratchDisable(1);
--  engine.scratchDisable(2);
-- }
-- return;
-+////////////////////////////////////////////////////////////////////////
-+// Decks                                                              //
-+////////////////////////////////////////////////////////////////////////
-+
-+DJCRMX2.Deck = function(number) {
-+    this.number = number;
-+    this.group = "[Channel" + this.number + "]";
-+    this.scratchTimer = 0;
-+};
-+
-+DJCRMX2.Deck.prototype.wheelPress = function (value) {
-+    if (this.scratchTimer != 0) {
-+        // The wheel was touched again, reset the timer.
-+        engine.stopTimer(this.scratchTimer);
-+        this.scratchTimer = 0;
-+    }
-+    if (value == 0x7F) {
-+        // And the jog wheel is pressed down:
-+
-+         /*  engine.scratchEnable(int,int,float,float,float,bool);
-+         * [ int deck ]              Which track/platter is playing?
-+         * [ int intervalsPerRev ]   # of MIDI signals sent in 1 spin.
-+         * [ float rpm ]             Imaginary vinyl rotation speed.
-+         * [ float alpha ]           Just a fine-tuning variable.
-+         * [ float beta ]            Just a fine-tuning variable.
-+         * [ bool ramp ]             As far as I know, nothing...
-+         */
-+
-+         var alpha = 1.0 / 8;
-+         var beta = alpha / 32;
-+         engine.scratchEnable(this.number, 256, 33 + 1/3, alpha, beta);
-+    } else {
-+        // The wheel touch sensor can be overly sensitive, so don't release scratch mode right away.
-+        // Depending on how fast the platter was moving, lengthen the time we'll wait.
-+        var scratchRate = Math.abs(engine.getValue(this.group, "scratch2"));
-+        var inertiaTime = Math.pow(1.8, scratchRate) * 50;
-+        if (inertiaTime < 100) {
-+            // Just do it now.
-+            this.finishWheelPress();
-+        } else {         
-+            this.scratchTimer = engine.beginTimer(
-+                    100, "DJCRMX2.decks[" + this.number + "].finishWheelPress()", true);
-+        }
-+    }
-+}
-+
-+DJCRMX2.Deck.prototype.finishWheelPress = function() {
-+    this.scratchTimer = 0;
-+    var play = engine.getValue(this.group, "play");
-+    if (play != 0) {
-+        // If we are playing, just hand off to the engine.
-+        engine.scratchDisable(this.number, true);
-+    } else {
-+        // If things are paused, there will be a non-smooth handoff between scratching and jogging.
-+        // Instead, keep scratch on until the platter is not moving.
-+        var scratchRate = Math.abs(engine.getValue(this.group, "scratch2"));
-+        if (scratchRate < 0.01) {
-+            // The platter is basically stopped, now we can disable scratch and hand off to jogging.
-+            engine.scratchDisable(this.number, false);
-+        } else {
-+            // Check again soon.
-+            this.scratchTimer = engine.beginTimer(
-+                    100, "DJCRMX2.decks[" + this.number + "].finishWheelPress()", true);
-+        }
-+    }
-+};
-+
-+
-+/* [ Function wheelTurn ]
-+ * Pays attention to the current deck, checks scratching, affects the
-+ * song accordingly.
-+ */
-+DJCRMX2.Deck.prototype.wheelTurn = function (value) {
-+    var newValue = 0;
-+    // Spinning backwards = 127 or less (less meaning faster)
-+    // Spinning forwards  = 1 or more (more meaning faster)
-+    if (value - 64 > 0) {
-+        newValue = value - 128;
-+    } else {
-+        newValue = value;
-+    }
-+    
-+    if (engine.isScratching(this.number)) {
-+        engine.scratchTick(this.number, newValue);
-+    } else {
-+        engine.setValue(this.group, "jog", newValue);
-+    }   
- }
-+
-+/*  [ Function wheelPress ]
-+ * Detects whether a jog wheel is pressed or not and sets a specific
-+ * variable on and off accordingly.
-+ */
-+DJCRMX2.wheelPress = function (channel, control, value, status, group) {
-+    var deck = 0;     
-+    if (group == "[Channel1]") {
-+        deck = 1;
-+    } else  if (group == "[Channel2]") {
-+        deck = 2;
-+    } else {
-+        return; 
-+    }
-+    DJCRMX2.decks[deck].wheelPress(value);
-+}
-+
-  
--/*  [ Function wheelTurn ] - Version 0.1.2
--  * Pays attention to the current deck, checks scratching, affects the
--  * song accordingly.
--*/
--DJCRMX2.wheelTurn = function (channel, control, value, status, group){
-- var newValue=0;
-- // Spinning backwards = 127 or less (less meaning faster)
-- // Spinning forwards  = 1 or more (more meaning faster)
-- if (value-64 > 0) newValue = (value-128);
-- else newValue=value;
-- //if (!engine.isScratching(DJCRMX2.currentDeck)) // [FUT]
-- if(group=="[Channel1]")
-- {
--  if(DJCRMX2.scratching[1]==true) {engine.scratchTick(1,newValue);return;}
-- }
-- else if(group=="[Channel2]")
-- {
--  if(DJCRMX2.scratching[2]==true) {engine.scratchTick(2,newValue);return;}
-- }
-- engine.setValue(group, "jog", newValue);
-- return;
-+/* [ Function wheelTurn ]
-+ * Pays attention to the current deck, checks scratching, affects the
-+ * song accordingly.
-+ */
-+DJCRMX2.wheelTurn = function (channel, control, value, status, group) {
-+    var deck = 0;     
-+    if (group == "[Channel1]") {
-+        deck = 1;
-+    } else  if (group == "[Channel2]") {
-+        deck = 2;
-+    } else {
-+        return; 
-+    }
-+    DJCRMX2.decks[deck].wheelTurn(value);
- }
- 
--DJCRMX2.micSwitch = function (channel, control, value, status) //???
-+DJCRMX2.micSwitch = function (channel, control, value, status)
- {
-- if(status == 0x90 && control == 0x48 && value == 0x7F)
-- {
--  engine.setValue("[Microphone]","enabled",1);
--  engine.setValue("[Microphone]","talkover",1);
-- }
-- if(status == 0x90 && control == 0x48 && value == 0x00)
-- {
--  engine.setValue("[Microphone]","enabled",0);
--  engine.setValue("[Microphone]","talkover",0);
-- }
-+    if (status == 0x90 && control == 0x48 && value == 0x7F) {
-+        engine.setValue("[Microphone]","enabled",1);
-+        engine.setValue("[Microphone]","talkover",1);
-+    } else if (status == 0x90 && control == 0x48 && value == 0x00) {
-+        engine.setValue("[Microphone]","enabled",0);
-+        engine.setValue("[Microphone]","talkover",0);
-+    }
- }
- 
--/*  [ Function shutdown ] - Version 0.1.3
--  * Sets variables down for shutoff.
--*/
--DJCRMX2.shutdown = function(id){
-- DJCRMX2.scratching[1]=false;
-- DJCRMX2.scratching[2]=false;
-- engine.setValue("[Microphone]","enabled",0);
-- engine.setValue("[Microphone]","talkover",0);
-+/* [ Function shutdown ] - Version 0.1.3
-+ * Sets variables down for shutoff.
-+ */
-+DJCRMX2.shutdown = function (id) {
-+    engine.setValue("[Microphone]", "enabled", 0);
-+    engine.setValue("[Microphone]", "talkover", 0);
- }
diff --git a/media-sound/mixxx/files/mixxx-2.0.0-sqlite3.patch b/media-sound/mixxx/files/mixxx-2.0.0-sqlite3.patch
deleted file mode 100644
index a8cb15e63c65..000000000000
--- a/media-sound/mixxx/files/mixxx-2.0.0-sqlite3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/622776
-
---- mixxx-2.0.0/src/library/trackcollection.h
-+++ mixxx-2.0.0/src/library/trackcollection.h
-@@ -34,8 +34,7 @@
- #include "library/dao/libraryhashdao.h"
- 
- #ifdef __SQLITE3__
--typedef struct sqlite3_context sqlite3_context;
--typedef struct Mem sqlite3_value;
-+#include <sqlite3.h>
- #endif
- 
- class TrackInfoObject;
diff --git a/media-sound/mixxx/mixxx-2.0.0-r5.ebuild b/media-sound/mixxx/mixxx-2.0.0-r5.ebuild
deleted file mode 100644
index a8fcb5ca5c84..000000000000
--- a/media-sound/mixxx/mixxx-2.0.0-r5.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# 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/"
-SRC_URI="https://downloads.${PN}.org/${P}/${P}-src.tar.gz"
-
-# Upstream patches
-SRC_URI+=" https://github.com/mixxxdj/mixxx/commit/51d95ba58d99309f439cb7e2d1285cfb33aa0f63.patch -> ${PN}-2.0.0-ffmpeg30.patch"
-SRC_URI+=" https://github.com/mixxxdj/mixxx/commit/869e07067b15e09bf7ef886a8772afdfb79cbc3c.patch -> ${PN}-2.0.0-ffmpeg31.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aac debug 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/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=
-	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
-
-	"${DISTDIR}"/${P}-ffmpeg30.patch
-	"${DISTDIR}"/${P}-ffmpeg31.patch
-
-	"${FILESDIR}"/${P}-chromaprint-1.4.patch #604528
-	"${FILESDIR}"/${P}-gcc62.patch #595090
-
-	"${FILESDIR}"/${PN}-2.0.0-sqlite3.patch #622776
-
-	# The following patches were taken from sunny-overlay (bug #608430)
-	"${FILESDIR}"/${P}-fix-formatting-of-time-durations.patch
-	"${FILESDIR}"/${P}-eliminate-unnecessary-heap-allocation-of-qtime.patch
-	"${FILESDIR}"/${P}-fix-missing-pointer-initialization.patch
-	"${FILESDIR}"/${P}-move-definition-of-time-formatseconds-into-dot-cpp-file.patch
-	"${FILESDIR}"/${P}-fix-formatting-of-time-durations2.patch
-	"${FILESDIR}"/${P}-rmx2-backport-controller-scripts.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)"
-		qdebug="$(usex debug 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/mixxx/mixxx-2.1.1-r1.ebuild b/media-sound/mixxx/mixxx-2.1.1-r1.ebuild
index 6ddad2e85e46..6134b2177b39 100644
--- a/media-sound/mixxx/mixxx-2.1.1-r1.ebuild
+++ b/media-sound/mixxx/mixxx-2.1.1-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/mpc/Manifest b/media-sound/mpc/Manifest
index f1ccf597d7d2..7f1fbc20b666 100644
--- a/media-sound/mpc/Manifest
+++ b/media-sound/mpc/Manifest
@@ -1,5 +1,5 @@
-DIST mpc-0.27.tar.xz 113596 BLAKE2B ff4a16c64d750a9c1bab0f7f3d20486befb8b3e04857a65c9bddf8a3c624033e0f0f5e42ad01d285ae1370865e59a4babecd201c9b1b0b9e035a75aaf1fd35f1 SHA512 f73550004697c6d4ae44f25c82a9e4477fa878accb8725f58b74b2785c02b175a35e675c5484c58766e9032fe19beabd35a64c57cd1afd81478619d2f51916d4
 DIST mpc-0.28.tar.xz 109172 BLAKE2B de0155bd1d723c0affc02055fe8923a174d6a393e431bd71399e0c0833dda5488569fa90bbdb0c650a367bbc0c384d91215bc0997f013a372c0eae015d7acc27 SHA512 1d0c96c3c7cee2eac2d3cf25f09d74b5807b8ea56ff7dfc033b8fa690fd4d42de726a641e4f2552550d8a1c1b2840575aec5c595166ca5ae5776fcc93c8fb7cf
-EBUILD mpc-0.27.ebuild 774 BLAKE2B 4ca740cae22db9319d781bb37e94c99ab15d043f17fae915fa19a19040e1aefd4841f40e069275b508a2b659499d3b65fe4fa8a9aef5802addd98b068fb4a8cd SHA512 b4b324f241ffdfc289cb5713edc9f659eb6eed13b339c23fb54955b5bfda0894f052a4af5fc21ea828b914e18d06f6c95227fbd986ac40a115c00caa34dc1557
+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
 MISC metadata.xml 252 BLAKE2B 1b1288d9f4dd3db772b8fb0fedeaa7eade5e741424e44bbf206e13adc7917181f47e8c0cd76a19f6e115ea34d1da1cd5c5f0eef9e19e141cc79a903fd8a4f961 SHA512 8e302ca809c5fd04740c71e5d9e53786edbe46c487fcff77625a027b7922c099a4d187e853ad76965567e1d5a201ac98c6f3cef9ffe7e285b6dfde0c6df0cbdb
diff --git a/media-sound/mpc/mpc-0.27.ebuild b/media-sound/mpc/mpc-0.27.ebuild
deleted file mode 100644
index 81b1517d9708..000000000000
--- a/media-sound/mpc/mpc-0.27.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit bash-completion-r1
-
-DESCRIPTION="A commandline client for Music Player Daemon (media-sound/mpd)"
-HOMEPAGE="https://www.musicpd.org"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
-IUSE="iconv"
-
-RDEPEND=">=media-libs/libmpdclient-2.2
-	iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README doc/mpd-m3u-handler.sh doc/mppledit
-	doc/mpd-pls-handler.sh )
-
-src_configure() {
-	econf $(use_enable iconv) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-	newbashcomp doc/mpc-completion.bash ${PN}
-}
diff --git a/media-sound/mpc/mpc-0.30.ebuild b/media-sound/mpc/mpc-0.30.ebuild
new file mode 100644
index 000000000000..ba3eaf1311a8
--- /dev/null
+++ b/media-sound/mpc/mpc-0.30.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 meson
+
+DESCRIPTION="A commandline client for Music Player Daemon (media-sound/mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/mpc"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="iconv test"
+
+RDEPEND="media-libs/libmpdclient
+	iconv? ( virtual/libiconv )"
+
+DEPEND="${RDEPEND}
+	dev-python/sphinx
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+src_configure() {
+	local emesonargs=(
+		-Dtest=$(usex iconv true false)
+		-Diconv=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	newbashcomp contrib/mpc-completion.bash mpc
+}
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 9f2c4c07c147..9df53957a4e4 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 2867 BLAKE2B 8c76f99991b49e02c35ee366161caf885b8a174e921e0fd549a250aa1fa39f1e3251679a60b61682101bdf10f8f114afdf23218d15bacae63d661931d02f7e4c SHA512 1fd64df75c40f8d8efdaf8723f6a52c0aeb0e785c8f71356c1ad164712a851ee76e28f6edd098d7f2b30c54a9955fd63f4fd33ecc533d3c2d215756cba31f0a8
+EBUILD mpg123-1.25.10-r1.ebuild 2866 BLAKE2B 011b510ab5ae2ef22b95fa9d9ea9c24af778c5032f774fcc0c7c437fc31a5c5ae04061dc4412df339058a45a5c6577954cc3704eccd76a5735a6e7bdf9489922 SHA512 9fd464f4f0543f98922457b1574f2f5413f2293763eb23f6e7d41c75b5f2d185d32d52799d264726801263290132dcf24a16b6d8c2e562c28fa40da0e49c090d
 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 0a537ca16236..0c248cb9fa1e 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/pnmixer/Manifest b/media-sound/pnmixer/Manifest
index e99d11212ce4..363dc8c1307c 100644
--- a/media-sound/pnmixer/Manifest
+++ b/media-sound/pnmixer/Manifest
@@ -5,6 +5,6 @@ DIST pnmixer-0.7.1.tar.gz 237949 BLAKE2B 87b309f3dd844009abe5f5bb2c5ca16ba800699
 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 1012 BLAKE2B 7645e57a092ca24ac20a58de8f7e188bdf90adc87fbfee6dd66ab0b3798e7114691eb6d504b2ead562acd11d6454759cf5eaa60962c067cbf9e5ebd5e0a1e783 SHA512 6805e47533c0d29d989eda2938ce5c811538c23a02a348e5a6d4250fac01b9fd0aa6cdd78e6ad45e36055703a083cbf6678a2000785164219a1607569e0c708e
+EBUILD pnmixer-0.7.2.ebuild 1011 BLAKE2B 1c5377add2b165f28b9b6ecce20708ea7a7a5d8077f2c62fba07d6386c83b7edcb4d77b3512faec4abc9ccb08c9f986e4f008de3d6df7ded44914872568ef930 SHA512 d7046ec707e330ce05d41ed8c53db1cc4ac2a0cd5573066c42adcdaf6d99b3aaba0eceeb37887f614585e9f4c4681af8abe0406473f071901a6560e6fffff9da
 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.7.2.ebuild b/media-sound/pnmixer/pnmixer-0.7.2.ebuild
index 346e7d99739f..1b1841456cfb 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/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 1c3ee43115ec..8dbea3412ce9 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,8 +1,7 @@
-DIST pulseeffects-3.1.6.tar.gz 614441 BLAKE2B bb7461532785cd0ab79d0f506b5b9bcfc006779776e25870ce92b4af4e7cb0f7b3bcfe9c58180e52bdb9b9be20a14644ed8622fd3cc578dd3bdf9ff173c091b6 SHA512 efd9871c57f4b7152e4528927c7371e225980a09acacf4fcf939c468c7cb01b94b1bbb3c94cbd8879a6b41c7c4794ed5f45035a2b185b0a09b31515c964d4722
 DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
-DIST pulseeffects-4.3.1.tar.gz 1058711 BLAKE2B 917bf83014c84a1e2558f471ca93f31db4814f7dc3d09730c24b327f423bdb4f880bad57239bb7555384f12d7a6f03e26bf51b7aec462f8ce26992ccf59cfe71 SHA512 00305c8650e57963674e77b02a4e896f95f59d404901f3a684247ded95becf3c04fab35df83bc043e3f4f0ab601c98173c135b0b01bca22b520cf180f5bb20fb
-EBUILD pulseeffects-3.1.6.ebuild 1474 BLAKE2B c37c8cc5b72e9ea384d7e34fe107a9d8a22fbf45309328dd49f99cca01cf85629497399fa388eb94b1a31dceb1dcd5ab5544abf73eddba81edecb1ba749e5a87 SHA512 34755ef7a7b27df191a9044e34f68bef3807a50b5e691adcaba156014244c8f89bed6583fb1684f586e45058eb6ffca0aa1f0af26266884ee32920131b8379de
+DIST pulseeffects-4.3.4.tar.gz 1019739 BLAKE2B fd10afa51aca2f277f533d3eed2b8759911a8fb35953d087025d58f27ef9f0c3e541c8dac373f5a65a0e545e5ec64d1029e0968119165bab42fa860740229cbf SHA512 33700d3dbd6d7fd31b52a951bcaf99bb9887198f2c9b8143c4e8d9369ea77c30442493f0141a960c2703b84df3fe5271b34adcf350295968002e6bb5759d99d3
+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.3.1.ebuild 1551 BLAKE2B 379412fbb7666ef15c130838bb47d59934756dde1ad548bf045dfe86b6c5a41fd79a2569a47c43a8f291ec5ac5ee24ee5465871611163b6038654134a5df7b11 SHA512 f71084e6030630b9d77030dc798386d0498583a4ac6a3a49dc74410299eb2d1fe65da6dc9121a7048e6c59e778a763f8831d7829a3a9ec30ce74623322f454e3
-EBUILD pulseeffects-9999.ebuild 1556 BLAKE2B 4916a47b76b4206d9f8b285916dbdfe13684c8feb6bb707a212a2a4844972f18370aba90719d982a8c2f8af452519ee25b225515d038dfef89167d514a9ba6b6 SHA512 7b22ee540afbcb64ac52bab63c430c69744513279153a6c5f7d277b9e3cb3a94576b037bd8e8d2b8b52837b10cd958d1af62e731e7904dbcc0d13f087f6f33ef
+EBUILD pulseeffects-4.3.4.ebuild 1687 BLAKE2B 5d583fb97fd461eda2195f727af6446377db0fe51756aca577a3f242598959ba1008978bea0297fdda495e1ee47bcb8e464c905db912b673653638062962d851 SHA512 110ce51d9552c26580ec55fad83ae762af77053e118c104e76e04d8a7de37da99bf09709386ae06bc38cec61c3430bbfc2f087a4110acb895a3d1a6f5188602e
+EBUILD pulseeffects-9999.ebuild 1687 BLAKE2B 5d583fb97fd461eda2195f727af6446377db0fe51756aca577a3f242598959ba1008978bea0297fdda495e1ee47bcb8e464c905db912b673653638062962d851 SHA512 110ce51d9552c26580ec55fad83ae762af77053e118c104e76e04d8a7de37da99bf09709386ae06bc38cec61c3430bbfc2f087a4110acb895a3d1a6f5188602e
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-3.1.6.ebuild b/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild
index 2e478cefa85c..ea2fbb5e162d 100644
--- a/media-sound/pulseeffects/pulseeffects-3.1.6.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_REPO_URI="${HOMEPAGE}"
 else
 	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
@@ -30,18 +30,20 @@ DEPEND="
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	>=dev-python/gst-python-1.12.0:1.0[${PYTHON_USEDEP}]
-	media-plugins/swh-plugins
-	>=x11-libs/gtk+-3.18:3
+	>=x11-libs/gtk+-3.18:3[introspection]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	>=sci-libs/scipy-0.18[${PYTHON_USEDEP}]
 	>=media-libs/lilv-0.24.2-r1
 	>=media-plugins/calf-0.90.0[lv2]
 	>=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
+	>=media-libs/gst-plugins-bad-1.12.0:1.0[introspection]
+	>=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
+	dev-libs/appstream-glib
+	sys-devel/gettext
 "
 RDEPEND="${DEPEND}
 	media-sound/pulseaudio[equalizer]
diff --git a/media-sound/pulseeffects/pulseeffects-4.3.1.ebuild b/media-sound/pulseeffects/pulseeffects-4.3.4.ebuild
index 79ce00083ef9..33a78d46639a 100644
--- a/media-sound/pulseeffects/pulseeffects-4.3.1.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.3.4.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE="bs2b calf mda-lv2 rubberband"
 
 #TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-DEPEND="
+RDEPEND="
 	>=dev-libs/boost-1.41
 	>=dev-cpp/glibmm-2.56.0
 	>=dev-cpp/gtkmm-3.20:3.0
@@ -41,17 +41,18 @@ DEPEND="
 	mda-lv2? ( media-plugins/mda-lv2 )
 	rubberband? ( media-libs/rubberband )
 	>=media-libs/zita-convolver-3.0.0
-	dev-util/itstool
 	media-libs/libebur128
-"
-RDEPEND="${DEPEND}
 	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_preinst(){
-	gnome2_schemas_savelist
-}
-
 pkg_postinst(){
 	gnome2_gconf_install
 	gnome2_schemas_update
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
index 90b1ffc99215..33a78d46639a 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_REPO_URI="${HOMEPAGE}"
 else
 	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-3"
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE="bs2b calf mda-lv2 rubberband"
 
 #TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-DEPEND="
+RDEPEND="
 	>=dev-libs/boost-1.41
 	>=dev-cpp/glibmm-2.56.0
 	>=dev-cpp/gtkmm-3.20:3.0
@@ -41,17 +41,18 @@ DEPEND="
 	mda-lv2? ( media-plugins/mda-lv2 )
 	rubberband? ( media-libs/rubberband )
 	>=media-libs/zita-convolver-3.0.0
-	dev-util/itstool
 	media-libs/libebur128
-"
-RDEPEND="${DEPEND}
 	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_preinst(){
-	gnome2_schemas_savelist
-}
-
 pkg_postinst(){
 	gnome2_gconf_install
 	gnome2_schemas_update
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index cdf3995f6dd5..41387ffd5b48 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,10 +1,4 @@
-DIST qmmp-1.1.12.tar.bz2 1147871 BLAKE2B e511b02c38cbc5fcb478585df14a50c9f67985da9ef5e1e11557f2acbbd454d1b1beb430c8e2e2725a7d9ceea63243746fd41ecf2970fd3c52bcf21857bc1228 SHA512 a45680dcee478a7f03a04dbc87525368ac227a9de7e803252470f517027639d3426bf27a3235996d94ad68212596c03e7a67b5ad00a642532f02a820bf4097ee
-DIST qmmp-1.1.7.tar.bz2 1135005 BLAKE2B fc6574b5baa1aaf89cb13f194e59daafa0fe502c1e5ebe5322ae5564eeeb590b6f531307470dc93ef586d992ac827c114b89559ba83b6daab57d16e364388c53 SHA512 058187d34b848c0917077a167bcb52c63e39b5150409295ea658484d99fcd5582f7871979d3d3eea40aa97f0d9bf2a2d72ae721b827bcc0366b1bbc652aa3a72
-DIST qmmp-1.2.2.tar.bz2 1187439 BLAKE2B 984a1a38cc20500c07a928cc2a1cd5d0210307c0acaedc73b36d3d7d90fc9ddd1b7d84e8791ec7f2dfbfe1288c24b1e62dbadc191e6ef596863a3ec5ca777075 SHA512 deec5ad6e53222d390e5f147ac1dbf3f471c0266eb32315b9b334348ae10f54b88842ae016d95282a41d27592c46f3479c6f594dc8eccb330750025469b468b6
 DIST qmmp-1.2.3.tar.bz2 1187718 BLAKE2B f57eae68d25d709413a9cd33c48d82488be4e357eb472b19169f821ab96eba6babd75cf6d4492bade95ee590c17cb3dc789018782b136ee0829d337fb391008c SHA512 8daeae416b7c985450c7876145a896b88163608afd971f05eca9e4cbdea65039f21833836fe88cf1ceff253434370e3880c3ee7f30fe3ee7207fa8656a473d1e
-EBUILD qmmp-1.1.12.ebuild 3860 BLAKE2B 3ff315969c52877dfd02651bee97b01ba72ab00383a20f6183ad823e0242b3d4676bcc3d28c6a4c33c1c4a64810757f09d1add8b14d656354ddc81ae88ed19a3 SHA512 cb3b6e484f7f63f6659937362ad090a0534c759f4bcdffe9b8aa1161d1a3733bf3dc2b781bbe8650fdeba88d1b52a1f3db7fe0da0206c9137f161dc7bd99ff1f
-EBUILD qmmp-1.1.7-r1.ebuild 3858 BLAKE2B 544e062718ea06fb28e0920ef7d4c1ee1fa8ad850248a956df78054f1f63b06538af04cd8b09fb5f059af5748ce2530f8fb72dc33f902b1c6b5cfab9c8d62c28 SHA512 88a97842bd3b8f43409c420d391421845a45ce597e9334a6218b13bd36ce18dcc510f82dbe67f175e88ed8da5c8bb28eb3a526c0499f828041fadc9b6c3ba22a
-EBUILD qmmp-1.2.2.ebuild 4174 BLAKE2B f89ba88df7ddcca820028778416ece543951481e82bd6136a45e95349f934e2a3683e2c5dc5248c606c51e44d2eae4c1ef5686e8eec8a93ba1b2fd2ea958a538 SHA512 b33fbca7a5e380f08adcb182caf3772b30e3bdb092e88684e16b8298646b89fae14cb9ebbaf3f1292c2e44689863515d4f87bc944ff5e1f37ff1abd314a8bb49
 EBUILD qmmp-1.2.3.ebuild 4172 BLAKE2B 9db4f2b3d25b782c9e27eae6ae8d2f64b247634863ee3b58362401746c0004a66d9444f8a21efb86d79841136f5a22a10d40838e98ab83b4bce04ccce5d4dae4 SHA512 911c14441c370ae4494da1e9b0dacc28ad9b469eaab72fb99a5210af73760f2597c63a1ff844c10b0a2d8a17f270f6ec3b9196b0d08ed738ce9c640e061be6e8
 EBUILD qmmp-9999.ebuild 4174 BLAKE2B f89b2d24351b45622cd4f09b8883d549eb90f1b3d963c3dad4f9230e45fcbf720caa11a97acae7e881414dae61a2939da30a37dac3e24e9a09782fe303b9072f SHA512 7db78b91c76d766f8c5d0251ba3c1d5ee94a47427865b75bcf386f0d0d01969bb4ad169196b7acb8932dfd4d93b40eeb39c8b2e4e8cf4699ed5e92be1bd38b16
 MISC metadata.xml 1776 BLAKE2B acbe67572cda04be31f68a07539acc2f1124b789bd1986fcd0e17f7688c37d2248236467b9f04c6de04030c4ce59962e78741fad57d9bd993b1a893fcc58ecbc SHA512 92f5f391cadb3f602d950a52ba0c6e3e8b5ec844ed7d6ffd5bc1ac112fcb46f113ac8524676a1d8c482366703966edbd551a4906aba54af54ca0856e20215425
diff --git a/media-sound/qmmp/qmmp-1.1.12.ebuild b/media-sound/qmmp/qmmp-1.1.12.ebuild
deleted file mode 100644
index f3b0a524c058..000000000000
--- a/media-sound/qmmp/qmmp-1.1.12.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-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"
-	KEYWORDS="~amd64 ~x86"
-else
-	QMMP_DEV_BRANCH="1.1"
-	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 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 sid sndfile soxr stereo tray udisks +vorbis wavpack"
-
-REQUIRED_USE="gnome? ( dbus ) 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 )
-	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 )
-	sndfile? ( media-libs/libsndfile )
-	sid? ( >=media-libs/libsidplayfp-1.1.0 )
-	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_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_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_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
-}
diff --git a/media-sound/qmmp/qmmp-1.1.7-r1.ebuild b/media-sound/qmmp/qmmp-1.1.7-r1.ebuild
deleted file mode 100644
index 8f444940609f..000000000000
--- a/media-sound/qmmp/qmmp-1.1.7-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-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"
-	KEYWORDS="amd64 x86"
-else
-	QMMP_DEV_BRANCH="1.1"
-	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 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 sid sndfile soxr stereo tray udisks +vorbis wavpack"
-
-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 )
-	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 )
-	sndfile? ( media-libs/libsndfile )
-	sid? ( >=media-libs/libsidplayfp-1.1.0 )
-	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 )
-
-REQUIRED_USE="gnome? ( dbus ) udisks? ( dbus )"
-
-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_ALSA="$(usex alsa)"
-		-DUSE_AAC="$(usex aac)"
-		-DUSE_ANALYZER="$(usex analyzer)"
-		-DUSE_BS2B="$(usex bs2b)"
-		-DUSE_CDA="$(usex cdda)"
-		-DUSE_CROSSFADE="$(usex crossfade)"
-		-DUSE_COVER="$(usex cover)"
-		-DUSE_CUE="$(usex cue)"
-		-DUSE_CURL="$(usex curl)"
-		-DUSE_ENCA="$(usex enca)"
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_FLAC="$(usex flac)"
-		-DUSE_GME="$(usex game)"
-		-DUSE_GNOMEHOTKEY="$(usex gnome)"
-		-DUSE_HAL=OFF
-		-DUSE_JACK="$(usex jack)"
-		-DUSE_KDENOTIFY="$(usex dbus)"
-		-DUSE_LADSPA="$(usex ladspa)"
-		-DUSE_LYRICS="$(usex lyrics)"
-		-DUSE_MAD="$(usex mad)"
-		-DUSE_MIDI="$(usex midi)"
-		-DUSE_MPLAYER="$(usex mplayer)"
-		-DUSE_MMS="$(usex mms)"
-		-DUSE_MODPLUG="$(usex modplug)"
-		-DUSE_MPRIS="$(usex dbus)"
-		-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_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
-}
diff --git a/media-sound/qmmp/qmmp-1.2.2.ebuild b/media-sound/qmmp/qmmp-1.2.2.ebuild
deleted file mode 100644
index b0b24f039928..000000000000
--- a/media-sound/qmmp/qmmp-1.2.2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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"
-	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/qsynth/Manifest b/media-sound/qsynth/Manifest
index 5614bf50899b..055496241a8b 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -2,5 +2,5 @@ AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee3696
 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 1274 BLAKE2B 3ac1bda361a2b42726c1d686e876d7664ea40ca4819e31dfd0aeef1ccd3b20d87141557dfc2989398a8e01e2c2651cdca817eb6e76bb33a3ec49114c2ebd7da0 SHA512 2fa527e7d3ff57b6a6d4d64a4bd3a31edde1b26743da73228c59a1c62b7d025584de50ed46bde7360d1e96012f0a7741d48faf378df67c95b053f18467be3fb1
+EBUILD qsynth-0.5.0.ebuild 1273 BLAKE2B b18f4d30b82f444f8a1a17e43eb91a88cb01a2d7ef799a665ecd4229b109c2f11ddd00ae4aa8c745abf3bf636597dc292f56becb8b6e2f075cc4a2fdfd955878 SHA512 3bda963746bf43ed2e4844355b99f356e5beae590c026bc1bc021b8d0eecc12fa716b143a9c7e2ad02afa9a388eda504e00111fe7ae2d986a7eeb805778b3044
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.5.0.ebuild b/media-sound/qsynth/qsynth-0.5.0.ebuild
index d93b19597565..a702cf026ffe 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/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index e6f975f7af8d..a9833f000c04 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -2,6 +2,6 @@ DIST quodlibet-3.8.1.tar.gz 3697363 BLAKE2B 67c56281a998d93b2ea457656473ab7fc45a
 DIST quodlibet-3.9.1.tar.gz 3850929 BLAKE2B c4317521259f1d46e927276ee8bd927afd72708f7b6e260a68e2cfe6e949f44e08df5884f3613804955b18b7284f0140f9d2d409833bd0a139732728903ae978 SHA512 6d6b6380de2fc2d3ab1614b304f2d7219ff1d823e03f532baa0e9b1308fd36094ad745433494253d956182ae9914eb62846df3d3e5fea92dddccdaa725178563
 DIST quodlibet-4.1.0.tar.gz 4882607 BLAKE2B 1e0c519eb3f1d377dc7fc0ee2a08faa51632eabd1f21638e38aaf5edc4faa6707274edfe314910b32895e59a5cdd27434914afb1c33aa2914788e644db2d2aaf SHA512 987001b6335e18ce18d25b71be327261c3fe5e0a142395ce061d7460e9ade2543a3372a64560b804be3e4d70889017612e9bc1a72215d45b215caf4da545e9ae
 EBUILD quodlibet-3.8.1-r1.ebuild 1717 BLAKE2B 1d5a8105c82a70394a4602244c3d7734352c02c9ff4e4b32f0802d93a5f4f1bc355397b61f48c2e5ce0b79ddaa9145d39bef54f0f6698ad5b92805affb38d7b8 SHA512 784706ebf88f4a18e869ed4bb6a89ed78c2a5c9fef8b96d4c8358e11d122afcbf831b1028c2d47450b1cf89e0c6c379164cace47f6314045eb3ac9f600be7828
-EBUILD quodlibet-3.9.1.ebuild 1762 BLAKE2B a19a65c10150735cc5ac8b0ceea6fd38437065e1ff8041f4300574e6987a42a0e3c2231167e625d3e22a483a7755e63331d6de26dbd97bd0531c74006be81e19 SHA512 37131164403e18228e787385b04bf4cb517d340b48925a64b9bb83a561c84749542818ceea10915849406398762268d338a83cbbdbc5466184f82c13416130a0
+EBUILD quodlibet-3.9.1.ebuild 1761 BLAKE2B 9401568378a19461ac48fed948543c3adb820727023b9615f9ebd886499c9d2365c8fb3f4d5f140809f901cf27c0274942212c40d5603fc72ce5f315beca93b8 SHA512 ee39e47465a2fc58d608226ab9185b61e6d5e620a2c70afeb02cb5a18fbb46699d0e91deac731d3608a8ff827660203b82e7361c44e6eb142a19f9dcb3932479
 EBUILD quodlibet-4.1.0.ebuild 1611 BLAKE2B d1a37f206b0bc5014bdf3da1e361006c03916ad9fc6763a330651a4c44eebf45ad1dd0b406b92f4638f019e6f60293dec1440f63b8afe573c48e90100cbef8f3 SHA512 1caf57d3f99aae71e015db3ed126265e08b9a5a19bc4adbf86028a7e27cfe9c64a1fd3c4db18ec1f40258e2b405cb68f3e049aeae858ea95a908bc8797697644
 MISC metadata.xml 1136 BLAKE2B 372295e43337120cabfa3a28f260fa3feff8cce235240be1c65fc0a54922b294cc94124690fdb923d82f78c5866e82bc7becfad334c8e1ca3797b6602a9d0d80 SHA512 1466590147ca42dda2b5c11fe781a39e6d25d205b69fdba20663f1d1bfc2e251123c99990810727a36fbbd7a0c868bf1ddc51e94a38985719cef1bea71f07feb
diff --git a/media-sound/quodlibet/quodlibet-3.9.1.ebuild b/media-sound/quodlibet/quodlibet-3.9.1.ebuild
index 079481626d56..8539b1bc2f48 100644
--- a/media-sound/quodlibet/quodlibet-3.9.1.ebuild
+++ b/media-sound/quodlibet/quodlibet-3.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="+dbus gstreamer ipod +udev"
 
 RDEPEND="dev-libs/keybinder:3[introspection]
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index cad876cf2973..083ca06f46ab 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,7 +1,5 @@
 AUX notest.patch 1545 BLAKE2B f0d6f44eed7811ce3a9c12f1044844a806214489787b90d2d27590fc2bff746d2fb8511a75874e3bfbfd5c5563dd642534e904706dd029d057986344c207c900 SHA512 c3e9fbb8f1844d9faa35b318ffebfe6c64672f329ac584a101bf1e3c5736916666e7c100863de7db50f89b8f98b8a2e267e82e4aad457cbbaa875da0322bb0f6
 AUX piper.capnp 19756 BLAKE2B f852a7e9890e8e3fe3742115a10ffaa5d9793f48b37afc3d608f01f4548d799b00c7770186548384e9f5e85378c6b51167693cf25648aa5cdbf1e2ee353cce78 SHA512 c520116c978f8abbc747d3a465c006ec800cf1dd5f8f96f7c5879d88ae81fcc09f3a2640f9212b74f41f5b28269a17f35aac3521be946c66b599419c39a95720
-DIST sonic-visualiser-3.0.2.tar.gz 5123229 BLAKE2B 767be64ae74a47e2d1fb2e1b9a93384999c3567613f0b9662d3c5063fd0d951398c6bf4f3ce118545f83f707647461a92e152cabb0596a80dae0284f8415188c SHA512 25259df72175e397c63e76dca25f0099139c6569153c1e5750f90bcf5d661f20dd8c02aba53272567e72e661bfc66ec19cb3b3066795f978a6b76c826a5bf825
 DIST sonic-visualiser-3.1.1.tar.gz 5304359 BLAKE2B 79c9d1d55ea2ec939fdb7abe656ab81aae72862d139eda4e62037e0231c596cf725b4fd5741216e6413bc25e659798dee3b0e06f55063a9ad73f0d9204f76d84 SHA512 e83efffb62179e67a0e5fd7352f63f5a0210102a7fb38c5ad486479a3749f68a44fec2d1843d1c1ca826ba0004bf421811a270a0a50e3f89f71d956dc7a76ae7
-EBUILD sonic-visualiser-3.0.2.ebuild 2639 BLAKE2B 589b386d5d208d4d93d4ef6a160f233769ff89d9145a46d36426617586bb21176d105122cc94c80dc9b713f0063e69a8d129b59b70f094987a546fac7d378cc1 SHA512 c5704adef2c1ff04ef12e1b20a566e583a0d68deb6ffa1be41a7c0131030f77e329d0d59cd7df97b96f4d008e0684ff18ebe886879b311683738e2439c3153ac
 EBUILD sonic-visualiser-3.1.1.ebuild 2678 BLAKE2B 973202ef9f34738c2ede4ffebd589b5c9a75bf8af6609471e60a0d74b163562493fc469273a30575e4c0ee1fcfda0697d3539af7b7f330cd2c8c2915b7afc120 SHA512 2ae7a8242714a67ee0bb6ff2c2438e1ecb584439ce423b974bbe1c7baa85737a8a6e7d27395dbb57e073671e41fe1404bda4a65affb9b522d5f92b05dccb6d61
 MISC metadata.xml 353 BLAKE2B a43c47637d7677bb228f7f1be5c106785dc7fb429a831858e1dbcb222fc016676c855e888b31070a363c658d7904b80e09a0fd13c424f9d12ee4bbf9211ac023 SHA512 812f7ef25b8bde0654650ac3f3ddd1e18bfc828db0b5709fdf4c57017438ea118b7d7d14c9dd7006cb7fa63aeb72a25d155ec60beb0eca36bfbd292ecf5faa3f
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild
deleted file mode 100644
index e326ea97ed91..000000000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qmake-utils autotools xdg-utils
-
-DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="https://www.sonicvisualiser.org/"
-SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2222/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="id3tag jack mad ogg osc +portaudio pulseaudio"
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtxml:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	media-libs/libsndfile
-	media-libs/libsamplerate
-	app-arch/bzip2
-	>=media-libs/dssi-0.9.1
-	media-libs/liblrdf
-	media-libs/ladspa-sdk
-	media-libs/speex
-	>=media-libs/vamp-plugin-sdk-2.0
-	media-libs/rubberband
-	dev-libs/sord
-	dev-libs/serd
-	sci-libs/fftw:3.0
-	>=dev-libs/capnproto-0.6:=
-	osc? ( media-libs/liblo )
-	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	mad? ( media-libs/libmad )
-	id3tag? ( media-libs/libid3tag )
-	ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 )
-	pulseaudio? ( media-sound/pulseaudio )"
-
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( jack pulseaudio portaudio )"
-
-sv_disable_opt() {
-	einfo "Disabling $1"
-	for i in . svapp svcore svgui ; do
-		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
-	done
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/notest.patch"
-
-	use id3tag || sv_disable_opt id3tag
-	use jack || sv_disable_opt jack
-	use mad || sv_disable_opt mad
-	use ogg || sv_disable_opt fishsound
-	use ogg || sv_disable_opt oggz
-	use osc || sv_disable_opt liblo
-	use portaudio || sv_disable_opt portaudio
-	use pulseaudio || sv_disable_opt libpulse
-
-	eautoreconf
-
-	# Those need to be regenerated as they must match current capnproto version
-	einfo "Regenerating piper capnproto files"
-	rm -f piper-cpp/vamp-capnp/piper.capnp.* || die
-	mkdir -p piper/capnp || die
-	cp "${FILESDIR}/piper.capnp" piper/capnp/ || die
-	cd piper-cpp
-	emake vamp-capnp/piper.capnp.h
-}
-
-src_configure() {
-	export QMAKE="$(qt5_get_bindir)"/qmake
-	econf
-	eqmake5 -r sonic-visualiser.pro
-}
-
-src_test() {
-	for i in test-svcore-base test-svcore-data-fileio test-svcore-data-model ; do
-		einfo "Running ${i}"
-		./${i} || die
-	done
-}
-
-src_install() {
-	dobin ${PN} piper-vamp-simple-server piper-convert vamp-plugin-load-checker
-	dodoc README*
-	#install samples
-	insinto /usr/share/${PN}/samples
-	doins samples/*
-	# desktop entry
-	doicon icons/sv-icon.svg
-	domenu *.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index 15ffa6bd1d81..853a6d86eb64 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,5 +1,5 @@
 AUX ts3client-bin 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
-DIST TeamSpeak3-Client-linux_amd64-3.1.10.run 75971703 BLAKE2B 0b48b15d15af5b78d06a3c80b4aae964883bed5508685d22dbfeba30adecf5bc4b7e3dab54ca13f828eae7d2c24640037fb378581d726d81f4df26d5aa8f8929 SHA512 5a83c8a24e5af0353d15c28fdc8cfd840fbf071f5a25fbbc8f672bdec0afd374663826d42901329657596a6f3fa88774b3a1d9acad9fcc9fa0f41fc426043b3e
-DIST TeamSpeak3-Client-linux_x86-3.1.10.run 75706398 BLAKE2B 534079d00510d1d12fbdfd759b9e1f730da0afb4df813afaf389b2f63781d2d27bdaf6bc9ea1f3a92ab31b07a7f1bd190f647a1fc2491f43946396d2db68596f SHA512 81e70223c3257b74334b78928060bf7204ef4d79e5a09dd8b196c628361cdce88d6e8908bc99c2b40997d218fcfc0185073637275c1712a03b241537be3e56e6
-EBUILD teamspeak-client-3.1.10.ebuild 2459 BLAKE2B 606f7b03679d4b084d1e4362134b5d1adb11ea9d2f2ff3f4313e293cc53a919868c1883d6814693cdf634bcda3fbf121fd556a1f95b162dec082d89645060c57 SHA512 8b885ff34be1af8f9bb033707622d7a01cf2b5df1b27d61d733de21c7121728cb689a4683590b8b163263acc06b4edfee169c77544fcee8dcb523c4f72e57cf5
+DIST TeamSpeak3-Client-linux_amd64-3.2.1.run 76215644 BLAKE2B 81e3aa54f88182ff79113d994a2ef4d9e6d3ba38078879a19f21bca6637cf1d2f7bf7cf66a15edf957bc25413760f67d343db7fbbb8aa678e1aa55e8ae48d75c SHA512 b77d77daf8806bd48580abcc4721a6dbe5e30f55ed0ececc57215405d6607c3457d7ab628d4cb607d78c6f206f7093745842692176ca199bd95578f8b6fa81a8
+DIST TeamSpeak3-Client-linux_x86-3.2.1.run 75958520 BLAKE2B 2cdc92e740c3951d434f9545da670892b5f16c27fcf1c20b5fb9feb0d2bdbebabda08f2c8216b12a02a4248e685a006ef8f711ec7eb9f27e18550dc8f0e5422b SHA512 761210985b0c2f6674ae7da5bceb57783f7bba0827799fd291e951716ac7490aa3ee88d4030b985b67d5397353b459bceef42e6b41467513440ffeeaaa265d54
+EBUILD teamspeak-client-3.2.1.ebuild 2377 BLAKE2B 1231e4354854dfdba0fe4d78aa994cd5943e588487d83cc66c2b8b8137401a9eee0629b0a8738629263920fc3d181d44f306c4cc613728b3b33438c1a826950d SHA512 ef34b08bdebf7d1ce99b75a725b965f39b2fd6ef043495a23f223c0260d564032f594bb855a3b86face9592efd0df561e3113676fb660c726edea465499cb219
 MISC metadata.xml 756 BLAKE2B 24d27da6d88662420d55ced31434390eeb7cdb354bdd09c7ae9381c1317d69e6aba654098a11efe3a0a9f86f5dafa53302ef6ba09a84463ab4267a4bcb5cc260 SHA512 5fea4c3f3823d53bb3ab6d9c05fc8e468f45c7441276e94eabb05b680f6253a920d92fff8735433121814b1fe80bf5f51c60cd001b42e714cb10bb22a5609cca
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.1.10.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.2.1.ebuild
index 806dc9b21dca..f3e33c771106 100644
--- a/media-sound/teamspeak-client/teamspeak-client-3.1.10.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-3.2.1.ebuild
@@ -67,11 +67,8 @@ src_install() {
 	exeinto /opt/teamspeak3-client/soundbackends
 	doexe soundbackends/*.so
 
-	local folders=( "gfx" "html" "resources" "sound" "styles" "translations" )
-	for folder in ${folders[@]}; do
-		insinto /opt/teamspeak3-client
-		doins -r ${folder}
-	done
+	insinto /opt/teamspeak3-client
+	doins -r gfx html resources sound styles translations
 
 	dosym ../../usr/$(get_libdir)/qt5/libexec/QtWebEngineProcess /opt/teamspeak3-client/QtWebEngineProcess
 
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index 372fcd31834b..f1e1c49d765e 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -1,11 +1,10 @@
 AUX teamspeak.initd-r1 559 BLAKE2B fa37f29a3a03579d091da5cd01785dd93e15f38c070e06589619a3843ab85a86197be836ee0c8fe630c4ad8872c3efaf4e160b215a45cef3ebe8a07f9d749b82 SHA512 0fcfc65290ececdb3bf07cf2d88edeb325dc738aad6c7ae4ce0838fb272190f6a2667ed20a484fe92a0d4d9b529927b31a4df6ddcc2d4e917677f1d589d4f356
 AUX teamspeak.service 418 BLAKE2B fad43e28b976db44b290937654f3fa503a7a17dbba17e7d01c8931a18bf63615b0a125dec420f35e2517dacfd760750957997fcf58e69bcd2ca0721b4e2054ae SHA512 a31633591ae97224f3aefef25ed9d50e6cedf252c94559f7c424065ae815e0724c75e1c71337283933283cc77626d106ba5e15f3cce5c5dfddfc74a1f99160ba
-AUX teamspeak.tmpfiles 131 BLAKE2B a6bad602a95e98b46f55b06dc398bd9757b9e4b3aacc511295c2121790e8decd63a6ccae9d60ff915959cc4bbdb494eeeb5eb42f182f1b24b32bc7c5cceee3a7 SHA512 ecede9a97cf7701cbc96508ab8ed7cee0c4c041c45e48e3e53d5c3696458540ea00c81fb9a57e72d09839a96d808c287494b2a0629f143b6686f0291e046ec79
 AUX ts3db_mariadb.ini.sample 99 BLAKE2B 8b81805ac580ea892d4b05fc55787b850202545b911b11175932d2b3031dabcfa29d2bafe37742a05cea5e6dc8913abfdba140f9c2203515eb5da4444b3bbdd1 SHA512 60993fa58beb07f3304e7603abe91dba2e23e3f6868a6e2894bf55e1e79c358defd1a08523e6ade16d1eb1042aad1783c76c2dff8e6ce282d08d77800c3357db
 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.3.0.tar.bz2 8383889 BLAKE2B 7397f1c084c7487b613db7c2a71670320636b1c3c5fa353f255d721404dabee39f4f876440613772a1c784947393907c58fb7f275bf212ac3ae46957feb0c5a2 SHA512 375d1476fcbc507aec75a781ee071ccb99753290ecbfb2f2709c9a14556502f27adbbfc31abc9905e33eab3796a6addbde3f81e4714969e18204873c62c0647f
-DIST teamspeak3-server_linux_x86-3.3.0.tar.bz2 8257788 BLAKE2B d23dab70b2f847cf8c1e52b36dd72afa8c6f463b7439d3fd0b10e62586e6678c70eced16c934f87cd8fcc18ee1d2013189a9e60c56dfebf356bb4975f0fce821 SHA512 9b85b75d55f0ea2c89bfc0925de008268cb0c82894dc6909588dd2de6d0c271ad19102f7cc6f5d5f1143be3e3e9c56ac6206fb19d120eede1fc9f4ec67a58142
-EBUILD teamspeak-server-3.3.0.ebuild 3064 BLAKE2B 2dca7f778d55d2b29086f0defebbc23384e268e00ff4533ce63251d796013caa89b7d1308d84ba161757e53e13bd0781466c6c60fef2d90c5d94a727bad40630 SHA512 14b1c9e78433aa77f61f2f67e54ba3dcdcc001d1cd9ee7cd1f8b717cf9678cd9d4b777baf16b1bc34f1bae8fde60db049200de7d130505a0563252f362c26edd
+DIST teamspeak3-server_linux_amd64-3.3.1.tar.bz2 8415114 BLAKE2B 22908295d78677ecd09778c85b3e8dae6acd2170732759760884b76bb3614c4af8553910b9c62800bf5ab9cd32423acfe3c9bb476b7b6d7450330626f9f8ad8e SHA512 4335ed9a3ba11a8b26385f5c0b73c01da8c7374b3c0fa24bdeefc66bc297dd241e012ab30e9d0185c44a6c575a38d6c131dfdd8819147dd34f7e79d940ec49cb
+DIST teamspeak3-server_linux_x86-3.3.1.tar.bz2 8289228 BLAKE2B 3bdc1fcc29b9650ab6b1eda9d7cb9c201993fed0d194bf75071562d4f553b21098a31d1081113da7b8269056af4bcc3761acff17cf133c9fce874f63c2f4ec75 SHA512 734abdc9e0f3b6bda4fe5c71da51167745d2bdf56890a93c3b4d6d944231e9a561735224d4541f2b70584810aeca8f73f97334d26949fcd1000a708664c44eeb
+EBUILD teamspeak-server-3.3.1.ebuild 3064 BLAKE2B 2dca7f778d55d2b29086f0defebbc23384e268e00ff4533ce63251d796013caa89b7d1308d84ba161757e53e13bd0781466c6c60fef2d90c5d94a727bad40630 SHA512 14b1c9e78433aa77f61f2f67e54ba3dcdcc001d1cd9ee7cd1f8b717cf9678cd9d4b777baf16b1bc34f1bae8fde60db049200de7d130505a0563252f362c26edd
 MISC metadata.xml 822 BLAKE2B ac5c32d28c089f00c7ac508d60d90fff40313dcb4758145401d4ebc76dd53f449834373475e7437c37b8892be6d121be5c2ff1b20cbbdde9c110cab4e1a1f760 SHA512 7265c0f252a1b7e1e4e2901773b81fc7e96d0b6da39475f1e7c65a37c75188f86ce3da13b39a1cf8be46b9ad80945fc3a5755135d6bb2c63829d13a0d3c1dc10
diff --git a/media-sound/teamspeak-server/files/teamspeak.tmpfiles b/media-sound/teamspeak-server/files/teamspeak.tmpfiles
deleted file mode 100644
index 1b1d7f0e9902..000000000000
--- a/media-sound/teamspeak-server/files/teamspeak.tmpfiles
+++ /dev/null
@@ -1,4 +0,0 @@
-# systemd tmpfile settings for teamspeak3-server
-# See tmpfiles.d(5) for details
-
-d /var/run/teamspeak3 0755 teamspeak teamspeak -
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.3.0.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.3.1.ebuild
index e8110a9eba1a..e8110a9eba1a 100644
--- a/media-sound/teamspeak-server/teamspeak-server-3.3.0.ebuild
+++ b/media-sound/teamspeak-server/teamspeak-server-3.3.1.ebuild
diff --git a/media-sound/tempest_for_eliza/Manifest b/media-sound/tempest_for_eliza/Manifest
index 9c66c313c853..4cb301276d82 100644
--- a/media-sound/tempest_for_eliza/Manifest
+++ b/media-sound/tempest_for_eliza/Manifest
@@ -1,3 +1,4 @@
 DIST tempest_for_eliza-1.0.5.tar.gz 45046 BLAKE2B 4e5be0142ee7ab7cbee5e5c4bbe6e8c035928c342cc78ba733853a826736fa125bcd20e6230a61574fa6a146500518e644c5c9a7cd4cbc5544e7be0b34e0b56d SHA512 f14aec8427f1f9a7cfe59e2165e2d7b1a5d963c807755ec2299a0fa2f36492b3fb4240b0b4fce54cc9957cf4d3709839bc40035594fcb2568247bcb62b4614f9
 EBUILD tempest_for_eliza-1.0.5-r1.ebuild 795 BLAKE2B 30e58d25b0c02413bf8134ff4064dce867858d7f30ab0d224791f212c02189d79457f258128de70b4baa06d27b7b005c95089dc78ed2f9243f058edd204d232e SHA512 539ed37510b41e3e9105e7db06bd62788f1f2a95c6d669fe3f071b1244334b30e3fd9346dc179cfad8e147c4a00c86d6b63a18a946bdf948dd7d76b9c5866d4d
+EBUILD tempest_for_eliza-1.0.5-r2.ebuild 669 BLAKE2B 777c4a1572c2b76279e337baaede292c37878177d460f335affeaa01aca96ff79d9f1015fbc4e73b7fcf5600704d5f31c477516aa7e4a7195c837e0621c54381 SHA512 1621bd34dd8e2b94114219f719c9256ab43b17f1690ea20194005e6c1e1ff7a3e25864dd4fd7694022a145c6adde78190f236e2b1149bc6b2540acd25387ba60
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r2.ebuild b/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r2.ebuild
new file mode 100644
index 000000000000..c1f630a8951e
--- /dev/null
+++ b/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Listen to music on the radio generated by images on your screen"
+HOMEPAGE="http://www.erikyyy.de/tempest/"
+SRC_URI="http://www.erikyyy.de/tempest/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="media-libs/libsdl"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	tc-export CXX
+	econf \
+		--enable-debug \
+		--enable-nowarnerror
+}
+
+src_compile() {
+	emake CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	default
+	rm songs/Makefile* || die
+	insinto /usr/share/${PN}
+	doins songs/*
+}
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 096398c86381..5e21d85e7087 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -16,5 +16,5 @@ AUX timidity.service 190 BLAKE2B 909311fae666b9970a8b4d56e1848f907ffeff1fc9e0cac
 AUX timidity.xpm 1522 BLAKE2B 9aee528dbf843d992d548adc923f817373013760128ae96df7becb6bc844a95ddc056b072dbaea1528d9db5c2d4836b09f8316b740c75033fc23a0bb76186fab SHA512 1630fc235e450e5420c598357ad98eed6f04b1d1035fd6284dfeb2e633ce5d80135f89ea593d58b4eac2b9405383787e4d891b9c22ff8b5ac3ece64e9abe7d4e
 DIST TiMidity++-2.14.0.tar.xz 1356476 BLAKE2B 8d4a360d1c16b250f3bef7c010e1e263fdda13446437ff2454dc2c2a717246c4d27836a3b40586b12b33e175bc54ee211a3a1798005733461cf5833eda11811a SHA512 d8fc06fa36e4dd42de80c61943da4cd9aec5f8aaf31057a9ededa633d2d48e64c4e53391378d82a7a46ffe4f96c756b010ea9727270f80b134ae1f8bad535bd3
 EBUILD timidity++-2.14.0-r2.ebuild 5120 BLAKE2B ea61c55377c185c5b8f5ef21f65805903ab81a816932fe356d438bc91e06768ba93a2e0742079322aaef32870350999f1a8dac5898626e07b3c09cc00c4fdfd3 SHA512 331162f1be948e0ad0f8c3d05ace64d654991225cbb654957519b932ed4687a79234381bcdcf6ecd0cad9add9c3575b3d019d10f8725e76ffee8c2992a7ecf16
-EBUILD timidity++-2.14.0-r3.ebuild 5295 BLAKE2B 0e30f8152955babe3937c6649323d63948e2b0934cb3236e81a75fc03c78a68ac2ffee3eee7260d8ef6286c3fd7d0da314e7ba191f63c24b0dd07da1769b1050 SHA512 2f7555e7f481b071169f983f1a8c6a5a3cd08fd3e9f89b8f7bda729315e7738b16d2288fe785e3f90205ef3afa705332c882575eb3c5e1dc5025472c1873967a
+EBUILD timidity++-2.14.0-r3.ebuild 5317 BLAKE2B b708c93a6b944ca3e6f248dbfb454e962b272891787d81dc375d27b3a3b0db99193bec1639c738496e47d55200c7eec97f4ac1fa618fef768906334bdeae1830 SHA512 45bcefe69f07d111af5a37c96b3a36cc3fe7ff175823a4db49973b540a18f14d2f93a71f5251bc36ec4367d810869c698fcc7d54261d293e14427bb760aa11d0
 MISC metadata.xml 331 BLAKE2B 0e52df0230422381a5982f075e39f00e982f9948a3d3309d183bbac93569d908fe3603082f11943fc35e3b8bd1c76bc131e7525c91e3aac5b7d9461093686f71 SHA512 b4559e92a59ba70b25863304bbdc59225c6ccbf3ee9ab8516db6987a19e8b5b7b6ea95f40c9ff55ed33c194ab174360d5f8fd6bfafa43290bb97a3a2093289e3
diff --git a/media-sound/timidity++/timidity++-2.14.0-r3.ebuild b/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
index a26a24cc91ef..dabcdf61ba8f 100644
--- a/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
+++ b/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
@@ -15,8 +15,10 @@ SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="motif oss nas X gtk vorbis tk slang alsa jack emacs ao selinux speex flac ncurses"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X"
+
+REQUIRED_USE="tk? ( X )"
 
 DEPEND="
 	alsa? ( media-libs/alsa-lib )
diff --git a/media-sound/wavsplit/Manifest b/media-sound/wavsplit/Manifest
index 37a56b1396ed..c76756f76cea 100644
--- a/media-sound/wavsplit/Manifest
+++ b/media-sound/wavsplit/Manifest
@@ -1,6 +1,7 @@
-AUX wavsplit-1.2.1-64bit.patch 1929 BLAKE2B 1bb5b423414d402a1bad1d017d9cecf96cafaf15173e233ab33fe4b7db42e600ff51b3f6ea934cdfd3c60ccb4e95b0fb03585449f42c56f0ee62afde23f9f21a SHA512 801fdabbb89c19899b20b15b87ff412d33ee37dacd78b8fd62683bcbdb97b3945ae549aaa041bcf93442eb9f023feacb537c1c9763cd80900620c23ea99e7038
-AUX wavsplit-1.2.1-Makefile.patch 495 BLAKE2B 70159245c96d09a4070eadad2d0882d4b99dd262f5fc1decc761f71fe30ee0c2dfb9c07d75c9024eab27cdbfe3696b1c1c77bc12aded79208d846229a189398b SHA512 3e72e39a8ece459d9acf3079231d20da99f9091c0215e7ca0ac27105bdde27caba05bb78666d97bc2dd06a276a63aa0cebccd567b1b72b6e8c5d8c230d94de81
-AUX wavsplit-1.2.1-large-files.patch 6265 BLAKE2B 0c4b76620e0f31ce65fc44d34bfd4ed3536ae17ed9c2d02a4cb71189a563a67788af89c6b9747b450f0b359610f1940e95833f584542e78a2268aa9fb2638cdb SHA512 8a2db26a87396eb57f16b379575949784e0ddca8d64b8c91d4478e38603dd351e957c4271499e8ef9f9e10710f7f6f0b01a82c517d808b224b9a5b3db5317b35
+AUX wavsplit-1.2.1-64bit.patch 1929 BLAKE2B 66e6e92a9f5c090bb383cd582cd9ff2310f088d025582429cb9e64430e707dcf068c763c3ce0641a481a18ef1e16c3d8898adddb991af85098b9fe8a7a20ec2a SHA512 7b8d27a4bbc3ac0099132f2729a03f60cc74e8371b74824d4f481c1d3d4ce0f9f9518935b180019f761d315f717ed311484c06ee3ecc1c0262752fd97960461b
+AUX wavsplit-1.2.1-Makefile.patch 495 BLAKE2B 8aa9ac0991630cca8d8720af33d1649b788f00cb1c171acfc77f4b04de1dc157e581eeefc3025a3b498000f8e331a910680096877462b0545632d2a3130224a2 SHA512 53bb5a83d30429f616f4d2274516741b5454fec82befe3bb5399d7d3d5a7f00160474dbb1104375de7cef090dc96719cb0f8c39cc72eeaada7974a53c22d4ec7
+AUX wavsplit-1.2.1-large-files.patch 6277 BLAKE2B 01e763a872a321aa6e477c7324ead458d358dfca3c2c26bc491615c66fdf10d8d1ee386baada563c7be8107e7c144d7931113547bc17d5ba4f2c8c97c23cbe16 SHA512 06d1250034e09c4a1937742ec992a4d42fe296034c59c5ea40131f093a574d9894b66b9a0217bf424f8171e779cf7a08fd45955bd36e183b6b698e0c33e6586e
 DIST wavsplit-1.2.1.tar.gz 32246 BLAKE2B 38e9e4f27c0adef12ece224224765a60442f34fa4a7ef5af1416071374a5c1f8f4908836fe568c6e046472da26abd51c6ba91a03f0ca10acea5b73a04f961859 SHA512 df0e4bf867fb19e50a8be10f13ed6f4c40e848106c6053661f7226e9893715f0318af4b19bf289b840dbf72768b8508af38351c24725cf3eb81a9f3dbcd27a19
 EBUILD wavsplit-1.2.1-r1.ebuild 812 BLAKE2B aaa5b7deb1621a68561374b0bbe1a5c88fa4994b58d862faf722d13da3182b22f0c46c17fdbfecbd51b7f689642fff61ab04985f79e27030f6099d1cc75c813e SHA512 a5dc805776a23e54bcdde8057503ffc00bf4c78fb34a4870eb2d2338b6c55861d113b06b066ce8036527d0bbfc8f0f57fabcd138f9c29f092084654e14e9f2e8
+EBUILD wavsplit-1.2.1-r2.ebuild 766 BLAKE2B c8dfc4b388ecc6059f28c81ace1ef016c4c5213bdc8236cde0d9cc3e3b2365833f30a709f63d7ea81f51cf38477bfd3ecb96ada18893b745062e732c72e5e7b2 SHA512 9998be51fef2424dd4e2fecad87089ac582935cd152469c4ee782a26ac5ee3db6c58632616571c20d14da6f44a7cff8b71775f125cbb0e238accc11dbde973b0
 MISC metadata.xml 331 BLAKE2B 53308e6ee29eac8d7573ff409099d4825985af37eb40f30b78523891f0fd7fce3628c30e559935e5506c6a8139a5dba45bf0303305222055891c1932bc2e46f3 SHA512 c9839a79cbe27caf7ce682e8b6db6e6b0abda1b1ee643820272f78026f6f7695e641980cbed35d8a89a050ff778d715bc7e7960bdef04fd4e1a29b355fba08f2
diff --git a/media-sound/wavsplit/files/wavsplit-1.2.1-64bit.patch b/media-sound/wavsplit/files/wavsplit-1.2.1-64bit.patch
index abfaf424113b..fe6294eb3523 100644
--- a/media-sound/wavsplit/files/wavsplit-1.2.1-64bit.patch
+++ b/media-sound/wavsplit/files/wavsplit-1.2.1-64bit.patch
@@ -1,5 +1,5 @@
---- bak/wavsplit.c	2006-11-24 17:53:36.056883000 +0100
-+++ wavsplit.c	2006-11-24 17:52:38.345276250 +0100
+--- a/wavsplit.c	2006-11-24 17:53:36.056883000 +0100
++++ b/wavsplit.c	2006-11-24 17:52:38.345276250 +0100
 @@ -403,7 +403,7 @@
    ptr += 4;                     /* we move past fmt_ */
    memcpy (&waveformat, ptr, sizeof (WAVEFORMAT));
@@ -27,8 +27,8 @@
      printf ("Samplebits: %d\n", waveformat.wBitsPerSample);
      printf ("Databytes: %llu\n\n", databytes);
      printf ("Split         Hours  Mins   Seconds         Bytes         %%\n");
---- bak/wavsplit.h	2006-11-24 17:53:36.056883000 +0100
-+++ wavsplit.h	2006-11-24 17:43:58.648797250 +0100
+--- a/wavsplit.h	2006-11-24 17:53:36.056883000 +0100
++++ b/wavsplit.h	2006-11-24 17:43:58.648797250 +0100
 @@ -46,29 +46,29 @@
  } TIMEFORMAT;
  
diff --git a/media-sound/wavsplit/files/wavsplit-1.2.1-Makefile.patch b/media-sound/wavsplit/files/wavsplit-1.2.1-Makefile.patch
index a4b35a64fefe..4cac4b657b70 100644
--- a/media-sound/wavsplit/files/wavsplit-1.2.1-Makefile.patch
+++ b/media-sound/wavsplit/files/wavsplit-1.2.1-Makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2006-03-30 08:54:03.000000000 +0200
-+++ Makefile	2006-03-30 08:55:04.000000000 +0200
+--- a/Makefile	2006-03-30 08:54:03.000000000 +0200
++++ b/Makefile	2006-03-30 08:55:04.000000000 +0200
 @@ -6,16 +6,16 @@
  version = 1.2.1
  
diff --git a/media-sound/wavsplit/files/wavsplit-1.2.1-large-files.patch b/media-sound/wavsplit/files/wavsplit-1.2.1-large-files.patch
index ff27231be65e..cfc7e9d41b68 100644
--- a/media-sound/wavsplit/files/wavsplit-1.2.1-large-files.patch
+++ b/media-sound/wavsplit/files/wavsplit-1.2.1-large-files.patch
@@ -1,5 +1,5 @@
---- Makefile	2004-11-17 23:19:17.000000000 +0100
-+++ Makefile	2005-01-16 21:23:33.000000000 +0100
+--- a/Makefile	2004-11-17 23:19:17.000000000 +0100
++++ b/Makefile	2005-01-16 21:23:33.000000000 +0100
 @@ -6,7 +6,7 @@
  version = 1.2.1
  
@@ -9,8 +9,8 @@
  LIBS = -lm
  
  all: wavsplit wavren
---- wavsplit.c	2004-11-17 23:19:17.000000000 +0100
-+++ wavsplit.c	2005-01-16 22:04:39.000000000 +0100
+--- a/wavsplit.c	2004-11-17 23:19:17.000000000 +0100
++++ b/wavsplit.c	2005-01-16 22:04:39.000000000 +0100
 @@ -269,9 +269,9 @@
             timepos * split)
  {
@@ -161,8 +161,8 @@
  
    while (to_be_read) {
      n_read = read (ifd, buf, to_be_read);
---- wavsplit.h	2004-11-17 23:19:17.000000000 +0100
-+++ wavsplit.h	2005-01-16 21:23:33.000000000 +0100
+--- a/wavsplit.h	2004-11-17 23:19:17.000000000 +0100
++++ b/wavsplit.h	2005-01-16 21:23:33.000000000 +0100
 @@ -121,15 +121,15 @@
  static int split (unsigned int UseHours, unsigned int UseFrames,
                    unsigned int fps, unsigned int UseTrackLens,
diff --git a/media-sound/wavsplit/wavsplit-1.2.1-r2.ebuild b/media-sound/wavsplit/wavsplit-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..7e422e4d3fa0
--- /dev/null
+++ b/media-sound/wavsplit/wavsplit-1.2.1-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simple command line tool to split WAV files"
+HOMEPAGE="https://sourceforge.net/projects/wavsplit/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+#-sparc, -amd64: 1.0: "Only supports PCM wave format" error message.
+KEYWORDS="~amd64 -sparc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-large-files.patch
+	"${FILESDIR}"/${P}-64bit.patch
+)
+
+src_prepare() {
+	default
+	emake clean
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_test() { :; } #294302
+
+src_install() {
+	dobin wav{ren,split}
+	doman wav{ren,split}.1
+	dodoc BUGS CHANGES CREDITS README{,.wavren}
+}
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index f6c7c1cabb04..456d2238db4b 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 7579 BLAKE2B 771176b840e47bac4d3da6f9ecede74410568ced36c24bfae997b0ebe92a21ba2fbbd2945c74c6cb0c52fe73d56dfff9494fb3f877b77de0594097dac6eff5ad SHA512 edb2dea6a212dbc420d3b087dba4f3d2cfc6a7035d96e951fa52bacd9e5868a487d0e73f6b2a43117fdb1ae43474c804a6a8854d4eedbe9418c9272c63c73455
+EBUILD xmms2-0.8_p20161122-r4.ebuild 7578 BLAKE2B f6e14dbadb3292107c596d206c4149582fa39e29ef6883e03ec47387f91c56915e2ca9f294641debf31c0578968f2515b3295c62cea7c6ec838b32b6d95ab219 SHA512 b7bd69e5c75a83f8ca8fcb45a715b019fb66b42ebc39d5ee5a8fdfba7ab491f8427945539223420b705fb5be536005ea0c1b6625eeb514d24a9e3f6cfec9c9ae
 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 95780ab4116d..b59e71f168cb 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
author	V3n3RiX <venerix@redcorelinux.org>	2018-09-08 10:50:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-09-08 10:50:14 +0100
commit	3f71901f8c228f4de570abed1831ce3ee425343e (patch)
tree	a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /media-sound
parent	12bb627384ddfd47382b9f1b6464481a58d01ebb (diff)