[proaudio] [2677] media-sound/supercollider: big update please test, version bump, remove old, eapi 5, cmake, new USE flags, update README.

[ Thread Index | Date Index | More lists.tuxfamily.org/proaudio Archives ]


Revision: 2677
Author:   lilrc
Date:     2013-04-19 23:41:33 +0200 (Fri, 19 Apr 2013)
Log Message:
-----------
media-sound/supercollider: big update please test, version bump, remove old, eapi 5, cmake, new USE flags, update README. Thanks to turion. Closes #0000162.

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/supercollider/ChangeLog
    trunk/overlays/proaudio/media-sound/supercollider/Manifest
    trunk/overlays/proaudio/media-sound/supercollider/metadata.xml
    trunk/overlays/proaudio/media-sound/supercollider/supercollider-99999999.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/supercollider/files/README.gentoo
    trunk/overlays/proaudio/media-sound/supercollider/supercollider-3.6.3.ebuild

Removed Paths:
-------------
    trunk/overlays/proaudio/media-sound/supercollider/files/70scel-gentoo.el
    trunk/overlays/proaudio/media-sound/supercollider/files/README-gentoo.txt
    trunk/overlays/proaudio/media-sound/supercollider/supercollider-3.3.1.ebuild
    trunk/overlays/proaudio/media-sound/supercollider/supercollider-3.4.3.ebuild

Modified: trunk/overlays/proaudio/media-sound/supercollider/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/supercollider/ChangeLog	2013-04-19 14:53:43 UTC (rev 2676)
+++ trunk/overlays/proaudio/media-sound/supercollider/ChangeLog	2013-04-19 21:41:33 UTC (rev 2677)
@@ -1,7 +1,25 @@
 # ChangeLog for media-sound/supercollider
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*supercollider-3.6.3 (19 Apr 2013)
+
+  19 Apr 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+  -files/70scel-gentoo.el, -supercollider-3.3.1.ebuild,
+  -supercollider-3.4.3.ebuild, +supercollider-3.6.3.ebuild,
+  supercollider-99999999.ebuild, +files/README.gentoo,
+  -files/README-gentoo.txt, metadata.xml:
+  Version bump and remove old ebuilds.
+  Move to EAPI 5.
+  Move to new build system; CMake.
+  Remove the special elisp file.
+  Add and remove USE flags and their descriptions.
+  Remove no-herd from metadata.
+  Rename and update the README-gentoo.txt (new name README.gentoo).
+  Depend on virtual/pkgconfig.
+  Thanks to turion for reporting this bug so that these deprecations could 
+  be spotted. Closes #0000162.
+
 *supercollider-3.4.3 (15 Jun 2011)
 
   15 Jun 2011; <willy@xxxxxxxxxx> +supercollider-3.4.3.ebuild, metadata.xml:

