gentoo resync : 25.08.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-08-25 07:36:27 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-08-25 07:36:27 +0100
commit: 43793fab84041cfc5c60c0151d1591b8a69fb24a (patch)
tree: 6208a7f4fc744684fce0f55acbb47511acace498 /media-sound
parent: 28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff)
95 files changed, 2213 insertions, 690 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 7a5caf7d522a..c20491e3cb2d 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index c666aadef109..3b94842bfab3 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,13 +1,10 @@
 AUX audacity-2.2.1-portmixer.patch 776 BLAKE2B 18e5e3a3394c2a56afd9314993bde41376a59bc7c480b159ca9d14ff812f507de32018d5b28ee9a2cdd4f3b5f1a6e420e85f3d8660c0fa0e28941f6fdce9fb6a SHA512 f00fdd46150181873bc4aa24f95b3491471198429f47fae2d4f79f0f360a642adf94936dcf63bb02e84f9581d87c05dc8d93ed37eddaf43e31d900d505b50805
-AUX audacity-2.2.1-without-libid3tag.patch 2911 BLAKE2B f8e27cba92376c09ddafe60a160064439ffa6f53d8db6a53cd5bb0db1a00d11fb52db01811de702612438e00f6ca825e7827e254033374187edb305d628bb414 SHA512 307e418d73fe1fd0aae0b9d303499b7a38ccc16290dc3548bda5b24525d5a9b5b10c9db8306ef442826668ef3f5f95f7db6b967ac07ded6934d0f38e2462e30d
 AUX audacity-2.2.2-automake.patch 916 BLAKE2B 8de3bb400bebcfcd1b2e51ce8ada2d24e9524b56219f31bd9181e6c6c6c7382aee3d32bfb2024b7d3155f9f2464c541c5e12c7e395ce3fd9197234db8347b4d1 SHA512 2e89f45595674c3388648a6aeac4f43b82fdda2f5ba8efda2d2d98a11be2a76cab5cd0d8a87d8e581810a6ed3984d88b01e7462b51544dea550952ab563defca
 AUX audacity-2.2.2-midi.patch 4999 BLAKE2B 74e99c16abbd64f4f74ccc1dc4e76a156d492e0f8d929e8e47bf12f574741fdf052ad7c9b780fb8c578790c505990d42712239470bacc5ba132dbdcb8fa3bc78 SHA512 5c0f9ca7d25ac2c15cc12a643408066eb7b320fb7c1476d9169be25128b3a4b682ed77e9d101923c7c6df187571874b9e67635d98472e875b7520053909b271a
 DIST audacity-help-2.1.3.zip 20682229 BLAKE2B f3a7c5870c2fd10e5d1420c03ea608d39e9768989ac106b6b1554994646200fb58550bb07ba889002dc652e9c2ea5a16f2ee87daa1e66433fc6f322d24fbc564 SHA512 4666d414628aaf611f98001350bdbcb761dac19ce4cc1e59d1a29e5d74056b9bfe4492a356bcd6c44aac9a3aaa24e30acd7bb9647ca10395fa8d5f0839f893ec
 DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53 SHA512 a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
 DIST audacity-minsrc-2.1.3.tar.xz 8073388 BLAKE2B 4ab323ad9daa93c568d46d00cb3a7f2460a3b6022b990f1eb1759790cd343d5e61d6080c94a7cd00f25c72280f3a459c79049292fdca69be89644e539f04c119 SHA512 96e8bc49ef431b964d67857387cd9e5c1b398becfcaa452e26ef7617f267b7688617a5312d4a9873a24ee34986ea411148369e0ce138d86fea9b520e2c74a3ef
-DIST audacity-minsrc-2.2.1.tar.xz 8111992 BLAKE2B 99b4a7602ed8e03714ff8c59c226ba98fb35344964d5033e541079f7f12a71f6c5264aa60613d02cdb6f254d5a542dc9380e6dfbfd870f2f3536c031c0cec54e SHA512 92c094e4903c438b0aac27b1fb6c9ccc9ca089e4d3123769ff23e434de1e6a519482b42588a54f56afdf5d2013e5681fce3d143f9e092731a9511d4bba31cfaa
 DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26 SHA512 8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c
 EBUILD audacity-2.1.3-r1.ebuild 2716 BLAKE2B e382834bf933f73269c4122b173361d071a976d4dfc746559ac99ca953395fd22b8d1bc5aaf70393426cf08a97cc8a6d18aabaa9f2fdb737f9560a47c1ff7a20 SHA512 1d92991b6295ac279c898c94fa30c9928b596918a0425ca30f7acbf77e417dbf0ab8e819df14e93c69293f6fd63b80845c2943c4cb2635204d5596a552ff86c5
-EBUILD audacity-2.2.1.ebuild 3017 BLAKE2B bfab42f350c45793650860c98ef715bc532603ca55d801c3948b1a6711448c497b7265fad23efe31a6cc690f11026cf14490c86465399183f8733a70ca1c8d26 SHA512 36aeb92c182198f86e4f5a69ce86bec1e75dd5713e1d6b926a020f4e902fb5ad9a37ebc3c034bcb0e853b787ae2c7c0e580303c1a0091a23f3becbbbf63df6aa
-EBUILD audacity-2.2.2.ebuild 3351 BLAKE2B 4febf53a48400d037069bb00eeb654d87532e0229c816bd02059c4e8585004615e0570065179503ee8c8ffdd70611f2a0bc5101ca4a80a88f91106683b625500 SHA512 6bdb10a5537810ee42f76d9cce6bdca8c9f3aa907e9cba1b8a592b8483c4c90341557aba093e78a13284cf12925a9c9e7134c776e3aa9fa8aab521b46445bbe3
+EBUILD audacity-2.2.2.ebuild 3309 BLAKE2B cd7c007f7be4c1105578bd90db98b95f04f16a66d1083979c5e212d8d0a051866af31d05ed9bb4f911fd72949b327be40dd889409d4445fcb807e858cf26f68f SHA512 378b58253ee03454ebfcc7f1cfd29c6e06e959683f74a75d31400e246465ff80b7ca995f85754a2747faa61a41a6e390bbcea8a16abb3a0aa72e48b7d5f5aa96
 MISC metadata.xml 1175 BLAKE2B 4579a87e1bc8a5b420f05774e640471e859e76d0526e581d6dbfbf1f39b36462d3d87677cd98d67b458486f32c34c215c69c9318069732c722cf4ef351a7803b SHA512 5d522d5b6d837f7632f8e1bb25d13d4f134880c7ddd12c637dd1235054c234f0679d02c7b6a0e3caa0c9d20782d5621bfa312239c177e4db4298e3f38d6d80ae
