(Portage version: 2.0.51-r15)

11 files changed, 391 insertions, 64 deletions

diff --git a/dev-lisp/cl-mcclim/ChangeLog b/dev-lisp/cl-mcclim/ChangeLog
index 300f11b1e329..514214f32594 100644
--- a/dev-lisp/cl-mcclim/ChangeLog
+++ b/dev-lisp/cl-mcclim/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for dev-lisp/cl-mcclim
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-mcclim/ChangeLog,v 1.5 2004/06/26 13:30:15 dholm Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-mcclim/ChangeLog,v 1.6 2005/02/09 07:55:59 mkennedy Exp $
+
+*cl-mcclim-0.9.20050202 (04 Feb 2005)
+
+  04 Feb 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/0.9.20041227-gentoo.patch, files/50mcclim-gentoo.el,
+  files/TODO.Gentoo, cl-mcclim-0.9.20040603.ebuild,
+  +cl-mcclim-0.9.20041227.ebuild, +cl-mcclim-0.9.20050202.ebuild,
+  cl-mcclim-0.9.ebuild:
+  New upstream version; Remove dependency on cmucl-sources.
+
+*cl-mcclim-0.9.20041130 (14 Dec 2004)
+
+  14 Dec 2004; Matthew Kennedy <mkennedy@gentoo.org> files/TODO.Gentoo,
+  +files/0.9.20041130/50mcclim-gentoo.el, cl-mcclim-0.9.20040603.ebuild,
+  +cl-mcclim-0.9.20041130.ebuild, cl-mcclim-0.9.ebuild:
+  New upstream version; Simplified documentation generation; Depend on
+  dev-lisp/cl-clx and not dev-lisp/cl-sbcl-clx
 
   26 Jun 2004; David Holm <dholm@gentoo.org> cl-mcclim-0.9.20040603.ebuild:
   Added to ~ppc.
diff --git a/dev-lisp/cl-mcclim/Manifest b/dev-lisp/cl-mcclim/Manifest
index bbd97206974a..72d8e99c3d89 100644
--- a/dev-lisp/cl-mcclim/Manifest
+++ b/dev-lisp/cl-mcclim/Manifest
@@ -1,10 +1,15 @@
-MD5 380d53ab9de8a35e94cf1aa27d6ea6f7 cl-mcclim-0.9.ebuild 2742
-MD5 e96350450370c8920a838e046c1e41e9 cl-mcclim-0.9.20040603.ebuild 3602
-MD5 d5dbb8364bde53353ee5a8e2cbc42497 ChangeLog 912
+MD5 52d90c4fbca2f42100650cbb1eb1efbd cl-mcclim-0.9.ebuild 2724
+MD5 96b58ee893d9c738ccb8d668089cb928 cl-mcclim-0.9.20040603.ebuild 2928
+MD5 426c9513aa3f087e204d9964af9c83b9 cl-mcclim-0.9.20041227.ebuild 2894
+MD5 a0511ef95d6d48f5d2e15aa965687100 ChangeLog 1628
 MD5 c8d8979589a5ef6d1310a74961af2636 metadata.xml 1191
+MD5 8cc936224c0fa3d6197b191de3efae39 cl-mcclim-0.9.20050202.ebuild 2879
 MD5 91915558ef2580b27d0e99f555988c86 files/digest-cl-mcclim-0.9 60
-MD5 55255c87d819e42c5f7b875a393a44b0 files/50mcclim-gentoo.el 129
+MD5 6c70574406d341f011851b22c49acb4a files/50mcclim-gentoo.el 103
 MD5 76c3cf12529f257d261f01aa1fbcff6f files/digest-cl-mcclim-0.9.20040603 259
-MD5 f54ab82a0c7cd3535e08011827b6bd4a files/TODO.Gentoo 226
+MD5 fa76fda52355a76f5091721ad0b2ab73 files/digest-cl-mcclim-0.9.20041227 167
+MD5 81a78c7a1899afa37ec82906fe725256 files/digest-cl-mcclim-0.9.20050202 167
+MD5 dab89c877892b4ae1e03e37857442184 files/TODO.Gentoo 247
+MD5 c1d843ac4832f2028d4be33667418e09 files/0.9.20041227-gentoo.patch 4800
 MD5 3f8a3f5066bf6c9b4035a9b40d426825 files/0.9/system.lisp-gentoo.patch 651
 MD5 0c0ff6c9e4eed120e881cb843e78c679 files/0.9.20040603/50mcclim-gentoo.el 130
