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

Package-Manager: portage-2.1.1_pre3-r3

8 files changed, 338 insertions, 18 deletions

diff --git a/dev-lisp/clisp/ChangeLog b/dev-lisp/clisp/ChangeLog
index 7fb4468ced49..96571046a0e1 100644
--- a/dev-lisp/clisp/ChangeLog
+++ b/dev-lisp/clisp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lisp/clisp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.52 2006/05/01 19:29:48 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.53 2006/07/23 06:17:08 mkennedy Exp $
+
+*clisp-2.39 (23 Jul 2006)
+
+  23 Jul 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/2.39/README.Gentoo, +files/2.39/clisp.sh,
+  +files/2.39/fastcgi-Makefile-gentoo.patch, +files/2.39/install-clc.lisp,
+  +clisp-2.39.ebuild:
+  New upstream version; Depend on libsigsegv >= 2.4; Don't unset CFLAGS, CLISP
+  2.39 now respects them.
 
   01 May 2006; Matthew Kennedy <mkennedy@gentoo.org>
   files/digest-clisp-2.38, Manifest:
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index 8931ed78bae9..af06bb4b7084 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -1,40 +1,61 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 2.38/README.Gentoo 334 RMD160 c236897c39f4c8e8f75ff9782d2ee7a7b30aece4 SHA1 3d552a225c26e205c01ec4ebc5286f2d3442cf49 SHA256 336e4287ec4cfdbe8fda692bd217431adb4e303d3f5204bdf3df0ea711fbebd6 size 334
+AUX 2.38/README.Gentoo 334 RMD160 c236897c39f4c8e8f75ff9782d2ee7a7b30aece4 SHA1 3d552a225c26e205c01ec4ebc5286f2d3442cf49 SHA256 336e4287ec4cfdbe8fda692bd217431adb4e303d3f5204bdf3df0ea711fbebd6
 MD5 66e5b3968b3a6ad0301ca028447b26b3 files/2.38/README.Gentoo 334
 RMD160 c236897c39f4c8e8f75ff9782d2ee7a7b30aece4 files/2.38/README.Gentoo 334
 SHA256 336e4287ec4cfdbe8fda692bd217431adb4e303d3f5204bdf3df0ea711fbebd6 files/2.38/README.Gentoo 334
-AUX 2.38/clisp.sh 2792 RMD160 107eccac30fc373f449d0d252ca82fa400ce0877 SHA1 65b61b10b36cf867491c35c0f3e2ca11a2bc1988 SHA256 5ba7c78f3d99b9264c9cb8909135ccd0bca113d66d5a998acc520fb431dc75ad size 2792
+AUX 2.38/clisp.sh 2792 RMD160 107eccac30fc373f449d0d252ca82fa400ce0877 SHA1 65b61b10b36cf867491c35c0f3e2ca11a2bc1988 SHA256 5ba7c78f3d99b9264c9cb8909135ccd0bca113d66d5a998acc520fb431dc75ad
 MD5 fe93240f140623bf55d2e503f6d8e01e files/2.38/clisp.sh 2792
 RMD160 107eccac30fc373f449d0d252ca82fa400ce0877 files/2.38/clisp.sh 2792
 SHA256 5ba7c78f3d99b9264c9cb8909135ccd0bca113d66d5a998acc520fb431dc75ad files/2.38/clisp.sh 2792
-AUX 2.38/fastcgi-Makefile-gentoo.patch 681 RMD160 13eaed6b82c26f47d8e574da4e1c4d5d83696a46 SHA1 57c5b06bdea2ccff3fab97a1119e6d67aa34c25b SHA256 202fe32bc4e1d4cab9e77c2d147822bcdf75cd34cc6e3fe59c2a5c9cc71f40d1 size 681
+AUX 2.38/fastcgi-Makefile-gentoo.patch 681 RMD160 13eaed6b82c26f47d8e574da4e1c4d5d83696a46 SHA1 57c5b06bdea2ccff3fab97a1119e6d67aa34c25b SHA256 202fe32bc4e1d4cab9e77c2d147822bcdf75cd34cc6e3fe59c2a5c9cc71f40d1
 MD5 8f6c314c6c8f3b08f59d17a32cee3a40 files/2.38/fastcgi-Makefile-gentoo.patch 681
 RMD160 13eaed6b82c26f47d8e574da4e1c4d5d83696a46 files/2.38/fastcgi-Makefile-gentoo.patch 681
 SHA256 202fe32bc4e1d4cab9e77c2d147822bcdf75cd34cc6e3fe59c2a5c9cc71f40d1 files/2.38/fastcgi-Makefile-gentoo.patch 681
