gentoo resync : 14.07.2018

38 files changed, 210 insertions, 586 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index f8f9d29a35fe..4b99c84c30c9 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index 1c602990c7b5..6d48096bacb2 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -1,5 +1,5 @@
 DIST asunder-2.9.2.tar.bz2 279227 BLAKE2B 7b8e1a54e4577267d7c4b4fa3f3fd5b434bc52465d3c473de309f48ac196c2d40885acf08fe84669ccfd5c107d7e45e45069c1757fbc2b550cdb8eaa90e01475 SHA512 37b8ed7c7eed46e594807866d29c3bd37cba8d880c68e714168ae373a8d0dbc58cf837dbd704f95ddbe2544880470fb1f176ab6a67643a4a45b048eabb87e4c2
 DIST asunder-2.9.3.tar.bz2 275527 BLAKE2B a113fc2c380555550a5903919b78d5c7f304c3938665318d86dbbdd01d503641413bccc755621cefd948b10fb352f6995252fb548cc5730e1ff50d4b2d6a3634 SHA512 b6546e16c936285584480cf378be11e96717aeedc22a7c5163cc0791a41498597d8437369d00823710c56faabe1dea23e4be9c839eb1ee371415104f13d61296
-EBUILD asunder-2.9.2-r1.ebuild 1077 BLAKE2B f66d32dfbb906f4d8972b198837d90068c9e2f072dc1ac83e3068954691bfa8a2bfd909be8abdac7d72887ecfa35ad1d4656fc0ab09dc11e327d4a854a0f6433 SHA512 3cf5a77110d76e29d8a0fe648b09249db74d3983ce60ded19602aeb48da1ae53c316a5d4637bcc196781af9e1756efc4b37e3b16878df6e21bb783e51750b58d
-EBUILD asunder-2.9.3.ebuild 1079 BLAKE2B 24f91d1007a50bbc781c158dadea898140208d4f69d7936219f7e65ee63acf7c9a79ba32dd30c486e0e2909d0b4032814164942d9e3529b65558e698a71664e8 SHA512 8db7e0724a4917a1debde92c73ae7e4d4e2169e8deec95f783ec1c4d045bb8478b6f4529e978c80e2882c62f50bca4bd9ec2e753c8dcb56378e3a83ec93f4ad1
+EBUILD asunder-2.9.2-r2.ebuild 1043 BLAKE2B b31247afc84f6cabf68b752e49b464470389de98fbcfa7c52fe90080802c16f3b4dfb796c79144713b08987a147db9f8a81e03d4bb40c2f4925e54f363f23583 SHA512 33aeebf7b9062697e34f58d0659fbc3caa306ca53671b218148861a1f5236902c015311ff8dc13fb88379d13ba15b73508e3bfb35a3afeb6718ecbb70b0558d2
+EBUILD asunder-2.9.3-r1.ebuild 1045 BLAKE2B ca487c6e9b44f7ffe47d6245e555a0d66875da1abd3b999d79c315f60d304ecc9e4c56da2603eac25c704e3a9bfa0bf48ad5e730dd4a8a4f69ac6a2fc051651f SHA512 c9b4828e8e907fe02467fc2b10f1d4ec074e10d8b238a73987278f4001177905a1db8127c1dc3f23e01f5260507e9f05fb7085f9463a21b1c9c0896bd4ece2f3
 MISC metadata.xml 407 BLAKE2B 3977485349c4dbb217e3ddcafaf22c7d394b764e6196a21fc63781ccf16a989ffd00faa0d4fbd9ff1c7bd35879d3cfdf586d0b5723b3e09d78fc034bf9736a5b SHA512 504625a32837ff424070b0fa4e691e71b0be4270958289c10d768790750842c581c919332747b26d7c43ada99d007e6517ff181474d668fcedc1ded21ae32f21
diff --git a/media-sound/asunder/asunder-2.9.2-r1.ebuild b/media-sound/asunder/asunder-2.9.2-r2.ebuild
index 02687a60142d..ed513c27d336 100644
--- a/media-sound/asunder/asunder-2.9.2-r1.ebuild
+++ b/media-sound/asunder/asunder-2.9.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="aac flac mac mp3 musepack opus vorbis wavpack"
+IUSE="flac mac mp3 musepack opus vorbis wavpack"
 
 COMMON_DEPEND=">=media-libs/libcddb-0.9.5
 	media-sound/cdparanoia
@@ -22,7 +22,6 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	sys-devel/gettext"
 RDEPEND="${COMMON_DEPEND}
-	aac? ( media-sound/neroaac )
 	flac? ( media-libs/flac )
 	mac? ( media-sound/mac )
 	mp3? ( media-sound/lame )
diff --git a/media-sound/asunder/asunder-2.9.3.ebuild b/media-sound/asunder/asunder-2.9.3-r1.ebuild
index 1dee31d021e3..34f0aaa1ed75 100644
--- a/media-sound/asunder/asunder-2.9.3.ebuild
+++ b/media-sound/asunder/asunder-2.9.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="aac flac mac mp3 musepack opus vorbis wavpack"
+IUSE="flac mac mp3 musepack opus vorbis wavpack"
 
 COMMON_DEPEND=">=media-libs/libcddb-0.9.5
 	media-sound/cdparanoia
@@ -22,7 +22,6 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	sys-devel/gettext"
 RDEPEND="${COMMON_DEPEND}
-	aac? ( media-sound/neroaac )
 	flac? ( media-libs/flac )
 	mac? ( media-sound/mac )
 	mp3? ( media-sound/lame )
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index ca4761ed2385..44d3d1c71ec8 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,3 +1,3 @@
-DIST elisa-0.1.1.tar.xz 1461960 BLAKE2B da194b982f676b536d893bc9f419cbe6f47e73426abc19f454b706514e6a9150397e4bdc7917457d8cc442ab644fa9a51976c7211bad64473c6a039baa0f3c2f SHA512 892e38b2d23af4c65727377c7b4fa08b10c2a2e96adea490222c6f47c44a8131dde01ed0f6e07a58a383b210303a7b9795e80c1025200343770a95aa12e0d5da
-EBUILD elisa-0.1.1.ebuild 1382 BLAKE2B ec2396cfb1a680f095a9a8acfb28935f995397bad8f8a7157345477b81650c0bc84d30e7a6ea916070781cb3389a6515e5be99655447cf503b8fad1be4081da5 SHA512 091f97afcdaf8aa7f078eb0acff327c4b41edd055066052afa9096e7b4f53c8f19f68a36d3cb6e426710c58dd62419f390793ed55d3244a5c0cf50cf65345cd0
+DIST elisa-0.2.1.tar.xz 1488948 BLAKE2B 91c885f0c95cff634570ce283be31ab3ae71119561d5cd309ddb663df050eb0117a7b6a59adb0e334b39d408485762665a07ea0cf316aca7ff30b9278b76a20c SHA512 39701f5c840ed4539e9b4093cccce9c27f728500ef0c7687585a17fabfb9498dda2649664e9613961ef8d514ef2257858bf0c815c0f05b593eb0b42f87ef4e25
+EBUILD elisa-0.2.1-r1.ebuild 1463 BLAKE2B 62feace67b61c37c0bc3dddf647094d86194d5a45512c3ecee3be46e64762fd75dab55f85df0a8b8730239d86815c40d94e86d88e8b6ac137f4cb023362fdc4d SHA512 8a4cc2f63dc34359d85b13668e268951b231b7ca9d3508e0341727b4ff150cdb74eaf747da1011515e49816c64237475fa4c45cff0bfa8ede545ed415b306cbd
 MISC metadata.xml 313 BLAKE2B 76e574d16964ee300bbfd452a53738f99626f7e572847cc923e8b1688dd3e55843a7f4aa5511525eed8e6a9513bc687f131b2a50d173901b54ce94d080d4103f SHA512 17fba6644e9931a1bda042c4ae7e9ad414276c0b159418630c6d20013f4d4b68cd62f150c5076f99e3c719d93f0103fba824fcbbfeebab1478aeddb19181c2f6
diff --git a/media-sound/elisa/elisa-0.1.1.ebuild b/media-sound/elisa/elisa-0.2.1-r1.ebuild
index 59f7d8a72c82..15da92ebbfac 100644
--- a/media-sound/elisa/elisa-0.1.1.ebuild
+++ b/media-sound/elisa/elisa-0.2.1-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=6
 
 KDE_TEST="forceoptional"
 KDE_HANDBOOK="optional"
+QT_MINIMAL="5.11.1"
 inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
@@ -26,6 +27,8 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kdeclarative)
 	$(add_frameworks_dep kfilemetadata)
 	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
 	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui)
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index d3126c3a11a7..2642ab17aa96 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,9 +1,5 @@
 AUX kid3-3.3.2-libdir.patch 1506 BLAKE2B 1265271633d61cab6d4ebb49284645a1528dedde7700145fb59c100b9fc209a84a021c2069291b6fcfb3030e0afa569016151e0545ce6f5375cc485881ecec44 SHA512 b987463eb82b499af757ba2865bfe57f9f9d405eb005822d08521f89700bfcfbb1bd46f9caa8c436b6d73d0b12284db08299d5425299f5803612e7b75b6c12ec
 AUX kid3-3.4.4-deps.patch 1485 BLAKE2B a2c4b9ac6e956dcc2e6415b502e0ca34814d668ceb3e2e315f4da8da382041cf55f6b5531d298ecc00ee242433c09d2095e4357a9814fd9eda60d501672c5a74 SHA512 af386071836e542e178cda38297091817943a3f754e4d14b3cca2ec628bd7c13980932e77b1f9e3c578b095d88ea2b24e89e58b6f726c6f656989fc08bc8a808