Modified: trunk/overlays/proaudio/media-sound/supercollider/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/supercollider/Manifest	2013-04-19 14:53:43 UTC (rev 2676)
+++ trunk/overlays/proaudio/media-sound/supercollider/Manifest	2013-04-19 21:41:33 UTC (rev 2677)
@@ -1,9 +1,6 @@
-AUX 70scel-gentoo.el 106 RMD160 e2de09b5378a1b0fe2dbd3cd61a3787c01e6e4da SHA1 8efd6732b118bff711cec662e238d93af745b32c SHA256 c3224e397bb8e9a0a57d709b9d2f99b9afce77e1df485e3ace8342d4c9cc3765
-AUX README-gentoo.txt 3246 RMD160 aabc84efe4d78e18d7a25ad65000f6d240835ce4 SHA1 2e2ce03562f30c08e645a81695bdb97379a023b4 SHA256 6f4ee95ecfe6cb2a19084e6c20c4fef71612d98bb698c7b11745d353e87d8edd
-DIST SuperCollider-3.3.1-Source-linux.tar.gz 4947164 RMD160 394893c026197d91d15c6f85a9f05a1a221b7d4f SHA1 f0a5f0ed6ebbdf0c87e049ceaf87759a66f24879 SHA256 004b9034748d5ca9ee20d50d567fd4c844f2a4c3d68797a1eb967bfc4bcf0f12
-DIST SuperCollider-3.4.3-Source-linux.tar.gz 5181623 RMD160 96bd48bea834e21687fdf3e9b28d29ce0eac6db1 SHA1 7acd69f46a95d4e348a868f9f7a119e325e93881 SHA256 1ae89a8ddfc6c46a3e8f8478367415b0bfe04a77c52a9c3428d72bb3d1b0a1bc
-EBUILD supercollider-3.3.1.ebuild 3516 RMD160 bf92ac12ea06d1073a74ca322841b2e00c9a9967 SHA1 1e754d16ec5ccd316d3b5f3f9e553f5c9e8b6bbb SHA256 ac5bc20724b82a844b25f323939b0436a2736b78779dd3033e72567db1cbc7ac
-EBUILD supercollider-3.4.3.ebuild 3372 RMD160 cbae4c634a73c1d1e2d7f4fec1fcdab2d6350743 SHA1 ca54a198926f037fafab57fc7d9177fde28abc39 SHA256 9de9e8555b71c1007cb42b926a7b1f958505c6b9051e8a81c849fb50a0d5f594
-EBUILD supercollider-99999999.ebuild 3501 RMD160 83720365931550d0a984e0399ed253592a12b968 SHA1 ed5df92a132ca951e95b991508b6009d713b6ddc SHA256 f21edeaca0538c04f21a1288d2ee5b3a726db8901ef1b93a57bb468f4118de06
-MISC ChangeLog 773 RMD160 93e23f4eec29814a01e4c02ccd96299a07dcc115 SHA1 879d2dc86feeada27b52a9df4cb4b866fd855788 SHA256 22d530cfcafb362d54580a2eb4670fbd438bde0c4b2f3070373f744623cdf3b0
-MISC metadata.xml 818 RMD160 2c8665830cd9e6d3ed40c4047c705fe7fea241b4 SHA1 2674a675749e72d68c916a65905fddaa2219803a SHA256 77f927c1fffe38c696ba38f840c49047a79dd5c8195697aa1b2596fa675b22ae
+AUX README.gentoo 2443 SHA256 a817a4b6fe4adb0184400f6b8b35b39b0af50378caa56fce603fddeb8deb52ee SHA512 e742739887866a49d5f814860b407f4cc1aba8f19b54de7c4cdaf99c40dd8af4de38c9e76d32f561b830ea772f06d50f7452a72a0c659a1079ff22bc2e85ad4f WHIRLPOOL 2ce1cc3ed5140e21746bf74cf23fc761fbe915adafa34e3d746c3d7544ee4090bd667c1865bdc6f1e7aeee2890f4cae2be6c53853df3d30122f7a768bf8ae2fe
+DIST SuperCollider-3.6.3-Source-linux.tar.bz2 7333680 SHA256 9bec4455d673f9a1ab687229a7246cfe85147ff184727efea7a1abdd32f91aac SHA512 8bd70c1525b1a7cb9cf2a065007f45c479df2eeffa28e92f3265502391ccfd886ad6b72d8fdf5a05e6dce74a77dfee7e8aca6568c997e615d02ca4557b88227f WHIRLPOOL 6ca9a34a588135c69d4f5cffc1569fd26450157055e4f47ce4b8c2e8ebdd8363a11245eff9b0a3e6093aea55d7c6996c0b2b9ea1a946e7c6e5a96cbaa26fb32f
+EBUILD supercollider-3.6.3.ebuild 3706 SHA256 ccd7818a0f81362e5167702f416dd1fb8cb520844d455f73b32b3406bda24786 SHA512 bd0f086f70b42fe73a3c75bdcf2b1bcd21423cfdf801331ced0f9322897abb99be51d8940d858eebb7e476f278534f5970d62cb42a2096d5f911a4aa76de9efa WHIRLPOOL f36c9ea3e816c11bf15a71dba94e46da3291e8ba08c0a069e4a5ef2543488fef99a386e08c392a3c4f02bc9aea523ddca3cce569e7f43bc1e0028e77c05f07c2
+EBUILD supercollider-99999999.ebuild 3596 SHA256 29a319a25515459869c0fd4303e6642b2f07ecf2685f9cb03baf205103f5c7cd SHA512 6919946c8d78f6edbbfce69a9b5f3d0c45254780383762f80c8a81b59d06ac6e003b5e12d0a753bc1dd0cd1e5ff821341761aced4482e82d25aee0c578dc55e4 WHIRLPOOL 8d9fe67c9c0df65238ea106d8f01a4c6d75c3bf90044c2e7144b9e9fdcdbb353d630016a5fb693f6ce9287abbc5f555e2f423e0581b21934a1fa2522065c6ec5
+MISC ChangeLog 1502 SHA256 671ab5fcae7049625ba677ba662b830e6da8b8ac39331dd70ac3ff9e95e34149 SHA512 8bea76ed99187e2c9b9f784f4699f7c9677ecca3e0b0af7767353e248d0d08343111c2dcd394acd79a572223acb7fd38927d27bf6baad3d58067718df0a486b4 WHIRLPOOL 034df4a7e6e56063bfda9e238c72a11cf9b76e70c6986bf0de191b755f60fe0b67ff4cab53b646f1cdee50ccefe7421e65299f157746610989dd018cc00790fb
+MISC metadata.xml 931 SHA256 adf9c574616ffcf93a1a39baccc67568243923daae19ea57db3e0d5dab2e890e SHA512 857a7454377edc2cdaa6be55a5bd94ef5acc43a7db1f99d1713500b178447a53504fc22997cf8beccf87360821ca8937d280603219c92c2922599fcafcd0c69e WHIRLPOOL c8513cf14875acd12f3bfe8c47e87b041013365000f575cbe1bb66c4be1dfcfdc671a2583ba64caab6ca26cc81acf553db7c7136eecffae3fba7ed36d2726592