-AUX 2.38/install-clc.lisp 501 RMD160 c4848c195ef194fce8ec73eb4aceeb5f34b919ac SHA1 7a3e221b37d03dc12e490b479d22a821a901357f SHA256 93ff66189e490ae806c2d227e24295af0cf01e1bb0a1d7de2cf57ff59523f09e size 501
+AUX 2.38/install-clc.lisp 501 RMD160 c4848c195ef194fce8ec73eb4aceeb5f34b919ac SHA1 7a3e221b37d03dc12e490b479d22a821a901357f SHA256 93ff66189e490ae806c2d227e24295af0cf01e1bb0a1d7de2cf57ff59523f09e
 MD5 2f431f5c714c00d04b55e02a9d54f452 files/2.38/install-clc.lisp 501
 RMD160 c4848c195ef194fce8ec73eb4aceeb5f34b919ac files/2.38/install-clc.lisp 501
 SHA256 93ff66189e490ae806c2d227e24295af0cf01e1bb0a1d7de2cf57ff59523f09e files/2.38/install-clc.lisp 501
-DIST clisp-2.38.tar.bz2 8078151 RMD160 9070e1d7cd4db66de62f077b68a7fef7413da622 SHA256 98ddb7faa384b9b62621ac9af8b4416cbe1b6df420306fceea9e1e01a880e051 size 8078151
-EBUILD clisp-2.38-r1.ebuild 3163 RMD160 e058c5b3d60a55bb59f61d618c70b36efa6da52d SHA1 c6049c11028391dde5537473a4ad5d2ec36eb72c SHA256 030d8425bbe6072fa79d279c36092e4316817f51bf44a469127f6443deb6134f size 3163
+AUX 2.39/README.Gentoo 334 RMD160 c236897c39f4c8e8f75ff9782d2ee7a7b30aece4 SHA1 3d552a225c26e205c01ec4ebc5286f2d3442cf49 SHA256 336e4287ec4cfdbe8fda692bd217431adb4e303d3f5204bdf3df0ea711fbebd6
+MD5 66e5b3968b3a6ad0301ca028447b26b3 files/2.39/README.Gentoo 334
+RMD160 c236897c39f4c8e8f75ff9782d2ee7a7b30aece4 files/2.39/README.Gentoo 334
+SHA256 336e4287ec4cfdbe8fda692bd217431adb4e303d3f5204bdf3df0ea711fbebd6 files/2.39/README.Gentoo 334
+AUX 2.39/clisp.sh 2792 RMD160 107eccac30fc373f449d0d252ca82fa400ce0877 SHA1 65b61b10b36cf867491c35c0f3e2ca11a2bc1988 SHA256 5ba7c78f3d99b9264c9cb8909135ccd0bca113d66d5a998acc520fb431dc75ad
+MD5 fe93240f140623bf55d2e503f6d8e01e files/2.39/clisp.sh 2792
+RMD160 107eccac30fc373f449d0d252ca82fa400ce0877 files/2.39/clisp.sh 2792
+SHA256 5ba7c78f3d99b9264c9cb8909135ccd0bca113d66d5a998acc520fb431dc75ad files/2.39/clisp.sh 2792
+AUX 2.39/fastcgi-Makefile-gentoo.patch 681 RMD160 910a369e952fa174747414ea16cbca7dc4fefd0d SHA1 a4031359977a137d65de15a3b1b6c77debfcc532 SHA256 14a91f53d5000ea2f9b47233c17e314afa13998a24791331ee75b7017b8a2f85
+MD5 43b440ef7bfc91cdd816f87292ad72df files/2.39/fastcgi-Makefile-gentoo.patch 681
+RMD160 910a369e952fa174747414ea16cbca7dc4fefd0d files/2.39/fastcgi-Makefile-gentoo.patch 681
+SHA256 14a91f53d5000ea2f9b47233c17e314afa13998a24791331ee75b7017b8a2f85 files/2.39/fastcgi-Makefile-gentoo.patch 681
+AUX 2.39/install-clc.lisp 501 RMD160 c4848c195ef194fce8ec73eb4aceeb5f34b919ac SHA1 7a3e221b37d03dc12e490b479d22a821a901357f SHA256 93ff66189e490ae806c2d227e24295af0cf01e1bb0a1d7de2cf57ff59523f09e
+MD5 2f431f5c714c00d04b55e02a9d54f452 files/2.39/install-clc.lisp 501
+RMD160 c4848c195ef194fce8ec73eb4aceeb5f34b919ac files/2.39/install-clc.lisp 501
+SHA256 93ff66189e490ae806c2d227e24295af0cf01e1bb0a1d7de2cf57ff59523f09e files/2.39/install-clc.lisp 501
+DIST clisp-2.38.tar.bz2 8078151 RMD160 9070e1d7cd4db66de62f077b68a7fef7413da622 SHA256 98ddb7faa384b9b62621ac9af8b4416cbe1b6df420306fceea9e1e01a880e051
+DIST clisp-2.39.tar.bz2 8071957 RMD160 b31e53cb97a116c683543ee74093fe2a05ed9ea4 SHA1 388cc208cd0bd05a154840e83a4b824a493acbc0 SHA256 9e7db421d076420d60652e7bdaf8241e36d1db6a4cad2a8253afc9952200bbb7
+EBUILD clisp-2.38-r1.ebuild 3163 RMD160 e058c5b3d60a55bb59f61d618c70b36efa6da52d SHA1 c6049c11028391dde5537473a4ad5d2ec36eb72c SHA256 030d8425bbe6072fa79d279c36092e4316817f51bf44a469127f6443deb6134f
 MD5 18d55c8d4eac86f9ee3071fcd5830f47 clisp-2.38-r1.ebuild 3163
 RMD160 e058c5b3d60a55bb59f61d618c70b36efa6da52d clisp-2.38-r1.ebuild 3163
 SHA256 030d8425bbe6072fa79d279c36092e4316817f51bf44a469127f6443deb6134f clisp-2.38-r1.ebuild 3163
