fix slib gambit support

Package-Manager: portage-2.1.2.9

3 files changed, 28 insertions, 19 deletions

diff --git a/dev-scheme/slib/ChangeLog b/dev-scheme/slib/ChangeLog
index 07157664f674..2f7e5d9c9cc2 100644
--- a/dev-scheme/slib/ChangeLog
+++ b/dev-scheme/slib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-scheme/slib
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/slib/ChangeLog,v 1.31 2007/06/06 16:28:00 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/slib/ChangeLog,v 1.32 2007/06/07 18:10:34 hkbst Exp $
+
+  07 Jun 2007; Marijn Schouten <hkBst@gentoo.org> slib-3.1.4-r3.ebuild:
+  fix slib gambit support
 
 *slib-3.1.4-r3 (06 Jun 2007)
 
diff --git a/dev-scheme/slib/Manifest b/dev-scheme/slib/Manifest
index b1b50d6c5575..a866637ec61f 100644
--- a/dev-scheme/slib/Manifest
+++ b/dev-scheme/slib/Manifest
@@ -31,14 +31,14 @@ EBUILD slib-3.1.4-r2.ebuild 2100 RMD160 3f891982553652e429b85cf94a9f8dc27911afe6
 MD5 76c3c9e0163e0e2851133612b638a7cd slib-3.1.4-r2.ebuild 2100
 RMD160 3f891982553652e429b85cf94a9f8dc27911afe6 slib-3.1.4-r2.ebuild 2100
 SHA256 43f956c9b0012b80c65e4e42bd88bd8e5a512ff1dff3ad4672e23026ac7ea9fe slib-3.1.4-r2.ebuild 2100
-EBUILD slib-3.1.4-r3.ebuild 3686 RMD160 31c57f5802b6e771ad1b96a71e06c7476d328f7c SHA1 abaf147eb3d5d8d37ca9ae97ea7bbce608fa4608 SHA256 fb4f03f18dc14b31760126aae0724a400959788a2820fdb3cbdf859f5a97158c
-MD5 56282e0511cc23ee7397b0e4207f9f8d slib-3.1.4-r3.ebuild 3686
-RMD160 31c57f5802b6e771ad1b96a71e06c7476d328f7c slib-3.1.4-r3.ebuild 3686
-SHA256 fb4f03f18dc14b31760126aae0724a400959788a2820fdb3cbdf859f5a97158c slib-3.1.4-r3.ebuild 3686
-MISC ChangeLog 6042 RMD160 f0ba8895f83e07ed42492dafb341f0fda91fea39 SHA1 5a8c9ae171d8ea5bb84018d01a0b532f8cffd7a5 SHA256 07543ead1ac3bc6ff83e6b5af238dd6c64c1fe7416df98b3336f7849a486131b
-MD5 c7c71a0a4f08bce9ddd774df5392af29 ChangeLog 6042
-RMD160 f0ba8895f83e07ed42492dafb341f0fda91fea39 ChangeLog 6042
-SHA256 07543ead1ac3bc6ff83e6b5af238dd6c64c1fe7416df98b3336f7849a486131b ChangeLog 6042
+EBUILD slib-3.1.4-r3.ebuild 4059 RMD160 56f2eebf42641704e10286f01338b2b1e97916f5 SHA1 66d903a475e8459ea3f45c619d54b41466ceaa02 SHA256 713705e149a021fb4f8c5f53732e9d526375b16bce70ecb79f7ea2f1b18e2879
+MD5 dc6cc6deba71ccc1adca0a8c33be62b8 slib-3.1.4-r3.ebuild 4059
+RMD160 56f2eebf42641704e10286f01338b2b1e97916f5 slib-3.1.4-r3.ebuild 4059
+SHA256 713705e149a021fb4f8c5f53732e9d526375b16bce70ecb79f7ea2f1b18e2879 slib-3.1.4-r3.ebuild 4059
+MISC ChangeLog 6141 RMD160 337777f771c66b5aa4f0dcdb8be7b39da9557873 SHA1 0dae53df69d3209c026c74bcc5e606db461f2227 SHA256 5bc6e02c07784d791525f8a1f2e6e41e376943dfbfdbde59528b752e01a0902d
+MD5 95f30519fc5bb214d84a2a5c536292cc ChangeLog 6141
+RMD160 337777f771c66b5aa4f0dcdb8be7b39da9557873 ChangeLog 6141
+SHA256 5bc6e02c07784d791525f8a1f2e6e41e376943dfbfdbde59528b752e01a0902d ChangeLog 6141
 MISC metadata.xml 398 RMD160 7fabdfdd6bbeac709b9571c0835ec15e588597b3 SHA1 c51deac0a50261fa887a2e2e9e2d35af40605496 SHA256 9f2719a4fba8cfe3430d7dbd7638dab8ab3b9dbbe20a1364544dc35ea5f8d75a
 MD5 b8e27e247b747f45efd6dd67f4a1dcb1 metadata.xml 398
 RMD160 7fabdfdd6bbeac709b9571c0835ec15e588597b3 metadata.xml 398