diff --git a/media-sound/audacity/audacity-2.2.1.ebuild b/media-sound/audacity/audacity-2.2.1.ebuild
deleted file mode 100644
index 1e1c6ebc1582..000000000000
--- a/media-sound/audacity/audacity-2.2.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils wxwidgets xdg-utils
-
-MY_P="${PN}-minsrc-${PV}"
-DOC_PV="2.1.3"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://web.audacityteam.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
-	doc? ( https://dev.gentoo.org/~polynomial-c/dist/${PN}-help-${DOC_PV}.zip )"
-	# wget doesn't seem to work on FossHub links, so we mirror
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
-	+lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
-RESTRICT="test"
-
-RDEPEND=">=app-arch/zip-2.3
-	dev-libs/expat
-	>=media-libs/libsndfile-1.0.0
-	=media-libs/portaudio-19*
-	media-libs/soxr
-	x11-libs/wxGTK:3.0[X]
-	alsa? ( media-libs/alsa-lib )
-	ffmpeg? ( libav? ( media-video/libav:= )
-		!libav? ( >=media-video/ffmpeg-1.2:= ) )
-	flac? ( >=media-libs/flac-1.3.1[cxx] )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	lame? ( >=media-sound/lame-3.70 )
-	lv2? ( media-libs/lv2 )
-	mad? ( >=media-libs/libmad-0.14.2b )
-	midi? ( media-libs/portmidi )
-	sbsms? ( media-libs/libsbsms )
-	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-	twolame? ( media-sound/twolame )
-	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="soundtouch? ( midi )"
-
-S="${WORKDIR}/${MY_P}-rc3"
-
-PATCHES=(
-	"${FILESDIR}/${P}-without-libid3tag.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
-src_configure() {
-	local WX_GTK_VER="3.0"
-	need-wxwidgets unicode
-
-	# * always use system libraries if possible
-	# * options listed in the order that configure --help lists them
-	local myeconfargs=(
-		--disable-dynamic-loading
-		--enable-nyquist
-		--enable-unicode
-		--with-expat=system
-		--with-libsndfile=system
-		--with-libsoxr=system
-		--with-portaudio
-		--with-widgetextra=local
-		--with-wx-version=${WX_GTK_VER}
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable ladspa)
-		$(use_enable nls)
-		$(use_enable vst)
-		#$(use_with alsa)
-		$(use_with ffmpeg)
-		$(use_with flac libflac)
-		$(use_with id3tag libid3tag)
-		#$(use_with jack)
-		$(use_with lame)
-		$(use_with lv2)
-		$(use_with mad libmad)
-		$(use_with midi)
-		$(use_with sbsms)
-		$(use_with soundtouch)
-		$(use_with twolame libtwolame)
-		$(use_with vamp libvamp)
-		$(use_with vorbis libvorbis)
-		$(use_with portmixer)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Remove bad doc install
-	rm -r "${D%/}"/usr/share/doc || die
-
-	# Install our docs
-	dodoc README.txt
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${WORKDIR}"/{m,man,manual}
-		dodoc "${WORKDIR}"/{favicon.ico,index.html,quick_help.html}
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/audacity/audacity-2.2.2.ebuild b/media-sound/audacity/audacity-2.2.2.ebuild
index 5c71e713a5d4..7f0a6fabb20a 100644
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ b/media-sound/audacity/audacity-2.2.2.ebuild
@@ -1,22 +1,24 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils gnome2-utils wxwidgets xdg-utils
+EAPI=6
+
+inherit autotools gnome2-utils wxwidgets xdg-utils
 
 MY_P="${PN}-minsrc-${PV}"
 DOC_PV="${PV}"
 DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://web.audacityteam.org/"
+HOMEPAGE="https://web.audacityteam.org/"
 SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
 	doc? ( https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${DOC_PV}.zip )"
 	# wget doesn't seem to work on FossHub links, so we mirror
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
 IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
 	+lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
+
 RESTRICT="test"
 
 RDEPEND=">=app-arch/zip-2.3
@@ -26,8 +28,10 @@ RDEPEND=">=app-arch/zip-2.3
 	media-libs/soxr
 	x11-libs/wxGTK:3.0[X]
 	alsa? ( media-libs/alsa-lib )
-	ffmpeg? ( libav? ( media-video/libav:= )
-		!libav? ( >=media-video/ffmpeg-1.2:= ) )
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( >=media-video/ffmpeg-1.2:= )
+	)
 	flac? ( >=media-libs/flac-1.3.1[cxx] )
 	id3tag? ( media-libs/libid3tag )
 	jack? ( virtual/jack )
@@ -41,7 +45,6 @@ RDEPEND=">=app-arch/zip-2.3
 	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
 	vorbis? ( >=media-libs/libvorbis-1.0 )"
 DEPEND="${RDEPEND}
-	app-arch/xz-utils
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
@@ -56,8 +59,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	epatch "${PATCHES[@]}"
-
+	default
 	# needed because of portmixer patch
 	eautoreconf
 }
@@ -108,7 +110,7 @@ src_install() {
 	rm -r "${D%/}"/usr/share/doc || die
 
 	# Install our docs
-	dodoc README.txt
+	einstalldocs
 
 	if use doc ; then
 		docinto html
diff --git a/media-sound/audacity/files/audacity-2.2.1-without-libid3tag.patch b/media-sound/audacity/files/audacity-2.2.1-without-libid3tag.patch
deleted file mode 100644
index 0a227ebbf9f9..000000000000
--- a/media-sound/audacity/files/audacity-2.2.1-without-libid3tag.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 499c6b4f36102325541cdad55afe5dc3a0e23b37 Mon Sep 17 00:00:00 2001
-From: Richard Ash <richardash1981@users.noreply.github.com>
-Date: Sun, 7 Jan 2018 17:06:33 +0000
-Subject: [PATCH] Fix building without libid3tag (#230)
-
-* Fix building without libid3tag
-
-Extend the pull Audacity#214 from torto9 to fix building
-with twolame but without libid3tag
----
- src/export/ExportMP2.cpp | 3 +++
- src/export/ExportMP3.cpp | 2 ++
- src/export/ExportPCM.cpp | 2 ++
- src/import/ImportPCM.cpp | 2 ++
- 4 files changed, 9 insertions(+)
-
-diff --git a/src/export/ExportMP2.cpp b/src/export/ExportMP2.cpp
-index 1aa259aed..cae2b7dcb 100644
---- a/src/export/ExportMP2.cpp
-+++ b/src/export/ExportMP2.cpp
-@@ -322,10 +322,13 @@ wxWindow *ExportMP2::OptionsCreate(wxWindow *parent, int format)
-    return safenew ExportMP2Options(parent, format);
- }
- 
-+
-+#ifdef USE_LIBID3TAG
- struct id3_tag_deleter {
-    void operator () (id3_tag *p) const { if (p) id3_tag_delete(p); }
- };
- using id3_tag_holder = std::unique_ptr<id3_tag, id3_tag_deleter>;
-+#endif
- 
- // returns buffer len; caller frees
- int ExportMP2::AddTags(
-diff --git a/src/export/ExportMP3.cpp b/src/export/ExportMP3.cpp
-index e0f8aa824..34963fc63 100644
---- a/src/export/ExportMP3.cpp
-+++ b/src/export/ExportMP3.cpp
-@@ -2009,10 +2009,12 @@ int ExportMP3::AskResample(int bitrate, int rate, int lowrate, int highrate)
-    return wxAtoi(choice->GetStringSelection());
- }
- 
-+#ifdef USE_LIBID3TAG
- struct id3_tag_deleter {
-    void operator () (id3_tag *p) const { if (p) id3_tag_delete(p); }
- };
- using id3_tag_holder = std::unique_ptr<id3_tag, id3_tag_deleter>;
-+#endif
- 
- // returns buffer len; caller frees
- int ExportMP3::AddTags(AudacityProject *WXUNUSED(project), ArrayOf<char> &buffer, bool *endOfFile, const Tags *tags)
-diff --git a/src/export/ExportPCM.cpp b/src/export/ExportPCM.cpp
-index eb2369977..021dec4aa 100644
---- a/src/export/ExportPCM.cpp
-+++ b/src/export/ExportPCM.cpp
-@@ -700,10 +700,12 @@ bool ExportPCM::AddStrings(AudacityProject * WXUNUSED(project), SNDFILE *sf, con
-    return true;
- }
- 
-+#ifdef USE_LIBID3TAG
- struct id3_tag_deleter {
-    void operator () (id3_tag *p) const { if (p) id3_tag_delete(p); }
- };
- using id3_tag_holder = std::unique_ptr<id3_tag, id3_tag_deleter>;
-+#endif
- 
- bool ExportPCM::AddID3Chunk(wxString fName, const Tags *tags, int sf_format)
- {
-diff --git a/src/import/ImportPCM.cpp b/src/import/ImportPCM.cpp
-index c943b0ae1..5790551c3 100644
---- a/src/import/ImportPCM.cpp
-+++ b/src/import/ImportPCM.cpp
-@@ -335,10 +335,12 @@ static wxString AskCopyOrEdit()
-    return oldCopyPref;
- }
- 
-+#ifdef USE_LIBID3TAG
- struct id3_tag_deleter {
-    void operator () (id3_tag *p) const { if (p) id3_tag_delete(p); }
- };
- using id3_tag_holder = std::unique_ptr<id3_tag, id3_tag_deleter>;
-+#endif
- 
- ProgressResult PCMImportFileHandle::Import(TrackFactory *trackFactory,
-                                 TrackHolders &outTracks,
--- 
-2.13.6
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index 57f27b5f55d1..594b081817a5 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,7 +1,11 @@
 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.4.0.0.ebuild b/media-sound/chuck/chuck-1.4.0.0.ebuild
new file mode 100644
index 000000000000..874e0f13126c
--- /dev/null
+++ b/media-sound/chuck/chuck-1.4.0.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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.4.0.0-hid-smc.patch
+	"${FILESDIR}"/${PN}-1.4.0.0-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
+	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.4.0.0-hid-smc.patch b/media-sound/chuck/files/chuck-1.4.0.0-hid-smc.patch
new file mode 100644
index 000000000000..0f608f579953
--- /dev/null
+++ b/media-sound/chuck/files/chuck-1.4.0.0-hid-smc.patch
@@ -0,0 +1,148 @@
+--- chuck-1.4.0.0~/src/core/util_hid.cpp
++++ chuck-1.4.0.0/src/core/util_hid.cpp
+@@ -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.4.0.0/src/core: util_hid.cpp.orig
diff --git a/media-sound/chuck/files/chuck-1.4.0.0-makefile.patch b/media-sound/chuck/files/chuck-1.4.0.0-makefile.patch
new file mode 100644
index 000000000000..b601726d42f9
--- /dev/null
+++ b/media-sound/chuck/files/chuck-1.4.0.0-makefile.patch
@@ -0,0 +1,27 @@
+--- chuck-1.4.0.0/src/makefile
++++ chuck-1.4.0.0/src/makefile
+@@ -40,8 +40,6 @@
+ 
+ ifneq ($(CHUCK_DEBUG),)
+ CFLAGS+= -g
+-else
+-CFLAGS+= -O3
+ endif
+ 
+ ifneq ($(USE_64_BIT_SAMPLE),)
+--- chuck-1.4.0.0/src/core/makefile.x/makefile.alsa
++++ chuck-1.4.0.0/src/core/makefile.x/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.4.0.0/src/core/makefile.x/makefile.jack
++++ chuck-1.4.0.0/src/core/makefile.x/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/declick/Manifest b/media-sound/declick/Manifest
index d0557b55f8b6..b16846f23205 100644
--- a/media-sound/declick/Manifest
+++ b/media-sound/declick/Manifest
@@ -1,3 +1,3 @@
 DIST declick-0.6.5.tar.gz 17932 BLAKE2B 759a06987e989e94743b302b8312b6e465da5c650e811ab0721c9e0ddd55dbd40d04d47176f2dde34df5010afe27b321f5d4f43399436b4fd67dc82610945e03 SHA512 d5605f092ceda2781a6c22fd6babf99e43529982f8b546bdc7f68455c6c09c635e2b5d36c9568e2e895a63e7a5308120807da613af5b8454b4dd986bf5f00b74
-EBUILD declick-0.6.5.ebuild 854 BLAKE2B f8979695d16a2b0e69a910de25cbf9407940a4b206a4b119b4908b042399c7c9512794ea1c4ad0505619783198fc9e3ae6b94dfdf69938d88985375abcc265e1 SHA512 98fc5d3f69cc63ec112ad4b389b889197f0c1f8bf812ddbc06f78459dd1ddc34e8ee16dd4aba4d5b0f804319a85d2a0f5f7eb98d4719c5483c890b197de37b6b
+EBUILD declick-0.6.5-r1.ebuild 816 BLAKE2B 64d2b5d94496d689de9d8105efd8f002b5fabb07b1af21d56d7db0852813c41f6a45d77ec797d8e63c484e495a86255ea7d237d7cb2acb2f36d09167b66604fd SHA512 774870286b9ab5565b6baefe3196c29a9b0eb85dbecdeeff477e15ba64e339a34a889ada1e68e2d74962d918370a8db942297d3c05eb1a04010074f2b8663d78
 MISC metadata.xml 524 BLAKE2B 62792431b019eb9819a47bc3222bf3692dfce78c054084fc15b7e984865bb9b98609356f33145f357e5071a3920ce383d88f9e89548b517ce72904bbf492a2cb SHA512 45900b6dbe08a3bb653e8b5a0ceee6630755c032fc5bf52e53af66ef9ae0a4ab7d203b2238504de47eff95d1c3f56597a15907c97b2601b7f74171ed8136c09b
diff --git a/media-sound/declick/declick-0.6.5.ebuild b/media-sound/declick/declick-0.6.5-r1.ebuild
index e680690eb326..c6d6cd7a99ce 100644
--- a/media-sound/declick/declick-0.6.5.ebuild
+++ b/media-sound/declick/declick-0.6.5-r1.ebuild
@@ -1,34 +1,33 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
-DESCRIPTION="declick is a dynamic digital declicker for audio sample files"
+DESCRIPTION="Dynamic digital declicker for audio sample files"
 HOMEPAGE="http://home.snafu.de/wahlm/dl8hbs/declick.html"
 SRC_URI="http://home.snafu.de/wahlm/dl8hbs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-DEPEND=""
+KEYWORDS="~amd64 ~x86"
 
 src_prepare() {
+	default
 	# add $LDFLAGS to link command
-	sed -i -e "s:\(-o declick\):\$(LDFLAGS) \1:g" Makefile
+	sed -i -e "s:\(-o declick\):\$(LDFLAGS) \1:g" Makefile || die
 
 	# convert docs to utf-8
 	if [ -x "$(type -p iconv)" ]; then
 		for X in README; do
-			iconv -f LATIN1 -t UTF8 -o "${X}~" "${X}" && mv -f "${X}~" "${X}" || rm -f "${X}~"
+			iconv -f LATIN1 -t UTF8 -o "${X}~" "${X}" && mv -f "${X}~" "${X}" || rm -f "${X}~" || die
 		done
 	fi
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" COPTS="${CFLAGS}" LDFLAGS="${LDFLAGS}" declick || die "emake failed"
+	emake CC="$(tc-getCC)" COPTS="${CFLAGS}" LDFLAGS="${LDFLAGS}" declick
 }
 
 src_install() {
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index e35577ec92e9..79423cd0e0a5 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,7 +1,7 @@
 DIST fluidsynth-1.1.11.tar.gz 634566 BLAKE2B ed135533c9e3e807794e0eca8117d430aa299b8772b2b6c85f6233e7e497d69f43381d9c7cf2de5ce8638f5dc616339bd28cecc3cdc23408bf5883a0b14fee79 SHA512 ad7c634426b29e5a05d67addf32d43a9ccb11a1fe3cfc09ad617416b9df3dc99a48191377f5027232521380737dde2d9b59833516d1bffb90f410bab3bbe140c
 DIST fluidsynth-1.1.6.tar.gz 958735 BLAKE2B 9be1e72238545d78f2aded9e98336639ba83d2272b3247ac86609e84331fb8517eb29b505d269719196468bdbf645496c9f4f4426ac232b16f19b3b8b1c3450f SHA512 2dcb8a8a1634273cc93c45b6e21b87ac45a023c768cffdadda0a4e611eab8d5bbea0e1ba59e5f147488054cfa6fcaf561399ae275a665c76082b8738a80778bb
 DIST fluidsynth-1.1.9.tar.gz 630651 BLAKE2B 2e6faa1126778a98b1960146046490331f943dfe78dcbf66aeaac16deda3ea0bca2eca747e7041ba752d136360b2003ae89b0d936df78a6cd9d5024bd3cd834e SHA512 9bbe9143dc55a0e10e33efd62698e28b598a7ede95d44f193a93c5e29920c7b6d08f7f5ba96bd2c1c42a4b184134d4e811f643fdc0077be714c0cf72635de235
-EBUILD fluidsynth-1.1.11.ebuild 2203 BLAKE2B 02259bde188874b56057d7d262c500b3c152dcdc3497002c08913fa757a3ab806995e3d4844c69ba70d1a7cd983519a7aeb1522b05ddfaba47a9e560dff7563c SHA512 bfa6d865cad032bb3ceefd27742f74d9b985ec30804718256c4b7eaaab39b580213379054d46546ff3810fdca838f4a38eb5bc795512395ce9916264b08d51b6
+EBUILD fluidsynth-1.1.11.ebuild 2198 BLAKE2B 006cf09b65a09a35dd20f04026f5e3d03c0eacaf079d326ed10295bbfd74ad6414b5685368d34418fb95c479e43a8d21bd7818a812a5f9b4ca7225f09626e320 SHA512 41e3126ebdb46a9b380581dafc15295208e2b3740343da506f1ec0983df7511f254c505d9dc6366cc2ebceccd2393f0d1dbd8397b242217392493bf9bea2fdc3
 EBUILD fluidsynth-1.1.6-r1.ebuild 2161 BLAKE2B 86ab6aac8b65c858cfb4a72ba4c153040c9303f2ed8e655983b47472f1a6d7d4b8c6a66a2c0da25006bb1a4de6199897e53266d414ae7518e1b762fb47ac366b SHA512 9949a64762e561bcb6e77e38fef18c8882898a20a0bdcfa6b95478e1a251bf22a54818ef5b63b8fea8e1a714fe435a48c7af8b701917e60dd60a9de37108c38c
 EBUILD fluidsynth-1.1.9.ebuild 2253 BLAKE2B 47c026d1d29245f63395a93e81e719da1f88b8b7fc483954702e5b2a8bcbe30fe2fa2ff5c700d37c65a7c862c53e6d529984b6224443edbc2662fb6f152cba1b SHA512 272838ed901704d279f38e12c6a5fdbdd2b46db2184dbe6d528b95f65648af2ed97caa6af565e7a370e0064bac0ba7dc4e89705d0980cf1238fcff53e1e19717
 MISC metadata.xml 339 BLAKE2B 4bc7678ba8ccc3e97a79dda9294b31ffc1950212619ace448def22e50852b20e3b716368d9c5b7127aff381aab85d7fa104404fcd409144452855a4b5d41b529 SHA512 abac43fa8ab39fe41adf6c34a4f0e3aa605dbe834555b2eac4abcaadb6556cc08555197aadc43e51733cf8d4e30c7f7be3efb724536d54604069055836a36980
diff --git a/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild b/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild
index 8cabd6cdfd40..376658b069ee 100644
--- a/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/FluidSynth/fluidsynth/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash portaudio pulseaudio readline sndfile"
 
 RDEPEND="
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index e090499ffefe..efb6b81cfed8 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -5,5 +5,5 @@ DIST grip-3.9.0.tar.gz 968706 BLAKE2B 9d530b1e7c93239d4298a57a784eec38d98fe57e2c
 EBUILD grip-3.4.3.ebuild 1207 BLAKE2B 014b3ae549e72ae4960820532e746337a3d821684f98e19619ab9314441c2be743df3e7049885c921bd5d09f837d275a661116a9c258cfce1008f7978a5fcb00 SHA512 e6fff5d8728217b346a200ee84bec062212be2a2b37e5e942f730d897e53983df66e032a72e7540be6aa83732cd9bd0bdf20566b66ebf6a37a21f1e909a6f44c
 EBUILD grip-3.7.1.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
 EBUILD grip-3.8.1.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
-EBUILD grip-3.9.0.ebuild 1207 BLAKE2B 43ee61c3ba2b6b3264b7e90dce3f8337a29f9373f562cfbdfc9b6f8b4a4c880ab2a663fd2ce540ba511ec145a462c1b2c9daabc76012df933c7aa06f9bf7dd44 SHA512 0a16293d757f35e724a42dcf4ed304fb6386f8be53e4a6fa7758f14677eeeea0af427d95ed330b57f0affa8e00fe2997948ee04255d3d7b1951c1bf3cccd2990
+EBUILD grip-3.9.0.ebuild 1205 BLAKE2B 91e95f5185f242c02b0b25dc0cf0503bf8a6d68a1c041c552da88a5a8bfc8a9b9b979935a8da2b4bba35e62a4c52bd0db43f64db01004a75887a9e1429cc6a83 SHA512 3e182396784ca47538a2b95b92f2003847b9a5ca30bde4eaf13e5b5c930c45b5addb5272ed68c12c9a40ef6f9e9ff7c210ee69a840a48586bfc86fc16c84f2ba
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.9.0.ebuild b/media-sound/grip/grip-3.9.0.ebuild
index 58adf1f69220..9e2562a4b9ce 100644
--- a/media-sound/grip/grip-3.9.0.ebuild
+++ b/media-sound/grip/grip-3.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="vorbis"
 
 # lame and vorbis-tools are no real RDEPENDs. But without them
diff --git a/media-sound/id3ted/Manifest b/media-sound/id3ted/Manifest
index c90d2bd7a6c0..772503f7c8d0 100644
--- a/media-sound/id3ted/Manifest
+++ b/media-sound/id3ted/Manifest
@@ -1,3 +1,6 @@
+AUX id3ted-1.0-outofbounds.patch 713 BLAKE2B f0e61828e73939d3497402d7b37d751e42393ff72d64be20c3c4f7f48ce9b484e1ccaf9915c291b35b0e21efab3c5a2419cff4c101b79176b8603851bced1855 SHA512 942b1858bcd917c2a0c3be023f666bcc38b364edce976ab3f3f9f4d16f1822240aedb33965086f5f67832096fa408e24d6c85cfe91a2adc1cc84bee8d4ebef9a
+DIST id3ted-1.0.tar.gz 32792 BLAKE2B 3df3a5a48302ecac6dbccbf7ddacb3db193e67f8352159d3c31763d03e6bf48c46c2aaf056b0d08649e33c7d4440f72a0dc1869b3d0978cba470bc2b609ff804 SHA512 ba135779ac8bb7e83d77737babc836a2bbf4cd7efd4ffad5aa982ec9f6c57d0479f0bdf017e62d62dddffcadab88ab7b3f07408d173d013b794d20bccd5218ee
 DIST id3ted-1.0b3.tar.gz 33023 BLAKE2B 441a5d7a4d486d87b2479184aadb6e067f878877e5e8ef25d01139b2d59e1603d52a31646fcbab2f2c228652cb0d67434bca9ce584c6ba02d4841fa9310c3174 SHA512 6478ee5b6ba652687dd17828a039e8b6fc2b593285c01309c32dfcd7ec4e0e24c10288a195e9b95c47689c844f342498d5151904bd2e596de0e5ec73afa0bd7f
+EBUILD id3ted-1.0.ebuild 540 BLAKE2B 2613d7481c6632000b39b4a8eefd2be78680d814590f2e16d0d822b2921eb9046c0ba6ac0ee5797060532fb053c5cf16d2caa0c19a66e00e06e99fc1aa9b263d SHA512 bfdc69db5ceb39086d39d3faf25e53c3d0fb4910135b9c597422d24a8ae21402b1a0534f9895d3fba9ed21d23fd6229d343739544636a18f278bf9a502866357
 EBUILD id3ted-1.0_beta3.ebuild 508 BLAKE2B b9f2442474f14acabb299f079da2f9586a2e010ddbab6fa3d58a8d0271641a3439dfe51451ec4932acdce61732e949caed389c33f285a39905cfdd151513e645 SHA512 b1347d06e62eb32d3e72cdfad9b4f8bb682c1090be9d93d182c260b880d1baba71a431c5ea0440fa760534beda4f29000449d22e73014e95c9ef74bb03460fa2
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/id3ted/files/id3ted-1.0-outofbounds.patch b/media-sound/id3ted/files/id3ted-1.0-outofbounds.patch
new file mode 100644
index 000000000000..919ed90e593f
--- /dev/null
+++ b/media-sound/id3ted/files/id3ted-1.0-outofbounds.patch
@@ -0,0 +1,22 @@
+From a044c5659bf29df8152feabba63a83dc6feb7a99 Mon Sep 17 00:00:00 2001
+From: denmord <denis.khabenkov@gmail.com>
+Date: Fri, 20 Jan 2017 20:36:31 +0300
+Subject: [PATCH] Fixed writing outside the bounds of the array
+
+---
+ fileio.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fileio.cpp b/fileio.cpp
+index 35d992f..edfe2de 100644
+--- a/fileio.cpp
++++ b/fileio.cpp
+@@ -154,7 +154,7 @@ FileIO::Status FileIO::resetTimes(const char *filename, const FileTimes &times)
+ }
+ 
+ FileIO::Status FileIO::createDir(const char *path) {
+-	char *directory = new char[strlen(path + 1)];
++	char *directory = new char[strlen(path) + 1];
+ 	char *curr = directory;
+ 	struct stat stats;
+ 	Status ret = Success;
diff --git a/media-sound/id3ted/id3ted-1.0.ebuild b/media-sound/id3ted/id3ted-1.0.ebuild
new file mode 100644
index 000000000000..8647777f37f4
--- /dev/null
+++ b/media-sound/id3ted/id3ted-1.0.ebuild
@@ -0,0 +1,27 @@
+# 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 ID3 Tag Editor"
+HOMEPAGE="https://muennich.github.com/id3ted/"
+SRC_URI="https://github.com/muennich/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/taglib
+	sys-apps/file"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-outofbounds.patch" )
+
+pkg_setup() {
+	export PREFIX="/usr"
+	tc-export CXX
+}
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index 1d669bae1f88..bd5eca0c17f7 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -6,5 +6,5 @@ DIST jack-audio-connection-kit-0.124.1.tar.gz 1113456 BLAKE2B 2f845de92e19f164ec
 DIST jack-audio-connection-kit-0.125.0.tar.gz 1217977 BLAKE2B 4037b76a5a6814f30adb4145282e2295bd7b2502934ec7b3cc41ed9bc1a1319855a60d739d72641c0e18a3ee1d8bcb829a637fabf7df7a4525271bff8933f09c SHA512 acdac0588c8a6b79763177677885b6e7bfa8ee3cd9556b33bfe09512bc1191414bb4f97eed62c3c71567b13b4eb69d95ec6b438e5a9d2e22a956c073d500c46f
 EBUILD jack-audio-connection-kit-0.121.3-r1.ebuild 2301 BLAKE2B 365da2382795f4c6378159e803f67dbbc3e54fa6b5a1723ffd4aaeb2999943783fcd72048f7cf3f5dde0058c69494e43c2f1ead08e2c56dce6b535e8dcd98a34 SHA512 32ad14f0be41c45f096a5dd35c05107c1ff854df1e1e6a2803b4c3cf98f8cd156a0d3aec2d092d6786749e5820edd143463d331dca752c48479d282c2ac65672
 EBUILD jack-audio-connection-kit-0.124.1-r1.ebuild 2104 BLAKE2B 4364186d40279df43927e9ef57ac6ba16de4943444dcbf4e39fc7cb7716232a37d43e28a57765df7ed0ec80106ceebb661f2bf9be7c9dfc241656e6d4061ebd6 SHA512 1b0769d43bc619f0dc41ea307519b7118adfa265af506b3e8a6b11b0bce4fb89ef0d8fe0f69cd1de888097b17c474836b1b95f1e412bf82a99e0592b3ec7fddc
-EBUILD jack-audio-connection-kit-0.125.0.ebuild 2067 BLAKE2B 3ea8e40e42611a090de13badcf5bc93177d1ca8ba120e435aaf60f80609f6fecd7a94b52104ede3586855f24d4ff6de106a42c61373b4aaa93a39418cb25baf6 SHA512 9b99ffd4f5c261d3ad665707dc9dfd653be397137d40756057ee175032881591c0b7be1737ffd72d6d9777e2d534e3696c7e8a3dadb6c0dcf280ec04a86637fd
+EBUILD jack-audio-connection-kit-0.125.0.ebuild 2072 BLAKE2B 79635f9caf09e9039d6255b2ccc1d51bc5953c2c59ddda23f554faf4868fad4f5b55c09d84b5b16bd58552e69b0ca5c5ff589bbb548e12bf4a9403c123625940 SHA512 8bbfe83f51639da5838e41aa29ced5302137950d4a5ea96fbf803def178257a8bd71f0f50cd3569f6f3ae8c0e341044daaddf04a54915f256b351a1bed9cb34c
 MISC metadata.xml 514 BLAKE2B 920e43b1a4ee5e4040d05a3dd62f677943ea7166a013e82d06f255d9a0d79d99af927bc5428517232dd7d21392f74b15c40c2d2e781d720abe1c153bc85ccadf SHA512 1fc2dd1efb39c6c002c5ad647a4f5134c841138546f66300db8ce93c979522ee29c4e74cea86e6bba4fe8d5414dfd5a25cb1d98803511450cbd22933ce474c1d
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
index 36182a295ed1..8dcbeddc5265 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam"
 
 # readline: only used for jack_transport -> useless for non native ABIs
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 2642ab17aa96..ee1c8ccfc13b 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -2,4 +2,4 @@ AUX kid3-3.3.2-libdir.patch 1506 BLAKE2B 1265271633d61cab6d4ebb49284645a1528dedd
 AUX kid3-3.4.4-deps.patch 1485 BLAKE2B a2c4b9ac6e956dcc2e6415b502e0ca34814d668ceb3e2e315f4da8da382041cf55f6b5531d298ecc00ee242433c09d2095e4357a9814fd9eda60d501672c5a74 SHA512 af386071836e542e178cda38297091817943a3f754e4d14b3cca2ec628bd7c13980932e77b1f9e3c578b095d88ea2b24e89e58b6f726c6f656989fc08bc8a808
 DIST kid3-3.6.1.tar.gz 1428799 BLAKE2B 055743c06bf28188c16e627556e1c23cb724f6a1601975f259a912445063a23f3c6d8101cbb3f582fac66c56bbcbaf243e637132b20930f718f2c5b1056b7dc9 SHA512 026be02c3dea1f05af0f24a26ee9d6b775f7e408db6de8afbb3dda5f66ee465263fb1c3763d4e8ab52b1856a58c1ea21228d24cdb754508e68c04f7d5cccfb77
 EBUILD kid3-3.6.1.ebuild 2039 BLAKE2B 916f9cc8c38797be544521a1547f32bfdfb92b657eb82ee7cbf04caaab44aedc2aa210c343dc07e061d832ca86ff9540d9926f79cd9977b05c805f4162a55ca3 SHA512 3c9579683274c70f5ab977887eab2973da50fce3aad59ecbc58cdeb653689422cbc3d87fe31aae262fde7241f5f41dedfd79bf52cfb99b5b4a269dd1a07661cb
-MISC metadata.xml 672 BLAKE2B 380133bb3cfd6862da40dc672da4c513a53a81adf40ee0552ae6df65afb42979a19e32f0e72d909f15d78f014e19057e0b2db69e087aa6bb222f7d4b7ccde88d SHA512 b76d1d9b77eab5a42ebb2bae4a039a0a9abc5227e37fbe3066ca04aacfaebfdbcd99b3901eba79bb8ee46a64fa58a3aaf6370eeb3706d1773e137b02de1202ed
+MISC metadata.xml 661 BLAKE2B 5a16df625ed1a34a04f7cd00cae636ec4dc2867cf1bab477c4a2fd99e21777ac949391c0c940da1235ee976a00b3812a84db1fb58c8c089aed983668f9ff49fb SHA512 d27b8c077e8363864d6d4baa217bd7813a01c520cba943bf25996823b944ed07c7b78205d5c77c1610566e2aa55cf03624633e4abef86e4378f6386b7bfb89c9
diff --git a/media-sound/kid3/metadata.xml b/media-sound/kid3/metadata.xml
index e7aa364bd79c..8db1b09337d8 100644
--- a/media-sound/kid3/metadata.xml
+++ b/media-sound/kid3/metadata.xml
@@ -14,7 +14,7 @@
       (<pkg>media-libs/chromaprint</pkg>)</flag>
   </use>
   <upstream>
-    <bugs-to>https://sourceforge.net/tracker/?group_id=70849</bugs-to>
+    <bugs-to>https://sourceforge.net/p/kid3/bugs/</bugs-to>
     <remote-id type="sourceforge">kid3</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index c5d1181b5399..0e983fa9a332 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -2,5 +2,5 @@ DIST lmms-1.1.90.tar.gz 16580373 BLAKE2B 7ae6025647f949aa015dc64cb6595e1e13b21c9
 DIST lmms-1.2.0_rc4.tar.gz 16596115 BLAKE2B ec8a132f900417749899b084915d31348e267aebcded218d919559f195ce4826091bc3576932d2fa9115c2e040ba73b84db05eeaca3fbcf33b930791241de990 SHA512 8f102f2a4f157da1b8477d4f73bd5b86e7d11453491f6764deed1c61654c0836e612e19d1dac33d154ed9d1b0a0c65084a0537be832c94e72b904264269b6a96
 EBUILD lmms-1.1.90.ebuild 2001 BLAKE2B edbfb370f068786cb2d2d2bd39a3d3203a3c200c52846ac76f5e3f4727a2ce32be8e4585c52a955cbc6eb71e95c0a7a5fca1f99c6549513c8ac52cf465ee6ccf SHA512 0bd83dc94431a467567174d65361c4b381a1286b3941e319d33a72297cccde9ddcec6a885938a51cf4e0c3ffebca0d45d4c0c6004c5e46077a16bdcbf0f42474
 EBUILD lmms-1.2.0_rc4.ebuild 2196 BLAKE2B 787ecdc79503e230b29af3097fa7b77db645f63ee593e871f1f20df13da50dbf7964c39adb4818193bafd7652d935e526f70097d04ab990f5c0e8658c5dd5c93 SHA512 fc471f52db5555c85970aa66acfeeeb553df13c0bacf946d8612cf30cd45ec6bfc70e8e8d8103e97fdd12a5e46da3ea8bdad5dbeffb28d48ef9ca5ba66bf144b
-EBUILD lmms-9999.ebuild 2196 BLAKE2B 787ecdc79503e230b29af3097fa7b77db645f63ee593e871f1f20df13da50dbf7964c39adb4818193bafd7652d935e526f70097d04ab990f5c0e8658c5dd5c93 SHA512 fc471f52db5555c85970aa66acfeeeb553df13c0bacf946d8612cf30cd45ec6bfc70e8e8d8103e97fdd12a5e46da3ea8bdad5dbeffb28d48ef9ca5ba66bf144b
+EBUILD lmms-9999.ebuild 2256 BLAKE2B c48c85ee481f7ed320d2e1b4106a0cca8f9ea68589d54d9f078e0203ba7d34673da0fabd2e36f8ea1e86874c34ea2e45b7fd793993c34899ae25617d7c15daa8 SHA512 60a7a9f3db22e4f6f1e5c2e7bdb4a308ea7aaf45fccf22ab63a1340c4a42083f3b704e443bf5d9b4357dca2d1fd31ec489bf864ceba609d2d5e72c6ecf3694e1
 MISC metadata.xml 956 BLAKE2B 0146d8de32c1f9aaa1b111f10e48de20bde5e3634527b4da37ec14d2a148e6eb974bf6665e4fe6254732dff28ec24e3ca7fd1d7b860928453a223bd183895715 SHA512 d96540b061f24e031f1cbb381c05f4eb368e207f8300e8b68e57a36deb2bfb6108453e8428e2534e895927a738d74d8692fc918d8456e0f01b5ec971d4400acc
diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild
index 354ba7ece7b3..85c5734ae478 100644
--- a/media-sound/lmms/lmms-9999.ebuild
+++ b/media-sound/lmms/lmms-9999.ebuild
@@ -19,7 +19,7 @@ fi
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 
-IUSE="alsa debug fluidsynth jack libgig ogg portaudio pulseaudio sdl soundio stk vst"
+IUSE="alsa debug fluidsynth jack libgig mp3 ogg portaudio pulseaudio sdl soundio stk vst"
 
 COMMON_DEPEND="
 	dev-qt/qtcore:5
@@ -33,6 +33,7 @@ COMMON_DEPEND="
 	fluidsynth? ( media-sound/fluidsynth )
 	jack? ( virtual/jack )
 	libgig? ( media-libs/libgig )
+	mp3? ( media-sound/lame )
 	ogg? (
 		media-libs/libogg
 		media-libs/libvorbis
@@ -75,6 +76,7 @@ src_configure() {
 		-DWANT_ALSA=$(usex alsa)
 		-DWANT_JACK=$(usex jack)
 		-DWANT_GIG=$(usex libgig)
+		-DWANT_MP3LAME=$(usex mp3)
 		-DWANT_OGGVORBIS=$(usex ogg)
 		-DWANT_PORTAUDIO=$(usex portaudio)
 		-DWANT_PULSEAUDIO=$(usex pulseaudio)
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index e59c0555bcdb..7ab6f2fce4b4 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -13,8 +13,10 @@ DIST mixxx-2.0.0-ffmpeg31.patch 2844 BLAKE2B ee44c1da8af553cff478d12bc4fb05ae50b
 DIST mixxx-2.0.0-src.tar.gz 25300881 BLAKE2B a0dbc03350bf6d6a8ce5abd06df50bf58cf3d75fcc3f8614873c807ad8a77d1afb12a8715944ebba80da5750e4c6d6570ea60a5afb83b87f8cc54c7c4d0ccb00 SHA512 8878c0f785e4c5f67724deeca61154d2587969a81d28aef8fa9d526aec8419a218ce2a7ef88d6fcf468d30fa13d31ac9a56ca9082431a35b7e4e040a7ccfbb1a
 DIST mixxx-2.1.0.tar.gz 34835250 BLAKE2B 7a90c3794a146001fd0df6bb7c9c6231c0d26814eafc5c83da666d511d7af0e193b75da9b8728ad399dbef208cf2437881df2c87818e503945b02591bc300567 SHA512 d9f4fab92c2896ec455e2041aa6033f9a9091d2915a185a99427b9c35afe7c99565350ce477bf0487c6276c9585875f0be61f310779ae90195917d2e995bbf90
 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.0.ebuild 2873 BLAKE2B af6a8c6f07aede897cc7e43c57aaaa5bd6f82837f4a4429f5e52b57af65e5ea58544f5fae705d5efd668ddf6999058206057bf699f51977d106282b38f2d974e SHA512 72000f7ff37fcf0955a342744b7bb4a88cab8021fc8d7c24d3b9805924b97cbe762b079bb79d3618b752ad5103406ab6bc54b3d2b80d3a13a1b94961cb2812b3
 EBUILD mixxx-2.1.1.ebuild 2988 BLAKE2B 8f665c044591f488492882f4b353b82af0276833567ac1812253201d93097a26d9694a806e5bff4b8af6736356a2fb11067d4bd3476d83da4b658e92ef8ca672 SHA512 6089de35a5e2045558ab9a1524081c655bd4dffbd12369e9aa8078c52b6999e57517f261b4b696a346e50a5019ecbc5c165a08d60b3e60740c57d831814959d5
+EBUILD mixxx-2.1.3.ebuild 3006 BLAKE2B 0c393607bc1db7e23d986a55c4b72c966ea00d317884a24cea3550414e5fb04963a0a5085a717a0f9a3e3ed7564909162e7fa699f43d38256afe6862ceb34b3a SHA512 1df37aec5a1d8c5bce3b2bb352328b9da488235baaf2121704ed17fa1cfb82b9ff5d813e5c44c94b9618438c4cdfba52f933ecbf4827d2165d27ee19358fdc36
 EBUILD mixxx-9999.ebuild 2988 BLAKE2B 8f665c044591f488492882f4b353b82af0276833567ac1812253201d93097a26d9694a806e5bff4b8af6736356a2fb11067d4bd3476d83da4b658e92ef8ca672 SHA512 6089de35a5e2045558ab9a1524081c655bd4dffbd12369e9aa8078c52b6999e57517f261b4b696a346e50a5019ecbc5c165a08d60b3e60740c57d831814959d5
 MISC metadata.xml 642 BLAKE2B 125facf06db489fe7e3f4663b1664a4e0c4288cad028b9d0e73db345c8e6a8004383b4efb70e7b5315028fba769fb790cb2b39949980b5adc6f3de2178c0f7c9 SHA512 e336e472a4ee405e18a2521cbd296917a1c555c444eb3794eea602a36ec30f5eab99e9dcad36a08c9852c228253721311d957ef632ae0d14c96391a95ad4dd5e
diff --git a/media-sound/mixxx/mixxx-2.1.3.ebuild b/media-sound/mixxx/mixxx-2.1.3.ebuild
new file mode 100644
index 000000000000..465a2c26cdea
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.1.3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic scons-utils toolchain-funcs
+
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://www.mixxx.org/"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
+else
+	#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
+	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-release-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac doc ffmpeg hid mp3 mp4 opus shout wavpack"
+
+# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
+# got fixed
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib:2
+	dev-libs/protobuf:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5[scripttools]
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint
+	media-libs/flac
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libsndfile
+	>=media-libs/libsoundtouch-1.5
+	media-libs/libvorbis
+	>=media-libs/portaudio-19_pre
+	media-libs/portmidi
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	sci-libs/fftw:3.0=
+	sys-power/upower
+	virtual/libusb:1
+	virtual/opengl
+	x11-libs/libX11
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	hid? ( dev-libs/hidapi )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2:= )
+	opus? (	media-libs/opusfile )
+	shout? ( media-libs/libshout )
+	wavpack? ( media-sound/wavpack )
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.0-docs.patch
+)
+
+src_prepare() {
+	# use multilib compatible directory for plugins
+	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
+
+	default
+}
+
+src_configure() {
+	local myoptimize=0
+
+	# Required for >=qt-5.7.0 (bug #590690)
+	append-cxxflags -std=c++11
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #591968
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		if [[ ${i} = native ]] ; then
+			myoptimize="native"
+			break
+		fi
+	done
+
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
+		faad="$(usex aac 1 0)"
+		ffmpeg="$(usex ffmpeg 1 0)"
+		hid="$(usex hid 1 0)"
+		hifieq=1
+		m4a="$(usex mp4 1 0)"
+		mad="$(usex mp3 1 0)"
+		optimize="${myoptimize}"
+		opus="$(usex opus 1 0)"
+		qt5=1
+		shoutcast="$(usex shout 1 0)"
+		vinylcontrol=1
+		wv="$(usex wavpack 1 0)"
+	)
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
+}
+
+src_install() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
+		install_root="${ED%/}"/usr install
+
+	dodoc README Mixxx-Manual.pdf
+}
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 46fe105105e5..07a91ba844f6 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,9 +1,10 @@
 AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20d60eecf3a62ce6c3eb0e6a8c29252ef6e3045a96af6e8cd12d7c27dfbdf8a79fa3ed025258b8c9cb7b05d SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5
+AUX mpd-0.20.10-libcdio-2.patch 843 BLAKE2B d0c7eeeedb6065b1e08b1a8b1e6f5237408cd1b747aba72651441f0c203a4d32a39bf4e3c2371ae16fbde2f991c2f60870b15e8340b81bbc793355131ea57f62 SHA512 c9b62e6e0e7408ff3ab1e73c08001e498150c6bda8a9796ef23c35ba4dd0313e243129f7fb1760997f4a226f1ea3de56657eeead41f07bcaafa9affde40cc851
 AUX mpd-0.20.12.logrotate 88 BLAKE2B 2ff692c0c37da35ba3d53c2050653131a0de364094a779eba7ed7b2db3334f1eef7fa261b6a94416cd6a29290fb563a4a15ef70768c2860d2d9c3b7f9fdfbc4d SHA512 6c0ad8341f24633271972a2414e945a8eb14db31b114e1c260bcc0c50e1288bdbc5e3344ff9ef53c3c28d7368985e55a944d53705302b8a3d14eccc9fe2d6b48
 AUX mpd-0.20.4.init 681 BLAKE2B 36f48fe4f2432f659c455e75c3e6a773e7d49b9194fea75cd08251cc661b4885fe4ca16cc1008b679cb441ce8eb6a309c60b132570b89e4cf8f9560e130e71be SHA512 e9dbbab915e0e84dec9bd084347e608db7802386b281dc35fa1a9401bd3a40652735a02c98a8d51074c061cbe05ff038e0a16f379638c133b6ae8a6a70ca8f39
 AUX mpd-0.20.4.logrotate 79 BLAKE2B fcff807fb7557d480378ae6712f598147c9dbc3381ca89b21529277bfc636448e474b610096eae5c02963bc5aa5cf1055f0a9bbde36f2cc8d178e373a755fa84 SHA512 b4616307eb4b06e42a53120bb37276ea19cb1b3096094214062835f71093a1d196bc515b6b6f1e23dbd83a49151565807071959408c4f1078d95925660d3b324
 DIST mpd-0.20.10.tar.xz 778828 BLAKE2B c16b955ace770cf3d5da2ccad81fd3089cf2e60bf47774745d75babcff38fa344646b26dd32617fa2fe86ee0c785b9c8272ea6c90f77266b1a0cba2d48145236 SHA512 bac6a71e5b85600c590eae6b785474574cf0d7b03d9add537161b968a2997a975a597639a9fece119a01a7e27b5207523e4ae30b2f4f35791eff8c3ff26d107c
 DIST mpd-0.20.12.tar.xz 781072 BLAKE2B 0f305efa94dca844ebc9e4548d0f57ce01c0274c49f40fe3fc8510b8f2748f2cf623125c16da382a8495aa6eeb1a8b9707a3bb46a5fa8a0657c9ffa11fbcb5dc SHA512 3e221edc71cc65f9da46aa4f1d0bc2f8ca701cc4a103ea8efb08191918312b2f3b0023288e3dcabe0779e81ee6f628773d779462e09a55f2c090cca0e3d099af
-EBUILD mpd-0.20.10.ebuild 7248 BLAKE2B b32e3c19c811e344d70a0b0a260bc8553e7a495e2efc9596ed580cad91ac12d84314856a0e1cc5a27064a7446983c000c89e1f7ce068029ca137a67b7346a662 SHA512 244256b2a88028895e6765dc6d4bb504342009ab53193215ce6a97369216d04097d424d5b12ba97772bbd0af866a7e65a684b5dc0d2b6f9566e0c4b4bb9e4f80
-EBUILD mpd-0.20.12-r2.ebuild 7315 BLAKE2B f70d4a926544b8f424226bc3dc1e49af3473682a790a0cb5ea0ed12d1e052d69b31f984b1cf241851c8eea935f06984fa7cfa1dd48c21895849317d2c8c97c15 SHA512 a19375a8cf82b488fe3b1caf48212a33cd8096572b74c14793c63883df944dd39e3ee7ca0dfc67f31c916d892f0359372b88a46bcc95ce3d60c7acf63bd7b5b3
-MISC metadata.xml 2403 BLAKE2B d061cff6d63c179f9dd58b22a6fe6e5eb14c6163440ad9aa3bc9a30adf1ec3bb612030c3d3e739d9c2f92983441683b69cec61285a38254aa5c038df14cdc500 SHA512 97ce4e8fe377823325847e1ab013338d4394863a92d4728dbbf016ca8b4a0b0416e5803380bdcc7f834245565596bcdd2169c5d3e0db1cef8b4a1b9943a2d3a1
+EBUILD mpd-0.20.10.ebuild 7284 BLAKE2B 956c7f48e1daa7a9c5ab632253d9f252e1c63b95e947febbb70e120955c641e079f12b33a6ab0a5c9326ae8f784938f5c8d193f687ecd6bbfc408cd54989ba63 SHA512 26e006b99a88d1ce1de0e4dc096be643e5aa6a27452197dcd815b8fb59fab1c46bf0b71689ec01d10e3cde83e7898599071f888d11976d9bdf6bc8d36057f09d
+EBUILD mpd-0.20.12-r2.ebuild 7361 BLAKE2B 6c257159de263c22984a28331cf6ad9bf17ab34bc6e255901f2871588133f2ddcc99cabe142f14a75e831faaad9cf2588889286cb6183716d9a14bd4e4f74624 SHA512 c5d52149a1ac383c35fdf5f22c756459545f1f0ca630d0ba3a433e6f856c9ad49482e3a39e94abc025c2e094abe2e260e8716fbda78e1ff8280a92957e720a36
+MISC metadata.xml 2517 BLAKE2B 1723729d1962eb361c8231e9351164008b3f2e47097846afc6a06d2ae8157a6ef0643f1ddc53f0fd7ca5569eaf1f30ad28ec18079ec2a9f92cf0ad3b287f4798 SHA512 f829d7424245ff87e86d1bdd4c59cd4a102823b8796aa44d202f2b0afdf902f88fa43d478b9cf610c1ffb52595d3bc2d37bc4d67ddd440110009ff9cbcfaad46
diff --git a/media-sound/mpd/files/mpd-0.20.10-libcdio-2.patch b/media-sound/mpd/files/mpd-0.20.10-libcdio-2.patch
new file mode 100644
index 000000000000..9153a87dcf9d
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.20.10-libcdio-2.patch
@@ -0,0 +1,27 @@
+From 12fd1cad0cc5472cbe931516970c1ac7aeb7ec00 Mon Sep 17 00:00:00 2001
+From: Max Kellermann <max@musicpd.org>
+Date: Sat, 3 Feb 2018 19:32:31 +0100
+Subject: [PATCH] archive/iso9660: libcdio 2.0 compatibility
+
+Closes #173
+---
+ src/archive/plugins/Iso9660ArchivePlugin.cxx | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/archive/plugins/Iso9660ArchivePlugin.cxx b/src/archive/plugins/Iso9660ArchivePlugin.cxx
+index 536745d85..363921527 100644
+--- a/src/archive/plugins/Iso9660ArchivePlugin.cxx
++++ b/src/archive/plugins/Iso9660ArchivePlugin.cxx
+@@ -115,7 +115,12 @@ Iso9660ArchiveFile::Visit(char *path, size_t length, size_t capacity,
+ 			visitor.VisitArchiveEntry(path + 1);
+ 		}
+ 	}
++
++#if LIBCDIO_VERSION_NUM >= 20000
++	iso9660_filelist_free(entlist);
++#else
+ 	_cdio_list_free (entlist, true);
++#endif
+ }
+ 
+ static ArchiveFile *
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 006975e46128..422ce7b850ea 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -5,6 +5,10 @@
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
   </maintainer>