-EBUILD clisp-2.38-r2.ebuild 3598 RMD160 2f0dfc4e2026476859fc03b1c0ad08ff76c635a0 SHA1 504ea8eb575cd17c7402e91b1c82818c0ac9fb7e SHA256 0fed963d219f86c06f41800eb2dba6630c3e1b0fd1e3022196b6daac9062ae72 size 3598
+EBUILD clisp-2.38-r2.ebuild 3598 RMD160 2f0dfc4e2026476859fc03b1c0ad08ff76c635a0 SHA1 504ea8eb575cd17c7402e91b1c82818c0ac9fb7e SHA256 0fed963d219f86c06f41800eb2dba6630c3e1b0fd1e3022196b6daac9062ae72
 MD5 6356b8f21d5b6ad568f0240aa06b12ed clisp-2.38-r2.ebuild 3598
 RMD160 2f0dfc4e2026476859fc03b1c0ad08ff76c635a0 clisp-2.38-r2.ebuild 3598
 SHA256 0fed963d219f86c06f41800eb2dba6630c3e1b0fd1e3022196b6daac9062ae72 clisp-2.38-r2.ebuild 3598
-EBUILD clisp-2.38.ebuild 3141 RMD160 7d76975b149b88b11fe6b6f22ab9cc86ea996f09 SHA1 b27be5197c9b87561d1444a5cee8588767f22799 SHA256 a54f3acd15e422dd3af3f996eb9278781e696538ed3726e987c77ca699217c05 size 3141
+EBUILD clisp-2.38.ebuild 3141 RMD160 7d76975b149b88b11fe6b6f22ab9cc86ea996f09 SHA1 b27be5197c9b87561d1444a5cee8588767f22799 SHA256 a54f3acd15e422dd3af3f996eb9278781e696538ed3726e987c77ca699217c05
 MD5 dcf6f597090f7d2d4ad822bcf92427a9 clisp-2.38.ebuild 3141
 RMD160 7d76975b149b88b11fe6b6f22ab9cc86ea996f09 clisp-2.38.ebuild 3141
 SHA256 a54f3acd15e422dd3af3f996eb9278781e696538ed3726e987c77ca699217c05 clisp-2.38.ebuild 3141
