gentoo resync : 13.09.2019

21 files changed, 103 insertions, 348 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 5e75c42de6c5..cad7863f5265 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index 243cf8f49fff..078ab0262c0f 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,3 +1,5 @@
 DIST drumstick-1.1.2.tar.bz2 1012371 BLAKE2B e60a5678d33db1831130037bb4a6df6da8de815a6a0ca33a167f85596f45a1d420ca4c689c756c1fd3f794fb2a097bc19878d78bfe0789a40f9eae1b306b769f SHA512 6e84fbf2ce717cdb3c669a477de65d2f32c277073d812546267c0a9556f7ead612e3140cbc412fcd560786ca024f201a1eb3ba9de4b037e3ba8d4db89e0e2e29
+DIST drumstick-1.1.3.tar.gz 1358468 BLAKE2B af4cc923d380a1da66c835a6302e47e31c17ff90ba9277fe6063e6029c3d4d087e85905487a4dae657cdbfb743d2ac6e6c5a30c0905c9bc736d8666105e52099 SHA512 41990c269c41dc011e14c9bf008b983cd3722ea52429ec7eabaa5689a6f69b1760fc766604378c30bb1dfab537b77f7522a13377b873308835a0e7701d24448e
 EBUILD drumstick-1.1.2.ebuild 1466 BLAKE2B 1875c3fc6df6afcda35ff243fecdde7e30558a11096976d18a9f22ef595bd32401d72a63182c3ae28a0da9905c99862338225f0d545b10bc3b1153d36db9f710 SHA512 6fadb06cd83001be43e08c5e468935333d6ad045618b407ce84133ac949b083089789f5ff366a26aeda5774ec63d74eb30bcf0553f60db9e9a75b488cc4b91d7
+EBUILD drumstick-1.1.3.ebuild 1467 BLAKE2B d0758a5ebbfd5c7fad1b65a44d66dd947aec0094da52f195b823ee2795ff4618a2afcf6699d3e5dd1aa4997ec3b5cb72b9b3beebb7a4486a665906ea2a8e024b SHA512 0a56021cd83fa80b7716d5beb9441d1ce6fc8d3b04e31a08e6cfe667b75f3f5292439302aad6fcea48d2166200d2b3487837c75cafaad17b01987e26cd0a6322
 MISC metadata.xml 543 BLAKE2B ab65d693031858992d6015da0dd074b2fe2975d50136fb105674c9f51b694d6b41e3d0b6f93e2b0928dac68aabd32cf1b4b3081d460639cbe6bd3e8b3a045c46 SHA512 b91230be7ae7d1cce86bba1b2706d88fb4beab8a37f1faef5d4ce79627bea14798d508269c6fe0b132450be6698a9466987b6d71d12006e09f58dc25404e784f
diff --git a/media-sound/drumstick/drumstick-1.1.3.ebuild b/media-sound/drumstick/drumstick-1.1.3.ebuild
new file mode 100644
index 000000000000..fcea0b268687
--- /dev/null
+++ b/media-sound/drumstick/drumstick-1.1.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg
+
+DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
+HOMEPAGE="http://drumstick.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fluidsynth pulseaudio"
+
+BDEPEND="
+	virtual/pkgconfig
+	x11-misc/shared-mime-info
+	doc? (
+		app-doc/doxygen
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	fluidsynth? ( media-sound/fluidsynth )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+RESTRICT="test"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! use fluidsynth ; then
+		sed -i -e "/pkg_check_modules(FLUIDSYNTH/d" \
+			library/rt/CMakeLists.txt \
+			library/rt-backends/CMakeLists.txt \
+			utils/vpiano/CMakeLists.txt || die
+	fi
+
+	if ! use pulseaudio ; then
+		sed -i -e "/pkg_check_modules(PULSE/d" CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF
+		$(cmake-utils_use_find_package doc Doxygen)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile doxygen
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc ; then
+		dodoc -r "${BUILD_DIR}"/doc/html
+	fi
+}
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 2a70d89b0fb8..4d44853c4cfb 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,6 +1,6 @@
-DIST mumble-1.3.0-rc1.tar.gz 8638701 BLAKE2B 6c97c528e8b598bb86a7318e997067706216436b37aabb06931e509d1c713d0104aa599a72235dd0afd46b34779205bd622a496bf14fd54aa065d9ab1d869725 SHA512 e993b18b0ecf620d3a9a89f145c18b9ecde3aaf9b7217e235b7472908c81a365323c8683dd6fc9ed14b108160f8bf5244369c2a9ee57c22595550220d158516c
 DIST mumble-1.3.0-rc2.tar.gz 8759830 BLAKE2B 4df1001a174d042221a674a21dcdb7165742cba2428f778eb6ef7fcfe8128734f4207230222971fa97622af3ea81e40b676cc089e45704be3fecf76f97f72a36 SHA512 b31a92cbe9d2d973cb06e5f3bb237de22f0fa5f242e6a8141ffaa735268ca41097bda44445a73ea5dafef6ef3ff7a5050c52c7f9b9f5600d400e57aff6f2e4c4