+  <maintainer type="person">
+    <email>zlogene@gentoo.org</email>
+    <name>Mikle Kolyada</name>
+  </maintainer>
   <use>
     <flag name="adplug">Enable the AdPlug decoder plugin</flag>
     <flag name="cdio">Use libcdio for ISO9660 parsing support</flag>
diff --git a/media-sound/mpd/mpd-0.20.10.ebuild b/media-sound/mpd/mpd-0.20.10.ebuild
index f6cea8f7ebd7..e5b9f541a62f 100644
--- a/media-sound/mpd/mpd-0.20.10.ebuild
+++ b/media-sound/mpd/mpd-0.20.10.ebuild
@@ -100,6 +100,7 @@ RDEPEND="${CDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.18.conf.patch
+	"${FILESDIR}"/${P}-libcdio-2.patch
 )
 
 pkg_setup() {
diff --git a/media-sound/mpd/mpd-0.20.12-r2.ebuild b/media-sound/mpd/mpd-0.20.12-r2.ebuild
index 85119e9eebe7..78b954370d78 100644
--- a/media-sound/mpd/mpd-0.20.12-r2.ebuild
+++ b/media-sound/mpd/mpd-0.20.12-r2.ebuild
@@ -105,7 +105,10 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-mpd )
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-0.18.conf.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+	"${FILESDIR}"/${PN}-0.20.10-libcdio-2.patch
+)
 
 pkg_setup() {
 	use network || ewarn "Icecast and Shoutcast streaming needs networking."
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 2357b400d740..5eb2c3310a32 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.ebuild 2906 BLAKE2B 36462309ca3efd27d94b9788da674763b07ca21c70e0a8cdcfa7465b714dce07ee2d05ca5c3a133ba68178bf3db8c4ce826f9adc2b0e6bdd54b81274ea079bdd SHA512 1bec3fba575532df6b2fe44a87053c7bb7c7d87953589d4aa0491ff936911bf3b4a384d9a083b7b4a734d485c43e80e812a6c34ae65b098cb204032e1177baf8
+EBUILD mpg123-1.25.10-r1.ebuild 2870 BLAKE2B ddadcd912e882997956e200dbedc0d856e8b1de0539afff3ea6a5eebb96cd011be02b3333dbf55dfdaba42565dcbd341c655dc469e312bc6ff2940f4f8510c29 SHA512 36c5c39f5904242f0b271ce87cb0df076da655829c4c59f5d39dc82ab436d9007454774205a43c69518879e5286826643d12a9cfad017cc6a96c2d3c1cd778da
 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.ebuild b/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
index 9ce3ffc8c792..673433c36334 100644
--- a/media-sound/mpg123/mpg123-1.25.10.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit flag-o-matic toolchain-funcs libtool multilib-minimal
 
 DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
@@ -10,11 +11,12 @@ 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.
-RDEPEND="app-eselect/eselect-mpg123
+RDEPEND="
+	app-eselect/eselect-mpg123
 	dev-libs/libltdl:0
 	alsa? ( media-libs/alsa-lib )
 	jack? ( virtual/jack )
@@ -91,7 +93,7 @@ multilib_src_configure() {
 multilib_src_install_all() {
 	einstalldocs
 	mv "${ED}"/usr/bin/mpg123{,-mpg123}
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index c50f7314ffc4..9c4b8dc8395b 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,2 +1,2 @@
-EBUILD mumble-9999.ebuild 2938 BLAKE2B 7dd09916803c64271aefdea74382bfc8a3a700fce6eb07bc00f08d4cc337dede346bd836380f71f690e20493e3d98bc594eace985df6fae572d8827aefc3ff61 SHA512 c434b208665e4a74cd19c326727ad02fddb90ac26353eabce996a9c90df22d8e8011e74c4470e3e4150d15b0909d1c5e2df9cd467ce154d8ccdc89bf47e50626
+EBUILD mumble-9999.ebuild 3023 BLAKE2B 16048b08d26ee51dcccacd19c9e6adfc0038e6d50d83a79b4f87f47ca8fa642fbf78cbb46f96c5553d1a6fbd44dc6af3de43a96cb149009cb58a6f8d4693d6fe SHA512 97b35ab609a8b7e7757633a8f80dd4d36697d52d58d5e1aa4ac3e55396ec4aef4df8fbe0a43bad3173ae1975eabb0825778dac127639bdabb06ccee641a1725b
 MISC metadata.xml 843 BLAKE2B 5048f202061b73223ef1d8c7beb20e5fbeb3726c0f1d8039bf4385e111e221dcc52ed309356311f3ba885f306c4d7c074caf9c785c86d8fda924c4ebf69475ae SHA512 0037f9510526f803d2abfe97c2b8712ff626b93d12457d5111f23b20787505168789cd86f9a3b4dad845634f584faa9e30e02777f4d0a7a8bd34f9fc9e1ca40f
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index 6caa7e0e0b35..e75beaeaaecf 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit multilib desktop qmake-utils xdg-utils
+inherit desktop gnome2-utils qmake-utils xdg-utils
 
 DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
 HOMEPAGE="https://wiki.mumble.info"
@@ -20,7 +20,7 @@ fi
 
 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="+alsa +dbus debug g15 libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
+IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -40,6 +40,7 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	dbus? ( dev-qt/qtdbus:5 )
 	g15? ( app-misc/g15daemon )
+	jack? ( virtual/jack )
 	!libressl? ( >=dev-libs/openssl-1.0.0b:0= )
 	libressl? ( dev-libs/libressl )
 	opus? ( >=media-libs/opus-1.0.1 )
@@ -50,6 +51,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.41.0
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 	x11-base/xorg-proto
 "
@@ -71,19 +73,17 @@ src_configure() {
 		$(myuse dbus)
 		$(usex debug 'symbols debug' release)
 		$(myuse g15)
+		$(usex jack '' no-jackaudio)
 		$(myuse opus)
 		$(myuse oss)
 		$(myuse portaudio)
+		$(myuse pulseaudio)
 		$(myuse rnnoise)
 		$(usex speech '' no-speechd)
 		$(usex zeroconf '' no-bonjour)
 	)
 
-	if has_version '<=sys-devel/gcc-4.2'; then
-		conf_add+=( no-pch )
-	else
-		use pch || conf_add+=( no-pch )
-	fi
+	use pch || conf_add+=( no-pch )
 
 	eqmake5 "${S}/main.pro" -recursive \
 		CONFIG+="${conf_add[*]}" \
@@ -116,6 +116,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	gnome2_icon_cache_update
 	xdg_desktop_database_update
 	echo
 	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
@@ -124,5 +125,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 0755bfc34dc7..f04969c424cf 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,12 +1,9 @@
-DIST musescore-2.0.2-fix-buildsystem.patch.bz2 2829 BLAKE2B 873265c9527f0df94a9ded5c9a34e1be5e677a00567bf09787228ee5195d49c77ea489166965c2b3defa7b8ddd38547d34be6ead4a1cbd18d575272690efed28 SHA512 2790352aa29215d02085a85fb2bae782fb8dd0db1c81b0d1d09d2d663843269cb32fa077663421bd2867779d1248ec36a34edb896e3e050f88f37c01111fe70b
-DIST musescore-2.0.2.tar.gz 44528670 BLAKE2B 18bc664c8b1d36b8b3d649b68bb3a6edd7eeb30744552fd7d4211eed8f995a71da0f61992f92886080882c4d8ad4184876745ce405dafeb2f017bab7eb761ef6 SHA512 aeb5f0c696a3c0796604c687cb3ea7303dd3536da71cf1b1e71f909cd5caa0864a879ffb19931f6ab0dc6fff854c9f2e05a64905e186b417fa954b73e3e9f08c
-DIST musescore-2.0.3-fix-buildsystem.patch.bz2 3446 BLAKE2B a6c1f000248e3ccbf993633901dee92c32930c46c73e485c273069328f14911bb7edec1d3ea6e41cb0709e328d3c46ef902f9dbd4859cb63a962978d490d98c1 SHA512 9b1bdd2b6ef68baebcb5209ada409fcf2648d999d997d490b15c2a40185f6b0a04ecb8690978707872d02a30d99ac2f80ebb72f6f19e15ec3404f996f89602b2
-DIST musescore-2.0.3.tar.gz 49958474 BLAKE2B f8b490eea470b2f72b13d6a62481a75a8132af0267d10a3a4f77e1069d7bc8b03b96a54ca287465e12c3862b3837adcbc4a181ffeac5a2c46b1b7d8ac9a051f2 SHA512 4cd1301036781a54fba06870cc6a3235919ca702ccbe45dcfd74b1d3a1173fa124cca7bcec2fdfb080fb7e3eaf870ba1879ea6738c764836b2f7cae6f7c2d3c1
+AUX musescore-2.1.0-pch.patch 1044 BLAKE2B 884fd6a532ace31f878c0a0e17323792871e7f297a340b605edf3a8cbc1591669c73d58610ba24b2104dc030e7a2599b60df6c553ab2e9a69a12a33dd97a87ed SHA512 daf676955df4947c119904e93452a2fa81e877951d6e509e250e7cb88b406a5533fb7b3463613c1b27bf4708586484ce65786572aaade3a616197c2dfc76115d
+AUX musescore-2.1.0-qt-5.11.patch 575 BLAKE2B 1dd0dfea52f73dc3d031dcead6ba07ac55195b264f393c39f0c411d6fc3f9d974f78a6948a9918ca67381e5c2c0b67750a5ccf0ac4a2ed2a8d1000434157d8a8 SHA512 5a6ec5aedaae257223fec6137dcc5ded44d6a4478f183c61220cd7d3c4b96c0fe591ff12070e4962979bb5c6d93a8c87a3003d3bcb449b1fe0977072e55615ed
+AUX musescore-2.1.0-qtsingleapplication.patch 1176 BLAKE2B 6218c930ba69595f6ad674d225b95a34e8b7fec4b93f9bd23ca7f0c3201c4af04056c1b23c191be2764d350afae36d1f586555358141e9efb50e6a622ab9c5ab SHA512 fc1300940b6101f985a607fa3c1e3ebc2d3b88335f57bb9cb2b442e0253c24cc31a5d1d07c1dfc507234a0146bfd480ea546ac8b63ffbfcef1635d5086326bf0
 DIST musescore-2.1.0-fix-buildsystem.patch.bz2 3736 BLAKE2B da2b1fa72c6fb59ff3d969ac8cf088bf034313ec8fe584f5f5fe335c7fd663a8f078d4d12a2ad439a086665384cfe7b24901c80707dd80403e1cdac1c2ebef1a SHA512 5f712ec046c0f53c24d61b43c79cd5e3e604c499ca95f47c79f29c5442b54d1867f699ea689de9328b5bece432ddaa4da557328ed6d069347870eba8e8695ffc
 DIST musescore-2.1.0.tar.gz 51131549 BLAKE2B 208377e786b83122402140bad2a9ac024d56a66316c74f52b7ca4d71f3dec9f91c3f0a7dd1b1c92e2bd5a81a63722593c2b41ac5f7af5dcb712e5de078df8852 SHA512 c8696685713cd4c4943f1ec2b69a6a93217449fa330105ed1ffb569918af293c1d6ef19cabe1e487f65ceadf27dff78185e286e82ac4517cd2b4de594a67beb2
 DIST musescore-9999-fix-buildsystem.patch.bz2 4019 BLAKE2B 0a80141d36fe8cf1bb4ac92f330c0b401a8686fa661b02842f49ee67d5fdeef339ae6909091637e22c81dddfa128b884c9bdaecdc540274896251424b40b78ae SHA512 6ac113314e3dc93856002df5b89f86728873869075db5e2b99f29f6b69c5ddbd178f89305656370b09d8180eb44b7a56623f06a8e674a522390c8dc59e32ad89
-EBUILD musescore-2.0.2-r1.ebuild 1566 BLAKE2B 94e3fecca8df157015e02d6f57f0d2fb9c1748ba60618390429c81d4f2adf21db38806e5534e3082ef4a7d96b0c2e14250023f18b53f7829c653c362d527f42c SHA512 339d5d928a23418d7755bd65cb959bd66a71dc56a53c79216ec1701f214973c6ee1f6a8b756ad63a1e63cbd09acaa5f98cc63aeb093206b3266d9fc18194210b
-EBUILD musescore-2.0.3.ebuild 1450 BLAKE2B e6f15e39839681401dd250c958133d14b0a1eeeb8980bcb31112eab5c2e082eaefc63a579575c75e35ff88066fe0379bb61bd152201a476892f387154e5c1300 SHA512 8f92f73a4f7d46e187aecd5be64050b95f90665863599a93231d6c32f62fca1e15b3d66737403d3b62766873886a9415099175e911711bb9901a3cf03959b64b
-EBUILD musescore-2.1.0.ebuild 1549 BLAKE2B 924e739b56a1fde247bda4de66f375a5544136432a230309389a692249c426aea7ad12dab94a28d1f7f5fba7c5d3a62b2dce86230d539bbbfdb5843e187f2a77 SHA512 be3cdb9f062633f6bc593e398278888c58a57c24c74133603fde10e3e6316ca7012377ee919f22c15e19211b6c9c1e458e946bea582f405f1e0b4dd60992e64a
-EBUILD musescore-9999.ebuild 1543 BLAKE2B 85e57aeef58d70051254bd7055813f99fc7228e22b36c3f1e908d971af61fa7e7d34e6cad2806c89cb5d45a89a0d0a6804cf3ed9ce43bb5d00549d7d737c7e68 SHA512 402933f1866594ae1d1902cbf553f80bdac1296451d8321b803e363b9bb54832af75f10428a58f7f64e202f5e5195c946561f406bb0b6bc91b74b84bdbf7e63c
-MISC metadata.xml 501 BLAKE2B 034cfd36ef8d38888df28696f2bb46b9840d1cd59d14d3cc87b0e3984b46b86b86620e84e7df0e816ec23455b87083fea17ddfd228457f326f9ffb4c34b4f441 SHA512 a0a5a3ca86ce04c7ac3b4c0f68914123feacfe5586c1c97813a8f6dde67383e661e2a992c955c49f3e1edaf1193eb24fcc2c14b8c0806faa93b41b5ea94c709c
+EBUILD musescore-2.1.0-r1.ebuild 2058 BLAKE2B 6d0dc4398e40241cd2a4eb8a1931e01bef710e506142c1fb88dc75e459c8b46139f2f4619dd4256301fcb56c91cf5302e9849f403aa3513d5e470f91725bf91d SHA512 92e3574b1e6b1754598e3831326586554a574af543569d85fbe6c21251076bb5d04ca57d44fdd8d4cca11bbc7182813b49dd19aa5e1b2087d21abd3805e7a497
+EBUILD musescore-9999.ebuild 2050 BLAKE2B 8c7c0f41b3c956c6a960b791db44b8c9d39f7ba6d3fb12b2b18253c5160e272fd3f6e75abf421fdbe2caf34628c8f55775d4b18b28b92d7717ca5fdcd5c8be06 SHA512 550226b2ea764ee2f03c8ca71ff601adeb5822dd629e94fc52435879a069128e886ccdd1e9f42feba482f193129113e0b16173d07379709c5cd123e79177c29d
+MISC metadata.xml 685 BLAKE2B 1ab11b407c05d18fa7fea53e4965f37dad96d2845fefc0ead84dab785a8c7684866e6455e500035d88a26ab3a59d18509e85811a5cc5a291bb033a78b55455b0 SHA512 3c9ad5c65edfafa2019ffeeabe13df04bbf5ef3dcee206284cf7e8b79543782da1312f7f443e4ab569248216410c4ac302ded74e074606f6ed8a3930344f483b
diff --git a/media-sound/musescore/files/musescore-2.1.0-pch.patch b/media-sound/musescore/files/musescore-2.1.0-pch.patch
new file mode 100644
index 000000000000..d69d1cd2f654
--- /dev/null
+++ b/media-sound/musescore/files/musescore-2.1.0-pch.patch
@@ -0,0 +1,31 @@
+From 5e8024c683891be677075d74cedfbf424e36bc31 Mon Sep 17 00:00:00 2001
+From: mirabilos <tg@debian.org>
+Date: Sun, 4 Mar 2018 16:38:21 +0100
+Subject: [PATCH] Fix numerous reports of missing all.h during compilation
+
+When disabling PCH, the all.h copying code is no longer run before
+AUTOMOC=caused *_autogen targets, so we must run it earlier.
+
+From Debian
+---
+ CMakeLists.txt | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 66b0ddfce8..7fdfffcc9b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -553,11 +553,8 @@ endif (NOT MINGW AND NOT APPLE)
+ #
+ 
+ # all.h is expected in PROJECT_BINARY_DIR by subdirs
+-add_custom_command(
+-    OUTPUT ${PROJECT_BINARY_DIR}/all.h
+-    COMMAND ${CMAKE_COMMAND}
+-    ARGS -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h
+-    DEPENDS ${PROJECT_SOURCE_DIR}/all.h
++execute_process(
++    COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h
+     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+     )
+ 
+\ No newline at end of file
diff --git a/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch b/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch
new file mode 100644
index 000000000000..2fa6afd9395d
--- /dev/null
+++ b/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch
@@ -0,0 +1,21 @@
+From 9c8a8ffe0cbb00ee93a10fe245da01a4d32ca086 Mon Sep 17 00:00:00 2001
+From: Orcan Ogetbil <orcan@localhost.localdomain>
+Date: Thu, 31 May 2018 21:04:51 -0400
+Subject: [PATCH] added missing #include <QButtonGroup> required by qt >= 5.11
+
+---
+ all.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/all.h b/all.h
+index 72db72b0ec..2ee0e8e807 100644
+--- a/all.h
++++ b/all.h
+@@ -131,6 +131,7 @@
+ #include <QProgressBar>
+ #include <QProgressDialog>
+ #include <QRadioButton>
++#include <QButtonGroup>
+ #include <QSplashScreen>
+ #include <QFontComboBox>
+ #include <QApplication>
diff --git a/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch b/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch
new file mode 100644
index 000000000000..1e362dd3298a
--- /dev/null
+++ b/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch
@@ -0,0 +1,28 @@
+From 4c28258db05dd6d33bbcd037a05a7fbbb66f67ab Mon Sep 17 00:00:00 2001
+From: Joachim Schmitz <jojo@schmitz-digital.de>
+Date: Wed, 8 Aug 2018 09:16:54 +0200
+Subject: [PATCH] Fix #52106: fails to compile with
+ -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+
+---
+ CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3a30c03d63..be6a50578a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -537,8 +537,13 @@ endif(APPLE)
+ ##
+ 
+ if (USE_SYSTEM_QTSINGLEAPPLICATION)
++    if (USE_PATH_WITH_EXPLICIT_QT_VERSION)
++      find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES qt5/QtSolutions)
++      find_library(QTSINGLEAPPLICATION_LIBRARIES Qt5Solutions_SingleApplication-2.6)
++    else (USE_PATH_WITH_EXPLICIT_QT_VERSION)
+       find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES QtSolutions)
+       find_library(QTSINGLEAPPLICATION_LIBRARIES QtSolutions_SingleApplication-2.6)
++    endif (USE_PATH_WITH_EXPLICIT_QT_VERSION)
+ else(USE_SYSTEM_QTSINGLEAPPLICATION)
+       subdirs (thirdparty/singleapp)
+       set(QTSINGLEAPPLICATION_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/singleapp/src)
diff --git a/media-sound/musescore/metadata.xml b/media-sound/musescore/metadata.xml
index 73e8e2334c09..f0d90452cf33 100644
--- a/media-sound/musescore/metadata.xml
+++ b/media-sound/musescore/metadata.xml
@@ -11,5 +11,7 @@
 	</upstream>
 	<use>
 		<flag name="portmidi">Enable support for building against <pkg>media-libs/portmidi</pkg></flag>
+		<flag name="vorbis">Enable SoundFont support using  <pkg>media-libs/libvorbis</pkg></flag>
+		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for embedded web browser</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/musescore/musescore-2.0.2-r1.ebuild b/media-sound/musescore/musescore-2.0.2-r1.ebuild
deleted file mode 100644
index 84ac9cadf90a..000000000000
--- a/media-sound/musescore/musescore-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-SRC_URI="https://github.com/${PN}/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="audiofile debug jack mp3 portaudio pulseaudio"
-
-RDEPEND="
-	>=dev-qt/qtconcurrent-5.3.0:5
-	>=dev-qt/qtcore-5.3.0:5
-	>=dev-qt/qtdeclarative-5.3.0:5
-	>=dev-qt/qtgui-5.3.0:5
-	>=dev-qt/qthelp-5.3.0:5
-	>=dev-qt/qtprintsupport-5.3.0:5
-	>=dev-qt/qtsvg-5.3.0:5
-	>=dev-qt/qtwebkit-5.3.0:5
-	>=dev-qt/qtxmlpatterns-5.3.0:5
-	>=media-libs/alsa-lib-1.0.0
-	>=media-libs/freetype-2.5.2
-	sys-libs/zlib
-	audiofile? (
-		media-libs/audiofile
-		media-libs/libsndfile
-	)
-	jack? ( media-sound/jack-audio-connection-kit )
-	mp3? ( media-sound/lame )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	"
-DEPEND="${RDEPEND}
-	dev-util/cmake
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	"
-PATCHES=(
-	"${WORKDIR}/${P}-fix-buildsystem.patch"
-)
-S="${WORKDIR}/MuseScore-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_audiofile="$(usex audiofile)"
-		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME="$(usex mp3)"
-		-DUSE_portaudio="$(usex portaudio)"
-		-DUSE_pulseaudio="$(usex pulseaudio)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake-utils_src_make -j1 lrelease manpages
-	cmake-utils_src_compile
-}
diff --git a/media-sound/musescore/musescore-2.0.3.ebuild b/media-sound/musescore/musescore-2.0.3.ebuild
deleted file mode 100644
index 27aff7756bea..000000000000
--- a/media-sound/musescore/musescore-2.0.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-SRC_URI="https://github.com/${PN}/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack mp3 portaudio pulseaudio"
-
-RDEPEND="
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/freetype-2.5.2
-	media-libs/libsndfile
-	sys-libs/zlib
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	mp3? ( media-sound/lame )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	"
-PATCHES=(
-	"${WORKDIR}/${PN}-2.0.3-fix-buildsystem.patch"
-)
-S="${WORKDIR}/MuseScore-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_ALSA="$(usex alsa)"
-		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME="$(usex mp3)"
-		-DBUILD_PORTAUDIO="$(usex portaudio)"
-		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake-utils_src_make -j1 lrelease manpages
-	cmake-utils_src_compile
-}
diff --git a/media-sound/musescore/musescore-2.1.0.ebuild b/media-sound/musescore/musescore-2.1.0-r1.ebuild
index c5eb58ccd824..56805b5d0079 100644
--- a/media-sound/musescore/musescore-2.1.0.ebuild
+++ b/media-sound/musescore/musescore-2.1.0-r1.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils
+inherit cmake-utils xdg-utils
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="http://musescore.org/"
+HOMEPAGE="https://musescore.org/"
 SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio"
