new upstream version, enhanced module support etc.

6 files changed, 149 insertions, 7 deletions

diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index 7e7efaab288f..2622d9f0bc4a 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -1,10 +1,8 @@
 MD5 49613e495da0b6f83016281175cb56c3 clisp-2.28.ebuild 1380
-MD5 b35daf985fd186161b7fba06238e5716 clisp-2.30-r1.ebuild 2201
-MD5 56d489d87872292018af46f3025e6ad0 clisp-2.31.ebuild 2243
+MD5 916ff4406ffd0de9d0faf970e2c6f522 clisp-2.30-r1.ebuild 2201
+MD5 a8dca29a82969db680001bc87072409e clisp-2.31.ebuild 2664
 MD5 647a51c956ce94b73ca66094fc6a019d clisp-2.29.ebuild 1436
-MD5 779b6208679cb1f0ae0aaa670eda9819 ChangeLog 2517
-MD5 b35daf985fd186161b7fba06238e5716 clisp-2.31.ebuild~ 2201
-MD5 f5cfd31cc6fe90f27f5562aa7a327fe4 clisp-2.30-r1.ebuild.~1.1.~ 2202
+MD5 c258bb0de9e19088dbefe077c6235c1d ChangeLog 2871
 MD5 a881823bfbd7a3504b176a965ee2b266 clisp-2.30.ebuild 1460
 MD5 bf978d68f0161bacd6772c07dfade6fa files/install-clc.lisp 484
 MD5 c112ebf612bf8e262c4285fd4c7e9553 files/clisp-2.30-gentoo.patch 1301
@@ -15,3 +13,5 @@ MD5 27760908e107e35ff838560fb5381d5b files/digest-clisp-2.31 64
 MD5 ec015c64b7aca6f6721123c27d7d921c files/clisp-2.30-linux.lisp-upstream.patch 4712
 MD5 4408eb96e1169c101473012aee6c87ca files/digest-clisp-2.30-r1 64
 MD5 fe93240f140623bf55d2e503f6d8e01e files/clisp.sh 2792
+MD5 9b76ca10cf785d54c75803e8fddc91cb files/2.31/bindings-glibc-linux.lisp-gentoo.patch 1292
+MD5 9db8f3ac2974a7d9725148ecc0709cc8 files/2.31/bindings-wildcard-fnmatch.c-gentoo.patch 1248
diff --git a/dev-lisp/clisp/clisp-2.30-r1.ebuild b/dev-lisp/clisp/clisp-2.30-r1.ebuild
index a6826f9e07ce..06666c9ba670 100644
--- a/dev-lisp/clisp/clisp-2.30-r1.ebuild
+++ b/dev-lisp/clisp/clisp-2.30-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.30-r1.ebuild,v 1.1 2003/06/07 19:52:08 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.30-r1.ebuild,v 1.2 2003/09/05 03:21:37 mkennedy Exp $
 
 IUSE="X threads"
 
