*** empty log message ***

11 files changed, 21 insertions, 275 deletions

diff --git a/dev-lisp/sbcl/ChangeLog b/dev-lisp/sbcl/ChangeLog
index 9af728ef7135..cf3289f2e7ec 100644
--- a/dev-lisp/sbcl/ChangeLog
+++ b/dev-lisp/sbcl/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-lisp/sbcl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.20 2003/10/13 07:05:34 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.21 2003/10/30 17:44:53 mkennedy Exp $
+
+  30 Oct 2003; <mkennedy@gentoo.org> sbcl-0.6.12.ebuild, sbcl-0.7.5.ebuild,
+  sbcl-0.7.6-r1.ebuild, sbcl-0.8.3.68.ebuild, sbcl-0.8.4-r2.ebuild:
+  removed old ebuilds
+
+  30 Oct 2003; <mkennedy@gentoo.org> sbcl-0.6.12.ebuild, sbcl-0.7.5.ebuild,
+  sbcl-0.7.6-r1.ebuild, sbcl-0.8.3.68.ebuild, sbcl-0.8.4-r2.ebuild:
+  improved clean up code, if you experience problems after updating to this
+  version, try re-emerging sbcl -- this should resolve any transient upgrade
+  problems
 
   13 Oct 2003; Matthew Kennedy <mkennedy@gentoo.org> metadata.xml:
   add metadata.xml
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 2dda9e39e580..b3828fe39a61 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -1,22 +1,14 @@
-MD5 4f65a6088bb383ff5ab855dc7c5bfa60 ChangeLog 3780
+MD5 dae1e0241ec26b692ebb8b6156a68f89 ChangeLog 4256
 MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
-MD5 f67859fbfee204bba3ee73ee8abe994a sbcl-0.6.12.ebuild 1053
-MD5 a6e113337aada357e7aa8b93dce9c82a sbcl-0.7.5.ebuild 1372
-MD5 215c765767ee81f9cbae0696e4fc0c53 sbcl-0.7.6-r1.ebuild 1482
 MD5 3f7c2bc02639ca69e478db920d8b3704 sbcl-0.7.7.ebuild 1479
 MD5 6c9f9c96627678efaa377d40692ea969 sbcl-0.8.1.ebuild 1534
-MD5 30af45636c7e7d046f5ad5a732473742 sbcl-0.8.3.68.ebuild 2545
 MD5 d913694a716b741d4edb240f3d8049b3 sbcl-0.8.3.ebuild 2562
 MD5 2842b64ad2353ca9b97ab1563ddb1e35 sbcl-0.8.4-r1.ebuild 3569
-MD5 ff046bb54c6ac396ce7919759cc1aa9d sbcl-0.8.4-r2.ebuild 3892
+MD5 9e5df4051446c5a4c72810d3574298d8 sbcl-0.8.4-r2.ebuild 3878
 MD5 c4fad0c97a08164fd44dea56a258a475 sbcl-0.8.4.ebuild 2560
-MD5 36e1837606337c53dc21111b18146143 files/digest-sbcl-0.6.12 150
-MD5 61c9382b669d5b190b434be62664253e files/digest-sbcl-0.7.5 219
-MD5 bc8e434b44fc3abc15022afc66be888f files/digest-sbcl-0.7.6-r1 300
 MD5 1b52d1cb085fdfec090a08604c2fd4ed files/digest-sbcl-0.7.7 300
 MD5 1821ff9718a8d902b416c691258c9a40 files/digest-sbcl-0.8.1 304
 MD5 1c37a6df08d60b9008ded7dfb2b584ab files/digest-sbcl-0.8.3 301
-MD5 714f4433aa5692baadd4b3ec5dfe9c9b files/digest-sbcl-0.8.3.68 301
 MD5 e4cb586a69674d17caa700f1cc5bda52 files/digest-sbcl-0.8.4 362
 MD5 5dbead83e334ab169eddfb64e138606b files/digest-sbcl-0.8.4-r1 528
 MD5 5dbead83e334ab169eddfb64e138606b files/digest-sbcl-0.8.4-r2 528
