bump + fix bug 199528

Package-Manager: portage-2.1.4_rc4

5 files changed, 96 insertions, 5 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/Manifest b/dev-scheme/stklos/Manifest
index a9320c0a05e2..fb266bfc7232 100644
--- a/dev-scheme/stklos/Manifest
+++ b/dev-scheme/stklos/Manifest
@@ -1,5 +1,10 @@
+AUX multilib.patch 776 RMD160 2f691e4af0b1e7f415dac5a095d390f40eeedcea SHA1 fd9432676989a667b111f9c2fa1f4fef793f8df2 SHA256 c5c3e8bc4b42708faef6bb8e8a7f0d9feda976669d182d769528d97ec4171c3b
+MD5 3231ffa6f724228161697805f7f0fb30 files/multilib.patch 776
+RMD160 2f691e4af0b1e7f415dac5a095d390f40eeedcea files/multilib.patch 776
+SHA256 c5c3e8bc4b42708faef6bb8e8a7f0d9feda976669d182d769528d97ec4171c3b files/multilib.patch 776
 DIST stklos-0.82.tar.gz 4077458 RMD160 34dff00248f590d216d3858cecc95299a7fb8a09 SHA1 e7858377dfb800055f9d34e0a375960960301503 SHA256 6d8e8a9577292faad5845218cd0289140bef4b8b398760e6eb0287b3c563672c
 DIST stklos-0.95.tar.gz 4188501 RMD160 22b000861f4b571e0cfd15c2376a49def53d243f SHA1 8e7e5c3407714c3f163e0f1298632db14eabcb90 SHA256 a5b98732946b71a13bcb4253179fbf41c2add8d407eb2ceb513a3e357bfc47b5
+DIST stklos-0.96.tar.gz 4243166 RMD160 32625030722e1b5480fd0481df55a644b9f80b3c SHA1 17fd6c653d73577807befc008e235b3fdf445bc2 SHA256 f67aa28c1df6483d3758376bb9b0bfb7fd5053e07604ca7b39ea1dfec47681ef
 EBUILD stklos-0.82.ebuild 1573 RMD160 3af78adc4d6d6a52c5d593d38510791b9012be49 SHA1 f0ba58275e6a207a4d70007411814f57d4d3d526 SHA256 63a8a5dd597d909bf2e2cf0e1d1bf9d6cc74a59f004d9a3d81a61410a83890f2
 MD5 328f9593936fff0b63c7b6acdc52a1af stklos-0.82.ebuild 1573
 RMD160 3af78adc4d6d6a52c5d593d38510791b9012be49 stklos-0.82.ebuild 1573
@@ -8,10 +13,14 @@ EBUILD stklos-0.95.ebuild 1430 RMD160 6d2e4b7c6f639822f132fb7f4840309960a09b7f S
 MD5 005f137e4fc0f77c802d81cd57666c29 stklos-0.95.ebuild 1430
 RMD160 6d2e4b7c6f639822f132fb7f4840309960a09b7f stklos-0.95.ebuild 1430
 SHA256 29a075adbe022dbed088ba1090537de63e56c93a6396a0d176e8a6f949c06b9d stklos-0.95.ebuild 1430
-MISC ChangeLog 1349 RMD160 0639e284cffbb6066ff336af28e3480daab268cf SHA1 9cadc124a74066758048a699e4eaa01af0d3715e SHA256 0f35282e99fe0717afd1ce90a03d8ea42df87a61281789283a3cc1728a42d259
-MD5 fb69cb12c25e1f1b4ca005472971cb83 ChangeLog 1349
-RMD160 0639e284cffbb6066ff336af28e3480daab268cf ChangeLog 1349
-SHA256 0f35282e99fe0717afd1ce90a03d8ea42df87a61281789283a3cc1728a42d259 ChangeLog 1349
+EBUILD stklos-0.96.ebuild 1515 RMD160 8f018d47761e57d77cd8370a23979fc055df4eb4 SHA1 20796a884853f7f8018c1bd91b8f2b34415cb020 SHA256 de39353f365d5a603c21fc2e28928fd228ebf2862018efc4466988e185d35803
+MD5 676cb64179e8bae14227e06be64a3170 stklos-0.96.ebuild 1515
+RMD160 8f018d47761e57d77cd8370a23979fc055df4eb4 stklos-0.96.ebuild 1515
+SHA256 de39353f365d5a603c21fc2e28928fd228ebf2862018efc4466988e185d35803 stklos-0.96.ebuild 1515
+MISC ChangeLog 1498 RMD160 c9b6f6024945248b97084058c9a22e6af468c9bb SHA1 bca9f5bc8eb767f99439025ce6453f9bae0b8343 SHA256 fba56a37725435b3fc05770c1de82cd6fed2bfa31d3c8c063c100d22f0c1d17d
+MD5 94e8f274f1459147a2ceff4802856b87 ChangeLog 1498
+RMD160 c9b6f6024945248b97084058c9a22e6af468c9bb ChangeLog 1498
+SHA256 fba56a37725435b3fc05770c1de82cd6fed2bfa31d3c8c063c100d22f0c1d17d ChangeLog 1498
 MISC metadata.xml 587 RMD160 ce929e8ee245b9420f28c2f19a57fc77eba41ee1 SHA1 4b9196812338770a414cdbbb0ad894b5963ea764 SHA256 e03e7285b4247851ac554906e190d6e828574bf8cb5706188dc8c1a8ff084303
 MD5 310ff323fb4cdc840898aa2cf2f89b0c metadata.xml 587
 RMD160 ce929e8ee245b9420f28c2f19a57fc77eba41ee1 metadata.xml 587
@@ -22,3 +31,6 @@ SHA256 a558ce554f858d12fdc417c07166b21b149cd99dd7ec23415048e9d1b04ea87f files/di
 MD5 dd39c0afdf48b0898a1acf6000efa1e4 files/digest-stklos-0.95 238
 RMD160 5634dba1e88b3cc2d83ea0f610674489b57826b5 files/digest-stklos-0.95 238
 SHA256 e7dc47560b6c0cde9369a75bd28d072b5ebdefbfe27158533638efb0ea6218b1 files/digest-stklos-0.95 238
+MD5 fc3b07e904621af6d7812012d7176d43 files/digest-stklos-0.96 238
+RMD160 f8fe3bbf8ba3971ce3b19e952b195059a4988ca0 files/digest-stklos-0.96 238
+SHA256 ff082b7f7dd4e4e38eac6e4f9370a1d4390bf723af698d0870e3beec6d739eb6 files/digest-stklos-0.96 238
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"
+}