.

Package-Manager: portage-2.0.51.22-r1

11 files changed, 41 insertions, 1140 deletions

diff --git a/dev-lisp/sbcl/metadata.xml b/dev-lisp/sbcl/metadata.xml
new file mode 100644
index 000000000000..d806d206463b
--- /dev/null
+++ b/dev-lisp/sbcl/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>common-lisp</herd>
+<longdescription>
+Steel Bank Common Lisp is an open source Common Lisp
+implementation. It provides an integrated native compiler,
+interpreter, and debugger.
+
+SBCL is a fork off of the main branch of CMUCL. SBCL is distinguished
+from CMUCL by a greater emphasis on maintainability. In particular,
+the SBCL system can be built directly from its source code, so that
+the output corresponds to the source code in a controlled, verifiable
+way, and arbitrary changes can be made to the system without causing
+bootstrapping problems. SBCL also places less emphasis than CMU CL
+does on new non-ANSI extensions, or on backward compatibility with old
+non-ANSI features.
+
+Support for native threading on GNU/Linux is available for the x86
+platform, including support for the new futex system call available in
+2.6.x kernels.
+
+SBCL 0.8.17 and later support Unicode.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-lisp/sbcl/sbcl-0.8.14.ebuild b/dev-lisp/sbcl/sbcl-0.8.14.ebuild
deleted file mode 100644
index 8d1ad1594390..000000000000
--- a/dev-lisp/sbcl/sbcl-0.8.14.ebuild
+++ /dev/null
@@ -1,131 +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/sbcl/sbcl-0.8.14.ebuild,v 1.3 2005/01/07 21:52:19 mkennedy Exp $
-
-inherit common-lisp-common eutils
-
-BV_X86=0.8.1
-BV_PPC=0.8.8
-BV_SPARC=0.7.13
-BV_MIPS=0.7.10
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp."
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	mirror://sourceforge/sbcl/${P}-html.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-ppc-linux-binary.tar.bz2 )
-	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
-	mips? ( mirror://sourceforge/sbcl/${PN}-${BV_MIPS}-mips-linux-binary.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~mips"
-IUSE="threads doc nosource"
-
-DEPEND=">=dev-lisp/common-lisp-controller-3.91
-	sys-apps/texinfo
-	doc? ( virtual/tetex )"
-
-PROVIDE="virtual/commonlisp"
-
-src_unpack() {
-	if use x86; then
-		unpack ${PN}-${BV_X86}-x86-linux-binary.tar.bz2
-		mv ${PN}-${BV_X86} x86-binary
-	elif use ppc; then
-		unpack ${PN}-${BV_PPC}-ppc-linux-binary.tar.bz2
-		mv ${PN}-${BV_PPC}-ppc-linux ppc-binary
-	elif use sparc; then
-		unpack ${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2
-		echo mv ${PN}-${BV_SPARC} sparc-binary || die
-		mv ${PN}-${BV_SPARC} sparc-binary || die
-	elif use mips; then
-		unpack ${PN}-${BV_SPARC}-mips-linux-binary.tar.gz
-		mv ${PN}-${BV_SPARC}-mips-linux mips-binary
-	fi
-
-	unpack ${P}-source.tar.bz2
-	epatch ${FILESDIR}/${PV}/sbcl-gentoo.patch
-	epatch ${FILESDIR}/${PV}/sbcl-no-tests-gentoo.patch
-
-	# Currently, thread support is only available for x86.	These
-	# features expressions also disable :sb-test.
-	if use x86 && use threads; then
-		cp ${FILESDIR}/${PV}/customize-target-features.lisp \
-			${S}/customize-target-features.lisp
-	else
-		cp ${FILESDIR}/${PV}/customize-target-features.lisp.no-threads \
-			${S}/customize-target-features.lisp
-	fi
-
-	find ${S} -type f -name .cvsignore -exec rm -f '{}' \;
-	find ${S} -type d -name CVS \) -exec rm -rf '{}' \;
-	find ${S} -type f -name \*.c -exec chmod 644 '{}' \;
-}
-
-src_compile() {
-	local bindir
-	use x86 && bindir=../x86-binary
-	use ppc && bindir=../ppc-binary
-	use sparc && bindir=../sparc-binary
-	use mips && bindir=../mips-binary
-
-	# TODO: allow the user to chose between SBCL, CMUCL and CLISP for bootstrapping
-	# build with previous SBCL
-	PATH=${bindir}/src/runtime:${PATH} SBCL_HOME=${bindir}/output GNUMAKE=make \
-		./make.sh 'sbcl --sysinit /dev/null --userinit /dev/null --noprogrammer --core ${bindir}/output/sbcl.core' \
-		|| die
-
-	# build with CMUCL
-#	GNUMAKE=make ./make.sh 'lisp -batch'
-
-	# Generation texinfo documentation
-	cd ${S}/doc/manual
-	make info
-	use doc && make ps pdf
-
-}
-
-src_install() {
-	unset SBCL_HOME
-
-	insinto /etc/
-	doins ${FILESDIR}/${PV}/sbclrc	# Gentoo specific (from Debian)
-
-	exeinto /usr/lib/common-lisp/bin
-	doexe ${FILESDIR}/${PV}/sbcl.sh	# Gentoo specific (from Debian)
-
-	dodir /usr/share/man
-	INSTALL_ROOT=${D}/usr sh install.sh
-	mv ${D}/usr/lib/sbcl/sbcl.core ${D}/usr/lib/sbcl/sbcl-dist.core
-
-	insinto /usr/lib/sbcl
-	doins ${FILESDIR}/${PV}/install-clc.lisp	# Gentoo specific (from Debian)
-
-	doman doc/sbcl-asdf-install.1
-
-	dodoc BUGS COPYING CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README STYLE SUPPORT TLA TODO
-	dodoc ${FILESDIR}/${PV}/README.Gentoo
-	dohtml doc/html/*
-
-	doinfo ${S}/doc/manual/*.info
-	use doc && dodoc ${S}/doc/manual/*.{pdf,ps}
-
-	keepdir /usr/lib/common-lisp/sbcl
-
-	if ! use nosource; then
-		# install the SBCL source
-		find ${S}/src -type f -name \*.fasl |xargs rm -f
-		mv ${S}/src ${D}/usr/lib/sbcl/
-	fi
-
-	impl-save-timestamp-hack sbcl || die
-}
-
-pkg_postinst() {
-	standard-impl-postinst sbcl
-}
-
-pkg_postrm() {
-	standard-impl-postrm sbcl /usr/bin/sbcl
-}
diff --git a/dev-lisp/sbcl/sbcl-0.8.15.ebuild b/dev-lisp/sbcl/sbcl-0.8.15.ebuild
deleted file mode 100644
index bdca9af8decc..000000000000
--- a/dev-lisp/sbcl/sbcl-0.8.15.ebuild
+++ /dev/null
@@ -1,133 +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/sbcl/sbcl-0.8.15.ebuild,v 1.5 2005/01/07 21:52:19 mkennedy Exp $
-
-inherit common-lisp-common eutils
-
-BV_X86=0.8.1
-BV_PPC=0.8.8
-BV_SPARC=0.7.13
-BV_MIPS=0.7.10
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp."
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	mirror://sourceforge/sbcl/${P}-html.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-ppc-linux-binary.tar.bz2 )
-	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
-	mips? ( mirror://sourceforge/sbcl/${PN}-${BV_MIPS}-mips-linux-binary.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~mips"
-IUSE="threads doc nosource"
-
-DEPEND=">=dev-lisp/common-lisp-controller-3.91
-	>=dev-lisp/cl-defsystem3-3.3i-r3
-	>=dev-lisp/cl-asdf-1.84
-	sys-apps/texinfo
-	doc? ( virtual/tetex )"
-
-PROVIDE="virtual/commonlisp"
-
-src_unpack() {
-	if use x86; then
-		unpack ${PN}-${BV_X86}-x86-linux-binary.tar.bz2
-		mv ${PN}-${BV_X86} x86-binary
-	elif use ppc; then
-		unpack ${PN}-${BV_PPC}-ppc-linux-binary.tar.bz2
-		mv ${PN}-${BV_PPC}-ppc-linux ppc-binary
-	elif use sparc; then
-		unpack ${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2
-		echo mv ${PN}-${BV_SPARC} sparc-binary || die
-		mv ${PN}-${BV_SPARC} sparc-binary || die
-	elif use mips; then
-		unpack ${PN}-${BV_SPARC}-mips-linux-binary.tar.gz
-		mv ${PN}-${BV_SPARC}-mips-linux mips-binary
-	fi
-
-	unpack ${P}-source.tar.bz2
-	epatch ${FILESDIR}/${PV}/sbcl-gentoo.patch
-	epatch ${FILESDIR}/${PV}/sbcl-no-tests-gentoo.patch
-
-	# Currently, thread support is only available for x86.	These
-	# features expressions also disable :sb-test.
-	if use x86 && use threads; then
-		cp ${FILESDIR}/${PV}/customize-target-features.lisp \
-			${S}/customize-target-features.lisp
-	else
-		cp ${FILESDIR}/${PV}/customize-target-features.lisp.no-threads \
-			${S}/customize-target-features.lisp
-	fi
-
-	find ${S} -type f -name .cvsignore -exec rm -f '{}' \;
-	find ${S} -type d -name CVS \) -exec rm -rf '{}' \;
-	find ${S} -type f -name \*.c -exec chmod 644 '{}' \;
-}
-
-src_compile() {
-	local bindir
-	use x86 && bindir=../x86-binary
-	use ppc && bindir=../ppc-binary
-	use sparc && bindir=../sparc-binary
-	use mips && bindir=../mips-binary
-
-	# TODO: allow the user to chose between SBCL, CMUCL and CLISP for bootstrapping
-	# build with previous SBCL
-	PATH=${bindir}/src/runtime:${PATH} SBCL_HOME=${bindir}/output GNUMAKE=make \
-		./make.sh 'sbcl --sysinit /dev/null --userinit /dev/null --noprogrammer --core ${bindir}/output/sbcl.core' \
-		|| die
-
-	# build with CMUCL
-#	GNUMAKE=make ./make.sh 'lisp -batch'
-
-	# Generation texinfo documentation
-	cd ${S}/doc/manual
-	make info
-	use doc && make ps pdf
-
-}
-
-src_install() {
-	unset SBCL_HOME
-
-	insinto /etc/
-	doins ${FILESDIR}/${PV}/sbclrc	# Gentoo specific (from Debian)
-
-	exeinto /usr/lib/common-lisp/bin
-	doexe ${FILESDIR}/${PV}/sbcl.sh	# Gentoo specific (from Debian)
-
-	dodir /usr/share/man
-	INSTALL_ROOT=${D}/usr sh install.sh
-	mv ${D}/usr/lib/sbcl/sbcl.core ${D}/usr/lib/sbcl/sbcl-dist.core
-
-	insinto /usr/lib/sbcl
-	doins ${FILESDIR}/${PV}/install-clc.lisp	# Gentoo specific (from Debian)
-
-	doman doc/sbcl-asdf-install.1
-
-	dodoc BUGS COPYING CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README STYLE SUPPORT TLA TODO
-	dodoc ${FILESDIR}/${PV}/README.Gentoo
-	dohtml doc/html/*
-
-	doinfo ${S}/doc/manual/*.info
-	use doc && dodoc ${S}/doc/manual/*.{pdf,ps}
-
-	keepdir /usr/lib/common-lisp/sbcl
-
-	if ! use nosource; then
-		# install the SBCL source
-		find ${S}/src -type f -name \*.fasl |xargs rm -f
-		mv ${S}/src ${D}/usr/lib/sbcl/
-	fi
-
-	impl-save-timestamp-hack sbcl || die
-}
-
-pkg_postinst() {
-	standard-impl-postinst sbcl
-}
-
-pkg_postrm() {
-	standard-impl-postrm sbcl /usr/bin/sbcl
-}
diff --git a/dev-lisp/sbcl/sbcl-0.8.16.ebuild b/dev-lisp/sbcl/sbcl-0.8.16.ebuild
deleted file mode 100644
index 933041675cb8..000000000000
--- a/dev-lisp/sbcl/sbcl-0.8.16.ebuild
+++ /dev/null
@@ -1,133 +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/sbcl/sbcl-0.8.16.ebuild,v 1.5 2005/01/07 21:52:19 mkennedy Exp $
-
-inherit common-lisp-common eutils
-
-BV_X86=0.8.1
-BV_PPC=0.8.8
-BV_SPARC=0.7.13
-BV_MIPS=0.7.10
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp."
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	mirror://sourceforge/sbcl/${P}-html.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-ppc-linux-binary.tar.bz2 )
-	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
-	mips? ( mirror://sourceforge/sbcl/${PN}-${BV_MIPS}-mips-linux-binary.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~mips"
-IUSE="threads doc nosource"
-
-DEPEND=">=dev-lisp/common-lisp-controller-3.91
-	>=dev-lisp/cl-defsystem3-3.3i-r3
-	>=dev-lisp/cl-asdf-1.84
-	sys-apps/texinfo
-	doc? ( virtual/tetex )"
-
-PROVIDE="virtual/commonlisp"
-
-src_unpack() {
-	if use x86; then
-		unpack ${PN}-${BV_X86}-x86-linux-binary.tar.bz2
-		mv ${PN}-${BV_X86} x86-binary
-	elif use ppc; then
-		unpack ${PN}-${BV_PPC}-ppc-linux-binary.tar.bz2
-		mv ${PN}-${BV_PPC}-ppc-linux ppc-binary
-	elif use sparc; then
-		unpack ${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2
-		echo mv ${PN}-${BV_SPARC} sparc-binary || die
-		mv ${PN}-${BV_SPARC} sparc-binary || die
-	elif use mips; then
-		unpack ${PN}-${BV_SPARC}-mips-linux-binary.tar.gz
-		mv ${PN}-${BV_SPARC}-mips-linux mips-binary
-	fi
-
-	unpack ${P}-source.tar.bz2
-	epatch ${FILESDIR}/${PV}/sbcl-gentoo.patch
-	epatch ${FILESDIR}/${PV}/sbcl-no-tests-gentoo.patch
-
-	# Currently, thread support is only available for x86.	These
-	# features expressions also disable :sb-test.
-	if use x86 && use threads; then
-		cp ${FILESDIR}/${PV}/customize-target-features.lisp \
-			${S}/customize-target-features.lisp
-	else
-		cp ${FILESDIR}/${PV}/customize-target-features.lisp.no-threads \
-			${S}/customize-target-features.lisp
-	fi
-
-	find ${S} -type f -name .cvsignore -exec rm -f '{}' \;
-	find ${S} -type d -name CVS \) -exec rm -rf '{}' \;
-	find ${S} -type f -name \*.c -exec chmod 644 '{}' \;
-}
-
-src_compile() {
-	local bindir
-	use x86 && bindir=../x86-binary
-	use ppc && bindir=../ppc-binary
-	use sparc && bindir=../sparc-binary
-	use mips && bindir=../mips-binary
-
-	# TODO: allow the user to chose between SBCL, CMUCL and CLISP for bootstrapping
-	# build with previous SBCL
-	PATH=${bindir}/src/runtime:${PATH} SBCL_HOME=${bindir}/output GNUMAKE=make \
-		./make.sh 'sbcl --sysinit /dev/null --userinit /dev/null --no-debugger --core ${bindir}/output/sbcl.core' \
-		|| die
-
-	# build with CMUCL
-#	GNUMAKE=make ./make.sh 'lisp -batch'
-
-	# Generation texinfo documentation
-	cd ${S}/doc/manual
-	make info
-	use doc && make ps pdf
-
-}
-
-src_install() {
-	unset SBCL_HOME
-
-	insinto /etc/
-	doins ${FILESDIR}/${PV}/sbclrc	# Gentoo specific (from Debian)
-
-	exeinto /usr/lib/common-lisp/bin
-	doexe ${FILESDIR}/${PV}/sbcl.sh	# Gentoo specific (from Debian)
-
-	dodir /usr/share/man
-	INSTALL_ROOT=${D}/usr sh install.sh
-	mv ${D}/usr/lib/sbcl/sbcl.core ${D}/usr/lib/sbcl/sbcl-dist.core
-
-	insinto /usr/lib/sbcl
-	doins ${FILESDIR}/${PV}/install-clc.lisp	# Gentoo specific (from Debian)
-
-	doman doc/sbcl-asdf-install.1
-
-	dodoc BUGS COPYING CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README STYLE SUPPORT TLA TODO
-	dodoc ${FILESDIR}/${PV}/README.Gentoo
-	dohtml doc/html/*
-
-	doinfo ${S}/doc/manual/*.info
-	use doc && dodoc ${S}/doc/manual/*.{pdf,ps}
-
-	keepdir /usr/lib/common-lisp/sbcl
-
-	if ! use nosource; then
-		# install the SBCL source
-		find ${S}/src -type f -name \*.fasl |xargs rm -f
-		mv ${S}/src ${D}/usr/lib/sbcl/
-	fi
-
-	impl-save-timestamp-hack sbcl || die
-}
-
-pkg_postinst() {
-	standard-impl-postinst sbcl
-}
-
-pkg_postrm() {
-	standard-impl-postrm sbcl /usr/bin/sbcl
-}
diff --git a/dev-lisp/sbcl/sbcl-0.8.18.ebuild b/dev-lisp/sbcl/sbcl-0.8.18.ebuild
deleted file mode 100644
index b3099f2105ee..000000000000
--- a/dev-lisp/sbcl/sbcl-0.8.18.ebuild
+++ /dev/null
@@ -1,140 +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/sbcl/sbcl-0.8.18.ebuild,v 1.4 2005/03/16 07:36:15 mkennedy Exp $
-
-inherit common-lisp-common eutils
-
-BV_X86=0.8.1
-BV_PPC=0.8.8
-BV_SPARC=0.7.13
-BV_MIPS=0.7.10
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp."
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	mirror://sourceforge/sbcl/${P}-html.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-ppc-linux-binary.tar.bz2 )
-	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
-	mips? ( mirror://sourceforge/sbcl/${PN}-${BV_MIPS}-mips-linux-binary.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="x86 ~ppc ~sparc ~mips"
-IUSE="threads doc nosource unicode ldb"
-
-DEPEND=">=dev-lisp/common-lisp-controller-3.91
-	>=dev-lisp/cl-defsystem3-3.3i-r3
-	>=dev-lisp/cl-asdf-1.84
-	sys-apps/texinfo
-	doc? ( virtual/tetex )"
-
-PROVIDE="virtual/commonlisp"
-
-pkg_setup() {
-	if use hardened; then
-		die 'So-called "hardened" USE features are incompatible with SBCL.'
-	fi
-}
-
-src_unpack() {
-	if use x86; then
-		unpack ${PN}-${BV_X86}-x86-linux-binary.tar.bz2
-		mv ${PN}-${BV_X86} x86-binary
-	elif use ppc; then
-		unpack ${PN}-${BV_PPC}-ppc-linux-binary.tar.bz2
-		mv ${PN}-${BV_PPC}-ppc-linux ppc-binary
-	elif use sparc; then
-		unpack ${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2
-		echo mv ${PN}-${BV_SPARC} sparc-binary || die
-		mv ${PN}-${BV_SPARC} sparc-binary || die
-	elif use mips; then
-		unpack ${PN}-${BV_SPARC}-mips-linux-binary.tar.gz
-		mv ${PN}-${BV_SPARC}-mips-linux mips-binary
-	fi
-
-	unpack ${P}-source.tar.bz2
-	epatch ${FILESDIR}/${PV}/sbcl-gentoo.patch
-	epatch ${FILESDIR}/${PV}/sbcl-no-tests-gentoo.patch
-
-	cp ${FILESDIR}/${PV}/customize-target-features.lisp-prefix \
-		${S}/customize-target-features.lisp
-	use x86 && use threads \
-		&& echo '(enable :sb-thread)' \
-		>>${S}/customize-target-features.lisp
-	use ldb \
-		&& echo '(enable :sb-ldb)' \
-		>>${S}/customize-target-features.lisp
-	echo '(enable :sb-futex)' >>${S}/customize-target-features.lisp
-	echo '(disable :sb-test)' >>${S}/customize-target-features.lisp
-	! use unicode \
-		&& echo '(disable :sb-unicode)' \
-		>>${S}/customize-target-features.lisp
-	cat ${FILESDIR}/${PV}/customize-target-features.lisp-suffix \
-		>>${S}/customize-target-features.lisp
-	find ${S} -type f -name .cvsignore -exec rm -f '{}' \;
-	find ${S} -type d -name CVS \) -exec rm -rf '{}' \;
-	find ${S} -type f -name \*.c -exec chmod 644 '{}' \;
-}
-
-src_compile() {
-	local bindir
-	use x86 && bindir=../x86-binary
-	use ppc && bindir=../ppc-binary
-	use sparc && bindir=../sparc-binary
-	use mips && bindir=../mips-binary
-	PATH=${bindir}/src/runtime:${PATH} SBCL_HOME=${bindir}/output GNUMAKE=make \
-		./make.sh 'sbcl
-			--sysinit /dev/null
-			--userinit /dev/null
-			--no-debugger
-			--core ${bindir}/output/sbcl.core' \
-				|| die
-	cd ${S}/doc/manual
-	make info
-	use doc && make ps pdf
-}
-
-src_install() {
-	unset SBCL_HOME
-
-	insinto /etc/
-	doins ${FILESDIR}/${PV}/sbclrc	# Gentoo specific (from Debian)
-
-	exeinto /usr/lib/common-lisp/bin
-	doexe ${FILESDIR}/${PV}/sbcl.sh	# Gentoo specific (from Debian)
-
-	dodir /usr/share/man
-	INSTALL_ROOT=${D}/usr sh install.sh
-	mv ${D}/usr/lib/sbcl/sbcl.core ${D}/usr/lib/sbcl/sbcl-dist.core
-
-	insinto /usr/lib/sbcl
-	doins ${FILESDIR}/${PV}/install-clc.lisp	# Gentoo specific (from Debian)
-
-	doman doc/sbcl-asdf-install.1
-
-	dodoc BUGS COPYING CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README STYLE SUPPORT TLA TODO
-	dodoc ${FILESDIR}/${PV}/README.Gentoo
-	dohtml doc/html/*
-
-	doinfo ${S}/doc/manual/*.info
-	use doc && dodoc ${S}/doc/manual/*.{pdf,ps}
-
-	keepdir /usr/lib/common-lisp/sbcl
-
-	if ! use nosource; then
-		# install the SBCL source
-		find ${S}/src -type f -name \*.fasl |xargs rm -f
-		mv ${S}/src ${D}/usr/lib/sbcl/
-	fi
-
-	impl-save-timestamp-hack sbcl || die
-}
-
-pkg_postinst() {
-	standard-impl-postinst sbcl
-}
-
-pkg_postrm() {
-	standard-impl-postrm sbcl /usr/bin/sbcl
-}
diff --git a/dev-lisp/sbcl/sbcl-0.8.19.ebuild b/dev-lisp/sbcl/sbcl-0.8.19.ebuild
deleted file mode 100644
index 40917b1486a0..000000000000
--- a/dev-lisp/sbcl/sbcl-0.8.19.ebuild
+++ /dev/null
@@ -1,145 +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/sbcl/sbcl-0.8.19.ebuild,v 1.3 2005/03/16 07:36:15 mkennedy Exp $
-
-inherit common-lisp-common-2 eutils
-
-BV_X86=0.8.1
-BV_PPC=0.8.8
-BV_SPARC=0.7.13
-BV_MIPS=0.7.10
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp."
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	mirror://sourceforge/sbcl/${P}-html.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-ppc-linux-binary.tar.bz2 )
-	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
-	mips? ( mirror://sourceforge/sbcl/${PN}-${BV_MIPS}-mips-linux-binary.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~x86 ~ppc ~sparc ~mips"
-IUSE="threads doc nosource unicode ldb"
-
-DEPEND="=dev-lisp/common-lisp-controller-4*
-	>=dev-lisp/cl-asdf-1.84
-	sys-apps/texinfo
-	doc? ( virtual/tetex )"
-
-PROVIDE="virtual/commonlisp"
-
-pkg_setup() {
-	if use hardened; then
-		die 'So-called "hardened" USE features are incompatible with SBCL.'
-	fi
-}
-
-src_unpack() {
-	if use x86; then
-		unpack ${PN}-${BV_X86}-x86-linux-binary.tar.bz2
-		mv ${PN}-${BV_X86} x86-binary
-	elif use ppc; then
-		unpack ${PN}-${BV_PPC}-ppc-linux-binary.tar.bz2
-		mv ${PN}-${BV_PPC}-ppc-linux ppc-binary
-	elif use sparc; then
-		unpack ${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2
-		echo mv ${PN}-${BV_SPARC} sparc-binary || die
-		mv ${PN}-${BV_SPARC} sparc-binary || die
-	elif use mips; then
-		unpack ${PN}-${BV_SPARC}-mips-linux-binary.tar.gz
-		mv ${PN}-${BV_SPARC}-mips-linux mips-binary
-	fi
-
-	unpack ${P}-source.tar.bz2
-	epatch ${FILESDIR}/${PV}/sbcl-gentoo.patch
-	epatch ${FILESDIR}/${PV}/sbcl-no-tests-gentoo.patch
-
-	cp ${FILESDIR}/${PV}/customize-target-features.lisp-prefix \
-		${S}/customize-target-features.lisp
-	use x86 && use threads \
-		&& echo '(enable :sb-thread)' \
-		>>${S}/customize-target-features.lisp
-	use ldb \
-		&& echo '(enable :sb-ldb)' \
-		>>${S}/customize-target-features.lisp
-	echo '(enable :sb-futex)' >>${S}/customize-target-features.lisp
-	echo '(disable :sb-test)' >>${S}/customize-target-features.lisp
-	! use unicode \
-		&& echo '(disable :sb-unicode)' \
-		>>${S}/customize-target-features.lisp
-	cat ${FILESDIR}/${PV}/customize-target-features.lisp-suffix \
-		>>${S}/customize-target-features.lisp
-	find ${S} -type f -name .cvsignore -exec rm -f '{}' \;
-	find ${S} -type d -name CVS \) -exec rm -rf '{}' \;
-	find ${S} -type f -name \*.c -exec chmod 644 '{}' \;
-}
-
-src_compile() {
-	local bindir
-	use x86 && bindir=../x86-binary
-	use ppc && bindir=../ppc-binary
-	use sparc && bindir=../sparc-binary
-	use mips && bindir=../mips-binary
-	PATH=${bindir}/src/runtime:${PATH} SBCL_HOME=${bindir}/output GNUMAKE=make \
-		./make.sh 'sbcl
-			--sysinit /dev/null
-			--userinit /dev/null
-			--no-debugger
-			--core ${bindir}/output/sbcl.core' \
-				|| die
-	cd ${S}/doc/manual
-	make info
-	use doc && make ps pdf
-}
-
-src_install() {
-	unset SBCL_HOME
-
-	insinto /etc/
-	doins ${FILESDIR}/${PV}/sbclrc	# Gentoo specific (from Debian)
-
-	exeinto /usr/lib/common-lisp/bin
-	doexe ${FILESDIR}/${PV}/sbcl.sh	# Gentoo specific (from Debian)
-
-	dodir /usr/share/man
-	INSTALL_ROOT=${D}/usr sh install.sh
-	mv ${D}/usr/lib/sbcl/sbcl.core ${D}/usr/lib/sbcl/sbcl-dist.core
-
-	insinto /usr/lib/sbcl
-	doins ${FILESDIR}/${PV}/install-clc.lisp	# Gentoo specific (from Debian)
-
-	doman doc/sbcl-asdf-install.1
-
-	dodoc BUGS COPYING CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README STYLE SUPPORT TLA TODO
-	dodoc ${FILESDIR}/${PV}/README.Gentoo
-	dohtml doc/html/*
-
-	doinfo ${S}/doc/manual/*.info
-	use doc && dodoc ${S}/doc/manual/*.{pdf,ps}
-
-	keepdir /usr/lib/common-lisp/sbcl
-
-	if ! use nosource; then
-		# install the SBCL source
-		find ${S}/src -type f -name \*.fasl |xargs rm -f
-		mv ${S}/src ${D}/usr/lib/sbcl/
-	fi
-
-	impl-save-timestamp-hack sbcl || die
-}
-
-pkg_postinst() {
-	standard-impl-postinst sbcl
-}
-
-pkg_postrm() {
-	standard-impl-postrm sbcl /usr/bin/sbcl
-}
-
-pkg_postrm() {
-	if [ ! -x /usr/bin/sbcl ]; then
-		rm -rf /usr/lib/sbcl/ || die
-	fi
-}
diff --git a/dev-lisp/sbcl/sbcl-0.8.20.ebuild b/dev-lisp/sbcl/sbcl-0.8.20.ebuild
deleted file mode 100644
index e21f765d8fa8..000000000000
--- a/dev-lisp/sbcl/sbcl-0.8.20.ebuild
+++ /dev/null
@@ -1,190 +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/sbcl/sbcl-0.8.20.ebuild,v 1.4 2005/04/25 05:55:06 mkennedy Exp $
-
-inherit common-lisp-common-2 eutils
-
-SBCL_AF_PV=2004-10-22
-
-BV_X86=0.8.1
-BV_PPC=0.8.8
-BV_SPARC=0.7.13
-BV_MIPS=0.7.10
-BV_AMD64=0.8.19
-
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp."
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	mirror://sourceforge/sbcl/${P}-html.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-ppc-linux-binary.tar.bz2 )
-	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
-	mips? ( mirror://sourceforge/sbcl/${PN}-${BV_MIPS}-mips-linux-binary.tar.gz )
-	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
-	callbacks? ( http://pinhead.music.uiuc.edu/~hkt/sbcl-af-${SBCL_AF_PV}.tgz )"
-
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="x86 ~ppc ~sparc ~mips ~amd64"
-IUSE="threads doc nosource unicode ldb callbacks"
-
-DEPEND="=dev-lisp/common-lisp-controller-4*
-	>=dev-lisp/cl-asdf-1.84
-	sys-apps/texinfo
-	doc? ( virtual/tetex )"
-
-PROVIDE="virtual/commonlisp"
-
-pkg_setup() {
-	if gcc-config -c |grep hardened; then
-		while read line; do einfo "${line}"; done <<EOF
-
-So-called "hardened" compiler features are incompatible with SBCL.	You must use
-gcc-config to select a profile with non-hardened features and "source
-/etc/profile" before continuing.
-
-EOF
-	die
-	fi
-}
-
-src_unpack() {
-	if use x86; then
-		unpack ${PN}-${BV_X86}-x86-linux-binary.tar.bz2
-		mv ${PN}-${BV_X86} x86-binary
-	elif use ppc; then
-		unpack ${PN}-${BV_PPC}-ppc-linux-binary.tar.bz2
-		mv ${PN}-${BV_PPC}-ppc-linux ppc-binary
-	elif use sparc; then
-		unpack ${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2
-		echo mv ${PN}-${BV_SPARC} sparc-binary || die
-		mv ${PN}-${BV_SPARC} sparc-binary || die
-	elif use mips; then
-		unpack ${PN}-${BV_MIPS}-mips-linux-binary.tar.gz
-		mv ${PN}-${BV_MIPS}-mips-linux mips-binary
-	elif use amd64; then
-		unpack ${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2
-		mv ${PN}-${BV_AMD64}-x86-64-linux x86-64-binary
-	fi
-
-	unpack ${P}-source.tar.bz2
-	epatch ${FILESDIR}/${PV}/sbcl-gentoo.patch
-	epatch ${FILESDIR}/${PV}/sbcl-no-tests-gentoo.patch
-
-	cp ${FILESDIR}/${PV}/customize-target-features.lisp-prefix \
-		${S}/customize-target-features.lisp
-	use x86 && use threads \
-		&& echo '(enable :sb-thread)' \
-		>>${S}/customize-target-features.lisp
-	use ldb \
-		&& echo '(enable :sb-ldb)' \
-		>>${S}/customize-target-features.lisp
-	use x86 \
-		&& echo '(enable :sb-futex)' \
-		>>${S}/customize-target-features.lisp
-	echo '(disable :sb-test)' >>${S}/customize-target-features.lisp
-	! use unicode \
-		&& echo '(disable :sb-unicode)' \
-		>>${S}/customize-target-features.lisp
-	cat ${FILESDIR}/${PV}/customize-target-features.lisp-suffix \
-		>>${S}/customize-target-features.lisp
-	find ${S} -type f -name .cvsignore -exec rm -f '{}' \;
-	find ${S} -depth -type d -name CVS	-exec rm -rf '{}' \;
-	find ${S} -type f -name \*.c -exec chmod 644 '{}' \;
-
-	if use callbacks; then
-		einfo "You have specified the \"callbacks\" USE flag.  Callbacks may only work for x86."
-		einfo "Please refer to README.Gentoo for more information."
-		unpack sbcl-af-${SBCL_AF_PV}.tgz
-	fi
-}
-
-src_compile() {
-	local bindir=""
-
-	if use x86; then
-		bindir=../x86-binary
-	elif use ppc; then
-		bindir=../ppc-binary
-	elif use sparc; then
-		bindir=../sparc-binary
-	elif use mips; then
-		bindir=../mips-binary
-	elif use amd64; then
-		bindir=../x86-64-binary
-	fi
-
-	PATH=${bindir}/src/runtime:${PATH} SBCL_HOME=${bindir}/output GNUMAKE=make \
-		./make.sh 'sbcl
-			--sysinit /dev/null
-			--userinit /dev/null
-			--no-debugger
-			--core ${bindir}/output/sbcl.core' \
-				|| die
-	cd ${S}/doc/manual
-	make info
-	use doc && make ps pdf
-}
-
-src_install() {
-	unset SBCL_HOME
-
-	insinto /etc/
-	doins ${FILESDIR}/${PV}/sbclrc	# Gentoo specific (from Debian)
-
-	exeinto /usr/lib/common-lisp/bin
-	doexe ${FILESDIR}/${PV}/sbcl.sh	# Gentoo specific (from Debian)
-
-	dodir /usr/share/man
-	dodir /usr/share/doc/${PF}
-	INSTALL_ROOT=${D}/usr DOC_DIR=${D}/usr/share/doc/${PF} sh install.sh || die
-	mv ${D}/usr/lib/sbcl/sbcl.core ${D}/usr/lib/sbcl/sbcl-dist.core || die
-
-	insinto /usr/lib/sbcl
-	doins ${FILESDIR}/${PV}/install-clc.lisp	# Gentoo specific (from Debian)
-
-	doman doc/sbcl-asdf-install.1
-
-	dodoc BUGS COPYING CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README STYLE SUPPORT TLA TODO
-	dodoc ${FILESDIR}/${PV}/README.Gentoo
-	dohtml doc/html/*
-
-	doinfo ${S}/doc/manual/*.info
-	use doc && dodoc ${S}/doc/manual/*.{pdf,ps}
-
-	keepdir /usr/lib/common-lisp/sbcl
-
-	if ! use nosource; then
-		# install the SBCL source
-		find ${S}/src -type f -name \*.fasl |xargs rm -f
-		mv ${S}/src ${D}/usr/lib/sbcl/
-	fi
-
-	impl-save-timestamp-hack sbcl || die
-}
-
-pkg_postinst() {
-	standard-impl-postinst sbcl
-	if use callbacks; then
-		mv /usr/lib/sbcl/sbcl.core /usr/lib/sbcl/sbcl-nocallbacks.core || die
-		pushd ${WORKDIR}/sbcl-af
-		sbcl --core /usr/lib/sbcl/sbcl-nocallbacks.core \
-			--load 'system' \
-			--eval '(sb-ext:save-lisp-and-die "/usr/lib/sbcl/sbcl.core")' || die
-		popd
-	fi
-# Image Summary
-# -------------
-# /usr/lib/sbcl/sbcl-dist.core		  - Plain SBCL image
-# /usr/lib/sbcl/sbcl-nocallbacks.core - CLC (Common Lisp Controller) image
-# /usr/lib/sbcl/sbcl.core			  - CLC image w/ callbacks support
-
-}
-
-pkg_postrm() {
-	standard-impl-postrm sbcl /usr/bin/sbcl
-	if [ ! -x /usr/bin/sbcl ]; then
-		rm -rf /usr/lib/sbcl/ || die
-	fi
-}
diff --git a/dev-lisp/sbcl/sbcl-0.8.21-r1.ebuild b/dev-lisp/sbcl/sbcl-0.8.21-r1.ebuild
index d306f56654d6..7cee2af0961e 100644
--- a/dev-lisp/sbcl/sbcl-0.8.21-r1.ebuild
+++ b/dev-lisp/sbcl/sbcl-0.8.21-r1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.8.21-r1.ebuild,v 1.1 2005/04/25 05:55:06 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.8.21-r1.ebuild,v 1.2 2005/06/01 03:24:45 mkennedy Exp $
 
 inherit common-lisp-common-2 eutils
 
-SBCL_AF_PV=2004-10-22
-
 BV_X86=0.8.1
 BV_PPC=0.8.15
 BV_SPARC=0.7.13
@@ -20,14 +18,13 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
 	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
 	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
 	mips? ( mirror://sourceforge/sbcl/${PN}-${BV_MIPS}-mips-linux-binary.tar.gz )
-	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
-	callbacks? ( http://pinhead.music.uiuc.edu/~hkt/sbcl-af-${SBCL_AF_PV}.tgz )"
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )"
 
 LICENSE="MIT"
 SLOT="0"
 
 KEYWORDS="x86 ~ppc ~sparc ~mips ~amd64"
-IUSE="threads doc nosource unicode ldb callbacks"
+IUSE="threads doc nosource unicode ldb"
 
 DEPEND="=dev-lisp/common-lisp-controller-4*
 	>=dev-lisp/cl-asdf-1.84
@@ -39,15 +36,15 @@ PROVIDE="virtual/commonlisp"
 MY_WORK=${S}/my_work
 
 pkg_setup() {
-	if gcc-config -c |grep hardened; then
-		while read line; do einfo "${line}"; done <<EOF
+	if use hardened && gcc-config -c |grep -qv vanilla; then
+		while read line; do einfo "${line}"; done <<'EOF'
 
-So-called "hardened" compiler features are incompatible with SBCL.	You must use
-gcc-config to select a profile with non-hardened features and "source
-/etc/profile" before continuing.
+So-called "hardened" compiler features are incompatible with SBCL. You
+must use gcc-config to select a profile with non-hardened features
+(the "vanilla" profile) and "source /etc/profile" before continuing.
 
 EOF
-	die
+		die
 	fi
 }
 
@@ -97,12 +94,6 @@ src_unpack() {
 	find ${S} -type f -name .cvsignore -exec rm -f '{}' \;
 	find ${S} -depth -type d -name CVS	-exec rm -rf '{}' \;
 	find ${S} -type f -name \*.c -exec chmod 644 '{}' \;
-
-	if use callbacks; then
-		einfo "You have specified the \"callbacks\" USE flag.  Callbacks may only work for x86."
-		einfo "Please refer to README.Gentoo for more information."
-		unpack sbcl-af-${SBCL_AF_PV}.tgz
-	fi
 }
 
 src_compile() {
@@ -171,19 +162,6 @@ src_install() {
 
 pkg_postinst() {
 	standard-impl-postinst sbcl
-	if use callbacks; then
-		mv /usr/$(get_libdir)/sbcl/sbcl.core /usr/$(get_libdir)/sbcl/sbcl-nocallbacks.core || die
-		pushd ${WORKDIR}/sbcl-af
-		sbcl --core /usr/$(get_libdir)/sbcl/sbcl-nocallbacks.core \
-			--load 'system' \
-			--eval "(sb-ext:save-lisp-and-die \"/usr/$(get_libdir)/sbcl/sbcl.core\")" || die
-		popd
-	fi
-# Image Summary
-# -------------
-# /usr/$(get_libdir)/sbcl/sbcl-dist.core		  - Plain SBCL image
-# /usr/$(get_libdir)/sbcl/sbcl-nocallbacks.core - CLC (Common Lisp Controller) image
-# /usr/$(get_libdir)/sbcl/sbcl.core			  - CLC image w/ callbacks support
 }
 
 pkg_postrm() {
diff --git a/dev-lisp/sbcl/sbcl-0.8.21.ebuild b/dev-lisp/sbcl/sbcl-0.8.21.ebuild
deleted file mode 100644
index 0ee603615518..000000000000
--- a/dev-lisp/sbcl/sbcl-0.8.21.ebuild
+++ /dev/null
@@ -1,182 +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/sbcl/sbcl-0.8.21.ebuild,v 1.1 2005/04/07 02:58:58 mkennedy Exp $
-
-inherit common-lisp-common-2 eutils
-
-SBCL_AF_PV=2004-10-22
-
-BV_X86=0.8.1
-BV_PPC=0.8.8
-BV_SPARC=0.7.13
-BV_MIPS=0.7.10
-BV_AMD64=0.8.19
-
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp."
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	mirror://sourceforge/sbcl/${P}-html.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-ppc-linux-binary.tar.bz2 )
-	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
-	mips? ( mirror://sourceforge/sbcl/${PN}-${BV_MIPS}-mips-linux-binary.tar.gz )
-	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
-	callbacks? ( http://pinhead.music.uiuc.edu/~hkt/sbcl-af-${SBCL_AF_PV}.tgz )"
-
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~amd64"
-IUSE="threads doc nosource unicode ldb callbacks"
-
-DEPEND="=dev-lisp/common-lisp-controller-4*
-	>=dev-lisp/cl-asdf-1.84
-	sys-apps/texinfo
-	doc? ( virtual/tetex )"
-
-PROVIDE="virtual/commonlisp"
-
-pkg_setup() {
-	if use hardened; then
-		die 'So-called "hardened" USE features are incompatible with SBCL.'
-	fi
-}
-
-src_unpack() {
-	if use x86; then
-		unpack ${PN}-${BV_X86}-x86-linux-binary.tar.bz2
-		mv ${PN}-${BV_X86} x86-binary
-	elif use ppc; then
-		unpack ${PN}-${BV_PPC}-ppc-linux-binary.tar.bz2
-		mv ${PN}-${BV_PPC}-ppc-linux ppc-binary
-	elif use sparc; then
-		unpack ${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2
-		echo mv ${PN}-${BV_SPARC} sparc-binary || die
-		mv ${PN}-${BV_SPARC} sparc-binary || die
-	elif use mips; then
-		unpack ${PN}-${BV_MIPS}-mips-linux-binary.tar.gz
-		mv ${PN}-${BV_MIPS}-mips-linux mips-binary
-	elif use amd64; then
-		unpack ${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2
-		mv ${PN}-${BV_AMD64}-x86-64-linux x86-64-binary
-	fi
-
-	unpack ${P}-source.tar.bz2
-	epatch ${FILESDIR}/${PV}/sbcl-gentoo.patch
-	epatch ${FILESDIR}/${PV}/sbcl-no-tests-gentoo.patch
-
-	cp ${FILESDIR}/${PV}/customize-target-features.lisp-prefix \
-		${S}/customize-target-features.lisp
-	use x86 && use threads \
-		&& echo '(enable :sb-thread)' \
-		>>${S}/customize-target-features.lisp
-	use ldb \
-		&& echo '(enable :sb-ldb)' \
-		>>${S}/customize-target-features.lisp
-	use x86 \
-		&& echo '(enable :sb-futex)' \
-		>>${S}/customize-target-features.lisp
-	echo '(disable :sb-test)' >>${S}/customize-target-features.lisp
-	! use unicode \
-		&& echo '(disable :sb-unicode)' \
-		>>${S}/customize-target-features.lisp
-	cat ${FILESDIR}/${PV}/customize-target-features.lisp-suffix \
-		>>${S}/customize-target-features.lisp
-	find ${S} -type f -name .cvsignore -exec rm -f '{}' \;
-	find ${S} -depth -type d -name CVS	-exec rm -rf '{}' \;
-	find ${S} -type f -name \*.c -exec chmod 644 '{}' \;
-
-	if use callbacks; then
-		einfo "You have specified the \"callbacks\" USE flag.  Callbacks may only work for x86."
-		einfo "Please refer to README.Gentoo for more information."
-		unpack sbcl-af-${SBCL_AF_PV}.tgz
-	fi
-}
-
-src_compile() {
-	local bindir=""
-
-	if use x86; then
-		bindir=../x86-binary
-	elif use ppc; then
-		bindir=../ppc-binary
-	elif use sparc; then
-		bindir=../sparc-binary
-	elif use mips; then
-		bindir=../mips-binary
-	elif use amd64; then
-		bindir=../x86-64-binary
-	fi
-
-	PATH=${bindir}/src/runtime:${PATH} SBCL_HOME=${bindir}/output GNUMAKE=make \
-		./make.sh 'sbcl
-			--sysinit /dev/null
-			--userinit /dev/null
-			--no-debugger
-			--core ${bindir}/output/sbcl.core' \
-				|| die
-	cd ${S}/doc/manual
-	make info
-	use doc && make ps pdf
-}
-
-src_install() {
-	unset SBCL_HOME
-
-	insinto /etc/
-	doins ${FILESDIR}/${PV}/sbclrc	# Gentoo specific (from Debian)
-
-	exeinto /usr/lib/common-lisp/bin
-	doexe ${FILESDIR}/${PV}/sbcl.sh	# Gentoo specific (from Debian)
-
-	dodir /usr/share/man
-	dodir /usr/share/doc/${PF}
-	INSTALL_ROOT=${D}/usr DOC_DIR=${D}/usr/share/doc/${PF} sh install.sh || die
-	mv ${D}/usr/lib/sbcl/sbcl.core ${D}/usr/lib/sbcl/sbcl-dist.core || die
-
-	insinto /usr/lib/sbcl
-	doins ${FILESDIR}/${PV}/install-clc.lisp	# Gentoo specific (from Debian)
-
-	doman doc/sbcl-asdf-install.1
-
-	dodoc BUGS COPYING CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README STYLE SUPPORT TLA TODO
-	dodoc ${FILESDIR}/${PV}/README.Gentoo
-	dohtml doc/html/*
-
-	doinfo ${S}/doc/manual/*.info
-	use doc && dodoc ${S}/doc/manual/*.{pdf,ps}
-
-	keepdir /usr/lib/common-lisp/sbcl
-
-	if ! use nosource; then
-		# install the SBCL source
-		find ${S}/src -type f -name \*.fasl |xargs rm -f
-		mv ${S}/src ${D}/usr/lib/sbcl/
-	fi
-
-	impl-save-timestamp-hack sbcl || die
-}
-
-pkg_postinst() {
-	standard-impl-postinst sbcl
-	if use callbacks; then
-		mv /usr/lib/sbcl/sbcl.core /usr/lib/sbcl/sbcl-nocallbacks.core || die
-		pushd ${WORKDIR}/sbcl-af
-		sbcl --core /usr/lib/sbcl/sbcl-nocallbacks.core \
-			--load 'system' \
-			--eval '(sb-ext:save-lisp-and-die "/usr/lib/sbcl/sbcl.core")' || die
-		popd
-	fi
-# Image Summary
-# -------------
-# /usr/lib/sbcl/sbcl-dist.core		  - Plain SBCL image
-# /usr/lib/sbcl/sbcl-nocallbacks.core - CLC (Common Lisp Controller) image
-# /usr/lib/sbcl/sbcl.core			  - CLC image w/ callbacks support
-}
-
-pkg_postrm() {
-	standard-impl-postrm sbcl /usr/bin/sbcl
-	if [ ! -x /usr/bin/sbcl ]; then
-		rm -rf /usr/lib/sbcl/ || die
-	fi
-}
diff --git a/dev-lisp/sbcl/sbcl-0.9.0.ebuild b/dev-lisp/sbcl/sbcl-0.9.0.ebuild
index c5aefec2e9aa..fcf40ae38f9e 100644
--- a/dev-lisp/sbcl/sbcl-0.9.0.ebuild
+++ b/dev-lisp/sbcl/sbcl-0.9.0.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.9.0.ebuild,v 1.2 2005/05/21 19:34:12 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.9.0.ebuild,v 1.3 2005/06/01 03:24:45 mkennedy Exp $
 
 inherit common-lisp-common-2 eutils
 
-SBCL_AF_PV=2004-10-22
-
 BV_X86=0.8.1
 BV_PPC=0.8.15
 BV_SPARC=0.8.15
@@ -20,14 +18,12 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
 	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
 	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
 	mips? ( mirror://sourceforge/sbcl/${PN}-${BV_MIPS}-mips-linux-binary.tar.gz )
-	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
-	callbacks? ( http://pinhead.music.uiuc.edu/~hkt/sbcl-af-${SBCL_AF_PV}.tgz )"
-
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )"
 LICENSE="MIT"
 SLOT="0"
 
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~amd64"
-IUSE="threads doc nosource unicode ldb callbacks"
+IUSE="threads doc nosource unicode ldb"
 
 DEPEND="=dev-lisp/common-lisp-controller-4*
 	>=dev-lisp/cl-asdf-1.84
@@ -47,11 +43,8 @@ gcc-config to select a profile with non-hardened features and "source
 /etc/profile" before continuing.
 
 EOF
-	die
+		die
 	fi
-
-	# FIXME Maybe something should be done in the case where a user requests
-	# threads on a non-NPTL system
 }
 
 src_unpack() {
@@ -98,12 +91,6 @@ src_unpack() {
 	find ${S} -type f -name .cvsignore -exec rm -f '{}' \;
 	find ${S} -depth -type d -name CVS	-exec rm -rf '{}' \;
 	find ${S} -type f -name \*.c -exec chmod 644 '{}' \;
-
-	if use callbacks; then
-		einfo "You have specified the \"callbacks\" USE flag.  Callbacks may only work for x86."
-		einfo "Please refer to README.Gentoo for more information."
-		unpack sbcl-af-${SBCL_AF_PV}.tgz
-	fi
 }
 
 src_compile() {
@@ -172,19 +159,6 @@ src_install() {
 
 pkg_postinst() {
 	standard-impl-postinst sbcl
-	if use callbacks; then
-		mv /usr/$(get_libdir)/sbcl/sbcl.core /usr/$(get_libdir)/sbcl/sbcl-nocallbacks.core || die
-		pushd ${WORKDIR}/sbcl-af
-		sbcl --core /usr/$(get_libdir)/sbcl/sbcl-nocallbacks.core \
-			--load 'system' \
-			--eval "(sb-ext:save-lisp-and-die \"/usr/$(get_libdir)/sbcl/sbcl.core\")" || die
-		popd
-	fi
-# Image Summary
-# -------------
-# /usr/$(get_libdir)/sbcl/sbcl-dist.core		  - Plain SBCL image
-# /usr/$(get_libdir)/sbcl/sbcl-nocallbacks.core - CLC (Common Lisp Controller) image
-# /usr/$(get_libdir)/sbcl/sbcl.core			  - CLC image w/ callbacks support
 }
 
 pkg_postrm() {
diff --git a/dev-lisp/sbcl/sbcl-0.9.1.ebuild b/dev-lisp/sbcl/sbcl-0.9.1.ebuild
index 4fdfd96edcf0..9c4da24f155e 100644
--- a/dev-lisp/sbcl/sbcl-0.9.1.ebuild
+++ b/dev-lisp/sbcl/sbcl-0.9.1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.9.1.ebuild,v 1.2 2005/05/30 08:29:31 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.9.1.ebuild,v 1.3 2005/06/01 03:24:45 mkennedy Exp $
 
 inherit common-lisp-common-2 eutils
 
-SBCL_AF_PV=2004-10-22
-
 BV_X86=0.8.1
 BV_PPC=0.8.15
 BV_SPARC=0.8.15
@@ -20,14 +18,13 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
 	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
 	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
 	mips? ( mirror://sourceforge/sbcl/${PN}-${BV_MIPS}-mips-linux-binary.tar.gz )
-	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
-	callbacks? ( http://pinhead.music.uiuc.edu/~hkt/sbcl-af-${SBCL_AF_PV}.tgz )"
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )"
 
 LICENSE="MIT"
 SLOT="0"
 
 KEYWORDS="x86 ~ppc ~sparc ~mips ~amd64"
-IUSE="threads doc nosource unicode ldb callbacks"
+IUSE="threads doc nosource unicode ldb"
 
 DEPEND="=dev-lisp/common-lisp-controller-4*
 	>=dev-lisp/cl-asdf-1.84
@@ -99,12 +96,6 @@ src_unpack() {
 	find ${S} -type f -name .cvsignore -exec rm -f '{}' \;
 	find ${S} -depth -type d -name CVS	-exec rm -rf '{}' \;
 	find ${S} -type f -name \*.c -exec chmod 644 '{}' \;
-
-	if use callbacks; then
-		einfo "You have specified the \"callbacks\" USE flag.  Callbacks may only work for x86."
-		einfo "Please refer to README.Gentoo for more information."
-		unpack sbcl-af-${SBCL_AF_PV}.tgz
-	fi
 }
 
 src_compile() {
@@ -173,19 +164,6 @@ src_install() {
 
 pkg_postinst() {
 	standard-impl-postinst sbcl
-	if use callbacks; then
-		mv /usr/$(get_libdir)/sbcl/sbcl.core /usr/$(get_libdir)/sbcl/sbcl-nocallbacks.core || die
-		pushd ${WORKDIR}/sbcl-af
-		sbcl --core /usr/$(get_libdir)/sbcl/sbcl-nocallbacks.core \
-			--load 'system' \
-			--eval "(sb-ext:save-lisp-and-die \"/usr/$(get_libdir)/sbcl/sbcl.core\")" || die
-		popd
-	fi
-# Image Summary
-# -------------
-# /usr/$(get_libdir)/sbcl/sbcl-dist.core		  - Plain SBCL image
-# /usr/$(get_libdir)/sbcl/sbcl-nocallbacks.core - CLC (Common Lisp Controller) image
-# /usr/$(get_libdir)/sbcl/sbcl.core			  - CLC image w/ callbacks support
 }
 
 pkg_postrm() {