prepare for supporting several implementation + misc fixes

Package-Manager: portage-2.1.2.7

3 files changed, 39 insertions, 34 deletions

diff --git a/dev-scheme/slib/ChangeLog b/dev-scheme/slib/ChangeLog
index ed7e2590a6e3..c51982fc27a8 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.28 2007/04/04 19:32:03 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/slib/ChangeLog,v 1.29 2007/05/29 11:57:13 hkbst Exp $
+
+  29 May 2007; Marijn Schouten <hkBst@gentoo.org> slib-3.1.4-r2.ebuild:
+  prepare for supporting several implementation + misc fixes
 
   04 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org> slib-3.1.1-r1.ebuild:
   Stable on alpha wrt bug #167706.
diff --git a/dev-scheme/slib/Manifest b/dev-scheme/slib/Manifest
index 033550f69f2b..64b65776707d 100644
--- a/dev-scheme/slib/Manifest
+++ b/dev-scheme/slib/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST slib2d2.zip 627968 RMD160 8262a74e7ff8d7e20ad08fcf63f77fd619996aaa SHA1 74df5b1d45d9e4f24521ddd687210c1964d2b483 SHA256 4f60fd2fd55386605f7ca05d698bb628e94c2e301b711e02c1691c75b1bfac1a
 DIST slib2d5.zip 777067 RMD160 74038cbc95f7ad6e9e7ef35923cf9c28520cabbe SHA1 a04f554e16a307ba43de72712a196ebb4e12a331 SHA256 16ac5b97ee056a2787033cfafe2d9b087eca89c2a5cde6fa229898b1b972081a
 DIST slib2d6.zip 793668 RMD160 f1520a98646675a10a0d17853cbbf7bf03d3f3df SHA1 402f7997a3d7ee72fa5c356487daef8420162338 SHA256 88ab2636b40f50e933696981b8a49b245ddee1addd111f0e1921d19d2ca14de5
@@ -26,14 +23,14 @@ EBUILD slib-3.1.1.ebuild 898 RMD160 df6cd4b7ad88eecbd4a8b66bee1299267206bdbe SHA
 MD5 443d2bbb88ba47a2c49a6d6aa7ebff1d slib-3.1.1.ebuild 898
 RMD160 df6cd4b7ad88eecbd4a8b66bee1299267206bdbe slib-3.1.1.ebuild 898
 SHA256 ad8dc76491f06d27097867bfc60d9ec850ef78cb3449c9e3d7b7125cb223a4dc slib-3.1.1.ebuild 898
-EBUILD slib-3.1.4-r2.ebuild 1545 RMD160 6591d6128c45f6c3f1794211167f81c01743a8c1 SHA1 d31852f7f6883f89919028de84f1656a6f9d01e2 SHA256 0824f878b504fa604d50b8678c9a5273908ba03fd653dee80339a9cb265fd32d
-MD5 612167afaad05c46d95be75b08d2724c slib-3.1.4-r2.ebuild 1545
-RMD160 6591d6128c45f6c3f1794211167f81c01743a8c1 slib-3.1.4-r2.ebuild 1545
-SHA256 0824f878b504fa604d50b8678c9a5273908ba03fd653dee80339a9cb265fd32d slib-3.1.4-r2.ebuild 1545
-MISC ChangeLog 5586 RMD160 c2ca223404e818fc3d8da2706f6a8211262bf351 SHA1 e7f136ceab35379271c4369fff1e41be57670e58 SHA256 63355b0bb527b011b854f5084f0c383cff365d41a9aa15748ea8645dd7aebcf3
-MD5 f7e724576ba166010e9d608bc51d33ff ChangeLog 5586
-RMD160 c2ca223404e818fc3d8da2706f6a8211262bf351 ChangeLog 5586
-SHA256 63355b0bb527b011b854f5084f0c383cff365d41a9aa15748ea8645dd7aebcf3 ChangeLog 5586
+EBUILD slib-3.1.4-r2.ebuild 1701 RMD160 771d3e5ab41bfa6bd334e405cd16c4a52aa42521 SHA1 8d162c6c1e876814e038ee40b98c938ebd7999ea SHA256 74b97b24360a173974e63d2aed3e2e066a33f79a834dacb4955f66d7c6667803
+MD5 4ee2784eb756fbe7f1b4bfc1c79bfc17 slib-3.1.4-r2.ebuild 1701
+RMD160 771d3e5ab41bfa6bd334e405cd16c4a52aa42521 slib-3.1.4-r2.ebuild 1701
+SHA256 74b97b24360a173974e63d2aed3e2e066a33f79a834dacb4955f66d7c6667803 slib-3.1.4-r2.ebuild 1701
+MISC ChangeLog 5717 RMD160 b26cad402c16a3ab9ab1b841a742b68d0dd330d7 SHA1 9ae424ef771e3f1cb73c916744e826b6961da135 SHA256 140c3111a8fd56462fc67a55d6d1410b27b908757bdb04236db5c8ba30455e44
+MD5 c05326150db8c6aebe776734186c56dd ChangeLog 5717
+RMD160 b26cad402c16a3ab9ab1b841a742b68d0dd330d7 ChangeLog 5717
+SHA256 140c3111a8fd56462fc67a55d6d1410b27b908757bdb04236db5c8ba30455e44 ChangeLog 5717
 MISC metadata.xml 398 RMD160 7fabdfdd6bbeac709b9571c0835ec15e588597b3 SHA1 c51deac0a50261fa887a2e2e9e2d35af40605496 SHA256 9f2719a4fba8cfe3430d7dbd7638dab8ab3b9dbbe20a1364544dc35ea5f8d75a
 MD5 b8e27e247b747f45efd6dd67f4a1dcb1 metadata.xml 398
 RMD160 7fabdfdd6bbeac709b9571c0835ec15e588597b3 metadata.xml 398