+IUSE="alsa debug jack portaudio portmidi pulseaudio vorbis"
 REQUIRED_USE="portmidi? ( portaudio )"
 
 RDEPEND="
@@ -23,37 +23,50 @@ RDEPEND="
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
 	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
+	>=dev-qt/qtsingleapplication-2.6.1_p20171024
 	dev-qt/qtsvg:5
 	dev-qt/qtwebkit:5
+	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
 	>=media-libs/freetype-2.5.2
 	media-libs/libsndfile
-	sys-libs/zlib
+	media-sound/lame
+	sys-libs/zlib:=
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
 	jack? ( virtual/jack )
-	mp3? ( media-sound/lame )
 	portaudio? ( media-libs/portaudio )
 	portmidi? ( media-libs/portmidi )
 	pulseaudio? ( media-sound/pulseaudio )
-	"
+	vorbis? ( media-libs/libvorbis )
+"
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig
-	"
+"
+
 PATCHES=(
-	"${WORKDIR}/${PN}-2.1.0-fix-buildsystem.patch"
+	"${WORKDIR}/${P}-fix-buildsystem.patch"
+	"${FILESDIR}/${P}-qt-5.11.patch"
+	"${FILESDIR}/${P}-qtsingleapplication.patch"
+	"${FILESDIR}/${P}-pch.patch"
 )
+
 S="${WORKDIR}/MuseScore-${PV}"
 
 src_configure() {
 	local mycmakeargs=(
+		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
+		-DUSE_SYSTEM_FREETYPE=ON
 		-DBUILD_ALSA="$(usex alsa)"
 		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME="$(usex mp3)"
+		-DBUILD_LAME=ON
 		-DBUILD_PORTAUDIO="$(usex portaudio)"
 		-DBUILD_PORTMIDI="$(usex portmidi)"
 		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+		-DSOUNDFONT3="$(usex vorbis)"
 	)
 	cmake-utils_src_configure
 }
@@ -63,3 +76,13 @@ src_compile() {
 	cmake-utils_src_make -j1 lrelease manpages
 	cmake-utils_src_compile
 }
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 09988cf9c632..051ffdcc6ae9 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils git-r3
+inherit cmake-utils git-r3 xdg-utils
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/"
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio"
+IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 
 RDEPEND="
@@ -23,24 +23,29 @@ RDEPEND="
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
 	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
+	>=dev-qt/qtsingleapplication-2.6.1_p20171024
 	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
+	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
 	>=media-libs/freetype-2.5.2
 	media-libs/libsndfile
-	sys-libs/zlib
+	sys-libs/zlib:=
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
 	jack? ( virtual/jack )
 	mp3? ( media-sound/lame )
 	portaudio? ( media-libs/portaudio )
 	portmidi? ( media-libs/portmidi )
 	pulseaudio? ( media-sound/pulseaudio )
-	"
+	vorbis? ( media-libs/libvorbis )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig
-	"
+"
+
 PATCHES=(
 	"${WORKDIR}/${P}-fix-buildsystem.patch"
 )
@@ -52,12 +57,17 @@ src_unpack() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
+		-DUSE_SYSTEM_FREETYPE=ON
 		-DBUILD_ALSA="$(usex alsa)"
 		-DBUILD_JACK="$(usex jack)"
 		-DBUILD_LAME="$(usex mp3)"
 		-DBUILD_PORTAUDIO="$(usex portaudio)"
 		-DBUILD_PORTMIDI="$(usex portmidi)"
 		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+		-DSOUNDFONT3="$(usex vorbis)"
+		-DBUILD_WEBEBENGINE="$(usex webengine)"
 	)
 	cmake-utils_src_configure
 }