-MISC ChangeLog 12445 RMD160 a4fdfeefcfa97ff8d093aabdea3b1fb8ed5dca76 SHA1 f5ed4887fd1d6d13da1fd76ec8c181e8798d0b01 SHA256 7ecdd4d539a7dd9f9c12f136a7a76cb5602233b3ff8e82751e57c1d8caa745d4 size 12445
-MD5 3c303a59c42ace327c011278ce825864 ChangeLog 12445
-RMD160 a4fdfeefcfa97ff8d093aabdea3b1fb8ed5dca76 ChangeLog 12445
-SHA256 7ecdd4d539a7dd9f9c12f136a7a76cb5602233b3ff8e82751e57c1d8caa745d4 ChangeLog 12445
-MISC metadata.xml 882 RMD160 c1c9236c3fb6d0594a998221fbff50add9b1d1b2 SHA1 87e15aa8db7170dd4ca3bb0e71c5ce2fb097f588 SHA256 b55a5dec0b7c7764565517bab024bb1526dd21cf58bc4a727f09ac3d2ff4983f size 882
+EBUILD clisp-2.39.ebuild 3527 RMD160 8ba8d236a2203cbf5c8c4fce976c83a776e7c52a SHA1 30238d4d0245183681f39d7d0d25e9e981ece012 SHA256 3234e6604e72b6eb99edbdb61ae1c90701fce9335352ec0753645cf66f462c4f
+MD5 fc4a5c0355a4489dbf9713cd45e08b2c clisp-2.39.ebuild 3527
+RMD160 8ba8d236a2203cbf5c8c4fce976c83a776e7c52a clisp-2.39.ebuild 3527
+SHA256 3234e6604e72b6eb99edbdb61ae1c90701fce9335352ec0753645cf66f462c4f clisp-2.39.ebuild 3527
+MISC ChangeLog 12779 RMD160 e77933c63c81404b52340273348cc8e9f4159130 SHA1 5a7ec8c1229b5a1199fff6e7814eb25522ab078e SHA256 8e5ae67d509062b2634e9d31af778d6de84fdfdcf43458c2ede4645a42139b50
+MD5 7e900d873c83cdee3540ea3142bd1011 ChangeLog 12779
+RMD160 e77933c63c81404b52340273348cc8e9f4159130 ChangeLog 12779
+SHA256 8e5ae67d509062b2634e9d31af778d6de84fdfdcf43458c2ede4645a42139b50 ChangeLog 12779
+MISC metadata.xml 882 RMD160 c1c9236c3fb6d0594a998221fbff50add9b1d1b2 SHA1 87e15aa8db7170dd4ca3bb0e71c5ce2fb097f588 SHA256 b55a5dec0b7c7764565517bab024bb1526dd21cf58bc4a727f09ac3d2ff4983f
 MD5 485cde76397408cf913fc6d4c7a45a67 metadata.xml 882
 RMD160 c1c9236c3fb6d0594a998221fbff50add9b1d1b2 metadata.xml 882
 SHA256 b55a5dec0b7c7764565517bab024bb1526dd21cf58bc4a727f09ac3d2ff4983f metadata.xml 882
@@ -47,10 +68,13 @@ SHA256 0cac2d185676cab92bb8516501d45c36c0867fde92ccef75a959ceb658460c46 files/di
 MD5 9210f3550260a9fcac73c39f31f2e14f files/digest-clisp-2.38-r2 238
 RMD160 60a53629c21be478cf62f91bd25afd22b09e95bf files/digest-clisp-2.38-r2 238
 SHA256 0cac2d185676cab92bb8516501d45c36c0867fde92ccef75a959ceb658460c46 files/digest-clisp-2.38-r2 238
