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

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

diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index b35d8fa2e3a8913bc04416a4f0a55bf106710d83..76519e580b0f70d00f359c74201e69019b031525 100644 (file)
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -1,14 +1 @@
-DIST sbcl-1.0.23-sparc-solaris-binary.tar.bz2 7907803 BLAKE2B 4be6831c196cfef505b411fa9ae0b9586f93309ce97fcd2b964abfb4175f00f7437da7859334973f2441592fc1a13cc5557044737659f5ef13998b593d623cda SHA512 d641d7859f0d60ce7dd684a0f21e62282a5a658ed6bb4d67d6b141b3ce22d9e27261efe7e5d0f752c30e467cf90d7c8a03ad2a04b3c60042f0ef0a4808a9c74a
-DIST sbcl-1.0.28-alpha-linux-binary.tar.bz2 7573824 BLAKE2B ab8e139adb4fbc0ac7b34457c3361b044d04d8d9dedba2008cb19220915900e2d1bf540b617c738145923d74fa28ab7d979fd0d1bf4b9d17c445dfb080731263 SHA512 85ceb4d3bf971777f5444a63cbabd88ccfaf16ed3b3c86cc5ea6cb3fd3189c4cd5a5ebbf785c97366afb7026604ffc34a1129936291deede5993056e158125ab
-DIST sbcl-1.0.28-sparc-linux-binary.tar.bz2 8032042 BLAKE2B ca4213ef00447d66406d1c752a1653fd628deba0e112f55a5625dad61da30c0be7c60fe4e84e8dcc9d9946db553ad544dc39b28d62124d8e3d6197943efc944a SHA512 cea1ba06f85169fca9fe3026813c6e7e8e8209b874e048b7bd63cb3a1c5bd7c829e8dbb2c486977e190a0390d28e4845938a9e84378f4f2f16f72bf0b6f45c80
-DIST sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 8217590 BLAKE2B 68da614df7d27ecf08a21603d4f172344c86e650176d238fe73d7756a626b694e2165b9157e53732730861d085902e5cc893b967073168fe3845cd2621668b87 SHA512 8118de56e448bce7a72b832e661eb4e2687eed675f88f766f7043c843a432e35121d9e6f9da8d22ac690c54bda0d55ecb07728748ce2cdd57320f49b4b812b86
-DIST sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 10038928 BLAKE2B b434f65e9e42341645ac91c8f35ffeb6d2d7f043544ca9af7c519a46df15cee6d2fe4d0a56c10643c6f263e8deb75bcfb00cc399d1f32c10d53c20a9842c45db SHA512 c271796f854fe884e0d8aa6504bbe2e6c078de1555fc9a823463640cfd8c793dbddcb3f32932788d84a41e2b8a085b95c97c13a15c43fc909dcaad18ce25f215
-DIST sbcl-1.2.7-powerpc-linux-binary.tar.bz2 9884585 BLAKE2B 1870da882fc5e466eaf5e96ed46aed600660bdfe836eabe145cf9ea4713e537a7d45dd76538d899801d0e3ea944c4ccfff1c9688fc695890bb4cac69135ef046 SHA512 7b9fef12d3d6397adec6a0c26d1431a18b8d91b5bf009034eb2501de9fd60dc04dd2e3cd2d9feb9204d4631360aea88ba07a9ad75dad0767b5dcc5e62e84e790
-DIST sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 10438955 BLAKE2B ca9cd3a55873c648940793ae9fb92dde5e4569b7392932771b31dc71da380267556b3ceb8b099f62576b76d77395123735232c43c0ed1f934d1e004a6194d0fa SHA512 9566cebf8fc29ead1f919309e3f98aeb618e97b34c80f53d1f739f1a3f4ef4cbaebd1c67f0b32172a0cdf14dc405eb75d0e916dedf3b8a758cdec2368d25f5c1
-DIST sbcl-1.2.7-x86-solaris-binary.tar.bz2 10351529 BLAKE2B 9b7324c8177856c6024220ce71070a1a51b93fa9352fe692c3fd5afa9b6cdcbb361c54e354ab1cc1153e6bf15cb0c5fc267c3da03addd5d35fbec840f72a7c06 SHA512 b30d40f0095bb43719ba2e1a619f53fe5f0bccaa08a35481bc5feeb0dd5b540018a9ec9f61799de89991a85750577922cb4e56db4d7dab8f07e18bbc643bdad1
-DIST sbcl-1.4.11-armhf-linux-binary.tar.bz2 9767589 BLAKE2B 2949338bc19973e0ca38f435caaa4c991a6c86d70dc092a4f1b6ec3eefa47af76f2a0c3fd8a4f8004127f4b8b3666a5cf4260b6ab56802308880067e4eaf8568 SHA512 297edddc36e9b9de080f9e25faa323e23877af234104b4b7e0fe2b74f0dd117d9cf0caa87b79718a8b071bcb5e97c8118f1d11af0e4aba2a961beb40c4dc99cb
-DIST sbcl-1.4.2-arm64-linux-binary.tar.bz2 10578821 BLAKE2B 1cd25c548be0f1b7ec01edc3bee7fe6c2aaf07b7bd1fc55d408dee7ac95e8f3761a194bf9e8efb734179a7eff04cdae2fe5ba4a9ba5ab06f7322ac1550d142cc SHA512 39bbd735b242aa0bbac05c6f4dbe28cb45e01684db7e5b4f1e51f995a9f9d5b484f63cc4243f472f72b3b1e6c4cd2268a7e812b15426eca5cf9a1fede10f44bb
-DIST sbcl-1.4.3-x86-linux-binary.tar.bz2 10227185 BLAKE2B 6d77c4f4177cbdb72fb9bab0da5bd91e0aa8deafffd238818a2551332f0ab246715d9489b5c1156f3481aa7fb79d161a988404620fc09fe86ff927543a1ee678 SHA512 41cd63d61dd7c46370341dce39a362287a23b528bfebe8e5571614aeefdea03d318207d25562e995db9ccedb6c1f50ea4d66627721f0fd9486e99440126e6a38
-DIST sbcl-1.5.8-ppc64le-linux-binary.tar.bz2 10025597 BLAKE2B aac079e3585ebe9d5b610cf096e958edfd4410361b0d96b2fa88a285cbdce4133d89e1ddf0cf6729d43d6c3057365d07a3d73362f906fd8798b76c993210a8e5 SHA512 443ab604caa768c756f3322d7c599142a50227914bcd6be12434432daf1e3d5af0740d1ebdb166b856cc77ddf02451e29fcef9e29099f7bc4fb49ad61db17674
 DIST sbcl-2.2.11-source.tar.bz2 7290281 BLAKE2B 5242127e2e9ee384f96cb4a6a7c3db30a4ef20885f1d28edeb8a73ef46275f19a99a801bd3be9fb424fdfaa4c7c5915061f3d87e043388f0d5b73c53648f53d0 SHA512 5c13d9d1305903d0c99b27485224c97f6e8d118afd24711afc7f80f92884352fff8cb075c36c7b752c79a09136206b6a8bcd7fbf8cbe979bbce777b978a1a594
-DIST sbcl-2.2.11-x86-64-linux-binary.tar.bz2 11651831 BLAKE2B 4907159286054642145e26c9739d2becf6a6e01788ee0a203a6444fbdb2a6ea3f760c22cca373151297a366af3d022daa73bbe0191f28d3dc03544285882b509 SHA512 d5786c3b893dc264c611c19c5bd24e919ed1978746a14c96e2ccf4659953d26b112868342f8a5db2df6bd1c30890ecf77627dbf135416564add94cd904017474

diff --git a/dev-lisp/sbcl/sbcl-2.2.11.ebuild b/dev-lisp/sbcl/sbcl-2.2.11.ebuild
index 94fbc6fb15895dd8d104f5c84a19e79cf749b83b..160ecc729cae89d67ed4ebe482c44127fde3ccde 100644 (file)
--- 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