make slib work with guile again, run tests if scm is installed (still fail) thanks to Olivier Huber <oli.huber@gmail.com> bug 206695

Package-Manager: portage-2.1.4

4 files changed, 153 insertions, 5 deletions

diff --git a/dev-scheme/slib/ChangeLog b/dev-scheme/slib/ChangeLog
index d53e8bef24ea..eea5b4a5ba3c 100644
--- a/dev-scheme/slib/ChangeLog
+++ b/dev-scheme/slib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-scheme/slib
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/slib/ChangeLog,v 1.34 2008/01/18 12:50:22 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/slib/ChangeLog,v 1.35 2008/01/21 21:26:43 hkbst Exp $
+
+*slib-3.1.5-r1 (21 Jan 2008)
+
+  21 Jan 2008; Marijn Schouten <hkBst@gentoo.org> +slib-3.1.5-r1.ebuild:
+  make slib work with guile again, run tests if scm is installed (still fail)
+  thanks to Olivier Huber <oli.huber@gmail.com> bug 206695
 
 *slib-3.1.5 (18 Jan 2008)
 
diff --git a/dev-scheme/slib/Manifest b/dev-scheme/slib/Manifest
index 7fecbe27a0fb..9293c055c7b2 100644
--- a/dev-scheme/slib/Manifest
+++ b/dev-scheme/slib/Manifest
@@ -40,14 +40,18 @@ EBUILD slib-3.1.4-r4.ebuild 4087 RMD160 1119ebfe52bf03be2f42f8bff28c0ec8a8afd730
 MD5 36cce411f541a5af91fdd0d41470304c slib-3.1.4-r4.ebuild 4087
 RMD160 1119ebfe52bf03be2f42f8bff28c0ec8a8afd730 slib-3.1.4-r4.ebuild 4087
 SHA256 63854378c4029ddc4838078fa7090ed20eb45e4727a6df4cf1a99f5b09a1ba7a slib-3.1.4-r4.ebuild 4087
+EBUILD slib-3.1.5-r1.ebuild 4008 RMD160 b5d5c886e3bacbfc42100724a470f18c4330b975 SHA1 c35ac515582fb5e457f91d6b639f51db869d0ad8 SHA256 50afb8b9ef0992c1dbc9742c2c1748f0bf310503d1eed76b90e74b5e8b79e433
+MD5 f4d222d29eabeb9328e6b9070fddd5a6 slib-3.1.5-r1.ebuild 4008
+RMD160 b5d5c886e3bacbfc42100724a470f18c4330b975 slib-3.1.5-r1.ebuild 4008
+SHA256 50afb8b9ef0992c1dbc9742c2c1748f0bf310503d1eed76b90e74b5e8b79e433 slib-3.1.5-r1.ebuild 4008
 EBUILD slib-3.1.5.ebuild 3874 RMD160 18658e5cd11b88ff5d7948619277b442f60e3b21 SHA1 36a309e4c774c21c6d1ac533e80bdece0bbedf77 SHA256 976832b8cdbb859ccb798c181b16fce912f831a0a4e73b6f530c7dddac1f4821
 MD5 b754202a164a7b1dde686fdcd7722e24 slib-3.1.5.ebuild 3874
 RMD160 18658e5cd11b88ff5d7948619277b442f60e3b21 slib-3.1.5.ebuild 3874
 SHA256 976832b8cdbb859ccb798c181b16fce912f831a0a4e73b6f530c7dddac1f4821 slib-3.1.5.ebuild 3874
