Remove lesstif, doc and source USE flags, bugs 117057 and 203469. Clean up.

(Portage version: 2.1.4)

27 files changed, 39 insertions, 1289 deletions

diff --git a/dev-lisp/cmucl/ChangeLog b/dev-lisp/cmucl/ChangeLog
index 0869f49795cc..90f746842bbe 100644
--- a/dev-lisp/cmucl/ChangeLog
+++ b/dev-lisp/cmucl/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for dev-lisp/cmucl
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.27 2007/02/22 01:36:27 peper Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.28 2008/01/21 06:55:15 ulm Exp $
+
+  21 Jan 2008; Ulrich Mueller <ulm@gentoo.org> -files/19a/cmucl.sh,
+  -files/19a/herald-save.lisp-gentoo.patch, -files/19a/install-clc.lisp,
+  -files/19a/site-init.lisp.in, -files/19b/README.Gentoo,
+  -files/18e/README.Gentoo, -files/19b/cmucl.sh,
+  -files/18e/herald-save.lisp-gentoo.patch,
+  -files/18e/install-clc.lisp-gentoo.patch, -files/18e/site-init.lisp.in,
+  -files/19a/README.Gentoo, -files/19b/herald-save.lisp-gentoo.patch,
+  -files/19b/install-clc.lisp, -files/19b/site-init.lisp.in,
+  -cmucl-18e-r4.ebuild, -cmucl-19a-r1.ebuild, -cmucl-19b.ebuild,
+  cmucl-19c.ebuild, -cmucl-19d_pre1.ebuild, -cmucl-19d_pre1-r1.ebuild,
+  cmucl-19d_p2.ebuild:
+  Remove lesstif USE flag and depend on virtual/motif wrt bug 117057. Remove
+  bogus doc and source USE flags, fixes bug 203469. Add quotes around some
+  variables. Clean up old versions on behalf of hkBst.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/dev-lisp/cmucl/cmucl-18e-r4.ebuild b/dev-lisp/cmucl/cmucl-18e-r4.ebuild
deleted file mode 100644
index 95457b2ef3ed..000000000000
--- a/dev-lisp/cmucl/cmucl-18e-r4.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-18e-r4.ebuild,v 1.11 2007/02/03 17:55:25 flameeyes Exp $
-
-inherit common-lisp-common eutils
-
-DEB_PV=8
-
-DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp"
-HOMEPAGE="http://www.cons.org/cmucl/ http://packages.debian.org/unstable/devel/cmucl.html"
-SRC_URI="mirror://gentoo/cmucl_${PV}-${DEB_PV}.tar.gz
-	mirror://gentoo/cmucl-${PV}-x86-linux.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="doc lesstif"
-
-DEPEND="dev-lisp/common-lisp-controller
-	>=dev-lisp/cl-defsystem3-3.3i-r3
-	>=dev-lisp/cl-asdf-1.84
-	doc? ( virtual/tetex )
-	lesstif? ( x11-libs/lesstif )
-	!lesstif? ( x11-libs/openmotif )
-	sys-devel/bc"
-
-PROVIDE="virtual/commonlisp"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}/herald-save.lisp-gentoo.patch
-	epatch ${FILESDIR}/${PV}/install-clc.lisp-gentoo.patch
-}
-
-src_compile() {
-	# 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
-
-	PATH=${WORKDIR}/bin:$PATH CMUCLCORE=${WORKDIR}/lib/cmucl/lib/lisp.core make || die
-	if use doc; then
-		make -C src/docs
-	fi
-}
-
-src_install() {
-	insinto /usr/lib/cmucl/include
-	doins src/lisp/*.h target/lisp/*.h target/lisp/*.map target/lisp/*.nm
-	insinto /usr/lib/cmucl
-	cp target/lisp/lisp.core lisp-dist.core
-	doins lisp-dist.core
-
-	dodoc target/lisp/lisp.{nm,map}
-	doman src/general-info/{cmucl,lisp}.1
-
-	dobin target/lisp/lisp
-	dobin own-work/Demos/lisp-start
-
-	insinto /usr/lib/cmucl
-	doins own-work/install-clc.lisp
-	exeinto /usr/lib/common-lisp/bin
-	cp own-work/cmucl-script.sh cmucl.sh
-	doexe cmucl.sh
-
-	insinto /etc/common-lisp/cmucl
-	sed "s,@PF@,${PF},g" <${FILESDIR}/${PV}/site-init.lisp.in >site-init.lisp
-	doins site-init.lisp
-	dosym /etc/common-lisp/cmucl/site-init.lisp /usr/lib/cmucl/site-init.lisp
-
-	dodir /etc/env.d
-	cat >${D}/etc/env.d/50cmucl <<EOF
-# CMUCLLIB=/usr/lib/cmucl
-EOF
-	[ -f /etc/lisp-config.lisp ] || touch ${D}/etc/lisp-config.lisp
-
-	insinto /usr/share/doc/${P}/html/Basic-tutorial
-	doins own-work/tutorials/Basic-tutorial/*
-	insinto /usr/share/doc/${P}/html/Clos
-	doins own-work/tutorials/Clos/*
-	docinto notes
-	dodoc own-work/tutorials/notes/*
-
-	insinto /usr/lib/cmucl
-	doins own-work/hemlock11.*
-
-	if use doc; then
-		dodoc src/docs/*/*.{ps,pdf}
-	fi
-
-	exeinto /usr/lib/cmucl
-	doexe target/motif/server/motifd
-	insinto /usr/lib/cmucl/subsystems/
-	doins target/interface/clm-library.x86f
-
-	keepdir /usr/lib/common-lisp/cmucl
-	impl-save-timestamp-hack cmucl || die
-}
-
-pkg_postinst() {
-	standard-impl-postinst cmucl
-}
-
-pkg_prerm() {
-	standard-impl-postrm cmucl /usr/bin/lisp
-}
diff --git a/dev-lisp/cmucl/cmucl-19a-r1.ebuild b/dev-lisp/cmucl/cmucl-19a-r1.ebuild
deleted file mode 100644
index af2297102a2e..000000000000
--- a/dev-lisp/cmucl/cmucl-19a-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-19a-r1.ebuild,v 1.5 2007/02/03 17:55:25 flameeyes Exp $
-
-inherit common-lisp-common-2 eutils
-
-DEB_PV=10
-MY_PV=${PV}-release-20040728
-
-DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp"
-HOMEPAGE="http://www.cons.org/cmucl/
-	http://packages.debian.org/unstable/devel/cmucl.html"
-SRC_URI="mirror://gentoo/cmucl_${MY_PV}.orig.tar.gz
-	mirror://gentoo/cmucl_${MY_PV}-${DEB_PV}.diff.gz
-	mirror://gentoo/${PN}-${PV}-x86-linux.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="doc lesstif nosource"
-
-DEPEND="=dev-lisp/common-lisp-controller-4*
-	doc? ( virtual/tetex )
-	lesstif? ( x11-libs/lesstif )
-	!lesstif? ( x11-libs/openmotif )
-	sys-devel/bc"
-
-PROVIDE="virtual/commonlisp"
-
-S=${WORKDIR}/cmucl-${MY_PV}.orig
-
-src_unpack() {
-	unpack ${A}
-	epatch cmucl_${MY_PV}-${DEB_PV}.diff || die
-	epatch ${FILESDIR}/${PV}/herald-save.lisp-gentoo.patch || die
-}
-
-src_compile() {
-	# 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
-
-	PATH=${WORKDIR}/bin:$PATH CMUCLCORE=${WORKDIR}/lib/cmucl/lib/lisp.core make || die
-
-	if use doc; then
-		make -C src/docs
-	fi
-}
-
-src_install() {
-	insinto /usr/lib/cmucl/include
-	doins src/lisp/*.h target/lisp/*.h target/lisp/*.map target/lisp/*.nm
-	insinto /usr/lib/cmucl
-	cp target/lisp/lisp.core lisp-dist.core
-	doins lisp-dist.core
-
-	dodoc target/lisp/lisp.{nm,map}
-	doman src/general-info/{cmucl,lisp}.1
-
-	dobin target/lisp/lisp
-	dobin own-work/Demos/lisp-start
-
-	insinto /usr/lib/cmucl
-	doins own-work/install-clc.lisp
-	exeinto /usr/lib/common-lisp/bin
-	newexe own-work/cmucl-script.sh cmucl.sh
-
-	insinto /etc/common-lisp/cmucl
-	sed "s,@PF@,${PF},g" <${FILESDIR}/${PV}/site-init.lisp.in >site-init.lisp
-	doins site-init.lisp
-	dosym /etc/common-lisp/cmucl/site-init.lisp /usr/lib/cmucl/site-init.lisp
-
-	dodir /etc/env.d
-	cat >${D}/etc/env.d/50cmucl <<EOF
-# CMUCLLIB=/usr/lib/cmucl
-EOF
-	[ -f /etc/lisp-config.lisp ] || touch ${D}/etc/lisp-config.lisp
-
-	insinto /usr/share/doc/${P}/html/Basic-tutorial
-	doins own-work/tutorials/Basic-tutorial/*
-	insinto /usr/share/doc/${P}/html/Clos
-	doins own-work/tutorials/Clos/*
-	docinto notes
-	dodoc own-work/tutorials/notes/*
-
-	insinto /usr/lib/cmucl
-	doins own-work/hemlock11.*
-
-	if use doc; then
-		dodoc src/docs/*/*.{ps,pdf}
-	fi
-
-	exeinto /usr/lib/cmucl
-	doexe target/motif/server/motifd
-	insinto /usr/lib/cmucl/subsystems/
-	doins target/interface/clm-library.x86f
-
-	# Previously installed from dev-lisp/cmucl-source
-
-	if ! use nosource; then
-		dodir /usr/share/common-lisp/source/cmucl
-		(cd src ; find . -name \*.lisp -and -type f | tar --create --file=- --files-from=- ) |\
-			tar --extract --file=- -C ${D}/usr/share/common-lisp/source/cmucl
-		dodir /usr/share/common-lisp/systems
-	fi
-
-	# cmucl-graystream
-
-	insinto /usr/share/common-lisp/source/cmucl-graystream
-	doins src/pcl/gray-streams* own-work/cmucl-graystream.asd
-	dosym /usr/share/common-lisp/source/cmucl-graystream/cmucl-graystream.asd \
-		/usr/share/common-lisp/systems/
-
-	# CMUCL-CLX
-	insinto /usr/share/common-lisp/source/cmucl-clx
-	cp -r src/clx/*.lisp own-work/cmucl-clx.asd \
-		src/code/clx-ext.lisp \
-		src/hemlock/charmacs.lisp \
-		src/hemlock/key-event.lisp \
-		src/hemlock/keysym-defs.lisp \
-		${D}/usr/share/common-lisp/source/cmucl-clx
-	insinto /usr/share/common-lisp/source/cmucl-clx/debug
-	doins src/clx/debug/*.lisp
-	insinto /usr/share/common-lisp/source/cmucl-clx/demo
-	doins src/clx/demo/*.lisp
-	insinto /usr/share/common-lisp/source/cmucl-clx/test
-	doins src/clx/test/*.lisp
-#	find ${D}/usr/share/common-lisp/source/cmucl-clx -type f -print0 | xargs -0 chmod 644
-#	find ${D}/usr/share/common-lisp/source/cmucl-clx -type d -print0 | xargs -0 chmod 755
-	dosym /usr/share/common-lisp/source/cmucl-clx/cmucl-clx.asd \
-		/usr/share/common-lisp/systems/
-
-	keepdir /usr/lib/common-lisp/cmucl
-	impl-save-timestamp-hack cmucl || die
-}
-
-pkg_postinst() {
-	standard-impl-postinst cmucl
-	register-common-lisp-source cmucl-graystream
-	register-common-lisp-source cmucl-clx
-}
-
-pkg_prerm() {
-	standard-impl-postrm cmucl /usr/bin/lisp
-	unregister-common-lisp-source cmucl-graystream
-	unregister-common-lisp-source cmucl-clx
-}
-
-pkg_postrm() {
-	if [ ! -x /usr/bin/lisp ]; then
-		rm -rf /usr/lib/cmucl/ || die
-	fi
-}
diff --git a/dev-lisp/cmucl/cmucl-19b.ebuild b/dev-lisp/cmucl/cmucl-19b.ebuild
deleted file mode 100644
index 93ec52c9eaf2..000000000000
--- a/dev-lisp/cmucl/cmucl-19b.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-19b.ebuild,v 1.3 2007/02/03 17:55:25 flameeyes Exp $
-
-inherit common-lisp-common-2 eutils toolchain-funcs
-
-DEB_PV=4
-MY_PV=${PV}-release-20050628
-
-DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp"
-HOMEPAGE="http://www.cons.org/cmucl/
-	http://packages.debian.org/unstable/devel/cmucl.html"
-SRC_URI="mirror://gentoo/cmucl_${MY_PV}.orig.tar.gz
-	mirror://gentoo/cmucl_${MY_PV}-${DEB_PV}.diff.gz
-	mirror://gentoo/${P}-x86-linux.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc lesstif nosource"
-
-DEPEND="=dev-lisp/common-lisp-controller-4*
-	doc? ( virtual/tetex )
-	lesstif? ( x11-libs/lesstif )
-	!lesstif? ( x11-libs/openmotif )
-	sys-devel/bc"
-
-PROVIDE="virtual/commonlisp"
-
-S=${WORKDIR}/cmucl-${MY_PV}.orig
-
-src_unpack() {
-	unpack ${A}
-	epatch cmucl_${MY_PV}-${DEB_PV}.diff || die
-	epatch ${FILESDIR}/${PV}/herald-save.lisp-gentoo.patch || die
-
-	find ${S} -type f \( -name \*.sh -o -name linux-nm \) \
-		-exec chmod +x '{}' \;
-}
-
-src_compile() {
-	# 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
-
-	PATH=${WORKDIR}/bin:$PATH CMUCLCORE=${WORKDIR}/lib/cmucl/lib/lisp.core make || die
-
-	if use doc; then
-		make -C src/docs
-	fi
-}
-
-src_install() {
-	insinto /usr/lib/cmucl/include
-	doins src/lisp/*.h target/lisp/*.h target/lisp/*.map target/lisp/*.nm
-	insinto /usr/lib/cmucl
-	cp target/lisp/lisp.core lisp-dist.core
-	doins lisp-dist.core
-
-	dodoc target/lisp/lisp.{nm,map}
-	doman src/general-info/{cmucl,lisp}.1
-
-	dobin target/lisp/lisp
-	dobin own-work/Demos/lisp-start
-
-	insinto /usr/lib/cmucl
-	doins own-work/install-clc.lisp
-	exeinto /usr/lib/common-lisp/bin
-	newexe own-work/cmucl-script.sh cmucl.sh
-
-	insinto /etc/common-lisp/cmucl
-	sed "s,@PF@,${PF},g" <${FILESDIR}/${PV}/site-init.lisp.in >site-init.lisp
-	doins site-init.lisp
-	dosym /etc/common-lisp/cmucl/site-init.lisp /usr/lib/cmucl/site-init.lisp
-
-	dodir /etc/env.d
-	cat >${D}/etc/env.d/50cmucl <<EOF
-# CMUCLLIB=/usr/lib/cmucl
-EOF
-	[ -f /etc/lisp-config.lisp ] || touch ${D}/etc/lisp-config.lisp
-
-	insinto /usr/share/doc/${P}/html/Basic-tutorial
-	doins own-work/tutorials/Basic-tutorial/*
-	insinto /usr/share/doc/${P}/html/Clos
-	doins own-work/tutorials/Clos/*
-	docinto notes
-	dodoc own-work/tutorials/notes/*
-
-	insinto /usr/lib/cmucl
-	doins own-work/hemlock11.*
-
-	if use doc; then
-		dodoc src/docs/*/*.{ps,pdf}
-	fi
-
-	exeinto /usr/lib/cmucl
-	doexe target/motif/server/motifd
-	insinto /usr/lib/cmucl/subsystems/
-	doins target/interface/clm-library.x86f
-
-	# Previously installed from dev-lisp/cmucl-source
-
-	if ! use nosource; then
-		dodir /usr/share/common-lisp/source/cmucl
-		(cd src ; find . -name \*.lisp -and -type f | tar --create --file=- --files-from=- ) |\
-			tar --extract --file=- -C ${D}/usr/share/common-lisp/source/cmucl
-		dodir /usr/share/common-lisp/systems
-	fi
-
-	# cmucl-graystream
-
-	insinto /usr/share/common-lisp/source/cmucl-graystream
-	doins src/pcl/gray-streams* own-work/cmucl-graystream.asd
-	dosym /usr/share/common-lisp/source/cmucl-graystream/cmucl-graystream.asd \
-		/usr/share/common-lisp/systems/
-
-	# CMUCL-CLX
-	insinto /usr/share/common-lisp/source/cmucl-clx
-	cp -r src/clx/*.lisp own-work/cmucl-clx.asd \
-		src/code/clx-ext.lisp \
-		src/hemlock/charmacs.lisp \
-		src/hemlock/key-event.lisp \
-		src/hemlock/keysym-defs.lisp \
-		${D}/usr/share/common-lisp/source/cmucl-clx
-	insinto /usr/share/common-lisp/source/cmucl-clx/debug
-	doins src/clx/debug/*.lisp
-	insinto /usr/share/common-lisp/source/cmucl-clx/demo
-	doins src/clx/demo/*.lisp
-	insinto /usr/share/common-lisp/source/cmucl-clx/test
-	doins src/clx/test/*.lisp
-#	find ${D}/usr/share/common-lisp/source/cmucl-clx -type f -print0 | xargs -0 chmod 644
-#	find ${D}/usr/share/common-lisp/source/cmucl-clx -type d -print0 | xargs -0 chmod 755
-	dosym /usr/share/common-lisp/source/cmucl-clx/cmucl-clx.asd \
-		/usr/share/common-lisp/systems/
-
-	keepdir /usr/lib/common-lisp/cmucl
-	impl-save-timestamp-hack cmucl || die
-}
-
-pkg_postinst() {
-	standard-impl-postinst cmucl
-	register-common-lisp-source cmucl-graystream
-	register-common-lisp-source cmucl-clx
-}
-
-pkg_prerm() {
-	standard-impl-postrm cmucl /usr/bin/lisp
-	unregister-common-lisp-source cmucl-graystream
-	unregister-common-lisp-source cmucl-clx
-}
-
-pkg_postrm() {
-	if [ ! -x /usr/bin/lisp ]; then
-		rm -rf /usr/lib/cmucl/ || die
-	fi
-}
diff --git a/dev-lisp/cmucl/cmucl-19c.ebuild b/dev-lisp/cmucl/cmucl-19c.ebuild
index e5d361e88ba9..f6b4e424c943 100644
--- a/dev-lisp/cmucl/cmucl-19c.ebuild
+++ b/dev-lisp/cmucl/cmucl-19c.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-19c.ebuild,v 1.5 2007/02/03 17:55:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-19c.ebuild,v 1.6 2008/01/21 06:55:15 ulm Exp $
 
 inherit common-lisp-common-2 eutils toolchain-funcs
 
@@ -17,12 +17,11 @@ SRC_URI="mirror://gentoo/cmucl_${MY_PV}.orig.tar.gz
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="x86"
-IUSE="doc lesstif nosource"
+IUSE="doc nosource"
 
 DEPEND=">=dev-lisp/common-lisp-controller-4
 	doc? ( virtual/tetex )
-	lesstif? ( x11-libs/lesstif )
-	!lesstif? ( x11-libs/openmotif )
+	virtual/motif
 	sys-devel/bc"
 
 PROVIDE="virtual/commonlisp"
@@ -31,24 +30,16 @@ S=${WORKDIR}/cmucl-${MY_PV}.orig
 
 src_unpack() {
 	unpack ${A}
-	epatch cmucl_${MY_PV}-${DEB_PV}.diff || die
-	epatch ${FILESDIR}/${PV}/herald-save.lisp-gentoo.patch || die
+	epatch cmucl_${MY_PV}-${DEB_PV}.diff
+	epatch "${FILESDIR}/${PV}/herald-save.lisp-gentoo.patch"
 
-	find ${S} -type f \( -name \*.sh -o -name linux-nm \) \
+	find "${S}" -type f \( -name \*.sh -o -name linux-nm \) \
 		-exec chmod +x '{}' \;
 }
 
 src_compile() {
 	export SANDBOX_ON=0
 
-	# 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
 
@@ -78,15 +69,15 @@ src_install() {
 	newexe own-work/cmucl-script.sh cmucl.sh
 
 	insinto /etc/common-lisp/cmucl
-	sed "s,@PF@,${PF},g" <${FILESDIR}/${PV}/site-init.lisp.in >site-init.lisp
+	sed "s,@PF@,${PF},g" <"${FILESDIR}/${PV}/site-init.lisp.in" >site-init.lisp
 	doins site-init.lisp
 	dosym /etc/common-lisp/cmucl/site-init.lisp /usr/lib/cmucl/site-init.lisp
 
 	dodir /etc/env.d
-	cat >${D}/etc/env.d/50cmucl <<EOF
+	cat >"${D}"/etc/env.d/50cmucl <<EOF
 # CMUCLLIB=/usr/lib/cmucl
 EOF
-	[ -f /etc/lisp-config.lisp ] || touch ${D}/etc/lisp-config.lisp
+	[ -f /etc/lisp-config.lisp ] || touch "${D}"/etc/lisp-config.lisp
 
 	insinto /usr/share/doc/${P}/html/Basic-tutorial
 	doins own-work/tutorials/Basic-tutorial/*
@@ -119,7 +110,7 @@ EOF
 	if ! use nosource; then
 		dodir /usr/share/common-lisp/source/cmucl
 		(cd src ; find . -name \*.lisp -and -type f | tar --create --file=- --files-from=- ) |\
-			tar --extract --file=- -C ${D}/usr/share/common-lisp/source/cmucl
+			tar --extract --file=- -C "${D}"/usr/share/common-lisp/source/cmucl
 		dodir /usr/share/common-lisp/systems
 	fi
 
@@ -136,7 +127,7 @@ EOF
 		src/hemlock/charmacs.lisp \
 		src/hemlock/key-event.lisp \
 		src/hemlock/keysym-defs.lisp \
-		${D}/usr/share/common-lisp/source/cmucl-clx
+		"${D}"/usr/share/common-lisp/source/cmucl-clx
 	insinto /usr/share/common-lisp/source/cmucl-clx/debug
 	doins src/clx/debug/*.lisp
 	insinto /usr/share/common-lisp/source/cmucl-clx/demo
diff --git a/dev-lisp/cmucl/cmucl-19d_p2.ebuild b/dev-lisp/cmucl/cmucl-19d_p2.ebuild
index 5a9f8ac22873..5e4dbb2df55f 100644
--- a/dev-lisp/cmucl/cmucl-19d_p2.ebuild
+++ b/dev-lisp/cmucl/cmucl-19d_p2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-19d_p2.ebuild,v 1.2 2008/01/21 06:55:15 ulm Exp $
 
 inherit common-lisp-common-3 eutils toolchain-funcs
 
@@ -15,10 +15,9 @@ SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-s
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="doc lesstif source"
+IUSE=""
 
-DEPEND="lesstif? ( x11-libs/lesstif )
-	!lesstif? ( x11-libs/openmotif )
+DEPEND="virtual/motif
 	sys-devel/bc"
 
 PROVIDE="virtual/commonlisp"
@@ -27,16 +26,10 @@ 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 \) \
+	epatch "${FILESDIR}/${MY_PV}-gentoo.patch"
+	epatch "${FILESDIR}/${MY_PV}-cmucl-patch-002.patch"
+	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
@@ -51,10 +44,10 @@ 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
+		tar xzpf $i -C "${D}"/usr
 	done
-	mv ${D}/usr/doc ${D}/usr/share/doc/${PF}
-	mv ${D}/usr/man ${D}/usr/share/
+	mv "${D}"/usr/doc "${D}"/usr/share/doc/${PF}
+	mv "${D}"/usr/man "${D}"/usr/share/
 	impl-save-timestamp-hack cmucl || die
 }
 
diff --git a/dev-lisp/cmucl/cmucl-19d_pre1-r1.ebuild b/dev-lisp/cmucl/cmucl-19d_pre1-r1.ebuild
deleted file mode 100644
index 10e201663acc..000000000000
--- a/dev-lisp/cmucl/cmucl-19d_pre1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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_pre1-r1.ebuild,v 1.1 2006/11/19 17:20:55 mkennedy Exp $
-
-inherit common-lisp-common-3 eutils toolchain-funcs
-
-MY_PVL=${PV/_/-}
-MY_PV=${PV:0:3}
-
-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}/pre-release/cmucl-src-${MY_PVL}.tar.bz2
-	http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/pre-release/cmucl-${MY_PVL}-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
-	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/cmucl-19d_pre1.ebuild b/dev-lisp/cmucl/cmucl-19d_pre1.ebuild
deleted file mode 100644
index 51e80e755e4e..000000000000
--- a/dev-lisp/cmucl/cmucl-19d_pre1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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_pre1.ebuild,v 1.1 2006/11/09 02:28:47 mkennedy Exp $
-
-inherit common-lisp-common-3 eutils toolchain-funcs
-
-MY_PVL=${PV/_/-}
-MY_PV=${PV:0:3}
-
-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}/pre-release/cmucl-src-${MY_PVL}.tar.bz2
-	http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/pre-release/cmucl-${MY_PVL}-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
-	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_prerm() {
-	standard-impl-postrm cmucl /usr/bin/lisp
-}
diff --git a/dev-lisp/cmucl/files/18e/README.Gentoo b/dev-lisp/cmucl/files/18e/README.Gentoo
deleted file mode 100644
index 885807587fb5..000000000000
--- a/dev-lisp/cmucl/files/18e/README.Gentoo
+++ /dev/null
@@ -1,31 +0,0 @@
-
-* README.Gentoo -- Gentoo Specific Notes for dev-lisp/cmucl
-
-** About dev-lisp/cmucl 
-
-The dev-lisp/cmucl ebuild in portage aim to provide a port of
-Debian's package of CMUCL.  Thus the Gentoo CMUCL port should be
-binary compatible with the Debian port.
-
-** Linux Miscellaneous Binary Support
-
-You can have your compiled Lisp .x86f files automatically executed
-like any other binary by executing the following command:
-
-  echo ':lisp:E::x86f::/usr/bin/lisp-start:' \
-    >/proc/sys/fs/binfmt_misc/register
-
-Note: you need kernel support for this.  A good place to put the
-above command is in your /etc/conf.d/localstart.
-
-** Credit
-
-This Gentoo package, like many other Gentoo packages in the dev-lisp
-category, benifit from the Debian Project's work.
-
-  -- Matthew Kennedy <mkennedy@gentoo.org>
-
-
-Local Variables: ***
-mode: outline ***
-End: ***
diff --git a/dev-lisp/cmucl/files/18e/herald-save.lisp-gentoo.patch b/dev-lisp/cmucl/files/18e/herald-save.lisp-gentoo.patch
deleted file mode 100644
index 62d6e66d0750..000000000000
--- a/dev-lisp/cmucl/files/18e/herald-save.lisp-gentoo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur cmucl-18e.original/src/code/save.lisp cmucl-18e/src/code/save.lisp
---- cmucl-18e.original/src/code/save.lisp	2003-06-08 02:23:44.000000000 -0500
-+++ cmucl-18e/src/code/save.lisp	2004-01-14 14:03:28.487836232 -0600
-@@ -289,11 +289,9 @@
- 	))
- 
- (setf (getf *herald-items* :bugs)
--      '("For support see http://www.cons.org/cmucl/support.html Send bug reports to the debian BTS."
--        terpri
--	"or to "
--	"pvaneynd@debian.org" terpri
--       "type (help) for help, (quit) to exit, and (demo) to see the demos" terpri
-+      '("For support see http://www.cons.org/cmucl/support.html" terpri
-+	"Send bug reports to http://bugs.gentoo.org." terpri
-+	"Type (help) for help or (quit) to exit." terpri
-         terpri
- 	"Loaded subsystems:"))
- 
diff --git a/dev-lisp/cmucl/files/18e/install-clc.lisp-gentoo.patch b/dev-lisp/cmucl/files/18e/install-clc.lisp-gentoo.patch
deleted file mode 100644
index b155c7f16156..000000000000
--- a/dev-lisp/cmucl/files/18e/install-clc.lisp-gentoo.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur cmucl-18e.original/own-work/install-clc.lisp cmucl-18e/own-work/install-clc.lisp
---- cmucl-18e.original/own-work/install-clc.lisp	2003-05-02 02:49:32.000000000 -0500
-+++ cmucl-18e/own-work/install-clc.lisp	2004-01-15 02:25:05.514260000 -0600
-@@ -10,15 +10,17 @@
-           (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp"))
-   (unix:unix-exit 1))
- 
--(unless (ignore-errors
-+;; (unless (ignore-errors
-           (common-lisp-controller:init-common-lisp-controller 
-            "/usr/lib/common-lisp/cmucl/"
-            :version 3)
--          t)
--  (format t "~%Error during init of common-lisp-controller~%")
--  (unix:unix-exit 1))
-+;;           t)
-+;;   (format t "~%Error during init of common-lisp-controller~%")
-+;;   (unix:unix-exit 1))
- 
--(defun common-lisp-controller:send-clc-command (command package)
-+(in-package :common-lisp-controller)
-+
-+(defun send-clc-command (command package)
-   (let ((process
-          (ext:run-program "/usr/bin/clc-send-command"
-                           (list
-@@ -40,6 +42,8 @@
-                package
- 	       "cmucl"))))
- 
-+(in-package "COMMON-LISP-USER")
-+
- (unless (ignore-errors
-           ;; it loaded, configure it for common-lisp-controller use:
-           (format t "~%Saving to new-lisp.core...")
diff --git a/dev-lisp/cmucl/files/18e/site-init.lisp.in b/dev-lisp/cmucl/files/18e/site-init.lisp.in
deleted file mode 100644
index 94f999802061..000000000000
--- a/dev-lisp/cmucl/files/18e/site-init.lisp.in
+++ /dev/null
@@ -1,54 +0,0 @@
-;;; -*- Mode: Lisp; Package: System -*-
-;;;
-;;; **********************************************************************
-;;; This code was written as part of the CMU Common Lisp project at
-;;; Carnegie Mellon University, and has been placed in the public domain.
-;;;
-
-;;; Heavy modifications by Peter Van Eynde
-
-;;; More modifications for Gentoo by Matthew Kennedy
-;;; <mkennedy@gentoo.org>
-
-(in-package "SYSTEM")
-
-(if (probe-file "/etc/lisp-config.lisp")
-    (load "/etc/lisp-config.lisp")
-  (format t "~%;;; Warning: There is no /etc/lisp-config.lisp file (which should have been created during emerge"))
-
-;;; If you have sources installed on your system, un-comment the following form
-;;; and change it to point to the source location.  This will allow the Hemlock
-;;; "Edit Definition" command and the debugger to find sources for functions in
-;;; the core.
-(setf (ext:search-list "target:")
-      '(
-        "/usr/share/common-lisp/source/cmucl/"      ; object dir
-        ))
-
-(setf (ext:search-list "library:") '("/usr/lib/cmucl/"))
-;;; for safety...
-
-;;; optional extentions to the lisp image: delete if you
-;;; don't like them :-).
-(in-package :common-lisp-user)
-
-;;; newbie functions, delete if you don't like them
-
-(defun help ()
-  (format t "~
-Welcome to the Gentoo GNU/Linux port of CMUCL.
-
-The CMUCL REPL does not have GNU Readline-like support, however
-you may wish to install rlwap (see: app-misc/rlwrap) to achieve
-the same effect.
-
-If you think you found a bug, please use http://bugs.gentoo.org/
-
-Read the documentation in /usr/share/doc/@PF@.
-
-(quit)            exit Lisp
-(describe 'foo)   gives information about foo
-(inspect '*foo*)  interactively inspects *foo*
-(apropos \"foo\") briefly describe all symbols which match \"foo\"
-"))
-
diff --git a/dev-lisp/cmucl/files/19a/README.Gentoo b/dev-lisp/cmucl/files/19a/README.Gentoo
deleted file mode 100644
index 885807587fb5..000000000000
--- a/dev-lisp/cmucl/files/19a/README.Gentoo
+++ /dev/null
@@ -1,31 +0,0 @@
-
-* README.Gentoo -- Gentoo Specific Notes for dev-lisp/cmucl
-
-** About dev-lisp/cmucl 
-
-The dev-lisp/cmucl ebuild in portage aim to provide a port of
-Debian's package of CMUCL.  Thus the Gentoo CMUCL port should be
-binary compatible with the Debian port.
-
-** Linux Miscellaneous Binary Support
-
-You can have your compiled Lisp .x86f files automatically executed
-like any other binary by executing the following command:
-
-  echo ':lisp:E::x86f::/usr/bin/lisp-start:' \
-    >/proc/sys/fs/binfmt_misc/register
-
-Note: you need kernel support for this.  A good place to put the
-above command is in your /etc/conf.d/localstart.
-
-** Credit
-
-This Gentoo package, like many other Gentoo packages in the dev-lisp
-category, benifit from the Debian Project's work.
-
-  -- Matthew Kennedy <mkennedy@gentoo.org>
-
-
-Local Variables: ***
-mode: outline ***
-End: ***
diff --git a/dev-lisp/cmucl/files/19a/cmucl.sh b/dev-lisp/cmucl/files/19a/cmucl.sh
deleted file mode 100644
index 16772da268f0..000000000000
--- a/dev-lisp/cmucl/files/19a/cmucl.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-
-if [ ! -f /usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp ] ; then
-  cat <<EOF
-$0: cannot find the common-lisp-controller source.
-EOF
-  exit 0
-fi
-
-IMAGE=/usr/lib/cmucl/lisp.core
-DIR=cmucl
-
-case $1 in
-    rebuild)
-	    echo $0 rebuilding...
-	    shift
-	    while [ ! -z "$1" ] ; do
-		echo rebuilding $1
-		/usr/bin/lisp -core $IMAGE -eval "
-(let ((*gc-verbose* nil)
-      (*compile-print* nil)
-      (*compile-progress* nil)
-      (*compile-verbose*  nil)
-      (*require-verbose* nil)
-      (*load-verbose* nil))
-  (load \"/etc/common-lisp/cmucl/site-init.lisp\"))
-(let ((*gc-verbose* nil)
-      (*compile-print* t)
-      (*compile-progress* nil)
-      (*compile-verbose*  t)
-      (*require-verbose* t)
-      (*load-verbose* t)
-      (mk::*load-source-if-no-binary* nil)
-      (mk::*bother-user-if-no-binary* nil)
-      (mk::*compile-during-load* t))
-
-    (handler-case
-       (progn
-	 (with-compilation-unit (:optimize '((inhibit-warnings 3)))
-          (common-lisp-controller:compile-library :$1))
-         (unix:unix-exit 0))
-      (error (e)
-        (ignore-errors (format t \"~&Built Error: ~A~%\" e))
-	(finish-output)
-        (unix:unix-exit 1)))))" -nositeinit -noinit -batch -quiet || exit 1
-		shift
- 	    done 
-	    ;;
-     remove)
-	    echo $0 removing packages...
-	    shift
-	    while [ ! -z "$1" ] ; do
-		rm -rf "/usr/lib/common-lisp/$DIR/$1"
-		shift
- 	    done
-	    rmdir /usr/lib/common-lisp/$DIR 2> /dev/null 
-	    ;;
-    install-defsystem|install-clc)
-    	    echo installing the clc...
-	    ( cd /usr/lib/cmucl
-	     [ -f $IMAGE ] && rm -f $IMAGE
-	     /usr/bin/lisp  \
-	       -core ${IMAGE%.core}-dist.core -load /usr/lib/cmucl/install-clc.lisp \
-	       -nositeinit -noinit -batch -quiet  && \
-               mv new-lisp.core $IMAGE || (echo FAILED ; ln ${IMAGE%.core}-dist.core $IMAGE ) )
-    	    ;;
-    remove-defsystem|remove-clc)
-     	    [ -f $IMAGE ] && rm -f $IMAGE
-    	    ;;
-    make-user-image)
-    	    if [ ! -f $1 ] ; then 
-	      echo Cannot find file $1 to load and dump!
-	      exit 321
-	    fi
-	    /usr/bin/lisp -core $IMAGE -eval "
-(load \"$1\")
-    ;;
-    ;; Enable the garbage collector.  But first fake it into thinking that
-    ;; we don't need to garbage collect.  The save-lisp is going to call
-    ;; purify so any garbage will be collected then.
-#-gengc (setf lisp::*need-to-collect-garbage* nil)
-(gc-on)
-    ;;
-    ;; Save the lisp.
-(setf ext:*batch-mode* nil)
-(save-lisp #p\"home:lisp.core\")" -nositeinit -noinit -batch -quiet && echo New image created
-	    ;;
-    *)
-	    echo $0 unkown command $1
-	    echo known commands: install-clc, remove-clc,rebuild and remove
-	    exit 1
-	    ;;
-esac
-
-exit 0
diff --git a/dev-lisp/cmucl/files/19a/herald-save.lisp-gentoo.patch b/dev-lisp/cmucl/files/19a/herald-save.lisp-gentoo.patch
deleted file mode 100644
index b1a54bfb3ceb..000000000000
--- a/dev-lisp/cmucl/files/19a/herald-save.lisp-gentoo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ur cmucl-19a-release-20040728.orig.orig/src/code/save.lisp cmucl-19a-release-20040728.orig/src/code/save.lisp
---- cmucl-19a-release-20040728.orig.orig/src/code/save.lisp	2004-06-29 16:24:46.000000000 -0500
-+++ cmucl-19a-release-20040728.orig/src/code/save.lisp	2004-08-03 11:18:05.286348696 -0500
-@@ -289,11 +289,9 @@
- 	))
- 
- (setf (getf *herald-items* :bugs)
--      '("For support see http://www.cons.org/cmucl/support.html Send bug reports to the debian BTS."
--        terpri
--	"or to "
--	"pvaneynd@debian.org" terpri
--       "type (help) for help, (quit) to exit, and (demo) to see the demos" terpri
-+      '("For support see http://www.cons.org/cmucl/support.html" terpri
-+	"Send bug reports to http://bugs.gentoo.org" terpri
-+	"Type (help) for help or (quit) to exit." terpri
-         terpri
- 	"Loaded subsystems:"))
- 
-Only in cmucl-19a-release-20040728.orig/src/code: save.lisp~
diff --git a/dev-lisp/cmucl/files/19a/install-clc.lisp b/dev-lisp/cmucl/files/19a/install-clc.lisp
deleted file mode 100644
index 23642b16ffee..000000000000
--- a/dev-lisp/cmucl/files/19a/install-clc.lisp
+++ /dev/null
@@ -1,55 +0,0 @@
-;;; -*- Mode: LISP; Package: CL-USER -*-
-;;;
-;;; Copyright Peter Van Eynde, 2001
-;;;
-;;; License: LGPL v2
-;;;
-(in-package "COMMON-LISP-USER")
-
-(unless (ignore-errors
-          (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp"))
-  (unix:unix-exit 1))
-
-;; (unless (ignore-errors
-          (common-lisp-controller:init-common-lisp-controller 
-           "/usr/lib/common-lisp/cmucl/"
-           :version 3)
-;;           t)
-;;   (format t "~%Error during init of common-lisp-controller~%")
-;;   (unix:unix-exit 1))
-
-(in-package :common-lisp-controller)
-
-(defun send-clc-command (command package)
-  (let ((process
-         (ext:run-program "/usr/bin/clc-send-command"
-                          (list
-                           (ecase command
-                             (:recompile "recompile")
-                             (:remove "remove"))
-                           (format nil "~A" package)
-			   "cmucl"
-                           "--quiet")
-                          :wait t)))
-    (if (= (ext:process-exit-code process)
-           0)
-        ;; no error
-        (values)
-        (error "An error happend during ~A of ~A for ~A~%Please see /usr/share/doc/common-lisp-controller/REPORTING-BUGS.gz"
-               (ecase command
-                 (:recompile "recompilation")
-                 (:remove "removal"))
-               package
-	       "cmucl"))))
-
-(in-package "COMMON-LISP-USER")
-
-(unless (ignore-errors
-          ;; it loaded, configure it for common-lisp-controller use:
-          (format t "~%Saving to new-lisp.core...")
-          (ext:gc :full t)       
-          (setf ext:*batch-mode* nil)
-          (ext:save-lisp "new-lisp.core" 
-                         :purify t))
-  (unix:unix-exit 1))
-
diff --git a/dev-lisp/cmucl/files/19a/site-init.lisp.in b/dev-lisp/cmucl/files/19a/site-init.lisp.in
deleted file mode 100644
index 94f999802061..000000000000
--- a/dev-lisp/cmucl/files/19a/site-init.lisp.in
+++ /dev/null
@@ -1,54 +0,0 @@
-;;; -*- Mode: Lisp; Package: System -*-
-;;;
-;;; **********************************************************************
-;;; This code was written as part of the CMU Common Lisp project at
-;;; Carnegie Mellon University, and has been placed in the public domain.
-;;;
-
-;;; Heavy modifications by Peter Van Eynde
-
-;;; More modifications for Gentoo by Matthew Kennedy
-;;; <mkennedy@gentoo.org>
-
-(in-package "SYSTEM")
-
-(if (probe-file "/etc/lisp-config.lisp")
-    (load "/etc/lisp-config.lisp")
-  (format t "~%;;; Warning: There is no /etc/lisp-config.lisp file (which should have been created during emerge"))
-
-;;; If you have sources installed on your system, un-comment the following form
-;;; and change it to point to the source location.  This will allow the Hemlock
-;;; "Edit Definition" command and the debugger to find sources for functions in
-;;; the core.
-(setf (ext:search-list "target:")
-      '(
-        "/usr/share/common-lisp/source/cmucl/"      ; object dir
-        ))
-
-(setf (ext:search-list "library:") '("/usr/lib/cmucl/"))
-;;; for safety...
-
-;;; optional extentions to the lisp image: delete if you
-;;; don't like them :-).
-(in-package :common-lisp-user)
-
-;;; newbie functions, delete if you don't like them
-
-(defun help ()
-  (format t "~
-Welcome to the Gentoo GNU/Linux port of CMUCL.
-
-The CMUCL REPL does not have GNU Readline-like support, however
-you may wish to install rlwap (see: app-misc/rlwrap) to achieve
-the same effect.
-
-If you think you found a bug, please use http://bugs.gentoo.org/
-
-Read the documentation in /usr/share/doc/@PF@.
-
-(quit)            exit Lisp
-(describe 'foo)   gives information about foo
-(inspect '*foo*)  interactively inspects *foo*
-(apropos \"foo\") briefly describe all symbols which match \"foo\"
-"))
-
diff --git a/dev-lisp/cmucl/files/19b/README.Gentoo b/dev-lisp/cmucl/files/19b/README.Gentoo
deleted file mode 100644
index 885807587fb5..000000000000
--- a/dev-lisp/cmucl/files/19b/README.Gentoo
+++ /dev/null
@@ -1,31 +0,0 @@
-
-* README.Gentoo -- Gentoo Specific Notes for dev-lisp/cmucl
-
-** About dev-lisp/cmucl 
-
-The dev-lisp/cmucl ebuild in portage aim to provide a port of
-Debian's package of CMUCL.  Thus the Gentoo CMUCL port should be
-binary compatible with the Debian port.
-
-** Linux Miscellaneous Binary Support
-
-You can have your compiled Lisp .x86f files automatically executed
-like any other binary by executing the following command:
-
-  echo ':lisp:E::x86f::/usr/bin/lisp-start:' \
-    >/proc/sys/fs/binfmt_misc/register
-
-Note: you need kernel support for this.  A good place to put the
-above command is in your /etc/conf.d/localstart.
-
-** Credit
-
-This Gentoo package, like many other Gentoo packages in the dev-lisp
-category, benifit from the Debian Project's work.
-
-  -- Matthew Kennedy <mkennedy@gentoo.org>
-
-
-Local Variables: ***
-mode: outline ***
-End: ***
diff --git a/dev-lisp/cmucl/files/19b/cmucl.sh b/dev-lisp/cmucl/files/19b/cmucl.sh
deleted file mode 100644
index 16772da268f0..000000000000
--- a/dev-lisp/cmucl/files/19b/cmucl.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-
-if [ ! -f /usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp ] ; then
-  cat <<EOF
-$0: cannot find the common-lisp-controller source.
-EOF
-  exit 0
-fi
-
-IMAGE=/usr/lib/cmucl/lisp.core
-DIR=cmucl
-
-case $1 in
-    rebuild)
-	    echo $0 rebuilding...
-	    shift
-	    while [ ! -z "$1" ] ; do
-		echo rebuilding $1
-		/usr/bin/lisp -core $IMAGE -eval "
-(let ((*gc-verbose* nil)
-      (*compile-print* nil)
-      (*compile-progress* nil)
-      (*compile-verbose*  nil)
-      (*require-verbose* nil)
-      (*load-verbose* nil))
-  (load \"/etc/common-lisp/cmucl/site-init.lisp\"))
-(let ((*gc-verbose* nil)
-      (*compile-print* t)
-      (*compile-progress* nil)
-      (*compile-verbose*  t)
-      (*require-verbose* t)
-      (*load-verbose* t)
-      (mk::*load-source-if-no-binary* nil)
-      (mk::*bother-user-if-no-binary* nil)
-      (mk::*compile-during-load* t))
-
-    (handler-case
-       (progn
-	 (with-compilation-unit (:optimize '((inhibit-warnings 3)))
-          (common-lisp-controller:compile-library :$1))
-         (unix:unix-exit 0))
-      (error (e)
-        (ignore-errors (format t \"~&Built Error: ~A~%\" e))
-	(finish-output)
-        (unix:unix-exit 1)))))" -nositeinit -noinit -batch -quiet || exit 1
-		shift
- 	    done 
-	    ;;
-     remove)
-	    echo $0 removing packages...
-	    shift
-	    while [ ! -z "$1" ] ; do
-		rm -rf "/usr/lib/common-lisp/$DIR/$1"
-		shift
- 	    done
-	    rmdir /usr/lib/common-lisp/$DIR 2> /dev/null 
-	    ;;
-    install-defsystem|install-clc)
-    	    echo installing the clc...
-	    ( cd /usr/lib/cmucl
-	     [ -f $IMAGE ] && rm -f $IMAGE
-	     /usr/bin/lisp  \
-	       -core ${IMAGE%.core}-dist.core -load /usr/lib/cmucl/install-clc.lisp \
-	       -nositeinit -noinit -batch -quiet  && \
-               mv new-lisp.core $IMAGE || (echo FAILED ; ln ${IMAGE%.core}-dist.core $IMAGE ) )
-    	    ;;
-    remove-defsystem|remove-clc)
-     	    [ -f $IMAGE ] && rm -f $IMAGE
-    	    ;;
-    make-user-image)
-    	    if [ ! -f $1 ] ; then 
-	      echo Cannot find file $1 to load and dump!
-	      exit 321
-	    fi
-	    /usr/bin/lisp -core $IMAGE -eval "
-(load \"$1\")
-    ;;
-    ;; Enable the garbage collector.  But first fake it into thinking that
-    ;; we don't need to garbage collect.  The save-lisp is going to call
-    ;; purify so any garbage will be collected then.
-#-gengc (setf lisp::*need-to-collect-garbage* nil)
-(gc-on)
-    ;;
-    ;; Save the lisp.
-(setf ext:*batch-mode* nil)
-(save-lisp #p\"home:lisp.core\")" -nositeinit -noinit -batch -quiet && echo New image created
-	    ;;
-    *)
-	    echo $0 unkown command $1
-	    echo known commands: install-clc, remove-clc,rebuild and remove
-	    exit 1
-	    ;;
-esac
-
-exit 0
diff --git a/dev-lisp/cmucl/files/19b/herald-save.lisp-gentoo.patch b/dev-lisp/cmucl/files/19b/herald-save.lisp-gentoo.patch
deleted file mode 100644
index 0981115c6dfc..000000000000
--- a/dev-lisp/cmucl/files/19b/herald-save.lisp-gentoo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ur cmucl-19a-release-20040728.orig.orig/src/code/save.lisp cmucl-19b-release-20050628.orig/src/code/save.lisp
---- cmucl-19b-release-20050628.orig.orig/src/code/save.lisp	2004-06-29 16:24:46.000000000 -0500
-+++ cmucl-19b-release-20050628.orig/src/code/save.lisp	2004-08-03 11:18:05.286348696 -0500
-@@ -289,11 +289,9 @@
- 	))
- 
- (setf (getf *herald-items* :bugs)
--      '("For support see http://www.cons.org/cmucl/support.html Send bug reports to the debian BTS."
--        terpri
--	"or to "
--	"pvaneynd@debian.org" terpri
--       "type (help) for help, (quit) to exit, and (demo) to see the demos" terpri
-+      '("For support see http://www.cons.org/cmucl/support.html" terpri
-+	"Send bug reports to http://bugs.gentoo.org" terpri
-+	"Type (help) for help or (quit) to exit." terpri
-         terpri
- 	"Loaded subsystems:"))
- 
-
diff --git a/dev-lisp/cmucl/files/19b/install-clc.lisp b/dev-lisp/cmucl/files/19b/install-clc.lisp
deleted file mode 100644
index 23642b16ffee..000000000000
--- a/dev-lisp/cmucl/files/19b/install-clc.lisp
+++ /dev/null
@@ -1,55 +0,0 @@
-;;; -*- Mode: LISP; Package: CL-USER -*-
-;;;
-;;; Copyright Peter Van Eynde, 2001
-;;;
-;;; License: LGPL v2
-;;;
-(in-package "COMMON-LISP-USER")
-
-(unless (ignore-errors
-          (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp"))
-  (unix:unix-exit 1))
-
-;; (unless (ignore-errors
-          (common-lisp-controller:init-common-lisp-controller 
-           "/usr/lib/common-lisp/cmucl/"
-           :version 3)
-;;           t)
-;;   (format t "~%Error during init of common-lisp-controller~%")
-;;   (unix:unix-exit 1))
-
-(in-package :common-lisp-controller)
-
-(defun send-clc-command (command package)
-  (let ((process
-         (ext:run-program "/usr/bin/clc-send-command"
-                          (list
-                           (ecase command
-                             (:recompile "recompile")
-                             (:remove "remove"))
-                           (format nil "~A" package)
-			   "cmucl"
-                           "--quiet")
-                          :wait t)))
-    (if (= (ext:process-exit-code process)
-           0)
-        ;; no error
-        (values)
-        (error "An error happend during ~A of ~A for ~A~%Please see /usr/share/doc/common-lisp-controller/REPORTING-BUGS.gz"
-               (ecase command
-                 (:recompile "recompilation")
-                 (:remove "removal"))
-               package
-	       "cmucl"))))
-
-(in-package "COMMON-LISP-USER")
-
-(unless (ignore-errors
-          ;; it loaded, configure it for common-lisp-controller use:
-          (format t "~%Saving to new-lisp.core...")
-          (ext:gc :full t)       
-          (setf ext:*batch-mode* nil)
-          (ext:save-lisp "new-lisp.core" 
-                         :purify t))
-  (unix:unix-exit 1))
-
diff --git a/dev-lisp/cmucl/files/19b/site-init.lisp.in b/dev-lisp/cmucl/files/19b/site-init.lisp.in
deleted file mode 100644
index 94f999802061..000000000000
--- a/dev-lisp/cmucl/files/19b/site-init.lisp.in
+++ /dev/null
@@ -1,54 +0,0 @@
-;;; -*- Mode: Lisp; Package: System -*-
-;;;
-;;; **********************************************************************
-;;; This code was written as part of the CMU Common Lisp project at
-;;; Carnegie Mellon University, and has been placed in the public domain.
-;;;
-
-;;; Heavy modifications by Peter Van Eynde
-
-;;; More modifications for Gentoo by Matthew Kennedy
-;;; <mkennedy@gentoo.org>
-
-(in-package "SYSTEM")
-
-(if (probe-file "/etc/lisp-config.lisp")
-    (load "/etc/lisp-config.lisp")
-  (format t "~%;;; Warning: There is no /etc/lisp-config.lisp file (which should have been created during emerge"))
-
-;;; If you have sources installed on your system, un-comment the following form
-;;; and change it to point to the source location.  This will allow the Hemlock
-;;; "Edit Definition" command and the debugger to find sources for functions in
-;;; the core.
-(setf (ext:search-list "target:")
-      '(
-        "/usr/share/common-lisp/source/cmucl/"      ; object dir
-        ))
-
-(setf (ext:search-list "library:") '("/usr/lib/cmucl/"))
-;;; for safety...
-
-;;; optional extentions to the lisp image: delete if you
-;;; don't like them :-).
-(in-package :common-lisp-user)
-
-;;; newbie functions, delete if you don't like them
-
-(defun help ()
-  (format t "~
-Welcome to the Gentoo GNU/Linux port of CMUCL.
-
-The CMUCL REPL does not have GNU Readline-like support, however
-you may wish to install rlwap (see: app-misc/rlwrap) to achieve
-the same effect.
-
-If you think you found a bug, please use http://bugs.gentoo.org/
-
-Read the documentation in /usr/share/doc/@PF@.
-
-(quit)            exit Lisp
-(describe 'foo)   gives information about foo
-(inspect '*foo*)  interactively inspects *foo*
-(apropos \"foo\") briefly describe all symbols which match \"foo\"
-"))
-
diff --git a/dev-lisp/cmucl/files/digest-cmucl-18e-r4 b/dev-lisp/cmucl/files/digest-cmucl-18e-r4
deleted file mode 100644
index 0ab15efc8e9d..000000000000
--- a/dev-lisp/cmucl/files/digest-cmucl-18e-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 695f4a6abc5af6276f776a9739c2c7e7 cmucl-18e-x86-linux.tar.bz2 6404635
-RMD160 2ef1be297f91d789fada6b74e2c33af6e69a6e2a cmucl-18e-x86-linux.tar.bz2 6404635
-SHA256 f029d9d88945fd88e25d355562fc65170ac839d3660215e5e5cee2353d40eef7 cmucl-18e-x86-linux.tar.bz2 6404635
-MD5 79384e120d128e8ea48dd414bfbff4cc cmucl_18e-8.tar.gz 6305420
-RMD160 34973aed566c8b8dfcf12c04ec4c15bf8c3468aa cmucl_18e-8.tar.gz 6305420
-SHA256 70678a72ca02837d7f68ecd0ba9d9b470a339312d4ec56eca0013acd7007a072 cmucl_18e-8.tar.gz 6305420
diff --git a/dev-lisp/cmucl/files/digest-cmucl-19a-r1 b/dev-lisp/cmucl/files/digest-cmucl-19a-r1
deleted file mode 100644
index 1b7235de8a0d..000000000000
--- a/dev-lisp/cmucl/files/digest-cmucl-19a-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 8d2afba837c28149944d3edd02af8b86 cmucl-19a-x86-linux.tar.bz2 7237512
-RMD160 d4d4572c5cd06afee3d663d25e453e518c7e008c cmucl-19a-x86-linux.tar.bz2 7237512
-SHA256 2d1be114823215dd135ead627f6848009ddca6806b41e62377373f461e7cb35c cmucl-19a-x86-linux.tar.bz2 7237512
-MD5 0518633d69983cda9d4a227c4ed018c7 cmucl_19a-release-20040728-10.diff.gz 1503298
-RMD160 d451e6f1274b285db54b1153f630e3ae80d88e61 cmucl_19a-release-20040728-10.diff.gz 1503298
-SHA256 33f690b56c4f57b8dde62a0a78a2d03c6a8364624425ae9612624912618c2beb cmucl_19a-release-20040728-10.diff.gz 1503298
-MD5 6b37fe4815935af73f0efd1312e6a969 cmucl_19a-release-20040728.orig.tar.gz 4456803
-RMD160 80e14a7b3b61ca28984b95334283442da8eb4f49 cmucl_19a-release-20040728.orig.tar.gz 4456803
-SHA256 f85e10478f9f576577a11d2dd9ebff59650f4b033f605dee5aec1a1af5c24de4 cmucl_19a-release-20040728.orig.tar.gz 4456803
diff --git a/dev-lisp/cmucl/files/digest-cmucl-19b b/dev-lisp/cmucl/files/digest-cmucl-19b
deleted file mode 100644
index 006f87d6f232..000000000000
--- a/dev-lisp/cmucl/files/digest-cmucl-19b
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 ccdc295e51e3c3a1531f2ef945fdc029 cmucl-19b-x86-linux.tar.bz2 7289196
-RMD160 2089f312b370f0985fd532b774c1136741f9a34e cmucl-19b-x86-linux.tar.bz2 7289196
-SHA256 a9e458c920e10f0469dc3663ac543c360ed0481da8074f91131ea03c86f0179c cmucl-19b-x86-linux.tar.bz2 7289196
-MD5 b1b1ef79c04bf4e8b00c5f2e4dd4af9f cmucl_19b-release-20050628-4.diff.gz 1504059
-RMD160 fd05fe166b221ef54a0d234d3771dcb9418525e9 cmucl_19b-release-20050628-4.diff.gz 1504059
-SHA256 9151691c71d50c7dae8632bdeb5f7429cacb1238a7f58ec67bdc10aaa28a9c28 cmucl_19b-release-20050628-4.diff.gz 1504059
-MD5 363a959fd8080ecabc8372463d485134 cmucl_19b-release-20050628.orig.tar.gz 4644271
-RMD160 dfdcfa3668dd9c6c7b6b39a73eb283a7549f11b8 cmucl_19b-release-20050628.orig.tar.gz 4644271
-SHA256 197f25db93191534cf05bb293a4e0069768d6a8919f8bed3a15ded7ee463c251 cmucl_19b-release-20050628.orig.tar.gz 4644271
diff --git a/dev-lisp/cmucl/files/digest-cmucl-19d_pre1 b/dev-lisp/cmucl/files/digest-cmucl-19d_pre1
deleted file mode 100644
index 5485748a52e8..000000000000
--- a/dev-lisp/cmucl/files/digest-cmucl-19d_pre1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 06dba01693757fb57bcad374cf720b9e cmucl-19d-pre1-x86-linux.tar.bz2 7600456
-RMD160 59d8e1211fb2e37ecabfd6cda9a706b57913d9ec cmucl-19d-pre1-x86-linux.tar.bz2 7600456
-SHA256 959157ee365d499d065f08d9ab385d2fff6adda11ce78d79ede0247fb4ba6e6e cmucl-19d-pre1-x86-linux.tar.bz2 7600456
-MD5 f759dc6fc7dc04d0bc4037b57575f659 cmucl-src-19d-pre1.tar.bz2 3780423
-RMD160 19a536c4492d1ef6a59f09b6e9d9b90da6a88408 cmucl-src-19d-pre1.tar.bz2 3780423
-SHA256 117e8fd8c7c02a7bcdbc055a23431ffc895c9766c1459b5daaf91203cbc9ad05 cmucl-src-19d-pre1.tar.bz2 3780423
diff --git a/dev-lisp/cmucl/files/digest-cmucl-19d_pre1-r1 b/dev-lisp/cmucl/files/digest-cmucl-19d_pre1-r1
deleted file mode 100644
index 5485748a52e8..000000000000
--- a/dev-lisp/cmucl/files/digest-cmucl-19d_pre1-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 06dba01693757fb57bcad374cf720b9e cmucl-19d-pre1-x86-linux.tar.bz2 7600456
-RMD160 59d8e1211fb2e37ecabfd6cda9a706b57913d9ec cmucl-19d-pre1-x86-linux.tar.bz2 7600456
-SHA256 959157ee365d499d065f08d9ab385d2fff6adda11ce78d79ede0247fb4ba6e6e cmucl-19d-pre1-x86-linux.tar.bz2 7600456
-MD5 f759dc6fc7dc04d0bc4037b57575f659 cmucl-src-19d-pre1.tar.bz2 3780423
-RMD160 19a536c4492d1ef6a59f09b6e9d9b90da6a88408 cmucl-src-19d-pre1.tar.bz2 3780423
-SHA256 117e8fd8c7c02a7bcdbc055a23431ffc895c9766c1459b5daaf91203cbc9ad05 cmucl-src-19d-pre1.tar.bz2 3780423