diff --git a/dev-lisp/sbcl/files/digest-sbcl-0.6.12 b/dev-lisp/sbcl/files/digest-sbcl-0.6.12
deleted file mode 100644
index ff12f0dfaf6a..000000000000
--- a/dev-lisp/sbcl/files/digest-sbcl-0.6.12
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 29950dacd0436d6931ea57a5d51bd829 sbcl-0.6.12-source.tar.bz2 1731572
-MD5 6d5f802852c45b9cbd249d5cb7237175 sbcl-0.6.12-linux-binary.tar.bz2 5517367
diff --git a/dev-lisp/sbcl/files/digest-sbcl-0.7.5 b/dev-lisp/sbcl/files/digest-sbcl-0.7.5
deleted file mode 100644
index 5c67c4d06334..000000000000
--- a/dev-lisp/sbcl/files/digest-sbcl-0.7.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a5a6b95dbd323533054a45f49f898d09 sbcl-0.7.5-source.tar.bz2 1663476
-MD5 7ae3698787a39bb6b7338bb088f3d80a sbcl-0.7.2-x86-linux-binary.tar.bz2 5420822
-MD5 102636b35b0a27f75e38eeea782d0217 sbcl-0.7.5-html.tar.bz2 27596
diff --git a/dev-lisp/sbcl/files/digest-sbcl-0.7.6-r1 b/dev-lisp/sbcl/files/digest-sbcl-0.7.6-r1
deleted file mode 100644
index 89515df655aa..000000000000
--- a/dev-lisp/sbcl/files/digest-sbcl-0.7.6-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 b69376646a0975f93bfb8b907a60ab78 sbcl-0.7.6-source.tar.bz2 1667624
-MD5 7ae3698787a39bb6b7338bb088f3d80a sbcl-0.7.2-x86-linux-binary.tar.bz2 5420822
-MD5 4c3f54f6c3ed9195b87d3a34b6ac91a5 sbcl-0.7.6-ppc-linux-binary.tar.bz2 4890140
-MD5 19b70c07e32eb187d80338d5577559f3 sbcl-0.7.6-html.tar.bz2 37044
diff --git a/dev-lisp/sbcl/files/digest-sbcl-0.8.3.68 b/dev-lisp/sbcl/files/digest-sbcl-0.8.3.68
deleted file mode 100644
index 26732dad1466..000000000000
--- a/dev-lisp/sbcl/files/digest-sbcl-0.8.3.68
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 4dbe99b800f4cbd64799896dbbc8df5d sbcl_0.8.3.68.orig.tar.gz 2537205
-MD5 fc46f44fc5c6ca983bc1d923af1d77d6 sbcl_0.8.3.68-1.diff.gz 11334
-MD5 6c193e328cdb472787ef78401ee5294c sbcl-0.8.1-x86-linux-binary.tar.bz2 6348098
-MD5 1cbd667b28d6d5afabccc759315eea70 sbcl-0.7.13-binary-linux-ppc.tar.bz2 5339432
diff --git a/dev-lisp/sbcl/sbcl-0.6.12.ebuild b/dev-lisp/sbcl/sbcl-0.6.12.ebuild
deleted file mode 100644
index 7fcf0a54d57b..000000000000
--- a/dev-lisp/sbcl/sbcl-0.6.12.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.6.12.ebuild,v 1.13 2003/09/06 22:35:54 msterret Exp $
-
-DESCRIPTION="SteelBank Common Lisp"
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	mirror://sourceforge/sbcl/${P}-linux-binary.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="x86"
-
-PROVIDE="virtual/commonlisp"
-
-src_unpack() {
-	unpack ${P}-linux-binary.tar.bz2 ; mv ${P} ${P}-binary
-	unpack ${P}-source.tar.bz2
-}
-
-src_compile() {
-	export SBCL_HOME="../${P}-binary/output/"
-	export GNUMAKE="make"
-	sh make.sh "../${P}-binary/src/runtime/sbcl" || die "sh make.sh failed"
-
-	if which jade > /dev/null ; then
-		cd doc
-		sh make-doc.sh || die "sh make-doc.sh failed"
-	else
-		echo "Jade missing: Not building documentation"
-	fi
-}
-
-src_install() {
-	doman doc/sbcl.1
-	dobin src/runtime/sbcl
-
-	dodoc BUGS CREDITS NEWS README INSTALL COPYING
-
-	insinto /usr/share/sbcl
-	doins output/sbcl.core
-}
diff --git a/dev-lisp/sbcl/sbcl-0.7.5.ebuild b/dev-lisp/sbcl/sbcl-0.7.5.ebuild
deleted file mode 100644
index 3eb4bb290255..000000000000
--- a/dev-lisp/sbcl/sbcl-0.7.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.7.5.ebuild,v 1.9 2003/09/06 22:35:54 msterret Exp $
-
-DESCRIPTION="Steel Bank Common Lisp"
-HOMEPAGE="http://sbcl.sourceforge.net/"
-BOOTSTRAPPER="0.7.2"
-BIN=${PN}-${BOOTSTRAPPER}
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	mirror://sourceforge/sbcl/${BIN}-x86-linux-binary.tar.bz2
-	mirror://sourceforge/sbcl/${P}-html.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-# 2002.07.19 -- karltk:
-# Requires x86-only binary for bootstrapping
-# Krystof promises ppc binary for 0.7.6
-# Sparc is a lost cause.
-KEYWORDS="x86 -ppc -sparc "
-PROVIDE="virtual/commonlisp"
-DEPEND=""
-
-src_unpack() {
-	unpack ${BIN}-x86-linux-binary.tar.bz2
-	mv ${BIN} ${BIN}-binary
-
-	unpack ${P}-source.tar.bz2
-	unpack ${P}-html.tar.bz2
-}
-
-src_compile() {
-	export SBCL_HOME="../${BIN}-binary/output/"
-	# 2002.07.19 -- karltk:
-	# Marius tells me parallell make is  2-3 years off.
-	export GNUMAKE="make"
-	sh make.sh "../${BIN}-binary/src/runtime/sbcl" || die
-}
-
-src_install() {
-	doman doc/sbcl.1
-	dobin src/runtime/sbcl
-
-	dodoc BUGS CREDITS NEWS README INSTALL COPYING
-	dohtml doc/html/*
-
-	LIB=${DESTTREE}/lib/sbcl
-
-	dodir ${LIB}
-	insinto ${LIB}
-	doins output/sbcl.core
-
-	dodir /etc/env.d
-
-	echo "SBCL_HOME=${LIB}" > ${D}/etc/env.d/10sbcl
-}
diff --git a/dev-lisp/sbcl/sbcl-0.7.6-r1.ebuild b/dev-lisp/sbcl/sbcl-0.7.6-r1.ebuild
deleted file mode 100644
index a95ed83ca0d3..000000000000
--- a/dev-lisp/sbcl/sbcl-0.7.6-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.7.6-r1.ebuild,v 1.9 2003/09/11 01:10:52 msterret Exp $
-
-DESCRIPTION="Steel Bank Common Lisp"
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-0.7.2-x86-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-0.7.6-ppc-linux-binary.tar.bz2 )
-	mirror://sourceforge/sbcl/${P}-html.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="x86 ppc -sparc "
-PROVIDE="virtual/commonlisp"
-# the SRC_URI trickery needs this
-DEPEND=">=sys-apps/portage-2.0.27"
-
-src_unpack() {
-
-	if ( use x86 ) ; then
-		unpack ${PN}-0.7.2-x86-linux-binary.tar.bz2
-		mv ${PN}-0.7.2 x86-binary
-	elif ( use ppc ) ; then
-		unpack ${PN}-0.7.6-ppc-linux-binary.tar.bz2
-		mv ${PN}-0.7.6-ppc-linux ppc-binary
-	fi
-
-	unpack ${P}-source.tar.bz2
-	unpack ${P}-html.tar.bz2
-}
-
-src_compile() {
-	local bindir
-	use x86 && bindir=x86-binary
-	use ppc && bindir=ppc-binary
-
-	export SBCL_HOME="../${bindir}/output/"
-	export GNUMAKE="make"
-
-	sh make.sh "../${bindir}/src/runtime/sbcl" || die
-}
-
-src_install() {
-	local LIB=${DESTTREE}/lib/sbcl
-
-	doman doc/sbcl.1
-	dobin src/runtime/sbcl
-
-	dodoc BUGS CREDITS NEWS README INSTALL COPYING
-	dohtml doc/html/*
-
-	dodir ${LIB}
-	insinto ${LIB}
-	doins output/sbcl.core
-
-	dodir /etc/env.d
-
-	echo "SBCL_HOME=${LIB}" > ${D}/etc/env.d/10sbcl
-}
diff --git a/dev-lisp/sbcl/sbcl-0.8.3.68.ebuild b/dev-lisp/sbcl/sbcl-0.8.3.68.ebuild
deleted file mode 100644
index 70a9e11fdcdd..000000000000
--- a/dev-lisp/sbcl/sbcl-0.8.3.68.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.8.3.68.ebuild,v 1.1 2003/10/04 08:15:12 mkennedy Exp $
-
-DESCRIPTION="Steel Bank Common Lisp"
-HOMEPAGE="http://sbcl.sourceforge.net/"
-BV_X86=0.8.1
-BV_PPC=0.7.13
-DEB_PV=1
-SRC_URI="http://ftp.debian.org/debian/pool/main/s/sbcl/sbcl_${PV}.orig.tar.gz
-	http://ftp.debian.org/debian/pool/main/s/sbcl/sbcl_${PV}-${DEB_PV}.diff.gz
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-binary-linux-ppc.tar.bz2 )"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~ppc -sparc "
-PROVIDE="virtual/commonlisp"
-# the SRC_URI trickery needs this
-DEPEND=">=sys-apps/portage-2.0.27
-	dev-lisp/common-lisp-controller"
-
-S=${WORKDIR}/${P}
-
-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
-	fi
-	unpack sbcl_${PV}.orig.tar.gz
-	unpack sbcl_${PV}-${DEB_PV}.diff.gz
-	epatch sbcl_${PV}-${DEB_PV}.diff
-	cd ${S}/src/code && epatch ${FILESDIR}/gc.lisp-linux-2.6.patch
-}
-
-src_compile() {
-	local bindir
-	use x86 && bindir=../x86-binary
-	use ppc && bindir=../ppc-binary
-	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'
-}
-
-src_install() {
-	insinto /etc/
-	doins ${FILESDIR}/sbcl.rc
-
-	exeinto /usr/lib/common-lisp/bin
-	cp ${FILESDIR}/sbcl.sh sbcl.sh
-	doexe sbcl.sh
-
-	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}/install-clc.lisp
-
-	dodir /usr/share
-	mv ${D}/usr/man ${D}/usr/share/
-	doman debian/sbcl-asdf-install.1
-
-	dohtml doc/html/*
-	dodoc BUGS CREDITS NEWS README INSTALL COPYING \
-		debian/README.Debian debian/changelog debian/copyright
-
-	find ${D} -type f -name .cvsignore |xargs rm -f
-}
-
-pkg_postinst() {
-	einfo ">>> Fixing permissions for executables and directories..."
-	find /usr/share/common-lisp/source -type d -o \( -type f -perm +111 \) \
-		|xargs chmod 755
-	einfo ">>> fix permissions for non-executable files..."
-	find /usr/share/common-lisp/source -type f ! -perm -111 \
-		|xargs chmod 644
-
-	/usr/sbin/register-common-lisp-implementation sbcl
-}
-
-pkg_prerm() {
-	/usr/sbin/unregister-common-lisp-implementation sbcl
-}
\ No newline at end of file
diff --git a/dev-lisp/sbcl/sbcl-0.8.4-r2.ebuild b/dev-lisp/sbcl/sbcl-0.8.4-r2.ebuild
index 27129047eb7a..23b8cab1c7f0 100644
--- a/dev-lisp/sbcl/sbcl-0.8.4-r2.ebuild
+++ b/dev-lisp/sbcl/sbcl-0.8.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.8.4-r2.ebuild,v 1.4 2003/10/13 06:10:56 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.8.4-r2.ebuild,v 1.5 2003/10/30 17:44:53 mkennedy Exp $
 
 inherit common-lisp-common
 
@@ -90,12 +90,14 @@ src_install() {
 	find ${D} -type f -name .cvsignore -exec rm -f '{}' \;
 	find ${D} -type f -name \*.c -exec chmod 644 '{}' \;
 
+	# BIG FAT HACK
+	#
 	# Since the Portage emerge step kills file timestamp information,
-	# we need to compensate by ensuring all .fasl files are more recent
-	# than their .lisp source.
+	# we need to compensate by ensuring all .fasl files are more
+	# recent than their .lisp source.
 
-	dodir /usr/share/sbcl
-	tar cpvzf ${D}/usr/share/sbcl/portage-timestamp-compensate -C ${D}/usr/lib/sbcl .
+	dodir /usr/share/${PN}
+	tar cpvzf ${D}/usr/share/${PN}/portage-timestamp-compensate -C ${D}/usr/lib/${PN} .
 }
 
 pkg_postinst() {
@@ -105,14 +107,11 @@ pkg_postinst() {
 	/usr/sbin/register-common-lisp-implementation sbcl
 }
 
-pkg_prerm() {
-	/usr/sbin/unregister-common-lisp-implementation sbcl
-}
-
 pkg_postrm() {
 	# Since we keep our own time stamps we must manually remove them
 	# here.
 	if [ ! -x /usr/bin/sbcl ]; then
 		rm -rf /usr/lib/sbcl
 	fi
+	rm -rf /usr/lib/common-lisp/${PN}
 }