@@ -30,7 +30,7 @@ src_compile() {
 		--with-module=bindings/linuxlibc6"
 
 # for the time being, these modules cause segv during build
-#	use X && myconf="${myconf} --with-module=clx/new-clx"
+	use X && myconf="${myconf} --with-module=clx/new-clx"
 # 	use threads && myconf="${myconf} --with-threads=POSIX_THREADS"
 
 	einfo "Configuring with $myconf"
diff --git a/dev-lisp/clisp/clisp-2.31.ebuild b/dev-lisp/clisp/clisp-2.31.ebuild
new file mode 100644
index 000000000000..c5938fd62cc5
--- /dev/null
+++ b/dev-lisp/clisp/clisp-2.31.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.31.ebuild,v 1.1 2003/09/05 03:21:37 mkennedy Exp $
+
+IUSE="X threads fastcgi postgres ldap"
+
+DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
+HOMEPAGE="http://clisp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2"
+S=${WORKDIR}/${P}
+DEPEND="dev-libs/libsigsegv
+	dev-lisp/common-lisp-controller
+	fastcgi? ( dev-libs/fcgi )
+	postgres? ( dev-db/postgresql )
+	X? ( x11-base/xfree )
+	ldap? ( net-nds/openldap )"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~x86 ~ppc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	patch -p1 <${FILESDIR}/${PV}/bindings-glibc-linux.lisp-gentoo.patch || die
+	patch -p1 <${FILESDIR}/${PV}/bindings-wildcard-fnmatch.c-gentoo.patch || die
+}
+
+src_compile() {
+	local myconf="--with-dynamic-ffi
+		--with-unicode
+		--with-module=regexp
+		--with-module=syscalls
+		--with-module=bindings/glibc
+		--with-module=wildcard
+		--with-module=queens"
+#		--with-module=netica (netica is non-free, so there is little point in supporting it)
+	use X && myconf="${myconf} --with-module=clx/new-clx"
+	use postgres && myconf="${myconf} --with-module=postgresql"
+	use fastcgi && myconf="${myconf} --with-module=fastcgi"
+#	use ldap && myconf="${myconf} --with-module=dirkey" # openldap is currently broken
+	use threads && myconf="${myconf} --with-threads=POSIX_THREADS"
+	unset CFLAGS
+	./configure --prefix=/usr ${myconf} || die "./configure failed"
+	cd src
+	./makemake ${myconf} >Makefile
+	make config.lisp
+	sed 's,"vi","nano",g' <config.lisp >config.gentoo && mv config.gentoo config.lisp || die
+	make || die
+}
+
+src_install() {
+	cd src && make DESTDIR=${D} prefix=/usr install-bin || die
+	doman clisp.1 clreadline.3
+	dodoc SUMMARY README* NEWS MAGIC.add GNU-GPL COPYRIGHT \
+		ANNOUNCE clisp.dvi clisp.html clreadline.dvi clreadline.html
+
+	rm -f ${D}/usr/lib/clisp/base/*
+	(cd ${D}/usr/lib/clisp/base && ln -s ../full/* .)
+	chmod a+x ${D}/usr/lib/clisp/clisp-link
+  
+	# install common-lisp-controller profile
+	exeinto /usr/lib/common-lisp/bin 
+	doexe ${FILESDIR}/clisp.sh
+	insinto /usr/lib/clisp
+	doins ${FILESDIR}/install-clc.lisp 
+}
+
+pkg_preinst() {
+	local clisp_dir=/usr/lib/clisp
+	local old_mem=$clisp_dir/full/lispinit.mem
+	local new_mem=$clisp_dir/full/lispinit-new.mem
+	local clean_mem=$clisp_dir/full/lispinit-clean.mem
+	local lisp_run=$clisp_dir/full/lisp.run
+
+	rm -f $old_mem $new_mem $clean_mem $lisp_run
+}
+
+pkg_postinst() {
+	/usr/sbin/register-common-lisp-implementation clisp
+}
+
+pkg_prerm() {
+	/usr/sbin/unregister-common-lisp-implementation clisp
+}
+
diff --git a/dev-lisp/clisp/files/2.31/bindings-glibc-linux.lisp-gentoo.patch b/dev-lisp/clisp/files/2.31/bindings-glibc-linux.lisp-gentoo.patch
new file mode 100644
index 000000000000..48ef331feaba
--- /dev/null
+++ b/dev-lisp/clisp/files/2.31/bindings-glibc-linux.lisp-gentoo.patch
@@ -0,0 +1,22 @@
+diff -u clisp-2.31.orig/modules/bindings/glibc/linux.lisp clisp-2.31/modules/bindings/glibc/linux.lisp
+--- clisp-2.31.orig/modules/bindings/glibc/linux.lisp	2003-08-07 15:23:56.000000000 -0500
++++ clisp-2.31/modules/bindings/glibc/linux.lisp	2003-09-04 02:13:04.383537043 -0500
+@@ -873,8 +873,6 @@
+ ;    (:arguments (x double-float) (iptr (c-ptr double-float) :out))
+ ;  (:return-type double-float))
+ (def-call-out rint (:arguments (x double-float)) (:return-type double-float))
+-(def-call-out scalb (:arguments (x double-float) (n double-float))
+-  (:return-type double-float))
+ (def-call-out nextafter (:arguments (x double-float) (y double-float))
+   (:return-type double-float))
+ (def-call-out remainder (:arguments (x double-float) (y double-float))
+@@ -964,8 +962,6 @@
+ ;    (:arguments (x single-float) (iptr (c-ptr single-float) :out))
+ ;  (:return-type single-float))
+ (def-call-out rintf (:arguments (x single-float)) (:return-type single-float))
+-(def-call-out scalbf (:arguments (x single-float) (n single-float))
+-  (:return-type single-float))
+ (def-call-out nextafterf (:arguments (x single-float) (y single-float))
+   (:return-type single-float))
+ (def-call-out remainderf (:arguments (x single-float) (y single-float))
+Only in clisp-2.31/modules/bindings/glibc/: linux.lisp~
diff --git a/dev-lisp/clisp/files/2.31/bindings-wildcard-fnmatch.c-gentoo.patch b/dev-lisp/clisp/files/2.31/bindings-wildcard-fnmatch.c-gentoo.patch
new file mode 100644
index 000000000000..1e7cce411ae9
--- /dev/null
+++ b/dev-lisp/clisp/files/2.31/bindings-wildcard-fnmatch.c-gentoo.patch
@@ -0,0 +1,33 @@
+diff -u clisp-2.31.orig/modules/wildcard/Makefile.in clisp-2.31/modules/wildcard/Makefile.in
+--- clisp-2.31.orig/modules/wildcard/Makefile.in	2000-03-31 18:17:50.000000000 -0600
++++ clisp-2.31/modules/wildcard/Makefile.in	2003-09-04 03:24:14.869343640 -0500
+@@ -24,7 +24,7 @@
+ 	$(CC) $(CFLAGS) -I$(INCLUDES) -c wildcard.c
+ 
+ fnmatch.o : fnmatch.c fnmatch.h
+-	$(CC) $(CFLAGS) -I. -DHAVE_CONFIG_H -D_LIBC -c fnmatch.c
++	$(CC) $(CFLAGS) -I. -DHAVE_CONFIG_H -c fnmatch.c
+ 
+ # Make a module
+ clisp-module : all
+Only in clisp-2.31/modules/wildcard: Makefile.in~
+diff -u clisp-2.31.orig/modules/wildcard/fnmatch.c clisp-2.31/modules/wildcard/fnmatch.c
+--- clisp-2.31.orig/modules/wildcard/fnmatch.c	1998-07-22 15:22:52.000000000 -0500
++++ clisp-2.31/modules/wildcard/fnmatch.c	2003-09-04 03:24:37.101169587 -0500
+@@ -37,9 +37,6 @@
+    program understand `configure --with-gnu-libc' and omit the object files,
+    it is simpler to just do this in the source for each such file.  */
+ 
+-#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
+-
+-
+ # if defined (STDC_HEADERS) || !defined (isascii)
+ #  define ISASCII(c) 1
+ # else
+@@ -237,5 +234,3 @@
+ 
+ # undef FOLD
+ }
+-
+-#endif	/* _LIBC or not __GNU_LIBRARY__.  */
+Only in clisp-2.31/modules/wildcard: fnmatch.c~
diff --git a/dev-lisp/clisp/files/digest-clisp-2.31 b/dev-lisp/clisp/files/digest-clisp-2.31
new file mode 100644
index 000000000000..79487e6dcf81
--- /dev/null
+++ b/dev-lisp/clisp/files/digest-clisp-2.31
@@ -0,0 +1 @@
+MD5 44bf68b218721540be60250fc1259483 clisp-2.31.tar.bz2 5936744