gentoo resync : 30.06.2018

4 files changed, 129 insertions, 19 deletions

diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index fa46d65ae6b5..e6ea21ccd3b1 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -4,6 +4,8 @@ AUX supercollider-3.8.0-multilib.patch 3495 BLAKE2B 5c2ae8010c243966d01dfac3a38f
 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-r1.ebuild 3023 BLAKE2B 3e11c538d633f0d2c8a6baad934280051df1e298e029ef6634c025da1eaa3d5e395ad025ce179e9aa81ee638a2f163a65a85af011861877a5d16ae8c2b81dcfc SHA512 1e2e8523c8d53666f2b2ee72170f00add5bc7b5425836617b89fc1509dcb9291cb0c62516a2edf3b42da35a362bc9037fa5d25f97cd0cb3ff1ececbe6dac31e1
-MISC metadata.xml 910 BLAKE2B 3e574516ab8078203a112ee835fd37f25026103fcf7ff0425b05115c8b25eb72acc38e72a9b15802a90f05c31d6dcf21e8f4dcb5e7c1c07e7c9f0804101cfc90 SHA512 7afeb0ae7a5b92a5380a641e2cc93168c952680b61cc35c388bfa7163e172d12c6e2d236a5eaa1e9e126bda928e798a4519c8eb7821814cb6c0cca51075251c0
+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
+MISC metadata.xml 840 BLAKE2B 261014eccb171924a9a70a4972d9ea1cb9ad36f6ac2b7ecb40ebc2eee59d535871957109e239b90500d26073769cf58cd475cf221af0d2caf42033a2e0e56911 SHA512 a8ce15c95e8b04624301b814156ebe84195071b2ec80b223444c733e8b4de8137d4d70397f3a84d2894bdc635fff5d15ba66a9409749c02b3f3acb40d9479895
diff --git a/media-sound/supercollider/metadata.xml b/media-sound/supercollider/metadata.xml
index c2e47cdb26e0..8cd1323c9a04 100644
--- a/media-sound/supercollider/metadata.xml
+++ b/media-sound/supercollider/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 <!-- maintainer-needed -->
 	<longdescription>
-		SuperCollider is a platform for audio synthesis and algorithmic 
-		composition, used by musicians, artists, and researchers 
-		working with sound. It is free and open source software 
+		SuperCollider is a platform for audio synthesis and algorithmic
+		composition, used by musicians, artists, and researchers
+		working with sound. It is free and open source software
 		available for Windows, Mac OS X, and Linux.
 	</longdescription>
 	<upstream>
@@ -17,6 +17,5 @@
 		<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="wiimote">Build sclang with Wii Remote support</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/supercollider/supercollider-3.8.0-r1.ebuild b/media-sound/supercollider/supercollider-3.8.1.ebuild
index d5199f592ce1..07406d0c4346 100644
--- a/media-sound/supercollider/supercollider-3.8.0-r1.ebuild
+++ b/media-sound/supercollider/supercollider-3.8.1.ebuild
@@ -12,8 +12,7 @@ SRC_URI="https://github.com/supercollider/supercollider/releases/download/Versio
 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 +portaudio qt5 server +sndfile static-libs vim wiimote"
-REQUIRED_USE="^^ ( jack portaudio )"
+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="
@@ -24,7 +23,7 @@ RDEPEND="
 	avahi? ( net-dns/avahi )
 	fftw? ( sci-libs/fftw:3.0= )
 	jack? ( virtual/jack )
-	portaudio? ( media-libs/portaudio )
+	!jack? ( media-libs/portaudio )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -35,7 +34,6 @@ RDEPEND="
 	)
 	server? ( !app-admin/supernova )
 	sndfile? ( media-libs/libsndfile )
-	wiimote? ( app-misc/cwiid )
 "
 DEPEND="${RDEPEND}
 	dev-libs/icu
@@ -53,19 +51,18 @@ DEPEND="${RDEPEND}
 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
+	"${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
-		-DNATIVE=ON
 		-DSYSTEM_BOOST=OFF
 		-DSYSTEM_YAMLCPP=OFF
 		-DNO_AVAHI=$(usex !avahi)
@@ -82,7 +79,6 @@ src_configure() {
 		-DSC_ED=$(usex gedit)
 		-DSC_VIM=$(usex vim)
 		-DSC_EL=$(usex emacs)
-		-DSC_WII=$(usex wiimote)
 	)
 
 	use debug && mycmakeargs+=(
diff --git a/media-sound/supercollider/supercollider-3.9.3.ebuild b/media-sound/supercollider/supercollider-3.9.3.ebuild
new file mode 100644
index 000000000000..5ea861d111ba
--- /dev/null
+++ b/media-sound/supercollider/supercollider-3.9.3.ebuild
@@ -0,0 +1,113 @@
+# 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
+)
+
+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
+}