gentoo resync : 14.07.2018

6 files changed, 2 insertions, 296 deletions

diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index e6ea21ccd3b1..0277005ee19f 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -1,11 +1,6 @@
-AUX supercollider-3.8.0-desktop.patch 373 BLAKE2B a754375ae87cc47b62a4262b151f16800a9799f932669a095e1df0cbce693597fb35821a7c8d99a1816c7e7c432e25a2f7d19cb4af0dd3840f2f87a6ae7de9fd SHA512 be8a72fbf53cdcc7bccc073602457aa1f7d6c779077276dae0252f0379f62d923a588ba18d32cac4b1d48d46cd0a1799d95ccd0f9c8c1f73ed3f5188829ede93
-AUX supercollider-3.8.0-gcc-7.patch 2083 BLAKE2B 4e47c81c954136f6b8ba47f749755ccd8b61710ffa4442e93229dedbb4ae8f7b8d3d9559dbc1e253e34d9f550347940f8b437c68f27c3174069d79adf3ec16b6 SHA512 816f26d27fe98e716fae749bb1248d3b7022dcfa12e8de7450f40f2a6b9d7d89642ffe70b75b3340a93d34a2c8bafb0de9a3d7330d87f97027bc2ed534d73b99
-AUX supercollider-3.8.0-multilib.patch 3495 BLAKE2B 5c2ae8010c243966d01dfac3a38f5e73e1b8a5e4d4f12f11ffff1d8a701bb09fd278aba7126548219319ee65ff6814260f98cdc4194d7077d02b5c22bd476576 SHA512 9b6d7e878e71954d75fbb21c7a205a054187fb15b9e20d60bc5817281a926ffee702b6954701d1cdaab668201ad42674d7b17815b4c822a3b97ab2e799aac356
 AUX supercollider-3.8.0-no-opengl.patch 2146 BLAKE2B 0697fcad3f277072459d40675509b223e5b7e35d8ecd94e200817bceeea12e224201376c8db61b46159f8b18e3f27b28549458bdfc0793c994d17943ae4cb3b8 SHA512 33dabf5ce200b783d3c54e8ddbb1217d4d4269ae4b8f82627264737377c786fc049e6b9309b97ba06eced7e313d39a57129dea98915b4a0106a8f413b9e86fd2
 AUX supercollider-3.8.0-no-qtpositioning.patch 1840 BLAKE2B cf4ee13c08e81f3ae19d50b23f8416a5045bd60ab64f8b6c0903f40addf7701b30792f9d4de0c57f3b4f4b2b661eec19eb5b8faa520997b263215dfee6df5a8e SHA512 df86ee0e3c190283b9ed79a3bc4f1108ee0279c1d6f44bea6ffdeb7fc77b38163f2d9ab199b8124e2f06d436d68d217995b46c580740951e5e13cbd56618b635
 AUX supercollider-3.8.0-no-qtsensors.patch 2675 BLAKE2B 0fae3883eddbf2bc025e7dab0600915d3770e20c28fedc51522d1dff7e9b3fab2e4d920762b252d2af711ea4f2b010e8b532d90595c4594a757437cbc6a907ce SHA512 4574101c4c41522ebeb7a747f29734beec7a7d4eb0751d959718e0a040e1fb7fc76685d53e2cdf5e027ad91b7a0c7465714acc951bd4d4d8023145008f0b314c