-DIST kid3-3.5.1.tar.gz 1414829 BLAKE2B 42d172a443223979e6afbda3f6dec240a5bde22f102fdd4d6d64f3cbe30dc80a4cb09ed0d28176122801211e311441997ae162025ff0460eb803fc3ed1aec34e SHA512 7f1fbd6d1d576d23f9b57baaaa35101fb2e9ea23dec5b5506e25ec5a94dc8516d25b69b4dddb4a9b4835b2502d0a07087c245380483571a68e5972f98ca8ca58
-DIST kid3-3.6.0.tar.gz 1425297 BLAKE2B ff1c8dd8aed2b24c27c458e2215e304587bf658495ad8c8f7ceecd6f9960b010600c25be4ca0c512cf4c5335d48fea7b6267baae0ce2eef2db4dc271442f128c SHA512 ceba8175260d2ef6fad441c7ee5c9b2870b85988515229c09acfccd1a108998b07040dde26ca426de466599b9171fac37f001237991ae977f59742bbbb0cd4f0
 DIST kid3-3.6.1.tar.gz 1428799 BLAKE2B 055743c06bf28188c16e627556e1c23cb724f6a1601975f259a912445063a23f3c6d8101cbb3f582fac66c56bbcbaf243e637132b20930f718f2c5b1056b7dc9 SHA512 026be02c3dea1f05af0f24a26ee9d6b775f7e408db6de8afbb3dda5f66ee465263fb1c3763d4e8ab52b1856a58c1ea21228d24cdb754508e68c04f7d5cccfb77
-EBUILD kid3-3.5.1.ebuild 2012 BLAKE2B 66fb419abe7ee271b8b7ab60bf53ad8937e262abbb43621c7f9b556434e15cb90f0b43f08fe3de407880a132c546b456083a4d6d47d54a837a2f3ab6656f04a7 SHA512 031081877a9fe56f881f75ec28ca65a8301a9b5c4d9abd7596a0a547ad39eeaab8b6ad99485d2b44dd65dac24395b8f6f95b04becf555ed251099ed2d358c51a
-EBUILD kid3-3.6.0.ebuild 2014 BLAKE2B a955dea1b861316afdf42b3936da65d875baf24165640b9e8f9958fca12788bdc68fb190116f90baf462b3d595de1b62ff7b63a5be9020a488a532f14683068b SHA512 acab344e781bc386e84d9e3dafe518b6b7982b243511ee6c6c28645076b5c4b65c53aac9fb737b3953ee7a7c0c8d2440a0b00254fdd9b94da80c582f47aadfad
-EBUILD kid3-3.6.1.ebuild 2013 BLAKE2B 9c5014553b565a1e82ad8a996dc4e1084018c76c423e02337d37e423a462cadc756fca60ecd72bcd4c65aeaec8252beef47a9b61e3d3d2a4f349130228d31e38 SHA512 2a744c187d0596fef714b14d7cd70e166935d1a1c5dc7dae95c583e79cd72eb3b1f1a0b8ac12537f411fd67e61e90abae4ab3986c6696f60536b47408c37544b
+EBUILD kid3-3.6.1.ebuild 2039 BLAKE2B 916f9cc8c38797be544521a1547f32bfdfb92b657eb82ee7cbf04caaab44aedc2aa210c343dc07e061d832ca86ff9540d9926f79cd9977b05c805f4162a55ca3 SHA512 3c9579683274c70f5ab977887eab2973da50fce3aad59ecbc58cdeb653689422cbc3d87fe31aae262fde7241f5f41dedfd79bf52cfb99b5b4a269dd1a07661cb
 MISC metadata.xml 672 BLAKE2B 380133bb3cfd6862da40dc672da4c513a53a81adf40ee0552ae6df65afb42979a19e32f0e72d909f15d78f014e19057e0b2db69e087aa6bb222f7d4b7ccde88d SHA512 b76d1d9b77eab5a42ebb2bae4a039a0a9abc5227e37fbe3066ca04aacfaebfdbcd99b3901eba79bb8ee46a64fa58a3aaf6370eeb3706d1773e137b02de1202ed
diff --git a/media-sound/kid3/kid3-3.5.1.ebuild b/media-sound/kid3/kid3-3.5.1.ebuild
deleted file mode 100644
index a2e641496a1d..000000000000
--- a/media-sound/kid3/kid3-3.5.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
-inherit kde5
-
-DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="https://kid3.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 x86"
-IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-
-COMMON_DEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	sys-libs/readline:0=
-	acoustid? (
-		media-libs/chromaprint
-		virtual/ffmpeg
-	)
-	flac? (
-		media-libs/flac[cxx]
-		media-libs/libvorbis
-	)
-	kde? (
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kcoreaddons)
-		$(add_frameworks_dep kwidgetsaddons)
-		$(add_frameworks_dep kxmlgui)
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2:0 )
-	taglib? ( >=media-libs/taglib-1.9.1 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!media-sound/kid3:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep linguist-tools)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.3.2-libdir.patch"
-	"${FILESDIR}/${PN}-3.4.4-deps.patch"
-)
-
-src_prepare() {
-	# overengineered upstream build system
-	# kde5 eclass src_prepare leads to compile failure
-
-	# only enable handbook when required
-	if ! use_if_iuse handbook ; then
-		cmake_comment_add_subdirectory ${KDE_DOC_DIR}
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_PHONON=OFF
-		-DWITH_QT4=OFF
-		-DWITH_QT5=ON
-		-DWITH_CHROMAPRINT=$(usex acoustid)
-		-DWITH_FLAC=$(usex flac)
-		-DWITH_ID3LIB=$(usex mp3)
-		-DWITH_MP4V2=$(usex mp4)
-		-DWITH_TAGLIB=$(usex taglib)
-		-DWITH_VORBIS=$(usex vorbis)
-	)
-
-	if use kde ; then
-		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
-	else
-		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
-	fi
-
-	kde5_src_configure
-}
diff --git a/media-sound/kid3/kid3-3.6.0.ebuild b/media-sound/kid3/kid3-3.6.0.ebuild
deleted file mode 100644
index 17db2bbd586f..000000000000
--- a/media-sound/kid3/kid3-3.6.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
-inherit kde5
-
-DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="https://kid3.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-
-COMMON_DEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	sys-libs/readline:0=
-	acoustid? (
-		media-libs/chromaprint
-		virtual/ffmpeg
-	)
-	flac? (
-		media-libs/flac[cxx]
-		media-libs/libvorbis
-	)
-	kde? (
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kcoreaddons)
-		$(add_frameworks_dep kwidgetsaddons)
-		$(add_frameworks_dep kxmlgui)
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2:0 )
-	taglib? ( >=media-libs/taglib-1.9.1 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!media-sound/kid3:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep linguist-tools)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.3.2-libdir.patch"
-	"${FILESDIR}/${PN}-3.4.4-deps.patch"
-)
-
-src_prepare() {
-	# overengineered upstream build system
-	# kde5 eclass src_prepare leads to compile failure
-
-	# only enable handbook when required
-	if ! use_if_iuse handbook ; then
-		cmake_comment_add_subdirectory ${KDE_DOC_DIR}
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_PHONON=OFF
-		-DWITH_QT4=OFF
-		-DWITH_QT5=ON
-		-DWITH_CHROMAPRINT=$(usex acoustid)
-		-DWITH_FLAC=$(usex flac)
-		-DWITH_ID3LIB=$(usex mp3)
-		-DWITH_MP4V2=$(usex mp4)
-		-DWITH_TAGLIB=$(usex taglib)
-		-DWITH_VORBIS=$(usex vorbis)
-	)
-
-	if use kde ; then
-		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
-	else
-		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
-	fi
-
-	kde5_src_configure
-}
diff --git a/media-sound/kid3/kid3-3.6.1.ebuild b/media-sound/kid3/kid3-3.6.1.ebuild
index 0315d043942a..a187a6615d05 100644
--- a/media-sound/kid3/kid3-3.6.1.ebuild
+++ b/media-sound/kid3/kid3-3.6.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+ECM_KDEINSTALLDIRS="false"
 KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
 inherit kde5
 