-MISC ChangeLog 6401 RMD160 9367bcc4b264e91798264d2806c8b8d137f6944c SHA1 2e0cba15c73a1aff6cc340d6539cfcfe62efa192 SHA256 cae42c06ed580a0e2dde6ec093f42798fa01388a55ab40ea1fa93ab01eac40bd
-MD5 e45add50f964e3323e6c32d79e07fccc ChangeLog 6401
-RMD160 9367bcc4b264e91798264d2806c8b8d137f6944c ChangeLog 6401
-SHA256 cae42c06ed580a0e2dde6ec093f42798fa01388a55ab40ea1fa93ab01eac40bd ChangeLog 6401
+MISC ChangeLog 6642 RMD160 0af0c91faa9fad852de7dcfab1a0a9ca9e8b4131 SHA1 cc97356d8b070fe575e65f5056abbd061c7ecf87 SHA256 d350fd961c4f424e9c763ee975cc72febfba33cc7799d62158e578ad14f0602a
+MD5 0b2e16eec97e158ed3bc1485e7ef81b4 ChangeLog 6642
+RMD160 0af0c91faa9fad852de7dcfab1a0a9ca9e8b4131 ChangeLog 6642
+SHA256 d350fd961c4f424e9c763ee975cc72febfba33cc7799d62158e578ad14f0602a ChangeLog 6642
 MISC metadata.xml 398 RMD160 7fabdfdd6bbeac709b9571c0835ec15e588597b3 SHA1 c51deac0a50261fa887a2e2e9e2d35af40605496 SHA256 9f2719a4fba8cfe3430d7dbd7638dab8ab3b9dbbe20a1364544dc35ea5f8d75a
 MD5 b8e27e247b747f45efd6dd67f4a1dcb1 metadata.xml 398
 RMD160 7fabdfdd6bbeac709b9571c0835ec15e588597b3 metadata.xml 398
@@ -79,3 +83,6 @@ SHA256 be9684a7fb47a797ee2d2553918cdf4afe425c6992aa027327fcaef1620ba5f2 files/di
 MD5 853959c6a1d90d988d0bf1ce8cec71c7 files/digest-slib-3.1.5 217
 RMD160 842828dbb6c7999d660ea9bb44e814cf1b14b1d9 files/digest-slib-3.1.5 217
 SHA256 453892bffa62010c185046d9d1ef19a5728246e80463c65e9b0a0a6de7cc4973 files/digest-slib-3.1.5 217
