*** empty log message ***

5 files changed, 74 insertions, 24 deletions

diff --git a/dev-lisp/clisp/ChangeLog b/dev-lisp/clisp/ChangeLog
index 9e0063f4285a..3f87f1d2c939 100644
--- a/dev-lisp/clisp/ChangeLog
+++ b/dev-lisp/clisp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lisp/clisp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.8 2003/09/05 03:21:37 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.9 2003/11/26 20:29:29 mkennedy Exp $
+
+  26 Nov 2003; <mkennedy@gentoo.org> clisp-2.31.ebuild, metadata.xml,
+  files/2.31/fastcgi-Makefile.in-gentoo.patch:
+  resolves bug 33425 (treatment of CFLAGS), resolves bug 30591 (-D_LIBC error),
+  fixes for fastcgi support, disable thread USE permanently, filled out
+  metadata.xml, added support for the new common lisp controller recently added
+  to stable, add support for nls and readline USE flags.
 
 *clisp-2.31 (04 Sep 2003)
 
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index 62251dc68b33..bd1810dd449b 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -1,17 +1,19 @@
-MD5 c258bb0de9e19088dbefe077c6235c1d ChangeLog 2871
+MD5 614b0035ea7b6fe6ad321266e5d05161 ChangeLog 3278
 MD5 49613e495da0b6f83016281175cb56c3 clisp-2.28.ebuild 1380
 MD5 44ca75fcfa29c894ce368e2a05834a04 clisp-2.29.ebuild 1435
-MD5 a881823bfbd7a3504b176a965ee2b266 clisp-2.30.ebuild 1460
 MD5 41aa178dc9617efc0c8f8d72d658dd81 clisp-2.30-r1.ebuild 2197
-MD5 22f51b932365d87d7e5df2e031926e34 clisp-2.31.ebuild 2660
+MD5 a881823bfbd7a3504b176a965ee2b266 clisp-2.30.ebuild 1460
+MD5 f262930da0061aeac8c57e362095d9a0 clisp-2.31.ebuild 2913
+MD5 485cde76397408cf913fc6d4c7a45a67 metadata.xml 882
 MD5 c112ebf612bf8e262c4285fd4c7e9553 files/clisp-2.30-gentoo.patch 1301
 MD5 ec015c64b7aca6f6721123c27d7d921c files/clisp-2.30-linux.lisp-upstream.patch 4712
+MD5 fe93240f140623bf55d2e503f6d8e01e files/clisp.sh 2792
 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 fe93240f140623bf55d2e503f6d8e01e files/clisp.sh 2792
 MD5 4408eb96e1169c101473012aee6c87ca files/digest-clisp-2.30-r1 64
-MD5 bf978d68f0161bacd6772c07dfade6fa files/install-clc.lisp 484
 MD5 27760908e107e35ff838560fb5381d5b files/digest-clisp-2.31 64
+MD5 bf978d68f0161bacd6772c07dfade6fa files/install-clc.lisp 484
 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
diff --git a/dev-lisp/clisp/clisp-2.31.ebuild b/dev-lisp/clisp/clisp-2.31.ebuild
index 622780c30207..2a11fe3ca5c1 100644
--- a/dev-lisp/clisp/clisp-2.31.ebuild
+++ b/dev-lisp/clisp/clisp-2.31.ebuild
@@ -1,8 +1,8 @@
 # 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.2 2003/09/06 22:35:54 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.31.ebuild,v 1.3 2003/11/26 20:29:29 mkennedy Exp $
 
-IUSE="X threads fastcgi postgres ldap"
+IUSE="X threads fastcgi postgres ldap nls"
 
 DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
 HOMEPAGE="http://clisp.sourceforge.net/"
@@ -13,7 +13,9 @@ DEPEND="dev-libs/libsigsegv
 	fastcgi? ( dev-libs/fcgi )
 	postgres? ( dev-db/postgresql )
 	X? ( x11-base/xfree )
-	ldap? ( net-nds/openldap )"
+	ldap? ( net-nds/openldap )
+	readline? ( sys-libs/readline )
+	nls? ( sys-devel/gettext )"
 
 LICENSE="GPL-2"
 SLOT="2"
@@ -21,28 +23,30 @@ 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
+	epatch ${FILESDIR}/${PV}/bindings-glibc-linux.lisp-gentoo.patch
+	epatch ${FILESDIR}/${PV}/bindings-wildcard-fnmatch.c-gentoo.patch
+	epatch ${FILESDIR}/${PV}/fastcgi-Makefile.in-gentoo.patch
 }
 
 src_compile() {
+	export CC="${CC} ${CFLAGS}"
+	unset CFLAGS CXXFLAGS
 	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)