-EBUILD mumble-1.3.0_rc1-r1.ebuild 3740 BLAKE2B 7f25922b5de9c8165204258f7807e2d7b95459d742461e3420049b8d1964ddbc726a143da1c75266aef782c611302612dde416e5f1b8a9141a1445d4fadcf6fe SHA512 5a69d06a03be98f11447eefc44a9f6c31b5fb51f686e8afc0a89905b6e91d27295d84f1129518a4a6d62fb88ba2890754859d03e086a59edbc5298e5a0f29bc1
+DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122
+EBUILD mumble-1.3.0.ebuild 3781 BLAKE2B d81a5dd96991202f1c5b2a5a6e9086ef60df87ab8f87ff33d3588c008d17f6a0f59e2d3298e5a7b74ccc2ae9eea5a47b9b96a29de622a6edf29b5efe1c08e95c SHA512 cbb20c9b5be3b36fc112631eecc9b29ae9c251fbd3e6d606a28e98ed0444f441c2fe3962e401f9689733b1ba50f76762307db16ad2209d4cdaee26406f49a64d
 EBUILD mumble-1.3.0_rc2.ebuild 3781 BLAKE2B d81a5dd96991202f1c5b2a5a6e9086ef60df87ab8f87ff33d3588c008d17f6a0f59e2d3298e5a7b74ccc2ae9eea5a47b9b96a29de622a6edf29b5efe1c08e95c SHA512 cbb20c9b5be3b36fc112631eecc9b29ae9c251fbd3e6d606a28e98ed0444f441c2fe3962e401f9689733b1ba50f76762307db16ad2209d4cdaee26406f49a64d
 EBUILD mumble-9999.ebuild 3781 BLAKE2B d81a5dd96991202f1c5b2a5a6e9086ef60df87ab8f87ff33d3588c008d17f6a0f59e2d3298e5a7b74ccc2ae9eea5a47b9b96a29de622a6edf29b5efe1c08e95c SHA512 cbb20c9b5be3b36fc112631eecc9b29ae9c251fbd3e6d606a28e98ed0444f441c2fe3962e401f9689733b1ba50f76762307db16ad2209d4cdaee26406f49a64d
 MISC metadata.xml 758 BLAKE2B 72c530c5bb4db48b3ab9cd915dbf68abec74f609d796acc12b70426b40065f09407a0e4daf9668ec140fc6a185ff17d3bb21ead13a2b5abe28ceb3d232b3f073 SHA512 ecff83ea1a0b3dda39884cced8fb657475ae98f9a15e07f9a1a8f01bcb411382024d47d9da70c1e066654757b6ce7262ab3f7b03780a13257bdfa895e6417ec9
diff --git a/media-sound/mumble/mumble-1.3.0_rc1-r1.ebuild b/media-sound/mumble/mumble-1.3.0.ebuild
index 30b2055c37fb..ca1f49e6d6bd 100644
--- a/media-sound/mumble/mumble-1.3.0_rc1-r1.ebuild
+++ b/media-sound/mumble/mumble-1.3.0.ebuild
@@ -17,7 +17,8 @@ else
 	else
 		MY_PV="${PV/_/-}"
 		MY_P="${PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz"
+		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
+			https://dl.mumble.info/${MY_P}.tar.gz"
 		S="${WORKDIR}/${P/_*}"
 	fi
 	KEYWORDS="~amd64 ~arm64 ~x86"
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index af1326c78ac3..0a2247347658 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -5,7 +5,8 @@ AUX murmurd-dbus.service 297 BLAKE2B 30ca5427de360cacab404cfff42d8e2355f14def671
 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
 AUX murmurd-no-dbus.service 222 BLAKE2B 11fc296fd5d5445347f077ff9d4aaea3364176dff9c28d06b6b2d0b4a8d0ff8ccd559c68a0fadddbc8363349d9c599c9ebd6da8e0055a680b18aa282e72875a5 SHA512 d58c04dde0286b07a494c99fff8b94cdf1c47f6fcacbb5552445b7e19421f2a9862186e7309886590bc33ae3c64c0c840a9a93c55b35ca600b7a8f9ec53dbab2
 DIST mumble-1.3.0-rc2.tar.gz 8759830 BLAKE2B 4df1001a174d042221a674a21dcdb7165742cba2428f778eb6ef7fcfe8128734f4207230222971fa97622af3ea81e40b676cc089e45704be3fecf76f97f72a36 SHA512 b31a92cbe9d2d973cb06e5f3bb237de22f0fa5f242e6a8141ffaa735268ca41097bda44445a73ea5dafef6ef3ff7a5050c52c7f9b9f5600d400e57aff6f2e4c4