+MD5 853959c6a1d90d988d0bf1ce8cec71c7 files/digest-slib-3.1.5-r1 217
+RMD160 842828dbb6c7999d660ea9bb44e814cf1b14b1d9 files/digest-slib-3.1.5-r1 217
+SHA256 453892bffa62010c185046d9d1ef19a5728246e80463c65e9b0a0a6de7cc4973 files/digest-slib-3.1.5-r1 217
diff --git a/dev-scheme/slib/files/digest-slib-3.1.5-r1 b/dev-scheme/slib/files/digest-slib-3.1.5-r1
new file mode 100644
index 000000000000..ba0e1df5d567
--- /dev/null
+++ b/dev-scheme/slib/files/digest-slib-3.1.5-r1
@@ -0,0 +1,3 @@
+MD5 39274e6de82af2c97bdfc6c4cc125fb0 slib3a5.zip 1055491
+RMD160 1d0e487bde6ecbd4aaa878b56abb25086bbc36aa slib3a5.zip 1055491
+SHA256 3c4fbfc08de9220f456ed1cd58ca0fb49b4a8cdd4d03697fbea11d9407a16e30 slib3a5.zip 1055491
diff --git a/dev-scheme/slib/slib-3.1.5-r1.ebuild b/dev-scheme/slib/slib-3.1.5-r1.ebuild
new file mode 100644
index 000000000000..953c5c9a7084
--- /dev/null
+++ b/dev-scheme/slib/slib-3.1.5-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/slib/slib-3.1.5-r1.ebuild,v 1.1 2008/01/21 21:26:43 hkbst Exp $
+
+inherit versionator eutils
+
+#version magic thanks to masterdriverz and UberLord using bash array instead of tr
+trarr="0abcdefghi"
+MY_PV="$(get_version_component_range 1)${trarr:$(get_version_component_range 2):1}$(get_version_component_range 3)"
+
+MY_P=${PN}${MY_PV}
+S=${WORKDIR}/${PN}
+DESCRIPTION="library providing functions for Scheme implementations"
+SRC_URI="http://swiss.csail.mit.edu/ftpdir/scm/${MY_P}.zip"
+
+HOMEPAGE="http://swiss.csail.mit.edu/~jaffer/SLIB"
+
+SLOT="0"
+LICENSE="public-domain BSD"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="" #test"
+
+#unzip for unpacking
+RDEPEND=""
+DEPEND="app-arch/unzip"
+#		test? ( dev-scheme/scm )"
+
+INSTALL_DIR="/usr/share/slib/"
+
+src_unpack() {
+	unpack ${A}; cd "${S}"
+
+#	cp Makefile Makefile.old
+
+	sed "s_prefix = /usr/local/_prefix = ${D}/usr/_" -i Makefile
+	sed 's:libdir = $(exec_prefix)lib/:libdir = $(exec_prefix)share/:' -i Makefile
+	sed 's_mandir = $(prefix)man/_mandir = $(prefix)/share/man/_' -i Makefile
+	sed 's_infodir = $(prefix)info/_infodir = $(prefix)share/info/_' -i Makefile
+
+	sed 's:echo SCHEME_LIBRARY_PATH=$(libslibdir)  >> $(bindir)slib:echo SCHEME_LIBRARY_PATH=/usr/share/slib/ >> $(bindir)slib:' -i Makefile
+
+#	sed 's_mkdir_mkdir -p_g' -i Makefile
+
+#	diff -u Makefile.old Makefile
+
+	sed 's:(lambda () "/usr/local/share/gambc/")):(lambda () "/usr/share/gambit")):' -i gambit.init
+}
+
+src_compile() {
+	emake || die "make failed"
+}
+
+#slib needs scm for tests, but scm needs slib so we can't depend on it
+src_test() {
+	if has_version dev-scheme/scm; then
+		make test || die "Make test failed. See above for details."
+	else
+		einfo "Skipping test, because dev-scheme/scm is not installed."
+	fi
+}
+
+src_install() {
+	emake infoz || die "infoz failed"
+	emake install || die "install failed"
+
+	dodoc ANNOUNCE ChangeLog FAQ README
+	dodir /usr/share/gambit/
+	more_install
+}
+
+more_install() {
+	dosym ${INSTALL_DIR} /usr/share/guile/slib # link from guile dir
+	dosym ${INSTALL_DIR} /usr/lib/slib
+	dodir /etc/env.d/ && echo "SCHEME_LIBRARY_PATH=\"${INSTALL_DIR}\"" > "${D}"/etc/env.d/50slib
+
+	mkdir "${S}"/installers
+	pushd installers; make_installers; popd
+	dosbin installers/*
+}
+
+pkg_postinst() {
+	[ "${ROOT}" == "/" ] && pkg_config
+}
+
+IMPLEMENTATIONS="bigloo drscheme elk gambit guile scm" # mit-scheme
+
+pkg_config() {
+	for impl in ${IMPLEMENTATIONS}; do
+		install_slib ${impl}
+#		echo '(slib:report-version)' | slib ${impl}
+	done
+}
+
+make_load_expression() {
+	echo "(load \\\"${INSTALL_DIR}$1.init\\\")"
+}
+
+make_installers()
+{
+	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}\""
+	guile_install_command="guile -c \"(use-modules (ice-9 slib)) ${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}\""
+
+	for impl in ${IMPLEMENTATIONS}; do
+		command_var=${impl//-/}_install_command
+		make_installer ${impl} "${!command_var}"
+	done
+}
+
+make_installer() {
+	echo $2 > install_slib_for_${1//-/}
+}
+
+install_slib() {
+	if has_version dev-scheme/$1; then
+		script=install_slib_for_${1//-/}
+		einfo "Registering slib with $1..."
+#		echo running: $(cat /usr/sbin/${script})
+		$script
+	else
+		einfo "$1 not installed, not registering..."
+	fi
+}