bump + fix bug 199528

(Portage version: 2.1.4_rc4)

4 files changed, 80 insertions, 1 deletions

diff --git a/dev-scheme/stklos/ChangeLog b/dev-scheme/stklos/ChangeLog
index 0f85afbe3a3f..fd5259ebe00d 100644
--- a/dev-scheme/stklos/ChangeLog
+++ b/dev-scheme/stklos/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-scheme/stklos
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/stklos/ChangeLog,v 1.4 2007/06/08 11:48:39 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/stklos/ChangeLog,v 1.5 2007/11/28 17:59:26 hkbst Exp $
+
+*stklos-0.96 (28 Nov 2007)
+
+  28 Nov 2007; Marijn Schouten <hkBst@gentoo.org> +files/multilib.patch,
+  +stklos-0.96.ebuild:
+  bump + fix bug 199528
 
 *stklos-0.95 (08 Jun 2007)
 
diff --git a/dev-scheme/stklos/files/digest-stklos-0.96 b/dev-scheme/stklos/files/digest-stklos-0.96
new file mode 100644
index 000000000000..7e7463c2d53f
--- /dev/null
+++ b/dev-scheme/stklos/files/digest-stklos-0.96
@@ -0,0 +1,3 @@
+MD5 6daf095c6c2a34a5ffa82e69d7d1c166 stklos-0.96.tar.gz 4243166
+RMD160 32625030722e1b5480fd0481df55a644b9f80b3c stklos-0.96.tar.gz 4243166
+SHA256 f67aa28c1df6483d3758376bb9b0bfb7fd5053e07604ca7b39ea1dfec47681ef stklos-0.96.tar.gz 4243166
diff --git a/dev-scheme/stklos/files/multilib.patch b/dev-scheme/stklos/files/multilib.patch
new file mode 100644
index 000000000000..a01f5326dd63
--- /dev/null
+++ b/dev-scheme/stklos/files/multilib.patch
@@ -0,0 +1,22 @@
+Index: stklos-0.95/extensions/Makefile.am
+===================================================================
+--- stklos-0.95.orig/extensions/Makefile.am
++++ stklos-0.95/extensions/Makefile.am
+@@ -11,7 +11,7 @@ CC	  = @CC@
+ CFLAGS	  = @CFLAGS@ @SH_COMP_FLAGS@ @GTK_CONFIG_CFLAGS@ @GCINC@ $(INCLUDES)
+ 
+ 
+-shobjectdir	    = $(prefix)/lib/@PACKAGE@/@VERSION@
++shobjectdir	    = $(libdir)/@PACKAGE@/@VERSION@
+ shobject_SCRIPTS    = ldap.@SH_SUFFIX@
+ 
+ #======================================================================
+@@ -20,7 +20,7 @@ shobject_SCRIPTS    = ldap.@SH_SUFFIX@
+ scheme_SRCS = ldap.stk
+ scheme_OBJS = ldap.ostk
+ 
+-schemedir   = $(prefix)/share/@PACKAGE@/@VERSION@
++schemedir   = $(datadir)/@PACKAGE@/@VERSION@
+ scheme_DATA = $(scheme_SRCS) $(scheme_OBJS) 
+ 
+ 
diff --git a/dev-scheme/stklos/stklos-0.96.ebuild b/dev-scheme/stklos/stklos-0.96.ebuild
new file mode 100644
index 000000000000..0f12b459c39c
--- /dev/null
+++ b/dev-scheme/stklos/stklos-0.96.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/stklos/stklos-0.96.ebuild,v 1.1 2007/11/28 17:59:26 hkbst Exp $
+
+inherit eutils
+
+DESCRIPTION="fast and light Scheme implementation"
+HOMEPAGE="http://www.stklos.org"
+SRC_URI="http://www.stklos.org/download/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="threads ldap gtk gnome"
+DEPEND="dev-libs/gmp dev-libs/libpcre dev-libs/boehm-gc
+		ldap? ( net-nds/openldap )
+		gtk? ( x11-libs/gtk+ )"
+#		gnome? ( )" # someone using gnome should figure out what package will enable gnome support
+#silex and ``The Dominique Boucher LALR Package'' may also be deps, not in tree though
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if use threads; then
+		built_with_use dev-libs/boehm-gc threads || die "boehm-gc must be built with threads use flag"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}; cd "${S}"
+
+	cp cinvoke/Makefile.templ cinvoke/Makefile.templ.old
+	sed "s:\[PREFIX\]:\$\(DESTDIR\)\[PREFIX\]:g" -i cinvoke/Makefile.templ
+	diff -u cinvoke/Makefile.templ.old cinvoke/Makefile.templ
+
+	epatch "${FILESDIR}"/multilib.patch
+}
+
+src_compile() {
+#anyone interested in lurc threads? not in tree though
+	econf $(use_enable threads threads pthreads) $(use_enable ldap) $(use_enable gtk) $(use_enable gnome) \
+		--without-gmp-light --without-provided-gc --without-provided-regexp
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+}