Is now runnable on x86, too, thanks to new Portage.

4 files changed, 34 insertions, 30 deletions

diff --git a/dev-lisp/sbcl/ChangeLog b/dev-lisp/sbcl/ChangeLog
index 1e17d4785467..535e13b3e7e1 100644
--- a/dev-lisp/sbcl/ChangeLog
+++ b/dev-lisp/sbcl/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lisp/sbcl
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.6 2002/07/29 15:56:25 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.7 2002/08/09 13:49:31 karltk Exp $
+
+*sbcl-0.7.6-r1 (09 Aug 2002)
+
+  09 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sbcl-0.7.6-r1.ebuild files/digest-sbcl-0.7.6-r1:
+
+  Internal restructuring to allow both x86 and ppc to use the same sbcl ebuild,
+  it depends on the newest version of Portage (2.0.27).
+  
+  Removed sbcl-0.7.6.ebuild files/digest-sbcl-0.7.6
 
 *sbcl-0.7.6 (29 Jul 2002)
 
diff --git a/dev-lisp/sbcl/files/digest-sbcl-0.7.6 b/dev-lisp/sbcl/files/digest-sbcl-0.7.6-r1
index f2072228f5f3..89515df655aa 100644
--- a/dev-lisp/sbcl/files/digest-sbcl-0.7.6
+++ b/dev-lisp/sbcl/files/digest-sbcl-0.7.6-r1
@@ -1,3 +1,4 @@
 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/sbcl-0.7.5.ebuild b/dev-lisp/sbcl/sbcl-0.7.5.ebuild
index b859aa2155c9..1c6def59d613 100644
--- a/dev-lisp/sbcl/sbcl-0.7.5.ebuild
+++ b/dev-lisp/sbcl/sbcl-0.7.5.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Copyright 2002 Marius Bernklev <mariube@unixcore.com>
 # 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.2 2002/07/19 23:19:53 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.7.5.ebuild,v 1.3 2002/08/09 13:49:31 karltk Exp $
 
 DESCRIPTION="Steel Bank Common Lisp"
 HOMEPAGE="http://sbcl.sf.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="PD"
+	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
diff --git a/dev-lisp/sbcl/sbcl-0.7.6.ebuild b/dev-lisp/sbcl/sbcl-0.7.6-r1.ebuild
index 187be089da12..719fd4d98cb1 100644
--- a/dev-lisp/sbcl/sbcl-0.7.6.ebuild
+++ b/dev-lisp/sbcl/sbcl-0.7.6-r1.ebuild
@@ -1,42 +1,32 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Copyright 2002 Marius Bernklev <mariube@unixcore.com>
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.7.6.ebuild,v 1.3 2002/07/29 15:56:25 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.7.6-r1.ebuild,v 1.1 2002/08/09 13:49:31 karltk Exp $
 
 DESCRIPTION="Steel Bank Common Lisp"
 HOMEPAGE="http://sbcl.sourceforge.net/"
-
-# ugly kludge, note that KEYWORDS should prevent sparc
-
-TARCH=$([ $(arch) = ppc ] && echo "ppc" || echo "x86")
-
-if [ ${TARCH} = "x86" ]; then
-    BOOTSTRAPPER="0.7.2";
-elif [ ${TARCH} = "ppc" ]; then
-    BOOTSTRAPPER="0.7.6";
-fi
-
-BIN=${PN}-${BOOTSTRAPPER}
-
 SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	 mirror://sourceforge/sbcl/${BIN}-${TARCH}-linux-binary.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"
 
-# Digest doesn't work on x86
-KEYWORDS="-x86 ppc -sparc -sparc64" 
+KEYWORDS="x86 ppc -sparc -sparc64" 
 PROVIDE="virtual/commonlisp"
-DEPEND=""
+# the SRC_URI trickery needs this
+DEPEND=">=sys-apps/portage-2.0.27"
 RDEPEND="${DEPEND}"
 
 src_unpack() {
-	unpack ${BIN}-${TARCH}-linux-binary.tar.bz2
-	if [ ${ARCH} == "x86" ] ; then
-		mv ${BIN} ${BIN}-binary
-	elif [ ${ARCH} == "ppc" ] ; then
-		mv ${BIN}-${TARCH}-linux ${BIN}-binary
+	
+	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
@@ -44,10 +34,14 @@ src_unpack() {
 }
 
 src_compile() {
-	export SBCL_HOME="../${BIN}-binary/output/" 
+	local bindir
+	use x86 && bindir=x86-binary
+	use ppc && bindir=ppc-binary
+
+	export SBCL_HOME="../${bindir}/output/" 
 	export GNUMAKE="make"
     
-	sh make.sh "../${BIN}-binary/src/runtime/sbcl" || die
+	sh make.sh "../${bindir}/src/runtime/sbcl" || die
 }
 
 src_install() {