(Portage version: 2.0.51.19)

15 files changed, 61 insertions, 532 deletions

diff --git a/dev-lisp/cl-mcclim/ChangeLog b/dev-lisp/cl-mcclim/ChangeLog
index 514214f32594..bab32b18d976 100644
--- a/dev-lisp/cl-mcclim/ChangeLog
+++ b/dev-lisp/cl-mcclim/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-lisp/cl-mcclim
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-mcclim/ChangeLog,v 1.7 2005/04/11 07:08:39 mkennedy Exp $
+
+*cl-mcclim-0.9.1 (11 Apr 2005)
+
+  11 Apr 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/0.9.1-mcclim.asd-cmucl.patch,
+  -files/0.9.20040603/50mcclim-gentoo.el, -files/0.9.20041227-gentoo.patch,
+  -files/0.9/system.lisp-gentoo.patch, -cl-mcclim-0.9.ebuild,
+  +cl-mcclim-0.9.1.ebuild, -cl-mcclim-0.9.20040603.ebuild,
+  -cl-mcclim-0.9.20041227.ebuild, -cl-mcclim-0.9.20050202.ebuild:
+  New upstream; Removed older ebuilds.
 
 *cl-mcclim-0.9.20050202 (04 Feb 2005)
 
diff --git a/dev-lisp/cl-mcclim/Manifest b/dev-lisp/cl-mcclim/Manifest
index f5beec6151ad..02f14a310cfd 100644
--- a/dev-lisp/cl-mcclim/Manifest
+++ b/dev-lisp/cl-mcclim/Manifest
@@ -1,15 +1,17 @@
-MD5 edea130f596d424dd95b48dc9087c459 cl-mcclim-0.9.ebuild 2724
+MD5 c78360e4a624d39b1632961b8bff8c57 ChangeLog 1631
 MD5 41a27c907a9d9097172befc051185b5b cl-mcclim-0.9.20040603.ebuild 2931
 MD5 7f8d1155e430cc87cb0fe0e08f1a4a12 cl-mcclim-0.9.20041227.ebuild 2897
-MD5 c78360e4a624d39b1632961b8bff8c57 ChangeLog 1631
-MD5 c8d8979589a5ef6d1310a74961af2636 metadata.xml 1191
 MD5 f2170543edb38d07d16d7ddef8aa821b cl-mcclim-0.9.20050202.ebuild 2882
-MD5 91915558ef2580b27d0e99f555988c86 files/digest-cl-mcclim-0.9 60
+MD5 edea130f596d424dd95b48dc9087c459 cl-mcclim-0.9.ebuild 2724
+MD5 c8d8979589a5ef6d1310a74961af2636 metadata.xml 1191
+MD5 be5c0155e89ae9105de1f8a3eadaa548 cl-mcclim-0.9.1.ebuild 2808
+MD5 c1d843ac4832f2028d4be33667418e09 files/0.9.20041227-gentoo.patch 4800
 MD5 6c70574406d341f011851b22c49acb4a files/50mcclim-gentoo.el 103
+MD5 dab89c877892b4ae1e03e37857442184 files/TODO.Gentoo 247
+MD5 91915558ef2580b27d0e99f555988c86 files/digest-cl-mcclim-0.9 60
 MD5 76c3cf12529f257d261f01aa1fbcff6f files/digest-cl-mcclim-0.9.20040603 259
 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 2c98358325d7f09ffcee96873b1630d1 files/digest-cl-mcclim-0.9.1 141
 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.20050202.ebuild b/dev-lisp/cl-mcclim/cl-mcclim-0.9.1.ebuild
index c8f8440be2dc..ff07990490c9 100644
--- a/dev-lisp/cl-mcclim/cl-mcclim-0.9.20050202.ebuild
+++ b/dev-lisp/cl-mcclim/cl-mcclim-0.9.1.ebuild
@@ -1,19 +1,18 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-mcclim/cl-mcclim-0.9.1.ebuild,v 1.1 2005/04/11 07:08:39 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"
+SRC_URI="http://ftp.debian.org/debian/pool/main/c/cl-mcclim/cl-mcclim_${PV}.orig.tar.gz
+	http://ftp.debian.org/debian/pool/main/c/cl-mcclim/cl-mcclim_${PV}-${DEB_PV}.diff.gz"
 LICENSE="LLGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
@@ -31,11 +30,12 @@ CLPACKAGE="mcclim"
 SITEFILE=${FILESDIR}/50mcclim-gentoo.el
 ELISP_SOURCES="Tools/Emacs/indent-clim.el"
 