Deleted: trunk/overlays/proaudio/media-sound/supercollider/files/70scel-gentoo.el
===================================================================
--- trunk/overlays/proaudio/media-sound/supercollider/files/70scel-gentoo.el	2013-04-19 14:53:43 UTC (rev 2676)
+++ trunk/overlays/proaudio/media-sound/supercollider/files/70scel-gentoo.el	2013-04-19 21:41:33 UTC (rev 2677)
@@ -1,4 +0,0 @@
-;;; supercollider site-lisp
-
-(add-to-list 'load-path "/usr/share/emacs/site-lisp/scel")
-(require 'sclang)

Deleted: trunk/overlays/proaudio/media-sound/supercollider/files/README-gentoo.txt
===================================================================
--- trunk/overlays/proaudio/media-sound/supercollider/files/README-gentoo.txt	2013-04-19 14:53:43 UTC (rev 2676)
+++ trunk/overlays/proaudio/media-sound/supercollider/files/README-gentoo.txt	2013-04-19 21:41:33 UTC (rev 2677)
@@ -1,85 +0,0 @@
-Testing SuperCollider Installation
-----------------------------------
-
-To make sure that the SuperCollider install is working properly:
-
- 1) Ensure that Jack is running ("jackd -d alsa")
- 2) Ensure that you're going to run these commands from a directory
-    which contains the subdirectories sounds/ and synthdefs/
-    (these directories can be initially empty)
- 3) execute the following command:
-      sclang @DOCBASE@/examples/onetwoonetwo.sc -
-
-If all goes well, you'll get some scrolling output, and then you'll
-hear a looping synth line.  If the sclang command just sits there after
-complaining about some error, hit Ctrl-C to get out of the loop and
-start reading through the various online docs or filing some bugs
-to see if you can find what the problem is.
-
-Emacs Support
--------------
-
-The online documentation seems to be largely of the opinion that emacs
-is the preferred interface for working with SuperCollider.  Since emacs
-support is optional, you must have emacs in your USE flags if you want
-to have emacs support compiled in.  To start up emacs in SCLang mode,
-first add the following line to ~/.emacs:
-
-	(require 'sclang)
-
-And then run emacs as "emacs -sclang"
-
-Configuration Files
--------------------
-
-The main configuration file which loads the various libraries that
-SuperCollider will use is located at /etc/supercollider/sclang.cfg
-Values from this file can be overridden in ~/.sclang.cfg, or in
-.sclang.cfg in the directory sclang is being run from.
-
-Another configuration file which controls how SuperCollider
-connects to Jack, among other miscellaneous functions, can be created
-as ~/.sclang.sc  -  Creating this file shouldn't be necessary, but an
-example is provided in @DOCBASE@/examples
-
-Running in General
-------------------
-
-Once again, it bears repeating that Jack *must* be running, and the
-program *must* be started from inside a directory which contains
-sounds/ and synthdefs/.  (Technically, you could alternatively start
-sclang with the "-d" option to select a different directory
-containing those two subdirs.)
-
-Other Documentation in This Directory
--------------------------------------
-Included in the SuperCollider source tree are quite a few .rtf files
-which seem to serve as documentation.  I'm not sure exactly how useful
-these files are, because they may pertain more to the GUI aspects of
-the older Mac versions of SuperCollider, but they're included in
-the install tree anyway.
-
-More Information
-----------------
-
-The Official SuperCollider Homepage
-http://www.audiosynth.com/
-This page may not actually provide too much help, because it's still
-geared for the Mac versions of SuperCollider, not the Linux versions.
-Still, it's the official page.
-
-SuperCollider Wiki
-http://swiki.hfbk-hamburg.de:8888/MusicTechnology/6
-This is a very informative Wiki devoted to running and developing
-SuperCollider.  Pages of particular interest here:
-
-  * http://swiki.hfbk-hamburg.de:8888/MusicTechnology/478
-    General SuperCollider-on-Linux information
-  
-  * http://swiki.hfbk-hamburg.de:8888/MusicTechnology/579
-    SuperCollider and Emacs
-
-SuperCollider Mailing List
-http://www.create.ucsb.edu/mailman/listinfo/sc-users
-Probably the best place to go for problems that aren't specifically
-Gentoo-related

Copied: trunk/overlays/proaudio/media-sound/supercollider/files/README.gentoo (from rev 2675, trunk/overlays/proaudio/media-sound/supercollider/files/README-gentoo.txt)
===================================================================
--- trunk/overlays/proaudio/media-sound/supercollider/files/README.gentoo	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/supercollider/files/README.gentoo	2013-04-19 21:41:33 UTC (rev 2677)
@@ -0,0 +1,66 @@
+Testing SuperCollider Installation
+----------------------------------
+
+To make sure that the SuperCollider install is working properly:
+
+ 1) Ensure that Jack is running ("jackd -d alsa")
+ 2) Ensure that you're going to run these commands from a directory
+    which contains the subdirectories sounds/ and synthdefs/
+    (these directories can be initially empty)
+ 3) Make sure you know where you have onetwoonetwo.sc, which will
+    usually reside in the documentations directory, usually
+    /usr/share/doc/supercollider-<VERSION>/. If it is compressed please
+    uncompress it somewhere.
+ 4) execute the following command, adjusting the path to onetwoonetwo.sc
+    of course:
+      sclang <path/to/onetwoonetwo.sc> -
+
+If all goes well, you'll get some scrolling output, and then you'll
+hear a looping synth line.  If the sclang command just sits there after
+complaining about some error, hit Ctrl-C to get out of the loop and
+start reading through the various online docs or filing some bugs
+to see if you can find what the problem is.
+
+Emacs Support
+-------------
+
+The online documentation seems to be largely of the opinion that emacs
+is the preferred interface for working with SuperCollider.  Since emacs
+support is optional, you must have emacs in your USE flags if you want
+to have emacs support compiled in.  To start up emacs in SCLang mode,
+first add the following line to ~/.emacs:
+
+	(require 'sclang)
+
+And then run emacs as "emacs -sclang"
+
+Running in General
+------------------
+
+Once again, it bears repeating that Jack *must* be running, and the
+program *must* be started from inside a directory which contains
+sounds/ and synthdefs/.  (Technically, you could alternatively start
+sclang with the "-d" option to select a different directory
+containing those two subdirs.)
+
+More Information
+----------------
+
+The Official SuperCollider Homepage
+http://supercollider.sourceforge.net
+
+SuperCollider Wiki
+http://swiki.hfbk-hamburg.de:8888/MusicTechnology/6
+This is a very informative Wiki devoted to running and developing
+SuperCollider.  Pages of particular interest here:
+
+  * http://swiki.hfbk-hamburg.de:8888/MusicTechnology/478
+    General SuperCollider-on-Linux information
+  
+  * http://swiki.hfbk-hamburg.de:8888/MusicTechnology/579
+    SuperCollider and Emacs
+
+SuperCollider Mailing List
+http://www.create.ucsb.edu/mailman/listinfo/sc-users
+Probably the best place to go for problems that aren't specifically
+Gentoo-related

Modified: trunk/overlays/proaudio/media-sound/supercollider/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/supercollider/metadata.xml	2013-04-19 14:53:43 UTC (rev 2676)
+++ trunk/overlays/proaudio/media-sound/supercollider/metadata.xml	2013-04-19 21:41:33 UTC (rev 2677)
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-	<herd>no-herd</herd>
 	<maintainer>
 		<email>proaudio@xxxxxxxxxxxxx</email>
 		<name>pro-audio overlay team</name>
 	</maintainer>
 	<use>
-		<flag name="devel">Build and install the development files</flag>
 		<flag name="emacs">Enable the SCEL user interface</flag>
 		<flag name="gedit">Enable the SCED user interface</flag>
-		<flag name="lang">Build the sclang interpreter</flag>
-		<flag name="lid">Build with Linux Input Device support</flag>
-		<flag name="rendezvous">Enable Zeroconf/Rendezvous</flag>
-		<flag name="strip">Strip symbols from binaries</flag>
+		<flag name="gpl3">Build GPL-3 licensed code (recommended)</flag>
+		<flag name="ide">Build QT IDE</flag>
+		<flag name="server">Build with internal server</flag>
+		<flag name="sse4">Enable SSE4 optimizations (both 4.1 and 4.2)</flag>
+		<flag name="system-boost">Use system-wide <pkg>dev-libs/boost</pkg> instead of bundled</flag>
+		<flag name="system-yaml">Use system-wide <pkg>dev-cpp/yaml-cpp</pkg> instead of bundled</flag>
 		<flag name="vim">Enable the SCVIM user interface</flag>
-		<flag name="wii">Build with Linux WII support</flag>
+		<flag name="wiimote">Build sclang with Wii Remote support</flag>
 	</use>
 </pkgmetadata>

Deleted: trunk/overlays/proaudio/media-sound/supercollider/supercollider-3.3.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/supercollider/supercollider-3.3.1.ebuild	2013-04-19 14:53:43 UTC (rev 2676)
+++ trunk/overlays/proaudio/media-sound/supercollider/supercollider-3.3.1.ebuild	2013-04-19 21:41:33 UTC (rev 2677)
@@ -1,124 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit elisp-common toolchain-funcs
-
-DESCRIPTION="An environment and a programming language for real time audio synthesis."
-HOMEPAGE="http://www.audiosynth.com http://supercollider.sourceforge.net";
-
-MY_PN="SuperCollider"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="mirror://sourceforge/${PN}/Source/${PV}/${MY_P}-Source-linux.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-# lid means linux input device support.
-IUSE="alsa debug devel emacs lid sse wii"
-#IUSE="alsa debug devel emacs gedit lid sse vim wii"
-
-RDEPEND=">=media-sound/jack-audio-connection-kit-0.100.0
-	media-libs/alsa-lib
-	>=media-libs/libsndfile-1.0.16
-	>=sci-libs/fftw-3.0"
-	#>=sys-libs/readline-5.0
-
-DEPEND="${RDEPEND}
-	sys-apps/sed
-	sys-devel/automake
-	dev-util/scons
-	emacs? ( virtual/emacs )
-	dev-util/pkgconfig
-	dev-util/scons"
-#	gedit? ( app-editors/gedit )
-#	vim? ( app-editors/vim )
-
-S="${WORKDIR}/${MY_PN}-Source"
-
-src_prepare() {
-	# Uncommenting a line per linux/examples/sclang.cfg.in
-	if ! use emacs; then
-		sed -ie "/#-@SC_LIB_DIR@\/Common\/GUI\/Document.sc/s/^#//" \
-			"${S}/linux/examples/sclang.cfg.in" ||
-			die "sed failed."
-	else
-		sed -e "/elisp_dir = os.path.join(INSTALL_PREFIX/s/site-lisp')/site-lisp','scel')/" \
-		-i "${S}/SConstruct" ||
-		die "modifying elisp installdir failed."
-	fi
-
-	# remove strange rpath
-#	sed -e "/LINKFLAGS = /s/'-Wl,-rpath,build -Wl/'-Wl, -rpath -Wl/" -i "${S}/SConstruct" ||
-#		die "fix rpath failed."
-}
-
-src_compile() {
-	myconf=""
-	! use alsa; myconf="${myconf} ALSA=$?"
-	! use debug; myconf="${myconf} DEBUG=$?"
-	! use devel; myconf="${myconf} DEVELOPMENT=$?"
-#	! use gedit; myconf="${myconf} SCED=$?"
-	! use emacs; myconf="${myconf} SCEL=$?"
-	! use lid;  myconf="${myconf} LID=$?"
-	! use sse; myconf="${myconf} SSE=$?"
-#	! use vim; myconf="${myconf} SCVIM=$?"
-	! use wii; myconf="${myconf} WII=$?"
-#	if use sse ;then
-#		myconf="${myconf} SSE=yes \
-#			CUSTOMCCFLAGS=-I$(dirname $(gcc-config -X)) \
-#			CUSTOMCXXFLAGS=-I$(dirname $(gcc-config -X))"
-#	fi
-#	if use pentium4 ;then
-#		myconf="${myconf} OPT_ARCH=pentium4"
-#	fi
-
-	myconf="${myconf} CROSSCOMPILE="1" READLINE="0""
-	myconf="${myconf} AUDIOAPI="jack""
-
-	tc-export CC CXX
-	myconf="${myconf} CC="${CC}" CXX="${CXX}""
-
-	mkdir -p "${D}"
-	einfo "${myconf}"
-	#CCFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-	scons CUSTOMCCFLAGS="${CFLAGS}" CUSTOMCXXFLAGS="${CXXFLAGS}" \
-		PREFIX="/usr" DESTDIR="${D}" \
-	 	${myconf} || die "scons failed."
-}
-
-src_install() {
-	# Main install
-	scons  install
-
-	# Install our config file
-	insinto /etc/supercollider
-	doins linux/examples/sclang.cfg
-
-	# Documentation
-	mv "README LINUX" "README-linux"
-	mv editors/scel/README editors/scel/README-scel
-	dodoc README-linux editors/scel/README-scel
-
-	# Our documentation
-	sed -e "s:@DOCBASE@:/usr/share/doc/${PF}:" < "${FILESDIR}/README-gentoo.txt" | gzip > "${D}/usr/share/doc/${PF}/README-gentoo.txt.gz"
-
-	# Example files (don't gzip)
-	insinto /usr/share/doc/${PF}/examples
-	doins linux/examples/onetwoonetwo.sc linux/examples/sclang.sc
-
-	use emacs && elisp-site-file-install "${FILESDIR}/70scel-gentoo.el"
-}
-
-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 /usr/share/doc/${PF}/README-gentoo.txt.gz"
-	einfo
-}

