gentoo resync : 13.11.2021

13 files changed, 90 insertions, 524 deletions

diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index e9726d030798..76eccd30cf22 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/ecls/Manifest b/dev-lisp/ecls/Manifest
index 8d6dd501cf60..f842dab04b4e 100644
--- a/dev-lisp/ecls/Manifest
+++ b/dev-lisp/ecls/Manifest
@@ -1,11 +1,13 @@
-AUX README.Gentoo 632 BLAKE2B 3067b3165fb18fb2ef83a70513e73df3a10b94d97920931a15764e1f01d62db5c908fffd9bde06d1cee7b507884470025189aa3e4ab3c2273246071922d95744 SHA512 df0640792271d01f84437645fe8854740b17dd349e36b76711c55f6f4fefa7d2fd810176ece2a25d8cab88192f31a6df38e67dfcb7992857e5d038ad74b11c8a
+AUX README.gentoo 565 BLAKE2B 8e260676fa3c8fab086035116ae6c81cbea821a82a7de7fbc80fac28664deb26c154eb23fe92f704ebe13f0e61a095f063cfefd0100a48f97e40030fa743465e SHA512 57598ef3411fefd766393640e550b704a0e5dca9f808007d34799273fa34858c3e9eb74fcd805611c5aa9914326faaaa78be5fa65bca63a8f7acd717bcf389b2
 AUX ecls-16.1.3-build.patch 341 BLAKE2B 6a3b588010b66b6e060dfa29642bacea08e77e64cb9674c5677da69c3f3d7668e7893a16c67980b6ea87642c9961b475a29aafdf786afb3903ac4a6552164f30 SHA512 0af8f0704e79197a4d7857ae11f20f0086f2e1c3d2578ec613c6ce5df742e35b9676399d8f724528781a530426425a977646ec75b317f01609d17d3a98b04ef4
 AUX ecls-16.1.3-headers-gentoo.patch 446 BLAKE2B db2adc332867435e799e2779fbad5ebb175b247db5de7ab436da6631d31dc8d6059736dbb41be6fd91b0fd8116ee84e361772ae5da29c1448627bbeb07212646 SHA512 a58b39deb9f8577da66216fd6902803019751171e4415149a89bdb72f13a006e5f6d9bede2312521162a0895340c1a1ce756b09bc0a18dccceca3e4c0950a7cb
+AUX ecls-21.2.1-donotcompressinfo.patch 1023 BLAKE2B 6a1794bbba48c35ab21976bdfabadfd6baa20adb1e429bd50257add3058af2e0d93ade4307acd29e5a4335a96a728a24ce4ea59cddd3db50af4c963acd04e3a7 SHA512 dae180e0d41bc1e99cd11347625a48e3f55d7565cb269cacaf99b30e3c1bc9d8622dc9f738c900fd217cd5086d7a0f29f0ff05f2ab579af60835a31f5b68dfdd
+AUX ecls-21.2.1-ldflags.patch 468 BLAKE2B 78b515f6ca6be7283bc1323d361a49a3712efe1d3de910b99c4c4156117696f19a3e2ca1d90b7613b22b4c67e23391e416b52f0deff7fe4c1bf70fe0c1b74452 SHA512 083da13a5ee67b8951b075f0bde7d90211c81b38bc8cffee3c96b8c3023c4ece157b8f00bcbd0e1be4dcc7075030d98b0d78f22c42412ef2d7b50153bf8cac33
 DIST ecl-16.1.3.tgz 7459212 BLAKE2B 4f9d6ad2bd92ede4b5b20857b95a48bad5002049e83611865d9cf13e7131adfaad147a31f22f9a3f6a2c06e46db1996aa98135c28b97bf5ef16e17b5eba0dc4b SHA512 5d743f422f6bc24671abf4c739cde8273d08f056906a1ef8aed5145c703b6d52c7fa4b5e0be8c125f32240c20ce053007786bb3ae81cc34d47791f6fae0819c1
 DIST ecl-20.4.24.tgz 7815444 BLAKE2B 11b908b028beaaf9243dc0f2ceaa178918ae4763a907af4424ba21e6bdf3474aaa36c96e9a3ef1ce780e50649c2453b52b7c46b5e9dc1453281dc522417ad78c SHA512 4c127e0d6a99e38f3a926135ae92d92899058c5a5e99b90f28d4a47b58d94ee89a958cfb4bfd2b9e6ad7b3c57867cd13119b2a4dd6bb1aa3bb5ec42a96bfa788
 DIST ecl-21.2.1.tgz 7875088 BLAKE2B b8c05fab8ce5892ad9df830e3ad230e1c646bd30bc35243703ace18f1bf963057b132d980c74b364ff30a5b776a8f161e71bfd69d7908970811ab3dddbab1aac SHA512 0849bebe1a8073ea8027cfb172c1d7781d43adb6a8b80585bd08d5674b80422d1648b6fbf718cc17a51c5de6c696514523b4d13a82e8113bf9365c95d3c28648