-S=${WORKDIR}/${PN}-${THEIR_PV}.orig
+S=${WORKDIR}/${PN}-${PV}.orig
 
 src_unpack() {
 	unpack ${A}
-	epatch cl-mcclim_${THEIR_PV}-${DEB_PV}.diff || die
+	epatch cl-mcclim_${PV}-${DEB_PV}.diff || die
+	epatch ${FILESDIR}/${PV}-mcclim.asd-cmucl.patch || die
 }
 
 src_compile() {
@@ -45,45 +45,25 @@ src_compile() {
 
 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
+	insinto ${CLSOURCEROOT}/mcclim/
+	doins -r *.{lisp,asd} \
+		Backends Experimental Goatee Lisp-Dep Looks Examples \
+		debian/clim-examples.asd
+	dosym ${CLSOURCEROOT}/mcclim/mcclim.asd \
+		${CLSYSTEMROOT}/mcclim.asd
+	dosym ${CLSOURCEROOT}/mcclim/mcclim-examples.asd \
+		${CLSYSTEMROOT}/mcclim-examples.asd
+	for system in clim clim-clx clim-clx-user clim-looks; 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
+	dodoc debian/README* INSTALL* README TODO Copyright ReleaseNotes/* Webpage/clim-paper.pdf
 	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
+	do-debian-credits
 }
 
 pkg_postinst() {
diff --git a/dev-lisp/cl-mcclim/cl-mcclim-0.9.20040603.ebuild b/dev-lisp/cl-mcclim/cl-mcclim-0.9.20040603.ebuild
deleted file mode 100644
index 6cc7d3243020..000000000000
--- a/dev-lisp/cl-mcclim/cl-mcclim-0.9.20040603.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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.4 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
-	mirror://gentoo/cl-mcclim-${THEIR_PV}.gentoo-Spec.tar.gz" # additional sources from CVS for Gentoo
-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 clim-examples"
-SITEFILE=${FILESDIR}/${PV}/50mcclim-gentoo.el
-ELISP_SOURCES="Tools/Emacs/indent-clim.el Spec/climbols.el"
-
-S=${WORKDIR}/${PN}-${THEIR_PV}.orig
-
-src_unpack() {
-	unpack ${A}
-	epatch cl-mcclim_${THEIR_PV}-${DEB_PV}.diff
-}
-
-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.20041227.ebuild b/dev-lisp/cl-mcclim/cl-mcclim-0.9.20041227.ebuild
deleted file mode 100644
index 476275c8035e..000000000000
--- a/dev-lisp/cl-mcclim/cl-mcclim-0.9.20041227.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# 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.ebuild b/dev-lisp/cl-mcclim/cl-mcclim-0.9.ebuild
deleted file mode 100644
index 7423e24b36f6..000000000000
--- a/dev-lisp/cl-mcclim/cl-mcclim-0.9.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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.6 2005/02/09 07:55:59 mkennedy Exp $
-
-inherit common-lisp elisp eutils
-
-DESCRIPTION="McCLIM is a free software implementation of CLIM."
-HOMEPAGE="http://clim.mikemac.com/ http://clim.mikemac.com/spec/clim.html"
-SRC_URI="http://clim.mikemac.com/downloads/snapshots/src/McCLIM-${PV}.tgz"
-
-LICENSE="LLGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc emacs"
-
-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="clim clim-clx clim-examples"
-SITEFILE=${FILESDIR}/50mcclim-gentoo.el
-
-S=${WORKDIR}/McCLIM
-
-ELISP_SOURCES="Tools/Emacs/indent-clim.el Spec/climbols.el"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}/system.lisp-gentoo.patch
-	mkdir ${S}/clim-spec
-}
-
-src_compile() {
-	if use doc; then
-		make -C Doc manual.ps
-		if [ -x /usr/bin/lisp ]; 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))"
-		elif [ -x /usr/bin/sbcl ]; then
-			ewarn "Documentation cannot be built with SBCL at this time"
-		elif [ -x /usr/bin/clisp ]; then
-			ewarn "Documentation cannot be built with CLISP at this time"
-		fi
-	fi
-
-	if use emacs; then
-		cp ${ELISP_SOURCES} .
-		elisp-compile *.el
-	fi
-}
-
-src_install() {
-	insinto /usr/share/common-lisp/source/clim
-	doins *.lisp
-	for i in Apps Backends Examples Experimental Goatee Images Lisp-Dep Looks; do
-		cp -r ${i} ${D}/usr/share/common-lisp/source/clim/
-	done
-	dodir /usr/share/common-lisp/systems/
-
-	dosym /usr/share/common-lisp/source/clim/system.lisp /usr/share/common-lisp/systems/clim.asd
-
-	for i in clim-clx clim-examples; do
-		dosym /usr/share/common-lisp/source/clim /usr/share/common-lisp/source/${i}
-		dosym /usr/share/common-lisp/source/${i}/system.lisp  /usr/share/common-lisp/systems/${i}.asd
-	done
-
-	dodoc README TODO INSTALL*
-
-	if use doc; then
-		dodoc Doc/manual.ps
-		insinto /usr/share/doc/${PF}/html/Spec
-		doins clim-spec/*
-	fi
-
-	find ${D} -type d -name CVS -print |xargs rm -rf
-
-	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/files/0.9.1-mcclim.asd-cmucl.patch b/dev-lisp/cl-mcclim/files/0.9.1-mcclim.asd-cmucl.patch
new file mode 100644
index 000000000000..4a625c7ba6fa
--- /dev/null
+++ b/dev-lisp/cl-mcclim/files/0.9.1-mcclim.asd-cmucl.patch
@@ -0,0 +1,23 @@
+diff -ur cl-mcclim-0.9.1.orig.orig/mcclim.asd cl-mcclim-0.9.1.orig/mcclim.asd
+--- cl-mcclim-0.9.1.orig.orig/mcclim.asd	2005-04-11 01:45:44.000000000 -0500
++++ cl-mcclim-0.9.1.orig/mcclim.asd	2005-04-11 01:46:54.000000000 -0500
+@@ -35,16 +35,8 @@
+ ;;; Legacy CMUCL support stuff
+ #+cmu
+ (progn
+-  (unless (fboundp 'ext:stream-read-char)
+-    (unless (ignore-errors (ext:search-list "gray-streams:"))
+-      (setf (ext:search-list "gray-streams:")
+-	'("target:pcl/" "library:subsystems/")))
+-    (if (fboundp 'extensions:without-package-locks)
+-	(extensions:without-package-locks
+-	 (load "gray-streams:gray-streams-library"))
+-      (load "gray-streams:gray-streams-library")))
+-  #-clx
+-  (require :clx)
++  (asdf:oos 'asdf:load-op :cmucl-graystream)
++  (asdf:oos 'asdf:load-op :cmucl-clx)
+   #+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.~%~%")))
+ 
+Only in cl-mcclim-0.9.1.orig: mcclim.asd~
diff --git a/dev-lisp/cl-mcclim/files/0.9.20040603/50mcclim-gentoo.el b/dev-lisp/cl-mcclim/files/0.9.20040603/50mcclim-gentoo.el
deleted file mode 100644
index ffb5076201d1..000000000000
--- a/dev-lisp/cl-mcclim/files/0.9.20040603/50mcclim-gentoo.el
+++ /dev/null
@@ -1,7 +0,0 @@
-
-;; mcclim site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(load-library "indent-clim")
-(load-library "climbols")
-
diff --git a/dev-lisp/cl-mcclim/files/0.9.20041227-gentoo.patch b/dev-lisp/cl-mcclim/files/0.9.20041227-gentoo.patch
deleted file mode 100644
index b39c1063fbef..000000000000
--- a/dev-lisp/cl-mcclim/files/0.9.20041227-gentoo.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-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/0.9/system.lisp-gentoo.patch b/dev-lisp/cl-mcclim/files/0.9/system.lisp-gentoo.patch
deleted file mode 100644
index 4011b7b95271..000000000000
--- a/dev-lisp/cl-mcclim/files/0.9/system.lisp-gentoo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- McCLIM/system.lisp.original	2004-03-04 14:54:12.750240760 -0600
-+++ McCLIM/system.lisp	2004-03-04 14:58:50.797971080 -0600
-@@ -25,15 +25,12 @@
- 
- #+cmu
- (progn
--  (unless (fboundp 'ext:stream-read-char)
--    (unless (ignore-errors (ext:search-list "gray-streams:"))
--      (setf (ext:search-list "gray-streams:")
--	'("target:pcl/" "library:subsystems/")))
--    (load "gray-streams:gray-streams-library"))
--  #-clx
--  (require :clx)
--  #-mk-defsystem
--  (load "library:subsystems/defsystem"))
-+  (require :cmucl-graystream)
-+  (require :cmucl-clx))
-+
-+#+sbcl 
-+(progn 
-+  (require :clx))
- 
- (pushnew :clim *features*)
- (pushnew :mcclim *features*)
diff --git a/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9 b/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9
deleted file mode 100644
index f93d39b37fd0..000000000000
--- a/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1d35c9ccedfd210ae996bb700793a7c6 McCLIM-0.9.tgz 3304356
diff --git a/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.1 b/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.1
new file mode 100644
index 000000000000..d5e7c7862817
--- /dev/null
+++ b/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.1
@@ -0,0 +1,2 @@
+MD5 400de75e688f540d6a5a0b9dcbe515bc cl-mcclim_0.9.1.orig.tar.gz 3000070
+MD5 5637edc98b38d38b1279ec473c3edfdf cl-mcclim_0.9.1-1.diff.gz 4548
diff --git a/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.20040603 b/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.20040603
deleted file mode 100644
index 157230fe493d..000000000000
--- a/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.20040603
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 633998af38391ad5c1e25d7818879746 cl-mcclim_0.9+cvs.2004.06.03.orig.tar.gz 1431568
-MD5 5035f9a31b30d0669688ca49f8bf367b cl-mcclim_0.9+cvs.2004.06.03-1.diff.gz 5466
-MD5 f367f54686417532f81c943be1f9c58c cl-mcclim-0.9+cvs.2004.06.03.gentoo-Spec.tar.gz 321280
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
deleted file mode 100644
index 8af6080e403e..000000000000
--- a/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.20041227
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 70ac1cd20551..000000000000
--- a/dev-lisp/cl-mcclim/files/digest-cl-mcclim-0.9.20050202
+++ /dev/null
@@ -1,2 +0,0 @@
-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