@@ -56,10 +53,3 @@ SHA256 3b14bb4e98cb894ca3dcffee07eb32f31a83fa86deee561c699e04401e584161 files/di
 MD5 a1252a8dd656f70662da421b7ea68f84 files/digest-slib-3.1.4-r2 214
 RMD160 cc8c0f4a36e9a51626b52c47d40424104360aaa7 files/digest-slib-3.1.4-r2 214
 SHA256 be9684a7fb47a797ee2d2553918cdf4afe425c6992aa027327fcaef1620ba5f2 files/digest-slib-3.1.4-r2 214
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGE/05kT4lNIS36YERAv8vAKC9imEB06DOV9NkGt+3O6UavRhT+gCfUu6b
-RzlokCVRYQa72gmYI8O4+io=
-=wfEa
------END PGP SIGNATURE-----
diff --git a/dev-scheme/slib/slib-3.1.4-r2.ebuild b/dev-scheme/slib/slib-3.1.4-r2.ebuild
index 7b0a9756c886..464fa4d0cf91 100644
--- a/dev-scheme/slib/slib-3.1.4-r2.ebuild
+++ b/dev-scheme/slib/slib-3.1.4-r2.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-r2.ebuild,v 1.1 2007/01/28 11:19:38 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/slib/slib-3.1.4-r2.ebuild,v 1.2 2007/05/29 11:57:13 hkbst Exp $
 
 inherit versionator eutils
 
@@ -18,30 +18,42 @@ HOMEPAGE="http://swiss.csail.mit.edu/~jaffer/SLIB"
 SLOT="0"
 LICENSE="public-domain BSD"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
+IUSE="" #test"
 
 #unzip for unpacking
-#depend on guile for now, until slib actually works with another scheme implementation in portage
-RDEPEND="~dev-scheme/guile-1.6.8"
-DEPEND="app-arch/unzip
-	${RDEPEND}"
-
-# slib tests rely on scm being installed. It isn't even in portage :(
-RESTRICT="test"
+RDEPEND=""
+DEPEND="app-arch/unzip"
+#		test? ( dev-scheme/scm )"
 
 # maybe also do "make infoz"
-
 src_install() {
-	insinto /usr/share/slib/ #don't install directly into guile dir
+	INSTALL_DIR="/usr/share/slib/"
+
+	insinto ${INSTALL_DIR} #don't install directly into guile dir
 	doins *.scm
 	doins *.init
 	dodoc ANNOUNCE ChangeLog FAQ README
 	doinfo slib.info
-	dosym /usr/share/slib/ /usr/share/guile/slib # link from guile dir
-	dodir /etc/env.d/ && echo "SCHEME_LIBRARY_PATH=/usr/share/slib/" > ${D}/etc/env.d/50slib
+	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
 }
 
 pkg_postinst() {
-	einfo "Installing slib for guile..."
-	${ROOT}/usr/bin/guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
+	[ "${ROOT}" == "/" ] && pkg_config
 }
+
+pkg_config() {
+	install_slib dev-scheme/guile "guile -c \"(use-modules (ice-9 slib)) (require 'new-catalog)\""
+#	install_slib dev-scheme/gauche "gosh -e \"(require 'new-catalog)\""
+}
+
+install_slib() {
+	if has_version $1; then
+		einfo "Registering slib with $1..."
+#		echo running: $2
+		eval $2
+	else
+		einfo "$1 not installed, not registering ..."
+	fi
+}
\ No newline at end of file