slight change to build process, fixes bug 189649

Package-Manager: portage-2.1.3.7

4 files changed, 157 insertions, 5 deletions

diff --git a/dev-scheme/slib/ChangeLog b/dev-scheme/slib/ChangeLog
index 2f7e5d9c9cc2..9c2a439603f5 100644
--- a/dev-scheme/slib/ChangeLog
+++ b/dev-scheme/slib/ChangeLog
@@ -1,6 +1,11 @@
 # 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.32 2007/06/07 18:10:34 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/slib/ChangeLog,v 1.33 2007/09/07 15:18:06 hkbst Exp $
+
+*slib-3.1.4-r4 (07 Sep 2007)
+
+  07 Sep 2007; Marijn Schouten <hkBst@gentoo.org> +slib-3.1.4-r4.ebuild:
+  slight change to build process, fixes bug 189649
 
   07 Jun 2007; Marijn Schouten <hkBst@gentoo.org> slib-3.1.4-r3.ebuild:
   fix slib gambit support
diff --git a/dev-scheme/slib/Manifest b/dev-scheme/slib/Manifest
index a866637ec61f..29b68fdebd71 100644
--- a/dev-scheme/slib/Manifest
+++ b/dev-scheme/slib/Manifest
@@ -35,10 +35,14 @@ EBUILD slib-3.1.4-r3.ebuild 4059 RMD160 56f2eebf42641704e10286f01338b2b1e97916f5
 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
+EBUILD slib-3.1.4-r4.ebuild 4087 RMD160 1119ebfe52bf03be2f42f8bff28c0ec8a8afd730 SHA1 98a884a10e7051525c185c7175e331863e978d20 SHA256 63854378c4029ddc4838078fa7090ed20eb45e4727a6df4cf1a99f5b09a1ba7a
+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
+MISC ChangeLog 6296 RMD160 64496907d046d08be058aca984dfa0353a1772dc SHA1 25af91a48583e78214a29a17c5eb21582f82f989 SHA256 3e9e4e40a047f93996f3f7f2fe49754ddd8d88db6ef8ff4847d25586e997e320
+MD5 85d98d172417de06564c8a2f70b8dc18 ChangeLog 6296
+RMD160 64496907d046d08be058aca984dfa0353a1772dc ChangeLog 6296
+SHA256 3e9e4e40a047f93996f3f7f2fe49754ddd8d88db6ef8ff4847d25586e997e320 ChangeLog 6296
 MISC metadata.xml 398 RMD160 7fabdfdd6bbeac709b9571c0835ec15e588597b3 SHA1 c51deac0a50261fa887a2e2e9e2d35af40605496 SHA256 9f2719a4fba8cfe3430d7dbd7638dab8ab3b9dbbe20a1364544dc35ea5f8d75a
 MD5 b8e27e247b747f45efd6dd67f4a1dcb1 metadata.xml 398
 RMD160 7fabdfdd6bbeac709b9571c0835ec15e588597b3 metadata.xml 398
@@ -64,3 +68,6 @@ SHA256 be9684a7fb47a797ee2d2553918cdf4afe425c6992aa027327fcaef1620ba5f2 files/di
 MD5 a1252a8dd656f70662da421b7ea68f84 files/digest-slib-3.1.4-r3 214
 RMD160 cc8c0f4a36e9a51626b52c47d40424104360aaa7 files/digest-slib-3.1.4-r3 214
 SHA256 be9684a7fb47a797ee2d2553918cdf4afe425c6992aa027327fcaef1620ba5f2 files/digest-slib-3.1.4-r3 214
+MD5 a1252a8dd656f70662da421b7ea68f84 files/digest-slib-3.1.4-r4 214
+RMD160 cc8c0f4a36e9a51626b52c47d40424104360aaa7 files/digest-slib-3.1.4-r4 214
+SHA256 be9684a7fb47a797ee2d2553918cdf4afe425c6992aa027327fcaef1620ba5f2 files/digest-slib-3.1.4-r4 214
diff --git a/dev-scheme/slib/files/digest-slib-3.1.4-r4 b/dev-scheme/slib/files/digest-slib-3.1.4-r4
new file mode 100644
index 000000000000..aba33066f8e0
--- /dev/null
+++ b/dev-scheme/slib/files/digest-slib-3.1.4-r4
@@ -0,0 +1,3 @@
+MD5 b0df4089264fd248c9c4f6d2e074b9f6 slib3a4.zip 994885
+RMD160 2cd478889d462994d62363379e17e74a28b4ef8c slib3a4.zip 994885
+SHA256 d66d642c060d08f16aaca19fd2fd3040de22404eace80a36802cfe39cb5fb9b2 slib3a4.zip 994885
diff --git a/dev-scheme/slib/slib-3.1.4-r4.ebuild b/dev-scheme/slib/slib-3.1.4-r4.ebuild
new file mode 100644
index 000000000000..bc7bec609ed7
--- /dev/null
+++ b/dev-scheme/slib/slib-3.1.4-r4.ebuild
@@ -0,0 +1,137 @@
+# 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-r4.ebuild,v 1.1 2007/09/07 15:18:06 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}
+
+	epatch ${FILESDIR}/Makefile.patch
+
+	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
+
+#	for dir in mandir infodir srcdir htmldir; do
+#		sed "s_\$(${dir})_\$(${dir})/_g" -i Makefile
+#	done
+
+#	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() {
+	emake || die "make failed"
+}
+
+src_install() {
+	emake infoz || die "infoz failed"
+	emake install || die "install failed"
+
+	dodoc ANNOUNCE ChangeLog FAQ README
+	dodir /usr/share/gambit/
+	more_install
+}
+
+# maybe also do "make infoz"
+_src_install() {
+	insinto ${INSTALL_DIR} #don't install directly into guile dir
+	doins *.scm
+	doins *.init
+	dodoc ANNOUNCE ChangeLog FAQ README
+	doinfo slib.info
+	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}\""
+	#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
+}