@@ -67,3 +77,13 @@ src_compile() {
 	cmake-utils_src_make -j1 lrelease manpages
 	cmake-utils_src_compile
 }
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/neroaac/Manifest b/media-sound/neroaac/Manifest
deleted file mode 100644
index 8514a6e3b6f3..000000000000
--- a/media-sound/neroaac/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST NeroAACCodec-1.5.1.zip 2050564 BLAKE2B 40a7b61c3434829aaa775f5832aa9f8c1cb026327815d567b8990c6641c37990569aa80d051046b1c99e68b945163e0be845d2481c56528c8263f4b4e4773ab3 SHA512 7ceeb56a32b488fbb609eeb52a896bb4ab447c13769f765dcc50361093482e9d42f15ac42eb6be428a210b12fd31aedbff588232a7e268c88dd4d97f9ab191ef
-EBUILD neroaac-1.5.1.ebuild 1076 BLAKE2B 106494df2452cd151a4fe22eb10a03889843d00520513756b16d14ee742dcfc405d3f197f7deccb07deacf5a3815a451682da9e6b081d177e570ac63882e362c SHA512 10fa7be4ef62ff368164d8fd16e55e9914cdb63fe5dbefa6179d9ca96aceb29838ba5bfbcb6154861ddf765a77913afcaf1fe49b52d767ee7b8e369813aa6389
-MISC metadata.xml 274 BLAKE2B 28a05a9972e9ead3e9131c582422d07657c1148f7e0022bdab0f37180b776d1395ebc625b2a14e0729ea8b28e579eee29d0c94740d4f1355def2cce92ac766b6 SHA512 91cd3c489d25085a58773f40f6c1a481e9057ce95e4e2813b7127215ce5282d8104574c8b6939c22795c13f1a14c4d2ab85d75c4a8c08cf669bf94049ce6493f
diff --git a/media-sound/neroaac/metadata.xml b/media-sound/neroaac/metadata.xml
deleted file mode 100644
index ddd95185c8e4..000000000000
--- a/media-sound/neroaac/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Nero AAC reference quality MPEG-4 and 3GPP audio codec.
-	</longdescription>
-</pkgmetadata>
diff --git a/media-sound/neroaac/neroaac-1.5.1.ebuild b/media-sound/neroaac/neroaac-1.5.1.ebuild
deleted file mode 100644
index a47f7908faba..000000000000
--- a/media-sound/neroaac/neroaac-1.5.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Nero AAC reference quality MPEG-4 and 3GPP audio codec"
-HOMEPAGE="http://www.nero.com/enu/technologies-aac-codec.html"
-SRC_URI="http://ftp6.nero.com/tools/NeroAACCodec-${PV}.zip"
-
-LICENSE="Nero-AAC-EULA"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-RESTRICT="strip mirror test"
-
-QA_PRESTRIPPED="opt/${PN}/${PV}/neroAac\(Dec\|Enc\|Tag\)"
-QA_EXECSTACK="opt/${PN}/${PV}/neroAacDec opt/${PN}/${PV}/neroAacEnc"
-QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	edos2unix *.txt
-}
-
-src_install() {
-	exeinto /opt/${PN}/${PV}
-	doexe linux/*
-	dodir /opt/bin
-	dosym ../${PN}/${PV}/neroAacDec /opt/bin/neroAacDec
-	dosym ../${PN}/${PV}/neroAacEnc /opt/bin/neroAacEnc
-	dosym ../${PN}/${PV}/neroAacTag /opt/bin/neroAacTag
-	newdoc readme.txt README
-	newdoc license.txt LICENSE
-	newdoc changelog.txt ChangeLog
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins NeroAAC_tut.pdf
-	fi
-}
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 76cdebb1b88d..d86e56c37ba4 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,4 +1,8 @@
+AUX picard-2.0.3-crashfix.patch 639 BLAKE2B 2476104b4d1cb73cf1a88f006d88dcb598a5394794b9d28281b51a9661e5d8bed3a6693c98d8e84420980b98aabebae8430d6dc92478c2ab2c6d2d4a85a03cc6 SHA512 80380f0151b0ea5c3eea03d4f0e1a318c422d454324bdd403788e1553b129d9e3c41d79ffe4f74f492f752fb8e66ae6a53817ae4469a9066d2adc31e869b4ee8
+AUX picard-2.0.3-iteration-error.patch 904 BLAKE2B dfd8f64219a17cfa3ed5550eb5dfe4b268eaa09b28f493ccdb37da865d8d8d59f218a0c4d87b15013954bf3cf272d5776cc722a6fd47254a35d54f7d17d68e85 SHA512 b13e65e46a8fe0930473a76e414ac55443bf32516728221f902767510442807d5d2ddf70e15df1a851a31458876f578a270e630c0402379ff8f517b84be01865
 DIST picard-2.0.0_beta3.tar.gz 2686246 BLAKE2B e11cc85282bb3dfe7298090e42b62f7e9b2d4ee7df09b040905665694074ede611884e1544abc89aa3d07e0844d6599d5fac7c0db09bad7d9e64439c0c4478c9 SHA512 c8c5bdd84af3946bc24eb495bcb83877dffedb81e6ff64742925f6d1b4f2780f86280dda839d96030ea15ee2a7bf7708c20cc4ac92e97bf9cd372ea36715d156
+DIST picard-2.0.3.tar.gz 2748358 BLAKE2B ff71f9d7836b9f797a539db772e2ffcb8cb9ba4c25997c01590292bf1b7b5d311089174313af86f1eb0e82af48bc8f350578ae6bdffba3c6b3bf98b934481f8d SHA512 759252fa3c43af1bfc09d85ef90fe451e674bfebaee31838bd2779380d1b8ad817f899896baeccf583464566eb2acfe886c8288d1757faaaff2dc17c3b8ef6ae
 EBUILD picard-2.0.0_beta3.ebuild 1774 BLAKE2B 0dd094c47179e50704a8431322051a1942cbebf34ebd171f27823734b34103dc7427b13fce2714297cb7f811a62cbf90595212dc3b0205a0c55cb02be9ebb2fa SHA512 2f6936e6544930d2d60eec787e6a0f8cc36b49f891269448b0b308c9595aa5d9441012fe2f6eafa9d30fc40f647e9c74bc0e844f9323248f5477b562157cb768
+EBUILD picard-2.0.3.ebuild 1865 BLAKE2B 96e6997ca21026d9d48bc6dd1f87fec61a8b3c6322e2d03ddfb986a7d7aac64f35672532475a156f6045ea93b1c3aff0298a93c95254376ccd20004793ca0eb8 SHA512 50267055f69dd61d6542654672e55fc50cdefc9cd0790f3028643a40c086048adf842d7a1c4c5933cf86835a40c4144abc6c977f8ae409de45fec3cd0fe2b59a
 EBUILD picard-9999.ebuild 1698 BLAKE2B e2a3f8d9f18bc4560afa0dd926487d5a7ba1d609870c67cfd569c71ba25f623613796ee3fe61c3d2884670af6c64a609e12d7ba2667f64a6bcb87eb1724eea6d SHA512 d780f2c5855f59314d86089eed73b60c35dbe0083198b38bb4b61231affa31c3a7fc184083c593e3fde6c39cb4f4e561d2bc10d4bd57cd7226187bd9e3c60b75
 MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d
diff --git a/media-sound/picard/files/picard-2.0.3-crashfix.patch b/media-sound/picard/files/picard-2.0.3-crashfix.patch
new file mode 100644
index 000000000000..33c331778219
--- /dev/null
+++ b/media-sound/picard/files/picard-2.0.3-crashfix.patch
@@ -0,0 +1,23 @@
+From 24722cc47cc9e968eb05becf6056517b23e81e34 Mon Sep 17 00:00:00 2001
+From: Sambhav Kothari <sambhavs.email@gmail.com>
+Date: Sun, 12 Aug 2018 18:06:58 +0100
+Subject: [PATCH] PICARD-1310: Fix crash on clearing the log, due to wrong var.
+ name
+
+---
+ picard/log.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/picard/log.py b/picard/log.py
+index 5974a8a8c..a388af554 100644
+--- a/picard/log.py
++++ b/picard/log.py
+@@ -90,7 +90,7 @@ def contents(self, prev=-1):
+         return contents
+ 
+     def clear(self):
+-        with self.log_queue_lock:
++        with self._queue_lock:
+             self._log_queue.clear()
+ 
+ 
diff --git a/media-sound/picard/files/picard-2.0.3-iteration-error.patch b/media-sound/picard/files/picard-2.0.3-iteration-error.patch
new file mode 100644
index 000000000000..36e0b8092c54
--- /dev/null
+++ b/media-sound/picard/files/picard-2.0.3-iteration-error.patch
@@ -0,0 +1,24 @@
+From c5f8237bba87dcf113e41cd53a723ce1dad2c3dd Mon Sep 17 00:00:00 2001
+From: Laurent Monin <github@norz.org>
+Date: Mon, 20 Aug 2018 14:08:11 +0200
+Subject: [PATCH] PICARD-1318: Fix dictionary changed size during iteration
+ error
+
+It happens when looking up a track with script $set(newartists, %artists%)
+---
+ picard/metadata.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/picard/metadata.py b/picard/metadata.py
+index 8e2aa5266..4f9269b0c 100644
+--- a/picard/metadata.py
++++ b/picard/metadata.py
+@@ -333,7 +333,7 @@ def rawitems(self):
+     def apply_func(self, func):
+         for key, values in self.rawitems():
+             if key not in PRESERVED_TAGS:
+-                self[key] = [func(value) for value in values]
++                super().__setitem__(key, [func(value) for value in values])
+ 
+     def strip_whitespace(self):
+         """Strip leading/trailing whitespace.
diff --git a/media-sound/picard/picard-2.0.3.ebuild b/media-sound/picard/picard-2.0.3.ebuild
new file mode 100644
index 000000000000..4db7f7a110a7
--- /dev/null
+++ b/media-sound/picard/picard-2.0.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+DISTUTILS_SINGLE_IMPL=1
+DISABLE_AUTOFORMATTING=true
+
+inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="A cross-platform music tagger"
+HOMEPAGE="https://picard.musicbrainz.org"
+SRC_URI="https://github.com/metabrainz/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+	dev-qt/qtgui:5[accessibility]
+	>=media-libs/mutagen-1.38"
+DEPEND="
+	nls? ( dev-qt/linguist-tools:5 )
+"
+
+RESTRICT="test" # doesn't work with ebuilds
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-crashfix.patch"
+	"${FILESDIR}/${P}-iteration-error.patch"
+)
+
+python_compile() {
+	local build_args=(
+		--disable-autoupdate
+	)
+	if ! use nls; then
+		build_args+=( --disable-locales )
+	fi
+	distutils-r1_python_compile ${build_args[@]}
+}
+
+python_install() {
+	local install_args=(
+		--disable-autoupdate
+		--skip-build
+	)
+	if ! use nls; then
+		install_args+=( --disable-locales )
+	fi
+	distutils-r1_python_install ${install_args[@]}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable
+calculation and lookup of AcoustID fingerprints.
+
+Install optional package dev-python/python-discid to enable
+calculation and lookup of compact disc identifiers (disc IDs).
+
+If you are upgrading Picard and it does not start, try removing
+Picard's settings:
+	rm ~/.config/MusicBrainz/Picard.conf"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index fb5b8aaf327b..e44cd185db3d 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,8 +1,8 @@
 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.2.6.tar.gz 986724 BLAKE2B ca76d9307f51886ee77f3748f1f4e552e8f083cc3051895a0d21147f5efe5be39eee8f3555b7c144663df1ab17c570c1d9b2b774a4561ff800201098577702c3 SHA512 ae13533111655789f86c35a22be3f323649bee55c2415ae9a04fd45c2a52482e107bdd80d9632a808544fd6b43250946b3678c0701602113f071d73c7dfa8df3
+DIST pulseeffects-4.2.7.tar.gz 987331 BLAKE2B a4abe4d34c85f541a181e4066d617759a16e9f053e33f266133b328ba6e93d1013ccec33f8468ce60ff3c3b2c487a32dd0a36700348c4d7fbbf2b043193cf65e SHA512 097c1ab4a45b827873a2f8316cd8090992853ddaaa7eaec74eca62564c6e03c36425e495012d8994db43beb2d896fa4bbb8c1cca5fbd0dbd80bfe5f98a266172
 EBUILD pulseeffects-3.1.6.ebuild 1474 BLAKE2B c37c8cc5b72e9ea384d7e34fe107a9d8a22fbf45309328dd49f99cca01cf85629497399fa388eb94b1a31dceb1dcd5ab5544abf73eddba81edecb1ba749e5a87 SHA512 34755ef7a7b27df191a9044e34f68bef3807a50b5e691adcaba156014244c8f89bed6583fb1684f586e45058eb6ffca0aa1f0af26266884ee32920131b8379de
 EBUILD pulseeffects-3.2.3.ebuild 1492 BLAKE2B 959ccbff4ddd3376895dd833d7a36ba81b8b2d46381a7cc14aa73ab2701d01910fcc340fffe0058099f31e80332670182671c3c737d0b41746af5a386b2e6182 SHA512 281ff12ecc62b6c75db6ffaa290517ab24c8110db4333c54221d87f2283feab60a5ff2e0e02ead2193bafcb7d4a8c6b990e67cd1925e9afa5ee16aa5b49decd2
-EBUILD pulseeffects-4.2.6.ebuild 1556 BLAKE2B 4916a47b76b4206d9f8b285916dbdfe13684c8feb6bb707a212a2a4844972f18370aba90719d982a8c2f8af452519ee25b225515d038dfef89167d514a9ba6b6 SHA512 7b22ee540afbcb64ac52bab63c430c69744513279153a6c5f7d277b9e3cb3a94576b037bd8e8d2b8b52837b10cd958d1af62e731e7904dbcc0d13f087f6f33ef
+EBUILD pulseeffects-4.2.7.ebuild 1551 BLAKE2B 379412fbb7666ef15c130838bb47d59934756dde1ad548bf045dfe86b6c5a41fd79a2569a47c43a8f291ec5ac5ee24ee5465871611163b6038654134a5df7b11 SHA512 f71084e6030630b9d77030dc798386d0498583a4ac6a3a49dc74410299eb2d1fe65da6dc9121a7048e6c59e778a763f8831d7829a3a9ec30ce74623322f454e3
 EBUILD pulseeffects-9999.ebuild 1556 BLAKE2B 4916a47b76b4206d9f8b285916dbdfe13684c8feb6bb707a212a2a4844972f18370aba90719d982a8c2f8af452519ee25b225515d038dfef89167d514a9ba6b6 SHA512 7b22ee540afbcb64ac52bab63c430c69744513279153a6c5f7d277b9e3cb3a94576b037bd8e8d2b8b52837b10cd958d1af62e731e7904dbcc0d13f087f6f33ef
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.2.6.ebuild b/media-sound/pulseeffects/pulseeffects-4.2.7.ebuild
index 90b1ffc99215..79ce00083ef9 100644
--- a/media-sound/pulseeffects/pulseeffects-4.2.6.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.2.7.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"
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index b0e98a952a0b..cdf3995f6dd5 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -5,6 +5,6 @@ DIST qmmp-1.2.3.tar.bz2 1187718 BLAKE2B f57eae68d25d709413a9cd33c48d82488be4e357
 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 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.2.3.ebuild b/media-sound/qmmp/qmmp-1.2.3.ebuild
index b0b24f039928..0fb7b7f79845 100644
--- a/media-sound/qmmp/qmmp-1.2.3.ebuild
+++ b/media-sound/qmmp/qmmp-1.2.3.ebuild
@@ -10,7 +10,7 @@ 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"
+	KEYWORDS="amd64 x86"
 else
 	QMMP_DEV_BRANCH="1.2"
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
diff --git a/media-sound/quimup/Manifest b/media-sound/quimup/Manifest
index 8ccadfd3daef..d81dfcdef553 100644
--- a/media-sound/quimup/Manifest
+++ b/media-sound/quimup/Manifest
@@ -1,4 +1,6 @@
 AUX quimup-1.4.0-qdatastream.patch 298 BLAKE2B 4268dead71539c993f1cf3a32e57d4600e71b964ce71d6412589c0c58ec3cfb57adf09d11d4b216ff8501fe2ce983737cfd650b2cc3a3b868207627ed0efeffa SHA512 04cd65acabdeee81a7002a3a9402213d842ae1aea52832549ebfa1037c9279ab4e2e3503f4fc6c0fd410d974b00838da6214fe1f11df311d57c15dc51a7e5abb
 DIST quimup_1.4.0_src.tar.gz 225621 BLAKE2B 2ee93c8bd7a674c2e86b4d6779e76deb0a86abe6ce4794acf416a4f24ce013b6e068718763a97592809bfb89168b98a1450765a7e1ba0e2a0cbff5fbeb10f58a SHA512 e5351d33a8082371fa50914381fcb7d0b15fe2d8d65feab64774c2d85476b6135d199a17bf125d2e39fa64916bc3d31da1ba5eec6b274ff6298e0b93237f8b61
+DIST quimup_1.4.3_source.tar.gz 587260 BLAKE2B ee2ce0d9f71c63db73af00fe385d643f5ec08e322137c0c4d372fec68b875587e0f46ca2a46d9afc366afdd29e5381816457e4b3b3891af8c0113c577385aa23 SHA512 fb3727bf5c0f756c888484f7c061da95a1ece15673079ac8e6ffc82289f78cfce3dda7245ae25b1d705ffe057f1b0930baf2338bdfe0f16c900dc1ffd3fef807
 EBUILD quimup-1.4.0.ebuild 848 BLAKE2B cea8bda4ac4276bf6bd1b48f45304b20eaa2d18a687553628300021dab6a41e550d406bf7c389985d9044893f2b8e2015c7e6acb0afa8c8f0e09cbdf72dea735 SHA512 d45bb1a1a4c0974faadd572b382ba997aaf02d88f0d3febb30bb5623dd9761f49d861a0974a375305f54d65cbcaaa98cb2774860672acea2fa5397da4cda8f8b
+EBUILD quimup-1.4.3.ebuild 797 BLAKE2B 78f5206660a40e18fc2e7ace3abd4ffce8a500470cc96954ffaf07f6f21f75841e1e2c3d2c81c404842f5a51f2a7d13e505cf4d2e2739a258e06f8a0bc4aa6d3 SHA512 5ba2e48f56c8b3a3a3c3d683c26e6a4a8cdaa93457157669a7dbe08434a3f63feb0398cb0689080d65ef9866bcc79d6afab969bf992bd34a95e117a72c8dd7d8
 MISC metadata.xml 339 BLAKE2B 6bb8fc9b606a6375c7997836909a5396bba8e726e2f0e06820e43574353a83ebe8cfe7fda125c6a1c892eed799195c7b74f1fa5c365686e0335a75f82848bbeb SHA512 02c262de7f82e49ebd91d60aa4e6577b8c4cead1b0b1df8a7bc18b575358e93b17384bc42ace5cf64b13116db9077fbc2262f110f6308cfa3621e994170cebd6
diff --git a/media-sound/quimup/quimup-1.4.3.ebuild b/media-sound/quimup/quimup-1.4.3.ebuild
new file mode 100644
index 000000000000..f1390ac72f02
--- /dev/null
+++ b/media-sound/quimup/quimup-1.4.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="A Qt5 client for the music player daemon (MPD) written in C++"
+HOMEPAGE="https://sourceforge.net/projects/quimup/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}_source.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	>=media-libs/libmpdclient-2.3
+	media-libs/taglib
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN^}_${PV}"
+
+DOCS=( changelog FAQ.txt README )
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	default
+	dobin ${PN}
+
+	newicon src/resources/mn_icon.png ${PN}.png
+	make_desktop_entry ${PN} Quimup
+}
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index 72f4d55aaef0..a090ffb7c326 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,3 +1,5 @@
 DIST schismtracker-20120105.tar.bz2 1097124 BLAKE2B 978e4b3e81b5c9ed93132aeb12febc2add281060f41d74a52da25799d7ae291d2cbc2401619fd01bc7bba342049d4aef6ac0fbf326443b790c4704301a78a511 SHA512 5b92603af3b6add0e8bd6d0b140b0ddedbaf8e2b434f651ab887e3211ccc8bcfa94be281aabc3b28dbd84e3d91f539eb0939d6d4e0596529133db7ce10aeafd8
+DIST schismtracker-20180810.tar.gz 1064821 BLAKE2B d8016437db7cf6e0087150755090621ba15661753ebcfb8081f0c137a93389d04aa7a5e1ac09fb1366d1d3b3f76c22cb497171a74fb226347eb194c58c1f0f18 SHA512 d131cec7e4749941f0e5806bff14e0782a01f14f8a68605270d09ff40af1d20fffd4c7caf2926c5a63d3e0c0bb1ed24ce4a5e4cccc280ac045a22cfb8544c498
 EBUILD schismtracker-20120105.ebuild 1365 BLAKE2B 8386318c84c7cc74cd744dc8d64ac739e9d109c60626e27400eafce87147c99a7d706a5bfbf5c756ca777f30b3489678764d959380b7f9a5ab577a37460073f7 SHA512 aa012b9e698edfd9a460c80101e573ddc627efeaa2d5a8c65e2bf41600212f0c1dfb44da2f55a57ae7c4e940e187a98c8464ce8092f4de0b1c0bd4cfa827076d
+EBUILD schismtracker-20180810.ebuild 1566 BLAKE2B 790cc5f10cf37da4dd672b0ecd2aa92771898ff8547e912b161e17ed569d9b57f89919dd0af4012ba1c6c520e3748533c6c123b4926ef954784674758eb9ffe4 SHA512 5fac164d9ae0681379f0880d6506a66edb98b7383c0d6d1180247eac5df287d445b1d4895177da60f027868326adbe7c57f60e579ad9617bffcb4929a5a5a3f8
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/schismtracker/schismtracker-20180810.ebuild b/media-sound/schismtracker/schismtracker-20180810.ebuild
new file mode 100644
index 000000000000..55398fb6ab34
--- /dev/null
+++ b/media-sound/schismtracker/schismtracker-20180810.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools desktop xdg-utils
+
+DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
+HOMEPAGE="http://schismtracker.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/alsa-lib
+	>=media-libs/libsdl-1.2[X]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXv
+	x11-libs/libXxf86misc
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	default
+	eautoreconf
+
+	sed -e "/^Categories/ s/Audio/AudioVideo;Audio/" -i sys/fd.org/schism.desktop || die
+
+	# workaround for temporary files (missing directory). Fixes:
+	# sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
+	# /bin/sh: auto/default-font.c: No such file or directory
+	mkdir auto
+
+	#   sys-devel/binutils[multitarget] provides ${CHOST}-windres
+	#   wine provides /usr/bin/windres
+	# and schismtracker fails to use it properly:
+	# sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
+	[[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
+}
+
+src_install() {
+	default
+
+	domenu sys/fd.org/*.desktop
+	doicon icons/schism{,-itf}-icon-128.png
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 4bdb21ebdd26..a762d2b9bda7 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,5 +1,7 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
 DIST spotify-client_1.0.80.480.g51b03ac3-13_amd64.deb 97542898 BLAKE2B a89f3f607c9fb03327886fc1b6eb8d433b32913aa7ff32e95f626a8ef7710c4d6102721b76e9a83f1342d1ac6f6941d85376b4cb878cf641f42f3c3756582eb9 SHA512 a46b1d28e6c40dbe9a86a38794186f2cdf31341fff953eaa5a5fdbb37c27c00ffe14a918b2552df0996d2842f009e6700bf8683e0667fc671dfd5b343251f20e
-EBUILD spotify-1.0.72.ebuild 3417 BLAKE2B ea84409bbe8dc6eb029fe6ee0393aacb9e8fbc15f018cca4887e4f7c1ff13c6417aa0b750fe0bc08860126a0c53e39e14f2ab8f291deca5536ce5b436b3e58d4 SHA512 a9d1fced3b9ec9518a7e0eab950895c270e77d377211ee68d8a49b673bf1ee77dceb9180e417b8dc5323b82f1a44b44e15b28b287602218bb7bcca86a88ba51b
-EBUILD spotify-1.0.80.ebuild 3643 BLAKE2B 6e890c7c44aefb42842f51febc5e357b4df6600e904dbb6a189beba956e511fadd91f0936113dbcfa6f7b7959ea2e02496902a68137c09b2ad643e89697b1505 SHA512 59490d8f948f090c7c101f0f3d489b7955bedca2d19b7c080c038e13c36c2b2c9d823f462033f021dabad3b50f8ef9b461080cf547f7be1ea464381117b65b9a
+DIST spotify-client_1.0.88.353.g15c26ea1-14_amd64.deb 103367590 BLAKE2B 90de37c58643cd864b35e26f2d97507872adfa3a6d9b7832d46d0caf9d3383673c67b2e4d7d7015075912cc2ae3754f575f968bd6b743760d7a910d90581d25c SHA512 30592c34a2b1b9d546c753d03a8ead7459d83bd5f420e1dab92a1f2ff40ac2daa0f4f447b95cd499a30328aea1afe8949e05fdd0668b9caf637abdecf5e45742
+EBUILD spotify-1.0.72.ebuild 3153 BLAKE2B 9b6a5885f84ad3380abbdceff28cdc0c124fb8b5e49b98ad07afcb0155b07ffcc22b5b8600408bd3a80a94122830cc084b8f976aeda933ee9958635e21885105 SHA512 be69b2a2ac5258244123132a10035acaeab07ade9ff36a9dcea282a1ec08ed262866238333142ebf2b43dee1c4c5b7febccc7f7a4c7db1a1e9d2b7b9e718082e
+EBUILD spotify-1.0.80.ebuild 3379 BLAKE2B da3e12406fd9d04ca447a8a8f690262c05c76b7397be06e40169c435d1883330d4c2800797e3d58976513c8fedadaa20f49e3b114f72a77a325f400f5cba0782 SHA512 cea23c3af5d75616742273f55468b45c72a38c359b3f0758ae6b5d54545ee868ef68f8f1ab7d5443dee2b1f707b38f6d62aea91744c4ec3ad6d80732fc545d5e
+EBUILD spotify-1.0.88-r1.ebuild 3379 BLAKE2B 9c4f894b4900725fd22fd17d193d050f8184e7ecd614aef00a3855fa26d002fbd62bd5d573f4e8ec1d69a7a98a9cc2d9b4a57ff2ed48bdf9741f22876c2dfa1e SHA512 7343ae6120d9cbee976619497ad0a143cc7eebd6c766777139dd8b3fc73876117f11f647a10b58ff681072e9efe04d79377c49ca673765352cc8313187cd19f4
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.0.72.ebuild b/media-sound/spotify/spotify-1.0.72.ebuild
index 3b8d57bd25aa..b4ac3c597ade 100644
--- a/media-sound/spotify/spotify-1.0.72.ebuild
+++ b/media-sound/spotify/spotify-1.0.72.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils xdg-utils gnome2-utils pax-utils unpacker
+inherit gnome2-utils pax-utils unpacker xdg-utils
 
 DESCRIPTION="Spotify is a social music platform"
 HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
@@ -19,7 +19,7 @@ IUSE="libnotify systray pax_kernel pulseaudio"
 RESTRICT="mirror strip"
 
 DEPEND=""
-# zenety needed for filepicker
+# zenity needed for filepicker
 RDEPEND="
 	${DEPEND}
 	dev-libs/nss
@@ -94,10 +94,6 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 	xdg_mimeinfo_database_update
@@ -106,11 +102,6 @@ pkg_postinst() {
 	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
 	ewarn "To remove the cache:"
 	ewarn "rm -rf ~/.cache/spotify"
-	ewarn
-	ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon."
-	ewarn "Run"
-	ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache"
-	ewarn "Then log out and log in back to KDE."
 }
 
 pkg_postrm() {
diff --git a/media-sound/spotify/spotify-1.0.80.ebuild b/media-sound/spotify/spotify-1.0.80.ebuild
index da910ba96d62..ae609de2a96e 100644
--- a/media-sound/spotify/spotify-1.0.80.ebuild
+++ b/media-sound/spotify/spotify-1.0.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils xdg-utils gnome2-utils pax-utils unpacker
+inherit gnome2-utils pax-utils unpacker xdg-utils
 
 DESCRIPTION="Spotify is a social music platform"
 HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
@@ -19,7 +19,7 @@ IUSE="libnotify systray pax_kernel pulseaudio"
 RESTRICT="mirror strip"
 
 DEPEND=">=dev-util/patchelf-0.9_p20180129"
-# zenety needed for filepicker
+# zenity needed for filepicker
 RDEPEND="
 	dev-libs/openssl:0
 	dev-libs/nss
@@ -98,10 +98,6 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 	xdg_mimeinfo_database_update
@@ -110,11 +106,6 @@ pkg_postinst() {
 	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
 	ewarn "To remove the cache:"
 	ewarn "rm -rf ~/.cache/spotify"
-	ewarn
-	ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon."
-	ewarn "Run"
-	ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache"
-	ewarn "Then log out and log in back to KDE."
 }
 
 pkg_postrm() {
diff --git a/media-sound/spotify/spotify-1.0.88-r1.ebuild b/media-sound/spotify/spotify-1.0.88-r1.ebuild
new file mode 100644
index 000000000000..8bff5d699d5b
--- /dev/null
+++ b/media-sound/spotify/spotify-1.0.88-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils pax-utils unpacker xdg-utils
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
+BUILD_ID_AMD64="353.g15c26ea1-14"
+#BUILD_ID_X86=""
+#SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
+#	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )"
+SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libnotify systray pax_kernel pulseaudio"
+RESTRICT="mirror strip"
+
+DEPEND=">=dev-util/patchelf-0.9_p20180129"
+# zenity needed for filepicker
+RDEPEND="
+	dev-libs/openssl:0
+	dev-libs/nss
+	gnome-base/gconf
+	gnome-extra/zenity
+	media-libs/alsa-lib
+	media-libs/harfbuzz
+	media-libs/fontconfig
+	media-libs/mesa
+	net-misc/curl[ssl]
+	net-print/cups[ssl]
+	x11-libs/gtk+:2
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	dev-python/pygobject:3
+	dev-python/dbus-python
+	libnotify? ( x11-libs/libnotify )
+	pulseaudio? ( media-sound/pulseaudio )
+	systray? ( gnome-extra/gnome-integration-spotify )"
+	#sys-libs/glibc
+
+S=${WORKDIR}/
+
+QA_PREBUILT="opt/spotify/spotify-client/spotify"
+
+src_prepare() {
+	# Fix desktop entry to launch spotify-dbus.py for systray integration
+	if use systray ; then
+		sed -i \
+			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
+			usr/share/spotify/spotify.desktop || die "sed failed"
+	fi
+	default
+
+	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
+	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
+		|| die "failed to patch libcurl library dependency"
+}
+
+src_install() {
+	dodoc usr/share/doc/spotify-client/changelog.gz
+
+	SPOTIFY_PKG_HOME=usr/share/spotify
+	insinto /usr/share/pixmaps
+	doins ${SPOTIFY_PKG_HOME}/icons/*.png
+
+	# install in /opt/spotify
+	SPOTIFY_HOME=/opt/spotify/spotify-client
+	insinto ${SPOTIFY_HOME}
+	doins -r ${SPOTIFY_PKG_HOME}/*
+	fperms +x ${SPOTIFY_HOME}/spotify
+
+	dodir /usr/bin
+	cat <<-EOF >"${D}"/usr/bin/spotify || die
+		#! /bin/sh
+		exec ${SPOTIFY_HOME}/spotify "\$@"
+	EOF
+	fperms +x /usr/bin/spotify
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 512; do
+		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
+			"spotify-client.png"
+	done
+	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
+	if use pax_kernel; then
+		#create the headers, reset them to default, then paxmark -m them
+		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+	ewarn "To remove the cache:"
+	ewarn "rm -rf ~/.cache/spotify"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index 73718ed05df2..372fcd31834b 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -1,11 +1,11 @@
-AUX teamspeak.initd 1094 BLAKE2B b9332ff2e24922992a2ea6bf11ddbc7ab07d5c3e61de59ddd2be2343ce38facb529b81c86fc7bb45eb9b3ead0569201accd259c07c52b20da8368f1beb7873bc SHA512 f7c2b3f555bab16caba59d501c64e5cf809ec4fbd81fe9bfbea3f5db0d9689a1cc89f5ebebc631d4e67b24ad5c4bba9343267746b0dbbdd827f00f5444eb6737
+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 538 BLAKE2B 10dd1ca73bf81fb53832f1e6d4e763aae965102f93ff12b057672b3b201a281bca009cf22481bf5b1fcf09af49b120f7eda9b21c85686f15af25d1968c62c23c SHA512 bd03d3de15625009aa2cfb49b8dc0f2a4832ee8cf1d76b869a8c1da7882e500df8d07ab19a94035ffaaed32a9bff6545c42d8dd25086f60dd7804f72b8f36974
-AUX ts3server_mariadb.ini.sample 556 BLAKE2B e7ea14b839f4e41c67726f9167cab198673d5a1109085b44fbcfe87e1c7f4a79670cec512b59c16fc4d08bc8377de9ba3802b72695bbb564b70405b783ba99e9 SHA512 ee74ef7e4bd7ceec81584586a20fe688d74171541154a13db55ae9fb7cfd210a13b6821aa3668edb76a13035263e30ffa94abbfa55ccc390315568663d6e6e2d
-DIST teamspeak3-server_linux_amd64-3.2.0.tar.bz2 7850988 BLAKE2B 00bcbe3bf1a6352a7366f6e3821dd98158cfc1b84711e031b2e1fb75bf1f96abf64a6de00ed833ab2b34ea564c359c2f32c75205afa9c80474bda53790f29f48 SHA512 b9ecfb8f9619e3716a1a2f38d1ee3239b4fb6bc12f928d3b9b5b4780bbee63d43d029606f4b945b741c61c10ea3ced764137c68a8462fb1660a9cc058aa80109
-DIST teamspeak3-server_linux_x86-3.2.0.tar.bz2 7694652 BLAKE2B 0e937292af8cd93f5be61c02f70cf629a158956dc3b87a17a82c3671d0702d707d19e08f8fbc5f2bfc44565e8bce0af59227441e1d883536b766f878727625f3 SHA512 022713795c37aa59d607649db2b602da5e84b881da16b4522d3a4c235b322eb41793176414e740e9db73e2556d0ef6560702969d1c536a05fc6c4bbed550dbad
-EBUILD teamspeak-server-3.2.0.ebuild 3406 BLAKE2B 40b59dac859af212de10cb58700741479122f81495258c5618c16a7e85cdf670deb95a5b12e3c9019b459d0ddb6da3c84bc8e702efbea3f7ac6fe7558dcf43d9 SHA512 05e1d0518cb99292e8cac74b2f0a8f0daff3bcc4911e726305040b165f5c10318d35609a79b9d294b3697527b7f37c17a7bb82ac5abef45d98de08157c2b3523
-MISC metadata.xml 784 BLAKE2B 2e51ada42240de0b09a52863cdd26f08dbd1fdf1e037d9b9d71a382c72410ed1b1bf2b8b73d90d650b877b4d9ece4902a7873e4e8b110e5e4a798575151d9c44 SHA512 5b186a986e94b62f72ee83e77a4aaacfaadb7c58aa6418187dddcc78a31bc9880d9a2b55c16fa7f7239233d6aefca6048e72ef2db74d99c7b9f4b4adbae1710f
+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
+MISC metadata.xml 822 BLAKE2B ac5c32d28c089f00c7ac508d60d90fff40313dcb4758145401d4ebc76dd53f449834373475e7437c37b8892be6d121be5c2ff1b20cbbdde9c110cab4e1a1f760 SHA512 7265c0f252a1b7e1e4e2901773b81fc7e96d0b6da39475f1e7c65a37c75188f86ce3da13b39a1cf8be46b9ad80945fc3a5755135d6bb2c63829d13a0d3c1dc10
diff --git a/media-sound/teamspeak-server/files/teamspeak.initd b/media-sound/teamspeak-server/files/teamspeak.initd
deleted file mode 100644
index cc8393b58db7..000000000000
--- a/media-sound/teamspeak-server/files/teamspeak.initd
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/opt/bin/ts3server"
-command_background="true"
-group="teamspeak"
-inifile="/etc/teamspeak3-server/ts3server.ini"
-name="TeamSpeak Server"
-pidfile="/run/teamspeak3-server/server.pid"
-user="teamspeak"
-
-depend() {
-	need net
-	use mysql
-}
-
-start_pre() {
-	# ensure, that the TS3-server finds all custom supplied shared objects on startup.
-	LD_LIBRARY_PATH="/opt/teamspeak3-server:$LD_LIBRARY_PATH"
-	export LD_LIBRARY_PATH
-
-	# temporay fix for EPERM bug (we still leave it here to make sure it is *really* not there)
-	rm -f /dev/shm/7gbhujb54g8z9hu43jre8
-
-	checkpath -d --owner ${user}:${group} --mode 0700 /run/teamspeak3-server
-}
-
-start() {
-	ebegin "Starting ${name}"
-
-	start-stop-daemon --start --quiet --background --env "TS3SERVER_LICENSE=accept" \
-		--pidfile "${pidfile}" --make-pidfile \
-		--user "${user}" --group "${group}" --chdir "/opt/teamspeak3-server" \
-		--exec "${command}" -- \
-		inifile="${inifile}"
-
-	eend $?
-}
-
-restart() {
-	stop
-	sleep 3
-	start
-}
diff --git a/media-sound/teamspeak-server/files/teamspeak.initd-r1 b/media-sound/teamspeak-server/files/teamspeak.initd-r1
new file mode 100644
index 000000000000..85d807509d37
--- /dev/null
+++ b/media-sound/teamspeak-server/files/teamspeak.initd-r1
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+config="/etc/teamspeak3-server/ts3server.ini"
+name="TeamSpeak3 Server"
+pidfile="/run/${RC_SVCNAME}.pid"
+start_stop_daemon_args="--chdir /opt/teamspeak3-server --env TS3SERVER_LICENSE=accept"
+
+command="/opt/bin/ts3server"
+command_args="inifile=${config}"
+command_background="true"
+command_group="teamspeak"
+command_user="teamspeak"
+
+depend() {
+	use mysql
+}
+
+start_pre() {
+	# Fix for EPERM bug
+	rm -f /dev/shm/7gbhujb54g8z9hu43jre8
+}
diff --git a/media-sound/teamspeak-server/files/ts3server.ini b/media-sound/teamspeak-server/files/ts3server.ini-r1
index 962c8b80f0ad..769e815a1997 100644
--- a/media-sound/teamspeak-server/files/ts3server.ini
+++ b/media-sound/teamspeak-server/files/ts3server.ini-r1
@@ -21,3 +21,9 @@ query_skipbruteforcecheck=0
 query_buffer_mb=20
 http_proxy=
 license_accepted=1
+serverquerydocs_path=/opt/teamspeak3-server/serverquerydocs/
+query_ssh_ip=0.0.0.0, ::
+query_ssh_port=10022
+query_protocols=raw
+query_ssh_rsa_host_key=ssh_host_rsa_key
+query_timeout=300
diff --git a/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample b/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample-r1
index 94cea8bbe9d8..6b2a28d2976b 100644
--- a/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample
+++ b/media-sound/teamspeak-server/files/ts3server_mariadb.ini.sample-r1
@@ -9,7 +9,7 @@ query_ip=0.0.0.0, ::
 query_ip_whitelist=query_ip_whitelist.txt
 query_ip_blacklist=query_ip_blacklist.txt
 dbplugin=ts3db_mariadb
-dbpluginparameter=ts3db_mariadb.ini
+dbpluginparameter=/etc/teamspeak3-server/ts3db_mariadb.ini
 dbsqlpath=/opt/teamspeak3-server/sql/
 dbsqlcreatepath=create_mariadb/
 dbconnections=10
@@ -21,3 +21,9 @@ query_skipbruteforcecheck=0
 query_buffer_mb=20
 http_proxy=
 license_accepted=1
+serverquerydocs_path=/opt/teamspeak3-server/serverquerydocs/
+query_ssh_ip=0.0.0.0, ::
+query_ssh_port=10022
+query_protocols=raw
+query_ssh_rsa_host_key=ssh_host_rsa_key
+query_timeout=300
diff --git a/media-sound/teamspeak-server/metadata.xml b/media-sound/teamspeak-server/metadata.xml
index 812b26bfd184..f5abe25d7214 100644
--- a/media-sound/teamspeak-server/metadata.xml
+++ b/media-sound/teamspeak-server/metadata.xml
@@ -16,6 +16,6 @@
 		The server software allows users to connect and join chat channels.
 	</longdescription>
 	<use>
-		<flag name="tsdns">Install TeamSpeaks own DNS service.</flag>
+		<flag name="tsdns">Install TeamSpeaks own DNS service for handling multiple virtual servers.</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.2.0.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.2.0.ebuild
deleted file mode 100644
index aa03952e42e4..000000000000
--- a/media-sound/teamspeak-server/teamspeak-server-3.2.0.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
-
-inherit systemd user
-
-DESCRIPTION="A server software for hosting quality voice communication via the internet"
-HOMEPAGE="https://www.teamspeak.com/"
-SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )"
-
-LICENSE="LGPL-2.1 teamspeak3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="doc mysql tsdns"
-
-RDEPEND="mysql? ( <dev-libs/openssl-1.1:0=
-	sys-libs/zlib:= )"
-
-RESTRICT="mirror strip"
-
-S="${WORKDIR}/teamspeak3-server_linux"
-
-QA_PREBUILT="opt/teamspeak3-server/libmariadb.so.2
-	opt/teamspeak3-server/libts3db_mariadb.so
-	opt/teamspeak3-server/libts3db_sqlite3.so
-	opt/teamspeak3-server/ts3server"
-
-pkg_setup() {
-	enewgroup teamspeak
-	enewuser teamspeak -1 -1 /opt/teamspeak3-server teamspeak
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if use amd64; then
-		mv "teamspeak3-server_linux_amd64" "teamspeak3-server_linux" || die
-	else
-		mv "teamspeak3-server_linux_x86" "teamspeak3-server_linux" || die
-	fi
-}
-
-src_install() {
-	touch "${T%/}"/.ts3server_license_accepted || die
-	insinto "/opt/teamspeak3-server"
-	doins "${T}"/.ts3server_license_accepted
-
-	exeinto "/opt/teamspeak3-server"
-	doexe "ts3server"
-	doexe "${FILESDIR}/ts3server-bin"
-	dodir "/opt/bin"
-	dosym "../teamspeak3-server/ts3server-bin" "/opt/bin/ts3server"
-
-	exeinto "/opt/teamspeak3-server"
-	doexe "libts3db_sqlite3.so"
-
-	insinto "/opt/teamspeak3-server/sql"
-	doins "sql"/*.sql
-	doins -r "sql/create_sqlite"
-
-	insinto "/etc/teamspeak3-server"
-	doins "${FILESDIR}/ts3server.ini"
-
-	newinitd "${FILESDIR}/teamspeak.initd" teamspeak3-server
-	systemd_newunit "${FILESDIR}/teamspeak.service" teamspeak3-server.service
-	systemd_newtmpfilesd "${FILESDIR}/teamspeak.tmpfiles" teamspeak3-server.conf
-
-	if use mysql; then
-		insinto "/etc/teamspeak3-server"
-		doins "${FILESDIR}/ts3server_mariadb.ini.sample"
-		doins "${FILESDIR}/ts3db_mariadb.ini.sample"
-
-		exeinto "/opt/teamspeak3-server"
-		doexe "libts3db_mariadb.so"
-		doexe "redist/libmariadb.so.2"
-
-		insinto "/opt/teamspeak3-server/sql"
-		doins -r "sql/create_mariadb"
-		doins -r "sql/updates_and_fixes"
-	fi
-
-	if use doc; then
-		local HTML_DOCS=( "doc/serverquery/." )
-
-		docinto "serverquery"
-		dodoc "serverquerydocs"/*.txt
-
-		docinto "ts3server"
-		dodoc "doc"/*.txt
-	fi
-
-	if use tsdns; then
-		exeinto "/opt/teamspeak3-server"
-		doexe "tsdns/tsdnsserver"
-		dodir "/opt/bin"
-		dosym "../teamspeak3-server/tsdnsserver" "/opt/bin/tsdnsserver"
-
-		insinto "/etc/teamspeak3-server"
-		doins "tsdns/tsdns_settings.ini.sample"
-
-		docinto "tsdns"
-		dodoc "tsdns/README" "tsdns/USAGE"
-	fi
-
-	einstalldocs
-
-	keepdir "/etc/teamspeak3-server"
-	keepdir "/var/log/teamspeak3-server"
-
-	if use mysql; then
-		echo "CONFIG_PROTECT=\"/etc/teamspeak3-server/ts3server.ini /etc/teamspeak3-server/ts3server_mariadb.ini\"" > "${T}"/99teamspeak3-server || die
-	else
-		echo "CONFIG_PROTECT=\"/etc/teamspeak3-server/ts3server.ini\"" > "${T}"/99teamspeak3-server || die
-	fi
-	doenvd "${T}"/99teamspeak3-server
-
-	fowners -R teamspeak:teamspeak "/etc/teamspeak3-server" "/opt/teamspeak3-server" "/var/log/teamspeak3-server"
-}
-
-pkg_postinst() {
-	elog "If you have a Non-Profit License (NPL),"
-	elog "place it in /opt/teamspeak3-server as licensekey.dat."
-}
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.3.0.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.3.0.ebuild
new file mode 100644
index 000000000000..e8110a9eba1a
--- /dev/null
+++ b/media-sound/teamspeak-server/teamspeak-server-3.3.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+DESCRIPTION="A server software for hosting quality voice communication via the internet"
+HOMEPAGE="https://www.teamspeak.com/"
+SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
+	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )"
+
+LICENSE="LGPL-2.1 teamspeak3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="doc mysql tsdns"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/teamspeak3-server/libmariadb.so.2
+	opt/teamspeak3-server/libts3db_mariadb.so
+	opt/teamspeak3-server/libts3db_sqlite3.so
+	opt/teamspeak3-server/libts3_ssh.so
+	opt/teamspeak3-server/ts3server
+	opt/teamspeak3-server/tsdnsserver"
+
+pkg_setup() {
+	enewgroup teamspeak
+	enewuser teamspeak -1 -1 /opt/teamspeak3-server teamspeak
+}
+
+src_unpack() {
+	default
+
+	mv teamspeak3-server_linux_$(usex amd64 amd64 x86) ${P} || die
+}
+
+src_install() {
+	diropts -o teamspeak -g teamspeak
+	keepdir /opt/teamspeak3-server /var/log/teamspeak3-server
+
+	diropts
+	keepdir /etc/teamspeak3-server
+
+	touch ${D%/}/opt/teamspeak3-server/.ts3server_license_accepted || die
+
+	exeinto /opt/teamspeak3-server
+	doexe ts3server
+	doexe "${FILESDIR}"/ts3server-bin
+	dodir /opt/bin
+	dosym ../teamspeak3-server/ts3server-bin /opt/bin/ts3server
+
+	exeinto /opt/teamspeak3-server
+	doexe libts3db_sqlite3.so libts3_ssh.so
+
+	insinto /opt/teamspeak3-server/serverquerydocs
+	doins -r serverquerydocs/.
+
+	insinto /opt/teamspeak3-server/sql
+	doins sql/*.sql
+	doins -r sql/create_sqlite
+
+	insinto /etc/teamspeak3-server
+	newins "${FILESDIR}"/ts3server.ini-r1 ts3server.ini
+
+	dodoc CHANGELOG
+	docinto ts3server
+	dodoc doc/*.txt
+
+	newinitd "${FILESDIR}"/teamspeak.initd-r1 teamspeak3-server
+	systemd_newunit "${FILESDIR}"/teamspeak.service teamspeak3-server.service
+
+	newenvd - 99teamspeak3-server <<- EOF
+		CONFIG_PROTECT="/etc/teamspeak3-server/ts3server.ini /etc/teamspeak3-server/ts3server_mariadb.ini /etc/teamspeak3-server/tsdns_settings.ini"
+	EOF
+
+	if use doc; then
+		docinto html
+		dodoc -r doc/serverquery/.
+	fi
+
+	if use mysql; then
+		insinto /etc/teamspeak3-server
+		newins "${FILESDIR}"/ts3server_mariadb.ini.sample-r1 ts3server_mariadb.ini.sample
+		doins "${FILESDIR}"/ts3db_mariadb.ini.sample
+
+		exeinto /opt/teamspeak3-server
+		doexe libts3db_mariadb.so
+		doexe redist/libmariadb.so.2
+
+		insinto /opt/teamspeak3-server/sql
+		doins -r sql/create_mariadb
+		doins -r sql/updates_and_fixes
+	fi
+
+	if use tsdns; then
+		exeinto /opt/teamspeak3-server
+		doexe tsdns/tsdnsserver
+		dodir /opt/bin
+		dosym ../teamspeak3-server/tsdnsserver /opt/bin/tsdnsserver
+
+		insinto /etc/teamspeak3-server
+		doins tsdns/tsdns_settings.ini.sample
+
+		docinto tsdns
+		dodoc tsdns/{README,USAGE}
+	fi
+}
+
+pkg_postinst() {
+	elog "If you have a Non-Profit License (NPL),"
+	elog "place it in /opt/teamspeak3-server as licensekey.dat."
+	elog "Please note, that the license must be writeable by the teamspeak user."
+}
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index da8824d683ff..94aa87523b03 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -1,16 +1,19 @@
 AUX 50timidity++-gentoo.el 180 BLAKE2B 78cf106525eadbd201ef1497e2304213d1575c3c761b507281ac2bbdf0fb873ee4c68a91a2fa623edbd2ee9145e178a4ef5300e9644ce86953ac92fd4f999fce SHA512 21df87bf47d56c1072fc3942f3c988293106028dd0473dd1a03b66edc4e7586a3cf5150abdf3c932e44dc32a97ce9cbaa8016dcb28e5e60195f1fe9418ab3bd6
 AUX conf.d.timidity.2 972 BLAKE2B dc7a04ee54f82f7200c2ad4e9ec4ca22387d86fa99417aaf44db4f45ba15214026f010dee1051aab3707e0579163fe8398ab56a6dbfe63a271b13e7d59071ad8 SHA512 67668a6a00408ecc1e467be8f372b78be318e940d75c0fb856fadc5e5446e5d1a461c004856ab851968d6c146e662e766c09da6b815fd14b7675b92b975cabd9
 AUX init.d.timidity.4 510 BLAKE2B 88ff1704278784218748e1c5f81104e9928aa62616722a5d435e40ab68d8adf3945b5a5831521b9490d95cbd4fcaa73f661ac20e25879a48207deb4ae9d51a34 SHA512 597b79bbeac3c3365cf3b0d6defe7b3f031bf1acbefd33094e76f07394a4d5b21a79ce62c276928fed68de1eb02a30ec1eb8204be6d034d8c2dd92145e82faa3
+AUX timidity++-2.14.0-CVE-2017-11546.patch 1005 BLAKE2B e22fba2c36f8ff3dacbe67978a65024a25d82caf8f14d493b9ebc98a602ac022cd2258898a96d020683ee7896822cb787c8527d5d7a80ab71b51d28803ea2293 SHA512 33422016541eca77d48b27946c131c333837a3719fd9d83e162d2db9c5dd20a262650563a98b8402c92ed2383d9e29c189840408b6658f27de12b19e7b69d3b2
+AUX timidity++-2.14.0-CVE-2017-11547.patch 2480 BLAKE2B 6db9598d7f8c9b969163f8ceaab0832db0b2f1571ec3e23d276aa77464fad58c5db9de9a07507ecefed08840dc9ef6e9c5ce30b90188ae150536fc4fd3fdc8f3 SHA512 48083c7a59196c0cf4e82cf53ffd92edf995347a4e49e2450b2ea3ea2e6ad014d13b3881c54ca0c7ad312dd977c64d836cf543c66fc8367038271f3888c294c8
 AUX timidity++-2.14.0-ar.patch 822 BLAKE2B ecd76b6297cfc6fa04fdc1760dad9879a2835db79378df98a224e758d22aaa08fa7cd6f82c16b394e6d6b4bd103b9f69b7ff84b2c7ebb1b0c82c487cc8eb5dd5 SHA512 b0c26daa94361bc471034431c0632052ceb2a8e001caabfb7e08bd3f401932724981dc2c903132f9319d16038f7bac05843ca8da1112a5a3bab626c88244514b
 AUX timidity++-2.14.0-configure-flags.patch 4241 BLAKE2B d1d083ad5e397aa0e827cd21eb98b4143638559c31d38d9541f41a6d4dc12358a1c17c8115f956e177359f9ca122ee44e775abd7b6009777ca1eaaaeeadd59a1 SHA512 be9ca5a580a47af5eb29e180c81b141628692e2cb538113b3ec596e4b800fb6d4792fa4c72921414ba41a8e6932ae655e9b9a1428021333471e2929fdab07b17
-AUX timidity++-2.14.0-params.patch 712 BLAKE2B 904006f05176395e1c244c67a4b88fe7a6a69a350ad87bb9b54d207ee592a56ea191b8d8f4c47bf4bd7c8330238ac317bf631a529c1c775e274a55212464a899 SHA512 63e2a1be6fec715680230de158d1fb09d5288a068288ac33b37320491ac29ec1c66f60d05ffb352c4a192540163e9c93369115fe606aa25295b727332e92874c
+AUX timidity++-2.14.0-params.patch 716 BLAKE2B d4426e36db91fea9561a81bacb5337c8da3e385a598ebd61a38cb00ff2ab8be5b07c6259068ea31e11d0e755b28ba5769ee0cf9e6a7c31a272d1145d70e0521c SHA512 b35596de8ba6ffc4ff91a8ab7a2a0a25c658af97f8aa4e226737e910227e2a11bf4b227a5f8c61ddc1452cd614e03f75736787a2240cc530e90aba437371a09a
 AUX timidity++-2.14.0-pkg-config.patch 3836 BLAKE2B 64757187ff860fbd4359dca0f567e7b71ad11ffa060e736deccd4994e0409bcc86f1f5151414e532e22f07e4dc9a6b5d75b1617c21deab616a319622a3ced0c4 SHA512 2dba5ca948d31d4498f44f8b4c67d59294e7cf722652b62f9502222867f1c93fa491b9741c049bde7ac976c74e52639bfc359a88e2c7f3728b723e272e40692d
-AUX timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch 697 BLAKE2B 8efabaab0410df70579316514b3a9bf9a08a234702a17b78a96b7d1340f6388c7f78411d7e5c309957e0d84d579ae93135699918e9ad3c6a3484615ddd3afcd1 SHA512 d5716b7977f5c013c61da2e9f3e233b17e3b4b95cb14b2e459bae3c69316440be899278b44566a1640d8d82b683811348c22f5e859512c523baee4939bc2a497
-AUX timidity++-2.14.0-tcltk86.patch 308 BLAKE2B 2f3cfa71fb205fe55848b2df1e3da622b72b9afde706b3ac1f5033999d034d2448f6181e6b0cd9eada89a0b0a007f658b3e14a22e53df06ca6f298b7d7a56b0d SHA512 37e8a97fe1a09382234011ab253443ba9e9be78cdb7bb4dd03ee5756bda8e614bc627a091d10b480a3ef5bca9e3961c2f14e92a548782145d2bb61da991d5f62
+AUX timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch 701 BLAKE2B 32fa47b354cc3d9aedd0b3466eb69de08757f731c39d4b11fd8377d607918eedaedb0747b63ab031479790460303e971ad153875b448166632e90cab2af95598 SHA512 096ec664e401446bebe2395309cbe57c61c711a1ce4c23984ba668cdc9aef1a23a1c5d4f9111c0a2bb4e634368b57093f2dfb0aa1c60e281098bac646b8b9214
+AUX timidity++-2.14.0-tcltk86.patch 312 BLAKE2B 040b5c96771398e41adf62354bd48caeadcf030398128c39212f6226abb996d4f086d0476799726d761e0c93b84165c71d7b05a1060c1244483bbae7df782e8b SHA512 e6fd991cf5a1d568dccc1a47629e5562721325668e498b7474382b3f53f3161f1e0f40144ec5e2bb5d6f2b83ddc46fd22a2998d17763e142362cb7419a0bc31e
 AUX timidity.cfg-r1 669 BLAKE2B 023edf8f503f23817c1941a0cb1a0341f0ff1475405fc906a9acf4adb36ca8769bc015df5c30af50a828dd522d214bf9d6c4feabe2db3419e8100ebd431fdbdb SHA512 98f0690bda6deed6022e97e74a6114334d5f965d646d7c7d150ac177f6eb78277e931ed0b4c5613ef16ba648eaad66a3ed72ed933ca936698ca81365151b223b
 AUX timidity.desktop.2 257 BLAKE2B 6c7f88a3ccd9fc4ea90cd228e6d04d799430a78361d6df3428e127c1eb7ea2b82750c86932239c8a6ceb507d06fce2bc5e5ee963d56fd0e8daf2ff7890a9e68a SHA512 34312594866d77244d0eb77b4111a8e7998bd20bcb3542b036b1626d73bf4672eef677a926badceaaee517f1d32752b3e3b1ea4d3f2cc0703d66c1c740e0dc2e
 AUX timidity.service 190 BLAKE2B 909311fae666b9970a8b4d56e1848f907ffeff1fc9e0cacc7a89027ec1ce6a555ea01570328d75425b006752d6332cf278642ec9a7c27b9c9adb2cb7621e241e SHA512 1022c1e37e2a97fba414673860ec89bc146da208981dd50d9486c525b47c74ae146acef2d75ceec26335c3ab98b2c928ce480a161637990ecd737507a6c21b49
 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 5252 BLAKE2B 8ec893135153cd67d3984bbb1637310f66c7d55352627cec8918da4d9979316cc5a420b33c87f7b7fe71fce97dc4d81670e6eea722d12511996731dc26f2c536 SHA512 bb33e53402ba0eed094cf7921ee49a5b593ec5fa25b8968695e63b3524ced2eb695a1dc2c6d37930d932345d268d6db7d11554d4c3730267e50bed51efecb8ec
 MISC metadata.xml 331 BLAKE2B 0e52df0230422381a5982f075e39f00e982f9948a3d3309d183bbac93569d908fe3603082f11943fc35e3b8bd1c76bc131e7525c91e3aac5b7d9461093686f71 SHA512 b4559e92a59ba70b25863304bbdc59225c6ccbf3ee9ab8516db6987a19e8b5b7b6ea95f40c9ff55ed33c194ab174360d5f8fd6bfafa43290bb97a3a2093289e3
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-CVE-2017-11546.patch b/media-sound/timidity++/files/timidity++-2.14.0-CVE-2017-11546.patch
new file mode 100644
index 000000000000..94135e98b96a
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.14.0-CVE-2017-11546.patch
@@ -0,0 +1,31 @@
+From 2386ec2c745f6c5075e53ea051da211336b44b84 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Tue, 26 Jun 2018 22:31:27 +0200
+Subject: readmidi: Fix division by zero
+
+References: CVE-2017-11546
+
+An adhoc fix for division by zero in insert_note_steps().
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+bug-debian: https://bugs.debian.org/870338
+bug-suse: https://bugzilla.suse.com/show_bug.cgi?id=1081694
+bug: https://bugzilla.suse.com/show_bug.cgi?id=1081694
+origin: https://bugzilla.suse.com/attachment.cgi?id=760825
+---
+ timidity/readmidi.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/timidity/readmidi.c b/timidity/readmidi.c
+index 158388a..341777e 100644
+--- a/timidity/readmidi.c
++++ b/timidity/readmidi.c
+@@ -4585,6 +4585,8 @@ static void insert_note_steps(void)
+ 			if (beat != 0)
+ 				meas++, beat = 0;
+ 			num = timesig[n].a, denom = timesig[n].b, n++;
++			if (!denom)
++				denom = 1;
+ 		}
+ 		a = (meas + 1) & 0xff;
+ 		b = (((meas + 1) >> 8) & 0x0f) + ((beat + 1) << 4);
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-CVE-2017-11547.patch b/media-sound/timidity++/files/timidity++-2.14.0-CVE-2017-11547.patch
new file mode 100644
index 000000000000..12562a577e0e
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.14.0-CVE-2017-11547.patch
@@ -0,0 +1,67 @@
+From 34328d22cbb4ccf03f29223f54f1834c796d86a2 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Tue, 26 Jun 2018 22:31:28 +0200
+Subject: resample: Fix out-of-bound access in resamplers
+
+References: CVE-2017-11547
+
+An adhoc fix for out-of-bound accesses in resamples.
+The offset might overflow the given data range.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+bug-debian: https://bugs.debian.org/870338
+bug-suse: https://bugzilla.suse.com/show_bug.cgi?id=1081694
+origin: https://bugzilla.suse.com/attachment.cgi?id=760826
+---
+ timidity/resample.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/timidity/resample.c b/timidity/resample.c
+index cd6b8e6..4a3fadf 100644
+--- a/timidity/resample.c
++++ b/timidity/resample.c
+@@ -57,6 +57,8 @@ static resample_t resample_cspline(sample_t *src, splen_t ofs, resample_rec_t *r
+ {
+     int32 ofsi, ofsf, v0, v1, v2, v3, temp;
+ 
++    if (ofs + (1 << FRACTION_BITS) >= rec->data_length)
++      return src[ofs >> FRACTION_BITS];
+     ofsi = ofs >> FRACTION_BITS;
+     v1 = src[ofsi];
+     v2 = src[ofsi + 1];
+@@ -96,6 +98,8 @@ static resample_t resample_lagrange(sample_t *src, splen_t ofs, resample_rec_t *
+ {
+     int32 ofsi, ofsf, v0, v1, v2, v3;
+ 
++    if (ofs + (1 << FRACTION_BITS) >= rec->data_length)
++      return src[ofs >> FRACTION_BITS];
+     ofsi = ofs >> FRACTION_BITS;
+     v1 = (int32)src[ofsi];
+     v2 = (int32)src[ofsi + 1];
+@@ -154,6 +158,8 @@ static resample_t resample_gauss(sample_t *src, splen_t ofs, resample_rec_t *rec
+     sample_t *sptr;
+     int32 left, right, temp_n;
+ 
++    if (ofs + (1 << FRACTION_BITS) >= rec->data_length)
++      return src[ofs >> FRACTION_BITS];
+     left = (ofs>>FRACTION_BITS);
+     right = (rec->data_length>>FRACTION_BITS) - left - 1;
+     temp_n = (right<<1)-1;
+@@ -261,6 +267,8 @@ static resample_t resample_newton(sample_t *src, splen_t ofs, resample_rec_t *re
+     int32 left, right, temp_n;
+     int ii, jj;
+ 
++    if (ofs + (1 << FRACTION_BITS) >= rec->data_length)
++      return src[ofs >> FRACTION_BITS];
+     left = (ofs>>FRACTION_BITS);
+     right = (rec->data_length>>FRACTION_BITS)-(ofs>>FRACTION_BITS)-1;
+     temp_n = (right<<1)-1;
+@@ -330,6 +338,8 @@ static resample_t resample_linear(sample_t *src, splen_t ofs, resample_rec_t *re
+ {
+     int32 v1, v2, ofsi;
+ 
++    if (ofs + (1 << FRACTION_BITS) >= rec->data_length)
++      return src[ofs >> FRACTION_BITS];
+     ofsi = ofs >> FRACTION_BITS;
+     v1 = src[ofsi];
+     v2 = src[ofsi + 1];
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-params.patch b/media-sound/timidity++/files/timidity++-2.14.0-params.patch
index d56448b8761b..18790f8bffb4 100644
--- a/media-sound/timidity++/files/timidity++-2.14.0-params.patch
+++ b/media-sound/timidity++/files/timidity++-2.14.0-params.patch
@@ -1,5 +1,5 @@
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -2245,10 +2245,15 @@
  
  AM_CONDITIONAL(W32READDIR, test "x$W32READDIR" = "xyes")
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch b/media-sound/timidity++/files/timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch
index a83a7db993f8..6f901eab8bc0 100644
--- a/media-sound/timidity++/files/timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch
+++ b/media-sound/timidity++/files/timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch
@@ -8,8 +8,8 @@ Because otherwise TiMidity++ simply won't build as per:
 xskin_c.c:(.text+0x17c): undefined reference to `ctl_speana_data'
 collect2: error: ld returned 1 exit status
 
---- interface/xskin_c.c
-+++ interface/xskin_c.c
+--- a/interface/xskin_c.c
++++ b/interface/xskin_c.c
 @@ -228,7 +228,6 @@
      }
  }
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-tcltk86.patch b/media-sound/timidity++/files/timidity++-2.14.0-tcltk86.patch
index ea2c0eec6c7d..23ef62aa03e5 100644
--- a/media-sound/timidity++/files/timidity++-2.14.0-tcltk86.patch
+++ b/media-sound/timidity++/files/timidity++-2.14.0-tcltk86.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/451296
 
---- interface/tk_c.c
-+++ interface/tk_c.c
+--- a/interface/tk_c.c
++++ b/interface/tk_c.c
 @@ -913,7 +913,7 @@
  	vsnprintf(buf, sizeof(buf), fmt, ap);
  	Tcl_Eval(my_interp, buf);
diff --git a/media-sound/timidity++/timidity++-2.14.0-r3.ebuild b/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
new file mode 100644
index 000000000000..5a1770ebcfdb
--- /dev/null
+++ b/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools desktop elisp-common systemd toolchain-funcs user xdg-utils
+
+MY_PV=${PV/_/-}
+MY_P=TiMidity++-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
+HOMEPAGE="http://timidity.sourceforge.net/"
+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"
+
+DEPEND="
+	alsa? ( media-libs/alsa-lib )
+	ao? ( >=media-libs/libao-0.8.5 )
+	emacs? ( virtual/emacs )
+	flac? ( media-libs/flac )
+	gtk? ( x11-libs/gtk+:2 )
+	jack? ( virtual/jack )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( >=media-libs/nas-1.4 )
+	ncurses? ( sys-libs/ncurses:0= )
+	slang? ( sys-libs/slang )
+	speex? ( media-libs/speex )
+	tk? ( dev-lang/tk:0= )
+	vorbis? ( media-libs/libvorbis )
+	X? (
+		media-libs/libpng:0=
+		x11-libs/libXaw
+		x11-libs/libXext
+	)
+"
+RDEPEND="${DEPEND}
+	app-eselect/eselect-timidity
+	alsa? ( media-sound/alsa-utils )
+	selinux? ( sec-policy/selinux-timidity )
+"
+
+PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )"
+
+SITEFILE=50${PN}-gentoo.el
+
+pkg_setup() {
+	enewgroup audio 18 # Just make sure it exists
+	enewuser timidity -1 -1 /var/lib/timidity audio
+}
+
+DOCS=( AUTHORS ChangeLog NEWS README "${FILESDIR}"/timidity.cfg-r1 )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-params.patch
+	"${FILESDIR}"/${P}-revert-for-required-ctl_speana_data-function.patch
+	"${FILESDIR}"/${P}-tcltk86.patch
+	"${FILESDIR}"/${P}-ar.patch
+	"${FILESDIR}"/${P}-configure-flags.patch
+	"${FILESDIR}"/${P}-pkg-config.patch
+	"${FILESDIR}"/${P}-CVE-2017-1154{6,7}.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	export EXTRACFLAGS="${CFLAGS}" #385817
+
+	local myconf=()
+	local audios
+
+	use flac && audios+=",flac"
+	use speex && audios+=",speex"
+	use vorbis && audios+=",vorbis"
+	use oss && audios+=",oss"
+	use jack && audios+=",jack"
+	use ao && audios+=",ao"
+
+	if use nas; then
+		audios+=",nas"
+		myconf+=( --with-nas-library="/usr/$(get_libdir)/libaudio.so" --with-x )
+		use X || ewarn "Basic X11 support will be enabled because required by nas."
+	fi
+
+	if use alsa; then
+		audios+=",alsa"
+		myconf+=( --with-default-output=alsa --enable-alsaseq )
+	fi
+
+	# We disable motif by default and then only enable it if it's requested.
+	if use motif; then
+		myconf+=( --enable-motif --with-x )
+		use X || ewarn "Basic X11 support will be enabled because required by motif."
+	fi
+
+	econf \
+		--localstatedir=/var/state/timidity++ \
+		--with-module-dir="${EPREFIX}/usr/share/timidity" \
+		--with-lispdir="${SITELISP}/${PN}" \
+		--with-elf \
+		--enable-audio=${audios} \
+		--enable-server \
+		--enable-network \
+		--enable-dynamic \
+		--enable-vt100 \
+		--enable-spline=cubic \
+		$(use_enable emacs) \
+		$(use_enable slang) \
+		$(use_enable ncurses) \
+		$(use_with X x) \
+		$(use_enable X spectrogram) \
+		$(use_enable X wrd) \
+		$(use_enable X xskin) \
+		$(use_enable X xaw) \
+		$(use_enable gtk) \
+		$(use_enable tk tcltk) \
+		--disable-motif \
+		"${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+
+	# these are only for the ALSA sequencer mode
+	if use alsa; then
+		newconfd "${FILESDIR}"/conf.d.timidity.2 timidity
+		newinitd "${FILESDIR}"/init.d.timidity.4 timidity
+
+		systemd_dounit "${FILESDIR}"/timidity.service
+	fi
+
+	insinto /etc
+	newins "${FILESDIR}"/timidity.cfg-r1 timidity.cfg
+
+	dodir /usr/share/timidity
+	dosym ../../../etc/timidity.cfg /usr/share/timidity/timidity.cfg
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	diropts -o timidity -g nobody -m 0700
+	keepdir /var/lib/timidity
+
+	doicon "${FILESDIR}"/timidity.xpm
+	newmenu "${FILESDIR}"/timidity.desktop.2 timidity.desktop
+
+	# Order of preference: gtk, X (Xaw), ncurses, slang
+	# Do not create menu item for terminal ones
+	local interface="-id"
+	local terminal="true"
+	local nodisplay="true"
+	if use gtk || use X; then
+		interface="-ia"
+		terminal="false"
+		nodisplay="false"
+		use gtk && interface="-ig"
+	elif use ncurses || use slang; then
+		local interface="-is"
+		use ncurses && interface="-in"
+	fi
+	sed -e "s/Exec=timidity/Exec=timidity ${interface}/" \
+		-e "s/Terminal=.*/Terminal=${terminal}/" \
+		-e "s/NoDisplay=.*/NoDisplay=${nodisplay}/" \
+		-i "${D}"/usr/share/applications/timidity.desktop || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "A timidity config file has been installed in /etc/timidity.cfg."
+	elog "Do not edit this file as it will interfere with the eselect timidity tool."
+	elog "The tool 'eselect timidity' can be used to switch between installed patchsets."
+
+	if use alsa; then
+		elog "An init script for the alsa timidity sequencer has been installed."
+		elog "If you wish to use the timidity virtual sequencer, edit /etc/conf.d/timidity"
+		elog "and run 'rc-update add timidity <runlevel> && /etc/init.d/timidity start'"
+	fi
+
+	if use sparc; then
+		elog "Only saving to wave file and ALSA soundback has been tested working."
+	fi
+
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	xdg_desktop_database_update
+}
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index 0457eb2e50b6..cfb700a1ad4f 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -1,4 +1,11 @@
+AUX wavpack-5.1.0-CVE-2018-10536-CVE-2018-10537.patch 2488 BLAKE2B cabb0741eff1df18c185cb7d2e4f3eb8cf7101a3dcac0bf8641d2cdc2ca5b0bb9d983edb47e7c92884878237994024e66be8aa48edf3b651b2bcb03a82a91cbd SHA512 58c7c4bc3475e88a1f997e879c2220da8b638100f3da20f169d1131f9827677118628e6e05f61fe55ae3e00cad63c318535f28d47185b72c174477bfde6823be
+AUX wavpack-5.1.0-CVE-2018-10538-CVE-2018-10539-CVE-2018-10540.patch 2664 BLAKE2B d11f2a15cbfd595f08b225ad322379bf1725cef280ae7fb516b8b57014e9c7da0f05d98bc82a80ddab1987671192a4ce69930bc39cc9cba5d2b26a600094d32d SHA512 1a469c5a36f037509951cc1afbd7b558434061d656c5f252350879c18ff31836c13dfbbaadff2bd075b5c6399b07c3b1e9ec80986cf44e0175e5c185a34680eb
+AUX wavpack-5.1.0-CVE-2018-6767.patch 5430 BLAKE2B 7131fbc90bddeec7fc2d4995685204e1506b142c4a442051119c20e47f97e3d484f3cf4fd4a138d999cfb2e0fdf27b0ac1aca87deee44cbe8a12bc8695853252 SHA512 f3ad6ac08e428dabd8c56de5bd430809378aaaf0ef846fd807b54cbe7637c1e42b75ff495c093dbbd4e3c0f5da3e3cbcaa69e8625059778acbd5682566d221dc
+AUX wavpack-5.1.0-CVE-2018-7253.patch 1299 BLAKE2B e2a40e2518208d143072a201ef5c8e187b1562d905639ceb13bc9fecc89dfcb5a8266bafa4f738d52abd606ada06037ddc94e916a436c3770aa77d398a26bdc9 SHA512 d00d47ea3a6141fb85402d68984ec1217b6f21c68c5de968488ce349e059d70b3d497902a7a6f1149eb61ec41f83182c53359ec2af738c7f5ba965d7a3b676f1
+AUX wavpack-5.1.0-CVE-2018-7254.patch 3004 BLAKE2B 2c744a5675a8b8c3f6b8e956ff3b65173a350f0aec90d8c4ae82eb558461016da1e89a485b2a8a67b5b76959cf579337e3f603de3a2f63c113d7f19a05f01b32 SHA512 cb83dd1767ee9759e14bac5eacf8b29cae3a2c22c326cd34bcc6d6941c0565c68d16a3d07e4c2b2f7a591284b8faf5b8697b4505e4bfd5e5e83f2a9de70df586
 AUX wavpack-5.1.0-armv7.patch 805 BLAKE2B dc69a643e3dde75cce1d5a23176cb09fecc513a98835242437659b0724de8ba2cb97a59fb1cb3dc050454ff95bc2669e6b19f10fd03fadaf06e4c859c063277c SHA512 b152f8081b712c24ae8db641f4755798ab4c7412a298054449883255fa76571ffbd0c580848a274ce1c44401f69102a0b2c66137ae36d9323e9e5330ee20856e