Deleted: trunk/overlays/proaudio/media-sound/supercollider/supercollider-3.4.3.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/supercollider/supercollider-3.4.3.ebuild	2013-04-19 14:53:43 UTC (rev 2676)
+++ trunk/overlays/proaudio/media-sound/supercollider/supercollider-3.4.3.ebuild	2013-04-19 21:41:33 UTC (rev 2677)
@@ -1,106 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit elisp-common toolchain-funcs scons-utils
-
-DESCRIPTION="An environment and a programming language for real time audio synthesis."
-HOMEPAGE="http://www.audiosynth.com http://supercollider.sourceforge.net";
-
-MY_PN="SuperCollider"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="mirror://sourceforge/${PN}/Source/${PV}/${MY_P}-Source-linux.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-# lid means linux input device support.
-IUSE="alsa altivec curl debug devel emacs fftw gedit jack lang lid portaudio readline rendezvous sse sse2 strip vim wii X"
-
-RDEPEND=">=media-sound/jack-audio-connection-kit-0.100.0
-	media-libs/alsa-lib
-	>=media-libs/libsndfile-1.0.16
-	fftw? ( >=sci-libs/fftw-3.0 )
-	readline? ( >=sys-libs/readline-5.0 )
-	portaudio? ( media-libs/portaudio )"
-
-DEPEND="${RDEPEND}
-	sys-apps/sed
-	sys-devel/automake
-	dev-util/scons
-	emacs? ( virtual/emacs )
-	lang? ( dev-libs/icu )
-	dev-util/pkgconfig
-	dev-util/scons
-	gedit? ( app-editors/gedit )
-	vim? ( app-editors/vim )"
-
-S="${WORKDIR}/${MY_PN}-Source/common"
-
-#src_prepare() {
-	# Uncommenting a line per linux/examples/sclang.cfg.in
-#	if ! use emacs; then
-#		sed -ie "/#-@SC_LIB_DIR@\/Common\/GUI\/Document.sc/s/^#//" \
-#			"${S}/linux/examples/sclang.cfg.in" ||
-#			die "sed failed."
-#	else
-#		sed -e "/elisp_dir = os.path.join(INSTALL_PREFIX/s/site-lisp')/site-lisp','scel')/" \
-#		-i "${S}/SConstruct" ||
-#		die "modifying elisp installdir failed."
-#	fi
-
-	# remove strange rpath
-#	sed -e "/LINKFLAGS = /s/'-Wl,-rpath,build -Wl/'-Wl, -rpath -Wl/" -i "${S}/SConstruct" ||
-#		die "fix rpath failed."
-#}
-
-src_compile() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-
-	escons CUSTOMCCFLAGS="${CFLAGS}" CUSTOMCXXFLAGS="${CXXFLAGS}" \
-		PREFIX="/usr" DESTDIR="${D}" \
-		$(use_scons alsa ALSA) $(use_scons altivec ALTIVEC) $(use_scons curl CURL) \
-		$(use_scons jack AUDIOAPI jack) $(use_scons readline READLINE) \
-		$(use_scons debug DEBUG) $(use_scons devel DEVELOPMENT) $(use_scons fftw FFTW) \
-		$(use_scons lang LANG) $(use_scons lid LID) $(use_scons wii WII) \
-		$(use_scons rendezvous RENDEZVOUS) $(use_scons emacs SCEL) $(use_scons vim SCVIM) \
-		$(use_scons gedit SCED) $(use_scons sse SSE) $(use_scons sse2 SSE2) \
-		$(use_scons X X11) $(use_scons strip STRIP) || die "compilation failed"
-}
-
-src_install() {
-	# Main install
-	escons install || die "instal failed"
-
-	# Install our config file
-	insinto /etc/supercollider
-	doins linux/examples/sclang.cfg
-
-	# Documentation
-	mv "README LINUX" "README-linux"
-	mv editors/scel/README editors/scel/README-scel
-	dodoc README-linux editors/scel/README-scel
-
-	# Our documentation
-	sed -e "s:@DOCBASE@:/usr/share/doc/${PF}:" < "${FILESDIR}/README-gentoo.txt" | gzip > "${D}/usr/share/doc/${PF}/README-gentoo.txt.gz"
-
-	# Example files (don't gzip)
-	insinto /usr/share/doc/${PF}/examples
-	doins linux/examples/onetwoonetwo.sc linux/examples/sclang.sc
-
-	use emacs && elisp-site-file-install "${FILESDIR}/70scel-gentoo.el"
-}
-
-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 /usr/share/doc/${PF}/README-gentoo.txt.gz"
-	einfo
-}

