Missing x11-misc/imake dependencies; Resolves Bug #128288; Removed old ebuilds.

Package-Manager: portage-2.1_pre7-r1

28 files changed, 56 insertions, 1062 deletions

diff --git a/dev-lisp/clisp/ChangeLog b/dev-lisp/clisp/ChangeLog
index 1a778059b50a..46464ae470a4 100644
--- a/dev-lisp/clisp/ChangeLog
+++ b/dev-lisp/clisp/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for dev-lisp/clisp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.48 2006/01/28 10:41:39 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.49 2006/04/03 17:29:50 mkennedy Exp $
+
+*clisp-2.38-r1 (03 Apr 2006)
+
+  03 Apr 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  -files/2.33.2/README.Gentoo, -files/2.33.2/clisp.sh,
+  -files/2.33.2/compilefix.patch,
+  -files/2.33.2/fastcgi-Makefile.in-gentoo.patch,
+  -files/2.33.2/glibc-linux.lisp-sigpause-gentoo.patch,
+  -files/2.33.2/install-clc.lisp, -files/2.34/README.Gentoo,
+  -files/2.34/clisp.sh, -files/2.34/fastcgi-Makefile.in-gentoo.patch,
+  -files/2.34/glibc-linux.lisp-sigpause-gentoo.patch,
+  -files/2.34/install-clc.lisp, -files/2.35/README.Gentoo,
+  -files/2.35/clisp.sh, -files/2.35/install-clc.lisp,
+  -files/2.36/README.Gentoo, -files/2.36/clisp.sh,
+  -files/2.36/install-clc.lisp, -clisp-2.33.2-r2.ebuild,
+  -clisp-2.34-r1.ebuild, -clisp-2.35.ebuild, -clisp-2.36.ebuild,
+  +clisp-2.38-r1.ebuild:
+  Missing x11-misc/imake dependencies; Resolves Bug #128288; Removed old ebuilds.
 
   28 Jan 2006; Tobias Scherbaum <dertobi123@gentoo.org> clisp-2.38.ebuild:
   ppc stable, bug #120224
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index 227599e30d7c..66f6ac670385 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -1,32 +1,37 @@
-MD5 739d2f7559f199584aa29fbc5d9a2cf6 ChangeLog 10861
-MD5 fce61ccc24ef4d9aa4b70cc4c8fde0be clisp-2.33.2-r2.ebuild 4238
-MD5 703fc21066f759fb89bd66a28a9ee91f clisp-2.34-r1.ebuild 4160
-MD5 875bf0b817f57e16ad20f42f094ad8a1 clisp-2.35.ebuild 2879
-MD5 cd8df21d6d2351d3116a6cfafe5cdf6e clisp-2.36.ebuild 3142
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fdaa3c5ba38979d5847fcd8a11b6d95a ChangeLog 11716
+RMD160 7e7bf4e4d7b65a68019aac7b965e941471570d8a ChangeLog 11716
+SHA256 cf362bce2303846ab0dd3f98815747c76349cf79884fafd51c6a887d63d32c1c ChangeLog 11716
+MD5 18d55c8d4eac86f9ee3071fcd5830f47 clisp-2.38-r1.ebuild 3163
+RMD160 e058c5b3d60a55bb59f61d618c70b36efa6da52d clisp-2.38-r1.ebuild 3163
+SHA256 030d8425bbe6072fa79d279c36092e4316817f51bf44a469127f6443deb6134f clisp-2.38-r1.ebuild 3163
 MD5 dcf6f597090f7d2d4ad822bcf92427a9 clisp-2.38.ebuild 3141
-MD5 66e5b3968b3a6ad0301ca028447b26b3 files/2.33.2/README.Gentoo 334
-MD5 fe93240f140623bf55d2e503f6d8e01e files/2.33.2/clisp.sh 2792
-MD5 8d8449ba456d4f8b789d4349496845b6 files/2.33.2/compilefix.patch 1174
-MD5 a9325cfeff703a21e63dbd2b3aad34c1 files/2.33.2/fastcgi-Makefile.in-gentoo.patch 670
-MD5 3eb393d2fbfe2e395744f45ce0d3e4f0 files/2.33.2/glibc-linux.lisp-sigpause-gentoo.patch 622
-MD5 2f431f5c714c00d04b55e02a9d54f452 files/2.33.2/install-clc.lisp 501
-MD5 66e5b3968b3a6ad0301ca028447b26b3 files/2.34/README.Gentoo 334
-MD5 fe93240f140623bf55d2e503f6d8e01e files/2.34/clisp.sh 2792
-MD5 a68a303f8d8e4eec8542f36167df1377 files/2.34/fastcgi-Makefile.in-gentoo.patch 662
-MD5 e415e209cc23163e624face90f97e024 files/2.34/glibc-linux.lisp-sigpause-gentoo.patch 614
-MD5 2f431f5c714c00d04b55e02a9d54f452 files/2.34/install-clc.lisp 501
-MD5 66e5b3968b3a6ad0301ca028447b26b3 files/2.35/README.Gentoo 334
-MD5 fe93240f140623bf55d2e503f6d8e01e files/2.35/clisp.sh 2792
-MD5 2f431f5c714c00d04b55e02a9d54f452 files/2.35/install-clc.lisp 501
-MD5 66e5b3968b3a6ad0301ca028447b26b3 files/2.36/README.Gentoo 334
-MD5 fe93240f140623bf55d2e503f6d8e01e files/2.36/clisp.sh 2792
-MD5 2f431f5c714c00d04b55e02a9d54f452 files/2.36/install-clc.lisp 501
+RMD160 7d76975b149b88b11fe6b6f22ab9cc86ea996f09 clisp-2.38.ebuild 3141
+SHA256 a54f3acd15e422dd3af3f996eb9278781e696538ed3726e987c77ca699217c05 clisp-2.38.ebuild 3141
 MD5 66e5b3968b3a6ad0301ca028447b26b3 files/2.38/README.Gentoo 334
+RMD160 c236897c39f4c8e8f75ff9782d2ee7a7b30aece4 files/2.38/README.Gentoo 334
+SHA256 336e4287ec4cfdbe8fda692bd217431adb4e303d3f5204bdf3df0ea711fbebd6 files/2.38/README.Gentoo 334
 MD5 fe93240f140623bf55d2e503f6d8e01e files/2.38/clisp.sh 2792
+RMD160 107eccac30fc373f449d0d252ca82fa400ce0877 files/2.38/clisp.sh 2792
+SHA256 5ba7c78f3d99b9264c9cb8909135ccd0bca113d66d5a998acc520fb431dc75ad files/2.38/clisp.sh 2792
 MD5 2f431f5c714c00d04b55e02a9d54f452 files/2.38/install-clc.lisp 501
-MD5 9a2df7725b74af8b8b9f3db39b350e79 files/digest-clisp-2.33.2-r2 66
-MD5 d8868b134ba5463d87df11818719fcec files/digest-clisp-2.34-r1 64
-MD5 f9c5dbcccff51886eb3704fd7fa7c429 files/digest-clisp-2.35 64
-MD5 08b8b798be80ccd9fe2e06b3a94d11ec files/digest-clisp-2.36 64
+RMD160 c4848c195ef194fce8ec73eb4aceeb5f34b919ac files/2.38/install-clc.lisp 501
+SHA256 93ff66189e490ae806c2d227e24295af0cf01e1bb0a1d7de2cf57ff59523f09e files/2.38/install-clc.lisp 501
 MD5 b8735b2750320366c3270887f00e2fa3 files/digest-clisp-2.38 64