+AUX wavpack-5.1.0-memleaks.patch 800 BLAKE2B 601e81daad4208d109bd980cbe63ce0c638577d53fe01fa133469090faed7f641d00efd44f906732905599615513b0dddf918dc9ce13f927b3e889a1dbd0d13d SHA512 ac5f8473314939c1b07019617f8881e4675bab2d4a0f61dd95c5389ec9915a8573f3291a5c29547e8e5a300483600d36f3c53f9ee7380c5f0691860cef6a3594
 DIST wavpack-5.1.0.tar.bz2 824331 BLAKE2B 736dcb3cc0bee4ebcf76b8a7df178aa1b797ec6858358bf289a3e151f62d2ce8f430d163d46a84c0b5a7501c732ac639955c867e53fd9217ca7f213b601a8697 SHA512 4c31616ae63c3a875afa20f26ce935f7a8f9921e2892b4b8388eca3ccd83b2d686f43eed8b9ec1dead934a1148401b9dced3b05f509b7942c48d7af31cf80a54
+EBUILD wavpack-5.1.0-r1.ebuild 997 BLAKE2B 3563eac75f1091ce749baa151e0acfebd2c8022b1bbdd63aa07eda77b6a280d79676751d1662091ca3007e06d1636762cefe14ab044460afebe5d78fe0adb0ca SHA512 4c35bbec32c0f4609b06d26c93ee9af0011e24be897a422d8fd68adf426436178ce51f7615e3b9bbb3637a5b11c8389a27426fb21c2521f555dc1002f3c543a6
 EBUILD wavpack-5.1.0.ebuild 752 BLAKE2B a519797a235fbc6d8d0f99accc418475058fb08491cac1018efc50acf347d707bf270c7cbc11c34ebdf4ae19e7d2584bf08c857152c5b47d6600e170c2d16b9c SHA512 033c8ab3e49644faf65709af4048a5d673c33c00f5df6c1128a08358d93808fa0ad1e88ae73ea0262f838e56223b8232e3bee41759ba1837fbc0ad376da79a32
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-10536-CVE-2018-10537.patch b/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-10536-CVE-2018-10537.patch
new file mode 100644
index 000000000000..d8ac3552ddd5
--- /dev/null
+++ b/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-10536-CVE-2018-10537.patch
@@ -0,0 +1,59 @@
+From: David Bryant <david@wavpack.com>
+Date: Tue, 24 Apr 2018 22:18:07 -0700
+Subject: issue #30 issue #31 issue #32: no multiple format chunks in WAV or
+ W64
+
+---
+ cli/riff.c   | 7 ++++++-
+ cli/wave64.c | 6 ++++++
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/cli/riff.c b/cli/riff.c
+index 7bddf63..5d6452e 100644
+--- a/cli/riff.c
++++ b/cli/riff.c
+@@ -53,7 +53,7 @@ extern int debug_logging_mode;
+ 
+ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackContext *wpc, WavpackConfig *config)
+ {
+-    int is_rf64 = !strncmp (fourcc, "RF64", 4), got_ds64 = 0;
++    int is_rf64 = !strncmp (fourcc, "RF64", 4), got_ds64 = 0, format_chunk = 0;
+     int64_t total_samples = 0, infilesize;
+     RiffChunkHeader riff_chunk_header;
+     ChunkHeader chunk_header;
+@@ -140,6 +140,11 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack
+         else if (!strncmp (chunk_header.ckID, "fmt ", 4)) {     // if it's the format chunk, we want to get some info out of there and
+             int supported = TRUE, format;                        // make sure it's a .wav file we can handle
+ 
++            if (format_chunk++) {
++                error_line ("%s is not a valid .WAV file!", infilename);
++                return WAVPACK_SOFT_ERROR;
++            }
++
+             if (chunk_header.ckSize < 16 || chunk_header.ckSize > sizeof (WaveHeader) ||
+                 !DoReadFile (infile, &WaveHeader, chunk_header.ckSize, &bcount) ||
+                 bcount != chunk_header.ckSize) {
+diff --git a/cli/wave64.c b/cli/wave64.c
+index fa928a0..0388dc7 100644
+--- a/cli/wave64.c
++++ b/cli/wave64.c
+@@ -53,6 +53,7 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa
+     Wave64ChunkHeader chunk_header;
+     Wave64FileHeader filehdr;
+     WaveHeader WaveHeader;
++    int format_chunk = 0;
+     uint32_t bcount;
+ 
+     infilesize = DoGetFileSize (infile);
+@@ -104,6 +105,11 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa
+         if (!memcmp (chunk_header.ckID, fmt_guid, sizeof (fmt_guid))) {
+             int supported = TRUE, format;
+ 
++            if (format_chunk++) {
++                error_line ("%s is not a valid .W64 file!", infilename);
++                return WAVPACK_SOFT_ERROR;
++            }
++
+             chunk_header.ckSize = (chunk_header.ckSize + 7) & ~7L;
+ 
+             if (chunk_header.ckSize < 16 || chunk_header.ckSize > sizeof (WaveHeader) ||
diff --git a/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-10538-CVE-2018-10539-CVE-2018-10540.patch b/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-10538-CVE-2018-10539-CVE-2018-10540.patch
new file mode 100644
index 000000000000..d924bb624bdc
--- /dev/null
+++ b/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-10538-CVE-2018-10539-CVE-2018-10540.patch
@@ -0,0 +1,70 @@
+From: David Bryant <david@wavpack.com>
+Date: Tue, 24 Apr 2018 17:27:01 -0700
+Subject: issue #33, sanitize size of unknown chunks before malloc()
+
+---
+ cli/dsdiff.c | 9 ++++++++-
+ cli/riff.c   | 9 ++++++++-
+ cli/wave64.c | 9 ++++++++-
+ 3 files changed, 24 insertions(+), 3 deletions(-)
+
+diff --git a/cli/dsdiff.c b/cli/dsdiff.c
+index c016df9..fa56bbb 100644
+--- a/cli/dsdiff.c
++++ b/cli/dsdiff.c
+@@ -279,7 +279,14 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa
+         else {          // just copy unknown chunks to output file
+ 
+             int bytes_to_copy = (int)(((dff_chunk_header.ckDataSize) + 1) & ~(int64_t)1);
+-            char *buff = malloc (bytes_to_copy);
++            char *buff;
++
++            if (bytes_to_copy < 0 || bytes_to_copy > 4194304) {
++                error_line ("%s is not a valid .DFF file!", infilename);
++                return WAVPACK_SOFT_ERROR;
++            }
++
++            buff = malloc (bytes_to_copy);
+ 
+             if (debug_logging_mode)
+                 error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes",
+diff --git a/cli/riff.c b/cli/riff.c
+index de98c1e..7bddf63 100644
+--- a/cli/riff.c
++++ b/cli/riff.c
+@@ -286,7 +286,14 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack
+         else {          // just copy unknown chunks to output file
+ 
+             int bytes_to_copy = (chunk_header.ckSize + 1) & ~1L;
+-            char *buff = malloc (bytes_to_copy);
++            char *buff;
++
++            if (bytes_to_copy < 0 || bytes_to_copy > 4194304) {
++                error_line ("%s is not a valid .WAV file!", infilename);
++                return WAVPACK_SOFT_ERROR;
++            }
++
++            buff = malloc (bytes_to_copy);
+ 
+             if (debug_logging_mode)
+                 error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes",
+diff --git a/cli/wave64.c b/cli/wave64.c
+index 591d640..fa928a0 100644
+--- a/cli/wave64.c
++++ b/cli/wave64.c
+@@ -241,7 +241,14 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa
+         }
+         else {          // just copy unknown chunks to output file
+             int bytes_to_copy = (chunk_header.ckSize + 7) & ~7L;
+-            char *buff = malloc (bytes_to_copy);
++            char *buff;
++
++            if (bytes_to_copy < 0 || bytes_to_copy > 4194304) {
++                error_line ("%s is not a valid .W64 file!", infilename);
++                return WAVPACK_SOFT_ERROR;
++            }
++
++            buff = malloc (bytes_to_copy);
+ 
+             if (debug_logging_mode)
+                 error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes",
diff --git a/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-6767.patch b/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-6767.patch
new file mode 100644
index 000000000000..aa2cdd40fb62
--- /dev/null
+++ b/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-6767.patch
@@ -0,0 +1,111 @@
+From: David Bryant <david@wavpack.com>
+Date: Sun, 4 Feb 2018 11:28:15 -0800
+Subject: issue #27, do not overwrite stack on corrupt RF64 file
+
+---
+ cli/riff.c | 39 ++++++++++++++++++++++++++++++++-------
+ 1 file changed, 32 insertions(+), 7 deletions(-)
+
+diff --git a/cli/riff.c b/cli/riff.c
+index 8b1af45..de98c1e 100644
+--- a/cli/riff.c
++++ b/cli/riff.c
+@@ -42,6 +42,7 @@ typedef struct {
+ 
+ #pragma pack(pop)
+ 
++#define CS64ChunkFormat "4D"
+ #define DS64ChunkFormat "DDDL"
+ 
+ #define WAVPACK_NO_ERROR    0
+@@ -101,13 +102,13 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack
+ 
+         if (!strncmp (chunk_header.ckID, "ds64", 4)) {
+             if (chunk_header.ckSize < sizeof (DS64Chunk) ||
+-                !DoReadFile (infile, &ds64_chunk, chunk_header.ckSize, &bcount) ||
+-                bcount != chunk_header.ckSize) {
++                !DoReadFile (infile, &ds64_chunk, sizeof (DS64Chunk), &bcount) ||
++                bcount != sizeof (DS64Chunk)) {
+                     error_line ("%s is not a valid .WAV file!", infilename);
+                     return WAVPACK_SOFT_ERROR;
+             }
+             else if (!(config->qmode & QMODE_NO_STORE_WRAPPER) &&
+-                !WavpackAddWrapper (wpc, &ds64_chunk, chunk_header.ckSize)) {
++                !WavpackAddWrapper (wpc, &ds64_chunk, sizeof (DS64Chunk))) {
+                     error_line ("%s", WavpackGetErrorMessage (wpc));
+                     return WAVPACK_SOFT_ERROR;
+             }
+@@ -315,10 +316,11 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack
+ 
+ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples, int qmode)
+ {
+-    int do_rf64 = 0, write_junk = 1;
++    int do_rf64 = 0, write_junk = 1, table_length = 0;
+     ChunkHeader ds64hdr, datahdr, fmthdr;
+     RiffChunkHeader riffhdr;
+     DS64Chunk ds64_chunk;
++    CS64Chunk cs64_chunk;
+     JunkChunk junkchunk;
+     WaveHeader wavhdr;
+     uint32_t bcount;
+@@ -380,6 +382,7 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples,
+     strncpy (riffhdr.formType, "WAVE", sizeof (riffhdr.formType));
+     total_riff_bytes = sizeof (riffhdr) + wavhdrsize + sizeof (datahdr) + ((total_data_bytes + 1) & ~(int64_t)1);
+     if (do_rf64) total_riff_bytes += sizeof (ds64hdr) + sizeof (ds64_chunk);
++    total_riff_bytes += table_length * sizeof (CS64Chunk);
+     if (write_junk) total_riff_bytes += sizeof (junkchunk);
+     strncpy (fmthdr.ckID, "fmt ", sizeof (fmthdr.ckID));
+     strncpy (datahdr.ckID, "data", sizeof (datahdr.ckID));
+@@ -394,11 +397,12 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples,
+ 
+     if (do_rf64) {
+         strncpy (ds64hdr.ckID, "ds64", sizeof (ds64hdr.ckID));
+-        ds64hdr.ckSize = sizeof (ds64_chunk);
++        ds64hdr.ckSize = sizeof (ds64_chunk) + (table_length * sizeof (CS64Chunk));
+         CLEAR (ds64_chunk);
+         ds64_chunk.riffSize64 = total_riff_bytes;
+         ds64_chunk.dataSize64 = total_data_bytes;
+         ds64_chunk.sampleCount64 = total_samples;
++        ds64_chunk.tableLength = table_length;
+         riffhdr.ckSize = (uint32_t) -1;
+         datahdr.ckSize = (uint32_t) -1;
+         WavpackNativeToLittleEndian (&ds64hdr, ChunkHeaderFormat);
+@@ -409,6 +413,14 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples,
+         datahdr.ckSize = (uint32_t) total_data_bytes;
+     }
+ 
++    // this "table" is just a dummy placeholder for testing (normally not written)
++
++    if (table_length) {
++        strncpy (cs64_chunk.ckID, "dmmy", sizeof (cs64_chunk.ckID));
++        cs64_chunk.chunkSize64 = 12345678;
++        WavpackNativeToLittleEndian (&cs64_chunk, CS64ChunkFormat);
++    }
++
+     // write the RIFF chunks up to just before the data starts
+ 
+     WavpackNativeToLittleEndian (&riffhdr, ChunkHeaderFormat);
+@@ -418,8 +430,21 @@ int WriteRiffHeader (FILE *outfile, WavpackContext *wpc, int64_t total_samples,
+ 
+     if (!DoWriteFile (outfile, &riffhdr, sizeof (riffhdr), &bcount) || bcount != sizeof (riffhdr) ||
+         (do_rf64 && (!DoWriteFile (outfile, &ds64hdr, sizeof (ds64hdr), &bcount) || bcount != sizeof (ds64hdr))) ||
+-        (do_rf64 && (!DoWriteFile (outfile, &ds64_chunk, sizeof (ds64_chunk), &bcount) || bcount != sizeof (ds64_chunk))) ||
+-        (write_junk && (!DoWriteFile (outfile, &junkchunk, sizeof (junkchunk), &bcount) || bcount != sizeof (junkchunk))) ||
++        (do_rf64 && (!DoWriteFile (outfile, &ds64_chunk, sizeof (ds64_chunk), &bcount) || bcount != sizeof (ds64_chunk)))) {
++            error_line ("can't write .WAV data, disk probably full!");
++            return FALSE;
++    }
++
++    // again, this is normally not written except for testing
++
++    while (table_length--)
++        if (!DoWriteFile (outfile, &cs64_chunk, sizeof (cs64_chunk), &bcount) || bcount != sizeof (cs64_chunk)) {
++            error_line ("can't write .WAV data, disk probably full!");
++            return FALSE;
++        }
++
++
++    if ((write_junk && (!DoWriteFile (outfile, &junkchunk, sizeof (junkchunk), &bcount) || bcount != sizeof (junkchunk))) ||
+         !DoWriteFile (outfile, &fmthdr, sizeof (fmthdr), &bcount) || bcount != sizeof (fmthdr) ||
+         !DoWriteFile (outfile, &wavhdr, wavhdrsize, &bcount) || bcount != wavhdrsize ||
+         !DoWriteFile (outfile, &datahdr, sizeof (datahdr), &bcount) || bcount != sizeof (datahdr)) {
diff --git a/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-7253.patch b/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-7253.patch
new file mode 100644
index 000000000000..2bf554d8b525
--- /dev/null
+++ b/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-7253.patch
@@ -0,0 +1,31 @@
+From: David Bryant <david@wavpack.com>
+Date: Sat, 10 Feb 2018 16:01:39 -0800
+Subject: issue #28, do not overwrite heap on corrupt DSDIFF file
+
+---
+ cli/dsdiff.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/cli/dsdiff.c b/cli/dsdiff.c
+index 410dc1c..c016df9 100644
+--- a/cli/dsdiff.c
++++ b/cli/dsdiff.c
+@@ -153,7 +153,17 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa
+                 error_line ("dsdiff file version = 0x%08x", version);
+         }
+         else if (!strncmp (dff_chunk_header.ckID, "PROP", 4)) {
+-            char *prop_chunk = malloc ((size_t) dff_chunk_header.ckDataSize);
++            char *prop_chunk;
++
++            if (dff_chunk_header.ckDataSize < 4 || dff_chunk_header.ckDataSize > 1024) {
++                error_line ("%s is not a valid .DFF file!", infilename);
++                return WAVPACK_SOFT_ERROR;
++            }
++
++            if (debug_logging_mode)
++                error_line ("got PROP chunk of %d bytes total", (int) dff_chunk_header.ckDataSize);
++
++            prop_chunk = malloc ((size_t) dff_chunk_header.ckDataSize);
+ 
+             if (!DoReadFile (infile, prop_chunk, (uint32_t) dff_chunk_header.ckDataSize, &bcount) ||
+                 bcount != dff_chunk_header.ckDataSize) {
diff --git a/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-7254.patch b/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-7254.patch
new file mode 100644
index 000000000000..f6e1cc42b134
--- /dev/null
+++ b/media-sound/wavpack/files/wavpack-5.1.0-CVE-2018-7254.patch
@@ -0,0 +1,64 @@
+From: David Bryant <david@wavpack.com>
+Date: Sun, 11 Feb 2018 16:37:47 -0800
+Subject: issue #28, fix buffer overflows and bad allocs on corrupt CAF files
+
+---
+ cli/caff.c | 30 +++++++++++++++++++++++-------
+ 1 file changed, 23 insertions(+), 7 deletions(-)
+
+diff --git a/cli/caff.c b/cli/caff.c
+index ae57c4b..6248a71 100644
+--- a/cli/caff.c
++++ b/cli/caff.c
+@@ -89,8 +89,8 @@ typedef struct
+ 
+ #define CAFChannelDescriptionFormat "LLLLL"
+ 
+-static const char TMH_full [] = { 1,2,3,13,9,10,5,6,12,14,15,16,17,9,4,18,7,8,19,20,21 };
+-static const char TMH_std [] = { 1,2,3,11,8,9,5,6,10,12,13,14,15,7,4,16 };
++static const char TMH_full [] = { 1,2,3,13,9,10,5,6,12,14,15,16,17,9,4,18,7,8,19,20,21,0 };
++static const char TMH_std [] = { 1,2,3,11,8,9,5,6,10,12,13,14,15,7,4,16,0 };
+ 
+ static struct {
+     uint32_t mChannelLayoutTag;     // Core Audio layout, 100 - 146 in high word, num channels in low word
+@@ -274,10 +274,19 @@ int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack
+             }
+         }
+         else if (!strncmp (caf_chunk_header.mChunkType, "chan", 4)) {
+-            CAFChannelLayout *caf_channel_layout = malloc ((size_t) caf_chunk_header.mChunkSize);
++            CAFChannelLayout *caf_channel_layout;
+ 
+-            if (caf_chunk_header.mChunkSize < sizeof (CAFChannelLayout) ||
+-                !DoReadFile (infile, caf_channel_layout, (uint32_t) caf_chunk_header.mChunkSize, &bcount) ||
++            if (caf_chunk_header.mChunkSize < sizeof (CAFChannelLayout) || caf_chunk_header.mChunkSize > 1024) {
++                error_line ("this .CAF file has an invalid 'chan' chunk!");
++                return WAVPACK_SOFT_ERROR;
++            }
++
++            if (debug_logging_mode)
++                error_line ("'chan' chunk is %d bytes", (int) caf_chunk_header.mChunkSize);
++
++            caf_channel_layout = malloc ((size_t) caf_chunk_header.mChunkSize);
++
++            if (!DoReadFile (infile, caf_channel_layout, (uint32_t) caf_chunk_header.mChunkSize, &bcount) ||
+                 bcount != caf_chunk_header.mChunkSize) {
+                     error_line ("%s is not a valid .CAF file!", infilename);
+                     free (caf_channel_layout);
+@@ -495,8 +504,15 @@ int ParseCaffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack
+         }
+         else {          // just copy unknown chunks to output file
+ 
+-            int bytes_to_copy = (uint32_t) caf_chunk_header.mChunkSize;
+-            char *buff = malloc (bytes_to_copy);
++            uint32_t bytes_to_copy = (uint32_t) caf_chunk_header.mChunkSize;
++            char *buff;
++
++            if (caf_chunk_header.mChunkSize < 0 || caf_chunk_header.mChunkSize > 1048576) {
++                error_line ("%s is not a valid .CAF file!", infilename);
++                return WAVPACK_SOFT_ERROR;
++            }
++
++            buff = malloc (bytes_to_copy);
+ 
+             if (debug_logging_mode)
+                 error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes",
diff --git a/media-sound/wavpack/files/wavpack-5.1.0-memleaks.patch b/media-sound/wavpack/files/wavpack-5.1.0-memleaks.patch
new file mode 100644
index 000000000000..18f782fa7721
--- /dev/null
+++ b/media-sound/wavpack/files/wavpack-5.1.0-memleaks.patch
@@ -0,0 +1,32 @@
+From: David Bryant <david@wavpack.com>
+Date: Sun, 8 Apr 2018 16:27:40 -0700
+Subject: fix memory leaks
+
+---
+ src/common_utils.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/src/common_utils.c b/src/common_utils.c
+index caf6b8f..629e60e 100644
+--- a/src/common_utils.c
++++ b/src/common_utils.c
+@@ -373,6 +373,19 @@ WavpackContext *WavpackCloseFile (WavpackContext *wpc)
+ 
+     WavpackFreeWrapper (wpc);
+ 
++    if (wpc->metadata) {
++        int i;
++
++        for (i = 0; i < wpc->metacount; ++i)
++            if (wpc->metadata [i].data)
++                free (wpc->metadata [i].data);
++
++        free (wpc->metadata);
++    }
++
++    if (wpc->channel_identities)
++        free (wpc->channel_identities);
++
+     if (wpc->channel_reordering)
+         free (wpc->channel_reordering);
+ 
diff --git a/media-sound/wavpack/wavpack-5.1.0-r1.ebuild b/media-sound/wavpack/wavpack-5.1.0-r1.ebuild
new file mode 100644
index 000000000000..6022c6a2c024
--- /dev/null
+++ b/media-sound/wavpack/wavpack-5.1.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Hybrid lossless audio compression tools"
+HOMEPAGE="http://www.wavpack.com/"
+SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=virtual/libiconv-0-r1"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-armv7.patch
+	"${FILESDIR}"/${P}-CVE-2018-{6767,7253,7254}.patch
+	"${FILESDIR}"/${P}-CVE-2018-10536-CVE-2018-10537.patch
+	"${FILESDIR}"/${P}-CVE-2018-10538-CVE-2018-10539-CVE-2018-10540.patch
+	"${FILESDIR}"/${P}-memleaks.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf \
+		$(multilib_native_enable apps)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-sound/whipper/Manifest b/media-sound/whipper/Manifest
new file mode 100644
index 000000000000..d40413ca2657
--- /dev/null
+++ b/media-sound/whipper/Manifest
@@ -0,0 +1,5 @@
+AUX whipper-0.7.0-cdparanoia-name-fix.patch 2036 BLAKE2B 54d0c70f0ccf89e46607e67d3b1bd3288dc0c34da27d6111df98810d85369c51f953e415a6415c0c08649a2e7fed10cfea77e3a7695f8c4f03445948a8f83c64 SHA512 13edc4bd713409e8fa6d871ce5f9316895edb0156eeed7eef401e72c19f188a8067c45c16a3fe1c3e21209fd8ec6bdf2478e4d4376f210d535993c7ef1575453
+AUX whipper-0.7.0-src-Makefile-respect-CFLAGS.patch 1755 BLAKE2B 5b750690e20230528830a468b34d0a481dbf08af36b1b687121a57518613fabb5b298145b8f2693b21653749b3ed1e185864c6348b0adfb33810c1723fe640d3 SHA512 ccda4c1e97a841d8afec9ed68ccf87371e0883afa7b179010973925185fa58e6a21f4b488dba1891a416c22a8e0ee911318117a059c20989d673c5e5e214c25a
+DIST whipper-0.7.0.tar.gz 160649 BLAKE2B 8e14b6dda00b3c8be7ba0fabb25d1cbca536edc785373986f857bafbc2e54d358f18b27140ffda74384c4e815e68ee466c8fc5e4e5d17aa80c8237fda389ba2b SHA512 b4bf4ca64521d8600288addecec6cbd8e43d1ff9a6b9a60872eff1bd5a2b6966af036d6467ba09273ac78aa01d8cac3be29a0e2c4e6600829b9988a74ef8cd88
+EBUILD whipper-0.7.0.ebuild 1573 BLAKE2B ec636c39a9cb7abcbd4e4be2ba8c23dd3c5751080e670e8a5b20167edc133c54da87a29b26bc71e10565839e1c487d5627c0abb152267b5be32301310cb9010b SHA512 f4595bf32d8fa4830903bdb13beb33beae2fb725239f430001c1001556ea9166f3be152c52e322b50a42afb1574780dfae17eee601adb7bcf103ac5175f51085
+MISC metadata.xml 530 BLAKE2B 8cf5640fc05fc9b327e3b6d5d621987cdc74b816e372817fe9d63ac83c37e1669f6b07873eba61439b5d00d26975bc5dd850c649f80454f51f800cba8d7c340c SHA512 87970186262167b583d1a90dbe5016f11368d123f6ff81782c8bffa7217c8eda42440fca4c65ccfbbf75971acf292b1067838024c2bc536cd8b6116fc2cd4172
diff --git a/media-sound/whipper/files/whipper-0.7.0-cdparanoia-name-fix.patch b/media-sound/whipper/files/whipper-0.7.0-cdparanoia-name-fix.patch
new file mode 100644
index 000000000000..fdd7b9eed463
--- /dev/null
+++ b/media-sound/whipper/files/whipper-0.7.0-cdparanoia-name-fix.patch
@@ -0,0 +1,51 @@
+diff -ur a/whipper/program/cdparanoia.py b/whipper/program/cdparanoia.py
+--- a/whipper/program/cdparanoia.py	2018-04-09 10:05:00.000000000 +0200
++++ b/whipper/program/cdparanoia.py	2018-08-03 11:59:22.582106444 +0200
+@@ -280,10 +280,10 @@
+ 
+         bufsize = 1024
+         if self._overread:
+-            argv = ["cd-paranoia", "--stderr-progress",
++            argv = ["libcdio-paranoia", "--stderr-progress",
+                     "--sample-offset=%d" % self._offset, "--force-overread", ]
+         else:
+-            argv = ["cd-paranoia", "--stderr-progress",
++            argv = ["libcdio-paranoia", "--stderr-progress",
+                     "--sample-offset=%d" % self._offset, ]
+         if self._device:
+             argv.extend(["--force-cdrom-device", self._device, ])
+@@ -302,7 +302,7 @@
+         except OSError, e:
+             import errno
+             if e.errno == errno.ENOENT:
+-                raise common.MissingDependencyException('cd-paranoia')
++                raise common.MissingDependencyException('libcdio-paranoia')
+ 
+             raise
+ 
+@@ -559,8 +559,8 @@
+ 
+ 
+ def getCdParanoiaVersion():
+-    getter = common.VersionGetter('cd-paranoia',
+-                                  ["cd-paranoia", "-V"],
++    getter = common.VersionGetter('libcdio-paranoia',
++                                  ["libcdio-paranoia", "-V"],
+                                   _VERSION_RE,
+                                   "%(version)s %(release)s")
+ 
+@@ -585,12 +585,12 @@
+     def __init__(self, device=None):
+         # cdparanoia -A *always* writes cdparanoia.log
+         self.cwd = tempfile.mkdtemp(suffix='.whipper.cache')
+-        self.command = ['cd-paranoia', '-A']
++        self.command = ['libcdio-paranoia', '-A']
+         if device:
+             self.command += ['-d', device]
+ 
+     def commandMissing(self):
+-        raise common.MissingDependencyException('cd-paranoia')
++        raise common.MissingDependencyException('libcdio-paranoia')
+ 
+     def readbyteserr(self, bytes):
+         self._output.append(bytes)
diff --git a/media-sound/whipper/files/whipper-0.7.0-src-Makefile-respect-CFLAGS.patch b/media-sound/whipper/files/whipper-0.7.0-src-Makefile-respect-CFLAGS.patch
new file mode 100644
index 000000000000..71ba1f5c7857
--- /dev/null
+++ b/media-sound/whipper/files/whipper-0.7.0-src-Makefile-respect-CFLAGS.patch
@@ -0,0 +1,69 @@
+From a3f090d8ed55e5e2c0c595b9bf0e244a81ce1464 Mon Sep 17 00:00:00 2001
+From: Merlijn Wajer <merlijn@wizzup.org>
+Date: Wed, 22 Aug 2018 11:41:16 +0200
+Subject: [PATCH] src/Makefile: respect CFLAGS
+
+---
+ src/Makefile  | 19 +++++--------------
+ src/config.mk |  6 +++---
+ 2 files changed, 8 insertions(+), 17 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index f1c6d4a..ee8845d 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -5,25 +5,16 @@ include config.mk
+ SRC = accuraterip-checksum.c
+ OBJ = ${SRC:.c=.o}
+ 
+-all: options accuraterip-checksum
+-
+-options:
+-	@echo accuraterip-checksum build options:
+-	@echo "CFLAGS   = ${CFLAGS}"
+-	@echo "LDFLAGS  = ${LDFLAGS}"
+-	@echo "CC       = ${CC}"
++all: accuraterip-checksum
+ 
+ .c.o:
+-	@echo CC $<
+-	@${CC} -c ${CFLAGS} $<
++	${CC} -c ${OURCFLAGS} $<
+ 
+ accuraterip-checksum: ${OBJ}
+-	@echo CC -o $@
+-	@${CC} -o $@ ${OBJ} ${LDFLAGS}
++	${CC} -std=c99 -lsndfile -o $@ ${OBJ} ${OURCFLAGS} ${OURLDFLAGS}
+ 
+ clean:
+-	@echo cleaning
+-	@rm -f accuraterip-checksum ${OBJ} accuraterip-checksum-${VERSION}.tar.gz
++	rm -f accuraterip-checksum ${OBJ} accuraterip-checksum-${VERSION}.tar.gz
+ 
+ dist: clean
+ 	@echo creating dist tarball
+@@ -44,4 +35,4 @@ uninstall:
+ 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
+ 	@rm -f ${DESTDIR}${PREFIX}/bin/accuraterip-checksum
+ 
+-.PHONY: all options clean dist install uninstall
++.PHONY: all clean dist install uninstall
+diff --git a/src/config.mk b/src/config.mk
+index 283d745..87fe219 100644
+--- a/src/config.mk
++++ b/src/config.mk
+@@ -4,8 +4,8 @@ VERSION = 1.4
+ PREFIX = /usr/local
+ 
+ # flags
+-CFLAGS   = -std=c99
+-LDFLAGS  = -lsndfile
++OURCFLAGS   = ${CFLAGS} -std=c99
++OURLDFLAGS  = ${LDFLAGS} -lsndfile
+ 
+ # compiler and linker
+-CC = cc
++CC ?= cc
+-- 
+2.16.4
+
diff --git a/media-sound/whipper/metadata.xml b/media-sound/whipper/metadata.xml
new file mode 100644
index 000000000000..46be9b4141ca
--- /dev/null
+++ b/media-sound/whipper/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@retornaz.com</email>
+		<name>Quentin Retornaz</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>gentoo@wizzup.org</email>
+		<name>Merlijn Wajer</name>
+		<description>Whipper project developer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/whipper/whipper-0.7.0.ebuild b/media-sound/whipper/whipper-0.7.0.ebuild
new file mode 100644
index 000000000000..cf58c45c2d39
--- /dev/null
+++ b/media-sound/whipper/whipper-0.7.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python CD-DA ripper preferring accuracy over speed (forked from morituri)"
+HOMEPAGE="https://github.com/JoeLametta/whipper"
+SRC_URI="https://github.com/JoeLametta/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-libs/libsndfile
+	test? ( dev-python/twisted[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	app-cdr/cdrdao
+	dev-libs/gobject-introspection[${PYTHON_USEDEP}]
+	>=dev-libs/libcdio-paranoia-0.94_p2
+	dev-python/cddb-py[${PYTHON_USEDEP}]
+	dev-python/pycdio[${PYTHON_USEDEP}]
+	dev-python/pygobject:2=[${PYTHON_USEDEP}]
+	dev-python/python-musicbrainz-ngs[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-libs/flac
+	media-libs/libsndfile
+	media-libs/mutagen[${PYTHON_USEDEP}]
+	media-sound/sox[flac]
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cdparanoia-name-fix.patch"
+	"${FILESDIR}/${P}-src-Makefile-respect-CFLAGS.patch"
+)
+
+src_prepare() {
+	# accurip test totally depends on network access
+	rm "${PN}"/test/test_common_accurip.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	emake -C src CC="$(tc-getCC)"
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" -C src install
+}
diff --git a/media-sound/wildmidi/Manifest b/media-sound/wildmidi/Manifest
index 91946e3a554b..bc868fe9b12a 100644
--- a/media-sound/wildmidi/Manifest
+++ b/media-sound/wildmidi/Manifest
@@ -1,9 +1,11 @@
 AUX wildmidi.cfg 4670 BLAKE2B 09b79b3c179a506b6b1b6bb7f5b271926dc6b03daa755fb33c8116adabbf2e592aec32ced336be2986982adc84b78eb811fb417de3b327df8da70f2993124522 SHA512 978d8aeec23430cc0fbd0d625795a63f0876375e168f3be3294553de4d63c0e930775154c8dfa3a925c87010bb83e9e96b9e897de2166f3dbd40c4c14cd3f3c1
 DIST wildmidi-0.2.3.5.tar.gz 375792 BLAKE2B d4f14df0e46ce59d18fc2949d5e3789831301fa86b3abe9d0d027e4beb15cfde871561851d49bcfe3784db16d1a4433a8b3a19a05e673215d84255e0caaa51d5 SHA512 20bce7c551239944d2f6cd27a0963628e13624e651aabfae62380fe953ac3fc67eb27551a427c41ef2b057ec00903128d6afeccfc2688aefd46709d1f941befc
+DIST wildmidi-0.3.13.tar.gz 132407 BLAKE2B 5f603adb7583d47ca0595a48a385412d09ca8b19e99c93ba474d91076fa17a54e12e08bb39ea73d16c07addeab86e6c9d8b778d19045ef6b7d551d041bbc58fa SHA512 e9ede8a98c97e57a7bd34e63fc725a1b47bbff6b41f5dca101249917f0e7756ce4d93a84b8d5b6f592687fd3deed369c22c727873c9bdd1bea6e8c31fdbb4fdb
 DIST wildmidi-0.3.6.tar.gz 105534 BLAKE2B 4c2a62ec61333c3d9dc7f26e981389f22c6b2b611a548d6ff3fa9bc450490ece42f5b1c636dc53fc05c51b445a0ce8bc68fdfccdd440aa82bef36001049ce9d5 SHA512 e7efb9e9e67ee518dd0cdabbe8d701ec3c0762ea007e52533b82f4a4984e0600f7ba1cd9f9b79dda9e553fa04ca861b0b8d4b21ceb35ed0c8f5a4fe6de66d1d0
 DIST wildmidi-0.3.7.tar.gz 121501 BLAKE2B bae856c00449564f9199f977a4881d51c19769da10bf554a8baf681454a50b67b70feeda19592be91beda65131d4f241e661524f9c65163fb95a8570fee7f779 SHA512 b4d40404891161cb55a71dd790e2dbd2c4ec21730c8aaa6f3a68eeacd36d939f859b55ab535bee2feb9ffed04337332ef1eedcffbff6ae02d7499fec97f7a42b
 DIST wildmidi-0.3.8.tar.gz 121690 BLAKE2B fd11315e930a30f89ca57af0819116f8385fa1a7ecaedf7df1decc39774fa0a98df6b12e47bc8254a6c856bf41083571effa3aa70a448c1fdbcc0bbc7e848178 SHA512 883c5b2db84bee85f14a98729496aa9e15f5c1414dbaed6108d07e649b34937cbd3e8a8823a2b6519fcc7fdd354219c0667615c7b31e8952e13f8635e5284f50
 EBUILD wildmidi-0.2.3.5.ebuild 1108 BLAKE2B f1e1c9d2b7f38959cb423ffafd5ca17c6d979fc73e5ef810112aca00dd23a547dbd7e354bb1a86207dea79a42074475e705386b5fa3badf38f2190bcbe063487 SHA512 3937c9b2f532cd09dfcd656b516d396ec0acaeed010ca09ecf8f3609f71b67591e6aae5b009b8810d2f5684040e64de2ca0000b1404666b844dff78888eebb53
+EBUILD wildmidi-0.3.13.ebuild 1856 BLAKE2B acf289834ba609868e79d8463e42c008bedff881b83bf09bf3a87cc1aa097c3a654381abc1aab2a23b147ddfe0db331b19f14fa2916fe0cd0a8ed7d4185985dc SHA512 18b6b93c2e97a7a5a2a703681af8495b5447b0ad83891c2d945aeb95decc9f75c8c4836840cd7555ede5c0c30235d68b4bfa3ac65b08d2444d67f3af8b3d5e29
 EBUILD wildmidi-0.3.6.ebuild 1870 BLAKE2B a024316067bde1b90b6397c9127238198cccda88dd958fe9063257030dd58d00ad1ae5c6a11dc4cec0d4c7134be7df3fd878efe8f043213f84a574f0fd61ae32 SHA512 a15e48e3141a238c4237b7c080234f24b27dbadbc22b26cdb957939a94dd257f0bc21c6f98030881b3d6a477050c2a77b12c57dfe1a1ff6b0be5944be82c2738
 EBUILD wildmidi-0.3.7.ebuild 1843 BLAKE2B e3637544044e1b73f9c597cdc3a759d3c6e206f8523f7703cb465707446543c728b58dae5910c0049a9216e62701a6feae5cc56044fb98d2d53354d43781479d SHA512 d16c4718fdfeaf13ab6893a8617a9cae136ed2e2639b5649f038b65a588ca0f25b6e1ef247a4572e3cc96130a2eb82c4133956adb425c7266c986136b76f8092
 EBUILD wildmidi-0.3.8.ebuild 1870 BLAKE2B 1930d55817f98a070c49732ac393829e9a6fe628bd7e458d67fba4c04be42318186c9be8b6a034a97a4b1e3b93ec66721a4db0da712f2de4b64801c6a9065adb SHA512 85d8692fc01977a7358a11d88ad05bda7ef90bb378d49d17020599eb5e542d36f5d72b68c7b13f6b1d6c6266fa166d894b2813d3328f6027becd2364f3df6a5a
diff --git a/media-sound/wildmidi/wildmidi-0.3.13.ebuild b/media-sound/wildmidi/wildmidi-0.3.13.ebuild
new file mode 100644
index 000000000000..b75eb52da3d4
--- /dev/null
+++ b/media-sound/wildmidi/wildmidi-0.3.13.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils readme.gentoo-r1
+
+DESCRIPTION="Midi processing library and a midi player using the gus patch set"
+HOMEPAGE="http://www.mindwerks.net/projects/wildmidi/"
+SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+IUSE="+alsa openal oss +player"
+
+DEPEND="
+	player? (
+		alsa? ( media-libs/alsa-lib )
+		openal? ( media-libs/openal )
+	)
+"
+RDEPEND="${DEPEND}
+	media-sound/timidity-freepats
+"
+
+REQUIRED_USE="player? ( ^^ ( alsa oss openal ) )"
+
+DOC_CONTENTS="${PN} is using timidity-freepats for midi playback.
+	A default configuration file was placed on /etc/${PN}/${PN}.cfg.
+	For more information please read the ${PN}.cfg manpage."
+
+S="${WORKDIR}"/${PN}-${P}
+
+src_prepare() {
+	# alsa openal oss only make sense if player is enabled. See CMakeLists.txt
+	if ! use player && (use alsa || use openal || use oss); then
+		ewarn "The 'alsa', 'openal' and 'oss' use flags only make sense if"
+		ewarn "the 'player' use flags is selected and as a result they will be"
+		ewarn "ignored in this build"
+	fi
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_OPENAL=$(usex openal)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PLAYER=$(usex player)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	find "${D}" -name '*.la' -delete || die
+
+	insinto /etc/${PN}/
+	doins cfg/${PN}.cfg
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/${PN}.cfg ]]; then
+		elog
+		elog "Old /etc/${PN}.cfg detected!"
+		elog "Please migrate your configuration file to"
+		elog "/etc/${PN}/ directory which is now the default"
+		elog "location for the ${PN} configuration file."
+		elog
+	fi
+}
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 0135b1419153..f6c7c1cabb04 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 7581 BLAKE2B 647c46a016dcb76e7aa383cbd14f26d200680637a9858b9ab17b8dd11755819b644dd1e22d95b515c394336f2f0eabd845ee1133742e12e2a307909405c27e12 SHA512 6fad287e5043fdcf926792425d271b45f8affc371f173db5e58c3c8b1752ddf3bb73370ebe4d4fd56c31488cfef11ae64df1ff90010eef56759b7f116cc1f7f5
+EBUILD xmms2-0.8_p20161122-r4.ebuild 7579 BLAKE2B 771176b840e47bac4d3da6f9ecede74410568ced36c24bfae997b0ebe92a21ba2fbbd2945c74c6cb0c52fe73d56dfff9494fb3f877b77de0594097dac6eff5ad SHA512 edb2dea6a212dbc420d3b087dba4f3d2cfc6a7035d96e951fa52bacd9e5868a487d0e73f6b2a43117fdb1ae43474c804a6a8854d4eedbe9418c9272c63c73455
 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 44013523f07d..95780ab4116d 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-08-25 07:36:27 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-08-25 07:36:27 +0100
commit	43793fab84041cfc5c60c0151d1591b8a69fb24a (patch)
tree	6208a7f4fc744684fce0f55acbb47511acace498 /media-sound
parent	28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff)