New upstream version; Depend on libsigsegv >= 2.4; Don't unset CFLAGS, CLISP 2.39 now respects them.

(Portage version: 2.1.1_pre3-r3)

5 files changed, 163 insertions, 0 deletions

diff --git a/dev-lisp/clisp/files/2.39/README.Gentoo b/dev-lisp/clisp/files/2.39/README.Gentoo
new file mode 100644
index 000000000000..6bec925fb0d3
--- /dev/null
+++ b/dev-lisp/clisp/files/2.39/README.Gentoo
@@ -0,0 +1,11 @@
+                                                            -*-outline-*-
+
+* Gentoo Specific Notes
+
+The CLISP port for Gentoo uses Common Lisp Controller related code
+(install-clc.lisp and clisp.sh) from Debian.  This code contains the following
+copyright:
+
+    ;;;; Copyright (c) 2004 Kevin M. Rosenberg
+    ;;;; GNU GPL v2 license
+
diff --git a/dev-lisp/clisp/files/2.39/clisp.sh b/dev-lisp/clisp/files/2.39/clisp.sh
new file mode 100644
index 000000000000..f5ed6a1d8fce
--- /dev/null
+++ b/dev-lisp/clisp/files/2.39/clisp.sh
@@ -0,0 +1,118 @@
+#!/bin/sh
+# Copyright (c) 2002 Kevin M. Rosenberg
+# GNU GPL v2 license
+ 
+if [ ! -f /usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp ] ; then
+  echo "*** Can't find common-lisp-controller.lisp ***" >&2
+  echo "Please report this as a bug" &>2
+  exit 1
+fi
+
+clisp_dir=/usr/lib/clisp
+clc_lib_dir=/usr/lib/common-lisp/clisp
+
+builder=/usr/bin/clisp
+old_mem=$clisp_dir/full/lispinit.mem
+new_mem=$clisp_dir/full/lispinit-new.mem
+clean_mem=$clisp_dir/full/lispinit-clean.mem
+
+lisp_error()
+{
+    echo "Error running $builder" >&2
+    exit 1
+}
+
+mem_error()
+{
+    echo "Error moving new lisp image $new_mem" >&2
+    exit 1
+}
+
+
+case $1 in
+    rebuild)
+	echo $0 Rebuilding packages...
+	shift
+	while [ -x $builder ] && [ ! -z "$1" ] ; do
+	    echo ...rebuilding $1
+	    $builder -norc -q -M $old_mem -x "
+(let ((*compile-print* nil)
+      (*compile-progress* nil)
+      (*compile-verbose*  nil)
+      (*require-verbose* nil)
+      (*load-verbose* nil) 
+      (mk::*load-source-if-no-binary* nil)
+      (mk::*bother-user-if-no-binary* nil)
+      (mk::*compile-during-load* t))
+   (handler-case
+      (progn
+         (c-l-c:compile-library (quote $1))
+         (ext:exit 0)
+       )
+    (error (e)
+      (ignore-errors (format t \"~&Build error: ~A~%\" e))
+      (finish-output)
+      (ext:exit 1))))"  || exit 1
+	    shift
+	done 
+	;;
+    remove)
+	echo $0 Removing packages...
+	shift
+	while [ ! -z "$1" ] ; do
+	    echo ...removing package $1
+	    rm -rf "${clc_lib_dir}/$1"
+	    shift
+	done
+	rmdir $clc_lib_dir 2> /dev/null 
+	;;
+    install-clc)
+	echo Installing clc...
+	if [ ! -f $clean_mem ]; then
+	    cp $old_mem $clean_mem
+	fi
+	if [ -x $clisp_dir/$lisp_builder ]; then
+	    $builder -norc -q -M $clean_mem \
+		-x "
+(handler-case
+  (progn 
+    (when (find-package :c-l-c) ; have to remove 
+      (delete-package :c-l-c))  ; for clisp workaround
+    (load \"$clisp_dir/install-clc.lisp\") 
+    (saveinitmem \"${new_mem}\")
+    (ext:exit 0))
+  (error (e)
+    (ignore-errors (format t \"~&install-clc error: ~A~%\" e))
+    (finish-output)
+    (ext:exit 1)))"   || lisp_error
+  	    mv $new_mem $old_mem || mem_error
+	fi
+	;;
+    remove-clc)
+	if [ -f $clean_mem ]; then
+	    cp $clean_mem $old_mem
+	else
+	    echo "Warning: Can't find original image file $clean_mem. Aborting." >& 2
+	fi
+	;;
+    make-user-image)
+	if [ ! -f $2 ] ; then 
+	    echo "Trying to make-user image, but can not find file $2" >&2
+	    exit 1
+	fi 
+	$builder -norc -q -M $old_mem \
+	    -x "(progn    
+  (load \"$2\") 
+  (saveinitmem \"${new_mem}\"))
+  (ext:exit 0)" || lisp_error
+	mv $new_mem $old_mem || mem_error
+	;;
+    *)
+	echo "`basename $0`: Unknown command $1" >&2
+	echo "Known commands are:" >&2 
+	echo "install-clc, remove-clc, rebuild, remove, and make-user-image" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/dev-lisp/clisp/files/2.39/fastcgi-Makefile-gentoo.patch b/dev-lisp/clisp/files/2.39/fastcgi-Makefile-gentoo.patch
new file mode 100644
index 000000000000..982ec67458ef
--- /dev/null
+++ b/dev-lisp/clisp/files/2.39/fastcgi-Makefile-gentoo.patch
@@ -0,0 +1,16 @@
+diff -ur clisp-2.39.orig/modules/fastcgi/Makefile.in clisp-2.39/modules/fastcgi/Makefile.in
+--- clisp-2.39.orig/modules/fastcgi/Makefile.in	2004-08-12 09:38:36.000000000 -0500
++++ clisp-2.39/modules/fastcgi/Makefile.in	2006-04-24 15:14:38.000000000 -0500
+@@ -23,10 +23,10 @@
+ 	$(CLISP) -c fastcgi.lisp
+ 
+ fastcgi.o:       fastcgi.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDES) -I.. -c fastcgi.c
+ 
+ fastcgi_wrappers.o:       fastcgi_wrappers.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi_wrappers.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDES) -I.. -c fastcgi_wrappers.c
+ 
+ # Make a module
+ clisp-module : all
diff --git a/dev-lisp/clisp/files/2.39/install-clc.lisp b/dev-lisp/clisp/files/2.39/install-clc.lisp
new file mode 100644
index 000000000000..06cb217d32cf
--- /dev/null
+++ b/dev-lisp/clisp/files/2.39/install-clc.lisp
@@ -0,0 +1,15 @@
+;;;; -*- Mode: Lisp; Package: CL-USER -*-
+;;;; Copyright (c) 2004 Kevin M. Rosenberg
+;;;; GNU GPL v2 license
+
+(in-package #:cl-user)
+
+(handler-case
+    (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp")
+  (error (e)
+    (format t "Error during loading of common-lisp-controller.lisp: ~A~%" e)))
+
+(handler-case
+    (common-lisp-controller:init-common-lisp-controller-v4 "clisp")
+  (error (e)
+    (format t "Error during init-common-lisp-controller-v4: ~A~%" e)))
diff --git a/dev-lisp/clisp/files/digest-clisp-2.39 b/dev-lisp/clisp/files/digest-clisp-2.39
new file mode 100644
index 000000000000..5f462c75265c
--- /dev/null
+++ b/dev-lisp/clisp/files/digest-clisp-2.39
@@ -0,0 +1,3 @@
+MD5 70ea408e7c9b69d5feb5e408084ecfff clisp-2.39.tar.bz2 8071957
+RMD160 b31e53cb97a116c683543ee74093fe2a05ed9ea4 clisp-2.39.tar.bz2 8071957
+SHA256 9e7db421d076420d60652e7bdaf8241e36d1db6a4cad2a8253afc9952200bbb7 clisp-2.39.tar.bz2 8071957