fix beta22 syntax-case support

Package-Manager: portage-2.1.2.7

3 files changed, 23 insertions, 20 deletions

diff --git a/dev-scheme/gambit/ChangeLog b/dev-scheme/gambit/ChangeLog
index a468dca218bf..6dd87d92f004 100644
--- a/dev-scheme/gambit/ChangeLog
+++ b/dev-scheme/gambit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-scheme/gambit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gambit/ChangeLog,v 1.4 2007/04/19 13:17:55 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gambit/ChangeLog,v 1.5 2007/05/10 15:19:57 hkbst Exp $
+
+  10 May 2007; Marijn Schouten <hkBst@gentoo.org> gambit-4.0_beta22.ebuild:
+  fix beta22 syntax-case support
 
 *gambit-4.0_beta22 (19 Apr 2007)
 
diff --git a/dev-scheme/gambit/Manifest b/dev-scheme/gambit/Manifest
index 80d3f8b87e7f..516acef1bff6 100644
--- a/dev-scheme/gambit/Manifest
+++ b/dev-scheme/gambit/Manifest
@@ -13,14 +13,14 @@ EBUILD gambit-4.0_beta20.ebuild 2580 RMD160 4651b310cbe753e21df2d308400e2186cc7d
 MD5 ae631ecfe3469e620997ba65ee8b3a5b gambit-4.0_beta20.ebuild 2580
 RMD160 4651b310cbe753e21df2d308400e2186cc7d3549 gambit-4.0_beta20.ebuild 2580
 SHA256 4962e1960f0a123553c08b9b5845c6b41c9ea11955d8c76bf4c3567d96b9d181 gambit-4.0_beta20.ebuild 2580
-EBUILD gambit-4.0_beta22.ebuild 2647 RMD160 c666967179df6c1b2cf697d3eb13957436fe6e7b SHA1 376362363d0edb5107cd025ac6a5e7e553ff6032 SHA256 c0a366c09a16d92d18efee7ec83c67773fb60c2b97925a4f5a2dc4ea0238c4ca
-MD5 3b5b3b89ab1d91e4bd6e99304a9a7658 gambit-4.0_beta22.ebuild 2647
-RMD160 c666967179df6c1b2cf697d3eb13957436fe6e7b gambit-4.0_beta22.ebuild 2647
-SHA256 c0a366c09a16d92d18efee7ec83c67773fb60c2b97925a4f5a2dc4ea0238c4ca gambit-4.0_beta22.ebuild 2647
-MISC ChangeLog 911 RMD160 de052f1fe7a73db79ab660567e05bab8ea6301a7 SHA1 4c42ca2b3ae494d7f984859050d40e9ae7173f5c SHA256 bfba4d8c1ac58f24b055ab12ee1f356c2210b3449a551f18c92bb5eaa948ecf1
-MD5 0ad3fbbf1d55391f3571d87eabd49cde ChangeLog 911
-RMD160 de052f1fe7a73db79ab660567e05bab8ea6301a7 ChangeLog 911
-SHA256 bfba4d8c1ac58f24b055ab12ee1f356c2210b3449a551f18c92bb5eaa948ecf1 ChangeLog 911
+EBUILD gambit-4.0_beta22.ebuild 2719 RMD160 2d6f533ce1e071d01dab5f2ebd5594f13f1ffd38 SHA1 b402e9dee3601359d413f2832c558351b49d4c13 SHA256 1d180eab29e17d177fe962f901761b756e329fc77c5e753ff8cede65d7c16282
+MD5 6f1f9ad8e678541e8c7253c2eb923a4e gambit-4.0_beta22.ebuild 2719
+RMD160 2d6f533ce1e071d01dab5f2ebd5594f13f1ffd38 gambit-4.0_beta22.ebuild 2719
+SHA256 1d180eab29e17d177fe962f901761b756e329fc77c5e753ff8cede65d7c16282 gambit-4.0_beta22.ebuild 2719
+MISC ChangeLog 1021 RMD160 e509418a3605ea148fe4efc0d3037681c281da1e SHA1 a7f6739177d28389535118733d9d4beb451e9e31 SHA256 a7c0ddfdc4d4970e7bd6fcd1b1103a16b138863547d84fee945a0836f138b736
+MD5 a6629e4febff307cba2bd07984ac7cfd ChangeLog 1021
+RMD160 e509418a3605ea148fe4efc0d3037681c281da1e ChangeLog 1021
+SHA256 a7c0ddfdc4d4970e7bd6fcd1b1103a16b138863547d84fee945a0836f138b736 ChangeLog 1021
 MISC metadata.xml 159 RMD160 de517ce4d7d6fd637855d92a257e2c94b8339f43 SHA1 f037b0d8dd3d592d04170d21a1a9b9c594541612 SHA256 61c7b86c8f64d194ff9e03f62b4007e0c69db2054d09e3ccdbbf6dbc0c78024b
 MD5 50b0f9698722324cfb463e8cb165fc87 metadata.xml 159
 RMD160 de517ce4d7d6fd637855d92a257e2c94b8339f43 metadata.xml 159