@@ -12,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
 
 REQUIRED_USE="flac? ( vorbis )"
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index df206bf51abb..71251e426e58 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,5 +1,5 @@
 AUX mumble-1.2.4-speech-dispatcher.patch 1289 BLAKE2B 674312376997a2ee7f70886f8a7ec13731f46bc25870c1af239d6814ef66192999f89d644caf63eb98a3ad4fa3460c16fbfb2acb35c845c181cf08943d142c3b SHA512 32b83ba846fbda3529c222df2cf6fa0f615dabdd7e211051119fb9ed53bdc3e8e11aaa1b132bbdfcedffd72b1e19666aaf083799f7ebbbf60f536a9f9a0c6a2a
 DIST mumble-1.2.19.tar.gz 3210865 BLAKE2B 7ce466ab9d5ca761308d08633abf8efb6105b3097b7fde0a886f957dff4a16442d1f12c93123bd0291b37d14b412e0087b89f781d0f63a5182bd6ca2d3f2d3fe SHA512 f91111194a899149b500a94afcf7cc5b9691c7ce8669f07fca2c66adbb3916ddb863bf703d04fb8387133fb75f3c8edb52974d1acf3febfafa1f73da19946de4
 EBUILD mumble-1.2.19.ebuild 3048 BLAKE2B e925f6df26dd6a0da4241f90d2ced7d095029a292484028fedf332008d7e9a7ac755f14a72cd8a358ec7b2bc527c82eae59da6746d38879fa2827afd6bcccbd7 SHA512 9b5a99ae4ca3ccddc03e50044289fefae4cc41baa0db018316df809f56f893d8e676ee5e6c35d8e783c621fec848c54fa0be5471567909ebd1e0486924fffdbc
-EBUILD mumble-9999.ebuild 2889 BLAKE2B 8d8904682b7f11236a25474167b97ffad1196d7d36dfca6a41bf975cc94e21d0c6d49f4c3c90a64485b3439fbe487a5eb367d4fa158f0ca45129cb63475343e0 SHA512 ce9d09dd4a9d16a968e0f8b6db8bf84076ccdea0989df3a5c2e5e8dd48e290f1b3a650afc322aadfbd2dbcf3fb8e219a27a597ece65c2637615bf52224f3837b
-MISC metadata.xml 751 BLAKE2B 17b72569ef8313fa654bd444572521c482b1b2c4d14bc73b41be5f6ddf8e9c8e9064fa1a87b4589f7a18a5ceae835fb60718226059f5b96d4dfa6e2b26256630 SHA512 78d4d18e60dfbcbab8b1ae64f214c2f6aa0ae7ea01323590f3847b1ed50fc90a29acbb5a44c65e82747237e60d5d4a24c9b2808d4e4a90a996ab90952340c18b
+EBUILD mumble-9999.ebuild 2938 BLAKE2B 7dd09916803c64271aefdea74382bfc8a3a700fce6eb07bc00f08d4cc337dede346bd836380f71f690e20493e3d98bc594eace985df6fae572d8827aefc3ff61 SHA512 c434b208665e4a74cd19c326727ad02fddb90ac26353eabce996a9c90df22d8e8011e74c4470e3e4150d15b0909d1c5e2df9cd467ce154d8ccdc89bf47e50626
+MISC metadata.xml 843 BLAKE2B 5048f202061b73223ef1d8c7beb20e5fbeb3726c0f1d8039bf4385e111e221dcc52ed309356311f3ba885f306c4d7c074caf9c785c86d8fda924c4ebf69475ae SHA512 0037f9510526f803d2abfe97c2b8712ff626b93d12457d5111f23b20787505168789cd86f9a3b4dad845634f584faa9e30e02777f4d0a7a8bd34f9fc9e1ca40f
diff --git a/media-sound/mumble/metadata.xml b/media-sound/mumble/metadata.xml
index 59327713616d..146871bb68ac 100644
--- a/media-sound/mumble/metadata.xml
+++ b/media-sound/mumble/metadata.xml
@@ -11,6 +11,7 @@ Mumble is an open source, low-latency, high quality voice chat software primaril
 	<use>
 		<flag name="g15">Enable support for the Logitech G15 LCD (and compatible devices).</flag>
 		<flag name="opus">Enable Opus codec support via <pkg>media-libs/opus</pkg>.</flag>
+		<flag name="rnnoise">Enable alternative noise suppression option based on RNNoise.</flag>
 		<flag name="speech">Enable text-to-speech support in Mumble.</flag>
 	</use>
 	<upstream>
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index 1d787139f196..6caa7e0e0b35 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.mumble.info"
 if [[ "${PV}" = 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble )
+	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
 else
 	MY_P="${PN}-${PV/_/~}"
 	SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
@@ -20,7 +20,7 @@ fi
 
 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="+alsa +dbus debug g15 libressl +opus oss pch portaudio pulseaudio speech zeroconf"
+IUSE="+alsa +dbus debug g15 libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -74,6 +74,7 @@ src_configure() {
 		$(myuse opus)
 		$(myuse oss)
 		$(myuse portaudio)
+		$(myuse rnnoise)
 		$(usex speech '' no-speechd)
 		$(usex zeroconf '' no-bonjour)
 	)