Copied: trunk/overlays/proaudio/media-sound/supercollider/supercollider-3.6.3.ebuild (from rev 2675, trunk/overlays/proaudio/media-sound/supercollider/supercollider-3.4.3.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-sound/supercollider/supercollider-3.6.3.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/supercollider/supercollider-3.6.3.ebuild	2013-04-19 21:41:33 UTC (rev 2677)
@@ -0,0 +1,118 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+inherit cmake-utils eutils exteutils versionator
+
+MY_PN="SuperCollider"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="An environment and a programming language for real time audio synthesis."
+HOMEPAGE="http://supercollider.sourceforge.net";
+SRC_URI="mirror://sourceforge/${PN}/Source/$(get_version_component_range 1-2)/${MY_P}-Source-linux.tar.bz2"
+
+RESTRICT="mirror"
+
+LICENSE="GPL-2 gpl3? ( GPL-3 )"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="+avahi coreaudio curl debug doc emacs +fftw gedit +gpl3 ide jack portaudio qt4 server +sndfile sse sse4 static-libs system-boost system-yaml test vim wiimote"
+REQUIRED_USE="
+	ide? ( qt4 )
+	^^ ( coreaudio jack portaudio )"
+
+# Both alsa and readline will be automatically checked in cmake but
+# there are no options for theese. Thus the functionality cannot be
+# controlled through USE flags. Therefore hard-enabled.
+RDEPEND=">=media-sound/jack-audio-connection-kit-0.100.0
+	media-libs/alsa-lib
+	>=sys-libs/readline-5.0
+	x11-libs/libXt
+	avahi? ( net-dns/avahi )
+	fftw? ( >=sci-libs/fftw-3.0 )
+	portaudio? ( media-libs/portaudio )
+	qt4? (
+		>=dev-qt/qtcore-4.7
+		>=dev-qt/qtgui-4.7
+		>=dev-qt/qtwebkit-4.7
+	)
+	sndfile? ( >=media-libs/libsndfile-1.0.16 )
+	system-boost? ( dev-libs/boost )
+	system-yaml? ( dev-cpp/yaml-cpp )
+	wiimote? ( app-misc/cwiid )"
+DEPEND="${RDEPEND}
+	dev-libs/icu
+	virtual/pkgconfig
+	emacs? ( virtual/emacs )
+	gedit? ( app-editors/gedit )
+	vim? ( app-editors/vim )"
+
+S="${WORKDIR}/${MY_PN}-Source"
+
+DOCS=( AUTHORS README_LINUX.txt "${FILESDIR}/README.gentoo" )
+
+pkg_pretend() {
+	if use test; then
+		ewarn "You are trying to install ${PN} with tests enabled. This will most"
+		ewarn "probably fail. However, if it succeeds please let us know at"
+		ewarn "proaudio@xxxxxxxxxxxxxxxxxxx. Please also do contact us if you know how"
+		ewarn "to get the tests working."
+	fi
+}
+
+src_prepare() {
+	esed_check -i -e "s|SuperCollider|${PF}|" "${S}/platform/linux/CMakeLists.txt"
+}
+
+src_configure() {
+	use debug && CMAKE_BUILD_TYPE="Debug"
+	local mycmakeargs=(
+		$(cmake-utils_use_no avahi AVAHI)
+		$(cmake-utils_use curl CURL)
+		$(cmake-utils_use debug SC_MEMORY_DEBUGGING)
+		$(cmake-utils_use debug SN_MEMORY_DEBUGGING)
+		$(cmake-utils_use debug GC_SANITYCHECK)
+		$(cmake-utils_use doc INSTALL_HELP)
+		$(cmake-utils_use emacs SC_EL)
+		$(cmake-utils_use !fftw FFT_GREEN)
+		$(cmake-utils_use gedit SC_ED)
+		$(cmake-utils_use_no gpl3 GPL3)
+		$(cmake-utils_use ide SC_IDE)
+		$(cmake-utils_use_no sndfile SNDFILE)
+		$(cmake-utils_use qt4 SC_QT)
+		$(cmake-utils_use server SCLANG_SERVER)
+		$(cmake-utils_use sse SSE)
+		$(cmake-utils_use sse4 SSE41)
+		$(cmake-utils_use sse4 SSE42)
+		$(cmake-utils_use !static-libs LIBSCSYNTH)
+		$(cmake-utils_use system-boost SYSTEM_BOOST)
+		$(cmake-utils_use system-yaml SYSTEM_YAMLCPP)
+		$(cmake-utils_use test ENABLE_TESTSUITE)
+		$(cmake-utils_use vim SC_VIM)
+		$(cmake-utils_use wiimote SC_WII)
+	)
+	use coreaudio && mycmakeargs+=( "AUDIOAPI=coreaudio" )
+	use jack && mycmakeargs+=( "AUDIOAPI=jack" )
+	use portaudio && mycmakeargs+=( "AUDIOAPI=portaudio" )
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use emacs && newdoc editors/scel/README README.emacs
+	use gedit && newdoc editors/sced/README README.gedit
+	use vim && newdoc editors/scvim/README README.vim
+}
+
+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 /usr/share/doc/${PF}/README.gentoo"
+	einfo
+}