+MD5 678e0e23853b3dcdbde06a2ab778bbb9 files/digest-clisp-2.39 238
+RMD160 41385dc1dfbc4d9e72c4491162526f22580fb51e files/digest-clisp-2.39 238
+SHA256 c3bfe5f9bfd6dee2728f0a3ca4ef42a95c7bfed32324a1b2b30e656f4bcc8c59 files/digest-clisp-2.39 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEVmGyyiNZaEAZA+ARAorWAJ4+Tw0GYrkNrrb2wJnZsggRjFCUqQCfbcCc
-BNMEAmNSRychNGKcF69Y4UQ=
-=WE5G
+iD8DBQFEwxSUyiNZaEAZA+ARAthFAJ9XZVRKd3wurmF+2yLJKkRJKiYKVwCfdJTd
+H+1VcRZ2zaVf5fbmF2JRYx4=
+=ls8H
 -----END PGP SIGNATURE-----
diff --git a/dev-lisp/clisp/clisp-2.39.ebuild b/dev-lisp/clisp/clisp-2.39.ebuild
new file mode 100644
index 000000000000..245055504073
--- /dev/null
+++ b/dev-lisp/clisp/clisp-2.39.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.39.ebuild,v 1.1 2006/07/23 06:17:08 mkennedy Exp $
+
+inherit flag-o-matic common-lisp-common-2 eutils toolchain-funcs
+
+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="~amd64 ~ppc-macos -sparc ~x86"
+IUSE="X new-clx fastcgi pcre postgres readline zlib"
+
+RDEPEND=">=dev-libs/libsigsegv-2.4
+	>=dev-lisp/common-lisp-controller-4.27
+	sys-devel/gettext
+	virtual/tetex
+	fastcgi? ( dev-libs/fcgi )
+	postgres? ( >=dev-db/postgresql-8.0 )
+	readline? ( sys-libs/readline )
+	pcre? ( dev-libs/libpcre )
+	zlib? ( sys-libs/zlib )
+	X? ( new-clx? ( || ( x11-libs/libXpm virtual/x11 ) ) )"
+
+DEPEND="${RDEPEND}
+	X? ( new-clx? ( || ( ( x11-misc/imake x11-proto/xextproto ) virtual/x11 ) ) )"
+
+PROVIDE="virtual/commonlisp"
+
+pkg_setup() {
+	if use X; then
+		if use new-clx; then
+			einfo "CLISP will be built with NEW-CLX support which is a C binding to Xorg libraries."
+		else
+			einfo "CLISP will be built with MIT-CLX support."
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}/fastcgi-Makefile-gentoo.patch
+}
+
+src_compile() {
+	CC="$(tc-getCC)"
+	local myconf="--with-dynamic-ffi
+		--with-module=wildcard
+		--with-module=rawsock"
+	use ppc-macos || myconf="${myconf} --with-module=bindings/glibc"
+	use readline || myconf="${myconf} --with-noreadline"
+	if use X; then
+		if use new-clx; then
+			myconf="${myconf} --with-module=clx/new-clx"
+		else
+			myconf="${myconf} --with-module=clx/mit-clx"
+		fi
+	fi
+	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"
+	use zlib && myconf="${myconf} --with-module=zlib"
+	einfo "Configuring with ${myconf}"
+	./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() {
+	pushd 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
+	popd
+	# install common-lisp-controller profile
+	exeinto /usr/lib/common-lisp/bin
+	doexe ${FILESDIR}/${PV}/clisp.sh
+	insinto /usr/lib/clisp
+	doins ${FILESDIR}/${PV}/install-clc.lisp
+	dodoc ${FILESDIR}/${PV}/README.Gentoo
+	keepdir /usr/lib/common-lisp/clisp
+
+	dohtml doc/impnotes.{css,html}
+	dohtml build/clisp.html
+	dohtml doc/clisp.png
+	dodoc build/clisp.{ps,pdf}
+	dodoc doc/{editors,CLOS-guide,LISP-tutorial}.txt
+}
+
+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
+}
+
+pkg_postrm() {
+	standard-impl-postrm clisp /usr/bin/clisp
+}
+
+pkg_postrm() {
+	if [ ! -x /usr/bin/clisp ]; then
+		rm -rf /usr/lib/clisp/ || die
+	fi
+}
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