diff --git a/media-sound/puddletag/Manifest b/media-sound/puddletag/Manifest
deleted file mode 100644
index d088a66db611..000000000000
--- a/media-sound/puddletag/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST puddletag-1.2.0.tar.gz 1231226 BLAKE2B 3555bb8fe06acf95106a0dc59dd617d9fba7075dbe97c2fba18a24a663cb9d9ae010718fc07d57823acccdb528c078a8edbb9d38829468582b8791d5debdae42 SHA512 4fd57f3e89c01e2914c3cf2e08760752ab5454c15c66c97fb1b42165fd27893d240762ac3591bc5165a31d03ef7fbf8d411c4cd989e07dcc69f43f5e87e89611
-EBUILD puddletag-1.2.0.ebuild 1004 BLAKE2B 8871cec12d6ad3fcc87aa2d7d8bde1e1d024b01938c502e00f241947077960e3015aae704b84baf12e94b2408f0885b950d3cb3f8bf11db311c2bb422f2f5334 SHA512 f453158eeb6acaf99bb5b63a9afafb5b11b470a11cbf29a9034d7eaf575f544496cdd9d01a9fffa55d55352db1679e2c73fff817269a536d13815c5446eda041
-MISC metadata.xml 778 BLAKE2B 55eb2ed831d91ca2c042c329c91fab1d672c6ff581a6908f0ee3e895def40ed65ea885cf7a3aa50901810794faf43fa3d6f8761de35df8206492e2d1589cb8fe SHA512 3d8d7e8b38b916809424a16b9e306f301c07906fed200f8694b3496dd58259faee37c3e1964e914bdf11db2123dd68bbd5436555edddcf72d377fa5581645867
diff --git a/media-sound/puddletag/metadata.xml b/media-sound/puddletag/metadata.xml
deleted file mode 100644
index dd26272a674e..000000000000
--- a/media-sound/puddletag/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>billie@gentoo.org</email>
-		<name>Daniel Pielmeier</name>
-	</maintainer>
-	<use>
-		<flag name="cover"> Enables editing of FLAC cover art</flag>
-		<flag name="musicbrainz"> Enables support for musicbrainz, needs <pkg>dev-python/python-musicbrainz</pkg></flag>
-		<flag name="quodlibet">Enables support for editing <pkg>media-sound/quodlibet</pkg> databases</flag>
-		<flag name="acoustid">Use <pkg>media-libs/chromaprint</pkg> for acoustic fingerprinting</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">puddletag</remote-id>
-		<remote-id type="github">keithgg/puddletag</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/puddletag/puddletag-1.2.0.ebuild b/media-sound/puddletag/puddletag-1.2.0.ebuild
deleted file mode 100644
index 263adc18efad..000000000000
--- a/media-sound/puddletag/puddletag-1.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 fdo-mime
-
-DESCRIPTION="Audio tag editor"
-HOMEPAGE="http://docs.puddletag.net/"
-SRC_URI="https://github.com/keithgg/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acoustid cover musicbrainz quodlibet"
-
-DEPEND=""
-RDEPEND=">=dev-python/PyQt4-4.9.6-r2[${PYTHON_USEDEP},svg]
-	>=dev-python/pyparsing-1.5.1[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.21[${PYTHON_USEDEP}]
-	>=dev-python/configobj-4.7.2-r1[${PYTHON_USEDEP}]
-	acoustid? ( >=media-libs/chromaprint-0.6 )
-	musicbrainz? ( >=dev-python/python-musicbrainz-0.7.4-r1[${PYTHON_USEDEP}] )
-	cover? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	quodlibet? ( >=media-sound/quodlibet-2.5[${PYTHON_USEDEP}] )
-	>=dev-python/sip-4.14.2-r1:0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.0.1[${PYTHON_USEDEP}]"
-
-DOCS=(changelog HACKING NEWS THANKS TODO)
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 6120095e4ea3..f3c3868dd090 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -9,7 +9,7 @@ AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f90
 DIST pulseaudio-11.1.tar.xz 1648924 BLAKE2B eea767efb6529436a6c2aa7d5ccaccdbda2338ad8db639ad333598b1589d259acf71ef34e904a240710f5343864fa868789eaa7f7cae1b07902ebd989fe83e12 SHA512 8863d8d7aede0d9a4d158e84e7bece91747c335f9ac98c7b21fafe76b762f8817e1125307aa46e561e540d2c40525e91f51a55ec34ac55d58fd5980199856a7a
 DIST pulseaudio-11.99.1.tar.xz 1655948 BLAKE2B 33d774bbcb2cf4a1d457e2cecfae007a75acc5c8ba188c5f2fbce773cf3fb67c9c345538584014898f42b3ff7c6e680c9660ff07f7d74630f711f85d9c514d2c SHA512 f9340f836bd12756ddb30e27bb04f8470a97ec372f5d9a2703da3ac348436b7b3efe074635c5a994cc6cd77c7f18aa2d74811c7e12bc52c0578fd15f8dffaab8
 DIST pulseaudio-12.0.tar.xz 1657212 BLAKE2B b38bdeec21c336d7435b1ae895eb50b164d513f4b15d5c6b559df457722da02484072d3beb8874c3690efd1ddff1e13966ab5501d1e9418683461ca977b2c6fb SHA512 e9b02522f1e9cc2cf2e9db3364153fff5bc70561df34bc8e254e373a24c45585c1c722de8b6ebd7cd1814f523cf29b67c6940390a6fcc1ccbdde5aeff48f8d8c
-EBUILD pulseaudio-11.1-r1.ebuild 10991 BLAKE2B 5f5eb2a5a941307d9144f06a0d3452b040fa873f04abb48ed5e51e861841a0ef677201be07edfb96c54d9f6dda8d77e6306331c706884ffb954a921a56301dd0 SHA512 0389700cdbbcad351e7bea818ffd57ca244b2a41bd901eb5511d4af9bbf980fdca3a346ff0854abc280b938b2aaf52fb11f0c8f21342413dc70218806e12f853
+EBUILD pulseaudio-11.1-r1.ebuild 10990 BLAKE2B 7c5d064fa0b728ef39a0c9e6aa538427bceb66e19cef41e19167185793c6021c9365584fc22f9b4417a510c90253216a1515339954cc3ae26c352e2e987b29ac SHA512 4c076242f0a7f3bee1bece13a1ef5563b848a5be3856180fa69bc3b62892a9a9cf33df368d875c9382ee51e761689588b6f0fdc864a6b746d591103f12839323
 EBUILD pulseaudio-11.1.ebuild 10850 BLAKE2B 7c4423b125ba27e84d4af9b0ae99d31c5672490aed122a71887746ac9ca4554a96cddaf7eec8ae9b7ed91b3fa72a1caab541c95fe53a7117b4a93e8d9c982274 SHA512 88584bc0f38e6bb559d913d92fa5b06370590f43eaa11ac59af4ea07739d6f6870165e0801655982a11ff4f42e44de1b58962e5123f3d657cfcdf4727f04b0d0
 EBUILD pulseaudio-11.99.1-r1.ebuild 10990 BLAKE2B fbf57d791769744ef97fd49390bcb9d30a5a02450650f8b81a3b27575fc1188e7da5797939b01a6c308ba61a4b448377c5a5602ec0e7e585de98ece239b9da6e SHA512 a290149a12739dd09707d18f192f45532e36ab9473a211de4c3da0d37abe142ba710813ceb9019116953e96a451d8f4b7a9636710ea84000b584543073c8846f
 EBUILD pulseaudio-12.0-r1.ebuild 10661 BLAKE2B d411bcf361f9affe99c93f954b122bafc843b327e7e2668b3a01a18b0def83615aeced03d21aadae9fd993535ee44802ae3aed4b8b6a689627c2eaeaf3b575c1 SHA512 fbe96ce05c0b7aff771481d93d7d5567c08c7edfcfbc920e056dbd18cff7c488f86cfe9d5966e8eb71f0919e7af32194bc92f0c0a8997104e23c0385752a794b
diff --git a/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild b/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
index e2673e617622..ee526c96d715 100644
--- a/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 9a2bcd9995b8..29ed3acbe5ec 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,6 +1,10 @@
 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.1.3.tar.gz 721527 BLAKE2B 616e341375aa71a209e8d5e3043b3013da037609ddbec595eec1f655c9a725e17f1c9359535aa4c6bf441af2e7943bef435340ecccbbd92c5022230697609a40 SHA512 416111e77a09adad9af501d4ef24482969277ac52da5d1df730995ab650e6eca46b96ec6277bada8ee8ed5bb14a09592e566d419ea19f6a87840cecdf1a79bdd
+DIST pulseeffects-4.1.6.tar.gz 750083 BLAKE2B 36d0b61a578b40fc6a14ed56ca66260f1ddaba5bd8c3b2c7f234d081716c2f8437a4b8410a0f4a3db935ab4780a763cd2a0d58d793865f5306e6db13c144afbb SHA512 6bca6d6ef393f4844840e975d86f835c44b36ca339ab3817d051663cd6a14531aabbc5ed98c39e85fbd4440522c9ba48b53e451d955434d508b8aa175caf46d7
 EBUILD pulseeffects-3.1.6.ebuild 1474 BLAKE2B c37c8cc5b72e9ea384d7e34fe107a9d8a22fbf45309328dd49f99cca01cf85629497399fa388eb94b1a31dceb1dcd5ab5544abf73eddba81edecb1ba749e5a87 SHA512 34755ef7a7b27df191a9044e34f68bef3807a50b5e691adcaba156014244c8f89bed6583fb1684f586e45058eb6ffca0aa1f0af26266884ee32920131b8379de
 EBUILD pulseeffects-3.2.3.ebuild 1492 BLAKE2B 959ccbff4ddd3376895dd833d7a36ba81b8b2d46381a7cc14aa73ab2701d01910fcc340fffe0058099f31e80332670182671c3c737d0b41746af5a386b2e6182 SHA512 281ff12ecc62b6c75db6ffaa290517ab24c8110db4333c54221d87f2283feab60a5ff2e0e02ead2193bafcb7d4a8c6b990e67cd1925e9afa5ee16aa5b49decd2
-EBUILD pulseeffects-9999.ebuild 1517 BLAKE2B 61c46ec631b877ca88ad25ddb887467895a924d5112d54d7fe239609f85c0b213811277dd26d77aaa3bd35f5e9582e28f218d3a4795044fccde38b15684f74c3 SHA512 6d22aadcdc20b568fad4a094e3d01c613d9b7c7be3151d7da40597270133e76ccf7424a28c4e4abe9f87b2f60baac830f2dbd58251ca107444895c14c41de007
-MISC metadata.xml 607 BLAKE2B b9f1bd8b2afd83f2e07b1d5a3c1a82fd1ff7de67182316d868890375b1144edf292181c702fa274da87bd0cc43a5e967ed6f379d0e85764a31834a4ddb3c8c8e SHA512 fa5780c3149aad1d3c5edf76356d521942a85271576f868598c54a7010cf3d31366ad08aa80402479addf8f69111973e7e814abc2df17ea7d0273a5e2a749ac2
+EBUILD pulseeffects-4.1.3.ebuild 1417 BLAKE2B 889d988ed05c491f366e78aaa88a8455d431ed47490edba05575ae705fb7dce2d796baea85f1a48d3eef9b2b80fd1476a6a45754a895ab1f6a29af490969bd71 SHA512 73375cff820247f19cda0ab51eba32fab8629721ceb34f73fe1050c5b6a2346eb54f9a05244550e8742958fb5590e5af1b5e1fbdd45be1644de42ce83f4b2343
+EBUILD pulseeffects-4.1.6.ebuild 1515 BLAKE2B a01b7e30bb2dc724e62c8360a8eff01c71ac1ab0d378d481da8bb8499375e690921bebe57c3c8b8d184b7d965ddd73a11990d5ba91c688c23cca12fe66119655 SHA512 2242d7cc3f57c135d6c0f5babdc3a65051009d7dcdb66715d84381d36523adaecc192bdd6b93f2e5edc204611d1d27c336e6bdd4d2fc1c9518374fe7f872ec62
+EBUILD pulseeffects-9999.ebuild 1515 BLAKE2B a01b7e30bb2dc724e62c8360a8eff01c71ac1ab0d378d481da8bb8499375e690921bebe57c3c8b8d184b7d965ddd73a11990d5ba91c688c23cca12fe66119655 SHA512 2242d7cc3f57c135d6c0f5babdc3a65051009d7dcdb66715d84381d36523adaecc192bdd6b93f2e5edc204611d1d27c336e6bdd4d2fc1c9518374fe7f872ec62
+MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/metadata.xml b/media-sound/pulseeffects/metadata.xml
index c9003b7aa9b2..4f7f3990a2bb 100644
--- a/media-sound/pulseeffects/metadata.xml
+++ b/media-sound/pulseeffects/metadata.xml
@@ -10,6 +10,12 @@
 		<name>Jorge Pizarro Callejas</name>
 		<description>Jorgicio Gentoo Overlay</description>
 	</maintainer>
+	<use>
+		<flag name="bs2b">Enable use of media-libs/libbs2b</flag>
+		<flag name="calf">Enable use of media-plugins/calf for adding various FX</flag>
+		<flag name="mda-lv2">Enable use of media-plugins/mda-lv2 for the loudness FX</flag>
+		<flag name="rubberband">Enable usse of media-libs/rubberband for the pitch shifting FX</flag>
+	</use>
 	<longdescription lang="en">
 		Audio effects for Pulseaudio applications
 	</longdescription>
diff --git a/media-sound/pulseeffects/pulseeffects-4.1.3.ebuild b/media-sound/pulseeffects/pulseeffects-4.1.3.ebuild
new file mode 100644
index 000000000000..edfa01b18d19
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.1.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="${HOMEPAGE}"
+else
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf mda-lv2 rubberband"
+
+DEPEND="
+	>=dev-libs/boost-1.41
+	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/gtkmm-3.20:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=x11-libs/gtk+-3.18:3
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
+	calf? (	>=media-plugins/calf-0.90.0[lv2] )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	rubberband? ( media-libs/rubberband )
+"
+RDEPEND="${DEPEND}
+	media-sound/pulseaudio
+"
+
+pkg_preinst(){
+	gnome2_schemas_savelist
+}
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/pulseeffects/pulseeffects-4.1.6.ebuild b/media-sound/pulseeffects/pulseeffects-4.1.6.ebuild
new file mode 100644
index 000000000000..fde99f8f82b8
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.1.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="${HOMEPAGE}"
+else
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf mda-lv2 rubberband"
+
+#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
+DEPEND="
+	>=dev-libs/boost-1.41
+	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/gtkmm-3.20:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=x11-libs/gtk+-3.18:3
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
+	calf? (	>=media-plugins/calf-0.90.0[lv2] )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	rubberband? ( media-libs/rubberband )
+	>=media-libs/zita-convolver-3.0.0
+"
+RDEPEND="${DEPEND}
+	media-sound/pulseaudio
+"
+
+pkg_preinst(){
+	gnome2_schemas_savelist
+}
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
index 94b01c50ed02..fde99f8f82b8 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit gnome2-utils meson python-r1
+inherit gnome2-utils meson
 
 DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
 HOMEPAGE="https://github.com/wwmm/pulseeffects"
@@ -21,31 +19,31 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
+IUSE="bs2b calf mda-lv2 rubberband"
 
+#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
 DEPEND="
-	${PYTHON_DEPS}
-	python_targets_python3_4? ( dev-python/configparser )
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/gst-python-1.12.0:1.0[${PYTHON_USEDEP}]
+	>=dev-libs/boost-1.41
+	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/gtkmm-3.20:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
 	>=x11-libs/gtk+-3.18:3
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.18[${PYTHON_USEDEP}]
 	>=media-libs/lilv-0.24.2-r1
-	>=media-plugins/calf-0.90.0[lv2]
 	>=media-libs/gstreamer-1.12.0:1.0
 	>=media-libs/gst-plugins-good-1.12.0:1.0
 	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	>=media-plugins/gst-plugins-bs2b-1.12.0:1.0
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
 	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
 	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
 	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	media-libs/rubberband
+	calf? (	>=media-plugins/calf-0.90.0[lv2] )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	rubberband? ( media-libs/rubberband )
+	>=media-libs/zita-convolver-3.0.0
 "
 RDEPEND="${DEPEND}
-	media-sound/pulseaudio[equalizer]
+	media-sound/pulseaudio
 "
 
 pkg_preinst(){
@@ -55,9 +53,11 @@ pkg_preinst(){
 pkg_postinst(){
 	gnome2_gconf_install
 	gnome2_schemas_update
+	gnome2_icon_cache_update
 }
 
 pkg_postrm(){
 	gnome2_gconf_uninstall
 	gnome2_schemas_update
+	gnome2_icon_cache_update
 }
diff --git a/media-sound/qtscrobbler/Manifest b/media-sound/qtscrobbler/Manifest
index 22f734fe173f..c64297366034 100644
--- a/media-sound/qtscrobbler/Manifest
+++ b/media-sound/qtscrobbler/Manifest
@@ -1,4 +1,5 @@
+AUX qtscrobbler-0.11_pre20130123-qt5.11.patch 697 BLAKE2B d60d5da77ab0a30d9ad89d24a10882ce91c85bf9959e5be6019c69b0db95c60d2e6d1c2cbf5a1fdd5494236ce5d78d9b5a5a05b9bea264db750c0f570cda85d0 SHA512 2edf71e6397dfdbb1aaeb38bca5b6a3b2a097b1a25038f62d1052cb5258cf94b12c26181fea76c64506ed60bfdeaa4968429836eb47e874aec273cdb480689ce
 AUX qtscrobbler-0.11_pre20130123-qt5.patch 5444 BLAKE2B 5e8ef860627e3f8a1b5c6d7a845d4b71c2ae473a42c1fd9619d9a6a270b50e7214bec232c51faf918d4d220490ea1273e016280e56c3d4b06075fcb9feb528bd SHA512 716dc1d84d1eddcec15ec4b87c0c7454acda58ebb94ed5e7a1f5a79ec0a04d473c6dc9e7eb6649986346743cf8a673bdc25e714c221fefd0f05e0925a0f5b0c3
 DIST qtscrobbler-0.11_pre20130123.zip 298519 BLAKE2B 36d3c3fdf59aa7fd9127c0200b03a6427f6fa27cb40e144f10041a25ba977e40fc5f63547596cf93f797d94e741a4a159c5e1aa48f8742d7738d1c113b22aae8 SHA512 24de4a45d4b31fb3c544b963b97b8716b8472a0dfde1bd2fd6bf101785f22ef07ff34fcd9ce7028fe231b215538bb8e4c3248c234feb870a3adeb4c0b259d646
-EBUILD qtscrobbler-0.11_pre20130123.ebuild 1251 BLAKE2B 094405e5dcd19615efde5fc392f5f42a0087e75e25f028ff3f45b5682afd50d1708cdb37bdcba8d48bdc20a93fccefe67d8fbc8fda5f640525109e0b84939985 SHA512 37b3d7419fb6dd0505f7cd2a64b42ae0b29503cb47ab0afbf54ffe9c5450b45c4a168b8d506d7ce1a3b563455a49d687dd12b4104f2748db676aff6a6b8b1ded
+EBUILD qtscrobbler-0.11_pre20130123.ebuild 1285 BLAKE2B d6ea8043f5932cc68231731d0ead450f99faed2a5d0e9871c103eedf648004b445320f0c5744c85e26b9ecf6489e84b1dac51dd71f49de58e812693ecde14958 SHA512 e16d66960de5faa44f4426bc38000a1f50bc86ec0807b2f4e088a6d3513b57388d274206b33e06eaa33218fa269e68ffe5e44b74b4ffc150fe005bb0960f6bf7
 MISC metadata.xml 340 BLAKE2B 350f5459a036f9c55c558bc8f7d9ab02a3b9045eeed136d8ef2963a19c9e3ca281dbff32ac8259333b625ca86ff66a8a747f6e5893baf643f5a1d7318303511d SHA512 67534a9d49ba6af88e23b14129c377309124be860237efbe926ba870f554aac980522cf7c791fe2075da689670994487631760c986a7b11834a2f2f9b48fc317
diff --git a/media-sound/qtscrobbler/files/qtscrobbler-0.11_pre20130123-qt5.11.patch b/media-sound/qtscrobbler/files/qtscrobbler-0.11_pre20130123-qt5.11.patch
new file mode 100644
index 000000000000..33781a4ee82f
--- /dev/null
+++ b/media-sound/qtscrobbler/files/qtscrobbler-0.11_pre20130123-qt5.11.patch
@@ -0,0 +1,24 @@
+From 11d70c80a634aaf1606a435688dddbc3db36b7ff Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat, 14 Jul 2018 15:35:25 +0200
+Subject: [PATCH] Fix build with Qt 5.11
+
+---
+ src/qt/src/qtscrob.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/qt/src/qtscrob.cpp b/src/qt/src/qtscrob.cpp
+index 5b7a561..c6084e3 100644
+--- a/src/qt/src/qtscrob.cpp
++++ b/src/qt/src/qtscrob.cpp
+@@ -17,6 +17,7 @@
+  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+  ***************************************************************************/
+ 
++#include <QHeaderView>
+ #include <QtGui>
+ #include <QTime>
+ #include "qtscrob.h"
+-- 
+2.18.0
+
diff --git a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
index dc4f5ac6824a..3dc54d6064d0 100644
--- a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
+++ b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
@@ -30,7 +30,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_PN}-code-${COMMIT}"
 
-PATCHES=( "${FILESDIR}"/${P}-qt5.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-qt5.patch
+	"${FILESDIR}"/${P}-qt5.11.patch
+)
 
 src_configure() {
 	pushd src >/dev/null
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index ef6784e9bf41..ed63092d3c6c 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -9,6 +9,6 @@ AUX sox-14.4.2-CVE-2017-15642.patch 852 BLAKE2B b6d32a2d7909b601953f0603caa678e6
 AUX sox-14.4.2-CVE-2017-18189.patch 1109 BLAKE2B 1014eb9427b4735e08da68707e108a0c04b89ec75c91440a0ce833327af0ed152a1eba1ef46402f198f6394c1787ae899ee1ffc9748d1ec91544fe8f127cecb6 SHA512 dd4023a6bc98f510c2256537e747a20c9b3b8ec35e0f98d19d188a3973f1774566c5d70f8de6cd9083547ade69670d34d10b848836d0724896993e1e56c85c75
 AUX sox-14.4.2-wavpack-chk-errors-on-init.patch 1328 BLAKE2B 0a1f6c0ef96d5508f11901b28b57feda0be79f0af6ead0af51eb97db7a3a97497aa446389904bc9457efd8dc4f9738f5482841caa096d3449d3b1ab5d77b746a SHA512 ae95d810f489efb749f808c6e46b0412f4cfd6ee60fce0289c0c1d689bb599fd2516a79fcd24ac9ddd30fab6f0437a6876dccfb61db2f6c612fe680f6eff13b5
 DIST sox-14.4.2.tar.gz 1134299 BLAKE2B 9fae987d421fc733b84746f8dc8f09ced1c3ce066643a426d7c64c4ed4ceeb18e5d00165108b39065a4ce40ff39e9d020fc6e734ff1121ee39bfeed4ad822bc5 SHA512 b5c6203f4f5577503a034fe5b3d6a033ee97fe4d171c533933e2b036118a43a14f97c9668433229708609ccf9ee16abdeca3fc7501aa0aafe06baacbba537eca
-EBUILD sox-14.4.2-r1.ebuild 2623 BLAKE2B 88d031c8627f1a22fd70a7a6bc5eddedbec612f26c6151ce9e1f9eff5ea32e082b0a1a9c2734c60d0a50724600ef39c42122b5239936f02da1bee83459a2c63f SHA512 6a9e00525989efc807dbffdb863e218cd030285122f76e752055e1585ae79e78f3f899aafe4e61abaf873614a8456725774fd277db92e7d58e6199afa2f4244f
+EBUILD sox-14.4.2-r1.ebuild 2622 BLAKE2B 63710ce09d8eea6117f7851b709bf98a304535ef827df23cad86a9402e141f4d1de1292601c5344705ab40d9b17a2d5b45c93c33d970aff90b31017fbec9cc9a SHA512 980f2a62047118431b1c0452cec7c36cccd5b0d5ee9cf6b1203235fa6a06f28abd685af961e44f62bff663c51b20382d91c029646c5722c3ce1ae10d3f3bacf9
 EBUILD sox-14.4.2.ebuild 2162 BLAKE2B acf1642bd7003f6d19bc454196f4b6cf6fe9e7088363b3c3b530a973d874a3261faca50c26fc6d4e076064ebf10a87d39a5d647e4feccacc49d8c4cc052a1d62 SHA512 8bacb2ece8bc4808ad1b5db0a854e3c4c7eb4febaabdc18675bec344c8454243ba0d5530d87c6ae7b0b8416bf726a1d392cc8d6f0ef936dbd4fea01fe02ef825
 MISC metadata.xml 640 BLAKE2B f02bbb657d1f43a5c9394cca0f74a88d56163cbeabccdc481651e52abfb0ddaa00750c1578a6ff7c697848357c9382a537044a4364c9c5dfc35906f665011bec SHA512 0c7363b16df0333f4496a8e2ecb8c267cd1b23b1d946964fd2ff096a98313384f4f9d94e30791464076fe318d6bf7e5f1d4ef6f6a41a020ef1c197988c811862
diff --git a/media-sound/sox/sox-14.4.2-r1.ebuild b/media-sound/sox/sox-14.4.2-r1.ebuild
index 233339ff404d..8f7f7227ebc1 100644
--- a/media-sound/sox/sox-14.4.2-r1.ebuild
+++ b/media-sound/sox/sox-14.4.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack"
 
 RDEPEND="
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index e6ea21ccd3b1..0277005ee19f 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -1,11 +1,6 @@
-AUX supercollider-3.8.0-desktop.patch 373 BLAKE2B a754375ae87cc47b62a4262b151f16800a9799f932669a095e1df0cbce693597fb35821a7c8d99a1816c7e7c432e25a2f7d19cb4af0dd3840f2f87a6ae7de9fd SHA512 be8a72fbf53cdcc7bccc073602457aa1f7d6c779077276dae0252f0379f62d923a588ba18d32cac4b1d48d46cd0a1799d95ccd0f9c8c1f73ed3f5188829ede93
-AUX supercollider-3.8.0-gcc-7.patch 2083 BLAKE2B 4e47c81c954136f6b8ba47f749755ccd8b61710ffa4442e93229dedbb4ae8f7b8d3d9559dbc1e253e34d9f550347940f8b437c68f27c3174069d79adf3ec16b6 SHA512 816f26d27fe98e716fae749bb1248d3b7022dcfa12e8de7450f40f2a6b9d7d89642ffe70b75b3340a93d34a2c8bafb0de9a3d7330d87f97027bc2ed534d73b99
-AUX supercollider-3.8.0-multilib.patch 3495 BLAKE2B 5c2ae8010c243966d01dfac3a38f5e73e1b8a5e4d4f12f11ffff1d8a701bb09fd278aba7126548219319ee65ff6814260f98cdc4194d7077d02b5c22bd476576 SHA512 9b6d7e878e71954d75fbb21c7a205a054187fb15b9e20d60bc5817281a926ffee702b6954701d1cdaab668201ad42674d7b17815b4c822a3b97ab2e799aac356
 AUX supercollider-3.8.0-no-opengl.patch 2146 BLAKE2B 0697fcad3f277072459d40675509b223e5b7e35d8ecd94e200817bceeea12e224201376c8db61b46159f8b18e3f27b28549458bdfc0793c994d17943ae4cb3b8 SHA512 33dabf5ce200b783d3c54e8ddbb1217d4d4269ae4b8f82627264737377c786fc049e6b9309b97ba06eced7e313d39a57129dea98915b4a0106a8f413b9e86fd2
 AUX supercollider-3.8.0-no-qtpositioning.patch 1840 BLAKE2B cf4ee13c08e81f3ae19d50b23f8416a5045bd60ab64f8b6c0903f40addf7701b30792f9d4de0c57f3b4f4b2b661eec19eb5b8faa520997b263215dfee6df5a8e SHA512 df86ee0e3c190283b9ed79a3bc4f1108ee0279c1d6f44bea6ffdeb7fc77b38163f2d9ab199b8124e2f06d436d68d217995b46c580740951e5e13cbd56618b635
 AUX supercollider-3.8.0-no-qtsensors.patch 2675 BLAKE2B 0fae3883eddbf2bc025e7dab0600915d3770e20c28fedc51522d1dff7e9b3fab2e4d920762b252d2af711ea4f2b010e8b532d90595c4594a757437cbc6a907ce SHA512 4574101c4c41522ebeb7a747f29734beec7a7d4eb0751d959718e0a040e1fb7fc76685d53e2cdf5e027ad91b7a0c7465714acc951bd4d4d8023145008f0b314c
-DIST SuperCollider-3.8.1-Source-linux.tar.bz2 8913640 BLAKE2B 998b64b7e3530f6dc2e5d329bf387bb62aa694ec65d9a8464ae2b3bc1816f6a6fb26f351465df58170034ba35d7afc5df545a9bd614e96e6434155c70715d0ce SHA512 50d9e65e8b610e86decc98ecfa5bef2088af6dc2436e5059e5aa66e8ce9b4f2dab23dd1c5231c08430d1c50b211c876e7860c0e2078d0500bf8de4fbb9554eb7
 DIST SuperCollider-3.9.3-Source-linux.tar.bz2 11060240 BLAKE2B 5da51bece13d2a3e4ca1ff6b79637122a46c1f590aa7e4ebf52d7a663506c6f4bae4f3d618bb7f947c73828402f329be68e435a4de2ecc092c312cb2c993742c SHA512 5b0c29941907d5ca45c1676e34184664c03891051bba0ee50d9e8311400824054de7b6daba6d29fd875ff38f42ee9654504ea2f0b5bf0a36ae9605e6a79a0841
-EBUILD supercollider-3.8.1.ebuild 2935 BLAKE2B 52699086a017a4f86b5aa0cd0a1aa624f149f6d3e81c2724c5878560c2c9d7c06f2a3d651fd20d303ab8aff4ec47d2c0dc890e1c93ede245b5de2e07ccadcd46 SHA512 8ddcca74f44990e3b0f65b345019500a80505004462980287cb4026f458a538f9e94ac3adddd5e359b842093d1d93bfd75563d5cf62640065c7e550a50a1c1d6
-EBUILD supercollider-3.9.3.ebuild 2813 BLAKE2B 4e458fd33e51fb320fa2c58a49abce501ef1fbe2157a5c3b3edcac030e260126e5fadcbe57e9402ec55cddaad08ca30635da9c9568cb023860c64d84a4522105 SHA512 c26560c21dfa079e937a1d798bdaf294222ddbea0184350311e0eda10a84e972065d496020b9f10e5a317ecdd5ea2eeb7c08c1a2645cf5b3ee71c16b4bc13809
+EBUILD supercollider-3.9.3-r1.ebuild 2830 BLAKE2B 0dff8c6d9b3cb9fc53f06c1b99cea728d7eee0aa4f6e2650a6551522199e65a6f207db87ea1d31d1165af9acd915eda1b3fca37953ef6e16e8473f6994fec187 SHA512 604f01e53eeefd9b70ab4582221cb66076d1c033bf74c04a44efddb01c9d28c4a38dfab43399a96347f4cfcb2232e66f2b1498a1367bcc693b8256bd646bb2c6
 MISC metadata.xml 840 BLAKE2B 261014eccb171924a9a70a4972d9ea1cb9ad36f6ac2b7ecb40ebc2eee59d535871957109e239b90500d26073769cf58cd475cf221af0d2caf42033a2e0e56911 SHA512 a8ce15c95e8b04624301b814156ebe84195071b2ec80b223444c733e8b4de8137d4d70397f3a84d2894bdc635fff5d15ba66a9409749c02b3f3acb40d9479895
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-desktop.patch b/media-sound/supercollider/files/supercollider-3.8.0-desktop.patch
deleted file mode 100644
index 2cf759881d05..000000000000
--- a/media-sound/supercollider/files/supercollider-3.8.0-desktop.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/editors/sc-ide/SuperColliderIDE.desktop	2016-08-22 11:12:21.000000000 +0300
-+++ b/editors/sc-ide/SuperColliderIDE.desktop	2017-10-31 18:26:58.520164204 +0300
-@@ -5,6 +5,5 @@ 
- Icon=sc_ide
- Type=Application
- Terminal=false
--Patterns=*.scd;*.sc;*.schelp
--Categories=Application;Multimedia;Audio;AudioVideo
-+Categories=X-Multimedia;Audio;AudioVideo
- MimeType=text/x-sc;
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-gcc-7.patch b/media-sound/supercollider/files/supercollider-3.8.0-gcc-7.patch
deleted file mode 100644
index 5f0269845b31..000000000000
--- a/media-sound/supercollider/files/supercollider-3.8.0-gcc-7.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 1eaa3fb3afbbf4708695a25361527a70e2d7a02d Mon Sep 17 00:00:00 2001
-From: Brian Heim <brianlheim@gmail.com>
-Date: Tue, 4 Jul 2017 13:26:00 -0400
-Subject: [PATCH] DiskIO_UGens: include <functional>
-
-std::bind is in <functional> according to the C++ ISO standard, and
-gcc7.1 enforces this.
----
- server/plugins/DiskIO_UGens.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/server/plugins/DiskIO_UGens.cpp b/server/plugins/DiskIO_UGens.cpp
-index 47c91a139..d4bb1c51c 100644
---- a/server/plugins/DiskIO_UGens.cpp
-+++ b/server/plugins/DiskIO_UGens.cpp
-@@ -28,6 +28,7 @@
- 
- #include <atomic>
- #include <new>
-+#include <functional>
- #include <SC_Lock.h>
- 
- #include <boost/lockfree/queue.hpp>
--- 
-2.15.1
-
-From a891e7d5be4c4944970973cc8467485e8a4c0571 Mon Sep 17 00:00:00 2001
-From: Adrian Bunk <bunk@debian.org>
-Date: Thu, 7 Sep 2017 19:38:46 -0300
-Subject: [PATCH] PyrSched.cpp: #include <functional> to fix FTBFS
-
-Bug-Debian: https://bugs.debian.org/853671
----
- lang/LangPrimSource/PyrSched.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lang/LangPrimSource/PyrSched.cpp b/lang/LangPrimSource/PyrSched.cpp
-index 02f0c6264..63487a58e 100644
---- a/lang/LangPrimSource/PyrSched.cpp
-+++ b/lang/LangPrimSource/PyrSched.cpp
-@@ -37,6 +37,7 @@
- #include <string.h>
- #include <math.h>
- #include <limits>
-+#include <functional>
- 
- #if defined(__APPLE__) || defined(__linux__)
- # include <pthread.h>
--- 
-2.15.1
-
-From c058e16ff215b0b318abb3aa9ab4d47c0eeac877 Mon Sep 17 00:00:00 2001
-From: hlolli <hlolli@gmail.com>
-Date: Mon, 10 Jul 2017 18:32:22 +0200
-Subject: [PATCH] adding functional header in PyrSerialPrim.cpp
-
----
- lang/LangPrimSource/PyrSerialPrim.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lang/LangPrimSource/PyrSerialPrim.cpp b/lang/LangPrimSource/PyrSerialPrim.cpp
-index 3099598fe..5e2b40372 100644
---- a/lang/LangPrimSource/PyrSerialPrim.cpp
-+++ b/lang/LangPrimSource/PyrSerialPrim.cpp
-@@ -36,6 +36,7 @@
- #include <termios.h>
- #include <unistd.h>
- #include <boost/atomic.hpp>
-+#include <functional>
- 
- #include <stdexcept>
- #include <sstream>
--- 
-2.15.1
-
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-multilib.patch b/media-sound/supercollider/files/supercollider-3.8.0-multilib.patch
deleted file mode 100644
index 982e44a15a95..000000000000
--- a/media-sound/supercollider/files/supercollider-3.8.0-multilib.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 547a18c14dd45a22361f2ab495d14625862499e5 Mon Sep 17 00:00:00 2001
-From: Ferdinand Thiessen <rpm@fthiessen.de>
-Date: Sun, 5 Mar 2017 16:16:19 +0100
-Subject: [PATCH] cmake / linux: Allow setting LIB_SUFFIX to install libraries
- into lib64 etc.
-
----
- editors/sced/CMakeLists.txt      | 6 +++---
- server/plugins/CMakeLists.txt    | 2 +-
- server/scsynth/CMakeLists.txt    | 4 ++--
- server/supernova/server/main.cpp | 1 +
- 4 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/editors/sced/CMakeLists.txt b/editors/sced/CMakeLists.txt
-index 286d625fb..b304d4c07 100644
---- a/editors/sced/CMakeLists.txt
-+++ b/editors/sced/CMakeLists.txt
-@@ -14,10 +14,10 @@ if(NOT WIN32 AND SC_ED EQUAL 2)
-             DESTINATION share/gtksourceview-2.0/language-specs)
- 
-     install(FILES data/sced.gedit-plugin
--            DESTINATION lib/gedit-2/plugins)
-+            DESTINATION lib${LIB_SUFFIX}/gedit-2/plugins)
- 
-     install(DIRECTORY sced
--            DESTINATION lib/gedit-2/plugins)
-+            DESTINATION lib${LIB_SUFFIX}/gedit-2/plugins)
- 
- elseif(NOT WIN32 AND SC_ED EQUAL 3)
- 
-@@ -29,7 +29,7 @@ elseif(NOT WIN32 AND SC_ED EQUAL 3)
-             DESTINATION share/gtksourceview-3.0/language-specs)
- 
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sced3/supercollider.plugin sced3/supercollider.py
--            DESTINATION lib/gedit/plugins)
-+            DESTINATION lib${LIB_SUFFIX}/gedit/plugins)
- 
- elseif(WIN32)
- 
-diff --git a/server/plugins/CMakeLists.txt b/server/plugins/CMakeLists.txt
-index 52accc332..570f2e50b 100644
---- a/server/plugins/CMakeLists.txt
-+++ b/server/plugins/CMakeLists.txt
-@@ -301,7 +301,7 @@ elseif(APPLE)
- 
- else()
- 	install(TARGETS ${plugins} ${supernova_plugins}
--			DESTINATION "lib/SuperCollider/plugins"
-+			DESTINATION "lib${LIB_SUFFIX}/SuperCollider/plugins"
- 			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- endif()
- 
-diff --git a/server/scsynth/CMakeLists.txt b/server/scsynth/CMakeLists.txt
-index 1d99cad80..dbb92749b 100644
---- a/server/scsynth/CMakeLists.txt
-+++ b/server/scsynth/CMakeLists.txt
-@@ -150,7 +150,7 @@ elseif(NOT NO_LIBSNDFILE)
- endif(SNDFILE_FOUND)
- 
- if(UNIX AND NOT APPLE)
--	target_compile_definitions(libscsynth PUBLIC "SC_PLUGIN_DIR=\"${CMAKE_INSTALL_PREFIX}/lib/SuperCollider/plugins\"")
-+	target_compile_definitions(libscsynth PUBLIC "SC_PLUGIN_DIR=\"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/SuperCollider/plugins\"")
- endif()
- 
- 
-@@ -284,7 +284,7 @@ elseif(WIN32)
- else()
- 	install(TARGETS ${INSTALL_TARGETS}
- 			RUNTIME DESTINATION "bin"
--			LIBRARY DESTINATION "lib"
-+			LIBRARY DESTINATION "lib${LIB_SUFFIX}"
- 			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- endif()
- 
-diff --git a/server/supernova/server/main.cpp b/server/supernova/server/main.cpp
-index c0f603471..453355523 100644
---- a/server/supernova/server/main.cpp
-+++ b/server/supernova/server/main.cpp
-@@ -245,6 +245,7 @@ void set_plugin_paths(server_arguments const & args, nova::sc_ugen_factory * fac
-         const path home = resolve_home();
-         std::vector<path> folders = { "/usr/local/lib/SuperCollider/plugins",
-                                       "/usr/lib/SuperCollider/plugins",
-+                                      "/usr/lib64/SuperCollider/plugins",
-                                       home / "/.local/share/SuperCollider/Extensions",
-                                       home / "share/SuperCollider/plugins" };
- 
--- 
-2.15.1
-
diff --git a/media-sound/supercollider/supercollider-3.8.1.ebuild b/media-sound/supercollider/supercollider-3.8.1.ebuild
deleted file mode 100644
index 07406d0c4346..000000000000
--- a/media-sound/supercollider/supercollider-3.8.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="An environment and a programming language for real time audio synthesis."
-HOMEPAGE="https://supercollider.github.io/"
-SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source-linux.tar.bz2"
-
-LICENSE="GPL-2 gpl3? ( GPL-3 )"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="avahi cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim"
-RESTRICT="mirror"
-
-RDEPEND="
-	media-libs/alsa-lib
-	sys-libs/readline:0=
-	x11-libs/libX11
-	x11-libs/libXt
-	avahi? ( net-dns/avahi )
-	fftw? ( sci-libs/fftw:3.0= )
-	jack? ( virtual/jack )
-	!jack? ( media-libs/portaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5
-	)
-	server? ( !app-admin/supernova )
-	sndfile? ( media-libs/libsndfile )
-"
-DEPEND="${RDEPEND}
-	dev-libs/icu
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	gedit? ( app-editors/gedit )
-	qt5? (
-		dev-qt/linguist-tools:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtconcurrent:5
-	)
-	vim? ( app-editors/vim )
-"
-
-S="${WORKDIR}/SuperCollider-Source"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.8.0-no-opengl.patch
-	"${FILESDIR}"/${PN}-3.8.0-no-qtsensors.patch
-	"${FILESDIR}"/${PN}-3.8.0-no-qtpositioning.patch
-	"${FILESDIR}"/${PN}-3.8.0-multilib.patch
-	"${FILESDIR}"/${PN}-3.8.0-gcc-7.patch
-	"${FILESDIR}"/${PN}-3.8.0-desktop.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DAUDIOAPI=$(usex jack jack portaudio)
-		-DINSTALL_HELP=ON
-		-DSYSTEM_BOOST=OFF
-		-DSYSTEM_YAMLCPP=OFF
-		-DNO_AVAHI=$(usex !avahi)
-		-DFFT_GREEN=$(usex !fftw)
-		-DNO_GPL3=$(usex !gpl3)
-		-DNO_LIBSNDFILE=$(usex !sndfile)
-		-DSC_QT=$(usex qt5)
-		-DSCLANG_SERVER=$(usex server)
-		-DSUPERNOVA=$(usex server)
-		-DLIBSCSYNTH=$(usex !static-libs)
-		-DSSE=$(usex cpu_flags_x86_sse)
-		-DSSE2=$(usex cpu_flags_x86_sse2)
-		-DSC_IDE=$(usex qt5)
-		-DSC_ED=$(usex gedit)
-		-DSC_VIM=$(usex vim)
-		-DSC_EL=$(usex emacs)
-	)
-
-	use debug && mycmakeargs+=(
-		-DSC_MEMORY_DEBUGGING=ON
-		-DSN_MEMORY_DEBUGGING=ON
-		-DGC_SANITYCHECK=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use vim && newdoc editors/scvim/README.md README.vim
-	use emacs && newdoc editors/scel/README.md README.emacs
-	use gedit && newdoc editors/sced/README.md README.gedit
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Notice: SuperCollider is not very intuitive to get up and running."
-	einfo "The best course of action to make sure that the installation was"
-	einfo "successful and get you started with using SuperCollider is to take"
-	einfo "a look through ${EROOT%/}/usr/share/doc/${PF}/README.md.bz2"
-	einfo
-
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/supercollider/supercollider-3.9.3.ebuild b/media-sound/supercollider/supercollider-3.9.3-r1.ebuild
index 5ea861d111ba..af5984979652 100644
--- a/media-sound/supercollider/supercollider-3.9.3.ebuild
+++ b/media-sound/supercollider/supercollider-3.9.3-r1.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
 		dev-qt/qtgui:5
 		dev-qt/qtnetwork:5
 		dev-qt/qtprintsupport:5
+		dev-qt/qtsql:5
 		dev-qt/qtwebkit:5
 		dev-qt/qtwidgets:5
 	)
diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
index 3211a8f0241f..41d0176c8422 100644
--- a/media-sound/vorbis-tools/Manifest
+++ b/media-sound/vorbis-tools/Manifest
@@ -6,5 +6,5 @@ AUX vorbis-tools-1.4.0-format-security.patch 367 BLAKE2B ed537460519c4fb7c9743af
 AUX vorbis-tools-1.4.0-underlinking.patch 2368 BLAKE2B 8752f76eb1875932d8695d73cbd41c1127c93443436007da94108caac86ad246a8a200ea1429982caeb882c9418dce9e22d104a7122d191338b02740d81cc9fd SHA512 208347b22bc4144f796cc1cbea68dba890e0620db7f3b9005ca20d87069204e0b474f0dfaab0ea248d37e8d9efb685a70f47def41367281464561edfb5192147
 DIST vorbis-tools-1.4.0.tar.gz 1346532 BLAKE2B 37a915c522bc7ec3746d96bef3982f59aa590098425609d8d9a5cd522d15fe7ca5f0cf6cceb8eadf1a14b732f812b56206ec20c04121e20f34b9df0755d8bd18 SHA512 d2473f2e8e6726b5a5083f567797ae42bbb7fa3f26aec3f7b83e641e028c64726299f71a9d75258595a53cf29c18acb84841bcbc39509258d2c8df859e4e3b99
 EBUILD vorbis-tools-1.4.0-r3.ebuild 1174 BLAKE2B 3369ef56b23523dbb981341bc6e1bc745be8cc405604b9c633a8cc636356075ea2eea4e849718e29428688d877adad0eb8a91e64c4b482a4446fbb9884209f25 SHA512 e0868673ea0b1af427118f502d54bf4b25be9148fcb06e5f47a9fd5415505db2d94f98cff4736ff496119382354a0de8390956c596bdfbd56e172802ad9c2f51
-EBUILD vorbis-tools-1.4.0-r5.ebuild 1210 BLAKE2B 2bb0bdd6f0334377a31e9ea8050f26e187f3d5fb63b79634a4ef0bc2f77eb045d0963cfd572c8b5060ddd41e7912eb902cda44bb190e6bbf7bd22b71eb81880c SHA512 ad4808b45f8c35e58cf73729b4c8aa1f72dcf369569a1d161e804a1830770b0ac6bd025289fe603c38846f99a1f6d7aab516bf86a162c1a46cb606b22caa29b3
+EBUILD vorbis-tools-1.4.0-r5.ebuild 1209 BLAKE2B 534f416e532934aeb7d3e206a37b858b92ae18042154f1b31e60c67c4dca684b39a2bf8e5bc692d2833cc18e521cc0159bc2b5e978d2c2cd394da27979ed94f2 SHA512 938ea8ca7496a0f2e85b1cedc73f7f9745909bbf919c218468717fe590346469f991397226dff0f58fca6d2b6d885fc7399ec38d4612c3fbfbdf238abf85e536
 MISC metadata.xml 427 BLAKE2B 5a3d7b5384086ba3575fd479f1fb99db4aec140b6438389db4b1857ef41cc963053a57baa3d0a18b90cde721b508bb1985cebd23c20445e93e3362af1eb08aa4 SHA512 fe38791f10b0312286c49042e5c24303418ab755d5300b64b7dc406be5dfda993bbe804eae1124c2484d6a1f2e823895e174a522f8710e4b12129e856674d65c
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
index c44d174861f9..7587affb5980 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="flac kate nls +ogg123 speex"
 
 RDEPEND="
diff --git a/media-sound/xfmpc/Manifest b/media-sound/xfmpc/Manifest
index 15fc2e1e3f40..42f62688c818 100644
--- a/media-sound/xfmpc/Manifest
+++ b/media-sound/xfmpc/Manifest
@@ -1,3 +1,3 @@
 DIST xfmpc-0.2.3.tar.bz2 414680 BLAKE2B 167af8e53d7ddf2a629d585e8ca9f15507e54ee92ceae0f48d3462fc1667b07570d2489cc5058c0521aae2f0b1493a1101655ae702e48b3c4d0c6be493a4ec57 SHA512 3f592fdd559817051f7720bafc07fc66b39f682cc20286c12d54c4bd607e85bb0a722c567264a29224971b4ac14db51b0b44b233a16cccd9d17579a50549a3be
-EBUILD xfmpc-0.2.3-r1.ebuild 763 BLAKE2B fc955996e53129533110994c9a36134bf56c6c8204b5caea7671741a47585dea562bb087f5c2acd4436e0b853b9d6476cfb24598e9b40b64d5e1304ddb0f454a SHA512 64e9a9454b6b4f0457167debff549a10e4a82f31cc9c3a60d6d33c5c4bb0b2a8d4da6f6fe7d11408e976870ea6c7ad96328f708ecf08ab60f41d51f1cbfe71d2
+EBUILD xfmpc-0.2.3-r1.ebuild 774 BLAKE2B ecfffb22006c3452b3d0cf54bcdb9d993fb274b3adee1b72164beddfd4eb3a786863fd8278c02afb8052e89fc748ae90699ebada619436d0fccafbf3d9c004db SHA512 5b1272722cac67bc3b6c5492a64f63d85e22014dda9f45eaf8e523df5e56ddcef562a57db71093721674f82db0665933522b66922fca16d64cd9757d69f7cca8
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/media-sound/xfmpc/xfmpc-0.2.3-r1.ebuild b/media-sound/xfmpc/xfmpc-0.2.3-r1.ebuild
index 1f2802f64c8e..6d1b25a9d567 100644
--- a/media-sound/xfmpc/xfmpc-0.2.3-r1.ebuild
+++ b/media-sound/xfmpc/xfmpc-0.2.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xdg-utils
 
 DESCRIPTION="Music Player Daemon (MPD) client for the Xfce desktop environment"
 HOMEPAGE="https://goodies.xfce.org/projects/applications/xfmpc"
-SRC_URI="mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/0.2/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"