+RMD160 2f517a9e6e8c63fa11464dd3a2ed8ec50395d0fc files/digest-clisp-2.38 64
+SHA256 c0447d26305693b9f8d0a627a9d47d17a546da8a00a7c20137f7733f2be5b104 files/digest-clisp-2.38 64
+MD5 9210f3550260a9fcac73c39f31f2e14f files/digest-clisp-2.38-r1 238
+RMD160 60a53629c21be478cf62f91bd25afd22b09e95bf files/digest-clisp-2.38-r1 238
+SHA256 0cac2d185676cab92bb8516501d45c36c0867fde92ccef75a959ceb658460c46 files/digest-clisp-2.38-r1 238
 MD5 485cde76397408cf913fc6d4c7a45a67 metadata.xml 882
+RMD160 c1c9236c3fb6d0594a998221fbff50add9b1d1b2 metadata.xml 882
+SHA256 b55a5dec0b7c7764565517bab024bb1526dd21cf58bc4a727f09ac3d2ff4983f metadata.xml 882
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEMVubyiNZaEAZA+ARAiyDAJ400QVHhgYgNktDdQ46nuCoprfSKQCfWQk9
+0M6mXy5Ez3nczZeQ0ZVWX20=
+=yL4o
+-----END PGP SIGNATURE-----
diff --git a/dev-lisp/clisp/clisp-2.33.2-r2.ebuild b/dev-lisp/clisp/clisp-2.33.2-r2.ebuild
deleted file mode 100644
index b523ffcddc3b..000000000000
--- a/dev-lisp/clisp/clisp-2.33.2-r2.ebuild
+++ /dev/null
@@ -1,138 +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/clisp/clisp-2.33.2-r2.ebuild,v 1.8 2005/11/15 14:21:15 gustavoz Exp $
-
-inherit flag-o-matic common-lisp-common-2 eutils toolchain-funcs
-
-DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
-HOMEPAGE="http://clisp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="x86 ppc ~ppc-macos ~amd64 -sparc"
-IUSE="X fastcgi nls pcre postgres readline"
-
-DEPEND="dev-libs/libsigsegv
-	dev-lisp/common-lisp-controller
-	fastcgi? ( dev-libs/fcgi )
-	postgres? ( dev-db/postgresql )
-	X? ( virtual/x11 )
-	readline? ( sys-libs/readline )
-	nls? ( sys-devel/gettext )
-	pcre? ( dev-libs/libpcre )"
-
-PROVIDE="virtual/commonlisp"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}/fastcgi-Makefile.in-gentoo.patch || die
-	epatch ${FILESDIR}/${PV}/glibc-linux.lisp-sigpause-gentoo.patch || die
-	epatch ${FILESDIR}/${PV}/compilefix.patch || die
-}
-
-src_compile() {
-	# Handle the case where the user has some other -falign-functions
-	# option set.  Bug 34630.
-	if ! is-flag '-falign-functions=4' \
-		&& expr "$CFLAGS" : '.*\(-falign-functions=[[:digit:]]\+\)' >/dev/null; then
-		CFLAGS=${CFLAGS/\
-		$(expr "$CFLAGS" : '.*\(-falign-functions=[[:digit:]]\+\)')/\
-		-falign-functions=4}
-	fi
-
-	# Fails to compile without -falign-functions=4 when -march=pentium4
-	# (or -march=pentium3, sometimes??) is defined.	 Bugs 33425 and 34630.
-	if (is-flag '-march=pentium4' || is-flag '-march=pentium3') \
-		&& ! is-flag '-falign-functions=4'; then
-		append-flags '-falign-functions=4'
-	fi
-
-	# Athlon XP users report problems with -O3 optimization.  In this
-	# block, we remove any optimization flag.  Depending on bug 34497. we
-	# may be able to reduce optimization to -O2.
-	if is-flag '-march=athlon-xp'; then
-		filter-flags '-O*'
-	fi
-
-	# The previous stanza might not be necessary.  Bug 39830.
-	if is-flag '-march=athlon-xp'; then
-		replace-flags '-march=athlon-xp' '-mcpu=athlon-xp'
-	fi
-
-#	einfo "Using CFLAGS: ${CFLAGS}"
-#	export CC="$(gcc-getCC) ${CFLAGS}"
-
-	CC="$(tc-getCC)"			# used further down
-
-	# Let CLISP use its own set of optimizations
-	unset CFLAGS CXXFLAGS
-	local myconf="--with-dynamic-ffi
-		--with-unicode
-		--with-module=regexp
-		--with-module=syscalls
-		--with-module=wildcard"
-	use ppc-macos || myconf="${myconf} --with-module=bindings/glibc"
-	use readline || myconf="${myconf} --with-noreadline"
-	use nls || myconf="${myconf} --with-nogettext"
-#	use X && myconf="${myconf} --with-module=clx/new-clx"
-	use X && myconf="${myconf} --with-module=clx/mit-clx"
-	if use postgres; then
-		myconf="${myconf} --with-module=postgresql"
-		CC="${CC} -I $(pg_config --includedir)"
-	fi
-	use fastcgi && myconf="${myconf} --with-module=fastcgi"
-	use pcre && myconf="${myconf} --with-module=pcre"
-	./configure --prefix=/usr ${myconf} build || die "./configure failed"
-	cd build
-	./makemake ${myconf} >Makefile
-	emake -j1 config.lisp
-	sed -i 's,"vi","nano",g' config.lisp
-	sed -i 's,http://www.lisp.org/HyperSpec/,http://www.lispworks.com/reference/HyperSpec/,g' config.lisp
-	emake -j1 || die
-}
-
-src_install() {
-	pushd build
-	make DESTDIR=${D} prefix=/usr install-bin || die
-	doman clisp.1
-	dodoc SUMMARY README* NEWS MAGIC.add GNU-GPL COPYRIGHT \
-		ANNOUNCE clisp.dvi clisp.html
-
-	rm -f ${D}/usr/lib/clisp/base/*
-	(cd ${D}/usr/lib/clisp/base && ln -s ../full/* .)
-	chmod a+x ${D}/usr/lib/clisp/clisp-link
-	popd
-
-	# install common-lisp-controller profile
-	exeinto /usr/lib/common-lisp/bin
-	doexe ${FILESDIR}/${PV}/clisp.sh
-	insinto /usr/lib/clisp
-	doins ${FILESDIR}/${PV}/install-clc.lisp
-	dodoc ${FILESDIR}/${PV}/README.Gentoo
-
-	keepdir /usr/lib/common-lisp/clisp
-}
-
-pkg_preinst() {
-	local clisp_dir=/usr/lib/clisp
-	local old_mem=$clisp_dir/full/lispinit.mem
-	local new_mem=$clisp_dir/full/lispinit-new.mem
-	local clean_mem=$clisp_dir/full/lispinit-clean.mem
-	local lisp_run=$clisp_dir/full/lisp.run
-	rm -f $old_mem $new_mem $clean_mem $lisp_run
-}
-
-pkg_postinst() {
-	standard-impl-postinst clisp
-}
-
-pkg_postrm() {
-	standard-impl-postrm clisp /usr/bin/clisp
-}
-
-pkg_postrm() {
-	if [ ! -x /usr/bin/clisp ]; then
-		rm -rf /usr/lib/clisp/ || die
-	fi
-}
diff --git a/dev-lisp/clisp/clisp-2.34-r1.ebuild b/dev-lisp/clisp/clisp-2.34-r1.ebuild
deleted file mode 100644
index 7ccd212ca4b2..000000000000
--- a/dev-lisp/clisp/clisp-2.34-r1.ebuild
+++ /dev/null
@@ -1,137 +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/clisp/clisp-2.34-r1.ebuild,v 1.4 2005/11/15 14:21:15 gustavoz Exp $
-
-inherit flag-o-matic common-lisp-common-2 eutils toolchain-funcs
-
-DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
-HOMEPAGE="http://clisp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ppc ~ppc-macos -sparc x86"
-IUSE="X fastcgi pcre postgres readline zlib"
-
-DEPEND="dev-libs/libsigsegv
-	dev-lisp/common-lisp-controller
-	sys-devel/gettext
-	virtual/tetex
-	fastcgi? ( dev-libs/fcgi )
-	postgres? ( dev-db/postgresql )
-	X? ( virtual/x11 )
-	readline? ( sys-libs/readline )
-	pcre? ( dev-libs/libpcre )
-	zlib? ( sys-libs/zlib )"
-
-PROVIDE="virtual/commonlisp"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}/fastcgi-Makefile.in-gentoo.patch || die
-	epatch ${FILESDIR}/${PV}/glibc-linux.lisp-sigpause-gentoo.patch || die
-}
-
-src_compile() {
-	# Handle the case where the user has some other -falign-functions
-	# option set.  Bug 34630.
-	if ! is-flag '-falign-functions=4' \
-		&& expr "$CFLAGS" : '.*\(-falign-functions=[[:digit:]]\+\)' >/dev/null; then
-		CFLAGS=${CFLAGS/\
-		$(expr "$CFLAGS" : '.*\(-falign-functions=[[:digit:]]\+\)')/\
-		-falign-functions=4}
-	fi
-
-	# Fails to compile without -falign-functions=4 when -march=pentium4
-	# (or -march=pentium3, sometimes??) is defined.	 Bugs 33425 and 34630.
-	if (is-flag '-march=pentium4' || is-flag '-march=pentium3') \
-		&& ! is-flag '-falign-functions=4'; then
-		append-flags '-falign-functions=4'
-	fi
-
-	# Athlon XP users report problems with -O3 optimization.  In this
-	# block, we remove any optimization flag.  Depending on bug 34497. we
-	# may be able to reduce optimization to -O2.
-	if is-flag '-march=athlon-xp'; then
-		filter-flags '-O*'
-	fi
-
-	# The previous stanza might not be necessary.  Bug 39830.
-	if is-flag '-march=athlon-xp'; then
-		replace-flags '-march=athlon-xp' '-mcpu=athlon-xp'
-	fi
-
-#	einfo "Using CFLAGS: ${CFLAGS}"
-#	export CC="$(gcc-getCC) ${CFLAGS}"
-
-	CC="$(tc-getCC)"			# used further down
-
-	# Let CLISP use its own set of optimizations
-	unset CFLAGS CXXFLAGS
-	local myconf="--with-dynamic-ffi
-		--with-module=wildcard
-		--with-module=rawsock"
-	use ppc-macos || myconf="${myconf} --with-module=bindings/glibc"
-	use readline || myconf="${myconf} --with-noreadline"
-	use X && myconf="${myconf} --with-module=clx/new-clx"
-	if use postgres; then
-		myconf="${myconf} --with-module=postgresql"
-		CC="${CC} -I $(pg_config --includedir)"
-	fi
-	use fastcgi && myconf="${myconf} --with-module=fastcgi"
-	use pcre && myconf="${myconf} --with-module=pcre"
-	use zlib && myconf="${myconf} --with-module=zlib"
-	einfo "Configuring with ${myconf}"
-	./configure --prefix=/usr ${myconf} build || die "./configure failed"
-	cd build
-	./makemake ${myconf} >Makefile
-	emake -j1 config.lisp
-	sed -i 's,"vi","nano",g' config.lisp
-	sed -i 's,http://www.lisp.org/HyperSpec/,http://www.lispworks.com/reference/HyperSpec/,g' config.lisp
-	emake -j1 || die
-}
-
-src_install() {
-	pushd build
-	make DESTDIR=${D} prefix=/usr install-bin || die
-	doman clisp.1
-	dodoc SUMMARY README* NEWS MAGIC.add GNU-GPL COPYRIGHT \
-		ANNOUNCE clisp.dvi clisp.html
-
-	rm -f ${D}/usr/lib/clisp/base/*
-	(cd ${D}/usr/lib/clisp/base && ln -s ../full/* .)
-	chmod a+x ${D}/usr/lib/clisp/clisp-link
-	popd
-
-	# install common-lisp-controller profile
-	exeinto /usr/lib/common-lisp/bin
-	doexe ${FILESDIR}/${PV}/clisp.sh
-	insinto /usr/lib/clisp
-	doins ${FILESDIR}/${PV}/install-clc.lisp
-	dodoc ${FILESDIR}/${PV}/README.Gentoo
-
-	keepdir /usr/lib/common-lisp/clisp
-}
-
-pkg_preinst() {
-	local clisp_dir=/usr/lib/clisp
-	local old_mem=$clisp_dir/full/lispinit.mem
-	local new_mem=$clisp_dir/full/lispinit-new.mem
-	local clean_mem=$clisp_dir/full/lispinit-clean.mem
-	local lisp_run=$clisp_dir/full/lisp.run
-	rm -f $old_mem $new_mem $clean_mem $lisp_run
-}
-
-pkg_postinst() {
-	standard-impl-postinst clisp
-}
-
-pkg_postrm() {
-	standard-impl-postrm clisp /usr/bin/clisp
-}
-
-pkg_postrm() {
-	if [ ! -x /usr/bin/clisp ]; then
-		rm -rf /usr/lib/clisp/ || die
-	fi
-}
diff --git a/dev-lisp/clisp/clisp-2.35.ebuild b/dev-lisp/clisp/clisp-2.35.ebuild
deleted file mode 100644
index 33d6c9b2f839..000000000000
--- a/dev-lisp/clisp/clisp-2.35.ebuild
+++ /dev/null
@@ -1,96 +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/clisp/clisp-2.35.ebuild,v 1.2 2005/11/15 14:21:15 gustavoz Exp $
-
-inherit flag-o-matic common-lisp-common-2 eutils toolchain-funcs
-
-DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
-HOMEPAGE="http://clisp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~ppc-macos ~amd64 -sparc"
-IUSE="X fastcgi pcre postgres readline zlib"
-
-DEPEND="dev-libs/libsigsegv
-	dev-lisp/common-lisp-controller
-	sys-devel/gettext
-	virtual/tetex
-	fastcgi? ( dev-libs/fcgi )
-	postgres? ( dev-db/postgresql )
-	X? ( virtual/x11 )
-	readline? ( sys-libs/readline )
-	pcre? ( dev-libs/libpcre )
-	zlib? ( sys-libs/zlib )"
-
-PROVIDE="virtual/commonlisp"
-
-src_compile() {
-	# Let CLISP use its own set of optimizations
-	unset CFLAGS CXXFLAGS
-	CC="$(tc-getCC)"
-	local myconf="--with-dynamic-ffi
-		--with-module=wildcard
-		--with-module=rawsock"
-	use ppc-macos || myconf="${myconf} --with-module=bindings/glibc"
-	use readline || myconf="${myconf} --with-noreadline"
-	use X && myconf="${myconf} --with-module=clx/new-clx"
-	if use postgres; then
-		myconf="${myconf} --with-module=postgresql"
-		CC="${CC} -I $(pg_config --includedir)"
-	fi
-	use fastcgi && myconf="${myconf} --with-module=fastcgi"
-	use pcre && myconf="${myconf} --with-module=pcre"
-	use zlib && myconf="${myconf} --with-module=zlib"
-	einfo "Configuring with ${myconf}"
-	./configure --prefix=/usr ${myconf} build || die "./configure failed"
-	cd build
-	./makemake ${myconf} >Makefile
-	emake -j1 config.lisp
-	sed -i 's,"vi","nano",g' config.lisp
-	sed -i 's,http://www.lisp.org/HyperSpec/,http://www.lispworks.com/reference/HyperSpec/,g' config.lisp
-	emake -j1 || die
-}
-
-src_install() {
-	pushd build
-	make DESTDIR=${D} prefix=/usr install-bin || die
-	doman clisp.1
-	dodoc SUMMARY README* NEWS MAGIC.add GNU-GPL COPYRIGHT \
-		ANNOUNCE clisp.dvi clisp.html
-	rm -f ${D}/usr/lib/clisp/base/*
-	(cd ${D}/usr/lib/clisp/base && ln -s ../full/* .)
-	chmod a+x ${D}/usr/lib/clisp/clisp-link
-	popd
-	# install common-lisp-controller profile
-	exeinto /usr/lib/common-lisp/bin
-	doexe ${FILESDIR}/${PV}/clisp.sh
-	insinto /usr/lib/clisp
-	doins ${FILESDIR}/${PV}/install-clc.lisp
-	dodoc ${FILESDIR}/${PV}/README.Gentoo
-	keepdir /usr/lib/common-lisp/clisp
-}
-
-pkg_preinst() {
-	local clisp_dir=/usr/lib/clisp
-	local old_mem=$clisp_dir/full/lispinit.mem
-	local new_mem=$clisp_dir/full/lispinit-new.mem
-	local clean_mem=$clisp_dir/full/lispinit-clean.mem
-	local lisp_run=$clisp_dir/full/lisp.run
-	rm -f $old_mem $new_mem $clean_mem $lisp_run
-}
-
-pkg_postinst() {
-	standard-impl-postinst clisp
-}
-
-pkg_postrm() {
-	standard-impl-postrm clisp /usr/bin/clisp
-}
-
-pkg_postrm() {
-	if [ ! -x /usr/bin/clisp ]; then
-		rm -rf /usr/lib/clisp/ || die
-	fi
-}
diff --git a/dev-lisp/clisp/clisp-2.36.ebuild b/dev-lisp/clisp/clisp-2.38-r1.ebuild
index 0a440113d34b..b77dc9751a37 100644
--- a/dev-lisp/clisp/clisp-2.36.ebuild
+++ b/dev-lisp/clisp/clisp-2.38-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.36.ebuild,v 1.5 2006/01/25 08:24:04 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.38-r1.ebuild,v 1.1 2006/04/03 17:29:50 mkennedy Exp $
 
 inherit flag-o-matic common-lisp-common-2 eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~ppc-macos ~amd64 -sparc"
+KEYWORDS="~amd64 ~ppc ~ppc-macos -sparc ~x86"
 IUSE="X fastcgi pcre postgres readline zlib"
 
 RDEPEND="dev-libs/libsigsegv
@@ -24,7 +24,7 @@ RDEPEND="dev-libs/libsigsegv
 	pcre? ( dev-libs/libpcre )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
-	X? ( || ( x11-proto/xextproto virtual/x11 ) )"
+	X? ( || ( ( x11-misc/imake x11-proto/xextproto ) virtual/x11 ) )"
 
 PROVIDE="virtual/commonlisp"
 
diff --git a/dev-lisp/clisp/files/2.33.2/README.Gentoo b/dev-lisp/clisp/files/2.33.2/README.Gentoo
deleted file mode 100644
index 6bec925fb0d3..000000000000
--- a/dev-lisp/clisp/files/2.33.2/README.Gentoo
+++ /dev/null
@@ -1,11 +0,0 @@
-                                                            -*-outline-*-
-
-* Gentoo Specific Notes
-
-The CLISP port for Gentoo uses Common Lisp Controller related code
-(install-clc.lisp and clisp.sh) from Debian.  This code contains the following
-copyright:
-
-    ;;;; Copyright (c) 2004 Kevin M. Rosenberg
-    ;;;; GNU GPL v2 license
-
diff --git a/dev-lisp/clisp/files/2.33.2/clisp.sh b/dev-lisp/clisp/files/2.33.2/clisp.sh
deleted file mode 100644
index f5ed6a1d8fce..000000000000
--- a/dev-lisp/clisp/files/2.33.2/clisp.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2002 Kevin M. Rosenberg
-# GNU GPL v2 license
- 
-if [ ! -f /usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp ] ; then
-  echo "*** Can't find common-lisp-controller.lisp ***" >&2
-  echo "Please report this as a bug" &>2
-  exit 1
-fi
-
-clisp_dir=/usr/lib/clisp
-clc_lib_dir=/usr/lib/common-lisp/clisp
-
-builder=/usr/bin/clisp
-old_mem=$clisp_dir/full/lispinit.mem
-new_mem=$clisp_dir/full/lispinit-new.mem
-clean_mem=$clisp_dir/full/lispinit-clean.mem
-
-lisp_error()
-{
-    echo "Error running $builder" >&2
-    exit 1
-}
-
-mem_error()
-{
-    echo "Error moving new lisp image $new_mem" >&2
-    exit 1
-}
-
-
-case $1 in
-    rebuild)
-	echo $0 Rebuilding packages...
-	shift
-	while [ -x $builder ] && [ ! -z "$1" ] ; do
-	    echo ...rebuilding $1
-	    $builder -norc -q -M $old_mem -x "
-(let ((*compile-print* nil)
-      (*compile-progress* nil)
-      (*compile-verbose*  nil)
-      (*require-verbose* nil)
-      (*load-verbose* nil) 
-      (mk::*load-source-if-no-binary* nil)
-      (mk::*bother-user-if-no-binary* nil)
-      (mk::*compile-during-load* t))
-   (handler-case
-      (progn
-         (c-l-c:compile-library (quote $1))
-         (ext:exit 0)
-       )
-    (error (e)
-      (ignore-errors (format t \"~&Build error: ~A~%\" e))
-      (finish-output)
-      (ext:exit 1))))"  || exit 1
-	    shift
-	done 
-	;;
-    remove)
-	echo $0 Removing packages...
-	shift
-	while [ ! -z "$1" ] ; do
-	    echo ...removing package $1
-	    rm -rf "${clc_lib_dir}/$1"
-	    shift
-	done
-	rmdir $clc_lib_dir 2> /dev/null 
-	;;
-    install-clc)
-	echo Installing clc...
-	if [ ! -f $clean_mem ]; then
-	    cp $old_mem $clean_mem
-	fi
-	if [ -x $clisp_dir/$lisp_builder ]; then
-	    $builder -norc -q -M $clean_mem \
-		-x "
-(handler-case
-  (progn 
-    (when (find-package :c-l-c) ; have to remove 
-      (delete-package :c-l-c))  ; for clisp workaround
-    (load \"$clisp_dir/install-clc.lisp\") 
-    (saveinitmem \"${new_mem}\")
-    (ext:exit 0))
-  (error (e)
-    (ignore-errors (format t \"~&install-clc error: ~A~%\" e))
-    (finish-output)
-    (ext:exit 1)))"   || lisp_error
-  	    mv $new_mem $old_mem || mem_error
-	fi
-	;;
-    remove-clc)
-	if [ -f $clean_mem ]; then
-	    cp $clean_mem $old_mem
-	else
-	    echo "Warning: Can't find original image file $clean_mem. Aborting." >& 2
-	fi
-	;;
-    make-user-image)
-	if [ ! -f $2 ] ; then 
-	    echo "Trying to make-user image, but can not find file $2" >&2
-	    exit 1
-	fi 
-	$builder -norc -q -M $old_mem \
-	    -x "(progn    
-  (load \"$2\") 
-  (saveinitmem \"${new_mem}\"))
-  (ext:exit 0)" || lisp_error
-	mv $new_mem $old_mem || mem_error
-	;;
-    *)
-	echo "`basename $0`: Unknown command $1" >&2
-	echo "Known commands are:" >&2 
-	echo "install-clc, remove-clc, rebuild, remove, and make-user-image" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/dev-lisp/clisp/files/2.33.2/compilefix.patch b/dev-lisp/clisp/files/2.33.2/compilefix.patch
deleted file mode 100644
index 507c72c22747..000000000000
--- a/dev-lisp/clisp/files/2.33.2/compilefix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- clisp-2.33.2/src/genclisph.d.orig	2004-05-27 09:43:38.000000000 -0500
-+++ clisp-2.33.2/src/genclisph.d	2005-05-09 14:24:44.000000000 -0500
-@@ -891,13 +891,13 @@
-   printf("#define sstring_length(ptr)  sarray_length(ptr)\n");
-   printf("#define Sstring_length(obj)  sstring_length(TheSstring(obj))\n");
-   printf("extern bool string_equal (object string1, object string2);\n");
--  /*
-   #ifdef TYPECODES
-    printf("#define Array_type_simple_bit_vector(atype)  (%d+((atype)<<%d)",Array_type_sbvector,TB0);
-    if (TB0+1 != TB1) printf("+((atype)&%d)",bit(TB0+1)-bit(TB1));
-    if (TB1+1 != TB2) printf("+((atype)&%d)",bit(TB1+1)-bit(TB2));
-    printf(")\n");
-   #endif
-+  /*
-   sprintf(buf,"struct { XRECORD_HEADER gcv_object_t pack_external_symbols%s; gcv_object_t pack_internal_symbols%s; gcv_object_t pack_shadowing_symbols%s; gcv_object_t pack_use_list%s; gcv_object_t pack_used_by_list%s; gcv_object_t pack_name%s; gcv_object_t pack_nicknames%s; } *",attribute_aligned_object,attribute_aligned_object,attribute_aligned_object,attribute_aligned_object,attribute_aligned_object,attribute_aligned_object,attribute_aligned_object);
-   emit_typedef(buf,"Package");
-   */
diff --git a/dev-lisp/clisp/files/2.33.2/fastcgi-Makefile.in-gentoo.patch b/dev-lisp/clisp/files/2.33.2/fastcgi-Makefile.in-gentoo.patch
deleted file mode 100644
index 5be16b23c032..000000000000
--- a/dev-lisp/clisp/files/2.33.2/fastcgi-Makefile.in-gentoo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur clisp-2.33.2.original/modules/fastcgi/Makefile.in clisp-2.33.2/modules/fastcgi/Makefile.in
---- clisp-2.33.2.original/modules/fastcgi/Makefile.in	2004-03-03 08:41:54.000000000 -0600
-+++ clisp-2.33.2/modules/fastcgi/Makefile.in	2004-03-20 00:02:37.235191912 -0600
-@@ -22,10 +22,10 @@
- 	$(CLISP) -c fastcgi.lisp
- 
- fastcgi.o:       fastcgi.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -I.. -c fastcgi.c
- 
- fastcgi_wrappers.o:       fastcgi_wrappers.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi_wrappers.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -I.. -c fastcgi_wrappers.c
- 
- # Make a module
- clisp-module : all
-
diff --git a/dev-lisp/clisp/files/2.33.2/glibc-linux.lisp-sigpause-gentoo.patch b/dev-lisp/clisp/files/2.33.2/glibc-linux.lisp-sigpause-gentoo.patch
deleted file mode 100644
index f1d810f58411..000000000000
--- a/dev-lisp/clisp/files/2.33.2/glibc-linux.lisp-sigpause-gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -U4 --recursive clisp-2.33.2-orig/modules/bindings/glibc/linux.lisp clisp-2.33.2/modules/bindings/glibc/linux.lisp
---- clisp-2.33.2-orig/modules/bindings/glibc/linux.lisp	2004-07-27 11:51:00.403973848 -0400
-+++ clisp-2.33.2/modules/bindings/glibc/linux.lisp	2004-07-27 11:51:39.937963768 -0400
-@@ -34,8 +34,11 @@
- (def-c-type ulonglong uint64)
- (define-modify-macro orf () logior)
- (define-modify-macro andf () logand)
- 
-+; Needed to choose sigpause version
-+(c-lines "#define __FAVOR_BSD~%~%")
-+
- ; ============================= <stddef.h> ====================================
- 
- (c-lines "#include <stddef.h>~%")
- 
diff --git a/dev-lisp/clisp/files/2.33.2/install-clc.lisp b/dev-lisp/clisp/files/2.33.2/install-clc.lisp
deleted file mode 100644
index 06cb217d32cf..000000000000
--- a/dev-lisp/clisp/files/2.33.2/install-clc.lisp
+++ /dev/null
@@ -1,15 +0,0 @@
-;;;; -*- Mode: Lisp; Package: CL-USER -*-
-;;;; Copyright (c) 2004 Kevin M. Rosenberg
-;;;; GNU GPL v2 license
-
-(in-package #:cl-user)
-
-(handler-case
-    (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp")
-  (error (e)
-    (format t "Error during loading of common-lisp-controller.lisp: ~A~%" e)))
-
-(handler-case
-    (common-lisp-controller:init-common-lisp-controller-v4 "clisp")
-  (error (e)
-    (format t "Error during init-common-lisp-controller-v4: ~A~%" e)))
diff --git a/dev-lisp/clisp/files/2.34/README.Gentoo b/dev-lisp/clisp/files/2.34/README.Gentoo
deleted file mode 100644
index 6bec925fb0d3..000000000000
--- a/dev-lisp/clisp/files/2.34/README.Gentoo
+++ /dev/null
@@ -1,11 +0,0 @@
-                                                            -*-outline-*-
-
-* Gentoo Specific Notes
-
-The CLISP port for Gentoo uses Common Lisp Controller related code
-(install-clc.lisp and clisp.sh) from Debian.  This code contains the following
-copyright:
-
-    ;;;; Copyright (c) 2004 Kevin M. Rosenberg
-    ;;;; GNU GPL v2 license
-
diff --git a/dev-lisp/clisp/files/2.34/clisp.sh b/dev-lisp/clisp/files/2.34/clisp.sh
deleted file mode 100644
index f5ed6a1d8fce..000000000000
--- a/dev-lisp/clisp/files/2.34/clisp.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2002 Kevin M. Rosenberg
-# GNU GPL v2 license
- 
-if [ ! -f /usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp ] ; then
-  echo "*** Can't find common-lisp-controller.lisp ***" >&2
-  echo "Please report this as a bug" &>2
-  exit 1
-fi
-
-clisp_dir=/usr/lib/clisp
-clc_lib_dir=/usr/lib/common-lisp/clisp
-
-builder=/usr/bin/clisp
-old_mem=$clisp_dir/full/lispinit.mem
-new_mem=$clisp_dir/full/lispinit-new.mem
-clean_mem=$clisp_dir/full/lispinit-clean.mem
-
-lisp_error()
-{
-    echo "Error running $builder" >&2
-    exit 1
-}
-
-mem_error()
-{
-    echo "Error moving new lisp image $new_mem" >&2
-    exit 1
-}
-
-
-case $1 in
-    rebuild)
-	echo $0 Rebuilding packages...
-	shift
-	while [ -x $builder ] && [ ! -z "$1" ] ; do
-	    echo ...rebuilding $1
-	    $builder -norc -q -M $old_mem -x "
-(let ((*compile-print* nil)
-      (*compile-progress* nil)
-      (*compile-verbose*  nil)
-      (*require-verbose* nil)
-      (*load-verbose* nil) 
-      (mk::*load-source-if-no-binary* nil)
-      (mk::*bother-user-if-no-binary* nil)
-      (mk::*compile-during-load* t))
-   (handler-case
-      (progn
-         (c-l-c:compile-library (quote $1))
-         (ext:exit 0)
-       )
-    (error (e)
-      (ignore-errors (format t \"~&Build error: ~A~%\" e))
-      (finish-output)
-      (ext:exit 1))))"  || exit 1
-	    shift
-	done 
-	;;
-    remove)
-	echo $0 Removing packages...
-	shift
-	while [ ! -z "$1" ] ; do
-	    echo ...removing package $1
-	    rm -rf "${clc_lib_dir}/$1"
-	    shift
-	done
-	rmdir $clc_lib_dir 2> /dev/null 
-	;;
-    install-clc)
-	echo Installing clc...
-	if [ ! -f $clean_mem ]; then
-	    cp $old_mem $clean_mem
-	fi
-	if [ -x $clisp_dir/$lisp_builder ]; then
-	    $builder -norc -q -M $clean_mem \
-		-x "
-(handler-case
-  (progn 
-    (when (find-package :c-l-c) ; have to remove 
-      (delete-package :c-l-c))  ; for clisp workaround
-    (load \"$clisp_dir/install-clc.lisp\") 
-    (saveinitmem \"${new_mem}\")
-    (ext:exit 0))
-  (error (e)
-    (ignore-errors (format t \"~&install-clc error: ~A~%\" e))
-    (finish-output)
-    (ext:exit 1)))"   || lisp_error
-  	    mv $new_mem $old_mem || mem_error
-	fi
-	;;
-    remove-clc)
-	if [ -f $clean_mem ]; then
-	    cp $clean_mem $old_mem
-	else
-	    echo "Warning: Can't find original image file $clean_mem. Aborting." >& 2
-	fi
-	;;
-    make-user-image)
-	if [ ! -f $2 ] ; then 
-	    echo "Trying to make-user image, but can not find file $2" >&2
-	    exit 1
-	fi 
-	$builder -norc -q -M $old_mem \
-	    -x "(progn    
-  (load \"$2\") 
-  (saveinitmem \"${new_mem}\"))
-  (ext:exit 0)" || lisp_error
-	mv $new_mem $old_mem || mem_error
-	;;
-    *)
-	echo "`basename $0`: Unknown command $1" >&2
-	echo "Known commands are:" >&2 
-	echo "install-clc, remove-clc, rebuild, remove, and make-user-image" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/dev-lisp/clisp/files/2.34/fastcgi-Makefile.in-gentoo.patch b/dev-lisp/clisp/files/2.34/fastcgi-Makefile.in-gentoo.patch
deleted file mode 100644
index 902e1ac267c7..000000000000
--- a/dev-lisp/clisp/files/2.34/fastcgi-Makefile.in-gentoo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur clisp-2.34.original/modules/fastcgi/Makefile.in clisp-2.34/modules/fastcgi/Makefile.in
---- clisp-2.34.original/modules/fastcgi/Makefile.in	2004-03-03 08:41:54.000000000 -0600
-+++ clisp-2.34/modules/fastcgi/Makefile.in	2004-03-20 00:02:37.235191912 -0600
-@@ -22,10 +22,10 @@
- 	$(CLISP) -c fastcgi.lisp
- 
- fastcgi.o:       fastcgi.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -I.. -c fastcgi.c
- 
- fastcgi_wrappers.o:       fastcgi_wrappers.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi_wrappers.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -I.. -c fastcgi_wrappers.c
- 
- # Make a module
- clisp-module : all
-
diff --git a/dev-lisp/clisp/files/2.34/glibc-linux.lisp-sigpause-gentoo.patch b/dev-lisp/clisp/files/2.34/glibc-linux.lisp-sigpause-gentoo.patch
deleted file mode 100644
index e7f6dd69a786..000000000000
--- a/dev-lisp/clisp/files/2.34/glibc-linux.lisp-sigpause-gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -U4 --recursive clisp-2.34-orig/modules/bindings/glibc/linux.lisp clisp-2.34/modules/bindings/glibc/linux.lisp
---- clisp-2.34-orig/modules/bindings/glibc/linux.lisp	2004-07-27 11:51:00.403973848 -0400
-+++ clisp-2.34/modules/bindings/glibc/linux.lisp	2004-07-27 11:51:39.937963768 -0400
-@@ -34,8 +34,11 @@
- (def-c-type ulonglong uint64)
- (define-modify-macro orf () logior)
- (define-modify-macro andf () logand)
- 
-+; Needed to choose sigpause version
-+(c-lines "#define __FAVOR_BSD~%~%")
-+
- ; ============================= <stddef.h> ====================================
- 
- (c-lines "#include <stddef.h>~%")
- 
diff --git a/dev-lisp/clisp/files/2.34/install-clc.lisp b/dev-lisp/clisp/files/2.34/install-clc.lisp
deleted file mode 100644
index 06cb217d32cf..000000000000
--- a/dev-lisp/clisp/files/2.34/install-clc.lisp
+++ /dev/null
@@ -1,15 +0,0 @@
-;;;; -*- Mode: Lisp; Package: CL-USER -*-
-;;;; Copyright (c) 2004 Kevin M. Rosenberg
-;;;; GNU GPL v2 license
-
-(in-package #:cl-user)
-
-(handler-case
-    (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp")
-  (error (e)
-    (format t "Error during loading of common-lisp-controller.lisp: ~A~%" e)))
-
-(handler-case
-    (common-lisp-controller:init-common-lisp-controller-v4 "clisp")
-  (error (e)
-    (format t "Error during init-common-lisp-controller-v4: ~A~%" e)))
diff --git a/dev-lisp/clisp/files/2.35/README.Gentoo b/dev-lisp/clisp/files/2.35/README.Gentoo
deleted file mode 100644
index 6bec925fb0d3..000000000000
--- a/dev-lisp/clisp/files/2.35/README.Gentoo
+++ /dev/null
@@ -1,11 +0,0 @@
-                                                            -*-outline-*-
-
-* Gentoo Specific Notes
-
-The CLISP port for Gentoo uses Common Lisp Controller related code
-(install-clc.lisp and clisp.sh) from Debian.  This code contains the following
-copyright:
-
-    ;;;; Copyright (c) 2004 Kevin M. Rosenberg
-    ;;;; GNU GPL v2 license
-
diff --git a/dev-lisp/clisp/files/2.35/clisp.sh b/dev-lisp/clisp/files/2.35/clisp.sh
deleted file mode 100644
index f5ed6a1d8fce..000000000000
--- a/dev-lisp/clisp/files/2.35/clisp.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2002 Kevin M. Rosenberg
-# GNU GPL v2 license
- 
-if [ ! -f /usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp ] ; then
-  echo "*** Can't find common-lisp-controller.lisp ***" >&2
-  echo "Please report this as a bug" &>2
-  exit 1
-fi
-
-clisp_dir=/usr/lib/clisp
-clc_lib_dir=/usr/lib/common-lisp/clisp
-
-builder=/usr/bin/clisp
-old_mem=$clisp_dir/full/lispinit.mem
-new_mem=$clisp_dir/full/lispinit-new.mem
-clean_mem=$clisp_dir/full/lispinit-clean.mem
-
-lisp_error()
-{
-    echo "Error running $builder" >&2
-    exit 1
-}
-
-mem_error()
-{
-    echo "Error moving new lisp image $new_mem" >&2
-    exit 1
-}
-
-
-case $1 in
-    rebuild)
-	echo $0 Rebuilding packages...
-	shift
-	while [ -x $builder ] && [ ! -z "$1" ] ; do
-	    echo ...rebuilding $1
-	    $builder -norc -q -M $old_mem -x "
-(let ((*compile-print* nil)
-      (*compile-progress* nil)
-      (*compile-verbose*  nil)
-      (*require-verbose* nil)
-      (*load-verbose* nil) 
-      (mk::*load-source-if-no-binary* nil)
-      (mk::*bother-user-if-no-binary* nil)
-      (mk::*compile-during-load* t))
-   (handler-case
-      (progn
-         (c-l-c:compile-library (quote $1))
-         (ext:exit 0)
-       )
-    (error (e)
-      (ignore-errors (format t \"~&Build error: ~A~%\" e))
-      (finish-output)
-      (ext:exit 1))))"  || exit 1
-	    shift
-	done 
-	;;
-    remove)
-	echo $0 Removing packages...
-	shift
-	while [ ! -z "$1" ] ; do
-	    echo ...removing package $1
-	    rm -rf "${clc_lib_dir}/$1"
-	    shift
-	done
-	rmdir $clc_lib_dir 2> /dev/null 
-	;;
-    install-clc)
-	echo Installing clc...
-	if [ ! -f $clean_mem ]; then
-	    cp $old_mem $clean_mem
-	fi
-	if [ -x $clisp_dir/$lisp_builder ]; then
-	    $builder -norc -q -M $clean_mem \
-		-x "
-(handler-case
-  (progn 
-    (when (find-package :c-l-c) ; have to remove 
-      (delete-package :c-l-c))  ; for clisp workaround
-    (load \"$clisp_dir/install-clc.lisp\") 
-    (saveinitmem \"${new_mem}\")
-    (ext:exit 0))
-  (error (e)
-    (ignore-errors (format t \"~&install-clc error: ~A~%\" e))
-    (finish-output)
-    (ext:exit 1)))"   || lisp_error
-  	    mv $new_mem $old_mem || mem_error
-	fi
-	;;
-    remove-clc)
-	if [ -f $clean_mem ]; then
-	    cp $clean_mem $old_mem
-	else
-	    echo "Warning: Can't find original image file $clean_mem. Aborting." >& 2
-	fi
-	;;
-    make-user-image)
-	if [ ! -f $2 ] ; then 
-	    echo "Trying to make-user image, but can not find file $2" >&2
-	    exit 1
-	fi 
-	$builder -norc -q -M $old_mem \
-	    -x "(progn    
-  (load \"$2\") 
-  (saveinitmem \"${new_mem}\"))
-  (ext:exit 0)" || lisp_error
-	mv $new_mem $old_mem || mem_error
-	;;
-    *)
-	echo "`basename $0`: Unknown command $1" >&2
-	echo "Known commands are:" >&2 
-	echo "install-clc, remove-clc, rebuild, remove, and make-user-image" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/dev-lisp/clisp/files/2.35/install-clc.lisp b/dev-lisp/clisp/files/2.35/install-clc.lisp
deleted file mode 100644
index 06cb217d32cf..000000000000
--- a/dev-lisp/clisp/files/2.35/install-clc.lisp
+++ /dev/null
@@ -1,15 +0,0 @@
-;;;; -*- Mode: Lisp; Package: CL-USER -*-
-;;;; Copyright (c) 2004 Kevin M. Rosenberg
-;;;; GNU GPL v2 license
-
-(in-package #:cl-user)
-
-(handler-case
-    (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp")
-  (error (e)
-    (format t "Error during loading of common-lisp-controller.lisp: ~A~%" e)))
-
-(handler-case
-    (common-lisp-controller:init-common-lisp-controller-v4 "clisp")
-  (error (e)
-    (format t "Error during init-common-lisp-controller-v4: ~A~%" e)))
diff --git a/dev-lisp/clisp/files/2.36/README.Gentoo b/dev-lisp/clisp/files/2.36/README.Gentoo
deleted file mode 100644
index 6bec925fb0d3..000000000000
--- a/dev-lisp/clisp/files/2.36/README.Gentoo
+++ /dev/null
@@ -1,11 +0,0 @@
-                                                            -*-outline-*-
-
-* Gentoo Specific Notes
-
-The CLISP port for Gentoo uses Common Lisp Controller related code
-(install-clc.lisp and clisp.sh) from Debian.  This code contains the following
-copyright:
-
-    ;;;; Copyright (c) 2004 Kevin M. Rosenberg
-    ;;;; GNU GPL v2 license
-
diff --git a/dev-lisp/clisp/files/2.36/clisp.sh b/dev-lisp/clisp/files/2.36/clisp.sh
deleted file mode 100644
index f5ed6a1d8fce..000000000000
--- a/dev-lisp/clisp/files/2.36/clisp.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2002 Kevin M. Rosenberg
-# GNU GPL v2 license
- 
-if [ ! -f /usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp ] ; then
-  echo "*** Can't find common-lisp-controller.lisp ***" >&2
-  echo "Please report this as a bug" &>2
-  exit 1
-fi
-
-clisp_dir=/usr/lib/clisp
-clc_lib_dir=/usr/lib/common-lisp/clisp
-
-builder=/usr/bin/clisp
-old_mem=$clisp_dir/full/lispinit.mem
-new_mem=$clisp_dir/full/lispinit-new.mem
-clean_mem=$clisp_dir/full/lispinit-clean.mem
-
-lisp_error()
-{
-    echo "Error running $builder" >&2
-    exit 1
-}
-
-mem_error()
-{
-    echo "Error moving new lisp image $new_mem" >&2
-    exit 1
-}
-
-
-case $1 in
-    rebuild)
-	echo $0 Rebuilding packages...
-	shift
-	while [ -x $builder ] && [ ! -z "$1" ] ; do
-	    echo ...rebuilding $1
-	    $builder -norc -q -M $old_mem -x "
-(let ((*compile-print* nil)
-      (*compile-progress* nil)
-      (*compile-verbose*  nil)
-      (*require-verbose* nil)
-      (*load-verbose* nil) 
-      (mk::*load-source-if-no-binary* nil)
-      (mk::*bother-user-if-no-binary* nil)
-      (mk::*compile-during-load* t))
-   (handler-case
-      (progn
-         (c-l-c:compile-library (quote $1))
-         (ext:exit 0)
-       )
-    (error (e)
-      (ignore-errors (format t \"~&Build error: ~A~%\" e))
-      (finish-output)
-      (ext:exit 1))))"  || exit 1
-	    shift
-	done 
-	;;
-    remove)
-	echo $0 Removing packages...
-	shift
-	while [ ! -z "$1" ] ; do
-	    echo ...removing package $1
-	    rm -rf "${clc_lib_dir}/$1"
-	    shift
-	done
-	rmdir $clc_lib_dir 2> /dev/null 
-	;;
-    install-clc)
-	echo Installing clc...
-	if [ ! -f $clean_mem ]; then
-	    cp $old_mem $clean_mem
-	fi
-	if [ -x $clisp_dir/$lisp_builder ]; then
-	    $builder -norc -q -M $clean_mem \
-		-x "
-(handler-case
-  (progn 
-    (when (find-package :c-l-c) ; have to remove 
-      (delete-package :c-l-c))  ; for clisp workaround
-    (load \"$clisp_dir/install-clc.lisp\") 
-    (saveinitmem \"${new_mem}\")
-    (ext:exit 0))
-  (error (e)
-    (ignore-errors (format t \"~&install-clc error: ~A~%\" e))
-    (finish-output)
-    (ext:exit 1)))"   || lisp_error
-  	    mv $new_mem $old_mem || mem_error
-	fi
-	;;
-    remove-clc)
-	if [ -f $clean_mem ]; then
-	    cp $clean_mem $old_mem
-	else
-	    echo "Warning: Can't find original image file $clean_mem. Aborting." >& 2
-	fi
-	;;
-    make-user-image)
-	if [ ! -f $2 ] ; then 
-	    echo "Trying to make-user image, but can not find file $2" >&2
-	    exit 1
-	fi 
-	$builder -norc -q -M $old_mem \
-	    -x "(progn    
-  (load \"$2\") 
-  (saveinitmem \"${new_mem}\"))
-  (ext:exit 0)" || lisp_error
-	mv $new_mem $old_mem || mem_error
-	;;
-    *)
-	echo "`basename $0`: Unknown command $1" >&2
-	echo "Known commands are:" >&2 
-	echo "install-clc, remove-clc, rebuild, remove, and make-user-image" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/dev-lisp/clisp/files/2.36/install-clc.lisp b/dev-lisp/clisp/files/2.36/install-clc.lisp
deleted file mode 100644
index 06cb217d32cf..000000000000
--- a/dev-lisp/clisp/files/2.36/install-clc.lisp
+++ /dev/null
@@ -1,15 +0,0 @@
-;;;; -*- Mode: Lisp; Package: CL-USER -*-
-;;;; Copyright (c) 2004 Kevin M. Rosenberg
-;;;; GNU GPL v2 license
-
-(in-package #:cl-user)
-
-(handler-case
-    (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp")
-  (error (e)
-    (format t "Error during loading of common-lisp-controller.lisp: ~A~%" e)))
-
-(handler-case
-    (common-lisp-controller:init-common-lisp-controller-v4 "clisp")
-  (error (e)
-    (format t "Error during init-common-lisp-controller-v4: ~A~%" e)))
diff --git a/dev-lisp/clisp/files/digest-clisp-2.33.2-r2 b/dev-lisp/clisp/files/digest-clisp-2.33.2-r2
deleted file mode 100644
index d1380368af9a..000000000000
--- a/dev-lisp/clisp/files/digest-clisp-2.33.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ee4ea316db1e843dcb16094bf500012f clisp-2.33.2.tar.bz2 6091273
diff --git a/dev-lisp/clisp/files/digest-clisp-2.34-r1 b/dev-lisp/clisp/files/digest-clisp-2.34-r1
deleted file mode 100644
index cd5424c2e086..000000000000
--- a/dev-lisp/clisp/files/digest-clisp-2.34-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 68b20ad2d13bdc544e57000e38c856de clisp-2.34.tar.bz2 8000158
diff --git a/dev-lisp/clisp/files/digest-clisp-2.35 b/dev-lisp/clisp/files/digest-clisp-2.35
deleted file mode 100644
index fb1aef6b4353..000000000000
--- a/dev-lisp/clisp/files/digest-clisp-2.35
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a8e3136c4ecfb5deb65fe53e22ca2c07 clisp-2.35.tar.bz2 7902817
diff --git a/dev-lisp/clisp/files/digest-clisp-2.36 b/dev-lisp/clisp/files/digest-clisp-2.36
deleted file mode 100644
index 72e2ea68c72d..000000000000
--- a/dev-lisp/clisp/files/digest-clisp-2.36
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b6b5f6b7e6d0ce9f42bc07d59fbddc09 clisp-2.36.tar.bz2 8008221
diff --git a/dev-lisp/clisp/files/digest-clisp-2.38-r1 b/dev-lisp/clisp/files/digest-clisp-2.38-r1
new file mode 100644
index 000000000000..797910b544ad
--- /dev/null
+++ b/dev-lisp/clisp/files/digest-clisp-2.38-r1
@@ -0,0 +1,3 @@
+MD5 960e1f6e232415c59b6978f92e62f30b clisp-2.38.tar.bz2 8078151
+RMD160 9070e1d7cd4db66de62f077b68a7fef7413da622 clisp-2.38.tar.bz2 8078151
+SHA256 98ddb7faa384b9b62621ac9af8b4416cbe1b6df420306fceea9e1e01a880e051 clisp-2.38.tar.bz2 8078151