-DIST SuperCollider-3.8.1-Source-linux.tar.bz2 8913640 BLAKE2B 998b64b7e3530f6dc2e5d329bf387bb62aa694ec65d9a8464ae2b3bc1816f6a6fb26f351465df58170034ba35d7afc5df545a9bd614e96e6434155c70715d0ce SHA512 50d9e65e8b610e86decc98ecfa5bef2088af6dc2436e5059e5aa66e8ce9b4f2dab23dd1c5231c08430d1c50b211c876e7860c0e2078d0500bf8de4fbb9554eb7
 DIST SuperCollider-3.9.3-Source-linux.tar.bz2 11060240 BLAKE2B 5da51bece13d2a3e4ca1ff6b79637122a46c1f590aa7e4ebf52d7a663506c6f4bae4f3d618bb7f947c73828402f329be68e435a4de2ecc092c312cb2c993742c SHA512 5b0c29941907d5ca45c1676e34184664c03891051bba0ee50d9e8311400824054de7b6daba6d29fd875ff38f42ee9654504ea2f0b5bf0a36ae9605e6a79a0841
-EBUILD supercollider-3.8.1.ebuild 2935 BLAKE2B 52699086a017a4f86b5aa0cd0a1aa624f149f6d3e81c2724c5878560c2c9d7c06f2a3d651fd20d303ab8aff4ec47d2c0dc890e1c93ede245b5de2e07ccadcd46 SHA512 8ddcca74f44990e3b0f65b345019500a80505004462980287cb4026f458a538f9e94ac3adddd5e359b842093d1d93bfd75563d5cf62640065c7e550a50a1c1d6
-EBUILD supercollider-3.9.3.ebuild 2813 BLAKE2B 4e458fd33e51fb320fa2c58a49abce501ef1fbe2157a5c3b3edcac030e260126e5fadcbe57e9402ec55cddaad08ca30635da9c9568cb023860c64d84a4522105 SHA512 c26560c21dfa079e937a1d798bdaf294222ddbea0184350311e0eda10a84e972065d496020b9f10e5a317ecdd5ea2eeb7c08c1a2645cf5b3ee71c16b4bc13809
+EBUILD supercollider-3.9.3-r1.ebuild 2830 BLAKE2B 0dff8c6d9b3cb9fc53f06c1b99cea728d7eee0aa4f6e2650a6551522199e65a6f207db87ea1d31d1165af9acd915eda1b3fca37953ef6e16e8473f6994fec187 SHA512 604f01e53eeefd9b70ab4582221cb66076d1c033bf74c04a44efddb01c9d28c4a38dfab43399a96347f4cfcb2232e66f2b1498a1367bcc693b8256bd646bb2c6
 MISC metadata.xml 840 BLAKE2B 261014eccb171924a9a70a4972d9ea1cb9ad36f6ac2b7ecb40ebc2eee59d535871957109e239b90500d26073769cf58cd475cf221af0d2caf42033a2e0e56911 SHA512 a8ce15c95e8b04624301b814156ebe84195071b2ec80b223444c733e8b4de8137d4d70397f3a84d2894bdc635fff5d15ba66a9409749c02b3f3acb40d9479895
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-desktop.patch b/media-sound/supercollider/files/supercollider-3.8.0-desktop.patch
deleted file mode 100644
index 2cf759881d05..000000000000
--- a/media-sound/supercollider/files/supercollider-3.8.0-desktop.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/editors/sc-ide/SuperColliderIDE.desktop	2016-08-22 11:12:21.000000000 +0300
-+++ b/editors/sc-ide/SuperColliderIDE.desktop	2017-10-31 18:26:58.520164204 +0300
-@@ -5,6 +5,5 @@ 
- Icon=sc_ide
- Type=Application
- Terminal=false
--Patterns=*.scd;*.sc;*.schelp
--Categories=Application;Multimedia;Audio;AudioVideo
-+Categories=X-Multimedia;Audio;AudioVideo
- MimeType=text/x-sc;
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-gcc-7.patch b/media-sound/supercollider/files/supercollider-3.8.0-gcc-7.patch
deleted file mode 100644
index 5f0269845b31..000000000000
--- a/media-sound/supercollider/files/supercollider-3.8.0-gcc-7.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 1eaa3fb3afbbf4708695a25361527a70e2d7a02d Mon Sep 17 00:00:00 2001
-From: Brian Heim <brianlheim@gmail.com>
-Date: Tue, 4 Jul 2017 13:26:00 -0400
-Subject: [PATCH] DiskIO_UGens: include <functional>
-
-std::bind is in <functional> according to the C++ ISO standard, and
-gcc7.1 enforces this.
----
- server/plugins/DiskIO_UGens.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/server/plugins/DiskIO_UGens.cpp b/server/plugins/DiskIO_UGens.cpp
-index 47c91a139..d4bb1c51c 100644
---- a/server/plugins/DiskIO_UGens.cpp
-+++ b/server/plugins/DiskIO_UGens.cpp
-@@ -28,6 +28,7 @@
- 
- #include <atomic>
- #include <new>
-+#include <functional>
- #include <SC_Lock.h>
- 
- #include <boost/lockfree/queue.hpp>
--- 
-2.15.1
-
-From a891e7d5be4c4944970973cc8467485e8a4c0571 Mon Sep 17 00:00:00 2001
-From: Adrian Bunk <bunk@debian.org>
-Date: Thu, 7 Sep 2017 19:38:46 -0300
-Subject: [PATCH] PyrSched.cpp: #include <functional> to fix FTBFS
-
-Bug-Debian: https://bugs.debian.org/853671
----
- lang/LangPrimSource/PyrSched.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lang/LangPrimSource/PyrSched.cpp b/lang/LangPrimSource/PyrSched.cpp
-index 02f0c6264..63487a58e 100644
---- a/lang/LangPrimSource/PyrSched.cpp
-+++ b/lang/LangPrimSource/PyrSched.cpp
-@@ -37,6 +37,7 @@
- #include <string.h>
- #include <math.h>
- #include <limits>
-+#include <functional>
- 
- #if defined(__APPLE__) || defined(__linux__)
- # include <pthread.h>
--- 
-2.15.1
-
-From c058e16ff215b0b318abb3aa9ab4d47c0eeac877 Mon Sep 17 00:00:00 2001
-From: hlolli <hlolli@gmail.com>
-Date: Mon, 10 Jul 2017 18:32:22 +0200
-Subject: [PATCH] adding functional header in PyrSerialPrim.cpp
-
----
- lang/LangPrimSource/PyrSerialPrim.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lang/LangPrimSource/PyrSerialPrim.cpp b/lang/LangPrimSource/PyrSerialPrim.cpp
-index 3099598fe..5e2b40372 100644
---- a/lang/LangPrimSource/PyrSerialPrim.cpp
-+++ b/lang/LangPrimSource/PyrSerialPrim.cpp
-@@ -36,6 +36,7 @@
- #include <termios.h>
- #include <unistd.h>
- #include <boost/atomic.hpp>
-+#include <functional>
- 
- #include <stdexcept>
- #include <sstream>
--- 
-2.15.1
-
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-multilib.patch b/media-sound/supercollider/files/supercollider-3.8.0-multilib.patch
deleted file mode 100644
index 982e44a15a95..000000000000
--- a/media-sound/supercollider/files/supercollider-3.8.0-multilib.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 547a18c14dd45a22361f2ab495d14625862499e5 Mon Sep 17 00:00:00 2001
-From: Ferdinand Thiessen <rpm@fthiessen.de>
-Date: Sun, 5 Mar 2017 16:16:19 +0100
-Subject: [PATCH] cmake / linux: Allow setting LIB_SUFFIX to install libraries
- into lib64 etc.
-
----
- editors/sced/CMakeLists.txt      | 6 +++---
- server/plugins/CMakeLists.txt    | 2 +-
- server/scsynth/CMakeLists.txt    | 4 ++--
- server/supernova/server/main.cpp | 1 +
- 4 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/editors/sced/CMakeLists.txt b/editors/sced/CMakeLists.txt
-index 286d625fb..b304d4c07 100644
---- a/editors/sced/CMakeLists.txt
-+++ b/editors/sced/CMakeLists.txt
-@@ -14,10 +14,10 @@ if(NOT WIN32 AND SC_ED EQUAL 2)
-             DESTINATION share/gtksourceview-2.0/language-specs)
- 
-     install(FILES data/sced.gedit-plugin
--            DESTINATION lib/gedit-2/plugins)
-+            DESTINATION lib${LIB_SUFFIX}/gedit-2/plugins)
- 
-     install(DIRECTORY sced
--            DESTINATION lib/gedit-2/plugins)
-+            DESTINATION lib${LIB_SUFFIX}/gedit-2/plugins)
- 
- elseif(NOT WIN32 AND SC_ED EQUAL 3)
- 
-@@ -29,7 +29,7 @@ elseif(NOT WIN32 AND SC_ED EQUAL 3)
-             DESTINATION share/gtksourceview-3.0/language-specs)
- 
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sced3/supercollider.plugin sced3/supercollider.py
--            DESTINATION lib/gedit/plugins)
-+            DESTINATION lib${LIB_SUFFIX}/gedit/plugins)
- 
- elseif(WIN32)
- 
-diff --git a/server/plugins/CMakeLists.txt b/server/plugins/CMakeLists.txt
-index 52accc332..570f2e50b 100644
---- a/server/plugins/CMakeLists.txt
-+++ b/server/plugins/CMakeLists.txt
-@@ -301,7 +301,7 @@ elseif(APPLE)
- 
- else()
- 	install(TARGETS ${plugins} ${supernova_plugins}
--			DESTINATION "lib/SuperCollider/plugins"
-+			DESTINATION "lib${LIB_SUFFIX}/SuperCollider/plugins"
- 			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- endif()
- 
-diff --git a/server/scsynth/CMakeLists.txt b/server/scsynth/CMakeLists.txt
-index 1d99cad80..dbb92749b 100644
---- a/server/scsynth/CMakeLists.txt
-+++ b/server/scsynth/CMakeLists.txt
-@@ -150,7 +150,7 @@ elseif(NOT NO_LIBSNDFILE)
- endif(SNDFILE_FOUND)
- 
- if(UNIX AND NOT APPLE)
--	target_compile_definitions(libscsynth PUBLIC "SC_PLUGIN_DIR=\"${CMAKE_INSTALL_PREFIX}/lib/SuperCollider/plugins\"")
-+	target_compile_definitions(libscsynth PUBLIC "SC_PLUGIN_DIR=\"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/SuperCollider/plugins\"")
- endif()
- 
- 
-@@ -284,7 +284,7 @@ elseif(WIN32)
- else()
- 	install(TARGETS ${INSTALL_TARGETS}
- 			RUNTIME DESTINATION "bin"
--			LIBRARY DESTINATION "lib"
-+			LIBRARY DESTINATION "lib${LIB_SUFFIX}"
- 			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- endif()
- 
-diff --git a/server/supernova/server/main.cpp b/server/supernova/server/main.cpp
-index c0f603471..453355523 100644
---- a/server/supernova/server/main.cpp
-+++ b/server/supernova/server/main.cpp
-@@ -245,6 +245,7 @@ void set_plugin_paths(server_arguments const & args, nova::sc_ugen_factory * fac
-         const path home = resolve_home();
-         std::vector<path> folders = { "/usr/local/lib/SuperCollider/plugins",
-                                       "/usr/lib/SuperCollider/plugins",
-+                                      "/usr/lib64/SuperCollider/plugins",
-                                       home / "/.local/share/SuperCollider/Extensions",
-                                       home / "share/SuperCollider/plugins" };
- 
--- 
-2.15.1
-
diff --git a/media-sound/supercollider/supercollider-3.8.1.ebuild b/media-sound/supercollider/supercollider-3.8.1.ebuild
deleted file mode 100644
index 07406d0c4346..000000000000
--- a/media-sound/supercollider/supercollider-3.8.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="An environment and a programming language for real time audio synthesis."
-HOMEPAGE="https://supercollider.github.io/"
-SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source-linux.tar.bz2"
-
-LICENSE="GPL-2 gpl3? ( GPL-3 )"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="avahi cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim"
-RESTRICT="mirror"
-
-RDEPEND="
-	media-libs/alsa-lib
-	sys-libs/readline:0=
-	x11-libs/libX11
-	x11-libs/libXt
-	avahi? ( net-dns/avahi )
-	fftw? ( sci-libs/fftw:3.0= )
-	jack? ( virtual/jack )
-	!jack? ( media-libs/portaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5
-	)
-	server? ( !app-admin/supernova )
-	sndfile? ( media-libs/libsndfile )
-"
-DEPEND="${RDEPEND}
-	dev-libs/icu
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	gedit? ( app-editors/gedit )
-	qt5? (
-		dev-qt/linguist-tools:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtconcurrent:5
-	)
-	vim? ( app-editors/vim )
-"
-
-S="${WORKDIR}/SuperCollider-Source"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.8.0-no-opengl.patch
-	"${FILESDIR}"/${PN}-3.8.0-no-qtsensors.patch
-	"${FILESDIR}"/${PN}-3.8.0-no-qtpositioning.patch
-	"${FILESDIR}"/${PN}-3.8.0-multilib.patch
-	"${FILESDIR}"/${PN}-3.8.0-gcc-7.patch
-	"${FILESDIR}"/${PN}-3.8.0-desktop.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DAUDIOAPI=$(usex jack jack portaudio)
-		-DINSTALL_HELP=ON
-		-DSYSTEM_BOOST=OFF
-		-DSYSTEM_YAMLCPP=OFF
-		-DNO_AVAHI=$(usex !avahi)
-		-DFFT_GREEN=$(usex !fftw)
-		-DNO_GPL3=$(usex !gpl3)
-		-DNO_LIBSNDFILE=$(usex !sndfile)
-		-DSC_QT=$(usex qt5)
-		-DSCLANG_SERVER=$(usex server)
-		-DSUPERNOVA=$(usex server)
-		-DLIBSCSYNTH=$(usex !static-libs)
-		-DSSE=$(usex cpu_flags_x86_sse)
-		-DSSE2=$(usex cpu_flags_x86_sse2)
-		-DSC_IDE=$(usex qt5)
-		-DSC_ED=$(usex gedit)
-		-DSC_VIM=$(usex vim)
-		-DSC_EL=$(usex emacs)
-	)
-
-	use debug && mycmakeargs+=(
-		-DSC_MEMORY_DEBUGGING=ON
-		-DSN_MEMORY_DEBUGGING=ON
-		-DGC_SANITYCHECK=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use vim && newdoc editors/scvim/README.md README.vim
-	use emacs && newdoc editors/scel/README.md README.emacs
-	use gedit && newdoc editors/sced/README.md README.gedit
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Notice: SuperCollider is not very intuitive to get up and running."
-	einfo "The best course of action to make sure that the installation was"
-	einfo "successful and get you started with using SuperCollider is to take"
-	einfo "a look through ${EROOT%/}/usr/share/doc/${PF}/README.md.bz2"
-	einfo
-
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/supercollider/supercollider-3.9.3.ebuild b/media-sound/supercollider/supercollider-3.9.3-r1.ebuild
index 5ea861d111ba..af5984979652 100644
--- a/media-sound/supercollider/supercollider-3.9.3.ebuild
+++ b/media-sound/supercollider/supercollider-3.9.3-r1.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
 		dev-qt/qtgui:5
 		dev-qt/qtnetwork:5
 		dev-qt/qtprintsupport:5
+		dev-qt/qtsql:5
 		dev-qt/qtwebkit:5
 		dev-qt/qtwidgets:5
 	)