Modified: trunk/overlays/proaudio/media-sound/supercollider/supercollider-99999999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/supercollider/supercollider-99999999.ebuild	2013-04-19 14:53:43 UTC (rev 2676)
+++ trunk/overlays/proaudio/media-sound/supercollider/supercollider-99999999.ebuild	2013-04-19 21:41:33 UTC (rev 2677)
@@ -1,118 +1,105 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="5"
 
-inherit elisp-common subversion
+inherit cmake-utils eutils exteutils git-2 versionator
 
-ESVN_REPO_URI="http://supercollider.svn.sourceforge.net/svnroot/supercollider/trunk";
-#ESVN_STORE_DIR="${DISTDIR}/svn-src"
-#ESVN_FETCH_CMD="svn checkout"
-#ESVN_UPDATE_CMD="svn update"
-#ESVN_PROJECT="${PN/-svn}"
-#ESVN_BOOTSTRAP="autogen.sh"
-#ESVN_PATCHES=""
-
 DESCRIPTION="An environment and a programming language for real time audio synthesis."
-HOMEPAGE="http://www.audiosynth.com http://supercollider.sourceforge.net";
-SRC_URI=""
+HOMEPAGE="http://supercollider.sourceforge.net";
+EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
+EGIT_HAS_SUBMODULES="1"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 gpl3? ( GPL-3 )"
 SLOT="0"
 KEYWORDS=""
 
