*** empty log message ***

9 files changed, 202 insertions, 24 deletions

diff --git a/dev-lisp/clisp/ChangeLog b/dev-lisp/clisp/ChangeLog
index 1f06cec97d97..2285f807ec22 100644
--- a/dev-lisp/clisp/ChangeLog
+++ b/dev-lisp/clisp/ChangeLog
@@ -1,10 +1,23 @@
 # ChangeLog for dev-lisp/clisp
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.14 2004/01/29 04:50:47 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.15 2004/03/21 07:15:01 mkennedy Exp $
+
+*clisp-2.33 (20 Mar 2004)
+
+  20 Mar 2004; <mkennedy@gentoo.org> clisp-2.32-r1.ebuild, clisp-2.33.ebuild,
+  files/clisp.sh, files/2.33/berkely-db-configure-gentoo.patch.gz,
+  files/2.33/fastcgi-Makefile.in-gentoo.patch,
+  files/2.33/format.lisp-gentoo.patch:
+  Added support for berkely-db module; Added support for pcre module;
+  Upcase encoding encoding in clisp.sh; Added support for fastcgi
+  module;  Removed support for threading; Removed support for LDAP;  New
+  upstream version.
 
   28 Jan 2004; <mkennedy@gentoo.org> clisp-2.32-r1.ebuild:
   inherit common-lisp-common; use function register-common-lisp-implementation,
   not /usr/sbin/register-common-lisp-implementation
+  Corrected postinst and postrm for compatibility with changes in
+  common-lisp-common eclass.
 
 *clisp-2.32-r1 (15 Jan 2004)
 
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index c712fe143755..608dc9a6eded 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -1,27 +1,30 @@
-MD5 00284072d47a76860fe005a97f8d2ece clisp-2.32.ebuild 3781
-MD5 49613e495da0b6f83016281175cb56c3 clisp-2.28.ebuild 1380
+MD5 2fccd7fc90fc589c09e37785844b8df5 clisp-2.33.ebuild~ 3846
 MD5 41aa178dc9617efc0c8f8d72d658dd81 clisp-2.30-r1.ebuild 2197
-MD5 696a13636ace75f2840e73a4bd8c5433 clisp-2.31.ebuild 2907
+MD5 00284072d47a76860fe005a97f8d2ece clisp-2.32.ebuild 3781
 MD5 2fccd7fc90fc589c09e37785844b8df5 clisp-2.32-r1.ebuild 3846
 MD5 44ca75fcfa29c894ce368e2a05834a04 clisp-2.29.ebuild 1435
-MD5 4fc692df6aab2f206ede2054ab83b8ab ChangeLog 4242
-MD5 485cde76397408cf913fc6d4c7a45a67 metadata.xml 882
+MD5 696a13636ace75f2840e73a4bd8c5433 clisp-2.31.ebuild 2907
 MD5 71f82f22579ae31fffda2943f3428c5f clisp-2.31-r1.ebuild 3820
 MD5 a881823bfbd7a3504b176a965ee2b266 clisp-2.30.ebuild 1460
+MD5 4fc692df6aab2f206ede2054ab83b8ab ChangeLog 4242
+MD5 fdf0d78a9b79baa3cfd5c477848ecab7 clisp-2.33.ebuild 3847
+MD5 485cde76397408cf913fc6d4c7a45a67 metadata.xml 882
+MD5 49613e495da0b6f83016281175cb56c3 clisp-2.28.ebuild 1380
 MD5 bf978d68f0161bacd6772c07dfade6fa files/install-clc.lisp 484
-MD5 c112ebf612bf8e262c4285fd4c7e9553 files/clisp-2.30-gentoo.patch 1301
-MD5 2ce1383673bccf5309622a0c11c0aca0 files/digest-clisp-2.28 64
-MD5 7642efead569d6dbdd43a8d5a89df0a8 files/digest-clisp-2.29 64
-MD5 4408eb96e1169c101473012aee6c87ca files/digest-clisp-2.30 64
-MD5 27760908e107e35ff838560fb5381d5b files/digest-clisp-2.31 64
 MD5 da9eb2a136566bdce0620c950df941b2 files/digest-clisp-2.32 64
