New upstream version.

(Portage version: 2.1.2_rc3)

4 files changed, 118 insertions, 1 deletions

diff --git a/dev-lisp/cmucl/ChangeLog b/dev-lisp/cmucl/ChangeLog
index 7ce41615d4eb..4afde63cdfa5 100644
--- a/dev-lisp/cmucl/ChangeLog
+++ b/dev-lisp/cmucl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/cmucl
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.24 2006/11/19 17:20:55 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.25 2006/12/11 06:43:24 mkennedy Exp $
+
+*cmucl-19d_p2 (11 Dec 2006)
+
+  11 Dec 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/19d-cmucl-patch-002.patch, +cmucl-19d_p2.ebuild:
+  New upstream version.
 
 *cmucl-19d_pre1-r1 (19 Nov 2006)
 
diff --git a/dev-lisp/cmucl/cmucl-19d_p2.ebuild b/dev-lisp/cmucl/cmucl-19d_p2.ebuild
new file mode 100644
index 000000000000..5a9f8ac22873
--- /dev/null
+++ b/dev-lisp/cmucl/cmucl-19d_p2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-19d_p2.ebuild,v 1.1 2006/12/11 06:43:24 mkennedy Exp $
+
+inherit common-lisp-common-3 eutils toolchain-funcs
+
+MY_PV=${PV:0:3}
+MY_PVL=${PV}
+
+DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://www.cons.org/cmucl/"
+SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-src-${MY_PV}.tar.bz2
+	http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-${MY_PV}-x86-linux.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc lesstif source"
+
+DEPEND="lesstif? ( x11-libs/lesstif )
+	!lesstif? ( x11-libs/openmotif )
+	sys-devel/bc"
+
+PROVIDE="virtual/commonlisp"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${MY_PV}-gentoo.patch || die
+	epatch ${FILESDIR}/${MY_PV}-cmucl-patch-002.patch || die
+	find ${S} -type f \( -name \*.sh -o -name linux-nm \) \
+		-exec chmod +x '{}' \;
+	# non-x86 maintainers, add to the the following and verify
+	if use lesstif || test -d /usr/X11R6/include/lesstif; then
+		sed -i -e 's,-I/usr/X11R6/include,-I/usr/X11R6/include/lesstif,g' \
+			-e 's,-L/usr/X11R6/lib,-L/usr/X11R6/lib/lesstif -L/usr/X11R6/lib,g' \
+			src/motif/server/Config.x86
+	fi
+	sed -i -e "s,CC = .*,CC = $(tc-getCC),g" src/lisp/Config.linux_gencgc
+	sed -i -e 's,"time","",g' src/tools/build.sh
+	sed -i -e "s,@CFLAGS@,$CFLAGS,g" src/lisp/Config.linux_gencgc src/motif/server/Config.x86
+}
+
+src_compile() {
+	export SANDBOX_ON=0
+	src/tools/build.sh -C "" -o "bin/lisp -core lib/cmucl/lib/lisp.core -batch -noinit -nositeinit" || die
+}
+
+src_install() {
+	src/tools/make-dist.sh -g -G root -O root build-4 ${MY_PVL} x86 linux
+	dodir /usr/share/doc
+	for i in cmucl-${MY_PVL}-x86-linux.{,extra.}tar.gz; do
+		tar xzpf $i -C ${D}/usr
+	done
+	mv ${D}/usr/doc ${D}/usr/share/doc/${PF}
+	mv ${D}/usr/man ${D}/usr/share/
+	impl-save-timestamp-hack cmucl || die
+}
+
+pkg_postinst() {
+	standard-impl-postinst cmucl
+}
+
+pkg_postrm() {
+	standard-impl-postrm cmucl /usr/bin/lisp
+}
+
+# pkg_postrm() {
+#	if [ ! -x /usr/bin/lisp ]; then
+#		rm -rf /usr/lib/cmucl/ || die
+#	fi
+# }
diff --git a/dev-lisp/cmucl/files/19d-cmucl-patch-002.patch b/dev-lisp/cmucl/files/19d-cmucl-patch-002.patch
new file mode 100644
index 000000000000..4d7af2410990
--- /dev/null
+++ b/dev-lisp/cmucl/files/19d-cmucl-patch-002.patch
@@ -0,0 +1,32 @@
+diff -ur src.orig/pcl/std-class.lisp src/pcl/std-class.lisp
+--- src.orig/pcl/std-class.lisp	2005-07-07 11:44:27.000000000 -0500
++++ src/pcl/std-class.lisp	2006-12-11 00:01:52.000000000 -0600
+@@ -816,13 +816,17 @@
+   (when (and (not (or finalizep (class-finalized-p class)))
+ 	     (not (class-has-a-forward-referenced-superclass-p class)))
+     (finalize-inheritance class)
++    (dolist (sub (class-direct-subclasses class))
++      (update-class sub nil))
+     (return-from update-class))
+   ;;
+   (when (or finalizep
+ 	    (class-finalized-p class)
+ 	    (not (class-has-a-forward-referenced-superclass-p class)))
+     (setf (find-class (class-name class)) class)
+-    (update-cpl class (compute-class-precedence-list class))
++    (let ((*allow-forward-referenced-classes-in-cpl-p*
++	   (class-has-a-forward-referenced-superclass-p class)))
++      (update-cpl class (compute-class-precedence-list class)))
+     (update-slots class (compute-slots class))
+     (update-gfs-of-class class)
+     (update-inits class (compute-default-initargs class))
+@@ -832,6 +836,9 @@
+   (unless finalizep
+     (dolist (sub (class-direct-subclasses class))
+       (update-class sub nil))))
++)
++
++(pushnew :cmucl-19d-patch-002 *features*)
+ 
+ ;;;
+ ;;; Set values of shared slots from initforms inherited from
diff --git a/dev-lisp/cmucl/files/digest-cmucl-19d_p2 b/dev-lisp/cmucl/files/digest-cmucl-19d_p2
new file mode 100644
index 000000000000..cc093a2971ef
--- /dev/null
+++ b/dev-lisp/cmucl/files/digest-cmucl-19d_p2
@@ -0,0 +1,6 @@
+MD5 802cd8b05e376ff04c9006dd04f5bc7e cmucl-19d-x86-linux.tar.bz2 7600189
+RMD160 43a6d3e2637a74dad3155923f6771c213e09f54a cmucl-19d-x86-linux.tar.bz2 7600189
+SHA256 5d459213f37dac8f633377d1c64901d1e9fe9c5774a7b1d5f914c306fb48dadc cmucl-19d-x86-linux.tar.bz2 7600189
+MD5 3a3dba371a7e1db7fa4b8f338acd72a3 cmucl-src-19d.tar.bz2 3780254
+RMD160 5f691d74f4263e33142f478616a8c09524f2318b cmucl-src-19d.tar.bz2 3780254
+SHA256 027a86d3e2729e14cb8101d088716a61fb62b5197af66a4f80457f13134514bf cmucl-src-19d.tar.bz2 3780254