diff --git a/dev-lisp/cl-mcclim/cl-mcclim-0.9.20040603.ebuild b/dev-lisp/cl-mcclim/cl-mcclim-0.9.20040603.ebuild
index 2e33bada70ee..6cc7d3243020 100644
--- a/dev-lisp/cl-mcclim/cl-mcclim-0.9.20040603.ebuild
+++ b/dev-lisp/cl-mcclim/cl-mcclim-0.9.20040603.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-mcclim/cl-mcclim-0.9.20040603.ebuild,v 1.3 2004/06/26 13:30:15 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-mcclim/cl-mcclim-0.9.20040603.ebuild,v 1.4 2005/02/09 07:55:59 mkennedy Exp $
 
 inherit common-lisp elisp eutils
 
@@ -22,7 +22,7 @@ IUSE="emacs doc"
 
 DEPEND="dev-lisp/common-lisp-controller
 	dev-lisp/cmucl-source
-	dev-lisp/cl-clx-sbcl
+	dev-lisp/cl-clx
 	doc? ( media-gfx/transfig
 		media-libs/netpbm
 		virtual/tetex )
@@ -34,38 +34,14 @@ ELISP_SOURCES="Tools/Emacs/indent-clim.el Spec/climbols.el"
 
 S=${WORKDIR}/${PN}-${THEIR_PV}.orig
 