-EBUILD murmur-1.3.0_rc2-r1.ebuild 3565 BLAKE2B 4b8282c64999cf70a51fe234d23e0737b2c710984d188c733a97a90109120af9705eb21eef2a66da118043b64b6541fe372cabe92737f0981e5a9760d6cb6833 SHA512 b6fe723f3cf2e6468a47f2ffc0102d54f6fbc7cf374e5e97eaaa7e0853162f0604cf1b0db34e0b9c009f661a09c95ff0358cfd9dbf808ce9238c94b1f7f8ded3
+DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122
+EBUILD murmur-1.3.0.ebuild 3554 BLAKE2B 2df9caa9ae5efbb02bc80eb2f9d109943597a1c6fe1cf532f9f6cb3d9c4c2ef3bfd3f9140f37f92a47983037bc88ac05833a6c64cfbcda89f1d9bebb3d559ff1 SHA512 35e5ced14798cdd79fdea77dd4065d19f6c221e5ceed262a26caca1acb83e3587a162750204eb0b1503063dd13277e871c2fb296e627f81154ff8e8db938ee95
 EBUILD murmur-1.3.0_rc2-r2.ebuild 3554 BLAKE2B 2df9caa9ae5efbb02bc80eb2f9d109943597a1c6fe1cf532f9f6cb3d9c4c2ef3bfd3f9140f37f92a47983037bc88ac05833a6c64cfbcda89f1d9bebb3d559ff1 SHA512 35e5ced14798cdd79fdea77dd4065d19f6c221e5ceed262a26caca1acb83e3587a162750204eb0b1503063dd13277e871c2fb296e627f81154ff8e8db938ee95
 EBUILD murmur-9999.ebuild 3690 BLAKE2B 03dfc78a08930265518faaada25f6e857d39cd705e6ba3975ad7f12481efdba60b0f5b331e5ee785481ada733265f5caa0f681ba5aa0442d4cf45a1b96e742cd SHA512 9bab53e3b0282ac3adebb9055c1b57e2dbe0780a5f3e8cb2bbde227b22ebe057a85e3abf50a5106ce704ca07e2f56ede16ec03543676941d65269238488e6352
 MISC metadata.xml 597 BLAKE2B 6eece3d62949bfb7c01c6249764ee6e47ca0273972ed0aa2bae704ed7acb9267e7cef706d2c3eeafb5becd4695d8665c975f67e577ef3ce4def50e78ba1ce273 SHA512 d7ffb25e7b3919cb27417debe5b2f84f2f2c330e1a238583f154bb44b697a3b3c3749794baf896807874633b0659076e93c2845a56e49acb24047958d29d2beb
diff --git a/media-sound/murmur/murmur-1.3.0_rc2-r1.ebuild b/media-sound/murmur/murmur-1.3.0.ebuild
index 0a7f6b035c25..bd399783509e 100644
--- a/media-sound/murmur/murmur-1.3.0_rc2-r1.ebuild
+++ b/media-sound/murmur/murmur-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit qmake-utils systemd user readme.gentoo-r1
+inherit qmake-utils systemd readme.gentoo-r1
 
 DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
 HOMEPAGE="https://wiki.mumble.info"
@@ -32,6 +32,8 @@ SLOT="0"
 IUSE="+dbus debug +ice pch zeroconf"
 
 RDEPEND="
+	acct-group/murmur
+	acct-user/murmur
 	>=dev-libs/openssl-1.0.0b:0=
 	>=dev-libs/protobuf-2.2.0:=
 	dev-qt/qtcore:5
@@ -52,7 +54,10 @@ DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.41.0
 "
 BDEPEND="
-	virtual/pkgconfig"
+	acct-group/murmur
+	acct-user/murmur
+	virtual/pkgconfig
+"
 
 DOC_CONTENTS="
 	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
@@ -64,11 +69,6 @@ DOC_CONTENTS="
 	registration will fail.
 "
 
