gentoo resync : 06.01.2018

6 files changed, 314 insertions, 0 deletions

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)