-# lid means linux input device support.
-IUSE="sse emacs lid devel debug wii alsa"
+IUSE="+avahi coreaudio curl debug doc emacs +fftw gedit +gpl3 ide jack portaudio qt4 server +sndfile sse sse4 static-libs system-boost system-yaml test vim wiimote"
+REQUIRED_USE="
+	ide? ( qt4 )
+	^^ ( coreaudio jack portaudio )"
 
+# Both alsa and readline will be automatically checked in cmake but
+# there are no options for theese. Thus the functionality cannot be
+# controlled through USE flags. Therefore hard-enabled.
 RDEPEND=">=media-sound/jack-audio-connection-kit-0.100.0
 	media-libs/alsa-lib
-	>=media-libs/libsndfile-1.0.16
-	>=sci-libs/fftw-3.0"
-	#>=sys-libs/readline-5.0
-
+	>=sys-libs/readline-5.0
+	x11-libs/libXt
+	avahi? ( net-dns/avahi )
+	fftw? ( >=sci-libs/fftw-3.0 )
+	portaudio? ( media-libs/portaudio )
+	qt4? (
+		>=dev-qt/qtcore-4.7
+		>=dev-qt/qtgui-4.7
+		>=dev-qt/qtwebkit-4.7
+	)
+	sndfile? ( >=media-libs/libsndfile-1.0.16 )
+	system-boost? ( dev-libs/boost )
+	system-yaml? ( dev-cpp/yaml-cpp )
+	wiimote? ( app-misc/cwiid )"
 DEPEND="${RDEPEND}
-	sys-apps/sed
-	sys-devel/automake
-	dev-util/scons
+	dev-libs/icu
+	virtual/pkgconfig
 	emacs? ( virtual/emacs )
-	dev-util/pkgconfig
-	dev-util/scons"
+	gedit? ( app-editors/gedit )
+	vim? ( app-editors/vim )"
 