-pkg_setup() {
-	enewgroup murmur
-	enewuser murmur -1 -1 /var/lib/murmur murmur
-}
-
 src_prepare() {
 	default
 
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index a37dc2b78801..784f33061d2c 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -8,6 +8,6 @@ AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-12.2.tar.xz 1665092 BLAKE2B 2e36efc5142c1e379cc2b135f4126f03a31831b26efe60f7cdf128af6e23fab25706a5609644d0b387530021055f87525fe60d527cd3a087f51bfd58e810644f SHA512 877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e
 EBUILD pulseaudio-12.2-r1.ebuild 11536 BLAKE2B 28892f7980092e0a314c5d69edcc88d5d9be7dd7a8845f4396f2d4a885ab69b1cb9298f3bb720beed253b5a3ed796ba8e55c94c63f7a4e1ec9b4ae7e369f69b5 SHA512 529c755ecbc2c8596cf295fc56c095dd7b987a5b7e1eea9b35ec04993ca0967e1afa52027e3a7a864d12f362f25d2cc1e2190b6d4c91a5cb730535c6bdd403b2
-EBUILD pulseaudio-12.2-r2.ebuild 11719 BLAKE2B 1ad6d74fe06e3138c497dbf0020eed28ee958f41c0048b55c882516c5116a2afa49749b670ede6db471c3782b8ba99712dfa5bf45cb606e9dbd928c530576eb8 SHA512 99af1eef5dc60f3a6494329d495fa0d446893f3de7918d816089bb7349c56c88fe49eecf52f90ec167a05c319e68b3da5f710136185736547c4136df0d277db3
+EBUILD pulseaudio-12.2-r2.ebuild 11718 BLAKE2B dcf014538084f982a90380f3bc358686bc8ddeb6fb636d9ea1bfd2203db7216a35efb728c68cdd57ebfce55365e1ddbd6c944665220dabf1a59960c8b41989b9 SHA512 b016a7fd49a61715da48737d6e8e8a2473a5c3794d133d3b410b3e917dee7cadd46630526b193c39c3cac8cdbedf9a3ffe482a6a0185fd399a1272df47ee29b9
 EBUILD pulseaudio-12.2.ebuild 11111 BLAKE2B bd002a2bf9d7c0521eed3baec7d2b602302e8cd4bd7acd6ea22abeff54ee1be8042b44bcfd64a7f4d57f2855a958235d5b16fcf018f0377cd5f5faee040c84e2 SHA512 dd20835fb783428209dcffa07b0b4c1ec9f3e42b91faf07052df5f77f3eac388ee91dfbfe2da7f07890ae3631234a8a14bfafc41875c6716c6b8b9e839ba0f21
 MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild b/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
index 2a4cc0e9089f..14fcb10d3ed7 100644
--- a/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 3fd2dd5c6ff9..f701084e1f84 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,8 +1,6 @@
-DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
-DIST pulseeffects-4.6.5.tar.gz 1881685 BLAKE2B 25f9fd27f2cb66ed32664aa5aaf6e6a7f0860a4addadd572be7e53c49434c8d57bf1799ccdd5e40546a918b5723a0ce8b34a8d8b337fe3b4c7a16fb8271d9d3f SHA512 4de2c29b723d2f42ed38021f9515be31eba51419833a449f531c9ad130636e8ce31f0207ff5c00d493ea59ed684ddfe236b7e2570fd9e54b005eae494e65a680
 DIST pulseeffects-4.6.6.tar.gz 1881680 BLAKE2B 9bb1048b3870824d19f72e29da2ee274ed387bea7fae0036a104694defd47f754fda3fa1668a95ddb8c2ea066c457bb469c3c32292dc7a378625c6f19d9339ff SHA512 ed6482169bb06490bbcbc57f293723089e5750279a74d6ec5ba2693cb1a71df88262e6fd7d91c852ba5a75b07c246992f619299017e856fca38ad5c619486963
-EBUILD pulseeffects-3.2.3-r1.ebuild 1542 BLAKE2B b98afac0e18f40b4d50578aaa766cf077b73157aefb380fc766e63cd6e1c43b2ea1026ca30b9fbcdf24aa3d150b6f835664668dded8e025e9b2b4b94c558aacc SHA512 14edbfdc37cebc7bd6bf0b9f1f1ac0217da3df742e52b1762d186274eca7cb05ea953c2289059836417430c0bc528f3327859a4f2c4f8d4e5ff99f2ee2d42d4b
-EBUILD pulseeffects-4.6.5.ebuild 1804 BLAKE2B 440b75afc189ccd5efa34f187de3dd83401ea5d756e8a8bf1fbe6878d1d47ddcf1e0cc910346dbbe34ea3390924d2906c8c91a2733d80b2aca2e0aed5f42aed2 SHA512 49381d15e31c49220443f35b4f31fd1bc46f1c74d4989dc8dbc8f1b635e7ef485d0ba106c1f99cd98c129f60914ede3a7820f692114e40ca4edeacbe8fb844e2
+DIST pulseeffects-4.6.7.tar.gz 1880914 BLAKE2B 919f9885c8b991782251257ba13512c5c25ae6590fd3f709b9f142f74f80f9fd15bbdc0cd57a7a7d84cc4c94c795f69db57a13b161cbbebdd2458803e36e8ccc SHA512 138ea6081e3b1751f0cd15d6ae1eb0dbc4156493b37f7c8b48878a6600ec19c8846145b7bef3bccb93b6775bd4f0b9ee998c603152c6526540eaaebcdcaa5d2e
 EBUILD pulseeffects-4.6.6.ebuild 1803 BLAKE2B 62eb4d5b56e930df0ceda31bdeebf26ae89f80108f1754c6718342468481768dd5dcf8a5b0006a77ced1a92c3d8504142b65dc558b26defb4295caf20699e9c4 SHA512 052459a1211ea7a74265723b6d4352d0c79346195aab43136b74f3be7a3cd29a4cb8b53874b9106419d7cc3dc3e194dc36c7f7b67aa53450872eaf614f305a33
+EBUILD pulseeffects-4.6.7.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
 EBUILD pulseeffects-9999.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild b/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild
deleted file mode 100644
index cc5be9c324fd..000000000000
--- a/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit gnome2-utils meson python-r1
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="${HOMEPAGE}"
-else
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	${PYTHON_DEPS}
-	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}]
-	>=x11-libs/gtk+-3.18:3[introspection]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.18[${PYTHON_USEDEP}]
-	>=media-libs/lilv-0.24.2-r1
-	>=media-plugins/calf-0.90.0[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0[introspection]
-	>=media-plugins/gst-plugins-bs2b-1.12.0:1.0
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-RDEPEND="${DEPEND}
-	media-sound/pulseaudio[equalizer]
-"
-
-pkg_preinst(){
-	gnome2_schemas_savelist
-}
-
-pkg_postinst(){
-	gnome2_gconf_install
-	gnome2_schemas_update
-}
-
-pkg_postrm(){
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-4.6.5.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.7.ebuild
index 59759efb7e42..0e6624cf2428 100644
--- a/media-sound/pulseeffects/pulseeffects-4.6.5.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.6.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 ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 3d50e98629cd..2ec802edda02 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -10,4 +10,4 @@ AUX sox-14.4.2-CVE-2017-18189.patch 1109 BLAKE2B 1014eb9427b4735e08da68707e108a0
 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 2617 BLAKE2B 16de3a69ba83189cc3285b2886e2f04081fd875f8d0c85fd28986d0e5bab9afaade01fa39b02adc39f21cc92273dc55e65ec8d71f8000ec0adc96229a76e9ece SHA512 b503cec195701776966eab7ee510faf0f76b48f084bd6a2addfdefcdb8c1eb50370cd7ddcf214524da89d06e8ccd57d1859d84ce2ab2d158ac7b5c71eb6fff46
-MISC metadata.xml 579 BLAKE2B 9a129ee262f9147b903659d806b5cb7db559a3cd70adbe6cbf0faca60ae3f2d3c5898ea713813b124bdb43fac7b7e4fa9a6702892bc99dfa9fe3271403160077 SHA512 3b09529397d2d31693f701c05e4db73db553177ec6471a28612254fe3117d1b3574bdf3381a024c23c2e8c7efa02925d0c464548ed4105c573266c612595de2f
+MISC metadata.xml 653 BLAKE2B 73d6e024f7b8cf87cc0640a749af4bf3d45604e9e28cd9ff1f68fea9b7f4c05ff2e1ee676efd07d1221070492a3575c1f4397cfe7008df00403232353f22afcd SHA512 578f6db7fbe2ae3dc3a732a2cbfb8627bfcce1801b4834071040df1b9e3bf20ca9dd6e7a8d7df221d38f4e8fff22cefa6ad57fd19dc145ab4a247f688c497c71
diff --git a/media-sound/sox/metadata.xml b/media-sound/sox/metadata.xml
index 9f80c9612eac..c891b42123b6 100644
--- a/media-sound/sox/metadata.xml
+++ b/media-sound/sox/metadata.xml
@@ -11,6 +11,7 @@
     <flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder)</flag>
   </use>
   <upstream>
+    <remote-id type="cpe">cpe:/a:soundexchange:sound_exchange</remote-id>
     <remote-id type="sourceforge">sox</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index 64e8c327c66d..39cfe9c58e1d 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -2,11 +2,6 @@ AUX supercollider-3.10.2-boost-1.67.patch 1521 BLAKE2B 0e63a18647b85cede59cf8dcd
 AUX supercollider-3.10.2-boost-1.70.patch 1882 BLAKE2B 48fdf58789d37a296a28f11045d3f224c29a3bdfd39d5377101d2a1bb501f8a648307b0546daadea3d46213d6847098a1128101b1bd990c6ffe203aac6bdd6fc SHA512 0a999fbd53de6c7c2fb81451c6a1f4ce909220a257eefccce1d2246238637d661757795dfc4be7dd69c0553bdf1a02db9311da6033fe7b17230800d06fd291b4
 AUX supercollider-3.10.2-no-ccache.patch 927 BLAKE2B 661610049aab5c077cbff57fa476d08ef7170440135362dafa96b4ab312d778154acdcccd93562822c7d6078d55c6c5eaf59eeadc85e61cc85f1e50a76c908e8 SHA512 5a1f6f074adcb77b9958ff47e855378f9ec180201e32cc417925320ee7fbeedd5b2a163b300286bf0344bb6bb47743598c59c95f28573f4a309696ca5e44af8d
 AUX supercollider-3.10.2-system-boost.patch 15055 BLAKE2B d6b3b2c9f13829ff5b2af037f4204fff519efe67bcb7b705090a2883d97738f0cc8b4a66fe39f88d5fe676081ed44fe3132d23e404c821353d1e9b31d1e0d764 SHA512 d9b2ef108673b11a27c63654ceacf3b7e51df11ce05fc6d9045abd219ea718c2552f5ea026a5182c272639e695a1073192013b14cae257e7e4b00dd3c303ecae
-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.10.2-Source-linux.tar.bz2 11366481 BLAKE2B d01324ed65f7e8977c138709471e7b9000b1d05ce4c1c0ff83c9ca0ae6e3948b4933320c382b64ecd2aebc65597c963c9348dda09a8c2ec7bc2ea5a14473fe44 SHA512 f7d136cb03e32dfd0b72e36047deaa24d5edfac0f7e9eeaac35f8e991cd52b00db0701478e0daefb24bfbbc55b5cf240e3f3429fd46caa8d76daa21c7aebaf46
-DIST SuperCollider-3.9.3-Source-linux.tar.bz2 11060240 BLAKE2B 5da51bece13d2a3e4ca1ff6b79637122a46c1f590aa7e4ebf52d7a663506c6f4bae4f3d618bb7f947c73828402f329be68e435a4de2ecc092c312cb2c993742c SHA512 5b0c29941907d5ca45c1676e34184664c03891051bba0ee50d9e8311400824054de7b6daba6d29fd875ff38f42ee9654504ea2f0b5bf0a36ae9605e6a79a0841
 EBUILD supercollider-3.10.2.ebuild 3055 BLAKE2B 3569094c88762fde957ff9c979f3d6bb777b859a0f4bbb4c7a893b14acae31b32bd5a319867407488fde390c00261591bded8143ead4835866e7b64dd2599eb8 SHA512 01e2f6979578cba5736c415594e805ce36db7c797b02fe22932ad7320a11fc7242fda2b87c09021797517a20b0f8353e4b6cea877b4f8990c603f45bc8d85277
-EBUILD supercollider-3.9.3-r1.ebuild 2836 BLAKE2B 164dd68cf7178fca42bb1a650ddee93dc9ff90db43f4f4c95a09530ac02305c176a450430fa956d094a6368e6e0e81ab1d379cf10ea6e801a9e762edc61fb9c8 SHA512 25ca2d3f3a14fc11db4cb6626bbdaa43ded4e1ee2bf2a616e3c83cf34e171eff22ce831ca6d4087477140fcb92a3f2283a1dff6374a5d2d4a65226e3da23060f
 MISC metadata.xml 840 BLAKE2B 261014eccb171924a9a70a4972d9ea1cb9ad36f6ac2b7ecb40ebc2eee59d535871957109e239b90500d26073769cf58cd475cf221af0d2caf42033a2e0e56911 SHA512 a8ce15c95e8b04624301b814156ebe84195071b2ec80b223444c733e8b4de8137d4d70397f3a84d2894bdc635fff5d15ba66a9409749c02b3f3acb40d9479895
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-no-opengl.patch b/media-sound/supercollider/files/supercollider-3.8.0-no-opengl.patch
deleted file mode 100644
index 15e19d8dee60..000000000000
--- a/media-sound/supercollider/files/supercollider-3.8.0-no-opengl.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt
-index 64f275b..f88c4a7 100644
---- a/QtCollider/CMakeLists.txt
-+++ b/QtCollider/CMakeLists.txt
-@@ -8,17 +8,16 @@ find_package(Qt5Network)
- find_package(Qt5WebKit)
- find_package(Qt5WebKitWidgets)
- find_package(Qt5PrintSupport)
--find_package(Qt5OpenGL)
- find_package(Qt5Sensors)
- find_package(Qt5Quick)
- find_package(Qt5Qml)
- find_package(Qt5Sql)
- find_package(Qt5Positioning)
--mark_as_advanced(Qt5Concurrent_DIR Qt5Core_DIR Qt5Gui_DIR Qt5LinguistTools_DIR Qt5Location_DIR Qt5Network_DIR Qt5OpenGL_DIR Qt5Positioning_DIR Qt5PrintSupport_DIR Qt5Qml_DIR Qt5Quick_DIR Qt5Sensors_DIR Qt5Sql_DIR Qt5WebKitWidgets_DIR Qt5WebKit_DIR Qt5Widgets_DIR Qt5X11Extras_DIR)
-+mark_as_advanced(Qt5Concurrent_DIR Qt5Core_DIR Qt5Gui_DIR Qt5LinguistTools_DIR Qt5Location_DIR Qt5Network_DIR Qt5Positioning_DIR Qt5PrintSupport_DIR Qt5Qml_DIR Qt5Quick_DIR Qt5Sensors_DIR Qt5Sql_DIR Qt5WebKitWidgets_DIR Qt5WebKit_DIR Qt5Widgets_DIR Qt5X11Extras_DIR)
- 
- set (QT_COLLIDER_LIBS
-   Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::WebKit Qt5::WebKitWidgets Qt5::PrintSupport
--  Qt5::OpenGL Qt5::Sensors Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning
-+  Qt5::Sensors Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning
-   ${MATH_LIBRARY})
- 
- if (APPLE)
-diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt
-index f2347de..860d254 100644
---- a/editors/sc-ide/CMakeLists.txt
-+++ b/editors/sc-ide/CMakeLists.txt
-@@ -7,7 +7,6 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- find_package(Qt5Core)
- find_package(Qt5Concurrent)
- find_package(Qt5LinguistTools)
--find_package(Qt5OpenGL)
- find_package(Qt5Positioning)
- find_package(Qt5PrintSupport)
- find_package(Qt5Qml)
-@@ -18,7 +17,7 @@ find_package(Qt5WebKitWidgets)
- find_package(Qt5Widgets)
- 
- set(QT_IDE_LIBRARIES
--    Qt5::Core Qt5::Concurrent Qt5::WebKitWidgets Qt5::OpenGL Qt5::PrintSupport Qt5::Sensors Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning)
-+    Qt5::Core Qt5::Concurrent Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Sensors Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning)
- 
- if(${CMAKE_COMPILER_IS_GNUCXX})
-     add_definitions(-Wreorder)
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-no-qtpositioning.patch b/media-sound/supercollider/files/supercollider-3.8.0-no-qtpositioning.patch
deleted file mode 100644
index ee4bf52d010b..000000000000
--- a/media-sound/supercollider/files/supercollider-3.8.0-no-qtpositioning.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt
-index 903d5a0..007b4f4 100644
---- a/QtCollider/CMakeLists.txt
-+++ b/QtCollider/CMakeLists.txt
-@@ -11,12 +11,11 @@ find_package(Qt5PrintSupport)
- find_package(Qt5Quick)
- find_package(Qt5Qml)
- find_package(Qt5Sql)
--find_package(Qt5Positioning)
--mark_as_advanced(Qt5Concurrent_DIR Qt5Core_DIR Qt5Gui_DIR Qt5LinguistTools_DIR Qt5Location_DIR Qt5Network_DIR Qt5Positioning_DIR Qt5PrintSupport_DIR Qt5Qml_DIR Qt5Quick_DIR Qt5Sql_DIR Qt5WebKitWidgets_DIR Qt5WebKit_DIR Qt5Widgets_DIR Qt5X11Extras_DIR)
-+mark_as_advanced(Qt5Concurrent_DIR Qt5Core_DIR Qt5Gui_DIR Qt5LinguistTools_DIR Qt5Location_DIR Qt5Network_DIR Qt5PrintSupport_DIR Qt5Qml_DIR Qt5Quick_DIR Qt5Sql_DIR Qt5WebKitWidgets_DIR Qt5WebKit_DIR Qt5Widgets_DIR Qt5X11Extras_DIR)
- 
- set (QT_COLLIDER_LIBS
-   Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::WebKit Qt5::WebKitWidgets Qt5::PrintSupport
--  Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning
-+  Qt5::Quick Qt5::Qml Qt5::Sql
-   ${MATH_LIBRARY})
- 
- if (APPLE)
-diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt
-index dbe2ad7..cdbb11e 100644
---- a/editors/sc-ide/CMakeLists.txt
-+++ b/editors/sc-ide/CMakeLists.txt
-@@ -7,7 +7,6 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- find_package(Qt5Core)
- find_package(Qt5Concurrent)
- find_package(Qt5LinguistTools)
--find_package(Qt5Positioning)
- find_package(Qt5PrintSupport)
- find_package(Qt5Qml)
- find_package(Qt5Quick)
-@@ -16,7 +15,7 @@ find_package(Qt5WebKitWidgets)
- find_package(Qt5Widgets)
- 
- set(QT_IDE_LIBRARIES
--    Qt5::Core Qt5::Concurrent Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning)
-+    Qt5::Core Qt5::Concurrent Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Quick Qt5::Qml Qt5::Sql)
- 
- if(${CMAKE_COMPILER_IS_GNUCXX})
-     add_definitions(-Wreorder)
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-no-qtsensors.patch b/media-sound/supercollider/files/supercollider-3.8.0-no-qtsensors.patch
deleted file mode 100644
index b9099b971eee..000000000000
--- a/media-sound/supercollider/files/supercollider-3.8.0-no-qtsensors.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt
-index f88c4a7..903d5a0 100644
---- a/QtCollider/CMakeLists.txt
-+++ b/QtCollider/CMakeLists.txt
-@@ -8,16 +8,15 @@ find_package(Qt5Network)
- find_package(Qt5WebKit)
- find_package(Qt5WebKitWidgets)
- find_package(Qt5PrintSupport)
--find_package(Qt5Sensors)
- find_package(Qt5Quick)
- find_package(Qt5Qml)
- find_package(Qt5Sql)
- find_package(Qt5Positioning)
--mark_as_advanced(Qt5Concurrent_DIR Qt5Core_DIR Qt5Gui_DIR Qt5LinguistTools_DIR Qt5Location_DIR Qt5Network_DIR Qt5Positioning_DIR Qt5PrintSupport_DIR Qt5Qml_DIR Qt5Quick_DIR Qt5Sensors_DIR Qt5Sql_DIR Qt5WebKitWidgets_DIR Qt5WebKit_DIR Qt5Widgets_DIR Qt5X11Extras_DIR)
-+mark_as_advanced(Qt5Concurrent_DIR Qt5Core_DIR Qt5Gui_DIR Qt5LinguistTools_DIR Qt5Location_DIR Qt5Network_DIR Qt5Positioning_DIR Qt5PrintSupport_DIR Qt5Qml_DIR Qt5Quick_DIR Qt5Sql_DIR Qt5WebKitWidgets_DIR Qt5WebKit_DIR Qt5Widgets_DIR Qt5X11Extras_DIR)
- 
- set (QT_COLLIDER_LIBS
-   Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::WebKit Qt5::WebKitWidgets Qt5::PrintSupport
--  Qt5::Sensors Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning
-+  Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning
-   ${MATH_LIBRARY})
- 
- if (APPLE)
-diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt
-index 860d254..dbe2ad7 100644
---- a/editors/sc-ide/CMakeLists.txt
-+++ b/editors/sc-ide/CMakeLists.txt
-@@ -11,13 +11,12 @@ find_package(Qt5Positioning)
- find_package(Qt5PrintSupport)
- find_package(Qt5Qml)
- find_package(Qt5Quick)
--find_package(Qt5Sensors)
- find_package(Qt5Sql)
- find_package(Qt5WebKitWidgets)
- find_package(Qt5Widgets)
- 
- set(QT_IDE_LIBRARIES
--    Qt5::Core Qt5::Concurrent Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Sensors Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning)
-+    Qt5::Core Qt5::Concurrent Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning)
- 
- if(${CMAKE_COMPILER_IS_GNUCXX})
-     add_definitions(-Wreorder)
-diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt
-index fe52223..427c587 100644
---- a/lang/CMakeLists.txt
-+++ b/lang/CMakeLists.txt
-@@ -389,7 +389,7 @@ elseif(WIN32)
-             SET(QT_PLUGINS_DIR "${QT_BIN_PATH}/../plugins" CACHE PATH "Location of qt plugins for windows")
-         endif()
- 
--        foreach(plugin ${Qt5Network_PLUGINS} ${Qt5Gui_PLUGINS} ${Qt5Sensors_PLUGINS} ${Qt5Sql_PLUGINS} ${Qt5PrintSupport_PLUGINS})
-+        foreach(plugin ${Qt5Network_PLUGINS} ${Qt5Gui_PLUGINS} ${Qt5Sql_PLUGINS} ${Qt5PrintSupport_PLUGINS})
-             get_target_property(_loc ${plugin} LOCATION)
-             get_filename_component(_parent_dir ${_loc} DIRECTORY)
-             get_filename_component(_name_we ${_loc} NAME_WE)
diff --git a/media-sound/supercollider/supercollider-3.9.3-r1.ebuild b/media-sound/supercollider/supercollider-3.9.3-r1.ebuild
deleted file mode 100644
index 637cfe5bced5..000000000000
--- a/media-sound/supercollider/supercollider-3.9.3-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="~amd64 ~x86"
-IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim zeroconf"
-RESTRICT="mirror"
-
-RDEPEND="
-	media-libs/alsa-lib
-	sys-libs/readline:0=
-	x11-libs/libX11
-	x11-libs/libXt
-	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/qtsql:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5
-	)
-	server? ( !app-admin/supernova )
-	sndfile? ( media-libs/libsndfile )
-	zeroconf? ( net-dns/avahi )
-"
-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
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DAUDIOAPI=$(usex jack jack portaudio)
-		-DINSTALL_HELP=ON
-		-DSYSTEM_BOOST=OFF
-		-DSYSTEM_YAMLCPP=OFF
-		-DNO_AVAHI=$(usex !zeroconf)
-		-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/tuxguitar/Manifest b/media-sound/tuxguitar/Manifest
index e274e5c37431..a0ab162729c6 100644
--- a/media-sound/tuxguitar/Manifest
+++ b/media-sound/tuxguitar/Manifest
@@ -1,4 +1,4 @@
 AUX tuxguitar-fixed-ant-files.patch 10154 BLAKE2B 23f18334ce752a657f65a850c4b45eb7685b7937480977973d327c14d10ffc7e66f154d0d465dcb24ab39f7ae76fbf796e3df6571a3ff049fc116eaaee6381d8 SHA512 90b732cddf4684fb99a91e581903e64cd039ef9b9d8ec7bc9629ce8da889a6b2961f8f5dafd6cce21eb0c67e2e5501586580081f28c702de88ddd1d229769013
 DIST tuxguitar-1.3.2-src.tar.gz 82294553 BLAKE2B 74e0e4b0f2d3d63dbf8f16db43a165f77b39ad54e21091520c06228ea789161a6fb65a1a05bde0f1473afe61e2d990f646b5228b9fe19c114da21a5c32aa32b6 SHA512 fb94472df25578d94ad11cd385cfc9347bfefcdd8ebedd2e785f3645d6b2e0d6d87d3fc457af159865b3fae77ad443ac4246b3c6fbe42397f4d15908dd3b7149
 EBUILD tuxguitar-1.3.2.ebuild 3459 BLAKE2B ea0defbcfb81faf0d7566cbcc786078ea808630ebbc54e4db24343e487d0805541ea2ee6776b871e4f15d9439ab936cb6010562931d132696441d607044e93c2 SHA512 ecc329f413c6dde86fcfaef5b0f88f3934510cb72ec4de2f7f8b712be837bbee2394b983b9764c417233f4e291a80171ede7aa1f532dc7f730061710866d3926
