bump

(Portage version: 2.2_rc1/cvs/Linux 2.6.23-gentoo-r8 x86_64)

3 files changed, 147 insertions, 3 deletions

diff --git a/dev-scheme/slib/ChangeLog b/dev-scheme/slib/ChangeLog
index 63f4855df86b..20ba4c43235b 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.41 2008/02/20 22:25:52 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/slib/ChangeLog,v 1.42 2008/07/04 19:33:07 hkbst Exp $
+
+*slib-3.2.1 (04 Jul 2008)
+
+  04 Jul 2008; Marijn Schouten <hkBst@gentoo.org> slib-3.1.5-r1.ebuild,
+  +slib-3.2.1.ebuild:
+  bump
 
   19 Feb 2008; Christoph Mende <angelos@gentoo.org> slib-3.1.5-r1.ebuild:
   Stable on amd64, bug #210467
diff --git a/dev-scheme/slib/slib-3.1.5-r1.ebuild b/dev-scheme/slib/slib-3.1.5-r1.ebuild
index c2b9f8b08a7d..05d2385d4403 100644
--- a/dev-scheme/slib/slib-3.1.5-r1.ebuild
+++ b/dev-scheme/slib/slib-3.1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2008/02/19 19:56:05 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/slib/slib-3.1.5-r1.ebuild,v 1.7 2008/07/04 19:33:07 hkbst Exp $
 
 inherit versionator eutils
 
@@ -30,9 +30,15 @@ INSTALL_DIR="/usr/share/slib/"
 src_unpack() {
 	unpack ${A}; cd "${S}"
 
-#	cp Makefile Makefile.old
+	cp Makefile Makefile.old
 
+	E=MAR_IJN
+	echo $PORTAGE_TMPDIR
 	sed "s_prefix = /usr/local/_prefix = ${D}/usr/_" -i Makefile
+#	sed "s_prefix = /usr/local/_prefix = ${E/_/\_}/usr/_" -i Makefile
+
+	diff -u Makefile.old 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
diff --git a/dev-scheme/slib/slib-3.2.1.ebuild b/dev-scheme/slib/slib-3.2.1.ebuild
new file mode 100644
index 000000000000..cf26d3b020a6
--- /dev/null
+++ b/dev-scheme/slib/slib-3.2.1.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.2.1.ebuild,v 1.1 2008/07/04 19:33:07 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 mzscheme) ${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
+}