*** empty log message ***

5 files changed, 159 insertions, 1 deletions

diff --git a/dev-lisp/clisp/ChangeLog b/dev-lisp/clisp/ChangeLog
index 6c6f859121fa..06619bbaaf8a 100644
--- a/dev-lisp/clisp/ChangeLog
+++ b/dev-lisp/clisp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.21 2004/05/28 07:32:00 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.22 2004/06/08 20:01:43 mkennedy Exp $
+
+*clisp-2.33.2 (08 Jun 2004)
+
+  08 Jun 2004; <mkennedy@gentoo.org>
+  +files/2.33.2/fastcgi-Makefile.in-gentoo.patch, +clisp-2.33.2.ebuild:
+  New upstream version.
 
 *clisp-2.33.1 (28 May 2004)
 
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index d2157478ea68..706b014e73cf 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -5,6 +5,7 @@ MD5 dd78ddf286fa3d83218c95f21649dfab clisp-2.32-r1.ebuild 3705
 MD5 95d96ff1deb725b1a1e42e2c4959b74a clisp-2.33-r2.ebuild 4119
 MD5 8050c249cd303ac4650e868d87b19132 clisp-2.29.ebuild 1274
 MD5 49323236044f2e9a2285fcdc3a17e901 clisp-2.33-r1.ebuild 4217
+MD5 1ef0cf30baf418c9c012570ee57a5b4a clisp-2.33.2.ebuild 4122
 MD5 f0ce8a327544aa2acfc117316bca554a clisp-2.31.ebuild 2910
 MD5 89bc2f2d5f3e2393b4bed970a0066096 clisp-2.31-r1.ebuild 3831
 MD5 82dfae1c09f023140b197a2b3fdd24e5 clisp-2.30.ebuild 1420
@@ -21,6 +22,7 @@ MD5 4408eb96e1169c101473012aee6c87ca files/digest-clisp-2.30-r1 64
 MD5 da9eb2a136566bdce0620c950df941b2 files/digest-clisp-2.32-r1 64
 MD5 ec706829fc32d6d1aa4c4acc56e755a7 files/digest-clisp-2.33-r2 64
 MD5 a9cfca152741adf66c83f97408c735fd files/digest-clisp-2.33.1 66
+MD5 9a2df7725b74af8b8b9f3db39b350e79 files/digest-clisp-2.33.2 66
 MD5 ec706829fc32d6d1aa4c4acc56e755a7 files/digest-clisp-2.33 64
 MD5 3efd884903f5493a4b8d32c276b473a8 files/clisp.sh 2805
 MD5 ec015c64b7aca6f6721123c27d7d921c files/clisp-2.30-linux.lisp-upstream.patch 4712
@@ -32,6 +34,7 @@ MD5 2e3ac08aeb220af54163a8b41026e355 files/2.33.1/fastcgi-Makefile.in-gentoo.pat
 MD5 e4c6fe13416cfc355e04ae4fc2a01d50 files/2.33/berkely-db-configure-gentoo.patch.gz 3765
 MD5 d0bf00200c853600adc899f2cb1fb907 files/2.33/format.lisp-gentoo.patch 651
 MD5 4e46c2b7e0788acfbbee8e3b25ae782b files/2.33/fastcgi-Makefile.in-gentoo.patch 710
+MD5 a9325cfeff703a21e63dbd2b3aad34c1 files/2.33.2/fastcgi-Makefile.in-gentoo.patch 670
 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
diff --git a/dev-lisp/clisp/clisp-2.33.2.ebuild b/dev-lisp/clisp/clisp-2.33.2.ebuild
new file mode 100644
index 000000000000..5f1689584354
--- /dev/null
+++ b/dev-lisp/clisp/clisp-2.33.2.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.2.ebuild,v 1.1 2004/06/08 20:01:43 mkennedy Exp $
+
+inherit flag-o-matic common-lisp-common eutils gcc
+
+DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
+HOMEPAGE="http://clisp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="x86"
+IUSE="X fastcgi postgres nls pcre"
+
+DEPEND="dev-libs/libsigsegv
+	dev-lisp/common-lisp-controller
+	fastcgi? ( dev-libs/fcgi )
+	postgres? ( dev-db/postgresql )
+	X? ( virtual/x11 )
+	readline? ( sys-libs/readline )
+	nls? ( sys-devel/gettext )
+	pcre? ( dev-libs/libpcre )"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}/fastcgi-Makefile.in-gentoo.patch
+}
+
+src_compile() {
+	# 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
+
+	# The previous stanza might not be necessary.  Bug 39830.
+	if is-flag '-march=athlon-xp'; then
+		replace-flags '-march=athlon-xp' '-mcpu=athlon-xp'
+	fi
+
+#	einfo "Using CFLAGS: ${CFLAGS}"
+#	export CC="$(gcc-getCC) ${CFLAGS}"
+
+	# Let CLISP use its own set of optimizations
+	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 pcre && myconf="${myconf} --with-module=pcre"
+	./configure --prefix=/usr ${myconf} build || die "./configure failed"
+	cd build
+	./makemake ${myconf} >Makefile
+	emake -j1 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
+	emake -j1 || 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 versions of CLISP prior to
+2.33 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.2/fastcgi-Makefile.in-gentoo.patch b/dev-lisp/clisp/files/2.33.2/fastcgi-Makefile.in-gentoo.patch
new file mode 100644
index 000000000000..5be16b23c032
--- /dev/null
+++ b/dev-lisp/clisp/files/2.33.2/fastcgi-Makefile.in-gentoo.patch
@@ -0,0 +1,17 @@
+diff -ur clisp-2.33.2.original/modules/fastcgi/Makefile.in clisp-2.33.2/modules/fastcgi/Makefile.in
+--- clisp-2.33.2.original/modules/fastcgi/Makefile.in	2004-03-03 08:41:54.000000000 -0600
++++ clisp-2.33.2/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
+
diff --git a/dev-lisp/clisp/files/digest-clisp-2.33.2 b/dev-lisp/clisp/files/digest-clisp-2.33.2
new file mode 100644
index 000000000000..d1380368af9a
--- /dev/null
+++ b/dev-lisp/clisp/files/digest-clisp-2.33.2
@@ -0,0 +1 @@
+MD5 ee4ea316db1e843dcb16094bf500012f clisp-2.33.2.tar.bz2 6091273