gentoo resync : 06.01.2018

8 files changed, 357 insertions, 12 deletions

diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index 02d8471e7f87..fa46d65ae6b5 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -1,3 +1,9 @@
+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.0-Source-linux.tar.bz2 8866545 BLAKE2B cace10861c4d8914d2a9279d72d8684c2914db3802d5922b1254ad96a8f0e7503f912afa3acd79125838d09d407aee5a5ec2e2f89345ff927120f5fcd666b5ca SHA512 305898067cb323682ca3dc65b3f093658192dbad228632d928f2fbd4a635c651f49e2e4f32c338997aafd48a22b739cd80de4296f747c3f1810ddede0aff283a
-EBUILD supercollider-3.8.0.ebuild 2668 BLAKE2B e15d99b01d45ebb834d36452217cc11b70a830662e644b5f1281363bba051379b6499906675cf970006b49fea00211ed9a9a2058c1c0c963c9d92db2e9347069 SHA512 5e59afbce42cef844aca6ecd26d03af4489586acf1d89ddec5da1d10b5cb8b9a4bc0122a4a8cb44aba2468c1f58fb4011fbe9ad052467705184fa56a97235e3c
+EBUILD supercollider-3.8.0-r1.ebuild 3023 BLAKE2B 3e11c538d633f0d2c8a6baad934280051df1e298e029ef6634c025da1eaa3d5e395ad025ce179e9aa81ee638a2f163a65a85af011861877a5d16ae8c2b81dcfc SHA512 1e2e8523c8d53666f2b2ee72170f00add5bc7b5425836617b89fc1509dcb9291cb0c62516a2edf3b42da35a362bc9037fa5d25f97cd0cb3ff1ececbe6dac31e1
 MISC metadata.xml 910 BLAKE2B 3e574516ab8078203a112ee835fd37f25026103fcf7ff0425b05115c8b25eb72acc38e72a9b15802a90f05c31d6dcf21e8f4dcb5e7c1c07e7c9f0804101cfc90 SHA512 7afeb0ae7a5b92a5380a641e2cc93168c952680b61cc35c388bfa7163e172d12c6e2d236a5eaa1e9e126bda928e798a4519c8eb7821814cb6c0cca51075251c0
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-desktop.patch b/media-sound/supercollider/files/supercollider-3.8.0-desktop.patch
new file mode 100644
index 000000000000..2cf759881d05
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.8.0-desktop.patch
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..5f0269845b31
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.8.0-gcc-7.patch
@@ -0,0 +1,75 @@
+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
new file mode 100644
index 000000000000..982e44a15a95
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.8.0-multilib.patch
@@ -0,0 +1,89 @@
+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/files/supercollider-3.8.0-no-opengl.patch b/media-sound/supercollider/files/supercollider-3.8.0-no-opengl.patch
new file mode 100644
index 000000000000..15e19d8dee60
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.8.0-no-opengl.patch
@@ -0,0 +1,45 @@
+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
new file mode 100644
index 000000000000..ee4bf52d010b
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.8.0-no-qtpositioning.patch
@@ -0,0 +1,40 @@
+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
new file mode 100644
index 000000000000..b9099b971eee
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.8.0-no-qtsensors.patch
@@ -0,0 +1,55 @@
+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.8.0.ebuild b/media-sound/supercollider/supercollider-3.8.0-r1.ebuild
index 172e0129d89a..d5199f592ce1 100644
--- a/media-sound/supercollider/supercollider-3.8.0.ebuild
+++ b/media-sound/supercollider/supercollider-3.8.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils readme.gentoo-r1
+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/"
@@ -16,38 +16,54 @@ IUSE="avahi cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 j
 REQUIRED_USE="^^ ( jack portaudio )"
 RESTRICT="mirror"
 
-# Both alsa and readline will be automatically checked in cmake but
-# there are no options for these. Thus the functionality cannot be
-# controlled through USE flags. Therefore hard-enabled.
 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? ( media-sound/jack-audio-connection-kit )
+	jack? ( virtual/jack )
 	portaudio? ( media-libs/portaudio )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
-		dev-qt/qtpositioning:5
-		dev-qt/qtsensors: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 )
-	wiimote? ( app-misc/cwiid )"
+	wiimote? ( app-misc/cwiid )
+"
 DEPEND="${RDEPEND}
 	dev-libs/icu
 	virtual/pkgconfig
 	emacs? ( virtual/emacs )
 	gedit? ( app-editors/gedit )
-	vim? ( app-editors/vim )"
+	qt5? (
+		dev-qt/linguist-tools:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtconcurrent:5
+	)
+	vim? ( app-editors/vim )
+"
 
 S="${WORKDIR}/SuperCollider-Source"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-no-opengl.patch
+	"${FILESDIR}"/${P}-no-qtsensors.patch
+	"${FILESDIR}"/${P}-no-qtpositioning.patch
+	"${FILESDIR}"/${P}-multilib.patch
+	"${FILESDIR}"/${P}-gcc-7.patch
+	"${FILESDIR}"/${P}-desktop.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
-		AUDIOAPI=$(usex jack jack portaudio)
+		-DAUDIOAPI=$(usex jack jack portaudio)
 		-DINSTALL_HELP=ON
 		-DNATIVE=ON
 		-DSYSTEM_BOOST=OFF
@@ -58,6 +74,7 @@ src_configure() {
 		-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)
@@ -92,4 +109,12 @@ pkg_postinst() {
 	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
 }