-docs-buildable-p() {
-#	use doc && test -x /usr/bin/lisp # only CMUCL can build documentation at this time
-	false
-}
-
 src_unpack() {
 	unpack ${A}
 	epatch cl-mcclim_${THEIR_PV}-${DEB_PV}.diff
 }
 
 src_compile() {
-	if use doc; then
-		make -C Doc manual.ps
-		if docs-buildable-p; then
-			lisp -batch -noinit -nosite-init -eval "
-(progn
-  (compile-file \"Tools/gilbert/clim-doc-convert\")
-  (quit))"
-			lisp -batch -noinit -nositeinit \
-				-load Tools/gilbert/clim-doc-convert \
-				-eval "
-(progn
-  (defparameter clim-doc-convert::*mcclim-base-dir* \"${S}/\")
-  (defparameter clim-doc-convert::*output-directory* \"${S}/clim-spec/\")
-  (clim-doc-convert:run)
-  (quit))"
-		fi
-	fi
-
-	if use emacs; then
-		cp ${ELISP_SOURCES} . && elisp-compile *.el
-	fi
+	use doc && make -C Doc manual.ps
+	use emacs && cp ${ELISP_SOURCES} . && elisp-compile *.el
 }
 
 src_install() {
@@ -108,14 +84,7 @@ src_install() {
 	dodoc INSTALL* README TODO Copyright ReleaseNotes/* debian/*README.Debian Webpage/clim-paper.pdf
 	do-debian-credits
 
-	if use doc; then
-		dodoc Doc/manual.ps
-		if docs-buildable-p; then
-			insinto /usr/share/doc/${PF}/html/Spec
-			doins clim-spec/*
-		fi
-	fi
-
+	use doc && dodoc Doc/manual.ps
 	if use emacs; then
 		insinto /usr/share/emacs/site-lisp/${PN}
 		doins *.el *.elc
diff --git a/dev-lisp/cl-mcclim/cl-mcclim-0.9.20041227.ebuild b/dev-lisp/cl-mcclim/cl-mcclim-0.9.20041227.ebuild
new file mode 100644
index 000000000000..476275c8035e
--- /dev/null
+++ b/dev-lisp/cl-mcclim/cl-mcclim-0.9.20041227.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-mcclim/cl-mcclim-0.9.20041227.ebuild,v 1.1 2005/02/09 07:55:59 mkennedy Exp $
+
+inherit common-lisp elisp eutils
+
+DEB_PV=1
+THEIR_PV="${PV:0:3}+cvs.${PV:4:4}.${PV:8:2}.${PV:10:2}"
+
+DESCRIPTION="McCLIM is a free software implementation of CLIM."
+HOMEPAGE="http://clim.mikemac.com/
+	http://clim.mikemac.com/spec/clim.html
+	http://packages.debian.org/unstable/devel/cl-mcclim
+	http://clim.mikemac.com/spec/clim.html"
+SRC_URI="http://ftp.debian.org/debian/pool/main/c/cl-mcclim/cl-mcclim_${THEIR_PV}.orig.tar.gz
+	http://ftp.debian.org/debian/pool/main/c/cl-mcclim/cl-mcclim_${THEIR_PV}-${DEB_PV}.diff.gz"
+LICENSE="LLGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="emacs doc"
+
+DEPEND="dev-lisp/common-lisp-controller
+	dev-lisp/cmucl-source
+	dev-lisp/cl-clx
+	doc? ( media-gfx/transfig
+		media-libs/netpbm
+		virtual/tetex )
+	emacs? ( virtual/emacs )"
+
+CLPACKAGE="mcclim"
+# CLPACKAGE="mcclim clim-examples"
+SITEFILE=${FILESDIR}/50mcclim-gentoo.el
+ELISP_SOURCES="Tools/Emacs/indent-clim.el"
+
+S=${WORKDIR}/${PN}-${THEIR_PV}.orig
+
+src_unpack() {
+	unpack ${A}
+	epatch cl-mcclim_${THEIR_PV}-${DEB_PV}.diff || die
+	epatch ${FILESDIR}/${PV}-gentoo.patch || die
+}
+
+src_compile() {
+	use doc && make -C Doc manual.ps
+	use emacs && cp ${ELISP_SOURCES} . && elisp-compile *.el
+}
+
+src_install() {
+	dodir ${CLSYSTEMROOT}
+
+	for backend in CLX OpenGL PostScript; do
+		insinto ${CLSOURCEROOT}/mcclim/Backends/${backend}
+		doins Backends/${backend}/*
+	done
+	for experiment in freetype pprint unzip; do
+		insinto ${CLSOURCEROOT}/mcclim/Experimental/${experiment}
+		doins Experimental/${experiment}/*
+	done
+	insinto ${CLSOURCEROOT}/mcclim/Experimental
+	doins Experimental/*.lisp
+
+	insinto ${CLSOURCEROOT}/mcclim/Goatee
+	doins Goatee/*
+
+	insinto ${CLSOURCEROOT}/mcclim/Lisp-Dep
+	doins Lisp-Dep/*
+
+# 	insinto ${CLSOURCEROOT}/clim-examples/Examples
+# 	doins Examples/*
+# 	insinto ${CLSOURCEROOT}/clim-examples
+# 	doins Goatee/goatee-test.lisp
+
+	insinto ${CLSOURCEROOT}/mcclim
+	doins *.lisp debian/mcclim.asd
+	dosym ${CLSOURCEROOT}/mcclim/mcclim.asd ${CLSYSTEMROOT}/mcclim.asd
+
+# 	insinto ${CLSOURCEROOT}/clim-examples/
+# 	doins debian/clim-examples.asd
+# 	dosym ${CLSOURCEROOT}/clim-examples/clim-examples.asd ${CLSYSTEMROOT}/clim-examples.asd
+
+	for system in clim-clx-user clim-clx clim-looks clim; do
+		dosym ${CLSYSTEMROOT}/mcclim.asd ${CLSYSTEMROOT}/${system}.asd
+	done
+
+	dodoc INSTALL* README TODO Copyright ReleaseNotes/* debian/*README.Debian Webpage/clim-paper.pdf
+	do-debian-credits
+
+	use doc && dodoc Doc/manual.ps
+	if use emacs; then
+		insinto /usr/share/emacs/site-lisp/${PN}
+		doins *.el *.elc
+		elisp-site-file-install ${SITEFILE}
+	fi
+}
+
+pkg_postinst() {
+	elisp_pkg_postinst
+	common-lisp_pkg_postinst
+}
+
+pkg_postrm() {
+	elisp_pkg_postinst
+	common-lisp_pkg_postrm
+}
diff --git a/dev-lisp/cl-mcclim/cl-mcclim-0.9.20050202.ebuild b/dev-lisp/cl-mcclim/cl-mcclim-0.9.20050202.ebuild
new file mode 100644
index 000000000000..c8f8440be2dc
--- /dev/null
+++ b/dev-lisp/cl-mcclim/cl-mcclim-0.9.20050202.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-mcclim/cl-mcclim-0.9.20050202.ebuild,v 1.1 2005/02/09 07:55:59 mkennedy Exp $
+
+inherit common-lisp elisp eutils
+
+DEB_PV=1
+THEIR_PV="${PV:0:3}+cvs.${PV:4:4}.${PV:8:2}.${PV:10:2}"
+
+DESCRIPTION="McCLIM is a free software implementation of CLIM."
+HOMEPAGE="http://clim.mikemac.com/
+	http://clim.mikemac.com/spec/clim.html
+	http://packages.debian.org/unstable/devel/cl-mcclim
+	http://clim.mikemac.com/spec/clim.html"
+SRC_URI="http://ftp.debian.org/debian/pool/main/c/cl-mcclim/cl-mcclim_${THEIR_PV}.orig.tar.gz
+	http://ftp.debian.org/debian/pool/main/c/cl-mcclim/cl-mcclim_${THEIR_PV}-${DEB_PV}.diff.gz"
+LICENSE="LLGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="emacs doc"
+
+DEPEND="dev-lisp/common-lisp-controller
+	dev-lisp/cl-clx
+	doc? ( media-gfx/transfig
+		media-libs/netpbm
+		virtual/tetex )
+	emacs? ( virtual/emacs )"
+
+CLPACKAGE="mcclim"
+# CLPACKAGE="mcclim clim-examples"
+SITEFILE=${FILESDIR}/50mcclim-gentoo.el
+ELISP_SOURCES="Tools/Emacs/indent-clim.el"
+
+S=${WORKDIR}/${PN}-${THEIR_PV}.orig
+
+src_unpack() {
+	unpack ${A}
+	epatch cl-mcclim_${THEIR_PV}-${DEB_PV}.diff || die
+}
+
+src_compile() {
+	use doc && make -C Doc manual.ps
+	use emacs && cp ${ELISP_SOURCES} . && elisp-compile *.el
+}
+
+src_install() {
+	dodir ${CLSYSTEMROOT}
+	for backend in CLX OpenGL PostScript; do
+		insinto ${CLSOURCEROOT}/mcclim/Backends/${backend}
+		doins Backends/${backend}/*
+	done
+	for experiment in freetype pprint unzip; do
+		insinto ${CLSOURCEROOT}/mcclim/Experimental/${experiment}
+		doins Experimental/${experiment}/*
+	done
+	insinto ${CLSOURCEROOT}/mcclim/Experimental
+	doins Experimental/*.lisp
+	insinto ${CLSOURCEROOT}/mcclim/Goatee
+	doins Goatee/*
+	insinto ${CLSOURCEROOT}/mcclim/Lisp-Dep
+	doins Lisp-Dep/*
+	insinto ${CLSOURCEROOT}/mcclim/Looks/
+	doins Looks/*
+	insinto ${CLSOURCEROOT}/mcclim
+	doins *.lisp debian/mcclim.asd
+	dosym ${CLSOURCEROOT}/mcclim/mcclim.asd ${CLSYSTEMROOT}/mcclim.asd
+	insinto ${CLSOURCEROOT}/clim-examples/
+	doins debian/clim-examples.asd
+	dosym ${CLSOURCEROOT}/clim-examples/clim-examples.asd \
+		${CLSYSTEMROOT}/clim-examples.asd
+	insinto ${CLSOURCEROOT}/clim-examples/Examples
+	doins Examples/*.lisp
+	insinto ${CLSOURCEROOT}/clim-examples/Goatee
+	doins Goatee/goatee-test.lisp
+	for system in clim-clx-user clim-clx clim-looks clim; do
+		dosym ${CLSYSTEMROOT}/mcclim.asd ${CLSYSTEMROOT}/${system}.asd
+	done
+	dodoc INSTALL* README TODO Copyright ReleaseNotes/*
+	dodoc debian/*README.Debian Webpage/clim-paper.pdf
+	do-debian-credits
+	use doc && dodoc Doc/manual.ps
+	if use emacs; then
+		insinto /usr/share/emacs/site-lisp/${PN}
+		doins *.el *.elc
+		elisp-site-file-install ${SITEFILE}
+	fi
+}
+
+pkg_postinst() {
+	elisp_pkg_postinst
+	common-lisp_pkg_postinst
+}
+
+pkg_postrm() {
+	elisp_pkg_postinst
+	common-lisp_pkg_postrm
+}
diff --git a/dev-lisp/cl-mcclim/cl-mcclim-0.9.ebuild b/dev-lisp/cl-mcclim/cl-mcclim-0.9.ebuild
index 5ec8b8d7c5a9..7423e24b36f6 100644
--- a/dev-lisp/cl-mcclim/cl-mcclim-0.9.ebuild
+++ b/dev-lisp/cl-mcclim/cl-mcclim-0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-mcclim/cl-mcclim-0.9.ebuild,v 1.5 2004/07/14 15:55:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-mcclim/cl-mcclim-0.9.ebuild,v 1.6 2005/02/09 07:55:59 mkennedy Exp $
 
 inherit common-lisp elisp eutils
 
@@ -15,7 +15,7 @@ IUSE="doc emacs"
 
 DEPEND="dev-lisp/common-lisp-controller
 	dev-lisp/cmucl-source
-	dev-lisp/cl-clx-sbcl
+	dev-lisp/cl-clx
 	doc? ( media-gfx/transfig
 		media-libs/netpbm
 		virtual/tetex )
@@ -40,16 +40,16 @@ src_compile() {
 		if [ -x /usr/bin/lisp ]; then
 			lisp -batch -noinit -nosite-init -eval "
 (progn
-  (compile-file \"Tools/gilbert/clim-doc-convert\")
-  (quit))"
+(compile-file \"Tools/gilbert/clim-doc-convert\")
+quit))"
 			lisp -batch -noinit -nositeinit \
 				-load Tools/gilbert/clim-doc-convert \
 				-eval "
 (progn
-  (defparameter clim-doc-convert::*mcclim-base-dir* \"${S}/\")
-  (defparameter clim-doc-convert::*output-directory* \"${S}/clim-spec/\")
-  (clim-doc-convert:run)
-  (quit))"
+(defparameter clim-doc-convert::*mcclim-base-dir* \"${S}/\")
+(defparameter clim-doc-convert::*output-directory* \"${S}/clim-spec/\")
+(clim-doc-convert:run)
+(quit))"
 		elif [ -x /usr/bin/sbcl ]; then
 			ewarn "Documentation cannot be built with SBCL at this time"
 		elif [ -x /usr/bin/clisp ]; then
diff --git a/dev-lisp/cl-mcclim/files/0.9.20041227-gentoo.patch b/dev-lisp/cl-mcclim/files/0.9.20041227-gentoo.patch
new file mode 100644
index 000000000000..b39c1063fbef
--- /dev/null
+++ b/dev-lisp/cl-mcclim/files/0.9.20041227-gentoo.patch
@@ -0,0 +1,136 @@
+diff -ur cl-mcclim-0.9+cvs.2004.12.27.orig.orig/Backends/CLX/system.lisp cl-mcclim-0.9+cvs.2004.12.27.orig/Backends/CLX/system.lisp
+--- cl-mcclim-0.9+cvs.2004.12.27.orig.orig/Backends/CLX/system.lisp	2004-12-27 03:44:13.000000000 -0600
++++ cl-mcclim-0.9+cvs.2004.12.27.orig/Backends/CLX/system.lisp	2005-01-04 20:11:44.472818141 -0600
+@@ -15,12 +15,13 @@
+ ;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, 
+ ;;; Boston, MA  02111-1307  USA.
+ 
+-(in-package :common-lisp-user)
++(in-package #:clim-system)
+ 
+ #+:excl(require :clx)
+ #+:excl(require :loop)
+ 
+-(clim-defsystem (:clim-clx :depends-on (:clim #+(and sbcl asdf) :clx))
++#+(and (or sbcl cmu) asdf common-lisp-controller)
++(clim-defsystem (:clim-clx :depends-on (:clim :clx))
+   "Backends/CLX/package"
+   "Backends/CLX/keysyms-common"
+   "Backends/CLX/keysyms"
+diff -ur cl-mcclim-0.9+cvs.2004.12.27.orig.orig/debian/mcclim.asd cl-mcclim-0.9+cvs.2004.12.27.orig/debian/mcclim.asd
+--- cl-mcclim-0.9+cvs.2004.12.27.orig.orig/debian/mcclim.asd	2005-01-04 10:57:04.000000000 -0600
++++ cl-mcclim-0.9+cvs.2004.12.27.orig/debian/mcclim.asd	2005-01-04 20:09:28.446124914 -0600
+@@ -22,64 +22,37 @@
+ ;;; Modified in 2004 by Milan Zamazal <pdm@debian.org> for Debian installation.
+ ;;; Make diff against ../system.lisp to get the detailed modification report.
+ 
+-(in-package :common-lisp-user)
++(defpackage #:clim-system
++  (:use #:asdf
++	#:common-lisp))
++
++(in-package #:clim-system)
+ 
+ (defparameter *clim-directory* (directory-namestring *load-truename*))
+ 
+-#+cmu
+-(progn
+-  (unless (fboundp 'ext:stream-read-char)
+-    (asdf:operate 'asdf:load-op :cmucl-graystream)
+-    #+nil
+-    (unless (ignore-errors (ext:search-list "gray-streams:"))
+-      (setf (ext:search-list "gray-streams:")
+-	'("target:pcl/" "library:subsystems/")))
+-    #+nil
+-    (if (fboundp 'without-package-locks)
+-	(without-package-locks
+-	 (load "gray-streams:gray-streams-library"))
+-      (load "gray-streams:gray-streams-library")))
+-  #-clx
+-  (asdf:operate 'asdf:load-op :cmucl-clx)
+-  #-(or mk-defsystem asdf)
+-  (load "library:subsystems/defsystem")
+-  #+mp (when (eq mp::*initial-process* mp::*current-process*)
+-	 (format t "~%~%You need to run (mp::startup-idle-and-top-level-loops) to start up the multiprocessing support.~%~%")))
++;; #+(and cmu mp)
++;; (progn
++;;   (when (eq mp::*initial-process* mp::*current-process*)
++;;     (format t "~%~%You need to run (mp::startup-idle-and-top-level-loops) to start up the multiprocessing support.~%~%")))
+ 
+ (pushnew :clim *features*)
+ (pushnew :mcclim *features*)
+ 
+-#+mk-defsystem (use-package "MK")
+-
+ (defmacro clim-defsystem ((module &key depends-on) &rest components)
+   `(progn
+-     #+mk-defsystem
+-     (defsystem ,module
+-       :source-pathname *clim-directory*
+-       :source-extension "lisp"
+-       ,@(and depends-on `(:depends-on ,depends-on))
+-        :components
+-	(:serial
+-	 ,@components))
+-     #+asdf
+      (asdf:defsystem ,module
+-	 ,@(and depends-on
+-		`(:depends-on ,depends-on))
+-	 :serial t
+-	 :components
+-	 (,@(loop for c in components
+-		  for p = (merge-pathnames
+-			   (parse-namestring c)
+-			   (make-pathname :type "lisp"
+-					  :defaults *clim-directory*))
+-		  collect `(:file ,(pathname-name p) :pathname ,p))))
+-     #-(or mk-defsystem asdf)
+-     (defsystem ,module ()
+-       (:serial
+-	,@depends-on
+-	,@components))))
++       ,@(and depends-on
++	      `(:depends-on ,depends-on))
++       :serial t
++       :components
++       (,@(loop for c in components
++	     for p = (merge-pathnames
++		      (parse-namestring c)
++		      (make-pathname :type "lisp"
++				     :defaults *clim-directory*))
++	     collect `(:file ,(pathname-name p) :pathname ,p))))))
+ 
+-(clim-defsystem (:clim-lisp)
++(clim-defsystem (:clim-lisp :depends-on (#+cmu :cmucl-graystream))
+   ;; First possible patches
+   "patch"
+   #+cmu       "Lisp-Dep/fix-cmu"
+@@ -92,18 +65,16 @@
+ 
+ (clim-defsystem (:clim-core :depends-on (:clim-lisp))
+    "decls"
+-
+-   #.(or
+-      #+(and :cmu :mp (not :pthread))  "Lisp-Dep/mp-cmu"
+-
+-      ;; Rumor is that SB-THREAD is a feature test for the presence of
+-      ;; multithreading in SBCL.
+-
+-      #+sb-thread               "Lisp-Dep/mp-sbcl"
+-      #+excl                    "Lisp-Dep/mp-acl"
+-      #+openmcl                 "Lisp-Dep/mp-openmcl"
+-      #+lispworks               "Lisp-Dep/mp-lw"
+-      #| fall back |#           "Lisp-Dep/mp-nil")
++   #+(and :cmu :mp (not :pthread))  "Lisp-Dep/mp-cmu"
++   #+sb-thread               "Lisp-Dep/mp-sbcl"
++   #+excl                    "Lisp-Dep/mp-acl"
++   #+openmcl                 "Lisp-Dep/mp-openmcl"
++   #+lispworks               "Lisp-Dep/mp-lw"
++   #-(or (and :cmu :mp (not :pthread))
++	 sb-thread
++	 excl
++	 openmcl
++	 lispworks)          "Lisp-Dep/mp-nil"
+    "utils"
+    "defresource"
+    "setf-star"
diff --git a/dev-lisp/cl-mcclim/files/50mcclim-gentoo.el b/dev-lisp/cl-mcclim/files/50mcclim-gentoo.el
index 8769b164764f..9dd1491042ac 100644
--- a/dev-lisp/cl-mcclim/files/50mcclim-gentoo.el
+++ b/dev-lisp/cl-mcclim/files/50mcclim-gentoo.el
@@ -3,4 +3,3 @@
 
 (add-to-list 'load-path "@SITELISP@")
 (load-library "indent-clim")
-(load-library "climbols")
diff --git a/dev-lisp/cl-mcclim/files/TODO.Gentoo b/dev-lisp/cl-mcclim/files/TODO.Gentoo
index c0b563a39cc6..234aad4918ca 100644
--- a/dev-lisp/cl-mcclim/files/TODO.Gentoo
+++ b/dev-lisp/cl-mcclim/files/TODO.Gentoo
@@ -1,12 +1,8 @@
+                                                                 -*- outline -*-
+* Investigate CLISP portability
 
--*- Outline -*-
-
-  * Investigate CLISP portability
-
-  * Provide packages for the Listener and SciGraph
-    (dev-lisp/cl-clim-listener and dev-lisp/cl-clim-scigraph
-
-  * catalog other CLIM source for inclusion into portage
-
-
+* Port CLIM based software
 
+  * dev-lisp/cl-clim-listener
+  * dev-lisp/cl-clim-scigraph
+  * dev-lisp/cl-org-davep-dict (CLIM client)
diff --git a/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.20041227 b/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.20041227
new file mode 100644
index 000000000000..8af6080e403e
--- /dev/null
+++ b/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.20041227
@@ -0,0 +1,2 @@
+MD5 e6fde96fccd576d8d18982ca4496cef9 cl-mcclim_0.9+cvs.2004.12.27.orig.tar.gz 1550281
+MD5 e07bd48ecd117adf81c684bab1b04d4f cl-mcclim_0.9+cvs.2004.12.27-1.diff.gz 6063
diff --git a/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.20050202 b/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.20050202
new file mode 100644
index 000000000000..70ac1cd20551
--- /dev/null
+++ b/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.20050202
@@ -0,0 +1,2 @@
+MD5 5ac097951ab7600494b0bfe9289ba1e0 cl-mcclim_0.9+cvs.2005.02.02.orig.tar.gz 1561028
+MD5 49c1e508dc08b8df5600f159836e22ee cl-mcclim_0.9+cvs.2005.02.02-1.diff.gz 6519