+		--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"
 	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
+	# the following modules are not supported
+#	use ldap && myconf="${myconf} --with-module=dirkey"
+#	use threads && myconf="${myconf} --with-threads=POSIX_THREADS"
+	./configure --prefix=/usr ${myconf} build || die "./configure failed"
+	cd build
 	./makemake ${myconf} >Makefile
 	make config.lisp
 	sed 's,"vi","nano",g' <config.lisp >config.gentoo && mv config.gentoo config.lisp || die
@@ -50,10 +54,11 @@ src_compile() {
 }
 
 src_install() {
-	cd src && make DESTDIR=${D} prefix=/usr install-bin || die
-	doman clisp.1 clreadline.3
+	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 clreadline.dvi clreadline.html
+		ANNOUNCE clisp.dvi clisp.html
 
 	rm -f ${D}/usr/lib/clisp/base/*
 	(cd ${D}/usr/lib/clisp/base && ln -s ../full/* .)
@@ -64,6 +69,8 @@ src_install() {
 	doexe ${FILESDIR}/clisp.sh
 	insinto /usr/lib/clisp
 	doins ${FILESDIR}/install-clc.lisp
+
+	keepdir /usr/lib/common-lisp/clisp
 }
 
 pkg_preinst() {
@@ -77,10 +84,13 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	chown cl-builder:cl-builder /usr/lib/common-lisp/clisp
+	rm -rf /usr/lib/common-lisp/clisp/*
+	/usr/bin/clc-autobuild-impl clisp yes
 	/usr/sbin/register-common-lisp-implementation clisp
 }
 
 pkg_prerm() {
-	/usr/sbin/unregister-common-lisp-implementation clisp
+	rm -rf /usr/lib/common-lisp/clisp/*
 }
 
diff --git a/dev-lisp/clisp/files/2.31/fastcgi-Makefile.in-gentoo.patch b/dev-lisp/clisp/files/2.31/fastcgi-Makefile.in-gentoo.patch
new file mode 100644
index 000000000000..0447a146d09b
--- /dev/null
+++ b/dev-lisp/clisp/files/2.31/fastcgi-Makefile.in-gentoo.patch
@@ -0,0 +1,17 @@
+diff -ur clisp-2.31.orig/modules/fastcgi/Makefile.in clisp-2.31/modules/fastcgi/Makefile.in
+--- clisp-2.31.orig/modules/fastcgi/Makefile.in	2003-01-09 14:16:46.000000000 -0600
++++ clisp-2.31/modules/fastcgi/Makefile.in	2003-11-26 13:15:24.194528464 -0600
+@@ -21,10 +21,10 @@
+ 	$(CLISP) -c fastcgi.lisp
+ 
+ fastcgi.o:       fastcgi.c
+-	$(CC) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi.c
++	$(CC) $(CFLAGS) -I.. -c fastcgi.c
+ 
+ fastcgi_wrappers.o:       fastcgi_wrappers.c
+-	$(CC) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi_wrappers.c
++	$(CC) $(CFLAGS) -I.. -c fastcgi_wrappers.c
+ 
+ # Make a module
+ clisp-module : all
+Only in clisp-2.31/modules/fastcgi: Makefile.in~
diff --git a/dev-lisp/clisp/metadata.xml b/dev-lisp/clisp/metadata.xml
index f418045b09c8..1bb87a8a4df7 100644
--- a/dev-lisp/clisp/metadata.xml
+++ b/dev-lisp/clisp/metadata.xml
@@ -2,4 +2,18 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>common-lisp</herd>
+<longdescription>
+CLISP is a Common Lisp implementation. It mostly supports the Lisp
+described in the ANSI Common Lisp standard.  It includes an
+interpreter, a compiler, almost all of CLOS, a foreign language
+interface and a socket interface. An X11 interface is available
+through CLX and Garnet. Command line editing is provided by readline.
+CLISP runs on microcomputers (OS/2, Windows 95/98/NT/2000/XP, Amiga
+500-4000, Acorn RISC PC) as well as on Unix workstations (GNU/Linux,
+BSD, SVR4, Sun4, DEC Alpha OSF, HP-UX, NeXTstep, SGI, AIX, Sun3 and
+others) and needs only 2 MB of RAM.  The user interface comes in
+German, English, French, Spanish, Dutch and Russian, and can be
+changed at run time.
+</longdescription>
 </pkgmetadata>
+