Conditional support for CLISP's NEW-CLX module. If the user has X in USE and does not have new-clx in USE, then the MIT-CLX module will be built. The MIT-CLX module works better with some applications, eg. StumpWM and is therefore the default; Resolves Bug #128572.

(Portage version: 2.1_pre7-r1)

4 files changed, 139 insertions, 11 deletions

diff --git a/dev-lisp/clisp/ChangeLog b/dev-lisp/clisp/ChangeLog
index 46464ae470a4..0a9ec267cb35 100644
--- a/dev-lisp/clisp/ChangeLog
+++ b/dev-lisp/clisp/ChangeLog
@@ -1,6 +1,14 @@
 # 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.49 2006/04/03 17:29:50 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.50 2006/04/04 02:39:55 mkennedy Exp $
+
+*clisp-2.38-r2 (04 Apr 2006)
+
+  04 Apr 2006; Matthew Kennedy <mkennedy@gentoo.org> +clisp-2.38-r2.ebuild:
+  Conditional support for CLISP's NEW-CLX module. If the user has X in USE and
+  does not have new-clx in USE, then the MIT-CLX module will be built. The
+  MIT-CLX module works better with some applications, eg. StumpWM and is
+  therefore the default; Resolves Bug #128572.
 
 *clisp-2.38-r1 (03 Apr 2006)
 
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index 66f6ac670385..b0d86cb342e9 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -1,12 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 fdaa3c5ba38979d5847fcd8a11b6d95a ChangeLog 11716
 RMD160 7e7bf4e4d7b65a68019aac7b965e941471570d8a ChangeLog 11716
 SHA256 cf362bce2303846ab0dd3f98815747c76349cf79884fafd51c6a887d63d32c1c ChangeLog 11716
 MD5 18d55c8d4eac86f9ee3071fcd5830f47 clisp-2.38-r1.ebuild 3163
 RMD160 e058c5b3d60a55bb59f61d618c70b36efa6da52d clisp-2.38-r1.ebuild 3163
 SHA256 030d8425bbe6072fa79d279c36092e4316817f51bf44a469127f6443deb6134f clisp-2.38-r1.ebuild 3163
+MD5 47117c68095901522845f1adbf6dd9d8 clisp-2.38-r2.ebuild 3511
+RMD160 9eb6ad75b227abbacdae8ee707c0f750cd96750f clisp-2.38-r2.ebuild 3511
+SHA256 efcd56250ea2a6d31d21f8da1ece76bc0f96ed72f38f2c350bb098e633055b1e clisp-2.38-r2.ebuild 3511
 MD5 dcf6f597090f7d2d4ad822bcf92427a9 clisp-2.38.ebuild 3141
 RMD160 7d76975b149b88b11fe6b6f22ab9cc86ea996f09 clisp-2.38.ebuild 3141
 SHA256 a54f3acd15e422dd3af3f996eb9278781e696538ed3726e987c77ca699217c05 clisp-2.38.ebuild 3141
@@ -25,13 +25,9 @@ SHA256 c0447d26305693b9f8d0a627a9d47d17a546da8a00a7c20137f7733f2be5b104 files/di
 MD5 9210f3550260a9fcac73c39f31f2e14f files/digest-clisp-2.38-r1 238
 RMD160 60a53629c21be478cf62f91bd25afd22b09e95bf files/digest-clisp-2.38-r1 238
 SHA256 0cac2d185676cab92bb8516501d45c36c0867fde92ccef75a959ceb658460c46 files/digest-clisp-2.38-r1 238
+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 485cde76397408cf913fc6d4c7a45a67 metadata.xml 882
 RMD160 c1c9236c3fb6d0594a998221fbff50add9b1d1b2 metadata.xml 882
 SHA256 b55a5dec0b7c7764565517bab024bb1526dd21cf58bc4a727f09ac3d2ff4983f metadata.xml 882
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEMVubyiNZaEAZA+ARAiyDAJ400QVHhgYgNktDdQ46nuCoprfSKQCfWQk9
-0M6mXy5Ez3nczZeQ0ZVWX20=
-=yL4o
------END PGP SIGNATURE-----
diff --git a/dev-lisp/clisp/clisp-2.38-r2.ebuild b/dev-lisp/clisp/clisp-2.38-r2.ebuild
new file mode 100644
index 000000000000..815277c2b86f
--- /dev/null
+++ b/dev-lisp/clisp/clisp-2.38-r2.ebuild
@@ -0,0 +1,121 @@
+# 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.38-r2.ebuild,v 1.1 2006/04/04 02:39:55 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 ~ppc-macos -sparc ~x86"
+IUSE="X new-clx fastcgi pcre postgres readline zlib"
+
+RDEPEND="dev-libs/libsigsegv
+	>=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_compile() {
+	# Let CLISP use its own set of optimizations
+	unset CFLAGS CXXFLAGS
+	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/digest-clisp-2.38-r2 b/dev-lisp/clisp/files/digest-clisp-2.38-r2
new file mode 100644
index 000000000000..797910b544ad
--- /dev/null
+++ b/dev-lisp/clisp/files/digest-clisp-2.38-r2
@@ -0,0 +1,3 @@
+MD5 960e1f6e232415c59b6978f92e62f30b clisp-2.38.tar.bz2 8078151
+RMD160 9070e1d7cd4db66de62f077b68a7fef7413da622 clisp-2.38.tar.bz2 8078151
+SHA256 98ddb7faa384b9b62621ac9af8b4416cbe1b6df420306fceea9e1e01a880e051 clisp-2.38.tar.bz2 8078151