diff --git a/dev-scheme/slib/slib-3.1.4-r3.ebuild b/dev-scheme/slib/slib-3.1.4-r3.ebuild
index 4c45bb7c03db..0c6b2e84050f 100644
--- a/dev-scheme/slib/slib-3.1.4-r3.ebuild
+++ b/dev-scheme/slib/slib-3.1.4-r3.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/slib/slib-3.1.4-r3.ebuild,v 1.1 2007/06/06 16:28:00 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/slib/slib-3.1.4-r3.ebuild,v 1.2 2007/06/07 18:10:34 hkbst Exp $
 
 inherit versionator eutils
 
@@ -47,6 +47,8 @@ src_unpack() {
 
 #	einstall || die "install failed"
 #	emake infodir="${D}/usr/share/info/" mandir="${D}/usr/share/doc/${P}/" infoz || die "infoz failed"
+
+	sed 's:(lambda () "/usr/local/share/gambc/")):(lambda () "/usr/share/gambit")):' -i gambit.init
 }
 
 src_compile() {
@@ -57,6 +59,7 @@ src_install() {
 	emake install || die "install failed"
 
 	dodoc ANNOUNCE ChangeLog FAQ README
+	dodir /usr/share/gambit/
 	more_install
 }
 
@@ -84,43 +87,46 @@ pkg_postinst() {
 	[ "${ROOT}" == "/" ] && pkg_config
 }
 
-IMPLEMENTATIONS="bigloo elk gambit guile drscheme scm"
+IMPLEMENTATIONS="bigloo drscheme elk gambit guile scm" # mit-scheme
 
 pkg_config() {
 	for impl in ${IMPLEMENTATIONS}; do
-		install_slib dev-scheme/${impl}
+		install_slib ${impl}
 #		echo '(slib:report-version)' | slib ${impl}
 	done
 }
 
 make_load_expression() {
-	echo "(load \\\"${INSTALL_DIR}/$1.init\\\")"
+	echo "(load \\\"${INSTALL_DIR}$1.init\\\")"
 }
 
 make_installers()
 {
-	PROGRAM="(require 'new-catalog)" # (slib:report-version)"
+	PROGRAM="(require 'new-catalog) (slib:report-version)"
 
 	bigloo_install_command="bigloo -s -eval \"(begin "$(make_load_expression bigloo)" ${PROGRAM} (exit))\""
+	drscheme_install_command="mzscheme -vme \"(begin $(make_load_expression DrScheme) ${PROGRAM})\""
 	elk_install_command="echo \"$(make_load_expression elk) ${PROGRAM}\" | elk -l -"
 	gambit_install_command="gambit-interpreter -e \"$(make_load_expression gambit) ${PROGRAM}\""
 	guile_install_command="guile -c \"$(make_load_expression guile) ${PROGRAM}\""
+	#variable names may not contain hyphens (-)
+	mitscheme_install_command="echo \"(set! load/suppress-loading-message? #t) $(make_load_expression mitscheme) ${PROGRAM}\" | mit-scheme --batch-mode"
+	echo ${mitscheme_install_command}
 	scm_install_command="scm -e \"${PROGRAM}\""
-	drscheme_install_command="mzscheme -vme \"(begin $(make_load_expression DrScheme) ${PROGRAM})\""
 
 	for impl in ${IMPLEMENTATIONS}; do
-		command_var=${impl}_install_command
+		command_var=${impl//-/}_install_command
 		make_installer ${impl} "${!command_var}"
 	done
 }
 
 make_installer() {
-	echo $2 > install_slib_for_$1
+	echo $2 > install_slib_for_${1//-/}
 }
 
 install_slib() {
-	if has_version $1; then
-		script=install_slib_for_${1##*/}
+	if has_version dev-scheme/$1; then
+		script=install_slib_for_${1//-/}
 		einfo "Registering slib with $1..."
 #		echo running: $(cat /usr/sbin/${script})
 		$script