-MISC metadata.xml 1287 BLAKE2B aa7c3b560d507756eb72d602038017dd94e3f261a2a0255ee12441ef60b4772015f332109157e28cfd29ef3784cce6061f488f23ee5b8b9e42f430facff44008 SHA512 4249950599126709e668de28b8a8a0ac4dfa8b118b34f738e6eb7b610f6ed0fb2d11a962631bffcb52d552ee950c5045394e0df89dc37b5b9c9ac4648f86e2d8
+MISC metadata.xml 1203 BLAKE2B e1a4fca2836857ac65bd45a68016aa3523f54e55e3d57334428b21db9e14d72296edd2bb2d9dc0cbead8c9b944c02716984b41953ad39fffe4f4b83a5cf9e916 SHA512 495d2189cb9e60bad807016e0eeb04ca36d6ec6b9baec1355b969707b8a321770f670eb257fb5f9b2afb58418915da003b84b632b1203a67739fc02b4ecf8f17
diff --git a/media-sound/tuxguitar/metadata.xml b/media-sound/tuxguitar/metadata.xml
index f11d4ce160eb..43ad71f5f096 100644
--- a/media-sound/tuxguitar/metadata.xml
+++ b/media-sound/tuxguitar/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dracwyrm@gentoo.org</email>
-		<name>Jonathan Scruggs</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		A multitrack tablature editor and player that allows you to
 		compose music using the following features: