Apply emacs updates from bug 187470, thanks to Christian Faulhammer.

Package-Manager: portage-2.1.3.1

5 files changed, 150 insertions, 15 deletions

diff --git a/media-sound/supercollider/ChangeLog b/media-sound/supercollider/ChangeLog
index f9974a325f30..94aefec05eb7 100644
--- a/media-sound/supercollider/ChangeLog
+++ b/media-sound/supercollider/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/supercollider
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/supercollider/ChangeLog,v 1.10 2007/08/02 06:01:54 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/supercollider/ChangeLog,v 1.11 2007/08/03 17:05:52 drac Exp $
+
+*supercollider-20040903-r2 (03 Aug 2007)
+
+  03 Aug 2007; Samuli Suominen <drac@gentoo.org>
+  +files/50supercollider-gentoo.el, +supercollider-20040903-r2.ebuild:
+  Apply emacs updates from bug 187470, thanks to Christian Faulhammer.
 
   02 Aug 2007; Christian Faulhammer <opfer@gentoo.org>
   supercollider-20040903-r1.ebuild:
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index a8106fca4db3..538cbd0fd13d 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 50supercollider-gentoo.el 166 RMD160 fefea72c7128aa990d5a0bfe74c007dd618c5c12 SHA1 893baa2043b3642b62a40710d439c59962ad35a2 SHA256 b2e9fe0197a6a820f5fc22a79334ae248dc44b8dc428af54bfd835bb038ac820
+MD5 89b255fd77722658d1d4ba05c061b012 files/50supercollider-gentoo.el 166
+RMD160 fefea72c7128aa990d5a0bfe74c007dd618c5c12 files/50supercollider-gentoo.el 166
+SHA256 b2e9fe0197a6a820f5fc22a79334ae248dc44b8dc428af54bfd835bb038ac820 files/50supercollider-gentoo.el 166
 AUX README-gentoo.txt 3246 RMD160 aabc84efe4d78e18d7a25ad65000f6d240835ce4 SHA1 2e2ce03562f30c08e645a81695bdb97379a023b4 SHA256 6f4ee95ecfe6cb2a19084e6c20c4fef71612d98bb698c7b11745d353e87d8edd
 MD5 e0d010a09ea7addae1972ed480078139 files/README-gentoo.txt 3246
 RMD160 aabc84efe4d78e18d7a25ad65000f6d240835ce4 files/README-gentoo.txt 3246
@@ -14,14 +15,18 @@ EBUILD supercollider-20040903-r1.ebuild 3038 RMD160 2e6a5c96e3569046c3e30c8ebee9
 MD5 86724569b33a45c63e2962642384c4de supercollider-20040903-r1.ebuild 3038
 RMD160 2e6a5c96e3569046c3e30c8ebee9fc2817f76372 supercollider-20040903-r1.ebuild 3038
 SHA256 10c0930e50a30d915e76337318cec57be8ec9c89c8fceaec7cc4b85ae803ad1a supercollider-20040903-r1.ebuild 3038
+EBUILD supercollider-20040903-r2.ebuild 3305 RMD160 f7e2b0748a97cd3be0e78d4b3a4bdfc192819899 SHA1 452c3593c143275561d4d781f85e0da6b58c286c SHA256 45b1fbf1b92e246c45323a450e233db187ca20f857c7cc502198004a4ff53a43
+MD5 d1c6a9969d367bb87a1845a609cfbb61 supercollider-20040903-r2.ebuild 3305
+RMD160 f7e2b0748a97cd3be0e78d4b3a4bdfc192819899 supercollider-20040903-r2.ebuild 3305
+SHA256 45b1fbf1b92e246c45323a450e233db187ca20f857c7cc502198004a4ff53a43 supercollider-20040903-r2.ebuild 3305
 EBUILD supercollider-20040903.ebuild 2929 RMD160 149c1a98e2c795e331654d429bfcf3edbee99975 SHA1 8b9bf57ea02d1105f3d2fce308bad782e8ed959d SHA256 230e8b551b3ef48ea9d32301c822636457eab6c30250c3d7e5ecc95955cb3e63
 MD5 2c304637a67e4498d8922d4c128f3480 supercollider-20040903.ebuild 2929
 RMD160 149c1a98e2c795e331654d429bfcf3edbee99975 supercollider-20040903.ebuild 2929
 SHA256 230e8b551b3ef48ea9d32301c822636457eab6c30250c3d7e5ecc95955cb3e63 supercollider-20040903.ebuild 2929
-MISC ChangeLog 1666 RMD160 88f344b9a484d83703c0b5521522d801a1be4e60 SHA1 42c2b0a1b32409b3c86ba61a3e14d3bebc1e1862 SHA256 153cb7bb0134d0e1e8b6750bb89f45ba1653359994e3d92c6d12c1c9c4d30430
-MD5 fe2d8ddbeca16baddb674cf9179d402d ChangeLog 1666
-RMD160 88f344b9a484d83703c0b5521522d801a1be4e60 ChangeLog 1666
-SHA256 153cb7bb0134d0e1e8b6750bb89f45ba1653359994e3d92c6d12c1c9c4d30430 ChangeLog 1666
+MISC ChangeLog 1899 RMD160 c9bcbefe9156debdc863772cab5014cb94a23e57 SHA1 90c15ecc61636c0c30c08b589ab8cbd6fae971ed SHA256 0c12246e0d7856ebbe230a535f3a0d4e36c9b52926906669aa2eb2ae2c308bc8
+MD5 0cf3ce859a4c7cbaf3dfaf7414fec1c9 ChangeLog 1899
+RMD160 c9bcbefe9156debdc863772cab5014cb94a23e57 ChangeLog 1899
+SHA256 0c12246e0d7856ebbe230a535f3a0d4e36c9b52926906669aa2eb2ae2c308bc8 ChangeLog 1899
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -32,10 +37,6 @@ SHA256 03e14877cc25d81426052ecd4d6c7c4e56f65c05708d713d17bba7f6e97d8d50 files/di
 MD5 65472a99076ef1d81201dcf3d87b6d9d files/digest-supercollider-20040903-r1 262
 RMD160 b56df9dc794f779eab2ed0718846ef5958c567c5 files/digest-supercollider-20040903-r1 262
 SHA256 03e14877cc25d81426052ecd4d6c7c4e56f65c05708d713d17bba7f6e97d8d50 files/digest-supercollider-20040903-r1 262
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGsXNaNQqtfCuFneMRAg9OAJ0Y+mWWaXwOgUGJFCPb8jPDlzSIWACglj/N
-IXNvqETQR/5NlEy+zvNng8A=
-=Qf8o
------END PGP SIGNATURE-----
+MD5 65472a99076ef1d81201dcf3d87b6d9d files/digest-supercollider-20040903-r2 262
+RMD160 b56df9dc794f779eab2ed0718846ef5958c567c5 files/digest-supercollider-20040903-r2 262
+SHA256 03e14877cc25d81426052ecd4d6c7c4e56f65c05708d713d17bba7f6e97d8d50 files/digest-supercollider-20040903-r2 262
diff --git a/media-sound/supercollider/files/50supercollider-gentoo.el b/media-sound/supercollider/files/50supercollider-gentoo.el
new file mode 100644
index 000000000000..703f230ed545
--- /dev/null
+++ b/media-sound/supercollider/files/50supercollider-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; pspp site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'sclang-mode "sclang" nil t)
+(add-to-list 'auto-mode-alist '("\\.sc\\'" . sclang))
diff --git a/media-sound/supercollider/files/digest-supercollider-20040903-r2 b/media-sound/supercollider/files/digest-supercollider-20040903-r2
new file mode 100644
index 000000000000..72caae3cb2f0
--- /dev/null
+++ b/media-sound/supercollider/files/digest-supercollider-20040903-r2
@@ -0,0 +1,3 @@
+MD5 f148a95bbe4207d0768c91330ffa2493 supercollider-20040903.tgz 2381742
+RMD160 305ce210ddcf34b601d35730b944a6fbb71a0691 supercollider-20040903.tgz 2381742
+SHA256 342b10d454a9d06822bd0928728951bc824e3531dc60c4990905a74cf097a70e supercollider-20040903.tgz 2381742
diff --git a/media-sound/supercollider/supercollider-20040903-r2.ebuild b/media-sound/supercollider/supercollider-20040903-r2.ebuild
new file mode 100644
index 000000000000..b11e5ea7dcef
--- /dev/null
+++ b/media-sound/supercollider/supercollider-20040903-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/supercollider/supercollider-20040903-r2.ebuild,v 1.1 2007/08/03 17:05:52 drac Exp $
+
+inherit elisp-common eutils flag-o-matic
+
+DESCRIPTION="A real time audio synthesis programming language"
+HOMEPAGE="http://www.audiosynth.com"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE="emacs"
+
+RDEPEND="media-sound/jack-audio-connection-kit
+	 media-libs/alsa-lib
+	 media-libs/libsndfile"
+DEPEND="${RDEPEND}
+	sys-apps/sed
+	emacs? ( virtual/emacs )"
+
+S="${WORKDIR}"/SuperCollider3
+SITEFILE=50${PN}-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+
+	# Change default config file location from /etc to /etc/supercollider
+	sed -i -e "s:/etc/sclang.cfg:/etc/supercollider/sclang.cfg:" source/lang/LangSource/SC_LanguageClient.cpp
+	sed -i -e "s:/etc/sclang.cfg:/etc/supercollider/sclang.cfg:" linux/examples/sclang.cfg.in
+
+	# Change the ridiculous default scsynth location on sample ~/.scsynth.sc file
+	sed -i -e "s:/usr/local/music/bin/scsynth:/usr/bin/scsynth:" linux/examples/sclang.sc
+
+	# Uncommenting a line per linux/examples/sclang.cfg.in
+	if ! use emacs; then
+		sed -i -e \
+			"s:#-@SC_LIB_DIR@/Common/GUI/Document.sc:-@SC_LIB_DIR@/Common/GUI/Document.sc:"	\
+			linux/examples/sclang.cfg.in
+	fi
+
+	filter-ldflags -Wl,--as-needed --as-needed
+}
+
+src_compile() {
+	local myconf
+	if use emacs; then
+		myconf="${myconf} --enable-scel --with-lispdir="${SITELISP}/${PN}""
+	else
+		myconf="${myconf} --disable-scel"
+	fi
+
+	# Do the main compilation
+	./linux/bootstrap
+	econf ${myconf} || die
+	emake || die "emake failed."
+	cd "${S}"/linux/examples
+	emake sclang.cfg
+
+	# Also compile Emacs extensions if need be
+	if use emacs; then
+		cd "${S}"/linux/scel
+		emake || die "emake on skel failed."
+	fi
+}
+
+src_install() {
+	# Main install
+	einstall || die "einstall failed."
+
+	# Install our config file
+	insinto /etc/supercollider
+	doins linux/examples/sclang.cfg
+
+	# Documentation
+	mv linux/README linux/README-linux
+	mv linux/scel/README linux/scel/README-scel
+	dodoc linux/README-linux linux/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
+
+	# RTFs (don't gzip)
+	insinto /usr/share/doc/${PF}
+	doins doc/*.rtf changes.rtf
+
+	# Example files (don't gzip)
+	insinto /usr/share/doc/${PF}/examples
+	doins linux/examples/onetwoonetwo.sc linux/examples/sclang.sc
+
+	# Help files included with project (again, don't gzip)
+	cp -R "${S}"/build/Help "${D}"/usr/share/doc/${PF}
+
+	# Emacs installation
+	if use emacs; then
+		cd "${S}"/linux/scel
+		einstall lispdir="${D}/${SITELISP}/${PN}" || die "einstall on scel failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+}
+
+pkg_postinst() {
+	elog
+	elog "Notice: SuperCollider is not very intuitive to get up and running."
+	elog "The best course of action to make sure that the installation was"
+	elog "successful and get you started with using SuperCollider is to take"
+	elog "a look through /usr/share/doc/${PF}/README-gentoo.txt.gz"
+	elog
+	use emacs && elisp-site-regen
+}
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}