-MD5 ec015c64b7aca6f6721123c27d7d921c files/clisp-2.30-linux.lisp-upstream.patch 4712
+MD5 27760908e107e35ff838560fb5381d5b files/digest-clisp-2.31 64
+MD5 2ce1383673bccf5309622a0c11c0aca0 files/digest-clisp-2.28 64
 MD5 4408eb96e1169c101473012aee6c87ca files/digest-clisp-2.30-r1 64
-MD5 27760908e107e35ff838560fb5381d5b files/digest-clisp-2.31-r1 64
 MD5 da9eb2a136566bdce0620c950df941b2 files/digest-clisp-2.32-r1 64
+MD5 ec706829fc32d6d1aa4c4acc56e755a7 files/digest-clisp-2.33 64
 MD5 d00e83a5ea91ad14b7d664cb2e6443bf files/clisp.sh 2805
-MD5 9b76ca10cf785d54c75803e8fddc91cb files/2.31/bindings-glibc-linux.lisp-gentoo.patch 1292
-MD5 9db8f3ac2974a7d9725148ecc0709cc8 files/2.31/bindings-wildcard-fnmatch.c-gentoo.patch 1248
-MD5 ff3506766c1fc9216e04f650f39c0e94 files/2.31/fastcgi-Makefile.in-gentoo.patch 654
+MD5 ec015c64b7aca6f6721123c27d7d921c files/clisp-2.30-linux.lisp-upstream.patch 4712
+MD5 27760908e107e35ff838560fb5381d5b files/digest-clisp-2.31-r1 64
+MD5 c112ebf612bf8e262c4285fd4c7e9553 files/clisp-2.30-gentoo.patch 1301
+MD5 7642efead569d6dbdd43a8d5a89df0a8 files/digest-clisp-2.29 64
+MD5 4408eb96e1169c101473012aee6c87ca files/digest-clisp-2.30 64
 MD5 ed4100707b93b34a7825b915690e9ccd files/2.32/format.lisp-gentoo.patch 651
 MD5 83877a7508037b3286d37fc12f09650c files/2.32/fastcgi-Makefile.in-gentoo.patch 663
+MD5 9b76ca10cf785d54c75803e8fddc91cb files/2.31/bindings-glibc-linux.lisp-gentoo.patch 1292
+MD5 ff3506766c1fc9216e04f650f39c0e94 files/2.31/fastcgi-Makefile.in-gentoo.patch 654
+MD5 9db8f3ac2974a7d9725148ecc0709cc8 files/2.31/bindings-wildcard-fnmatch.c-gentoo.patch 1248
diff --git a/dev-lisp/clisp/clisp-2.32-r1.ebuild b/dev-lisp/clisp/clisp-2.32-r1.ebuild
index 78be5f2e5077..476e12ba5199 100644
--- a/dev-lisp/clisp/clisp-2.32-r1.ebuild
+++ b/dev-lisp/clisp/clisp-2.32-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.32-r1.ebuild,v 1.2 2004/01/29 04:50:47 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.32-r1.ebuild,v 1.3 2004/03/21 07:15:01 mkennedy Exp $
 
 inherit flag-o-matic common-lisp-common
 