diff --git a/dev-scheme/gambit/gambit-4.0_beta22.ebuild b/dev-scheme/gambit/gambit-4.0_beta22.ebuild
index e800e42717c4..698f3a081cf3 100644
--- a/dev-scheme/gambit/gambit-4.0_beta22.ebuild
+++ b/dev-scheme/gambit/gambit-4.0_beta22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gambit/gambit-4.0_beta22.ebuild,v 1.1 2007/04/19 13:17:55 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gambit/gambit-4.0_beta22.ebuild,v 1.2 2007/05/10 15:19:57 hkbst Exp $
 
 inherit eutils elisp-common check-reqs autotools multilib
 
@@ -12,7 +12,7 @@ DESCRIPTION="Gambit-C is a native Scheme to C compiler and interpreter."
 HOMEPAGE="http://www.iro.umontreal.ca/~gambit/"
 SRC_URI="http://www.iro.umontreal.ca/~gambit/download/gambit/4.0/source/${MY_P}.tar.gz"
 
-LICENSE="Apache-2.0 LGPL-2.1"
+LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 
@@ -22,7 +22,7 @@ SITEFILE="50gambit-gentoo.el"
 
 S=${WORKDIR}/${MY_P}
 
-IUSE="emacs gcc-opts"
+IUSE="emacs macros gcc-opts"
 
 pkg_setup() {
 	if ! use gcc-opts; then
@@ -55,9 +55,10 @@ src_compile() {
 	fi
 
 	# uses lots of memory
-	if use gcc-opts; then
+	if use macros; then
 		einfo "compiling syntax-case.scm..."
-		LD_LIBRARY_PATH="lib/" GAMBCOPT="=." gsc/gsc misc/syntax-case.scm
+		einfo "(this may take some time and cause thrashing)"
+		time LD_LIBRARY_PATH="lib/" GAMBCOPT="=." gsc/gsc misc/syntax-case.scm
 	fi
 }
 
@@ -66,7 +67,7 @@ src_install() {
 
 	rm ${D}/usr/current
 
-	use gcc-opts && dolib syntax-case.*
+	use macros && dolib syntax-case.*
 	mv ${D}/usr/syntax-case.scm ${D}/usr/$(get_libdir)
 
 	# rename the /usr/bin/gsc to avoid collision with gsc from ghostscript
@@ -84,10 +85,9 @@ src_install() {
 	doins -r examples
 
 	# create some more explicit names
-	dosym gsc-gambit usr/bin/gambitsc
-	dosym gsi usr/bin/gambitsi
+	dosym gsc-gambit usr/bin/gambit-compiler
+	dosym gsi usr/bin/gambit-interpreter
 
-	dodir /etc/env.d/ && echo "GAMBCOPT=\"=/usr/lib/\"" > ${D}/etc/env.d/50gambit
-	# automatically load syntax-case for r5rs goodness
-	echo '(load "~~syntax-case")' > ${D}/usr/lib/gambcext
+	use macros && dodir /etc/env.d/ && echo "GAMBCOPT=\"=/usr/$(get_libdir)/\"" > ${D}/etc/env.d/50gambit
+#		echo '(load "~~syntax-case")' > ${D}/usr/$(get_libdir)/gambcext
 }