gentoo resync : 29.06.2020

9 files changed, 295 insertions, 460 deletions

diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index c75a63ad07fc..f57612684910 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -1,7 +1,7 @@
-AUX supercollider-3.10.2-boost-1.67.patch 1521 BLAKE2B 0e63a18647b85cede59cf8dcda9f9834122f7cc6cd0ebc6722aa94e55ae0f8e1d1cf68ad7a5ac05c0a43d993e10decae034e8d17b09c14caa31314a131b3ff9e SHA512 6e57040b2ab9df0ee9c64d72b95ed5cee2d9f6c76231ff36d72ea8662df1cd49f96cfde68e6ba76b0f15ef2a1d9c78386fd886fcfc337630e47a9d35d036d7b1
-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
-DIST SuperCollider-3.10.2-Source-linux.tar.bz2 11366481 BLAKE2B d01324ed65f7e8977c138709471e7b9000b1d05ce4c1c0ff83c9ca0ae6e3948b4933320c382b64ecd2aebc65597c963c9348dda09a8c2ec7bc2ea5a14473fe44 SHA512 f7d136cb03e32dfd0b72e36047deaa24d5edfac0f7e9eeaac35f8e991cd52b00db0701478e0daefb24bfbbc55b5cf240e3f3429fd46caa8d76daa21c7aebaf46
-EBUILD supercollider-3.10.2.ebuild 3050 BLAKE2B 7ff85b0ed811d3dff6e264fe37581a18999ffe932ad2ba80b1f54e8cf44790a67505c0a5e8fe3d1a860178ff3f8e626958b431253f4fcecb552d9764049c74fe SHA512 3aba6aab63e0de30b25c0ea2cdb1cd773d4bad6dd05dce71ba1a06ee6c6441da40c1c0ab9aaae891705ad68f169c2b6eb36f35090a4a686c9c70906ea9ed4efb
-MISC metadata.xml 840 BLAKE2B 261014eccb171924a9a70a4972d9ea1cb9ad36f6ac2b7ecb40ebc2eee59d535871957109e239b90500d26073769cf58cd475cf221af0d2caf42033a2e0e56911 SHA512 a8ce15c95e8b04624301b814156ebe84195071b2ec80b223444c733e8b4de8137d4d70397f3a84d2894bdc635fff5d15ba66a9409749c02b3f3acb40d9479895
+AUX supercollider-3.11.0-boost-1.72.patch 1830 BLAKE2B b9a9f358199de97865fc0d8a2e55af2b3312797faa1cde25a2f7d110abf5dc7c14d755f4d2e21e99e1aba28cd0ebe96fa4bb15a190454745181c998ed6033b7f SHA512 cac02e7041dfd233a3624d1772a805bcb58a702195f0e4470f62e68834e494ca51b4719ba328c9de88669ae1b9dae5eb5bcc0bd162df12c6c5ea80829207bfb6
+AUX supercollider-3.11.0-fewer-qt-deps.patch 4412 BLAKE2B 433a51ca1e6b537811392891bec8f4de5aa289473c733c78567d4dddb3c5bc1b2b36c8a8f79222f2a70aa3eb6f0908b20d1cae5e87a9a57c1e56e3725b3787cf SHA512 742b4991c3402acb70ad731d4c535bea9671916360b9e0f17c6611359c1488c23599b613c4a0ff4846a74a55a7af7b5848865998bb4ebae4b0a4944f9caa892c
+AUX supercollider-3.11.0-qt-5.15.patch 2709 BLAKE2B ec9fd1241d6a5c244716434e0b1b44528f7c55a29dc9df09b47099685f5453e708edec6f106af9282ab31034bd1aa8f8e73c359e0228bbd9d63dc85ed41b4ddf SHA512 d26ae878b83f6cd5c7eca29893954bda1dd0adf70252e074f218851d931c97bd7b9aa6fd3ca9234ed7e7f0a52e26a28ad77ba3d5d08a7dee37bed2313d22a9b8
+DIST SuperCollider-3.11.0-Source.tar.bz2 18125654 BLAKE2B f73f2a75a132a4c3a3010ab093929a7aa6a1b534fe70115acd336a22ac8c6482ab6aef93c01f5d738bdd4504c75b1461dc555af9fdab8de8b16bd68a6854336f SHA512 64fef4d751436337baf40ced068a496d3e9221f751dcde7bfc2857a79c094764dff814d1c0cf519380053ddcfdb2c3f2b8eb787d3cff03e522c19fd95951b1da
+EBUILD supercollider-3.11.0.ebuild 3173 BLAKE2B acc717d7b2ed67113d1b088092af7e07382d0f2498d2328add2a3507aa8d71ee10b13d4650b9587f7da13590addd1934f7a23e53142048dcc66d855363f9820c SHA512 53ed68c6a543537de6d6fe5191496ba383f5f62d175652cb35a8e6fe5383efc741d8bf7d5ad4cacf27fedcc98375059a7b8e5e23cdc1fc86e752cf855974065f
+MISC metadata.xml 1118 BLAKE2B f73fdd5fe30a105f5e408c713ec865322da87a1961d91a22d7689b217a3867e98a327f4a1f6db39c527b103a11ef3b624067baf3e380794cd412f58908c519bf SHA512 31731d66bcabc0a2227b89d769159c1b0c936c9a512e082780e71d4531dd9eed9be3e0d05859b92e84d8a8281a129151aa7ead133181c298f121e7fb1a54671f
diff --git a/media-sound/supercollider/files/supercollider-3.10.2-boost-1.67.patch b/media-sound/supercollider/files/supercollider-3.10.2-boost-1.67.patch
deleted file mode 100644
index dd51d0b85d8d..000000000000
--- a/media-sound/supercollider/files/supercollider-3.10.2-boost-1.67.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From de567f9104af2b7b86d0de2f25eeb091a95e8579 Mon Sep 17 00:00:00 2001
-From: Tristan de Cacqueray <tristanC@wombatt.eu>
-Date: Sun, 9 Jun 2019 02:16:49 +0000
-Subject: [PATCH] Fix compilation with boost-1.67
-
-When using a system boost version >1.67, the compilation fails because of:
-server/supernova/./utilities/time_tag.hpp: In member function 'boost::posix_time::ptime nova::time_tag::to_ptime() const':
-supernova/./utilities/time_tag.hpp:232:102: error: no matching function for call to 'boost::date_time::subsecond_duration<boost::posix_time::time_duration, 1000000>::subsecond_duration(double)'
-  232 |         time_duration offset = seconds(get_secs() - ntp_offset) + microseconds(get_nanoseconds()/1000);
----
- server/supernova/utilities/time_tag.hpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/server/supernova/utilities/time_tag.hpp b/server/supernova/utilities/time_tag.hpp
-index 0f49955fd3..c1bb0e73cb 100644
---- a/server/supernova/utilities/time_tag.hpp
-+++ b/server/supernova/utilities/time_tag.hpp
-@@ -179,7 +179,8 @@ class time_tag {
- #ifdef BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
-         time_duration offset = seconds(get_secs() - ntp_offset) + nanoseconds(get_nanoseconds());
- #else
--        time_duration offset = seconds(get_secs() - ntp_offset) + microseconds(get_nanoseconds()/1000);
-+        time_duration offset =
-+            seconds(get_secs() - ntp_offset) + microseconds(static_cast<long>(get_nanoseconds() / 1000));
- #endif
-         return ptime(base, offset);
-     }
diff --git a/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch b/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch
deleted file mode 100644
index 74fc05ac45cd..000000000000
--- a/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From ea95d667907e1c9d4ee3ad8b33b452d60059e3c8 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 16 Jul 2019 17:30:38 +0200
-Subject: [PATCH] Fix build with boost-1.70 (get_io_service() removed)
-
-Fixes https://github.com/supercollider/supercollider/issues/4490
-
----
- server/supernova/sc/sc_osc_handler.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/server/supernova/sc/sc_osc_handler.cpp b/server/supernova/sc/sc_osc_handler.cpp
-index 5116a1be8..8c2418b09 100644
---- a/server/supernova/sc/sc_osc_handler.cpp
-+++ b/server/supernova/sc/sc_osc_handler.cpp
-@@ -728,7 +728,7 @@ void sc_osc_handler::tcp_connection::handle_message() {
- 
- void sc_osc_handler::start_tcp_accept(void)
- {
--    tcp_connection::pointer new_connection = tcp_connection::create(tcp_acceptor_.get_io_service());
-+    tcp_connection::pointer new_connection = tcp_connection::create((boost::asio::io_context&)tcp_acceptor_.get_executor().context());
- 
-     tcp_acceptor_.async_accept(
-         new_connection->socket(),
--- 
-2.22.0
-
-From 53909b1ff2983442dd8d2fdeff6b4331767237f1 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 16 Jul 2019 17:47:44 +0200
-Subject: [PATCH] Fix build with boost-1.70 (missing checked_delete.hpp
- include)
-
-See also: https://www.boost.org/doc/libs/1_70_0/libs/core/doc/html/core/checked_delete.html
----
- server/supernova/utilities/utils.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/server/supernova/utilities/utils.hpp b/server/supernova/utilities/utils.hpp
-index 35b8ab5ad..a7c191f2d 100644
---- a/server/supernova/utilities/utils.hpp
-+++ b/server/supernova/utilities/utils.hpp
-@@ -23,6 +23,7 @@
- 
- #include <type_traits>
- 
-+#include <boost/checked_delete.hpp>
- #include <boost/intrusive_ptr.hpp>
- #include <boost/noncopyable.hpp>
- #include <boost/detail/atomic_count.hpp>
--- 
-2.22.0
-
diff --git a/media-sound/supercollider/files/supercollider-3.10.2-system-boost.patch b/media-sound/supercollider/files/supercollider-3.10.2-system-boost.patch
deleted file mode 100644
index 93c8c4fc2ab5..000000000000
--- a/media-sound/supercollider/files/supercollider-3.10.2-system-boost.patch
+++ /dev/null
@@ -1,359 +0,0 @@
-diff --git c/CMakeLists.txt w/CMakeLists.txt
-index 063028774..a6b76f49b 100644
---- c/CMakeLists.txt
-+++ w/CMakeLists.txt
-@@ -253,20 +253,43 @@ if (NOT WIN32)
- endif()
- 
- if(SYSTEM_BOOST)
--  set(Boost_USE_MULTITHREADED      ON)
--  find_package( Boost 1.50.0 COMPONENTS  thread system filesystem program_options regex test_exec_monitor )
--endif()
--
--if (Boost_FOUND)
--	link_directories(${Boost_LIBRARY_DIRS})
-+    set(Boost_USE_MULTITHREADED ON)
-+    find_package( Boost 1.50.0 COMPONENTS  thread system filesystem program_options regex test_exec_monitor )
-+    if (Boost_FOUND)
-+        # we're specifically setting up the boost libraries here, so we can
-+        # name them
-+        add_library(boost_thread_lib SHARED IMPORTED)
-+        set_property(TARGET boost_thread_lib PROPERTY IMPORTED_LOCATION
-+          ${Boost_THREAD_LIBRARY})
-+        add_library(boost_system_lib SHARED IMPORTED)
-+        set_property(TARGET boost_system_lib PROPERTY IMPORTED_LOCATION
-+          ${Boost_SYSTEM_LIBRARY})
-+        add_library(boost_filesystem_lib SHARED IMPORTED)
-+        set_property(TARGET boost_filesystem_lib PROPERTY IMPORTED_LOCATION
-+          ${Boost_FILESYSTEM_LIBRARY})
-+        add_library(boost_program_options_lib SHARED IMPORTED)
-+        set_property(TARGET boost_program_options_lib PROPERTY
-+          IMPORTED_LOCATION ${Boost_PROGRAM_OPTIONS_LIBRARY})
-+        add_library(boost_regex_lib SHARED IMPORTED)
-+        set_property(TARGET boost_regex_lib PROPERTY IMPORTED_LOCATION
-+          ${Boost_REGEX_LIBRARY})
-+        add_library(boost_test_exec_monitor_lib SHARED IMPORTED)
-+        set_property(TARGET boost_test_exec_monitor_lib PROPERTY
-+          IMPORTED_LOCATION ${Boost_TEST_EXEC_MONITOR_LIBRARY})
-+        set(boost_include_dirs ${Boost_INCLUDE_DIRS})
-+    else()
-+        set(SYSTEM_BOOST OFF)
-+        set(boost_include_dirs ${CMAKE_SOURCE_DIR}/external_libraries/boost)
-+        message(WARNING "Not using system boost because none was found.")
-+    endif()
- else()
--	message(STATUS "building boost libraries manually")
-+    set(boost_include_dirs ${CMAKE_SOURCE_DIR}/external_libraries/boost)
- endif()
- 
- if(SYSTEM_YAMLCPP)
-   find_package(YamlCpp)
- else()
--  set(YAMLCPP_FOUND OFF)
-+  set(SYSTEM_YAMLCPP OFF)
- endif()
- 
- #############################################
-diff --git c/editors/sc-ide/CMakeLists.txt w/editors/sc-ide/CMakeLists.txt
-index 50059bc2f..8e48194fc 100644
---- c/editors/sc-ide/CMakeLists.txt
-+++ w/editors/sc-ide/CMakeLists.txt
-@@ -219,7 +219,6 @@ endif()
- include_directories(${CMAKE_SOURCE_DIR}/include/common)
- include_directories(${CMAKE_SOURCE_DIR}/common)
- include_directories(${CMAKE_SOURCE_DIR}/include/plugin_interface)
--include_directories(${CMAKE_SOURCE_DIR}/external_libraries/boost)
- include_directories(${YAMLCPP_INCLUDE_DIR})
- # For QtCollider headers:
- include_directories(${CMAKE_SOURCE_DIR})
-@@ -299,12 +298,8 @@ target_link_libraries( SuperCollider
-     oscpack
- )
- 
--if(Boost_FOUND)
--    target_link_libraries( SuperCollider ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} )
--else()
--    # in-house-built boost system
--    target_link_libraries( SuperCollider boost_system boost_filesystem )
--endif()
-+target_link_libraries( SuperCollider boost_system_lib boost_filesystem_lib)
-+include_directories(${boost_include_dirs})
- 
- if(APPLE)
-     target_link_libraries( ${ide_name} "-framework CoreServices -framework Foundation")
-diff --git c/external_libraries/CMakeLists.txt w/external_libraries/CMakeLists.txt
-index df33dc6f1..896ce6206 100644
---- c/external_libraries/CMakeLists.txt
-+++ w/external_libraries/CMakeLists.txt
-@@ -2,7 +2,8 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/nova-simd/vec.hpp)
- 	message(FATAL_ERROR "nova-simd submodule is missing: please run `git submodule init && git submodule update' from the toplevel of your git working tree")
- endif()
- 
--if(NOT Boost_FOUND) # we compile boost ourselves
-+if(NOT SYSTEM_BOOST) # we compile boost ourselves
-+	message(STATUS "Using bundled boost")
- 	# boost thread
- 	aux_source_directory(boost/libs/thread/src/ boost_thread_src )
- 
-@@ -14,66 +15,65 @@ if(NOT Boost_FOUND) # we compile boost ourselves
- 		message(SEND_ERROR "we need to implement boost_thread")
- 	endif()
- 
--	aux_source_directory(boost/libs/system/src/ boost_system )
--	add_library(boost_system STATIC EXCLUDE_FROM_ALL ${boost_system})
--	target_include_directories(boost_system PUBLIC boost)
-+	aux_source_directory(boost/libs/system/src/ boost_system_src )
-+	add_library(boost_system_lib STATIC EXCLUDE_FROM_ALL ${boost_system_src})
-+	target_include_directories(boost_system_lib PUBLIC boost)
- 
--	aux_source_directory(boost/libs/program_options/src/ boost_program_options )
--	add_library(boost_program_options STATIC EXCLUDE_FROM_ALL ${boost_program_options})
--	target_include_directories(boost_program_options PUBLIC boost)
-+	aux_source_directory(boost/libs/program_options/src/ boost_program_options_src )
-+	add_library(boost_program_options_lib STATIC EXCLUDE_FROM_ALL ${boost_program_options_src})
-+	target_include_directories(boost_program_options_lib PUBLIC boost)
- 
- 	aux_source_directory(boost/libs/filesystem/src boost_filesystem_src)
--	add_library(boost_filesystem STATIC EXCLUDE_FROM_ALL ${boost_filesystem_src})
--	target_include_directories(boost_filesystem PUBLIC boost)
-+	add_library(boost_filesystem_lib STATIC EXCLUDE_FROM_ALL ${boost_filesystem_src})
-+	target_include_directories(boost_filesystem_lib PUBLIC boost)
- 
- 	aux_source_directory(boost/libs/regex/src boost_regex_src)
--	add_library(boost_regex STATIC EXCLUDE_FROM_ALL ${boost_regex_src})
--	target_include_directories(boost_regex PUBLIC boost)
-+	add_library(boost_regex_lib STATIC EXCLUDE_FROM_ALL ${boost_regex_src})
-+	target_include_directories(boost_regex_lib PUBLIC boost)
- 
- 	if(LTO)
--		set_property(TARGET boost_program_options boost_system boost_filesystem
-+		set_property(TARGET boost_program_options_lib boost_system_lib boost_filesystem_lib
- 					 APPEND PROPERTY COMPILE_FLAGS "-flto -flto-report")
- 
--		set_property(TARGET boost_program_options boost_system boost_filesystem
-+		set_property(TARGET boost_program_options_lib boost_system_lib boost_filesystem_lib
- 					 APPEND PROPERTY LINK_FLAGS "-flto -flto-report")
- 	endif()
- 
--	add_library(boost_thread STATIC EXCLUDE_FROM_ALL ${boost_thread_src} ${boost_thread_platform})
--	target_link_libraries(boost_thread boost_system)
-+	add_library(boost_thread_lib STATIC EXCLUDE_FROM_ALL ${boost_thread_src} ${boost_thread_platform})
-+	target_link_libraries(boost_thread_lib boost_system_lib)
- #	target_compile_definitions(boost_thread PUBLIC BOOST_THREAD_DONT_PROVIDE_INTERRUPTIONS)
--	target_include_directories(boost_thread PUBLIC boost)
--	target_compile_definitions(boost_thread PUBLIC BOOST_THREAD_USE_LIB) # for win32
-+	target_include_directories(boost_thread_lib PUBLIC boost)
-+	target_compile_definitions(boost_thread_lib PUBLIC BOOST_THREAD_USE_LIB) # for win32
- 
- 	if(PTHREADS_FOUND)
--		target_include_directories(boost_thread PUBLIC ${PTHREADS_INCLUDE_DIR})
-+		target_include_directories(boost_thread_lib PUBLIC ${PTHREADS_INCLUDE_DIR})
- 	endif()
- 	if(WIN32)
--		target_compile_definitions( boost_thread PRIVATE BOOST_THREAD_BUILD_LIB)
-+		target_compile_definitions( boost_thread_lib PRIVATE BOOST_THREAD_BUILD_LIB)
- 	endif()
- 
- 
- 	if(CMAKE_SYSTEM_NAME MATCHES "Linux")
--		target_compile_options(boost_thread PRIVATE -fPIC)
--		target_link_libraries(boost_thread rt)
-+		target_compile_options(boost_thread_lib PRIVATE -fPIC)
-+		target_link_libraries(boost_thread_lib rt)
- 	endif()
- 
- 	if(LTO)
--		set_property(TARGET boost_thread
-+    set_property(TARGET boost_thread_lib
- 			APPEND PROPERTY COMPILE_FLAGS "-flto -flto-report")
- 
--		set_property(TARGET boost_thread
-+		set_property(TARGET boost_thread_lib
- 			APPEND PROPERTY LINK_FLAGS "-flto -flto-report")
- 	endif()
- 
- 	set_property( TARGET
--        boost_regex
--        boost_thread
--        boost_program_options
--        boost_system
--        boost_filesystem
-+        boost_regex_lib
-+        boost_thread_lib
-+        boost_program_options_lib
-+        boost_system_lib
-+        boost_filesystem_lib
-         PROPERTY FOLDER 3rdparty
-     )
--
- endif()
- 
- # tlsf
-@@ -84,10 +84,9 @@ set_property(TARGET tlsf PROPERTY POSITION_INDEPENDENT_CODE TRUE)
- 
- #oscpack
- add_library(oscpack STATIC EXCLUDE_FROM_ALL "oscpack_build.cpp")
--target_include_directories(oscpack PRIVATE boost)
-+target_include_directories(oscpack PRIVATE ${boost_include_dirs})
- target_include_directories(oscpack INTERFACE oscpack_1_1_0 )
- 
--
- if(LTO)
- 	set_property(TARGET oscpack tlsf
- 				 APPEND PROPERTY COMPILE_FLAGS "-flto -flto-report")
-@@ -96,15 +95,15 @@ if(LTO)
- 				 APPEND PROPERTY LINK_FLAGS "-flto -flto-report")
- endif()
- 
--if(NOT YAMLCPP_FOUND)
--  message(STATUS "using bundled libyaml-cpp")
-+if(NOT SYSTEM_YAMLCPP)
-+  message(STATUS "Using bundled yaml-cpp")
- 
-   # yaml-cpp
-   aux_source_directory(${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/src yaml_src)
-   CREATE_FINAL_FILE(${CMAKE_CURRENT_BINARY_DIR}/libyamlcpp.cpp ${yaml_src})
- 
-   add_library(yaml STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/libyamlcpp.cpp)
--  target_include_directories(yaml PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/include boost)
-+  target_include_directories(yaml PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/include ${boost_include_dirs})
-   set_property( TARGET yaml PROPERTY FOLDER 3rdparty )
-   set(YAMLCPP_LIBRARY yaml)
-   set(YAMLCPP_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/include)
-diff --git c/lang/CMakeLists.txt w/lang/CMakeLists.txt
-index c68b32fdc..593d91845 100644
---- c/lang/CMakeLists.txt
-+++ w/lang/CMakeLists.txt
-@@ -202,14 +202,8 @@ if(SC_HIDAPI)
-   endif()
- endif()
- 
--if (Boost_FOUND)
--	target_include_directories(libsclang PUBLIC ${Boost_INCLUDE_DIRS})
--	target_link_libraries(libsclang ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_REGEX_LIBRARY} ${Boost_FILESYSTEM_LIBRARY})
--else()
--	target_include_directories(libsclang PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/boost)
--	target_link_libraries(libsclang boost_regex boost_thread boost_system boost_filesystem)
--endif()
--
-+target_link_libraries(libsclang boost_thread_lib boost_system_lib boost_regex_lib boost_filesystem_lib)
-+target_include_directories(libsclang PUBLIC ${boost_include_dirs})
- 
- if (SCLANG_SERVER)
- 	target_link_libraries(libsclang libscsynth)
-diff --git c/server/CMakeLists.txt w/server/CMakeLists.txt
-index 2622b4e36..bf8dc863d 100644
---- c/server/CMakeLists.txt
-+++ w/server/CMakeLists.txt
-@@ -12,11 +12,7 @@ include_directories(${CMAKE_SOURCE_DIR}/external_libraries
- 					${CMAKE_SOURCE_DIR}/external_libraries/nova-tt
- 					)
- 
--if (Boost_FOUND)
--	include_directories(${Boost_INCLUDE_DIRS})
--else()
--	include_directories(${CMAKE_SOURCE_DIR}/external_libraries/boost)
--endif()
-+include_directories(${boost_include_dirs})
- 
- # here we choose who provides us with the FFT lib
- if (APPLE)
-diff --git c/server/plugins/CMakeLists.txt w/server/plugins/CMakeLists.txt
-index 8287f7be9..9a4db7be5 100644
---- c/server/plugins/CMakeLists.txt
-+++ w/server/plugins/CMakeLists.txt
-@@ -199,7 +199,7 @@ if (SUPERNOVA)
- 
- 		if(SNDFILE_FOUND)
- 			target_include_directories(DiskIO_UGens_supernova PUBLIC ${SNDFILE_INCLUDE_DIR})
--			target_link_libraries(DiskIO_UGens_supernova ${SNDFILE_LIBRARIES} ${PTHREADS_LIBRARY} ${MATH_LIBRARY} ${Boost_THREAD_LIBRARY})
-+      target_link_libraries(DiskIO_UGens_supernova ${SNDFILE_LIBRARIES} ${PTHREADS_LIBRARY} ${MATH_LIBRARY} boost_thread_lib)
- 			list(APPEND supernova_plugins DiskIO_UGens_supernova)
- 		else()
- 			message(SEND_ERROR "Cannot find libsndfile")
-@@ -217,7 +217,7 @@ endforeach()
- 
- if(NOT NO_X11)
- 	foreach(ugen ${uiugens})
--		target_link_libraries(${ugen} ${Boost_THREAD_LIBRARY})
-+    target_link_libraries(${ugen} boost_thread_lib)
- 	endforeach()
- endif()
- 
-diff --git c/server/scsynth/CMakeLists.txt w/server/scsynth/CMakeLists.txt
-index 17c09f262..3a7145841 100644
---- c/server/scsynth/CMakeLists.txt
-+++ w/server/scsynth/CMakeLists.txt
-@@ -176,11 +176,8 @@ elseif(AUDIOAPI STREQUAL coreaudio)
- 	target_link_libraries(libscsynth "-framework CoreAudio")
- endif()
- 
--if (Boost_FOUND)
--	target_link_libraries(libscsynth ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} )
--else()
--	target_link_libraries(libscsynth boost_system boost_filesystem)
--endif()
-+target_link_libraries(libscsynth boost_system_lib boost_filesystem_lib)
-+target_include_directories(libscsynth PUBLIC ${boost_include_dirs})
- 
- if (WIN32)
- 	target_link_libraries(libscsynth wsock32 ws2_32 winmm)
-diff --git c/server/supernova/CMakeLists.txt w/server/supernova/CMakeLists.txt
-index cfe128880..2b80cb545 100644
---- c/server/supernova/CMakeLists.txt
-+++ w/server/supernova/CMakeLists.txt
-@@ -70,7 +70,7 @@ if(NOT WIN32)
-                PROPERTY OUTPUT_NAME supernova)
- endif()
- 
--target_link_libraries(libsupernova oscpack tlsf ${PTHREADS_LIBRARIES} boost_thread)
-+target_link_libraries(libsupernova oscpack tlsf ${PTHREADS_LIBRARIES} boost_thread_lib)
- 
- target_compile_definitions(libsupernova PUBLIC SUPERNOVA)
- target_include_directories(libsupernova PUBLIC
-@@ -146,14 +146,8 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-     target_link_libraries(libsupernova rt)
- endif()
- 
--
--if(Boost_FOUND)
--    target_link_libraries(libsupernova ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
--    target_include_directories(libsupernova PUBLIC ${Boost_INCLUDE_DIRS})
--else()
--    target_include_directories(libsupernova PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/boost)
--    target_link_libraries(libsupernova boost_system boost_filesystem boost_program_options)
--endif()
-+target_link_libraries(libsupernova boost_system_lib boost_filesystem_lib boost_program_options_lib)
-+target_include_directories(libsupernova PUBLIC ${boost_include_dirs})
- 
- if(CMAKE_COMPILER_IS_GNUCXX)
-     if( ${_gcc_version} VERSION_GREATER 5 )
-diff --git c/testsuite/server/CMakeLists.txt w/testsuite/server/CMakeLists.txt
-index 38ce4b486..da19c2e5d 100644
---- c/testsuite/server/CMakeLists.txt
-+++ w/testsuite/server/CMakeLists.txt
-@@ -1,8 +1,8 @@
-+add_library(boost_test STATIC boost_test.cpp)
-+target_include_directories(boost_test PUBLIC ${boost_include_dirs})
-+
- add_subdirectory(scsynth)
--
- if (SUPERNOVA)
-   add_subdirectory(supernova)
- endif()
- 
--add_library(boost_test STATIC boost_test.cpp)
--target_include_directories(boost_test PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/boost)
-diff --git c/testsuite/server/supernova/CMakeLists.txt w/testsuite/server/supernova/CMakeLists.txt
-index e8a9ccf5f..4022da847 100644
---- c/testsuite/server/supernova/CMakeLists.txt
-+++ w/testsuite/server/supernova/CMakeLists.txt
-@@ -34,7 +34,7 @@ foreach(test ${simple_tests})
-   string(REPLACE .cpp "" test_name ${test} )
-   add_executable(${test_name} ${test})
- 
--  target_link_libraries(${test_name} libsupernova boost_test boost_thread)
-+  target_link_libraries(${test_name} libsupernova boost_test boost_thread_lib)
- 
-   add_test(${test_name}_run ${EXECUTABLE_OUTPUT_PATH}/${test_name})
- endforeach(test)
diff --git a/media-sound/supercollider/files/supercollider-3.11.0-boost-1.72.patch b/media-sound/supercollider/files/supercollider-3.11.0-boost-1.72.patch
new file mode 100644
index 000000000000..94329b867915
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.11.0-boost-1.72.patch
@@ -0,0 +1,45 @@
+From 43b2b27c14186a9a3eff917d7598751ed298ae20 Mon Sep 17 00:00:00 2001
+From: Hector Martin <marcan@marcan.st>
+Date: Sun, 31 May 2020 21:25:12 +0900
+Subject: [PATCH 2/2] Fix build with Boost 1.72.0
+
+---
+ .../include/boost/sync/detail/throw_exception.hpp           | 4 ----
+ external_libraries/oscpack_build.cpp                        | 6 +++---
+ 2 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/external_libraries/boost_sync/include/boost/sync/detail/throw_exception.hpp b/external_libraries/boost_sync/include/boost/sync/detail/throw_exception.hpp
+index b5fdfabf8..a7d7fa7b3 100755
+--- a/external_libraries/boost_sync/include/boost/sync/detail/throw_exception.hpp
++++ b/external_libraries/boost_sync/include/boost/sync/detail/throw_exception.hpp
+@@ -164,11 +164,7 @@ BOOST_NOINLINE BOOST_NORETURN void throw_exception(const char* func, const char*
+ 
+ #endif // !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+ 
+-#if !defined(BOOST_EXCEPTION_DISABLE)
+-#define BOOST_SYNC_DETAIL_HERE BOOST_THROW_EXCEPTION_CURRENT_FUNCTION, __FILE__, __LINE__
+-#else
+ #define BOOST_SYNC_DETAIL_HERE BOOST_CURRENT_FUNCTION, __FILE__, __LINE__
+-#endif
+ 
+ #define BOOST_SYNC_DETAIL_THROW_DEFAULT(ex)\
+     boost::sync::detail::throw_exception< ex >(BOOST_SYNC_DETAIL_HERE)
+diff --git a/external_libraries/oscpack_build.cpp b/external_libraries/oscpack_build.cpp
+index 3a658f3d3..1f6283d1c 100644
+--- a/external_libraries/oscpack_build.cpp
++++ b/external_libraries/oscpack_build.cpp
+@@ -1,8 +1,8 @@
+-#include <boost/detail/endian.hpp>
++#include <boost/predef.h>
+ 
+-#ifdef BOOST_LITTLE_ENDIAN
++#if BOOST_ENDIAN_LITTLE_BYTE
+ #define OSC_HOST_LITTLE_ENDIAN
+-#elif defined(BOOST_BIG_ENDIAN)
++#elif BOOST_ENDIAN_BIG_BYTE
+ #define OSC_HOST_BIG_ENDIAN
+ #else
+ #error please define endianness
+-- 
+2.26.2
+
diff --git a/media-sound/supercollider/files/supercollider-3.11.0-fewer-qt-deps.patch b/media-sound/supercollider/files/supercollider-3.11.0-fewer-qt-deps.patch
new file mode 100644
index 000000000000..8b1014d99919
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.11.0-fewer-qt-deps.patch
@@ -0,0 +1,126 @@
+From 5b655fbbf44ff5e67709667242a5feff707e1a51 Mon Sep 17 00:00:00 2001
+From: Hector Martin <marcan@marcan.st>
+Date: Mon, 1 Jun 2020 18:43:08 +0900
+Subject: [PATCH] Remove spurious Qt dependencies
+
+---
+ QtCollider/CMakeLists.txt     | 10 +++-------
+ QtCollider/widgets/QcCanvas.h |  2 --
+ README_LINUX.md               |  6 +++---
+ README_RASPBERRY_PI.md        |  2 +-
+ editors/sc-ide/CMakeLists.txt | 13 +++----------
+ 5 files changed, 10 insertions(+), 23 deletions(-)
+
+diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt
+index de38afb908..6b9437b9c0 100644
+--- a/QtCollider/CMakeLists.txt
++++ b/QtCollider/CMakeLists.txt
+@@ -7,19 +7,15 @@ option(SC_USE_QTWEBENGINE "Build with Qt WebEngine." ON)
+ set(
+   QT_COMPONENTS
+   Core
+-  Widgets
++  Gui
+   Network
+   PrintSupport
+-  OpenGL
+-  Quick
+-  Qml
+-  Sql
+   Svg
++  Widgets
+ )
+ 
+ set (QT_COLLIDER_LIBS
+-  Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::PrintSupport
+-  Qt5::Quick Qt5::Qml Qt5::Sql Qt5::OpenGL Qt5::Svg
++  Qt5::Core Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Svg Qt5::Widgets
+   ${MATH_LIBRARY})
+ 
+ if(SC_USE_QTWEBENGINE)
+diff --git a/QtCollider/widgets/QcCanvas.h b/QtCollider/widgets/QcCanvas.h
+index 3acb00fc23..ff230b8139 100644
+--- a/QtCollider/widgets/QcCanvas.h
++++ b/QtCollider/widgets/QcCanvas.h
+@@ -28,9 +28,7 @@
+ #include <QBasicTimer>
+ #include <QTime>
+ #include <QPalette>
+-#include <QGLWidget>
+ 
+-// using QcCanvasBase = QGLWidget;
+ using QcCanvasBase = QWidget;
+ 
+ class QcCanvas : public QcCanvasBase {
+diff --git a/README_LINUX.md b/README_LINUX.md
+index d5818e9106..532ad9cc5a 100644
+--- a/README_LINUX.md
++++ b/README_LINUX.md
+@@ -75,7 +75,7 @@ Depending on your Debian flavor and version, your distribution's PPA may be stuc
+ 
+ If this displays version 5.7 or later, installing Qt is easy:
+ 
+-    sudo apt-get install qt5-default qt5-qmake qttools5-dev qttools5-dev-tools qtdeclarative5-dev qtwebengine5-dev libqt5svg5-dev libqt5websockets5-dev
++    sudo apt-get install qt5-default qt5-qmake qttools5-dev qttools5-dev-tools qtwebengine5-dev libqt5svg5-dev libqt5websockets5-dev
+ 
+ If you are on Ubuntu 14.04 (Trusty) or 16.04 (Xenial), check the next section. Otherwise, you will have to use the official Qt installer. Sorry.
+ 
+@@ -87,13 +87,13 @@ On Xenial:
+ 
+     sudo apt-add-repository ppa:beineri/opt-qt-5.11.0-xenial
+     sudo apt-get update
+-    sudo apt-get install qt511base qt511location qt511declarative qt511tools qt511webchannel qt511xmlpatterns qt511svg qt511webengine qt511websockets
++    sudo apt-get install qt511base qt511location qt511tools qt511webchannel qt511xmlpatterns qt511svg qt511webengine qt511websockets
+ 
+ On Trusty, only Qt 5.10 and below are available:
+ 
+     sudo apt-add-repository ppa:beineri/opt-qt-5.10.1-trusty
+     sudo apt-get update
+-    sudo apt-get install qt510base qt510location qt510declarative qt510tools qt510webchannel qt510xmlpatterns qt510svg qt510webengine qt510websockets
++    sudo apt-get install qt510base qt510location qt510tools qt510webchannel qt510xmlpatterns qt510svg qt510webengine qt510websockets
+ 
+ [Stephan Binner's Launchpad PPAs]: https://launchpad.net/~beineri
+ 
+diff --git a/README_RASPBERRY_PI.md b/README_RASPBERRY_PI.md
+index 974ea1822c..aae8250388 100644
+--- a/README_RASPBERRY_PI.md
++++ b/README_RASPBERRY_PI.md
+@@ -42,7 +42,7 @@ Install required libraries:
+     # For GUI builds:
+     sudo apt-get install libjack-jackd2-dev libsndfile1-dev libasound2-dev libavahi-client-dev \
+         libreadline-dev libfftw3-dev libxt-dev libudev-dev cmake qttools5-dev qttools5-dev-tools \
+-        qtdeclarative5-dev libqt5svg5-dev qjackctl
++        qtbase5-dev libqt5svg5-dev qjackctl
+     # For GUI-less builds:
+     sudo apt-get install libsamplerate0-dev libsndfile1-dev libasound2-dev libavahi-client-dev \
+         libreadline-dev libfftw3-dev libudev-dev cmake git
+diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt
+index 1ee9ae4f43..6248668594 100644
+--- a/editors/sc-ide/CMakeLists.txt
++++ b/editors/sc-ide/CMakeLists.txt
+@@ -6,22 +6,15 @@ set(QT_IDE_COMPONENTS
+     Concurrent
+     Core
+     LinguistTools
+-    # OpenGL
+-    PrintSupport
+-    Qml
+-    Quick
+-    Sql
++    Network
+     Widgets
+ )
+ 
+ set(QT_IDE_LIBRARIES
+     Qt5::Concurrent
+     Qt5::Core
+-    # Qt5::OpenGL
+-    Qt5::PrintSupport
+-    Qt5::Qml
+-    Qt5::Quick
+-    Qt5::Sql
++    Qt5::Network
++    Qt5::Widgets
+ )
+ 
+ if(SC_USE_QTWEBENGINE)
diff --git a/media-sound/supercollider/files/supercollider-3.11.0-qt-5.15.patch b/media-sound/supercollider/files/supercollider-3.11.0-qt-5.15.patch
new file mode 100644
index 000000000000..37f803312c28
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-3.11.0-qt-5.15.patch
@@ -0,0 +1,89 @@
+From 244e55632cef86ecd363eb8df3f2352569f804f4 Mon Sep 17 00:00:00 2001
+From: Hector Martin <marcan@marcan.st>
+Date: Sun, 31 May 2020 21:24:52 +0900
+Subject: [PATCH 1/2] Fix build with Qt 5.15
+
+---
+ QtCollider/primitives/prim_QPen.cpp       | 1 +
+ QtCollider/widgets/QcGraph.cpp            | 1 +
+ QtCollider/widgets/QcLevelIndicator.cpp   | 1 +
+ QtCollider/widgets/QcMultiSlider.cpp      | 1 +
+ QtCollider/widgets/QcScopeShm.cpp         | 1 +
+ QtCollider/widgets/soundfileview/view.cpp | 1 +
+ 6 files changed, 6 insertions(+)
+
+diff --git a/QtCollider/primitives/prim_QPen.cpp b/QtCollider/primitives/prim_QPen.cpp
+index 8d531214d..4ba24519d 100644
+--- a/QtCollider/primitives/prim_QPen.cpp
++++ b/QtCollider/primitives/prim_QPen.cpp
+@@ -27,6 +27,7 @@
+ #include "PyrKernel.h"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QVector2D>
+ #include <QVector3D>
+ #include <cmath>
+diff --git a/QtCollider/widgets/QcGraph.cpp b/QtCollider/widgets/QcGraph.cpp
+index 70215ae94..79e71d1ad 100644
+--- a/QtCollider/widgets/QcGraph.cpp
++++ b/QtCollider/widgets/QcGraph.cpp
+@@ -24,6 +24,7 @@
+ #include "../style/routines.hpp"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMouseEvent>
+ #include <QApplication>
+ #include <QtCore/qmath.h>
+diff --git a/QtCollider/widgets/QcLevelIndicator.cpp b/QtCollider/widgets/QcLevelIndicator.cpp
+index 19c7d4874..8a60f354a 100644
+--- a/QtCollider/widgets/QcLevelIndicator.cpp
++++ b/QtCollider/widgets/QcLevelIndicator.cpp
+@@ -23,6 +23,7 @@
+ #include "../QcWidgetFactory.h"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ QC_DECLARE_QWIDGET_FACTORY(QcLevelIndicator);
+ 
+diff --git a/QtCollider/widgets/QcMultiSlider.cpp b/QtCollider/widgets/QcMultiSlider.cpp
+index 046b18739..381ddd404 100644
+--- a/QtCollider/widgets/QcMultiSlider.cpp
++++ b/QtCollider/widgets/QcMultiSlider.cpp
+@@ -26,6 +26,7 @@
+ #include <QApplication>
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ #include <cmath>
+ 
+diff --git a/QtCollider/widgets/QcScopeShm.cpp b/QtCollider/widgets/QcScopeShm.cpp
+index bb44623f4..edd38ef57 100644
+--- a/QtCollider/widgets/QcScopeShm.cpp
++++ b/QtCollider/widgets/QcScopeShm.cpp
+@@ -25,6 +25,7 @@
+ #include "../debug.h"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QTimer>
+ #include <QResizeEvent>
+ #include <QWindow>
+diff --git a/QtCollider/widgets/soundfileview/view.cpp b/QtCollider/widgets/soundfileview/view.cpp
+index a3eca811f..baba0b245 100644
+--- a/QtCollider/widgets/soundfileview/view.cpp
++++ b/QtCollider/widgets/soundfileview/view.cpp
+@@ -24,6 +24,7 @@
+ 
+ #include <QGridLayout>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QApplication>
+ #include <QPaintEvent>
+ #include <QCursor>
+-- 
+2.26.2
+
diff --git a/media-sound/supercollider/metadata.xml b/media-sound/supercollider/metadata.xml
index 8cd1323c9a04..4fbc15376707 100644
--- a/media-sound/supercollider/metadata.xml
+++ b/media-sound/supercollider/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marcan@marcan.st</email>
+		<name>Hector Martin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		SuperCollider is a platform for audio synthesis and algorithmic
 		composition, used by musicians, artists, and researchers
@@ -17,5 +24,6 @@
 		<flag name="gedit">Enable the SCED user interface</flag>
 		<flag name="gpl3">Build GPL-3 licensed code (recommended)</flag>
 		<flag name="server">Build with internal server</flag>
+		<flag name="webengine">Enable the internal help system using QtWebengine</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/supercollider/supercollider-3.10.2.ebuild b/media-sound/supercollider/supercollider-3.11.0.ebuild
index 94a5cc549598..3b3865ba3a00 100644
--- a/media-sound/supercollider/supercollider-3.10.2.ebuild
+++ b/media-sound/supercollider/supercollider-3.11.0.ebuild
@@ -7,14 +7,17 @@ inherit cmake 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"
+SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source.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 X zeroconf"
+IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim webengine X zeroconf"
 
-REQUIRED_USE="qt5? ( X )"
+REQUIRED_USE="
+	qt5? ( X )
+	webengine? ( qt5 )
+"
 
 BDEPEND="
 	virtual/pkgconfig
@@ -33,17 +36,17 @@ RDEPEND="
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
 		dev-qt/qtprintsupport:5
-		dev-qt/qtsql:5
 		dev-qt/qtsvg:5
-		dev-qt/qtwebchannel:5
-		dev-qt/qtwebengine:5[widgets]
-		dev-qt/qtwebsockets:5
 		dev-qt/qtwidgets:5
 	)
 	server? ( !app-admin/supernova )
 	sndfile? ( media-libs/libsndfile )
+	webengine? (
+		dev-qt/qtwebchannel:5
+		dev-qt/qtwebengine:5[widgets]
+		dev-qt/qtwebsockets:5
+	)
 	X? (
 		x11-libs/libX11
 		x11-libs/libXt
@@ -56,19 +59,18 @@ DEPEND="${RDEPEND}
 	gedit? ( app-editors/gedit )
 	qt5? (
 		dev-qt/qtconcurrent:5
-		dev-qt/qtdeclarative:5
 	)
 	vim? ( app-editors/vim )
 "
 
 PATCHES=(
-	"${FILESDIR}"/${P}-no-ccache.patch
-	"${FILESDIR}"/${P}-system-boost.patch
-	"${FILESDIR}"/${P}-boost-1.67.patch
-	"${FILESDIR}"/${P}-boost-1.70.patch
+	"${FILESDIR}"/${PN}-3.10.2-no-ccache.patch
+	"${FILESDIR}"/${P}-boost-1.72.patch # Upstream PR 4990
+	"${FILESDIR}"/${P}-qt-5.15.patch # Upstream PR 4986
+	"${FILESDIR}"/${P}-fewer-qt-deps.patch # Upstream PR 4991
 )
 
-S="${WORKDIR}/SuperCollider-Source"
+S="${WORKDIR}/SuperCollider-${PV}-Source"
 
 src_configure() {
 	local mycmakeargs=(
@@ -93,6 +95,10 @@ src_configure() {
 		-DNO_AVAHI=$(usex !zeroconf)
 	)
 
+	use qt5 && mycmakeargs+=(
+		-DSC_USE_QTWEBENGINE=$(usex webengine)
+	)
+
 	use debug && mycmakeargs+=(
 		-DSC_MEMORY_DEBUGGING=ON
 		-DSN_MEMORY_DEBUGGING=ON