-EBUILD ecls-16.1.3-r1.ebuild 2354 BLAKE2B dd7686cd0ea827c3afa9acf3ec51f2000f163af1ffbc7cfdb4f1933e89fe736affc72611317ac21629b67e67b6309c7502804fef5cb018dc91a83f51dee501f4 SHA512 ba4b1c237099a66eada955cb030cf30923d82f8a4b7dec5f479ea99b21bf6496827e2e33744a45e722c75a1bc1bfc131729ab8fe5a4189ecc20425f4355c9b1e
-EBUILD ecls-20.4.24-r1.ebuild 2385 BLAKE2B 8381b26e42f047356d04e617a134d5df0e6da7ab2ab890378ffdefb9edc4fdf0c640417a6dca70c1c144858500b7770bd79748614c9b7aaf7d7b1908019fa71c SHA512 6aca45cbd7b782da8ee26febba631d618ffe9d08b7197f70cb9f0cc0167b7497a29224e2d8c6f0bc0a7033f0a900a3582166b1bc74607e32cd588fb421bbfc50
-EBUILD ecls-21.2.1-r2.ebuild 2073 BLAKE2B 681720e0a5b5434c3156ba4ef9f30cae8d7c344b61276fb0fccddda67076abda1c4fd9dbe8d55d26907de9f95bb6a5d9c95ebd6f3ef869903fcc50fc67a1df75 SHA512 5affced0ed23eb091eaab59b5c6e004b1ac4bddfdacc6d5871953fafd9c7e8357162d90aed60e4d61274d034b416a5e13824bb9d664aab571b1e10b69afb0b4c
-EBUILD ecls-21.2.1-r3.ebuild 2032 BLAKE2B b8ccb00c98f3795e63843b9e1d27ef09ebadcf152796302fff5b11290f124eae9df0934082f2a0ace4d95e4850f1985c03595b19031b84ed8ed4da682a73f6d5 SHA512 55c8925d7f01f78d723358685e4115488f3b176cbee5140e773918e95f55889b66e4464ff2f5c1532cd915119441cb28100b705385f82eea92de32f773d24222
+EBUILD ecls-16.1.3-r1.ebuild 2354 BLAKE2B 96d5b7639e06d1b7b4e8fe5f340cb0f670f0be388c45982eee0db0349ea31e1939aaf7a122b303b3b280c01acc2fad20984a2a2d927c39f7c4a6db184a19cfa8 SHA512 272b1635c3caa74f0d701d37cdbe1da78987e47fb8e80c13f84b6e6aba2875c53fe463f99a0f9b9b9979deffbb039bc11ae252b49f8aa424fab1c3523f76aca2
+EBUILD ecls-20.4.24-r1.ebuild 2385 BLAKE2B 1f9965505be4b5b9fe41115b9fc771952c001ea0a1d74971a820813de7356ef2d6a4d531f3a7342dd26fe9ea8b2187ccb246a040eff2996ee5d84a68e37bc943 SHA512 b0f450e81f50305e15fd8e9e9ac65157efe975982ecbcbb93cc3bc4e759e94aef3e1a86486e88fb26207af6941f2caf1237b096ab0448675bb69da0b236325f8
+EBUILD ecls-21.2.1-r3.ebuild 2032 BLAKE2B a04f61b5fad3270086e20349dd777f1d9db6bcb2d4b0aecf98eae6eba398fc7d404dbc2fe9cf5c299a7c406b94b04df891dc7a72f3ddf8af8147ff4a46234182 SHA512 718df11e0cdfc8dbea9ca2b52f552a50d50086fe12e52ee0d8fa779dbb41bf56205ad88b98c4e12d6127f18c09d326ec2804b3b92f165132666b155db3e39ed6
+EBUILD ecls-21.2.1-r4.ebuild 2072 BLAKE2B 9a8f27f416a0cbdbfa3c10c94668267850d2ccd9f2519a1d763b38f75ed1e2a75d29690867f53be0064fa1db6fe2bb79b2c99bbc16c8831ed2c88a2b81f2fde4 SHA512 984c4632e4848a52a6b9dc9c676f04a490c600345749ae4b74f976c834c1505deaaaa3c8d29ec83fc388d35b7a142b1046b282f1ba6ad9f8a8bfaff9e161d2fa
 MISC metadata.xml 902 BLAKE2B cab2b4ab8766434eeb2c455b7119f80360dde182e3bfa75fb900d0ea32497a0758474337c5c9b33b68ea2fcd82b8745868c6da50ed79ae0af4a6f287c3d0fa06 SHA512 d1663bde77b96bf708f0cb2b5c71bfc2d6a99e830030c66eba9d097f61a32bae8b5c31cbcc4c6a1654914e662a04c4a9beaf89337372b858329bf349bac5ef97
