dev-lisp/sbcl: ebuild now builds from source exclusively

This removes all code paths related to building with the precompiled
SBCL binary.

1 files changed, 11 insertions, 52 deletions

diff --git a/dev-lisp/sbcl/sbcl-2.2.11.ebuild b/dev-lisp/sbcl/sbcl-2.2.11.ebuild
index 94fbc6f..160ecc7 100644
--- a/dev-lisp/sbcl/sbcl-2.2.11.ebuild
+++ b/dev-lisp/sbcl/sbcl-2.2.11.ebuild
@@ -22,32 +22,12 @@ BV_SPARC_SOLARIS=1.0.23
 
 DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
 HOMEPAGE="https://www.sbcl.org/ http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	!system-bootstrap? (
-		x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-		amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
-		ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
-		ppc64? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC64LE}-ppc64le-linux-binary.tar.bz2 )
-		sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
-		alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
-		arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
-		arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
-		x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
-		ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
-		x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
-		x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
-		sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )
-	)"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="debug doc source +threads +unicode +zstd system-bootstrap"
-
-# Restrict system-bootstrap to amd64 platforms for now
-REQUIRED_USE="system-bootstrap? (
-				  amd64
-			  )"
+KEYWORDS="-* ~amd64"
+IUSE="debug doc source +threads +unicode +zstd"
 
 CDEPEND=">=dev-lisp/asdf-3.3:=
 	prefix? ( dev-util/patchelf )"
@@ -55,12 +35,10 @@ CDEPEND=">=dev-lisp/asdf-3.3:=
 # bug #843851
 BDEPEND="${CDEPEND}
 	doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
-	system-bootstrap? (
-		amd64? ( || (
-			>=dev-lisp/ecls-21.2.1_p20221211
-			>=dev-lisp/sbcl-${BV_AMD64}
-		) )
-	)"
+	amd64? ( || (
+		>=dev-lisp/ecls-21.2.1_p20221211
+		>=dev-lisp/sbcl-${BV_AMD64}
+	) )"
 
 RDEPEND="${CDEPEND}
 	zstd? ( app-arch/zstd )
@@ -121,14 +99,6 @@ with_clean_environment() {
 		"$@"
 }
 
-src_unpack() {
-	unpack ${A}
-	if ! use system-bootstrap; then
-		mv sbcl-*-* sbcl-binary || die
-	fi
-	cd "${S}"
-}
-
 src_prepare() {
 	# bug #468482
 	eapply "${FILESDIR}"/concurrency-test-2.0.1.patch
@@ -184,27 +154,16 @@ src_configure() {
 	# customizing SBCL version as per
 	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
 	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
-
-	# set interpreter for Prefix
-	if use prefix && ! use system-bootstrap; then
-		patchelf --set-interpreter \
-			"${EPREFIX}/$(get_libdir)"/ld-linux-x86-64.so.2 \
-			"${WORKDIR}"/sbcl-binary/src/runtime/sbcl
-	fi
-
 	# applying customizations
 	sbcl_apply_features
 }
 
 src_compile() {
-	if use system-bootstrap; then
-		if has_version dev-lisp/sbcl; then
-			local lisp="sbcl --no-sysinit --no-userinit --disable-debugger"
-		else
-			local lisp="ecl --nodebug"
-		fi
+	# Use the system SBCL if it's available, otherwise build with ECL
+	if has_version dev-lisp/sbcl; then
+		local lisp="sbcl --no-sysinit --no-userinit --disable-debugger"
 	else
-		local lisp="sh ${WORKDIR}/sbcl-binary/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger"
+		local lisp="ecl --nodebug"
 	fi
 	# Bug #869434
 	append-cppflags -D_GNU_SOURCE