@@ -115,12 +115,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	chown cl-builder:cl-builder /usr/lib/common-lisp/clisp
-	rm -rf /usr/lib/common-lisp/clisp/* || true
-	/usr/bin/clc-autobuild-impl clisp yes
-	register-common-lisp-implementation clisp
+	standard-impl-postinst clisp
 }
 
-pkg_prerm() {
-	rm -rf /usr/lib/common-lisp/clisp/* || true
+pkg_postrm() {
+	standard-impl-postrm clisp /usr/bin/clisp
 }
diff --git a/dev-lisp/clisp/clisp-2.33.ebuild b/dev-lisp/clisp/clisp-2.33.ebuild
new file mode 100644
index 000000000000..716a15e1c450
--- /dev/null
+++ b/dev-lisp/clisp/clisp-2.33.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.33.ebuild,v 1.1 2004/03/21 07:15:01 mkennedy Exp $
+
+inherit flag-o-matic common-lisp-common
+
+IUSE="X fastcgi postgres nls berkdb pcre"
+
+# Handle the case where the user has some other -falign-functions
+# option set.  Bug 34630.
+
+if ! is-flag '-falign-functions=4' \
+	&& expr "$CFLAGS" : '.*\(-falign-functions=[[:digit:]]\+\)' >/dev/null; then
+	CFLAGS=${CFLAGS/\
+$(expr "$CFLAGS" : '.*\(-falign-functions=[[:digit:]]\+\)')/\
+-falign-functions=4}
+fi
+
+# Fails to compile without -falign-functions=4 when -march=pentium4
+# (or -march=pentium3, sometimes??) is defined.	 Bugs 33425 and 34630.
+
+if (is-flag '-march=pentium4' || is-flag '-march=pentium3') \
+	&& ! is-flag '-falign-functions=4'; then
+	append-flags '-falign-functions=4'
+fi
+
+# Athlon XP users report problems with -O3 optimization.  In this
+# block, we remove any optimization flag.  Depending on bug 34497. we
+# may be able to reduce optimization to -O2.
+
+if is-flag '-march=athlon-xp'; then
+	filter-flags '-O*'
+fi
+
+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 )
+	readline? ( sys-libs/readline )
+	nls? ( sys-devel/gettext )
+	berkdb? ( =sys-libs/db-4* )
+	pcre? ( dev-libs/libpcre )"
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~x86"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}/fastcgi-Makefile.in-gentoo.patch
+	epatch ${FILESDIR}/${PV}/berkely-db-configure-gentoo.patch.gz
+}
+
+src_compile() {
+	einfo "Using CFLAGS: ${CFLAGS}"
+	export CC="${CC} ${CFLAGS}"
+	unset CFLAGS CXXFLAGS
+	local myconf="--with-dynamic-ffi
+		--with-unicode
+		--with-module=regexp
+		--with-module=syscalls
+		--with-module=wildcard
+		--with-module=bindings/glibc"
+	use readline || myconf="${myconf} --with-noreadline"
+	use nls || myconf="${myconf} --with-nogettext"
+	use X && myconf="${myconf} --with-module=clx/new-clx"
+	if use postgres; then
+		myconf="${myconf} --with-module=postgresql"
+		CC="${CC} -I $(pg_config --includedir)"
+	fi
+	use fastcgi && myconf="${myconf} --with-module=fastcgi"
+	use berkdb && myconf="${myconf} --with-module=berkeley-db"
+	use pcre && myconf="${myconf} --with-module=pcre"
+	./configure --prefix=/usr ${myconf} build || die "./configure failed"
+	cd build
+	./makemake ${myconf} >Makefile
+	make config.lisp
+	sed -i 's,"vi","nano",g' config.lisp
+	sed -i 's,http://www.lisp.org/HyperSpec/,http://www.lispworks.com/reference/HyperSpec/,g' config.lisp
+	make || die
+}
+
+src_install() {
+	cd build && make DESTDIR=${D} prefix=/usr install-bin || die
+	doman clisp.1
+	dodoc SUMMARY README* NEWS MAGIC.add GNU-GPL COPYRIGHT \
+		ANNOUNCE clisp.dvi clisp.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
+
+	keepdir /usr/lib/common-lisp/clisp
+}
+
+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() {
+	standard-impl-postinst clisp
+	while read line; do einfo "${line}"; done <<EOF
+
+PLEASE NOTE: FASL files (.fas) created by previous versions of CLISP
+are not compatible with this version of CLISP (${PV}).	You will need
+to re-create your FASLs via. recompilation.	 FASLs in
+/usr/lib/common-lisp/clisp for Common Lisp Controller-installed Lisp
+packages have aready been recompiled for you.
+
+EOF
+}
+
+pkg_postrm() {
+	standard-impl-postrm clisp /usr/bin/clisp
+}
diff --git a/dev-lisp/clisp/files/2.33/berkely-db-configure-gentoo.patch.gz b/dev-lisp/clisp/files/2.33/berkely-db-configure-gentoo.patch.gz
new file mode 100644
index 000000000000..d47fbda5159a
--- /dev/null
+++ b/dev-lisp/clisp/files/2.33/berkely-db-configure-gentoo.patch.gz
diff --git a/dev-lisp/clisp/files/2.33/fastcgi-Makefile.in-gentoo.patch b/dev-lisp/clisp/files/2.33/fastcgi-Makefile.in-gentoo.patch
new file mode 100644
index 000000000000..a00027c57b3a
--- /dev/null
+++ b/dev-lisp/clisp/files/2.33/fastcgi-Makefile.in-gentoo.patch
@@ -0,0 +1,17 @@
+diff -ur clisp-2.33.original/modules/fastcgi/Makefile.in clisp-2.33/modules/fastcgi/Makefile.in
+--- clisp-2.33.original/modules/fastcgi/Makefile.in	2004-03-03 08:41:54.000000000 -0600
++++ clisp-2.33/modules/fastcgi/Makefile.in	2004-03-20 00:02:37.235191912 -0600
+@@ -22,10 +22,10 @@
+ 	$(CLISP) -c fastcgi.lisp
+ 
+ fastcgi.o:       fastcgi.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -I.. -c fastcgi.c
+ 
+ fastcgi_wrappers.o:       fastcgi_wrappers.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi_wrappers.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -I.. -c fastcgi_wrappers.c
+ 
+ # Make a module
+ clisp-module : all
+Only in clisp-2.33/modules/fastcgi: Makefile.in~
diff --git a/dev-lisp/clisp/files/2.33/format.lisp-gentoo.patch b/dev-lisp/clisp/files/2.33/format.lisp-gentoo.patch
new file mode 100644
index 000000000000..12cd17e8b962
--- /dev/null
+++ b/dev-lisp/clisp/files/2.33/format.lisp-gentoo.patch
@@ -0,0 +1,16 @@
+--- clisp-2.33.orig/src/format.lisp
++++ clisp-2.33/src/format.lisp
+@@ -2430,9 +2430,10 @@
+ 		        (prefix suffix per-line-p body-csdl add-fill
+ 				last-csdl)
+ 		        (format-logical-block-parse *FORMAT-CSDL*)
+-		      (when add-fill
+-			(format-error *FORMAT-CS* (csd-cs-index (car *FORMAT-CSDL*))
+-				      (TEXT "Error: ~~:@> not implemented")))
++;;; Disabled to allow CLC to work (WN)
++;		      (when add-fill
++;			(format-error *FORMAT-CS* (csd-cs-index (car *FORMAT-CSDL*))
++;				      (TEXT "Error: ~~:@> not implemented")))
+ 		      (setq *FORMAT-CSDL* body-csdl)
+ 		      (labels ((compute-inner ()
+ 			        `((PPRINT-LOGICAL-BLOCK
diff --git a/dev-lisp/clisp/files/clisp.sh b/dev-lisp/clisp/files/clisp.sh
index 68d23a96c280..a1dac79e9c97 100644
--- a/dev-lisp/clisp/files/clisp.sh
+++ b/dev-lisp/clisp/files/clisp.sh
@@ -35,7 +35,7 @@ case $1 in
 	shift
 	while [ -x $builder ] && [ ! -z "$1" ] ; do
 	    echo ...rebuilding $1
-	    $builder -norc -q -Efile utf-8 -M $old_mem -x "
+	    $builder -norc -q -Efile UTF-8 -M $old_mem -x "
 (let ((*compile-print* nil)
       (*compile-progress* nil)
       (*compile-verbose*  nil)
diff --git a/dev-lisp/clisp/files/digest-clisp-2.33 b/dev-lisp/clisp/files/digest-clisp-2.33
new file mode 100644
index 000000000000..4bdfa802ec07
--- /dev/null
+++ b/dev-lisp/clisp/files/digest-clisp-2.33
@@ -0,0 +1 @@
+MD5 8724eccb8933eedec31a06206c79e74d clisp-2.33.tar.bz2 6072837