bump

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.23-gentoo-r8 x86_64

4 files changed, 151 insertions, 5 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/Manifest b/dev-scheme/slib/Manifest
index c869063010a5..fa889664bc58 100644
--- a/dev-scheme/slib/Manifest
+++ b/dev-scheme/slib/Manifest
@@ -1,4 +1,5 @@
 AUX Makefile.patch 346 RMD160 2d599045345d2059ef38d7fd47e6e66887c43d80 SHA1 00d39d217c7e9321f8dd651ed1637f3f28cbba44 SHA256 a8af77683dac7c0974249e036ddfe7ca4810f36bbdd7dbabf97a2a16f5042726
+DIST slib-3b1.zip 1063156 RMD160 6e184f6da97c67d5ef47e268852379b1fc5b103c SHA1 13db8471f0c38815c426c3af152f83502062b6c3 SHA256 008fb9853a6a7bb479985a9f93974b22f128c507c7777ea1b8d3eaa22e6b7dd7
 DIST slib3a1.zip 861953 RMD160 9058c89d0da0231bdf06be084e316fb73f456f28 SHA1 8cedb61df26094060bd2f691ded7d03004238e06 SHA256 8a41bb6c726a2ff79579289ce20dc085171100050466f8ec7aa4ecd3348f3ae0
 DIST slib3a4.zip 994885 RMD160 2cd478889d462994d62363379e17e74a28b4ef8c SHA1 5e358cab8a58202bab3eae9ce4c04dda41bf37a5 SHA256 d66d642c060d08f16aaca19fd2fd3040de22404eace80a36802cfe39cb5fb9b2
 DIST slib3a5.zip 1055491 RMD160 1d0e487bde6ecbd4aaa878b56abb25086bbc36aa SHA1 d041f174ee1b4492c69e02da2c2cb4c5320ab80c SHA256 3c4fbfc08de9220f456ed1cd58ca0fb49b4a8cdd4d03697fbea11d9407a16e30
@@ -6,7 +7,8 @@ EBUILD slib-3.1.1-r1.ebuild 1460 RMD160 5609dcc41d607847aa0e68bf4871934b1dc4f762
 EBUILD slib-3.1.4-r2.ebuild 2100 RMD160 3f891982553652e429b85cf94a9f8dc27911afe6 SHA1 1a0eb380f335377fd7d7dc1fcd539dca39ee8c90 SHA256 43f956c9b0012b80c65e4e42bd88bd8e5a512ff1dff3ad4672e23026ac7ea9fe
 EBUILD slib-3.1.4-r3.ebuild 4059 RMD160 56f2eebf42641704e10286f01338b2b1e97916f5 SHA1 66d903a475e8459ea3f45c619d54b41466ceaa02 SHA256 713705e149a021fb4f8c5f53732e9d526375b16bce70ecb79f7ea2f1b18e2879
 EBUILD slib-3.1.4-r4.ebuild 4087 RMD160 1119ebfe52bf03be2f42f8bff28c0ec8a8afd730 SHA1 98a884a10e7051525c185c7175e331863e978d20 SHA256 63854378c4029ddc4838078fa7090ed20eb45e4727a6df4cf1a99f5b09a1ba7a
-EBUILD slib-3.1.5-r1.ebuild 4083 RMD160 f016b0d10a2b98d44aff561750fc0ef0facc9135 SHA1 52957d902faeada5c94f1b22d22f5382b165668f SHA256 eae990155d54616ae4a91db758fa3774e27f51528ad664ada16fa83f3de3f6ba
+EBUILD slib-3.1.5-r1.ebuild 4214 RMD160 bb30227147e1544ec082a62a32092296961e3a39 SHA1 469186789bda5e2d94077f9e174fc4e6316daa16 SHA256 13d75942eb10f39aafd0504b0691153428b396b9ebbda02e73de79f492275a31
 EBUILD slib-3.1.5.ebuild 3874 RMD160 18658e5cd11b88ff5d7948619277b442f60e3b21 SHA1 36a309e4c774c21c6d1ac533e80bdece0bbedf77 SHA256 976832b8cdbb859ccb798c181b16fce912f831a0a4e73b6f530c7dddac1f4821
-MISC ChangeLog 7299 RMD160 9d125c1244bf7496d7a9966f782f2c5a43e09396 SHA1 467bd8bef08d9198b731f9ef289d9c8f2c8c5145 SHA256 a7b707d20c8ffa90ee65742692e8f168f2468db7813a29f2b7a5412c6f9705cf
+EBUILD slib-3.2.1.ebuild 4006 RMD160 6cdec88e7f2fedbcb3062e9662473d012036fc78 SHA1 570b7f8edae161a0560e4f193a1afa95790d8035 SHA256 44ae76c33a5264d29b8f0aa4289be205330a8660451674e25d551694a388d8d1
+MISC ChangeLog 7428 RMD160 20b4a0179ee1aee6d45901b0577229c27611d99a SHA1 ba67c80b4e02cf3f4a477d91a1e16af41c3d307d SHA256 130c4c3a505787bd9c70dc656e6c6765011da61a83b7c374b826dddf6d53affd
 MISC metadata.xml 398 RMD160 7fabdfdd6bbeac709b9571c0835ec15e588597b3 SHA1 c51deac0a50261fa887a2e2e9e2d35af40605496 SHA256 9f2719a4fba8cfe3430d7dbd7638dab8ab3b9dbbe20a1364544dc35ea5f8d75a
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
+}