-src_prepare() {
-	# Uncommenting a line per linux/examples/sclang.cfg.in
-	if ! use emacs; then
-		sed -e "/#-@SC_LIB_DIR@\/Common\/GUI\/Document.sc/s/^#//" \
-			-i "${S}/linux/examples/sclang.cfg.in" ||
-			die "sed failed."
-	else
-		sed -e "/elisp_dir = os.path.join(INSTALL_PREFIX/s/site-lisp')/site-lisp','scel')/" \
-		-i "${S}/common/SConstruct" ||
-		die "modifying elisp installdir failed."
+DOCS=( AUTHORS README_LINUX.txt "${FILESDIR}/README.gentoo" )
+
+pkg_pretend() {
+	if use test; then
+		ewarn "You are trying to install ${PN} with tests enabled. This will most"
+		ewarn "probably fail. However, if it succeeds please let us know at"
+		ewarn "proaudio@xxxxxxxxxxxxxxxxxxx. Please also do contact us if you know how"
+		ewarn "to get the tests working."
 	fi
+}
 
-	# remove strange rpath
-	sed -e "/LINKFLAGS = /s/'-Wl,-rpath,build', '-Wl/'-Wl/" -i "${S}/common/SConstruct" ||
-		die "fix rpath failed."
+src_prepare() {
+	esed_check -i -e "s|SuperCollider|${PF}|" "${S}/platform/linux/CMakeLists.txt"
 }
 
-src_compile() {
-	myconf=""
-	! use alsa; myconf="${myconf} ALSA=$?"
-	! use debug; myconf="${myconf} DEBUG=$?"
-	! use wii; myconf="${myconf} WII=$?"
-	! use sse; myconf="${myconf} SSE=$?"
-	! use lid;  myconf="${myconf} LID=$?"
-	! use devel; myconf="${myconf} DEVELOPMENT=$?"
-	! use emacs; myconf="${myconf} SCEL=$?"
-#	if use sse ;then
-#		myconf="${myconf} SSE=yes \
-#			CUSTOMCCFLAGS=-I$(dirname $(gcc-config -X)) \
-#			CUSTOMCXXFLAGS=-I$(dirname $(gcc-config -X))"
-#	fi
-#	if use pentium4 ;then
-#		myconf="${myconf} OPT_ARCH=pentium4"
-#	fi
-
-	myconf="${myconf} CROSSCOMPILE="1" READLINE="0""
-	myconf="${myconf} AUDIOAPI="jack""
-
-	tc-export CC CXX
-	myconf="${myconf} CC="${CC}" CXX="${CXX}""
-
-	mkdir -p "${D}"
-	einfo "${myconf}"
-	#CCFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-	cd "${S}/common"
-	scons CUSTOMCCFLAGS="${CFLAGS}" CUSTOMCXXFLAGS="${CXXFLAGS}" \
-		PREFIX="/usr" DESTDIR="${D}" \
-	 	${myconf} || die "scons failed."
+src_configure() {
+	use debug && CMAKE_BUILD_TYPE="Debug"
+	local mycmakeargs=(
+		$(cmake-utils_use_no avahi AVAHI)
+		$(cmake-utils_use curl CURL)
+		$(cmake-utils_use debug SC_MEMORY_DEBUGGING)
+		$(cmake-utils_use debug SN_MEMORY_DEBUGGING)
+		$(cmake-utils_use debug GC_SANITYCHECK)
+		$(cmake-utils_use doc INSTALL_HELP)
+		$(cmake-utils_use emacs SC_EL)
+		$(cmake-utils_use !fftw FFT_GREEN)
+		$(cmake-utils_use gedit SC_ED)
+		$(cmake-utils_use_no gpl3 GPL3)
+		$(cmake-utils_use ide SC_IDE)
+		$(cmake-utils_use_no sndfile SNDFILE)
+		$(cmake-utils_use qt4 SC_QT)
+		$(cmake-utils_use server SCLANG_SERVER)
+		$(cmake-utils_use sse SSE)
+		$(cmake-utils_use sse4 SSE41)
+		$(cmake-utils_use sse4 SSE42)
+		$(cmake-utils_use !static-libs LIBSCSYNTH)
+		$(cmake-utils_use system-boost SYSTEM_BOOST)
+		$(cmake-utils_use system-yaml SYSTEM_YAMLCPP)
+		$(cmake-utils_use test ENABLE_TESTSUITE)
+		$(cmake-utils_use vim SC_VIM)
+		$(cmake-utils_use wiimote SC_WII)
+	)
+	use coreaudio && mycmakeargs+=( "AUDIOAPI=coreaudio" )
+	use jack && mycmakeargs+=( "AUDIOAPI=jack" )
+	use portaudio && mycmakeargs+=( "AUDIOAPI=portaudio" )
+	cmake-utils_src_configure
 }
 
 src_install() {
-	cd "${S}/common"
-	# Main install
-	scons  install
+	cmake-utils_src_install
 
-	# Install our config file
-	cd "${S}"
-	mv linux/examples/sclang.cfg.in linux/examples/sclang.cfg
-	insinto /etc/supercollider
-	doins linux/examples/sclang.cfg
-
-	# Documentation
-	mv "README LINUX" README-linux
-	mv editors/scel/README README-scel
-	dodoc README-linux README-scel
-
-	# Our documentation
-	sed -e "s:@DOCBASE@:/usr/share/doc/${PF}:" < "${FILESDIR}/README-gentoo.txt" | gzip > "${D}/usr/share/doc/${PF}/README-gentoo.txt.gz"
-
-	# Example files (don't gzip)
-	insinto /usr/share/doc/${PF}/examples
-	doins linux/examples/onetwoonetwo.sc linux/examples/sclang.sc
-
-	use emacs && elisp-site-file-install "${FILESDIR}/70scel-gentoo.el"
+	use emacs && newdoc editors/scel/README README.emacs
+	use gedit && newdoc editors/sced/README README.gedit
+	use vim && newdoc editors/scvim/README README.vim
 }
 
 pkg_postinst() {


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/