diff --git a/dev-lisp/ecls/ecls-16.1.3-r1.ebuild b/dev-lisp/ecls/ecls-16.1.3-r1.ebuild
index 864fb47fc121..4109b67d44f7 100644
--- a/dev-lisp/ecls/ecls-16.1.3-r1.ebuild
+++ b/dev-lisp/ecls/ecls-16.1.3-r1.ebuild
@@ -88,7 +88,7 @@ src_install() {
 	emake DESTDIR="${D}" install
 
 	dodoc README.md CHANGELOG
-	dodoc "${FILESDIR}"/README.Gentoo
+	dodoc "${FILESDIR}"/README.gentoo
 	pushd build/doc
 	newman ecl.man ecl.1
 	newman ecl-config.man ecl-config.1
diff --git a/dev-lisp/ecls/ecls-20.4.24-r1.ebuild b/dev-lisp/ecls/ecls-20.4.24-r1.ebuild
index b3ab59498a8c..0c2c641c4ac9 100644
--- a/dev-lisp/ecls/ecls-20.4.24-r1.ebuild
+++ b/dev-lisp/ecls/ecls-20.4.24-r1.ebuild
@@ -88,7 +88,7 @@ src_install() {
 	emake DESTDIR="${D}" install
 
 	dodoc README.md CHANGELOG
-	dodoc "${FILESDIR}"/README.Gentoo
+	dodoc "${FILESDIR}"/README.gentoo
 	pushd build/doc
 	newman ecl.man ecl.1
 	newman ecl-config.man ecl-config.1
diff --git a/dev-lisp/ecls/ecls-21.2.1-r3.ebuild b/dev-lisp/ecls/ecls-21.2.1-r3.ebuild
index 87a427e86126..c6913c125b73 100644
--- a/dev-lisp/ecls/ecls-21.2.1-r3.ebuild
+++ b/dev-lisp/ecls/ecls-21.2.1-r3.ebuild
@@ -79,7 +79,7 @@ src_install() {
 	emake DESTDIR="${D}" install
 
 	dodoc README.md CHANGELOG
-	dodoc "${FILESDIR}"/README.Gentoo
+	dodoc "${FILESDIR}"/README.gentoo
 	pushd build/doc
 	newman ecl.man ecl.1
 	newman ecl-config.man ecl-config.1
diff --git a/dev-lisp/ecls/ecls-21.2.1-r2.ebuild b/dev-lisp/ecls/ecls-21.2.1-r4.ebuild
index 2c6120e14edb..0f4009c48622 100644
--- a/dev-lisp/ecls/ecls-21.2.1-r2.ebuild
+++ b/dev-lisp/ecls/ecls-21.2.1-r4.ebuild
@@ -1,39 +1,39 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit multilib
-
-# test phase only works if ecls already installed #516876
-RESTRICT="test"
+inherit readme.gentoo-r1
 
 MY_P=ecl-${PV}
-
 DESCRIPTION="ECL is an embeddable Common Lisp implementation"
 HOMEPAGE="https://common-lisp.net/project/ecl/"
 SRC_URI="https://common-lisp.net/project/ecl/static/files/release/${MY_P}.tgz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2 LGPL-2.1+"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
-IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode +libatomic X"
+IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode X"
+# test phase only works if ecls already installed #516876
+RESTRICT="test"
 
-CDEPEND="dev-libs/gmp:0=
+RDEPEND="dev-libs/gmp:0=
 		dev-libs/libffi:=
-		libatomic? ( dev-libs/libatomic_ops )
+		dev-libs/libatomic_ops
 		>=dev-libs/boehm-gc-7.1[threads?]
 		>=dev-lisp/asdf-2.33-r3:="
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
 		app-text/texi2html
 		emacs? ( >=app-editors/emacs-23.1:* >=app-eselect/eselect-emacs-1.12 )"
-RDEPEND="${CDEPEND}"
 
-S="${WORKDIR}"/${MY_P}
+DOCS=( README.md CHANGELOG )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-16.1.3-headers-gentoo.patch"
 	"${FILESDIR}/${PN}-16.1.3-build.patch"
+	"${FILESDIR}/${PN}-21.2.1-donotcompressinfo.patch"
+	"${FILESDIR}/${PN}-21.2.1-ldflags.patch"
 )
 
 src_prepare() {
@@ -43,20 +43,18 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--with-system-gmp \
+		--enable-gmp=system \
 		--enable-boehm=system \
-		--enable-longdouble=yes \
 		--with-dffi \
+		--enable-libatomic=system \
+		--with-defsystem \
 		$(use_with cxx) \
 		$(use_enable gengc) \
 		$(use_enable precisegc) \
 		$(use_with debug debug-cflags) \
-		$(use_enable libatomic libatomic system) \
 		$(use_with cpu_flags_x86_sse sse) \
 		$(use_enable threads) \
-		$(use_with threads __thread) \
 		$(use_enable unicode) \
-		$(use_with unicode unicode-names) \
 		$(use_with X x)
 }
 
@@ -66,22 +64,24 @@ src_compile() {
 		[[ -n ${ETAGS} ]] || die "No etags implementation found"
 		pushd build > /dev/null || die
 		emake ETAGS=${ETAGS} TAGS
-		popd > /dev/null
+		popd > /dev/null || die
 	else
 		touch build/TAGS
 	fi
 
-	#parallel make fails
-	emake -j1
+	emake
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
-	dodoc README.md CHANGELOG
-	dodoc "${FILESDIR}"/README.Gentoo
-	pushd build/doc
+	readme.gentoo_create_doc
+	pushd build/doc > /dev/null || die
 	newman ecl.man ecl.1
 	newman ecl-config.man ecl-config.1
-	popd
+	popd > /dev/null || die
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
 }
diff --git a/dev-lisp/ecls/files/README.Gentoo b/dev-lisp/ecls/files/README.gentoo
index 9bb82f220097..c95b6cb75167 100644
--- a/dev-lisp/ecls/files/README.Gentoo
+++ b/dev-lisp/ecls/files/README.gentoo
@@ -3,13 +3,11 @@
 Gentoo GNU/Linux specific notes for ECL
 ---------------------------------------
 
-This is the README.Gentoo file from /usr/share/doc/@PF@/ directory.
-
   * The Gentoo port includes a patch to ECL's installed header file (ech.h) so
     that TRUE and FALSE are not redefined if they're already included from
     elsewhere. This makes it easier to use ECL with other software which defines
     those C preprocesser symbols (eg. glib-2.0).
 
-If you encounter any problems or have suggestions, use http://bugs.gentoo.org.
+If you encounter any problems or have suggestions, use https://bugs.gentoo.org/.
 Please don't bother the upstream authors unless you are absolutely certain it is
 not Gentoo-related.
diff --git a/dev-lisp/ecls/files/ecls-21.2.1-donotcompressinfo.patch b/dev-lisp/ecls/files/ecls-21.2.1-donotcompressinfo.patch
new file mode 100644
index 000000000000..722e5dc7483f
--- /dev/null
+++ b/dev-lisp/ecls/files/ecls-21.2.1-donotcompressinfo.patch
@@ -0,0 +1,35 @@
+diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in
+index 5660f41..c2aadbe 100644
+--- a/src/doc/Makefile.in
++++ b/src/doc/Makefile.in
+@@ -15,7 +15,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_INFO = @INSTALL_INFO@
+ mkinstalldirs = $(top_srcdir)/bdwgc/install-sh -d
+-INFO_FILE = ecl.info.gz
++INFO_FILE = ecl.info
+ MAKEINFO = @MAKEINFO@
+ MANUAL_MAKE_TARGET = @MANUAL_MAKE_TARGET@
+ MANUAL_INSTALL_TARGET = @MANUAL_INSTALL_TARGET@
+diff --git a/src/doc/manual/Makefile b/src/doc/manual/Makefile
+index f82c287..2ff67e0 100644
+--- a/src/doc/manual/Makefile
++++ b/src/doc/manual/Makefile
+@@ -5,15 +5,14 @@ FILES= *.txi */*.txi figures/*
+ all: pdf info html
+ 
+ pdf: manual.pdf
+-info: ecl.info.gz
++info: ecl.info
+ html: html/index.html
+ 
+ manual.pdf: $(FILES)
+ 	texi2pdf manual.txi
+ 
+-ecl.info.gz: $(FILES)
++ecl.info: $(FILES)
+ 	$(MAKEINFO) --no-split manual.txi
+-	gzip < ecl.info > ecl.info.gz
+ 
+ html/index.html: $(FILES)
+ 	$(MAKEINFO) --html --css-include=ecl.css --split=section manual.txi
diff --git a/dev-lisp/ecls/files/ecls-21.2.1-ldflags.patch b/dev-lisp/ecls/files/ecls-21.2.1-ldflags.patch
new file mode 100644
index 000000000000..5ac4cc5ea793
--- /dev/null
+++ b/dev-lisp/ecls/files/ecls-21.2.1-ldflags.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/723162
+
+--- ecl-21.2.1/src/c/Makefile.in
++++ ecl-21.2.1/src/c/Makefile.in
+@@ -104,7 +104,7 @@
+ 
+ $(DPP): $(srcdir)/dpp.c $(srcdir)/symbols_list.h
+ 	if test -f ../CROSS-DPP; then touch dpp; else \
+-	$(TRUE_CC) -I$(srcdir) -I@true_builddir@ -I./ $(srcdir)/dpp.c @CPPFLAGS@ @CFLAGS@ @ECL_CFLAGS@ -o $@ ; \
++	$(TRUE_CC) -I$(srcdir) -I@true_builddir@ -I./ $(srcdir)/dpp.c @CPPFLAGS@ @CFLAGS@ @ECL_CFLAGS@ @LDFLAGS@ -o $@ ; \
+ 	fi
+ 
+ $(OBJS): $(DPP)
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 77f2b94b279e..69d08e4c8e6a 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -32,18 +32,12 @@ DIST sbcl-1.4.2-arm64-linux-binary.tar.bz2 10578821 BLAKE2B 1cd25c548be0f1b7ec01
 DIST sbcl-1.4.3-x86-linux-binary.tar.bz2 10227185 BLAKE2B 6d77c4f4177cbdb72fb9bab0da5bd91e0aa8deafffd238818a2551332f0ab246715d9489b5c1156f3481aa7fb79d161a988404620fc09fe86ff927543a1ee678 SHA512 41cd63d61dd7c46370341dce39a362287a23b528bfebe8e5571614aeefdea03d318207d25562e995db9ccedb6c1f50ea4d66627721f0fd9486e99440126e6a38
 DIST sbcl-1.4.8-x86-64-linux-binary.tar.bz2 10353701 BLAKE2B 5b56f46fbdb87f015ed1fe103b6caaf43d2d424b45e2574e306b3d3cbc3c7bdfa48847a2e6d7d819e6bf4b59fa02ea01f9ce6b023802ae6f91fc7f56e5a260de SHA512 f3cb3c30dec1b7e6ac0c1b67de26192723871f8a8d543a41d7c4d04b0813fd7da1043433237b648a2c23f73169fe38f2ec3a3c2bd412eb4c9d36ed929c40f27d
 DIST sbcl-1.4.9-source.tar.bz2 6051607 BLAKE2B 8abcaf73233ea1a23d47987b16554636dcf94acfbc7ab731f0730fdb4a8176593fb3ab52d9b25b3dd56753cd984f7e0eddb1585a142eb7ad1aa5e3e03d7b0ca9 SHA512 e0248f460f9737d47653dd520732062d2637813b550df356ecc90aa6d21fbdd74f03182d1e890c09c1da742f7d57b4fbd04a4e6dc36999aca51bb6c2952ac236
-DIST sbcl-2.1.5-source.tar.bz2 6566902 BLAKE2B 3e98a3d996120baf7cbddbe595aacc07615cd8471e9bb87fc73e8cf0621988e5dd549a58425f7c569588833f9a4b1bbe43af40472fa9a287a3780e40e86536bd SHA512 5e208b3a1b3ff1a589c9ae0398e40086d979342c11fa7bb251797d0266618801b525dddb6998cebae3fc2a88547f7a71bdc43c5418f5edc2cf9bf699ed725334
-DIST sbcl-2.1.5-x86-64-linux-binary.tar.bz2 10155269 BLAKE2B 8456fbe477d6afc4becf4ec2fadb296e40532f02ea0ad5de61891cf68384450028e85e52d44164323c1a40b5f67c591114cd1a077de305b3f1b20484310bf5a6 SHA512 cb90c2bc6bed5f5f3af9831cd520580d4e8207ee45ae3572a17cf0da21563ce8e03d1c0e22099d05b750e0f76b2a0701918c80e25e2b7a9846d8cc5169f82f7c
-DIST sbcl-2.1.6-source.tar.bz2 6579274 BLAKE2B bb3c915b1f3889575065d0737eaadb5a19b00748ab508d90bb30218c8ef09527ee2533271700b68fedb28030727cde86aaa7b7ed1d2e6b02cecc79b6e6ed0376 SHA512 fa8088e5275451863b9aa908c0718e03801340fc87c514caed8a67df6fd443a0cdc1eb90f90605c0de757c4be5e9e502a944c4856fea98d719f5135457ca41c7
-DIST sbcl-2.1.6-x86-64-linux-binary.tar.bz2 10106836 BLAKE2B d362f22402cfc183b6b8a9251e20d51672a4870bbc427e9f718bcfb02ae3e459f426b8f4bf4b568c864b56602e5d7b285ab5f1c5aece397385e17439934d23fa SHA512 3382829bfe6bd85b00eeaed04830de7e966d014dd626c7d5635c916a4fa9517f4404af4e5498cc6b4b8e00db9079e350db7cb6860c0c4a4921e99ba221f2ba6e
-DIST sbcl-2.1.7-source.tar.bz2 6622050 BLAKE2B df464999381a4b2e563606a4a25bf00b72b74b3964e548f7bb4de6a43e4f6c3d00eefdc2b0c7e673bd58aff02725ae9af001b46a859320cf3c53b6f882eb44ce SHA512 52996bced71d003d7337c237b6078c6d7cece71a0e69ba77e2c735b9d0e92204e50a1e5eeaea946ca2adcc9c3a334b14693735817c0a19a4fbb4caf9cca3b52b
-DIST sbcl-2.1.7-x86-64-linux-binary.tar.bz2 10117534 BLAKE2B 613356710b2fc80bd00f49ba0da1fd3f0a6fcf25b1343f70957800a41c46e89468646fa1800566fa06217c25976875a7c10910cbd279d0294c7297eea10cb991 SHA512 32b9c87d21d3bb431a52d36b8fb390e9f4e42bc2803a970a5bbf655e57341061385fa5465a70511c92fdfa4e69c683c2ec056768c4e44dc9305e1b2260be307a
+DIST sbcl-2.1.10-source.tar.bz2 6680771 BLAKE2B 9d427c2c4330ee9f675cad27e8a37b20f010f900a840dc7e878d0f2d703b7a0f8704b8ac3be1d6e191ffa933338702039e3c3d105160e3c8468c99bcd703989b SHA512 83c4064b0b99e673221abbc5fd8d6c463dd2368dac7438215f0b0f847fab3999f470d15fe5a6ed504983b80d9160771c3ccb1485e4c3c973be03634ca0d7678b
+DIST sbcl-2.1.10-x86-64-linux-binary.tar.bz2 10185352 BLAKE2B 48f55807411f4614b40c447081f45597ad8ec720b1903ff57625093c9fa3b915e7f0fa31a7295d5594c5bedd2ed2da84d498df99eaa10e85761cca07c7d30f6d SHA512 557323cf0dfc5bb0a1c4908e5b46371e6f01ad8c05513d03db3e66a4e4ad0ec5bd3c57fed252209dffb8bc2179404f7626a196af19a087187ad6c4f5ba9408bf
 DIST sbcl-2.1.8-source.tar.bz2 6663139 BLAKE2B 3a1bdadfcda284c6f7c909f996bc9f9a5d0a1132a55b68d435d89138b2d144f48848d33f1c38d2b7728711660b59a0ee70e3d76f88f6528dc37e3661c7621f62 SHA512 0e2d839d262cb60b35a20558bb64b5bf4b4158dd8008c1efef74b99e300e4412b20fd9af99633ad5a0cc3c91bbfc34405ce7012d95195517d6b6f425904fb4d3
 DIST sbcl-2.1.8-x86-64-linux-binary.tar.bz2 10118495 BLAKE2B 5fd53f4e491018f4abd98ef3026982d80777f8ef38e046078679e452a00b3fddecf65139f69d1c43e21c13e1ef9b061c8d89c09de2454376a0a4e9aea2ec90f0 SHA512 9415290c1cd7d4fcb2f4da689c341af3d52346e25059a118a06fc2dd24f622ed0a7f664adddba3adb2b0ceb07c6a49a3ac9dbacf2e326d5813c44d330a6fe258
 EBUILD sbcl-1.3.11.ebuild 7866 BLAKE2B 88e6b869fe4655f2a971a53213844fb08a4c6b59bc42a57dd2616c39df93e9721304f6a94b457ed3ac07ee7abb1f8321a747901f42f211b87e6a5041624c4e90 SHA512 41dfd91a56ee2dd4e2421c4fac03cd4263f4fdaee60db9e81745ec552199a7a97083194f72e1585bee7241e593a10eab3c57cbd300858e1752b909412ffca1d7
 EBUILD sbcl-1.4.9.ebuild 8213 BLAKE2B c227898102be21a2ef44b906e4316f07ad6711ef4bfd662fe391aaebbe6a515158fd41a05db644604f6fd494c04af7cb08b93e4a1dd40aa146ccbe08115be247 SHA512 674cfadbccca53a1cc4f665aa935cbc7a65cefbdd70bfb3f9b14f3b813706b2b5273380e67ca4a76b81aaa5363423feeb74fafe423121ff7e8c7427b48cc39c1
-EBUILD sbcl-2.1.5.ebuild 8233 BLAKE2B 1b36498a792e2a3facbc3d050cfe68097b2e69df4d08e036a4f2fa1f5927dd0279ceed72248ffc2afe5df3cb1a9c7dc87fb57603465316e1929a7a04edead55a SHA512 90f1aa10baa49c48a3b73b1ecfdc597b2bffd58fde896184b82c0045761da7d642b069116066145d335593ce28936c50a8138f20ecd649cbe01be8d59eaba5fa
-EBUILD sbcl-2.1.6.ebuild 8233 BLAKE2B ca5778c4c9f0606e9e908e6cc797e67bb9ed74aa162932fd891492eb0366a9be5214335fcd89813fe9bb3fe5e23bd33088e364cd15b6ee585b1a1302191b47bd SHA512 bd0fc6d0ff1d7454333cdce372e4bbba03abbc7d08aad47732ca0bbd9a0dd7b3b5957449206b63585bddf5150448c8433ba133aa585e431cb055d64e73e23602
-EBUILD sbcl-2.1.7.ebuild 8233 BLAKE2B 556fc1326eebe42af01cbc7fc71f3c4adf0b6bcd4d0bcdeb9534d9b7d7fcc8e3b214ab8ca1f114ecfe758fe8b98bddd74a1fd0effc754011223b092936aae9e5 SHA512 20f441352cf86e6875aa58fc9e9e67d185d23063b436fca0e1daed85e6e62e6cb65b8227b4098b9b97c8924d9866de131d08b2fde381c0f5e4760c10825f7a7f
+EBUILD sbcl-2.1.10.ebuild 8235 BLAKE2B a2a46212aa7e780880bf719c3de825b85f3000f7907ded5e09dde35568e70c2cf8459a9bdaad3685701ec27e7e5753fc45ee8c09be9e115952e95404c9f5ea8a SHA512 d41bbf38261d95cc12c823173485fb8f6e32222ab9e41eb641ae5280921f856af85e4a1c72ac817b98147d251713fedb573b4015847a3cd85d0f66e0b29ed6d3
 EBUILD sbcl-2.1.8.ebuild 8233 BLAKE2B 821930297b7257d4f009b9866e8e3ef28000ff1cc13c81d2986570f98731c2c0f7173975a2ab58e8aeda569178eed25c4bcbcb75225889b54ec92b6a796755a1 SHA512 7ceb8d67cc5daa95907623ed09dc8e01dacf13774d6c733d0b70c39a86a8b5ce2b6dba1a0b61aba2f9276400b801256fd40c8592bf952e65a4cb4f05183bcc12
 MISC metadata.xml 1185 BLAKE2B fa1ce4556cb77fa154914a28fdd2e5dcec45498961875461f465978de4467ff16a329bfdd8a0fe161ba579639808b48af76bcd6fd22165a73d803983e6c10c91 SHA512 51bda1487ee9f95ba0e343f2990f465524590a88baba942819339697b446db3c7054d08791579c77472654f69e3f0fed8077ef2f0a9cb2314067fceff4c2c67c
diff --git a/dev-lisp/sbcl/sbcl-2.1.7.ebuild b/dev-lisp/sbcl/sbcl-2.1.10.ebuild
index cee2be629969..47cda449fe43 100644
--- a/dev-lisp/sbcl/sbcl-2.1.7.ebuild
+++ b/dev-lisp/sbcl/sbcl-2.1.10.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit multilib flag-o-matic pax-utils toolchain-funcs
 
 #same order as http://www.sbcl.org/platform-table.html
 BV_X86=1.4.3
-BV_AMD64=2.1.7
+BV_AMD64=2.1.10
 BV_PPC=1.2.7
 BV_SPARC=1.0.28
 BV_ALPHA=1.0.28
@@ -41,7 +41,7 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solari
 IUSE="debug doc source +threads +unicode zlib"
 
 CDEPEND=">=dev-lisp/asdf-3.3:="
-DEPEND="${CDEPEND}
+BDEPEND="${CDEPEND}
 		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
 RDEPEND="${CDEPEND}
 		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
diff --git a/dev-lisp/sbcl/sbcl-2.1.5.ebuild b/dev-lisp/sbcl/sbcl-2.1.5.ebuild
deleted file mode 100644
index 31722af3e2b1..000000000000
--- a/dev-lisp/sbcl/sbcl-2.1.5.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib flag-o-matic pax-utils toolchain-funcs
-
-#same order as http://www.sbcl.org/platform-table.html
-BV_X86=1.4.3
-BV_AMD64=2.1.5
-BV_PPC=1.2.7
-BV_SPARC=1.0.28
-BV_ALPHA=1.0.28
-BV_ARM=1.4.11
-BV_ARM64=1.4.2
-BV_X64_MACOS=1.2.11
-BV_PPC_MACOS=1.0.47
-BV_X86_SOLARIS=1.2.7
-BV_X64_SOLARIS=1.2.7
-BV_SPARC_SOLARIS=1.0.23
-
-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
-	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 )
-	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 )"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="debug doc source +threads +unicode zlib"
-
-CDEPEND=">=dev-lisp/asdf-3.3:="
-DEPEND="${CDEPEND}
-		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
-RDEPEND="${CDEPEND}
-		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
-
-# Disable warnings about executable stacks, as this won't be fixed soon by upstream
-QA_EXECSTACK="usr/bin/sbcl"
-
-CONFIG="${S}/customize-target-features.lisp"
-ENVD="${T}/50sbcl"
-
-# Prevent ASDF from using the system libraries
-CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
-ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
-
-usep() {
-	use ${1} && echo "true" || echo "false"
-}
-
-sbcl_feature() {
-	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
-}
-
-sbcl_apply_features() {
-	sed 's/^X//' > "${CONFIG}" <<-'EOF'
-	(lambda (list)
-	X  (flet ((enable  (x) (pushnew x list))
-	X         (disable (x) (setf list (remove x list))))
-	EOF
-	if use x86 || use amd64; then
-		sbcl_feature "$(usep threads)" ":sb-thread"
-	fi
-	sbcl_feature "true" ":sb-ldb"
-	sbcl_feature "false" ":sb-test"
-	sbcl_feature "$(usep unicode)" ":sb-unicode"
-	sbcl_feature "$(usep zlib)" ":sb-core-compression"
-	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
-	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
-	X    )
-	X  list)
-	EOF
-	cat "${CONFIG}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv sbcl-*-* sbcl-binary || die
-	cd "${S}"
-}
-
-src_prepare() {
-	# bug #468482
-	eapply "${FILESDIR}"/concurrency-test-2.0.1.patch
-	# bugs #486552, #527666, #517004
-	eapply "${FILESDIR}"/bsd-sockets-test-2.0.5.patch
-	# bugs #560276, #561018
-	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
-	# bug #767742
-	eapply "${FILESDIR}"/etags-2.1.0.patch
-
-	eapply "${FILESDIR}"/verbose-build-2.0.3.patch
-
-	eapply_user
-
-	# Make sure the *FLAGS variables are sane.
-	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
-	strip-unsupported-flags
-	filter-flags -fomit-frame-pointer -Wl,-s
-	filter-ldflags -s
-
-	# original bugs #526194, #620532
-	# this broke no-pie default builds, c.f. bug #632670
-	# Pass CFLAGS down by appending our value, to let users override
-	# the default values.
-	# Keep passing LDFLAGS down via the LINKFLAGS variable.
-	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
-		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
-		-i src/runtime/GNUmakefile || die
-
-	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
-		-i make-config.sh || die
-
-	# Use installed ASDF version
-	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
-	# Avoid installation of ASDF info page. See bug #605752
-	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
-
-	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
-
-	# Some shells(such as dash) don't have "time" as builtin
-	# and we don't want to DEPEND on sys-process/time
-	sed "s,^time ,," -i make.sh || die
-	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
-	# #define SBCL_HOME ...
-	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
-	# change location of /etc/sbclrc ...
-	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
-
-	find . -type f -name .cvsignore -delete
-}
-
-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
-
-	# applying customizations
-	sbcl_apply_features
-}
-
-src_compile() {
-	local bindir="${WORKDIR}"/sbcl-binary
-
-	# clear the environment to get rid of non-ASCII strings, see bug #174702
-	# set HOME for paludis
-	env - HOME="${T}" PATH="${PATH}" \
-		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
-		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
-		GNUMAKE=make ./make.sh \
-		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
-		|| die "make failed"
-
-	# need to set HOME because libpango(used by graphviz) complains about it
-	if use doc; then
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/manual info html || die "Cannot build manual"
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/internals info html || die "Cannot build internal docs"
-	fi
-}
-
-src_test() {
-	ewarn "Unfortunately, it is known that some tests fail eg."
-	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
-	ewarn "development and not of Gentoo's side. Please, before filing"
-	ewarn "any bug(s) search for older submissions. Thank you."
-	time ( cd tests && sh run-tests.sh )
-}
-
-src_install() {
-	# install system-wide initfile
-	dodir /etc/
-	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
-	;;; The following is required if you want source location functions to
-	;;; work in SLIME, for example.
-	X
-	(setf (logical-pathname-translations "SYS")
-	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
-	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
-	X
-	;;; Setup ASDF2
-	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
-	EOF
-
-	# Install documentation
-	unset SBCL_HOME
-	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
-		sh install.sh || die "install.sh failed"
-
-	# bug #517008
-	pax-mark -mr "${D}"/usr/bin/sbcl
-
-	# rm empty directories lest paludis complain about this
-	find "${ED}" -empty -type d -exec rmdir -v {} +
-
-	if use doc; then
-		dodoc -r doc/internals/sbcl-internals
-
-		doinfo doc/manual/*.info*
-		doinfo doc/internals/sbcl-internals.info
-
-		docinto internals-notes
-		dodoc doc/internals-notes/*
-	else
-		rm -Rv "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	# install the SBCL source
-	if use source; then
-		./clean.sh
-		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
-		for d in contrib/*/; do
-			cp -av "$d" "${ED}/usr/$(get_libdir)/sbcl/" || die
-		done
-	fi
-
-	# necessary for running newly-saved images
-	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
-	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
-	doenvd "${ENVD}"
-}
diff --git a/dev-lisp/sbcl/sbcl-2.1.6.ebuild b/dev-lisp/sbcl/sbcl-2.1.6.ebuild
deleted file mode 100644
index 9d2f456fe5b6..000000000000
--- a/dev-lisp/sbcl/sbcl-2.1.6.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib flag-o-matic pax-utils toolchain-funcs
-
-#same order as http://www.sbcl.org/platform-table.html
-BV_X86=1.4.3
-BV_AMD64=2.1.6
-BV_PPC=1.2.7
-BV_SPARC=1.0.28
-BV_ALPHA=1.0.28
-BV_ARM=1.4.11
-BV_ARM64=1.4.2
-BV_X64_MACOS=1.2.11
-BV_PPC_MACOS=1.0.47
-BV_X86_SOLARIS=1.2.7
-BV_X64_SOLARIS=1.2.7
-BV_SPARC_SOLARIS=1.0.23
-
-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
-	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 )
-	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 )"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="debug doc source +threads +unicode zlib"
-
-CDEPEND=">=dev-lisp/asdf-3.3:="
-DEPEND="${CDEPEND}
-		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
-RDEPEND="${CDEPEND}
-		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
-
-# Disable warnings about executable stacks, as this won't be fixed soon by upstream
-QA_EXECSTACK="usr/bin/sbcl"
-
-CONFIG="${S}/customize-target-features.lisp"
-ENVD="${T}/50sbcl"
-
-# Prevent ASDF from using the system libraries
-CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
-ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
-
-usep() {
-	use ${1} && echo "true" || echo "false"
-}
-
-sbcl_feature() {
-	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
-}
-
-sbcl_apply_features() {
-	sed 's/^X//' > "${CONFIG}" <<-'EOF'
-	(lambda (list)
-	X  (flet ((enable  (x) (pushnew x list))
-	X         (disable (x) (setf list (remove x list))))
-	EOF
-	if use x86 || use amd64; then
-		sbcl_feature "$(usep threads)" ":sb-thread"
-	fi
-	sbcl_feature "true" ":sb-ldb"
-	sbcl_feature "false" ":sb-test"
-	sbcl_feature "$(usep unicode)" ":sb-unicode"
-	sbcl_feature "$(usep zlib)" ":sb-core-compression"
-	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
-	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
-	X    )
-	X  list)
-	EOF
-	cat "${CONFIG}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv sbcl-*-* sbcl-binary || die
-	cd "${S}"
-}
-
-src_prepare() {
-	# bug #468482
-	eapply "${FILESDIR}"/concurrency-test-2.0.1.patch
-	# bugs #486552, #527666, #517004
-	eapply "${FILESDIR}"/bsd-sockets-test-2.0.5.patch
-	# bugs #560276, #561018
-	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
-	# bug #767742
-	eapply "${FILESDIR}"/etags-2.1.0.patch
-
-	eapply "${FILESDIR}"/verbose-build-2.0.3.patch
-
-	eapply_user
-
-	# Make sure the *FLAGS variables are sane.
-	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
-	strip-unsupported-flags
-	filter-flags -fomit-frame-pointer -Wl,-s
-	filter-ldflags -s
-
-	# original bugs #526194, #620532
-	# this broke no-pie default builds, c.f. bug #632670
-	# Pass CFLAGS down by appending our value, to let users override
-	# the default values.
-	# Keep passing LDFLAGS down via the LINKFLAGS variable.
-	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
-		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
-		-i src/runtime/GNUmakefile || die
-
-	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
-		-i make-config.sh || die
-
-	# Use installed ASDF version
-	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
-	# Avoid installation of ASDF info page. See bug #605752
-	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
-
-	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
-
-	# Some shells(such as dash) don't have "time" as builtin
-	# and we don't want to DEPEND on sys-process/time
-	sed "s,^time ,," -i make.sh || die
-	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
-	# #define SBCL_HOME ...
-	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
-	# change location of /etc/sbclrc ...
-	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
-
-	find . -type f -name .cvsignore -delete
-}
-
-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
-
-	# applying customizations
-	sbcl_apply_features
-}
-
-src_compile() {
-	local bindir="${WORKDIR}"/sbcl-binary
-
-	# clear the environment to get rid of non-ASCII strings, see bug #174702
-	# set HOME for paludis
-	env - HOME="${T}" PATH="${PATH}" \
-		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
-		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
-		GNUMAKE=make ./make.sh \
-		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
-		|| die "make failed"
-
-	# need to set HOME because libpango(used by graphviz) complains about it
-	if use doc; then
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/manual info html || die "Cannot build manual"
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/internals info html || die "Cannot build internal docs"
-	fi
-}
-
-src_test() {
-	ewarn "Unfortunately, it is known that some tests fail eg."
-	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
-	ewarn "development and not of Gentoo's side. Please, before filing"
-	ewarn "any bug(s) search for older submissions. Thank you."
-	time ( cd tests && sh run-tests.sh )
-}
-
-src_install() {
-	# install system-wide initfile
-	dodir /etc/
-	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
-	;;; The following is required if you want source location functions to
-	;;; work in SLIME, for example.
-	X
-	(setf (logical-pathname-translations "SYS")
-	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
-	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
-	X
-	;;; Setup ASDF2
-	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
-	EOF
-
-	# Install documentation
-	unset SBCL_HOME
-	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
-		sh install.sh || die "install.sh failed"
-
-	# bug #517008
-	pax-mark -mr "${D}"/usr/bin/sbcl
-
-	# rm empty directories lest paludis complain about this
-	find "${ED}" -empty -type d -exec rmdir -v {} +
-
-	if use doc; then
-		dodoc -r doc/internals/sbcl-internals
-
-		doinfo doc/manual/*.info*
-		doinfo doc/internals/sbcl-internals.info
-
-		docinto internals-notes
-		dodoc doc/internals-notes/*
-	else
-		rm -Rv "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	# install the SBCL source
-	if use source; then
-		./clean.sh
-		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
-		for d in contrib/*/; do
-			cp -av "$d" "${ED}/usr/$(get_libdir)/sbcl/" || die
-		done
-	fi
-
-	# necessary for running newly-saved images
-	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
-	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
-	doenvd "${ENVD}"
-}