gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /dev-lisp
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
44 files changed, 57 insertions, 2263 deletions
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 0ad818fac983..3908c9ce68eb 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/asdf/Manifest b/dev-lisp/asdf/Manifest
index bdbc3bc76109..04d2f5fdde4e 100644
--- a/dev-lisp/asdf/Manifest
+++ b/dev-lisp/asdf/Manifest
@@ -1,12 +1,5 @@
 AUX gentoo-init.lisp 354 BLAKE2B 201ba124983acd9f86a35742079fa9d9af3c7c5b29c2c2f3021e07907dbd808a59bc82931558aea8bfb6821f600d0b2944eb5a3b518474e203323f7210c4685c SHA512 28a24bdc25b7f2304b1c837eb1ca44d5006de6bae1d8e5cfd2bc4bac800dfad9c9c7b3964fd0667c89da95051a42da9054bda3f94202867dbae7b02dfd2b03e4
 AUX source-registry.conf 138 BLAKE2B 1adc9396d0d23b361c52d70b1c10d7f5e031776b1a5bb168fe55a2fb90e03a6771511cfe52a26256620988f030cdc51d75e0ac3f433eb8a500aa5d8c119e0427 SHA512 244ce3e7cd9c5f483f99c8e43f2d62d16ea35b25897029b7b9038fe5412752f7d8c7ea11396fd87c218e77c63c5efe2f27c2a11fe49ffb79908f8e7b85bf64c9
-DIST asdf-3.1.5.tar.gz 400359 BLAKE2B 586a66799a37259694baa673f2849e183fac5fedfe5ff5c92529d47fc0954d40b48bbc095db926b9ea2214b551729c269d0925e4396a52310b72fd5f21842f49 SHA512 937d45eabea0853cd1b2e78e84cf33e7b55065857ffcf49fd87ccd60e21ae09c6dc7ab3649d48b37aeb1beaeeaf6c816e5ce035f0283707105296fb976044516
-DIST asdf-3.3.1.tar.gz 479255 BLAKE2B 5161b79741a52721eaa4da80a61bbe51e924967ecb744a087fdcbd99407abcc42faf39eafe6d30af7dd8af751a80caaf23e93ce42aa5f584123a1e8b528cc613 SHA512 bf5efec4518eb5312ce743c0fbe60c587bebfe26c36c833c163d67bf8631e18eeb293f2185e547f6be10da061a17f024d9f4a3a0808727d7b9b3a7d7a0faf133
-DIST asdf-3.3.2.tar.gz 482616 BLAKE2B 860728720ccb02debee6a826d8b27bfd8f5fea3daa529ecfc8d2f5564c77340a38582ccbccf4f311c644bdeccd7348004690929185aa70c3dc0f6b4124616df8 SHA512 f8e065383d6e82754c87d309a8b500ad213e09d1375792fd475eb169d9f880d97b26072e608046d61c83512645781cded09dcff22052e214e8e3639f2a978c74
 DIST asdf-3.3.5.tar.gz 520233 BLAKE2B 59697b9c6a691c43efe47c0e6d9fed5b8a0f2f2432f10cb58a643857bc3d332b730b180d5d13e87656b9106eab7787359ecd3b854447f5d9c8a871b3a1510448 SHA512 27221bbf798c94e427b8e2c0e8ecb5384102dd5f8f5d2cc18c2e3d44e0aa2f3b79538e0f2cb589442eb493abe00c8a63a04f6c1558979b78cd00165c6b33103b
-EBUILD asdf-3.1.5.ebuild 1107 BLAKE2B fafa6108bae3c728d0e924d313da8172354182594178e430b9a551b18d3b848670249ff2dbc223864b860f91633ff766f4af5d4d1b83ee9ff2a8e7b202da3dfb SHA512 6973ad2b14c8724e5bd4107f8aa22b2bbf74bcfdd5b56d443101cf9140f084e69446f33c3a7ec252b8c5eb434f0ee68b3c7d81ee7e1030b163b5101083d61bd5
-EBUILD asdf-3.3.1.ebuild 1277 BLAKE2B 3f2b4bc15d33655825af8fa5622d3b439753547d8fa44e6952251597f8ff785e8b634e6146aaabb76fc3830674b6b4639f0f6273e0f7382d1ed112564031c0b6 SHA512 3cf4e69d14fca2905f31ef3fe8b86c6e163a3d41c7a462b5115eef2cd17f986912345a4a5f3aa84f8f5fd777239a347b9abfd66f1a1c56266af41bca8c6d36ae
-EBUILD asdf-3.3.2-r1.ebuild 1353 BLAKE2B 9ba8b48f9fac2e07ee615019c994ecff2b30b9d933a5d02f757447d75e27d99893f7162e3784608c847f991e461d9c12361ff21064052671788b1dd55dcc5509 SHA512 6ea20ad0f80f98c30a7b6be5114d22e2ef69dd33b9f07d28ce1cf3588f0761f0e681cfb6ee07221c3ea85822a193f6edf23a36c336fe9d4b0f929b56e0682685
-EBUILD asdf-3.3.2.ebuild 1290 BLAKE2B c2434eab5d23c7ccb2f3168312d122786bca5287bf0f1fdb5929b38fa1a9fb7eca212de9033dfe44e5c47b2b2975516ca10954a4e17ca2389d9e4bf194c5efbd SHA512 3d6cfa7c4be57edc48de3c6b5e66292c9e89fe7a7fdffbaedc43777f93d0ce89766664ed4edb894482fe18df5284ad8902addd6fb9861b42b10219761d5293e8
-EBUILD asdf-3.3.5.ebuild 1544 BLAKE2B 427c8b784aba8cd1b8defbfec8697c486eb3c23fae799c1e97858e4be5939133400cb637ff7deb8f6a0234cec9f0abef954a419568747f1bee812bcf7f6a32ad SHA512 b83fcc1b30228f4dbe2e232f00a992c7acd02fdeb13f443f6ff575da4bb1f65a72204f6a5813fa01ee715dceed8080a82b64490904abf92ed0a1a0767846fdd9
+EBUILD asdf-3.3.5.ebuild 1541 BLAKE2B 903a49d00c911dbf44bc1e7b9d068a04ef7b4cc387e5c7f7c30d0880f540bc8f56f3dcc0db2f278d248b9717483db6590f5bd9c45575caeba01c690cfed5bc7d SHA512 20191a8362d02e297be7e2bbb35fca7270c08e0063a430c7642b0a15e8281e53698031740d961c2c2e527663089f0344092dcc5551f539bc8d63686af15eb2f0
 MISC metadata.xml 262 BLAKE2B 9d57142b15b4db8306f29f0644b2898c7b8674bdeccf72f654028ba92be886bcf341a224babb36e26363e35761f2f571637b4774f2bad6259202ac4b9c32eb19 SHA512 2066fb6068acc9947350a565fae1b067f16fb7b3223338d7d2c023caf443c472bab6024bf84c3b8c2d71a53cb37a61a682971864dba11be196ae22e4996cdff2
diff --git a/dev-lisp/asdf/asdf-3.1.5.ebuild b/dev-lisp/asdf/asdf-3.1.5.ebuild
deleted file mode 100644
index 17658be2a887..000000000000
--- a/dev-lisp/asdf/asdf-3.1.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit prefix
-
-DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp"
-HOMEPAGE="http://common-lisp.net/project/asdf/"
-SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PVR}"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="doc"
-
-DEPEND="!dev-lisp/cl-${PN}
-		!<dev-lisp/asdf-2.33-r3
-		doc? ( virtual/texi2dvi )"
-RDEPEND=""
-PDEPEND="~dev-lisp/uiop-${PV}"
-
-#S="${WORKDIR}"
-
-src_compile() {
-	make
-	use doc && make doc
-}
-
-src_install() {
-	insinto /usr/share/common-lisp/source/${PN}
-	doins -r build version.lisp-expr
-	dodoc README.md TODO
-	dohtml doc/*.{html,css,ico,png}
-	if use doc; then
-		dohtml -r doc/index.html
-		insinto /usr/share/doc/${PF}
-		#doins doc/${PN}.pdf
-	fi
-
-	insinto /etc/common-lisp
-	cd "${T}"
-	cp "${FILESDIR}"/gentoo-init.lisp "${FILESDIR}"/source-registry.conf .
-	eprefixify gentoo-init.lisp source-registry.conf
-	doins gentoo-init.lisp source-registry.conf
-}
diff --git a/dev-lisp/asdf/asdf-3.3.1.ebuild b/dev-lisp/asdf/asdf-3.3.1.ebuild
deleted file mode 100644
index 94d6a7b9a0d3..000000000000
--- a/dev-lisp/asdf/asdf-3.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit prefix common-lisp-3
-
-DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp"
-HOMEPAGE="http://common-lisp.net/project/asdf/"
-SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PVR}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="doc"
-
-DEPEND="!dev-lisp/cl-${PN}
-		!<dev-lisp/asdf-2.33-r3
-		doc? ( virtual/texi2dvi )"
-PDEPEND="virtual/commonlisp
-		~dev-lisp/uiop-${PV}"
-
-install_docs() {
-	(cd doc ; dodoc *.{html,css,ico,png} "${PN}.pdf" ; dodoc -r asdf )
-	if has_version ">=dev-lisp/sbcl-1.4.0" ; then
-		(cd doc ; doinfo "${PN}.info" )
-	fi
-}
-
-src_compile() {
-	emake
-	use doc && emake -C doc
-}
-
-src_test() {
-	common-lisp-export-impl-args "$(common-lisp-find-lisp-impl)"
-	test/run-tests.sh ${CL_BINARY}
-}
-
-src_install() {
-	insinto "${CLSOURCEROOT}/${PN}"
-	doins -r build version.lisp-expr
-	dodoc README.md TODO
-	use doc && install_docs
-	insinto /etc/common-lisp
-	cd "${T}" || die
-	cp "${FILESDIR}/gentoo-init.lisp" "${FILESDIR}/source-registry.conf" . || die
-	eprefixify gentoo-init.lisp source-registry.conf
-	doins gentoo-init.lisp source-registry.conf
-}
diff --git a/dev-lisp/asdf/asdf-3.3.2-r1.ebuild b/dev-lisp/asdf/asdf-3.3.2-r1.ebuild
deleted file mode 100644
index cdc7b5348e9f..000000000000
--- a/dev-lisp/asdf/asdf-3.3.2-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit prefix common-lisp-3
-
-DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp"
-HOMEPAGE="http://common-lisp.net/project/asdf/"
-SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PVR}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="!dev-lisp/cl-${PN}
-		!<dev-lisp/asdf-2.33-r3
-		doc? ( virtual/texi2dvi )
-		test? ( virtual/commonlisp )"
-PDEPEND="virtual/commonlisp
-		~dev-lisp/uiop-${PV}"
-
-install_docs() {
-	(cd doc ; dodoc *.{html,css,ico,png} "${PN}.pdf" ; dodoc -r asdf )
-	if has_version ">=dev-lisp/sbcl-1.4.0" ; then
-		(cd doc ; doinfo "${PN}.info" )
-	fi
-}
-
-src_compile() {
-	emake
-	use doc && emake -C doc
-}
-
-src_test() {
-	common-lisp-export-impl-args "$(common-lisp-find-lisp-impl)"
-	test/run-tests.sh ${CL_BINARY}
-}
-
-src_install() {
-	insinto "${CLSOURCEROOT}/${PN}"
-	doins -r build version.lisp-expr
-	dodoc README.md TODO
-	use doc && install_docs
-	insinto /etc/common-lisp
-	cd "${T}" || die
-	cp "${FILESDIR}/gentoo-init.lisp" "${FILESDIR}/source-registry.conf" . || die
-	eprefixify gentoo-init.lisp source-registry.conf
-	doins gentoo-init.lisp source-registry.conf
-}
diff --git a/dev-lisp/asdf/asdf-3.3.2.ebuild b/dev-lisp/asdf/asdf-3.3.2.ebuild
deleted file mode 100644
index a71c652de589..000000000000
--- a/dev-lisp/asdf/asdf-3.3.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit prefix common-lisp-3
-
-DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp"
-HOMEPAGE="http://common-lisp.net/project/asdf/"
-SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PVR}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="doc"
-
-DEPEND="!dev-lisp/cl-${PN}
-		!<dev-lisp/asdf-2.33-r3
-		doc? ( virtual/texi2dvi )"
-PDEPEND="virtual/commonlisp
-		~dev-lisp/uiop-${PV}"
-
-install_docs() {
-	(cd doc ; dodoc *.{html,css,ico,png} "${PN}.pdf" ; dodoc -r asdf )
-	if has_version ">=dev-lisp/sbcl-1.4.0" ; then
-		(cd doc ; doinfo "${PN}.info" )
-	fi
-}
-
-src_compile() {
-	emake
-	use doc && emake -C doc
-}
-
-src_test() {
-	common-lisp-export-impl-args "$(common-lisp-find-lisp-impl)"
-	test/run-tests.sh ${CL_BINARY}
-}
-
-src_install() {
-	insinto "${CLSOURCEROOT}/${PN}"
-	doins -r build version.lisp-expr
-	dodoc README.md TODO
-	use doc && install_docs
-	insinto /etc/common-lisp
-	cd "${T}" || die
-	cp "${FILESDIR}/gentoo-init.lisp" "${FILESDIR}/source-registry.conf" . || die
-	eprefixify gentoo-init.lisp source-registry.conf
-	doins gentoo-init.lisp source-registry.conf
-}
diff --git a/dev-lisp/asdf/asdf-3.3.5.ebuild b/dev-lisp/asdf/asdf-3.3.5.ebuild
index e99e2968ca08..b1153ce7066e 100644
--- a/dev-lisp/asdf/asdf-3.3.5.ebuild
+++ b/dev-lisp/asdf/asdf-3.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PVR}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index 855d1c2e1037..cbc64012f7e8 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -1,4 +1,4 @@
 AUX clisp-2.49.92-after_glibc_cfree_bdb.patch 8499 BLAKE2B d093b76cdf25b0822aaca87bd6055c6b58edc68e387d78d7fd979171d881fe585b674246b3a2a6f37a8412b5aef1b997210b4019a1595a07b64471cb9324656f SHA512 1b8cb29bf9caa30ca05474a67202f72f013e57d6b0d2dff1fb5ab0472df9f5c5a5b5de46922c931fa9a4d4a0a25890a05e1f7d38ddfb56c967026eef80001919
 DIST clisp-2.49.92.tar.bz2 9055207 BLAKE2B 6cf331eb9f99f62579e35469e2d01cae066083592ccc71cf483b70b4d1be349cdee9d403e0a7ed1ad1c8c5d805c1dab51c1a5031d77469ff8c4dc52eb58913df SHA512 cc9412a7b3f21c85b040bf5e660380fafb3c2374765a1c00272feb3f7838f2161e27a5d6295cef9976f0c4522f10796cf5ee5447716090d1cc69ecfe598ef306
-EBUILD clisp-2.49.92-r1.ebuild 4057 BLAKE2B f2ede2fdba75a59513ac84d6006d9a47461a2aee413a93cdf02989020dc5f5e39f708912ebaeaf9a03cb4c5a1de95745c46d975afcd15adea2926c7e0c8069a9 SHA512 7d6333913b48249590bd74922cb0fa56eab6a10517dbf1b08bb23975bd1c10d5cb35e0b647c70347c3719c618dd45d510f762ff7b71bdecb7ef31b2c17c3e64c
+EBUILD clisp-2.49.92-r1.ebuild 4017 BLAKE2B 2d108ba4c9efd37ebf898fa13781ecb49bb6885214f2ca352d405962c4a373f12b090c31137c042b710b986692e3de2fa4f75e9ccfc2bc2eab6c1653ddfbb45b SHA512 1e2167c5356be22fc603b5a9f503ed5cd4d71d1f96f629b774deb5d45e29826bd5f8c069b69cdc0ed3a11e3326aaa9ddec9811da8d94cf5e7e5ada47e13ebc4c
 MISC metadata.xml 1241 BLAKE2B c9448490c5af9a2c7be822093f6baeee9e23b4c92fbf06723ee724bc950bd34502f22aaa2c8a059b2bb29d7cd36f668fa039a3cb80cfe64dc58c42f1a3e26122 SHA512 d721fc1e1055bff3ed7585a6b22e69c60ce88abb1e67bfed9ae8ca8310a12cce5a7a2ca14b97a87d9ad19fed9d68f67f259321cac4376d625aa6fbede7ab8ccb
diff --git a/dev-lisp/clisp/clisp-2.49.92-r1.ebuild b/dev-lisp/clisp/clisp-2.49.92-r1.ebuild
index a8f877a3e79b..7c6874ec2809 100644
--- a/dev-lisp/clisp/clisp-2.49.92-r1.ebuild
+++ b/dev-lisp/clisp/clisp-2.49.92-r1.ebuild
@@ -11,27 +11,27 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2/8"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
 IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk +pcre postgres +readline svm threads +unicode +zlib"
 # "jit" disabled ATM
 
 RDEPEND=">=dev-lisp/asdf-2.33-r3
-         virtual/libcrypt:=
-		 virtual/libiconv
-		 >=dev-libs/libsigsegv-2.10
-		 >=dev-libs/ffcall-1.10
-		 dbus? ( sys-apps/dbus )
-		 fastcgi? ( dev-libs/fcgi )
-		 gdbm? ( sys-libs/gdbm:0= )
-		 gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 )
-		 postgres? ( >=dev-db/postgresql-8.0:* )
-		 readline? ( >=sys-libs/readline-7.0:0= )
-		 pcre? ( dev-libs/libpcre:3 )
-		 svm? ( sci-libs/libsvm )
-		 zlib? ( sys-libs/zlib )
-		 X? ( x11-libs/libXpm )
-		 hyperspec? ( dev-lisp/hyperspec )
-		 berkdb? ( sys-libs/db:4.8 )"
+	virtual/libcrypt:=
+	virtual/libiconv
+	>=dev-libs/libsigsegv-2.10
+	>=dev-libs/ffcall-1.10
+	dbus? ( sys-apps/dbus )
+	fastcgi? ( dev-libs/fcgi )
+	gdbm? ( sys-libs/gdbm:0= )
+	gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 )
+	postgres? ( >=dev-db/postgresql-8.0:* )
+	readline? ( >=sys-libs/readline-7.0:0= )
+	pcre? ( dev-libs/libpcre:3 )
+	svm? ( sci-libs/libsvm )
+	zlib? ( sys-libs/zlib )
+	X? ( x11-libs/libXpm )
+	hyperspec? ( dev-lisp/hyperspec )
+	berkdb? ( sys-libs/db:4.8 )"
 
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto x11-misc/imake )"
diff --git a/dev-lisp/cmucl/Manifest b/dev-lisp/cmucl/Manifest
index c8a22a13abaf..c4b53724d2d0 100644
--- a/dev-lisp/cmucl/Manifest
+++ b/dev-lisp/cmucl/Manifest
@@ -4,5 +4,5 @@ AUX cmuclrc 305 BLAKE2B 1943c5ca8f43ce890e37949fa71cbeb24a5f849c827b3e05ec240ce2
 AUX site-init.lisp.in 1839 BLAKE2B d4bd6da1c3d0902b96af4abac48f981f21d4494f3da6dab9d398c3af873c4fbf23a6c9cda878099a522787875e3882fc635859253769f56d6275721bea0a7853 SHA512 374e5acf970b1bd26d2318b678cba509296f2356a4672648f8522387c216288e8f43b514004b0d0c98da5d03a5db10435d5f42f57db88c916691eb4ae93f126a
 DIST cmucl-21c-x86-linux.tar.bz2 11127872 BLAKE2B b9089a40b4a0738f9faccdfddb7b33256a561a07cedc3ef9b3ec7afddbbb9de493c2ffb9af4a8d6b6ce70ef857576870901a6b7a607f52bdaf8a0f53ddd2d07e SHA512 9097220aef612aa3d8367a86a86dc62d86d918190d2688f6e90d415c9f9d881f97f0829e9d310f700b014821d30bf5a15f7a05cdb9201c9deab10a7231e0bcb6
 DIST cmucl-src-21c.tar.bz2 6947775 BLAKE2B 828075c71ddf459d09076199af4a02f2294063bd9ef0beb6d4bcbb473dd0ff8cfdff7faa9416f640e125603301fa37c73a280db597bf4301c22fbe88c4cc2dbb SHA512 98ea0516b71af7c6f92b5f67f6c1545949fcd1dc95e1238a989c1c2858a75e2751e5eb765b29812ad5cc5de015333787dac2a63a9ddea9bb83cfd72fef6794f4
-EBUILD cmucl-21c.ebuild 2968 BLAKE2B feec2475fb8dd3e43da31f35e32b36695e96e64fca18b3a946bf28c8b3e0ec23cb39333bab5cb6614b90de38cb50d4216c0112360e023c493e3180d575b02a40 SHA512 c8612dedb2e0c41e7285e0c993b0d136fc6abbd54f6f2bd79eb29b7e73654e2bdb9cad7cbff072785e7575bdcc3f0e61a26b5c36843f7fab8bb28aef6689f9f0
+EBUILD cmucl-21c.ebuild 2989 BLAKE2B fa527026009d13a42734978ed9f78df4deab75b00f1a791aca9dfe3db9af22d8a71a00a79e2f0f0c559453b14652e477947933779c99e6bc653afda5fe89700b SHA512 2c9f7fdd38ab83792a57b62959ce41eff131e64b6574e6bba0a10130b5434197db42d02e53ceacb77ba6d31b69fd5741abc96c169c2e1a35204a4e797a6ad310
 MISC metadata.xml 1393 BLAKE2B 846f8c77c97261eaf9a47f9f003d81e6807df36809dabb0e3d08bd7db022be8df791a4ecfbaa997d810e43fa749b1aef8e5d96ced95a9d0a3d2a2eb4de638710 SHA512 63fb77e29fddc06d4d82ed746fa138fd4a49165d06698ce5ae03fc46a5aee7bfa0331832cfe42bc987ec5131278e747f7c3400d2a66a5cff171470117d0e62a5
diff --git a/dev-lisp/cmucl/cmucl-21c.ebuild b/dev-lisp/cmucl/cmucl-21c.ebuild
index d6672d17e4f9..310cc6a4dd90 100644
--- a/dev-lisp/cmucl/cmucl-21c.ebuild
+++ b/dev-lisp/cmucl/cmucl-21c.ebuild
@@ -3,14 +3,17 @@
 
 EAPI=6
 
-inherit toolchain-funcs multilib
+inherit toolchain-funcs
 
 MY_PV=${PV:0:3}
 
 DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp"
 HOMEPAGE="http://www.cons.org/cmucl/"
-SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-src-${MY_PV}.tar.bz2
-	http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-${MY_PV}-x86-linux.tar.bz2"
+SRC_URI="
+	http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-src-${MY_PV}.tar.bz2
+	http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-${MY_PV}-x86-linux.tar.bz2
+"
+S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
@@ -24,8 +27,6 @@ DEPEND="${CDEPEND}
 	doc? ( virtual/latex-base )"
 RDEPEND="${CDEPEND}"
 
-S="${WORKDIR}"
-
 TARGET=linux-4
 
 src_prepare() {
@@ -103,7 +104,7 @@ src_install() {
 	# Documentation
 	dodoc doc/cmucl/README
 	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins src/docs/cmu-user/cmu-user.pdf src/docs/internals/design.pdf
+		dodoc src/docs/cmu-user/cmu-user.pdf src/docs/internals/design.pdf
+		docompress -x /usr/share/doc/${PF}/{cmu-user,design}.pdf
 	fi
 }
diff --git a/dev-lisp/ecls/Manifest b/dev-lisp/ecls/Manifest
index 000a376e4374..f7d2feff79e3 100644
--- a/dev-lisp/ecls/Manifest
+++ b/dev-lisp/ecls/Manifest
@@ -3,11 +3,6 @@ AUX ecls-16.1.3-build.patch 341 BLAKE2B 6a3b588010b66b6e060dfa29642bacea08e77e64
 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 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 2077 BLAKE2B 96d08d96b11991906473208ded28782c9a265d4ab924515e3ebb92b16756ff73981cbcabe667940299ba784dfbbbc5cc27221ab27d6a15fabab7539158e4d7e4 SHA512 95070c15d1a1ef424ee8db98ca12583429fa4543c3bf5ad5e19605f57433c767ee29ddb837400fb66bf2d3c6ac879492d7740060403417d588a4e0d8e937f24e
-MISC metadata.xml 902 BLAKE2B cab2b4ab8766434eeb2c455b7119f80360dde182e3bfa75fb900d0ea32497a0758474337c5c9b33b68ea2fcd82b8745868c6da50ed79ae0af4a6f287c3d0fa06 SHA512 d1663bde77b96bf708f0cb2b5c71bfc2d6a99e830030c66eba9d097f61a32bae8b5c31cbcc4c6a1654914e662a04c4a9beaf89337372b858329bf349bac5ef97
+EBUILD ecls-21.2.1-r4.ebuild 2076 BLAKE2B 6288a5e8229c9f7e93d7b47fcdcc24af8da7ff7b3d1a759fe33f6e95be35e7a1e91ddeb9d40f98b4d63b5cc145d9c6ae4fc20efacf8afb0faf44cc8ca7021fd0 SHA512 c641e34e5f18cf0592d2eca4baf4af59b6adaa11d7587f0276c788c37bf893a2c8c32e96baf8033c24bcd21acede7060bbe76f0245b5e0686fcc93b8d8b80272
+MISC metadata.xml 824 BLAKE2B 9c044fb3e39969f686c0dd9ec1c608ed06cf363bfe0f34fd2df5c450c615f9631e33c15926da371ee1d3b94d2793906cd69354f8e03b4e49f7a89fd3c5a0ee8d SHA512 d71da21f28721d0021236b71375199b00ba2f6c9f64ee0925db8973f520eb4042cea2d50647e96fec34fa37d372057222bd8101c9eea3f5ed14e7fd7f5b6fbff
diff --git a/dev-lisp/ecls/ecls-16.1.3-r1.ebuild b/dev-lisp/ecls/ecls-16.1.3-r1.ebuild
deleted file mode 100644
index 4109b67d44f7..000000000000
--- a/dev-lisp/ecls/ecls-16.1.3-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib
-
-# test phase only works if ecls already installed #516876
-RESTRICT="test"
-
-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"
-
-LICENSE="BSD-2 LGPL-2.1+"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode +libatomic X"
-
-CDEPEND="dev-libs/gmp:0=
-		dev-libs/libffi:=
-		libatomic? ( dev-libs/libatomic_ops )
-		>=dev-libs/boehm-gc-7.1[threads?]
-		>=dev-lisp/asdf-2.33-r3:="
-DEPEND="${CDEPEND}
-		app-text/texi2html
-		emacs? ( >=app-editors/emacs-23.1:* >=app-eselect/eselect-emacs-1.12 )"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${P}-headers-gentoo.patch"
-	"${FILESDIR}/${P}-build.patch"
-)
-
-pkg_setup() {
-	if use gengc || use precisegc ; then
-		ewarn "You have enabled the generational garbage collector or"
-		ewarn "the precise collection routines. These features are not very stable"
-		ewarn "at the moment and may cause crashes."
-		ewarn "Don't enable them unless you know what you're doing."
-	fi
-}
-
-src_prepare() {
-	default
-	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
-}
-
-src_configure() {
-	econf \
-		--with-system-gmp \
-		--enable-boehm=system \
-		--enable-longdouble=yes \
-		--with-dffi \
-		$(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)
-}
-
-src_compile() {
-	if use emacs; then
-		local ETAGS=$(eselect --brief etags list | sed -ne '/emacs/{p;q}')
-		[[ -n ${ETAGS} ]] || die "No etags implementation found"
-		pushd build > /dev/null || die
-		emake ETAGS=${ETAGS} TAGS
-		popd > /dev/null
-	else
-		touch build/TAGS
-	fi
-
-	#parallel make fails
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc README.md CHANGELOG
-	dodoc "${FILESDIR}"/README.gentoo
-	pushd build/doc
-	newman ecl.man ecl.1
-	newman ecl-config.man ecl-config.1
-	popd
-}
diff --git a/dev-lisp/ecls/ecls-20.4.24-r1.ebuild b/dev-lisp/ecls/ecls-20.4.24-r1.ebuild
deleted file mode 100644
index 0c2c641c4ac9..000000000000
--- a/dev-lisp/ecls/ecls-20.4.24-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib
-
-# test phase only works if ecls already installed #516876
-RESTRICT="test"
-
-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"
-
-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"
-
-CDEPEND="dev-libs/gmp:0=
-		dev-libs/libffi:=
-		libatomic? ( dev-libs/libatomic_ops )
-		>=dev-libs/boehm-gc-7.1[threads?]
-		>=dev-lisp/asdf-2.33-r3:="
-DEPEND="${CDEPEND}
-		app-text/texi2html
-		emacs? ( >=app-editors/emacs-23.1:* >=app-eselect/eselect-emacs-1.12 )"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-16.1.3-headers-gentoo.patch"
-	"${FILESDIR}/${PN}-16.1.3-build.patch"
-)
-
-pkg_setup() {
-	if use gengc || use precisegc ; then
-		ewarn "You have enabled the generational garbage collector or"
-		ewarn "the precise collection routines. These features are not very stable"
-		ewarn "at the moment and may cause crashes."
-		ewarn "Don't enable them unless you know what you're doing."
-	fi
-}
-
-src_prepare() {
-	default
-	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
-}
-
-src_configure() {
-	econf \
-		--with-system-gmp \
-		--enable-boehm=system \
-		--enable-longdouble=yes \
-		--with-dffi \
-		$(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)
-}
-
-src_compile() {
-	if use emacs; then
-		local ETAGS=$(eselect --brief etags list | sed -ne '/emacs/{p;q}')
-		[[ -n ${ETAGS} ]] || die "No etags implementation found"
-		pushd build > /dev/null || die
-		emake ETAGS=${ETAGS} TAGS
-		popd > /dev/null
-	else
-		touch build/TAGS
-	fi
-
-	#parallel make fails
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc README.md CHANGELOG
-	dodoc "${FILESDIR}"/README.gentoo
-	pushd build/doc
-	newman ecl.man ecl.1
-	newman ecl-config.man ecl-config.1
-	popd
-}
diff --git a/dev-lisp/ecls/ecls-21.2.1-r3.ebuild b/dev-lisp/ecls/ecls-21.2.1-r3.ebuild
deleted file mode 100644
index c6913c125b73..000000000000
--- a/dev-lisp/ecls/ecls-21.2.1-r3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib
-
-# test phase only works if ecls already installed #516876
-RESTRICT="test"
-
-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"
-
-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 X"
-
-CDEPEND="dev-libs/gmp:0=
-		dev-libs/libffi:=
-		dev-libs/libatomic_ops
-		>=dev-libs/boehm-gc-7.1[threads?]
-		>=dev-lisp/asdf-2.33-r3:="
-DEPEND="${CDEPEND}
-		app-text/texi2html
-		emacs? ( >=app-editors/emacs-23.1:* >=app-eselect/eselect-emacs-1.12 )"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-16.1.3-headers-gentoo.patch"
-	"${FILESDIR}/${PN}-16.1.3-build.patch"
-)
-
-src_prepare() {
-	default
-	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
-}
-
-src_configure() {
-	econf \
-		--with-system-gmp \
-		--enable-boehm=system \
-		--enable-longdouble=yes \
-		--with-dffi \
-		--enable-libatomic=system \
-		$(use_with cxx) \
-		$(use_enable gengc) \
-		$(use_enable precisegc) \
-		$(use_with debug debug-cflags) \
-		$(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)
-}
-
-src_compile() {
-	if use emacs; then
-		local ETAGS=$(eselect --brief etags list | sed -ne '/emacs/{p;q}')
-		[[ -n ${ETAGS} ]] || die "No etags implementation found"
-		pushd build > /dev/null || die
-		emake ETAGS=${ETAGS} TAGS
-		popd > /dev/null
-	else
-		touch build/TAGS
-	fi
-
-	#parallel make fails
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc README.md CHANGELOG
-	dodoc "${FILESDIR}"/README.gentoo
-	pushd build/doc
-	newman ecl.man ecl.1
-	newman ecl-config.man ecl-config.1
-	popd
-}
diff --git a/dev-lisp/ecls/ecls-21.2.1-r4.ebuild b/dev-lisp/ecls/ecls-21.2.1-r4.ebuild
index 70bc6b36ea1d..7e9d58759ffb 100644
--- a/dev-lisp/ecls/ecls-21.2.1-r4.ebuild
+++ b/dev-lisp/ecls/ecls-21.2.1-r4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2 LGPL-2.1+"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86 ~amd64-linux"
 IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode X"
 # test phase only works if ecls already installed #516876
 RESTRICT="test"
diff --git a/dev-lisp/ecls/metadata.xml b/dev-lisp/ecls/metadata.xml
index 3ceb15c13d2d..7cc134f601a9 100644
--- a/dev-lisp/ecls/metadata.xml
+++ b/dev-lisp/ecls/metadata.xml
@@ -14,7 +14,6 @@ standalone executables.
 	<use>
 		<flag name="gengc">Use generational garbage collection (experimental)</flag>
 		<flag name="precisegc">Use type information during garbage collection (experimental)</flag>
-		<flag name="libatomic">Use <pkg>dev-libs/libatomic_ops</pkg> library</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">ecls</remote-id>
diff --git a/dev-lisp/gcl/Manifest b/dev-lisp/gcl/Manifest
index 5ea283f36d27..52d111be4b02 100644
--- a/dev-lisp/gcl/Manifest
+++ b/dev-lisp/gcl/Manifest
@@ -10,7 +10,7 @@ DIST gcl-2.6.10.tar.gz 5490689 BLAKE2B 46af0cf8a810a82fe2bc2bd46ca1cbe17b74c71eb
 DIST gcl-2.6.12-fedora.tar.bz2 680471 BLAKE2B 0ad96ce0a09bb73ee77456373eb7e50b2325a4f2e042c21120a1c33b2dec2aa10f5485bb1b02e8eb8e77aaaea6e141189d676217f9d139615911d8a77ea5818a SHA512 7640f8370754c889e2db9d047c4476195f949f4d97eafc7ef81761c1a548e24125d6d93381227b55f1840c3d127770995e88bf66f83c6952e121f5fa004e7f1a
 DIST gcl-2.6.12.tar.gz 7031837 BLAKE2B afd3f81dd8a712d92883a96399a2e0621b0d38a349904707846bd694892510012fde27f94ec36664c249659a480e7f92c412b3790ecb74247a91ba0cb44aa420 SHA512 e82b5bdded6f846de4ea35a83bc8294043ba6d4fe03ff421f8753e78add1e5e87124782f672cd38ad89bbec1ca7c5ff69fe2621be1552b209516b58b6c97fd20
 DIST gcl-2.6.13_pre99.tar.xz 10030460 BLAKE2B 8750d641062bcad5a124173013d38403f37ad352c7c436e89d4e329d997200be399a100dcefc4ce484e3f85f46e2dd90ee02947e5e728e001782e973c4122b0e SHA512 a3ad2bd639157ca2a80b534e87c169f6e07002a1b9ca8039483cff336af764123dec9e749da045b656b990e0a97c70881c798420ec4bd0e4494f43d0d040e413
-EBUILD gcl-2.6.10.ebuild 3957 BLAKE2B 7490f7ac90b1133dfaabd02119eaba0a6c6cda8a2ce8e21d53c7fb9d42919eeb12a4bdac9e58bfa983582e5a7d7248f6c1f80cee82e10f493bde47a1c444ddf8 SHA512 0d87bdc13c7f9323d93d8f4f29844435c67d244a3b9525712742b7afa889eba7a4e8a97ef0d50f2740b1befbe32f2f7358ba0815e3d38b2fde79ae42db23a52b
-EBUILD gcl-2.6.12.ebuild 3827 BLAKE2B 6cd0e7d56cc77b12643bc0bb0b2405d24bea7d678af09930e6412d42389d101b18a63c43e1a09b9c09efbd5391d544acccee8bfed3efccf11e04cf46c1890265 SHA512 73fc32245476e456f3689d15b12b2d0a89fe7c6c1cc39f2a46a832c2324d6a306107bb940a5fe50567d4bc9c1452c13ddd8592661b77960bbbdadde826ba30fb
+EBUILD gcl-2.6.10.ebuild 3928 BLAKE2B bcc3e1b8b37323e6ef6740664d28191923cd69a59267ae0c8eeda8aa6d9a844a39b2ee9339d945a9a27e93b5294fb845268dba34fd826e4d203592ea68aa7768 SHA512 abb82bdd5ab6ed06111a29eaaf325636d4e3bde64c8f53b6b208783e702dc9be6f7389e1ac06978648547f3c9b90fafffdaf1647949ab1e102946044cd1db96c
+EBUILD gcl-2.6.12.ebuild 3839 BLAKE2B 8e3f5c1d9620112c79b7604f9beeef8d41d8a8e3337d0bc4c170a61f79d80cbd1b78d389a2c0293f6bad1f11e9bf178108d8ab8052896a0e5d1b1685ba2acfa7 SHA512 11bdbaaec48e3d7a1264c0ddca91b041b0b16a70a2b1530d80e98def9466d83399e8cb74e1446f4add1bcc238e6e9f954829f19e540d36300d841154b71133a7
 EBUILD gcl-2.6.13_pre99.ebuild 2462 BLAKE2B 84d3315f0448ec280740571f6e3d9e48cb1ab29dc1862c649704f18dcc36b8be4f0384109362733a7f8005b3a80f02369a32e96d91c725b11b072ba190dfa496 SHA512 f9fcce8135ef5c904a14e9ab14fe513f4c5c8267c0d1c30ea1b565ea913df4fb0e596f8d1299808ebdeddc93ea4581e289034455dace4f6c5800ccae4881c7d1
 MISC metadata.xml 722 BLAKE2B 4efe3f45f285f77a679e5c745a98e6707db15ac67554c17a2de932183d216ac0906d302197ca094b0773d90bd0a36dcef5e0ecf621f8ef07c9e18478db734f77 SHA512 fb317108e1673ab66aeda56aff57fb70679dcc1c4893f1e8c8b54dd9220414777694d647089c6281426fdf07393be0a7ee64fe1bee519fab638523315c20adc6
diff --git a/dev-lisp/gcl/gcl-2.6.10.ebuild b/dev-lisp/gcl/gcl-2.6.10.ebuild
index 0216a90d7973..47a5f441a32c 100644
--- a/dev-lisp/gcl/gcl-2.6.10.ebuild
+++ b/dev-lisp/gcl/gcl-2.6.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,6 +8,7 @@ inherit elisp-common epatch flag-o-matic
 DESCRIPTION="GNU Common Lisp"
 HOMEPAGE="https://www.gnu.org/software/gcl/gcl.html"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz https://dev.gentoo.org/~grozin/${P}-fedora.tar.bz2"
+S="${WORKDIR}"/${PN}
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
@@ -29,8 +30,6 @@ DEPEND="${RDEPEND}
 	>=app-text/texi2html-1.64
 	>=sys-devel/autoconf-2.52"
 
-S="${WORKDIR}"/${PN}
-
 src_prepare() {
 	mv "${WORKDIR}"/fedora/info/* info/
 	cp -p /usr/share/texmf-dist/tex/texinfo/texinfo.tex info/
@@ -134,13 +133,10 @@ src_install() {
 		elisp-install ${PN} elisp/*.el
 	fi
 
-	insinto /usr/share/doc/${PF}
-	doins *.dvi
+	docompress -x /usr/share/doc/${PF}/*.dvi
 	if use athena; then
-		pushd xgcl-2 > /dev/null
-		insinto /usr/share/doc/${PF}
-		doins *.pdf
-		popd > /dev/null
+		dodoc xgcl-2/*.pdf
+		docompress -x /usr/share/doc/${PF}/*.pdf
 	fi
 }
 
diff --git a/dev-lisp/gcl/gcl-2.6.12.ebuild b/dev-lisp/gcl/gcl-2.6.12.ebuild
index 33b27a39d040..37a0306ac5f1 100644
--- a/dev-lisp/gcl/gcl-2.6.12.ebuild
+++ b/dev-lisp/gcl/gcl-2.6.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,10 +7,11 @@ inherit elisp-common epatch flag-o-matic
 DESCRIPTION="GNU Common Lisp"
 HOMEPAGE="https://www.gnu.org/software/gcl/gcl.html"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz https://dev.gentoo.org/~grozin/${P}-fedora.tar.bz2"
+S="${WORKDIR}"/${PN}
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ppc64 ~x86"
 IUSE="+ansi athena emacs +readline tk X"
 
 # See bug #205803
@@ -28,8 +29,6 @@ DEPEND="${RDEPEND}
 	>=app-text/texi2html-1.64
 	>=sys-devel/autoconf-2.52"
 
-S="${WORKDIR}"/${PN}
-
 src_prepare() {
 	mv "${WORKDIR}"/fedora/info/* info/
 	cp -p /usr/share/texmf-dist/tex/texinfo/texinfo.tex info/
@@ -130,13 +129,12 @@ src_install() {
 		elisp-install ${PN} elisp/*.el
 	fi
 
-	insinto /usr/share/doc/${PF}
-	doins info/*.pdf
+	dodoc info/gcl-{si,tk}.pdf
+	docompress -x /usr/share/doc/${PF}/gcl-{si,tk}.pdf
+
 	if use athena; then
-		pushd xgcl-2 > /dev/null
-		insinto /usr/share/doc/${PF}
-		doins *.pdf
-		popd > /dev/null
+		dodoc xgcl-2/dwdoc.pdf
+		docompress -x /usr/share/doc/${PF}/dwdoc.pdf
 	fi
 }
 
diff --git a/dev-lisp/hyperspec/Manifest b/dev-lisp/hyperspec/Manifest
index d3723a10357a..21464057ade0 100644
--- a/dev-lisp/hyperspec/Manifest
+++ b/dev-lisp/hyperspec/Manifest
@@ -1,3 +1,3 @@
 DIST HyperSpec-7-0.tar.gz 2032830 BLAKE2B ec72b57fdcf669fe400dc2729191cc7c387172035d0663816fcc18450543052d3a958bd9042ef67bc70a1ccb07e74b189d32e1c790cdd1b721e8d74a6a88412d SHA512 1b9058fe1ae2e283f4a68211dc659021e04bd10373d7c2392f4fa496543e2454f96c7eb671bcb1e72c906456792f8a265a5e34bac24d01e2c0e7fb1ce359c370
-EBUILD hyperspec-7.0-r3.ebuild 865 BLAKE2B d4950784e38dbfa576e92524bcb0e45708797d0011228a3918f267296a8cf6d21f02c4c47d09d6ac49f6993b65c23ae41ffe47d59db93f6887e7dc416aa6e8d1 SHA512 78eba48c60ecac1596d315c76693cb2285ec1a913f6c36295a0fb4df007651e0d0b9717cb7017265fd23eb6d43116efcb0034220b57e3c6ca5d73a4a1db1910a
+EBUILD hyperspec-7.0-r3.ebuild 864 BLAKE2B 1bdbbb3c32577f839caae77ac95114d0e7b9e4ec18f4a29414b6a0b51f8b1cabd2ddaeaf11997e51ce902b5746d647a0e37fd0d7d88f0033775c5f3594a8d41e SHA512 37749fa4cd08fe0e4813b3ab600af3ab3540403e008500a3e67049b805954b5bfa2fa3ea9f376abea073e52110f5f6ac146879c824fa2d6cd20fb1c703d7e4b3
 MISC metadata.xml 285 BLAKE2B 010681e95eb1d8c4e5b0165e07bc63fdadd786c0a98439d3221ed6d825fa810dbc00a39fce5d2e01c279a3b94cfd5ff8a3d3c13ab5c278978603a88d4cbd822e SHA512 468b64cf13a1b4a38ca1909172c1adebb3da49edb7961be5deec6bbcd7c29d17828c7b538d22b7b7814ef2b8791fa962e9c13d876af9fa609aaf8fd866cdabd9
diff --git a/dev-lisp/hyperspec/hyperspec-7.0-r3.ebuild b/dev-lisp/hyperspec/hyperspec-7.0-r3.ebuild
index 15c9263763d0..4d5567170d93 100644
--- a/dev-lisp/hyperspec/hyperspec-7.0-r3.ebuild
+++ b/dev-lisp/hyperspec/hyperspec-7.0-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"
 
 LICENSE="HyperSpec"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 
 src_install() {
 	docinto html
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 9c7ac403582c..e770c8fb98e3 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -1,18 +1,7 @@
-AUX bsd-sockets-test-1.2.11.patch 14240 BLAKE2B c9b9989c6dc484ba72877e5cfd4b69ded30b8801334b5cf95a4ff8544ef814f6777147a3d1d9e9285fd1a145c842fe73fc1f98c3b3d96d810346350efd46d4a1 SHA512 5da3fcb4b0e76abd218716b14d5deb1612b100761672216330105afb591c83408910a5de10e99e2f6d9372036c7f6897b889a9241ef84b0564600eddfba83073
 AUX bsd-sockets-test-2.0.5.patch 16171 BLAKE2B 6b78dbd0eb2cad0503234f3b51c4e1c614ab7e89a477c6fecce8f86130c4b703fe0419bb5a4735e54a490b3a249ccc649311e9c44dffa81789a9a70e35f4a2c6 SHA512 5d84f006db1e2672f530a8d2626c5c52f8c93afcd8e7a54898e8b3ca733d8479c0a1974be8091e011acd93de00e8dc6f491fea65aafd0c18626a68c1080ec692
-AUX concurrency-test-1.2.6.patch 1069 BLAKE2B a802300284267942da91ba205ce1a002da3731a7220b0b10fa77b8c347636ee2c2660b590bb18af565a083fb2235b9d3eafd66ba8796d6b7357d032403fb6115 SHA512 6969cec62ee9ee0ecb2aff34c854f51fd93b52f768ed1e1bf7cb3686c370c6e6b1d0691159b5d404f8d5e12e90a1447e6098ed83b0bb1ff4dc7f454f7052ec53
-AUX concurrency-test-1.3.15.patch 967 BLAKE2B 220bdd3ac1c40d2921440fb1ea67ec99f7766b6c33d014be57201502ed122c8cf12875be0ccd5c74fa14d0280a5ece8f63100971eca2f9ffb7a35dac1b7f17b2 SHA512 628429eacd8c513190229260fcfc8ce403072fb7b4bade10c3b65e30a3fc60f1057b018b7043590a205626f3e2f05b244ffd48afa864911d350d37aa84eb1a98
 AUX concurrency-test-2.0.1.patch 587 BLAKE2B 3c7f73f7efe711f400f830cbd53b6448aeba41e14f4b229b0260d62c494ffdf9ef9687d916aa108035b53065598a8a51c92e086509b2cdabb2f6b2a7acb0b718 SHA512 c1223eda1a6e9e40196bc133a6270c9803195257d39637d4622026503774847eb184879025d9029617e8b36074d81c47820c4474ceabcb45b7734deddeeae8ce
 AUX etags-2.1.0.patch 347 BLAKE2B 00e55c6b2279bfe8171de31a92a8c2afd4bc13eb2364aadb4f7850bc6078fabdefa21bd238c1d2b9914818b0fff81ad26ed0f1878cbec3f2b2e3fc13518cf908 SHA512 724e97da71176769a78e1eae017d6d9efcf3add4707947d9d2700837b596b7b4f675bfc40e2be35d8be61cb67ac273fdf810ce5b1489202fbdc9be6125fa3a0f
-AUX gentoo-fix_install_man.patch 399 BLAKE2B f0f04de59f5ddd69a54fcfa5feb4c8038e7e37c923d8ca93d061b642cd01a39b9d1a0f54b00a8a1fbc654788d0224b4949bf225e97048fc73fa2196969ae3496 SHA512 bc5118ddf2fd851dcabf773cc7443fa0d3f5a5b83715173110f9164c631faaf8c2d6b247f7ac205da23bb388ff459eba228deeaa2a45202870b7f97376564030
 AUX sb-posix-test-1.2.15.patch 1325 BLAKE2B 051500de2167bb963c6b20cf8f57a03e9326e9e8c79ce249fb23aa7f041c62384717d545f2e6aeefac900af9c27f640218543a218bf902081bcec69968108df1 SHA512 79fd75eb5c44630eb6669b1808029420c7031cc1ba367b8687d7433bf0d19016a7912df0ab21c90aa7e709417ec9784c846c7dcefbc1308a059cbd8b3209dd27
-AUX sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch 1024 BLAKE2B 73899d54f3951347f3b1d340f1333fee2480816ae601299bebd3341598d98d7cecee1de246e1084427c97863b66cad8ce4dd88a4a0ef1390871592adce3baca2 SHA512 a09efe91a082fd2bed9dc30652f3e5ed51e416697b7b2fee4d6c5f90db0ecbadca7adf652f532d79869fde9186e9d16855f5fd81321cb2a82e1a158d4cde9e97
-AUX sbcl-1.2.11-solaris.patch 500 BLAKE2B 060508d99acaea6ce0b8f881ae191be329af9ad6ec5174ffc28551b7d1a9690a087e2d11ca129413996a24c9fc8e9de4fbc30b09e90d7723b70c7c68b3b30b93 SHA512 4dbd0cc499f3cb634330db9843e82b88830e45e63402a082f51e02b0dcb1541f35e8cb0410aa25bf283af3c0372a8a39220b3f11b7288de2c5c768ac133780bc
-AUX sbcl-1.2.13-verbose-build.patch 835 BLAKE2B 9afec842d7130c28ebe45dd41b3668b33050cff39f93eb57ad167112807795578aa7b25d9db566acf7739fa6d6a21b4c00a9ef4e6e301d1b8ad61e6cc9ad3567 SHA512 da3b1479bec7fc98eab1ae0dc67c0f483512dace899644f8fa7ed5742910a9b852934c86a0b2f4ba4df15715b9dd01cf2d5b826fd6687b67888066b7d3cf8da7
-AUX sbcl-1.3.11-config.patch 630 BLAKE2B 7c8abce227890314a8d9a926d33336b670e1238a2402d331824bd2438be3c90cf0e7648ad2d4dd8290c792ef6c765d71bfed54a5e818f861478d04565ce6f4e5 SHA512 f76584df3309f76510070752c356396d50114bd180142a7af120c5a6f43c1a0591644ba93d27e04aa88ca79dd13d48accbd48c371bf9e519916db81a5fc4208b
-AUX sbcl-1.4.0-bsd-sockets-test.patch 15625 BLAKE2B 016d9ff9ef952c0b51fc0d03670a352dc12f6d40283bd7cef2110a0c795160b07412ca117e988aad71e19dd2629666aa6b3d6b17cbc123973f33d5d44e70e281 SHA512 59120ce76dd3c24b48edebda4d4536eb570fa7fab67ef8e995d89b72c5702333943ea7f39c674091773996b67add22e6fff7abd041acbb0e83a3e0e002097d74
-AUX sbcl-1.4.0-verbose-build.patch 936 BLAKE2B 2ec498fbe58e5b4ed8786f8554801ef89fa8300db7aeea45b09e1136254ca7cad92aadafa05d3d687c52267f444f7c7d2bd7b1d52ca5d502787f046f33708a4f SHA512 10b9e32a122910cca131bb5b4f1fbc098fa588a77b6cea2086a4f8458bcd70d5a7c2ad25018ac72b417d6fba8769d09e7debaffc23ef8f9a3b184d7f5729ec8d
-AUX sbcl-1.4.9-gcc-10.patch 453 BLAKE2B 6d22bb9545db387ad98b7e35cfe7e99d1cf04f51dfa9992c6bf41efbe643606b1b80e4add80daeb1e999f1eb723e6d6aaaa42859a0bbee396bba1bbc965c8f60 SHA512 7df0bd616422890ba6e58238a839ecd4bd795f2cb899c51290851c907eaf9fbac47a0f228869c1c951677f8b30518a8a0370e5d08fe901883c13d6b35d001608
 AUX verbose-build-2.0.3.patch 1014 BLAKE2B bdd83275e874ad0835caba34f4b97ae16d2537ccb0650aac12f874dc9344fa4b8dd56468ef8c45cca2fe570fff25026f636b2cae294116a23f9bde6523cb9efa SHA512 01b0259d8d19b5c5554bcee54756b60986d623467e3156f4ece3f0ede5d64ec75688d3ac8a41a33e55e3f80c96c3f9184e6ec208621e33fb18397e6f575d4b84
 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
@@ -21,27 +10,15 @@ DIST sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 8217590 BLAKE2B 68da614df7d27ecf0
 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-linux-binary.tar.bz2 10516485 BLAKE2B 4036684f398c0766d55a6089fb67ae23520fc949b39525b2ac005f2665cdee8c0901a638e5dfc8e78e5f80963331a5fe2ddd4b0108ddaea063fabfd1d5829f72 SHA512 ca09beeafeb40f21eb1a377f04a69d57feb5549fa63aadf2e39aa65f3875418bdab755e22b567b3f2c514fb94534b739a57606288912ffc5cddf370a400e9e5c
 DIST sbcl-1.2.7-x86-solaris-binary.tar.bz2 10351529 BLAKE2B 9b7324c8177856c6024220ce71070a1a51b93fa9352fe692c3fd5afa9b6cdcbb361c54e354ab1cc1153e6bf15cb0c5fc267c3da03addd5d35fbec840f72a7c06 SHA512 b30d40f0095bb43719ba2e1a619f53fe5f0bccaa08a35481bc5feeb0dd5b540018a9ec9f61799de89991a85750577922cb4e56db4d7dab8f07e18bbc643bdad1
-DIST sbcl-1.3.11-source.tar.bz2 5790557 BLAKE2B d6b493d880ab2481f18381475165a3eed585fa46e626eb1e762cced29a6a7315be638df6f44ffdc694d8fb55509f912267a7dbe8892b6672eb56e839f55908ff SHA512 07cce0b33f1d41bc208827d228ae356b56165bb55fab72c48973a15a63e2e680aafc16db67d36cc4952f71101faaacafd9660276cd67673314f1699d6a91af82
-DIST sbcl-1.3.11-x86-64-linux-binary.tar.bz2 9248214 BLAKE2B f1f6ebbec168a47d7405c15c63a70f10afad2d271d17dfa461f94bd8b1a1c21506a3a9c1d7ffe2501cc70419406e0d73b53a34ff9ff003e4791170101b7b1293 SHA512 ffb443f9e3ede2f9dbdc1bf28554bd59ef1fd5ad855465ee10f9835221fde20211188e881be854b4760870b122dfc6c5ad5c8cad1bea613ffb3b6a6f67a36056
-DIST sbcl-1.3.12-armhf-linux-binary.tar.bz2 9193847 BLAKE2B 27106c0144ee99f534cd0a59cfb331ef8f39dbefdc76e294a8671523b1c05f42353d31b8e74600dd01f85fb5156d39216a877d77aba57a061427ea1dc28a492e SHA512 5bdb4e2b584933e9ee9aaa2ba68328f219f072af802782ee5dedf83baa5c679cd5a1ccbf3458678810ccb8679ffd392d4fba108e86d537e10554c1860bfd4de5
-DIST sbcl-1.3.9-armhf-linux-binary.tar.bz2 9161130 BLAKE2B 0dbfe39803d6e3955124fa1a619da7b6d4ec9e7d6eb78e868508c61bf478a980cb15ba427ef0b38d0f051ce38b881020534c0d37bfbcd81a8d763654283669ec SHA512 309e2ac7ef9ac95bf751432cf243af0de022c5b21054df2bf4e99da4ff087218af72b0ab3be69214eba3df1b6bbe707cc28840508e960c5d2ed2af0e86de3fdd
 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.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-1.5.8-ppc64le-linux-binary.tar.bz2 10025597 BLAKE2B aac079e3585ebe9d5b610cf096e958edfd4410361b0d96b2fa88a285cbdce4133d89e1ddf0cf6729d43d6c3057365d07a3d73362f906fd8798b76c993210a8e5 SHA512 443ab604caa768c756f3322d7c599142a50227914bcd6be12434432daf1e3d5af0740d1ebdb166b856cc77ddf02451e29fcef9e29099f7bc4fb49ad61db17674
-DIST sbcl-2.1.11-source.tar.bz2 6687529 BLAKE2B 06deb2cc4f55aeb9ddfdf267d541ffbd15d8a5ed068b21d5786888bab973485c9c23250e4bb3980b46e3ba7580c402ff0364447d8104689757deb29cbd81e7c4 SHA512 c1a1c377a45d3968907b14a64a9b8b70fb33e8e7e7ff90820f2da75d4f16e1d4f804818b9d21bf0c438120293dcfe2d2b023e9b0d2e4a5b5842944d9c2c45d74
-DIST sbcl-2.1.11-x86-64-linux-binary.tar.bz2 10159401 BLAKE2B e40631dd49dea23759c6f8330944c354ca025c11765ee18f64a92faaa64aea05504ba4ff431651ea8403a7c8ac6705364bde826736ec5e1d378f197b3c233867 SHA512 ac3c5cbd8df596c838d61833e431427c80875b2f5379a855d4426cebf5d90fc5210d74b28db9c3fdbef4d315eeaba75fc18fd9f2f129a1e72d90fa1055421d6b
 DIST sbcl-2.2.0-source.tar.bz2 6697729 BLAKE2B de89a3725ab68e7c189b225ee43bda3f53ca457c7c63a12c593e6f44559833cb1c95bda4e66181429a32cff614177a5650f94b45add5a5013c7a80b43608c04d SHA512 0afd424e6b8dbc574e928fbfb1ce264211b94e5bdef35b131a9f672b5051819d6978ea5338863e1321305dc562d8d81ae33c1e1fffdbaf6a60a3fbef0926e99f
 DIST sbcl-2.2.0-x86-64-linux-binary.tar.bz2 10178679 BLAKE2B 7a38af9f548807852fc602bb2cb4be3d50ab9fef875919f5c38df6fa9a43e80323cd005064c2e373cbb72d8e7e01a1ee4e0732c3ca9b8ee558e6c2f965d4631f SHA512 a148cf90b2b31ecd49a767468355eca166f428d491588ce5bd577da6efa32e0531b92fba1bfbf034b058a9af8baa45842e41ec24411bd3d5766b9cf20206453b
-DIST sbcl-2.2.1-source.tar.bz2 6701705 BLAKE2B 65cd2675866daac78f654ae85754c40aa866c550b3866fa05166d6fa0ef9edf221c10ee4e7ea62bd6774fc00140f08b95f69b2ce30ff6080303850f40a7cbf1f SHA512 4139aaf4023469c500ee729b72670a8e661ef9763fd6f3f7bd143dcc6ab31f3cc0c8d9d1211a9db7d6c673bf71f386fd5b4713a9a3344d100f91168c40d97af9
-DIST sbcl-2.2.1-x86-64-linux-binary.tar.bz2 10182052 BLAKE2B ad3057d389616b61c8cb6674396722d532602904576723b4ce551cf85b3e3ee9b76309be17ad36033f9b5e8ef4ce2cb49a51f64ea20c647869536293c589f6c8 SHA512 565acc7fa54bc212c5f07d82c453dfde20b7e9ebaaf9e9044810e1322cfe739f48a31121d8ece724a264b736def3a62197b35ebf240190e9d34c3b041447fad8
-EBUILD sbcl-1.3.11.ebuild 7869 BLAKE2B 787bcb56ead23f6033ab11a6e57b8513c20879db26e4f674f00f93fb24572b8718526785ce578c6424e9eb625ac0036c36bea7be659d68d414d139af1355b014 SHA512 463a2d43938c92270922591e994d0cb9097a701a6e69c63ef9ff4cd8457b2dc5aa0a5412a063d012f6d0acca4ba8db4029be3bdf7ce9b1851967f3982faf4f16
-EBUILD sbcl-1.4.9.ebuild 8320 BLAKE2B dc1f619557850e563b3a43d74354d8b3406e77147989a82af9f46e96af61fb75b60cfcae268148816e8eda077d9292235dc514ed2777e083f919567456ca0e3a SHA512 c662f5328f38392b391f1acd7bbfe3ad45eea6039044e522e35d15efbeaa00ab7d4762144731b758dfc9bd4f5d8ce968b71a51817468f918b50f2441ca2cf5b4
-EBUILD sbcl-2.1.11.ebuild 8342 BLAKE2B 17f706e87a48180f21edc1caba2fa47941662f807fe55993757b0f5cdf260e935ae557ad900861050a1cb282075a1256110077322619183afea8885aa369b9d0 SHA512 5a7e44ac7335ee0da8229fc2409bdd2fa270e6c24579624afa3784c50a5668c8373befd506c15c51816a7deba9a3689d52eb1faf22aca3d5020173e214d31962
-EBUILD sbcl-2.2.0.ebuild 8348 BLAKE2B 65376ae6f475799f7aec05e1fc975fa3734b1556655b13321529a771fb920b9f3d9a5355f88b06877d353c71ce56c0b4a52427e0d949473a9bc657fca4802ab9 SHA512 d6b1bbdfa78b27f9a306c0d4a2f58fe8a705ec65642a1a1910a246be9e7b9e706e642ff80c0c0ee6b222a4d5b92f691be13d014de5140425f0a9ecaacb20768c
-EBUILD sbcl-2.2.1.ebuild 8348 BLAKE2B 7036ef4b1ac3b4429977802dcaeeaca2b75908834301cc52e6e3eb508b5f892510ae7d8ee8c20d7b9c85918940e40ec34bdf186d477e50d884643fcab5b94294 SHA512 aca9b95d076318981daaa78fa6fd8f27ae194d6d84549dcd23446761c568c9618b607b34787cf3e3768a9da4dcd42a4d971d26d39d62137605a3812e5228d4da
+DIST sbcl-2.2.2-source.tar.bz2 6716272 BLAKE2B 6cb820a22d3c548df79598e0b3280204b65ce0b4c928a63f342a1cd106f2ce19bb639c0a7baf17dfae0d2b8dbcd92a7c4934ac75b9623691d218e7b36ab33830 SHA512 5e30736d737999da7686e45d63c17e6fccdab673bcb8afa5180f000f67eeea8546ca4ea83c1356e65c8f921fa2abee6b48f74d98e1d88d95dda618ffb249962c
+DIST sbcl-2.2.2-x86-64-linux-binary.tar.bz2 10166209 BLAKE2B 460eac990d89f9ee1d77b3a60e22ccb8398e84af1b5859bd3fb39a30f132f6b15b213d7789d714b40a89de54a047ed91bd3a6609eb919f0a7cb82af9ec9eb008 SHA512 97a73833279028390b86685abff0725934fdf67bfd0fb055c0a2b84bd6b76409b9693ec6f5ecfd399b2d2eb743b1a51e7701d0802e0d9c42ff4d2bb524a1d39f
+EBUILD sbcl-2.2.0.ebuild 8344 BLAKE2B 1baa54b857fd84c98ca24cde84b6595a9b4d58df52205e41620b2bf028b40af77d3f50ba43b82949fd9c86c4e75653c080ee031b1be29bb3c50543b0b49fef72 SHA512 644db987685fbeb15e5eac754ac15138958c09fe657be8838ab18f9df336f3b86b0f34003a74c43a3d32248bf7dfed1752cdb302abf85fa882fefc46bbf92a07
+EBUILD sbcl-2.2.2.ebuild 8348 BLAKE2B d207e7038dc2fd29ceebbcea139c8d298a41aecd9415c4b9518f4909c2a14abeb82dbb5348389cdaad692352c0de8df5cff08206a7563b16a9bd71623504b7fd SHA512 13061348bd4864fc1349de9fc24c4fa6c102c957ee2febce8d3f58d78610b65910291f2d5459e090b238042225fa7843650af6fa3594041c33028c7bd8d8f2ce
 MISC metadata.xml 1185 BLAKE2B fa1ce4556cb77fa154914a28fdd2e5dcec45498961875461f465978de4467ff16a329bfdd8a0fe161ba579639808b48af76bcd6fd22165a73d803983e6c10c91 SHA512 51bda1487ee9f95ba0e343f2990f465524590a88baba942819339697b446db3c7054d08791579c77472654f69e3f0fed8077ef2f0a9cb2314067fceff4c2c67c
diff --git a/dev-lisp/sbcl/files/bsd-sockets-test-1.2.11.patch b/dev-lisp/sbcl/files/bsd-sockets-test-1.2.11.patch
deleted file mode 100644
index 88f6fa588cee..000000000000
--- a/dev-lisp/sbcl/files/bsd-sockets-test-1.2.11.patch
+++ /dev/null
@@ -1,350 +0,0 @@
-diff -r -U2 sbcl-1.2.11.orig/contrib/sb-bsd-sockets/tests.lisp sbcl-1.2.11/contrib/sb-bsd-sockets/tests.lisp
---- sbcl-1.2.11.orig/contrib/sb-bsd-sockets/tests.lisp	2015-04-27 20:56:47.000000000 +0600
-+++ sbcl-1.2.11/contrib/sb-bsd-sockets/tests.lisp	2015-04-28 22:27:32.588146072 +0600
-@@ -36,13 +36,13 @@
- ;;; Apparently getprotobyname_r on FreeBSD says -1 and EINTR
- ;;; for unknown protocols...
--#-(and freebsd sb-thread)
--#-(and dragonfly sb-thread)
--(deftest get-protocol-by-name/error
--  (handler-case (get-protocol-by-name "nonexistent-protocol")
--    (unknown-protocol ()
--      t)
--    (:no-error ()
--      nil))
--  t)
-+;#-(and freebsd sb-thread)
-+;#-(and dragonfly sb-thread)
-+;(deftest get-protocol-by-name/error
-+;  (handler-case (get-protocol-by-name "nonexistent-protocol")
-+;    (unknown-protocol ()
-+;      t)
-+;    (:no-error ()
-+;      nil))
-+;  t)
- 
- (deftest make-inet-socket.smoke
-@@ -92,19 +92,19 @@
-   t)
- 
--#-win32
--(deftest make-inet6-socket.smoke
--  (handler-case
--      (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp"))))
--        (> (socket-file-descriptor s) 1))
--    (address-family-not-supported () t))
--  t)
--
--#-win32
--(deftest make-inet6-socket.keyword
--  (handler-case
--      (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp)))
--        (> (socket-file-descriptor s) 1))
--    (address-family-not-supported () t))
--  t)
-+;#-win32
-+;(deftest make-inet6-socket.smoke
-+;  (handler-case
-+;      (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp"))))
-+;        (> (socket-file-descriptor s) 1))
-+;    (address-family-not-supported () t))
-+;  t)
-+
-+;#-win32
-+;(deftest make-inet6-socket.keyword
-+;  (handler-case
-+;      (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp)))
-+;        (> (socket-file-descriptor s) 1))
-+;    (address-family-not-supported () t))
-+;  t)
- 
- (deftest* (non-block-socket)
-@@ -114,52 +114,52 @@
-   t)
- 
--(deftest inet-socket-bind
--  (let* ((tcp (get-protocol-by-name "tcp"))
--         (address (make-inet-address "127.0.0.1"))
--         (s1 (make-instance 'inet-socket :type :stream :protocol tcp))
--         (s2 (make-instance 'inet-socket :type :stream :protocol tcp)))
--    (unwind-protect
--         ;; Given the functions we've got so far, if you can think of a
--         ;; better way to make sure the bind succeeded than trying it
--         ;; twice, let me know
--         (progn
--           (socket-bind s1 address 0)
--           (handler-case
--               (let ((port (nth-value 1 (socket-name s1))))
--                 (socket-bind s2 address port)
--                 nil)
--             (address-in-use-error () t)))
--      (socket-close s1)
--      (socket-close s2)))
--  t)
--
--#-win32
--(deftest inet6-socket-bind
--  (handler-case
--      (let* ((tcp (get-protocol-by-name "tcp"))
--             (address (make-inet6-address "::1"))
--             (s1 (make-instance 'inet6-socket :type :stream :protocol tcp))
--             (s2 (make-instance 'inet6-socket :type :stream :protocol tcp)))
--        (unwind-protect
--             ;; Given the functions we've got so far, if you can think of a
--             ;; better way to make sure the bind succeeded than trying it
--             ;; twice, let me know
--             (handler-case
--                 (socket-bind s1 address 0)
--               (socket-error ()
--                 ;; This may mean no IPv6 support, can't fail a test
--                 ;; because of that (address-family-not-supported doesn't catch that)
--                 t)
--               (:no-error (x)
--                 (declare (ignore x))
--                 (handler-case
--                     (let ((port (nth-value 1 (socket-name s1))))
--                       (socket-bind s2 address port)
--                       nil)
--                   (address-in-use-error () t))))
--          (socket-close s1)
--          (socket-close s2)))
--    (address-family-not-supported () t))
--  t)
-+;(deftest inet-socket-bind
-+;  (let* ((tcp (get-protocol-by-name "tcp"))
-+;         (address (make-inet-address "127.0.0.1"))
-+;         (s1 (make-instance 'inet-socket :type :stream :protocol tcp))
-+;         (s2 (make-instance 'inet-socket :type :stream :protocol tcp)))
-+;    (unwind-protect
-+;         ;; Given the functions we've got so far, if you can think of a
-+;         ;; better way to make sure the bind succeeded than trying it
-+;         ;; twice, let me know
-+;         (progn
-+;           (socket-bind s1 address 0)
-+;           (handler-case
-+;               (let ((port (nth-value 1 (socket-name s1))))
-+;                 (socket-bind s2 address port)
-+;                 nil)
-+;             (address-in-use-error () t)))
-+;      (socket-close s1)
-+;      (socket-close s2)))
-+;  t)
-+
-+;#-win32
-+;(deftest inet6-socket-bind
-+;  (handler-case
-+;      (let* ((tcp (get-protocol-by-name "tcp"))
-+;             (address (make-inet6-address "::1"))
-+;             (s1 (make-instance 'inet6-socket :type :stream :protocol tcp))
-+;             (s2 (make-instance 'inet6-socket :type :stream :protocol tcp)))
-+;        (unwind-protect
-+;             ;; Given the functions we've got so far, if you can think of a
-+;             ;; better way to make sure the bind succeeded than trying it
-+;             ;; twice, let me know
-+;             (handler-case
-+;                 (socket-bind s1 address 0)
-+;               (socket-error ()
-+;                 ;; This may mean no IPv6 support, can't fail a test
-+;                 ;; because of that (address-family-not-supported doesn't catch that)
-+;                 t)
-+;               (:no-error (x)
-+;                 (declare (ignore x))
-+;                 (handler-case
-+;                     (let ((port (nth-value 1 (socket-name s1))))
-+;                       (socket-bind s2 address port)
-+;                       nil)
-+;                   (address-in-use-error () t))))
-+;          (socket-close s1)
-+;          (socket-close s2)))
-+;    (address-family-not-supported () t))
-+;  t)
- 
- (deftest* (simple-sockopt-test)
-@@ -228,35 +228,35 @@
- ;;; the message ended up
- 
--#-win32
--(deftest simple-local-client
--    (progn
--      ;; SunOS (Solaris) and Darwin systems don't have a socket at
--      ;; /dev/log.  We might also be building in a chroot or
--      ;; something, so don't fail this test just because the file is
--      ;; unavailable, or if it's a symlink to some weird character
--      ;; device.
--      (when (block nil
--              (handler-bind ((sb-posix:syscall-error
--                              (lambda (e)
--                                (declare (ignore e))
--                                (return nil))))
--                (sb-posix:s-issock
--                 (sb-posix::stat-mode (sb-posix:stat "/dev/log")))))
--        (let ((s (make-instance 'local-socket :type :datagram)))
--          (format t "Connecting ~A... " s)
--          (finish-output)
--          (handler-case
--              (socket-connect s "/dev/log")
--            (sb-bsd-sockets::socket-error ()
--              (setq s (make-instance 'local-socket :type :stream))
--              (format t "failed~%Retrying with ~A... " s)
--              (finish-output)
--              (socket-connect s "/dev/log")))
--          (format t "ok.~%")
--          (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
--            (format stream
--                    "<7>bsd-sockets: Don't panic.  We're testing local-domain client code; this message can safely be ignored"))))
--      t)
--  t)
-+;#-win32
-+;(deftest simple-local-client
-+;    (progn
-+;      ;; SunOS (Solaris) and Darwin systems don't have a socket at
-+;      ;; /dev/log.  We might also be building in a chroot or
-+;      ;; something, so don't fail this test just because the file is
-+;      ;; unavailable, or if it's a symlink to some weird character
-+;      ;; device.
-+;      (when (block nil
-+;              (handler-bind ((sb-posix:syscall-error
-+;                              (lambda (e)
-+;                                (declare (ignore e))
-+;                                (return nil))))
-+;                (sb-posix:s-issock
-+;                 (sb-posix::stat-mode (sb-posix:stat "/dev/log")))))
-+;        (let ((s (make-instance 'local-socket :type :datagram)))
-+;          (format t "Connecting ~A... " s)
-+;          (finish-output)
-+;          (handler-case
-+;              (socket-connect s "/dev/log")
-+;            (sb-bsd-sockets::socket-error ()
-+;              (setq s (make-instance 'local-socket :type :stream))
-+;              (format t "failed~%Retrying with ~A... " s)
-+;              (finish-output)
-+;              (socket-connect s "/dev/log")))
-+;          (format t "ok.~%")
-+;          (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
-+;            (format stream
-+;                    "<7>bsd-sockets: Don't panic.  We're testing local-domain client code; this message can safely be ignored"))))
-+;      t)
-+;  t)
- 
- 
-@@ -373,58 +373,58 @@
-                len address port (subseq buf 0 (min 10 len)))))))
- 
--#+sb-thread
--(deftest interrupt-io
--    (let (result)
--      (labels
--          ((client (port)
--             (setf result
--                   (let ((s (make-instance 'inet-socket
--                                           :type :stream
--                                           :protocol :tcp)))
--                     (socket-connect s #(127 0 0 1) port)
--                     (let ((stream (socket-make-stream s
--                                                       :input t
--                                                       :output t
--                                                       :buffering :none)))
--                       (handler-case
--                           (prog1
--                               (catch 'stop
--                                 (progn
--                                   (read-char stream)
--                                   (sleep 0.1)
--                                   (sleep 0.1)
--                                   (sleep 0.1)))
--                             (close stream))
--                         (error (c)
--                           c))))))
--           (server ()
--             (let ((s (make-instance 'inet-socket
--                                     :type :stream
--                                     :protocol :tcp)))
--               (setf (sockopt-reuse-address s) t)
--               (socket-bind s (make-inet-address "127.0.0.1") 0)
--               (socket-listen s 5)
--               (multiple-value-bind (* port)
--                   (socket-name s)
--                 (let* ((client (sb-thread:make-thread
--                                 (lambda () (client port))))
--                        (r (socket-accept s))
--                        (stream (socket-make-stream r
--                                                    :input t
--                                                    :output t
--                                                    :buffering :none))
--                        (ok :ok))
--                   (socket-close s)
--                   (sleep 5)
--                   (sb-thread:interrupt-thread client
--                                               (lambda () (throw 'stop ok)))
--                   (sleep 5)
--                   (setf ok :not-ok)
--                   (write-char #\x stream)
--                   (close stream)
--                   (socket-close r))))))
--        (server))
--      result)
--  :ok)
-+;#+sb-thread
-+;(deftest interrupt-io
-+;    (let (result)
-+;      (labels
-+;          ((client (port)
-+;             (setf result
-+;                   (let ((s (make-instance 'inet-socket
-+;                                           :type :stream
-+;                                           :protocol :tcp)))
-+;                     (socket-connect s #(127 0 0 1) port)
-+;                     (let ((stream (socket-make-stream s
-+;                                                       :input t
-+;                                                       :output t
-+;                                                       :buffering :none)))
-+;                       (handler-case
-+;                           (prog1
-+;                               (catch 'stop
-+;                                 (progn
-+;                                   (read-char stream)
-+;                                   (sleep 0.1)
-+;                                   (sleep 0.1)
-+;                                   (sleep 0.1)))
-+;                             (close stream))
-+;                         (error (c)
-+;                           c))))))
-+;           (server ()
-+;             (let ((s (make-instance 'inet-socket
-+;                                     :type :stream
-+;                                     :protocol :tcp)))
-+;               (setf (sockopt-reuse-address s) t)
-+;               (socket-bind s (make-inet-address "127.0.0.1") 0)
-+;               (socket-listen s 5)
-+;               (multiple-value-bind (* port)
-+;                   (socket-name s)
-+;                 (let* ((client (sb-thread:make-thread
-+;                                 (lambda () (client port))))
-+;                        (r (socket-accept s))
-+;                        (stream (socket-make-stream r
-+;                                                    :input t
-+;                                                    :output t
-+;                                                    :buffering :none))
-+;                        (ok :ok))
-+;                   (socket-close s)
-+;                   (sleep 5)
-+;                   (sb-thread:interrupt-thread client
-+;                                               (lambda () (throw 'stop ok)))
-+;                   (sleep 5)
-+;                   (setf ok :not-ok)
-+;                   (write-char #\x stream)
-+;                   (close stream)
-+;                   (socket-close r))))))
-+;        (server))
-+;      result)
-+;  :ok)
- 
- (defmacro with-client-and-server ((server-socket-var client-socket-var) &body body)
-@@ -485,4 +485,5 @@
-               client server (unsigned-byte 8) ,direction)))))
- 
--  (define-shutdown-tests :output)
--  (define-shutdown-tests :io))
-+;  (define-shutdown-tests :output)
-+;  (define-shutdown-tests :io))
-+)
diff --git a/dev-lisp/sbcl/files/concurrency-test-1.2.6.patch b/dev-lisp/sbcl/files/concurrency-test-1.2.6.patch
deleted file mode 100644
index b85fc168ed0e..000000000000
--- a/dev-lisp/sbcl/files/concurrency-test-1.2.6.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nuar a/contrib/sb-concurrency/tests/test-frlock.lisp b/contrib/sb-concurrency/tests/test-frlock.lisp
---- a/contrib/sb-concurrency/tests/test-frlock.lisp	2014-11-29 19:56:58.000000000 +0100
-+++ b/contrib/sb-concurrency/tests/test-frlock.lisp	2014-12-16 23:52:18.569947139 +0100
-@@ -22,9 +22,9 @@
-   #+openbsd 0.01
-   #-openbsd 0.0001)
- 
--(defun test-frlocks (&key (reader-count 100) (read-count 1000000)
-+(defun test-frlocks (&key (reader-count 50) (read-count 500000)
-                           (outer-read-pause 0) (inner-read-pause 0)
--                          (writer-count 10) (write-count (/ 1 *minimum-sleep*))
-+                          (writer-count 10) (write-count 5000)
-                           (outer-write-pause *minimum-sleep*) (inner-write-pause 0))
-     (let ((rw (make-frlock))
-           (a 0)
-@@ -87,7 +87,7 @@
- #+sb-thread
- (deftest* (frlock.1 :fails-on :win32)
-     (handler-case
--        (sb-ext:with-timeout 60 (test-frlocks))
-+        (sb-ext:with-timeout 240 (test-frlocks))
-       (sb-ext:timeout (c)
-         (error "~A" c)))
-   nil
diff --git a/dev-lisp/sbcl/files/concurrency-test-1.3.15.patch b/dev-lisp/sbcl/files/concurrency-test-1.3.15.patch
deleted file mode 100644
index 53b5bea06bc1..000000000000
--- a/dev-lisp/sbcl/files/concurrency-test-1.3.15.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -r -U2 sbcl-1.3.15.orig/contrib/sb-concurrency/tests/test-frlock.lisp sbcl-1.3.15/contrib/sb-concurrency/tests/test-frlock.lisp
---- sbcl-1.3.15.orig/contrib/sb-concurrency/tests/test-frlock.lisp	2017-02-28 20:51:29.000000000 +0100
-+++ sbcl-1.3.15/contrib/sb-concurrency/tests/test-frlock.lisp	2017-03-02 18:15:41.225284441 +0100
-@@ -25,5 +25,5 @@
- (defun test-frlocks (&key (reader-count 100) (read-count 1000000)
-                           (outer-read-pause 0) (inner-read-pause 0)
--                          (writer-count 10) (write-count (/ 1 *minimum-sleep*))
-+                          (writer-count 10) (write-count 5000)
-                           (outer-write-pause *minimum-sleep*) (inner-write-pause 0))
-     (let ((rw (make-frlock))
-@@ -88,5 +88,5 @@
- (deftest* (frlock.1)
-     (handler-case
--        (sb-ext:with-timeout 10
-+        (sb-ext:with-timeout 240
-           (test-frlocks #+win32 :outer-write-pause #+win32 t ))
-       (sb-ext:timeout (c)
diff --git a/dev-lisp/sbcl/files/gentoo-fix_install_man.patch b/dev-lisp/sbcl/files/gentoo-fix_install_man.patch
deleted file mode 100644
index 87a5f43c0c13..000000000000
--- a/dev-lisp/sbcl/files/gentoo-fix_install_man.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/install.sh b/install.sh
-index 1400791..ac149c1 100644
---- a/install.sh
-+++ b/install.sh
-@@ -106,6 +106,7 @@ echo "Documentation:"
- 
- # man
- cp doc/sbcl.1 "$BUILD_ROOT$MAN_DIR"/man1/ && echo " man $BUILD_ROOT$MAN_DIR/man1/sbcl.1"
-+cp doc/sbcl-asdf-install.1 "$BUILD_ROOT$MAN_DIR"/man1/ && echo " man $BUILD_ROOT$MAN_DIR/man1/sbcl-asdf-install.1"
- 
- # info
- for info in doc/manual/*.info
diff --git a/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch b/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
deleted file mode 100644
index bf03ada518fe..000000000000
--- a/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- sbcl-1.1.17-orig/src/runtime/Config.x86-linux	2014-03-31 03:14:22.000000000 +1100
-+++ sbcl-1.1.17/src/runtime/Config.x86-linux	2014-04-28 15:34:59.822482441 +1000
-@@ -27,7 +27,7 @@
- # (You *are* encouraged to design and implement a coherent stable
- # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
- # working on one and it would be a nice thing to have.)
--LINKFLAGS += -Wl,--export-dynamic -m32
-+LINKFLAGS += -Wl,--export-dynamic -m32 -nopie
- OS_LIBS = -ldl
- 
- ifdef LISP_FEATURE_LARGEFILE
---- sbcl-1.1.17-orig/src/runtime/Config.x86-64-linux	2014-03-31 03:14:22.000000000 +1100
-+++ sbcl-1.1.17/src/runtime/Config.x86-64-linux	2014-04-28 15:35:22.364623003 +1000
-@@ -27,7 +27,7 @@
- # (You *are* encouraged to design and implement a coherent stable
- # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
- # working on one and it would be a nice thing to have.)
--LINKFLAGS += -Wl,--export-dynamic
-+LINKFLAGS += -Wl,--export-dynamic -nopie
- OS_LIBS = -ldl
- 
- ifdef LISP_FEATURE_LARGEFILE
diff --git a/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch b/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch
deleted file mode 100644
index 850fd5d9dba7..000000000000
--- a/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r -U2 sbcl-1.2.11.orig/src/runtime/Config.x86-sunos sbcl-1.2.11/src/runtime/Config.x86-sunos
---- sbcl-1.2.11.orig/src/runtime/Config.x86-sunos	2015-04-27 20:56:50.000000000 +0600
-+++ sbcl-1.2.11/src/runtime/Config.x86-sunos	2015-04-28 22:38:01.569103626 +0600
-@@ -12,6 +12,6 @@
- CC=gcc
- CFLAGS = -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer
--NM = nm -xgp
--GREP = ggrep
-+NM = nm -t x -p
-+GREP = grep
- 
- ASSEM_SRC = x86-assem.S ldso-stubs.S
diff --git a/dev-lisp/sbcl/files/sbcl-1.2.13-verbose-build.patch b/dev-lisp/sbcl/files/sbcl-1.2.13-verbose-build.patch
deleted file mode 100644
index ade4f0868c67..000000000000
--- a/dev-lisp/sbcl/files/sbcl-1.2.13-verbose-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -r -U2 sbcl-1.2.13.orig/make.sh sbcl-1.2.13/make.sh
---- sbcl-1.2.13.orig/make.sh	2015-06-29 01:24:03.000000000 +0600
-+++ sbcl-1.2.13/make.sh	2015-06-29 15:53:04.430927942 +0600
-@@ -25,5 +25,5 @@
- # any --xc-host parameter should be suitable for the host machine
- # instead of the target.
--sh make-config.sh "$@" || exit $?
-+sh -x make-config.sh "$@" || exit $?
- 
- . output/prefix.def
-@@ -70,9 +70,9 @@
- # and the make-target-*.sh scripts will take care of transferring the
- # necessary files.
--time sh make-host-1.sh
--time sh make-target-1.sh
--time sh make-host-2.sh
--time sh make-target-2.sh
--time sh make-target-contrib.sh
-+time sh -x make-host-1.sh
-+time sh -x make-target-1.sh
-+time sh -x make-host-2.sh
-+time sh -x make-target-2.sh
-+time sh -x make-target-contrib.sh
- 
- NCONTRIBS=`find contrib -name Makefile -print | wc -l`
diff --git a/dev-lisp/sbcl/files/sbcl-1.3.11-config.patch b/dev-lisp/sbcl/files/sbcl-1.3.11-config.patch
deleted file mode 100644
index e23f1e6d9bcb..000000000000
--- a/dev-lisp/sbcl/files/sbcl-1.3.11-config.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -r -U2 sbcl-1.3.11.orig/src/runtime/Config.x86-64-linux sbcl-1.3.11/src/runtime/Config.x86-64-linux
---- sbcl-1.3.11.orig/src/runtime/Config.x86-64-linux	2016-10-30 23:28:43.000000000 +0700
-+++ sbcl-1.3.11/src/runtime/Config.x86-64-linux	2016-11-16 23:27:37.248815622 +0700
-@@ -58,12 +58,4 @@
- endif
- 
--# The following works for Ubuntu 16.10. There must be a better way to
--# do this across various flavors of linux.
--ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e no-pie),)
--CFLAGS += -fno-pie
--LINKFLAGS += -no-pie
--LDFLAGS += -no-pie
--endif
--
- # Nothing to do for after-grovel-headers.
- .PHONY: after-grovel-headers
diff --git a/dev-lisp/sbcl/files/sbcl-1.4.0-bsd-sockets-test.patch b/dev-lisp/sbcl/files/sbcl-1.4.0-bsd-sockets-test.patch
deleted file mode 100644
index d51bdd5c507c..000000000000
--- a/dev-lisp/sbcl/files/sbcl-1.4.0-bsd-sockets-test.patch
+++ /dev/null
@@ -1,383 +0,0 @@
-diff -Nuar a/contrib/sb-bsd-sockets/tests.lisp b/contrib/sb-bsd-sockets/tests.lisp
---- a/contrib/sb-bsd-sockets/tests.lisp	2017-09-30 18:30:58.000000000 +0200
-+++ b/contrib/sb-bsd-sockets/tests.lisp	2017-10-01 18:45:57.132900158 +0200
-@@ -18,11 +18,11 @@
-   (equalp (make-inet-address "242.1.211.3")  #(242 1 211 3))
-   t)
- 
--#-win32
--(deftest make-inet6-address.1
--    (equalp (make-inet6-address "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
--            #(255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255))
--  t)
-+;#-win32
-+;(deftest make-inet6-address.1
-+;    (equalp (make-inet6-address "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
-+;            #(255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255))
-+;  t)
- 
- (deftest get-protocol-by-name/tcp
-     (integerp (get-protocol-by-name "tcp"))
-@@ -35,15 +35,15 @@
- ;;; See https://bugs.launchpad.net/sbcl/+bug/659857
- ;;; Apparently getprotobyname_r on FreeBSD says -1 and EINTR
- ;;; for unknown protocols...
--#-(and freebsd sb-thread)
--#-(and dragonfly sb-thread)
--(deftest get-protocol-by-name/error
--  (handler-case (get-protocol-by-name "nonexistent-protocol")
--    (unknown-protocol ()
--      t)
--    (:no-error ()
--      nil))
--  t)
-+;#-(and freebsd sb-thread)
-+;#-(and dragonfly sb-thread)
-+;(deftest get-protocol-by-name/error
-+;  (handler-case (get-protocol-by-name "nonexistent-protocol")
-+;    (unknown-protocol ()
-+;      t)
-+;    (:no-error ()
-+;      nil))
-+;  t)
- 
- (when (handler-case (make-instance 'inet-socket
-                                    :type :stream
-@@ -102,21 +102,21 @@
-       (:no-error nil))
-   t)
- 
--#-win32
--(deftest make-inet6-socket.smoke
--  (handler-case
--      (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp"))))
--        (> (socket-file-descriptor s) 1))
--    ((or address-family-not-supported protocol-not-supported-error) () t))
--  t)
--
--#-win32
--(deftest make-inet6-socket.keyword
--  (handler-case
--      (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp)))
--        (> (socket-file-descriptor s) 1))
--    ((or address-family-not-supported protocol-not-supported-error) () t))
--  t)
-+;#-win32
-+;(deftest make-inet6-socket.smoke
-+;  (handler-case
-+;      (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp"))))
-+;        (> (socket-file-descriptor s) 1))
-+;    ((or address-family-not-supported protocol-not-supported-error) () t))
-+;  t)
-+
-+;#-win32
-+;(deftest make-inet6-socket.keyword
-+;  (handler-case
-+;      (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp)))
-+;        (> (socket-file-descriptor s) 1))
-+;    ((or address-family-not-supported protocol-not-supported-error) () t))
-+;  t)
- 
- #+ipv4-support
- (deftest* (non-block-socket)
-@@ -125,55 +125,55 @@
-     (non-blocking-mode s))
-   t)
- 
--#+ipv4-support
--(deftest inet-socket-bind
--  (let* ((tcp (get-protocol-by-name "tcp"))
--         (address (make-inet-address "127.0.0.1"))
--         (s1 (make-instance 'inet-socket :type :stream :protocol tcp))
--         (s2 (make-instance 'inet-socket :type :stream :protocol tcp)))
--    (unwind-protect
--         ;; Given the functions we've got so far, if you can think of a
--         ;; better way to make sure the bind succeeded than trying it
--         ;; twice, let me know
--         (progn
--           (socket-bind s1 address 0)
--           (handler-case
--               (let ((port (nth-value 1 (socket-name s1))))
--                 (socket-bind s2 address port)
--                 nil)
--             (address-in-use-error () t)))
--      (socket-close s1)
--      (socket-close s2)))
--  t)
--
--#-win32
--(deftest inet6-socket-bind
--  (handler-case
--      (let* ((tcp (get-protocol-by-name "tcp"))
--             (address (make-inet6-address "::1"))
--             (s1 (make-instance 'inet6-socket :type :stream :protocol tcp))
--             (s2 (make-instance 'inet6-socket :type :stream :protocol tcp)))
--        (unwind-protect
--             ;; Given the functions we've got so far, if you can think of a
--             ;; better way to make sure the bind succeeded than trying it
--             ;; twice, let me know
--             (handler-case
--                 (socket-bind s1 address 0)
--               (socket-error ()
--                 ;; This may mean no IPv6 support, can't fail a test
--                 ;; because of that (address-family-not-supported doesn't catch that)
--                 t)
--               (:no-error (x)
--                 (declare (ignore x))
--                 (handler-case
--                     (let ((port (nth-value 1 (socket-name s1))))
--                       (socket-bind s2 address port)
--                       nil)
--                   (address-in-use-error () t))))
--          (socket-close s1)
--          (socket-close s2)))
--    ((or address-family-not-supported protocol-not-supported-error) () t))
--  t)
-+;#+ipv4-support
-+;(deftest inet-socket-bind
-+;  (let* ((tcp (get-protocol-by-name "tcp"))
-+;         (address (make-inet-address "127.0.0.1"))
-+;         (s1 (make-instance 'inet-socket :type :stream :protocol tcp))
-+;         (s2 (make-instance 'inet-socket :type :stream :protocol tcp)))
-+;    (unwind-protect
-+;         ;; Given the functions we've got so far, if you can think of a
-+;         ;; better way to make sure the bind succeeded than trying it
-+;         ;; twice, let me know
-+;         (progn
-+;           (socket-bind s1 address 0)
-+;           (handler-case
-+;               (let ((port (nth-value 1 (socket-name s1))))
-+;                 (socket-bind s2 address port)
-+;                 nil)
-+;             (address-in-use-error () t)))
-+;      (socket-close s1)
-+;      (socket-close s2)))
-+;  t)
-+
-+;#-win32
-+;(deftest inet6-socket-bind
-+;  (handler-case
-+;      (let* ((tcp (get-protocol-by-name "tcp"))
-+;             (address (make-inet6-address "::1"))
-+;             (s1 (make-instance 'inet6-socket :type :stream :protocol tcp))
-+;             (s2 (make-instance 'inet6-socket :type :stream :protocol tcp)))
-+;        (unwind-protect
-+;             ;; Given the functions we've got so far, if you can think of a
-+;             ;; better way to make sure the bind succeeded than trying it
-+;             ;; twice, let me know
-+;             (handler-case
-+;                 (socket-bind s1 address 0)
-+;               (socket-error ()
-+;                 ;; This may mean no IPv6 support, can't fail a test
-+;                 ;; because of that (address-family-not-supported doesn't catch that)
-+;                 t)
-+;               (:no-error (x)
-+;                 (declare (ignore x))
-+;                 (handler-case
-+;                     (let ((port (nth-value 1 (socket-name s1))))
-+;                       (socket-bind s2 address port)
-+;                       nil)
-+;                   (address-in-use-error () t))))
-+;          (socket-close s1)
-+;          (socket-close s2)))
-+;    ((or address-family-not-supported protocol-not-supported-error) () t))
-+;  t)
- 
- #+ipv4-support
- (deftest* (simple-sockopt-test)
-@@ -241,37 +241,37 @@
- ;;; to look at /etc/syslog.conf or local equivalent to find out where
- ;;; the message ended up
- 
--#-win32
--(deftest simple-local-client
--    (progn
--      ;; SunOS (Solaris) and Darwin systems don't have a socket at
--      ;; /dev/log.  We might also be building in a chroot or
--      ;; something, so don't fail this test just because the file is
--      ;; unavailable, or if it's a symlink to some weird character
--      ;; device.
--      (when (block nil
--              (handler-bind ((sb-posix:syscall-error
--                              (lambda (e)
--                                (declare (ignore e))
--                                (return nil))))
--                (sb-posix:s-issock
--                 (sb-posix::stat-mode (sb-posix:stat "/dev/log")))))
--        (let ((s (make-instance 'local-socket :type :datagram)))
--          (format t "Connecting ~A... " s)
--          (finish-output)
--          (handler-case
--              (socket-connect s "/dev/log")
--            (sb-bsd-sockets::socket-error ()
--              (setq s (make-instance 'local-socket :type :stream))
--              (format t "failed~%Retrying with ~A... " s)
--              (finish-output)
--              (socket-connect s "/dev/log")))
--          (format t "ok.~%")
--          (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
--            (format stream
--                    "<7>bsd-sockets: Don't panic.  We're testing local-domain client code; this message can safely be ignored"))))
--      t)
--  t)
-+;#-win32
-+;(deftest simple-local-client
-+;    (progn
-+;      ;; SunOS (Solaris) and Darwin systems don't have a socket at
-+;      ;; /dev/log.  We might also be building in a chroot or
-+;      ;; something, so don't fail this test just because the file is
-+;      ;; unavailable, or if it's a symlink to some weird character
-+;      ;; device.
-+;      (when (block nil
-+;              (handler-bind ((sb-posix:syscall-error
-+;                              (lambda (e)
-+;                                (declare (ignore e))
-+;                                (return nil))))
-+;                (sb-posix:s-issock
-+;                 (sb-posix::stat-mode (sb-posix:stat "/dev/log")))))
-+;        (let ((s (make-instance 'local-socket :type :datagram)))
-+;          (format t "Connecting ~A... " s)
-+;          (finish-output)
-+;          (handler-case
-+;              (socket-connect s "/dev/log")
-+;            (sb-bsd-sockets::socket-error ()
-+;              (setq s (make-instance 'local-socket :type :stream))
-+;              (format t "failed~%Retrying with ~A... " s)
-+;              (finish-output)
-+;              (socket-connect s "/dev/log")))
-+;          (format t "ok.~%")
-+;          (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
-+;            (format stream
-+;                    "<7>bsd-sockets: Don't panic.  We're testing local-domain client code; this message can safely be ignored"))))
-+;      t)
-+;  t)
- 
- ;;; these require that the internet (or bits of it, at least) is available
- 
-@@ -387,60 +387,60 @@
-        (format t "Received ~A bytes from ~A:~A - ~A ~%"
-                len address port (subseq buf 0 (min 10 len)))))))
- 
--#+(and ipv4-support sb-thread)
--(deftest interrupt-io
--    (let (result)
--      (labels
--          ((client (port)
--             (setf result
--                   (let ((s (make-instance 'inet-socket
--                                           :type :stream
--                                           :protocol :tcp)))
--                     (socket-connect s #(127 0 0 1) port)
--                     (let ((stream (socket-make-stream s
--                                                       :input t
--                                                       :output t
--                                                       :buffering :none)))
--                       (handler-case
--                           (prog1
--                               (catch 'stop
--                                 (progn
--                                   (read-char stream)
--                                   (sleep 0.1)
--                                   (sleep 0.1)
--                                   (sleep 0.1)))
--                             (close stream))
--                         (error (c)
--                           c))))))
--           (server ()
--             (let ((s (make-instance 'inet-socket
--                                     :type :stream
--                                     :protocol :tcp)))
--               (setf (sockopt-reuse-address s) t)
--               (socket-bind s (make-inet-address "127.0.0.1") 0)
--               (socket-listen s 5)
--               (multiple-value-bind (* port)
--                   (socket-name s)
--                 (let* ((client (sb-thread:make-thread
--                                 (lambda () (client port))))
--                        (r (socket-accept s))
--                        (stream (socket-make-stream r
--                                                    :input t
--                                                    :output t
--                                                    :buffering :none))
--                        (ok :ok))
--                   (socket-close s)
--                   (sleep 5)
--                   (sb-thread:interrupt-thread client
--                                               (lambda () (throw 'stop ok)))
--                   (sleep 5)
--                   (setf ok :not-ok)
--                   (write-char #\x stream)
--                   (close stream)
--                   (socket-close r))))))
--        (server))
--      result)
--  :ok)
-+;#+(and ipv4-support sb-thread)
-+;(deftest interrupt-io
-+;    (let (result)
-+;      (labels
-+;          ((client (port)
-+;             (setf result
-+;                   (let ((s (make-instance 'inet-socket
-+;                                           :type :stream
-+;                                           :protocol :tcp)))
-+;                     (socket-connect s #(127 0 0 1) port)
-+;                     (let ((stream (socket-make-stream s
-+;                                                       :input t
-+;                                                       :output t
-+;                                                       :buffering :none)))
-+;                       (handler-case
-+;                           (prog1
-+;                               (catch 'stop
-+;                                 (progn
-+;                                   (read-char stream)
-+;                                   (sleep 0.1)
-+;                                   (sleep 0.1)
-+;                                   (sleep 0.1)))
-+;                             (close stream))
-+;                         (error (c)
-+;                           c))))))
-+;           (server ()
-+;             (let ((s (make-instance 'inet-socket
-+;                                     :type :stream
-+;                                     :protocol :tcp)))
-+;               (setf (sockopt-reuse-address s) t)
-+;               (socket-bind s (make-inet-address "127.0.0.1") 0)
-+;               (socket-listen s 5)
-+;               (multiple-value-bind (* port)
-+;                   (socket-name s)
-+;                 (let* ((client (sb-thread:make-thread
-+;                                 (lambda () (client port))))
-+;                        (r (socket-accept s))
-+;                        (stream (socket-make-stream r
-+;                                                    :input t
-+;                                                    :output t
-+;                                                    :buffering :none))
-+;                        (ok :ok))
-+;                   (socket-close s)
-+;                   (sleep 5)
-+;                   (sb-thread:interrupt-thread client
-+;                                               (lambda () (throw 'stop ok)))
-+;                   (sleep 5)
-+;                   (setf ok :not-ok)
-+;                   (write-char #\x stream)
-+;                   (close stream)
-+;                   (socket-close r))))))
-+;        (server))
-+;      result)
-+;  :ok)
- 
- (defmacro with-client-and-server (((socket-class &rest common-initargs)
-                                    (listen-socket-var &rest listen-address)
-@@ -503,8 +503,9 @@
-             (define-shutdown-test ,(make-name 'shutdown.client.ub8)
-               client server (unsigned-byte 8) ,direction)))))
- 
--  (define-shutdown-tests :output)
--  (define-shutdown-tests :io))
-+;  (define-shutdown-tests :output)
-+;  (define-shutdown-tests :io)
-+)
- 
- #+linux
- (deftest abstract.smoke
diff --git a/dev-lisp/sbcl/files/sbcl-1.4.0-verbose-build.patch b/dev-lisp/sbcl/files/sbcl-1.4.0-verbose-build.patch
deleted file mode 100644
index 27ad3b0758d4..000000000000
--- a/dev-lisp/sbcl/files/sbcl-1.4.0-verbose-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nuar a/make.sh b/make.sh
---- a/make.sh	2017-09-30 18:30:58.000000000 +0200
-+++ b/make.sh	2017-10-01 18:08:26.742909789 +0200
-@@ -24,7 +24,7 @@
- # thing" when run on the target machine, with the minor caveat that
- # any --xc-host parameter should be suitable for the host machine
- # instead of the target.
--sh make-config.sh "$@" || exit $?
-+sh -x make-config.sh "$@" || exit $?
- 
- . output/prefix.def
- . output/build-config
-@@ -76,11 +76,11 @@
-         $@
-     fi
- }
--maybetime sh make-host-1.sh
--maybetime sh make-target-1.sh
--maybetime sh make-host-2.sh
--maybetime sh make-target-2.sh
--maybetime sh make-target-contrib.sh
-+maybetime sh -x make-host-1.sh
-+maybetime sh -x make-target-1.sh
-+maybetime sh -x make-host-2.sh
-+maybetime sh -x make-target-2.sh
-+maybetime sh -x make-target-contrib.sh
- 
- NCONTRIBS=`find contrib -name Makefile -print | wc -l`
- NPASSED=`find obj/asdf-cache -name test-passed.test-report -print | wc -l`
diff --git a/dev-lisp/sbcl/files/sbcl-1.4.9-gcc-10.patch b/dev-lisp/sbcl/files/sbcl-1.4.9-gcc-10.patch
deleted file mode 100644
index 216422e9a60b..000000000000
--- a/dev-lisp/sbcl/files/sbcl-1.4.9-gcc-10.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/777582
-https://src.fedoraproject.org/rpms/sbcl/blob/rawhide/f/sbcl-1.4.14-gcc10.patch
---- a/src/runtime/linux-os.c
-+++ b/src/runtime/linux-os.c
-@@ -64,7 +64,7 @@ int personality (unsigned long);
- #include <sys/personality.h>
- #endif
- 
--size_t os_vm_page_size;
-+//size_t os_vm_page_size;
- 
- #if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_FUTEX) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX)
- #include <sys/syscall.h>
diff --git a/dev-lisp/sbcl/sbcl-1.3.11.ebuild b/dev-lisp/sbcl/sbcl-1.3.11.ebuild
deleted file mode 100644
index ff24bfe13357..000000000000
--- a/dev-lisp/sbcl/sbcl-1.3.11.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2022 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.2.7
-BV_AMD64=1.3.11
-BV_PPC=1.2.7
-BV_SPARC=1.0.28
-BV_ALPHA=1.0.28
-BV_ARM=1.3.9
-BV_ARM64=1.3.11
-BV_PPC_MACOS=1.0.47
-BV_X64_MACOS=1.2.11
-BV_SPARC_SOLARIS=1.0.23
-BV_X86_SOLARIS=1.2.7
-BV_X64_SOLARIS=1.2.7
-
-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 )
-	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
-	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
-	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-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 )"
-
-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.1:="
-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() {
-	eapply "${FILESDIR}"/gentoo-fix_install_man.patch
-	# bug #468482
-	eapply "${FILESDIR}"/concurrency-test-1.2.6.patch
-	# bugs #486552, #527666, #517004
-	eapply "${FILESDIR}"/bsd-sockets-test-1.2.11.patch
-	# bugs #560276, #561018
-	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
-	# bug #599902
-	eapply "${FILESDIR}"/${PN}-1.3.11-config.patch
-
-	eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
-	eapply "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch
-
-	# To make the hardened compiler NOT compile with -fPIE -pie
-	if gcc-specs-pie ; then
-		einfo "Disabling PIE..."
-		eapply "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
-	fi
-
-	eapply_user
-
-	# bug #526194
-	sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \
-		-e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \
-		-i src/runtime/GNUmakefile || die
-
-	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
-		-i make-config.sh || die
-
-	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || 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
-
-	strip-unsupported-flags ; filter-flags -fomit-frame-pointer
-
-	# 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
-	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-1.4.9.ebuild b/dev-lisp/sbcl/sbcl-1.4.9.ebuild
deleted file mode 100644
index a206148ab726..000000000000
--- a/dev-lisp/sbcl/sbcl-1.4.9.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2022 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=1.4.8
-BV_PPC=1.2.7
-BV_PPC64LE=1.5.8
-BV_SPARC=1.0.28
-BV_ALPHA=1.0.28
-BV_ARM=1.3.12
-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 )
-	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 )"
-
-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.1:="
-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-1.3.15.patch
-	# bugs #486552, #527666, #517004
-	eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch
-	# bugs #560276, #561018
-	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
-
-	eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
-	eapply "${FILESDIR}"/${PN}-1.4.0-verbose-build.patch
-
-	# bug #777582
-	eapply "${FILESDIR}"/${PN}-1.4.9-gcc-10.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
-	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.11.ebuild b/dev-lisp/sbcl/sbcl-2.1.11.ebuild
deleted file mode 100644
index a7da3fbabdee..000000000000
--- a/dev-lisp/sbcl/sbcl-2.1.11.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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.11
-BV_PPC=1.2.7
-BV_PPC64LE=1.5.8
-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 )
-	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 )"
-
-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:="
-BDEPEND="${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.2.0.ebuild b/dev-lisp/sbcl/sbcl-2.2.0.ebuild
index e71871384dcb..39e5a7ef3dba 100644
--- a/dev-lisp/sbcl/sbcl-2.2.0.ebuild
+++ b/dev-lisp/sbcl/sbcl-2.2.0.ebuild
@@ -39,7 +39,7 @@ 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"
+KEYWORDS="-* amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="debug doc source +threads +unicode zlib"
 
 CDEPEND=">=dev-lisp/asdf-3.3:="
diff --git a/dev-lisp/sbcl/sbcl-2.2.1.ebuild b/dev-lisp/sbcl/sbcl-2.2.2.ebuild
index b59b084c7017..bb519f27a98c 100644
--- a/dev-lisp/sbcl/sbcl-2.2.1.ebuild
+++ b/dev-lisp/sbcl/sbcl-2.2.2.ebuild
@@ -7,7 +7,7 @@ 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.2.1
+BV_AMD64=2.2.2
 BV_PPC=1.2.7
 BV_PPC64LE=1.5.8
 BV_SPARC=1.0.28
diff --git a/dev-lisp/uiop/Manifest b/dev-lisp/uiop/Manifest
index a8736d862ce4..7661af74400d 100644
--- a/dev-lisp/uiop/Manifest
+++ b/dev-lisp/uiop/Manifest
@@ -1,9 +1,3 @@
-DIST asdf-3.1.5.tar.gz 400359 BLAKE2B 586a66799a37259694baa673f2849e183fac5fedfe5ff5c92529d47fc0954d40b48bbc095db926b9ea2214b551729c269d0925e4396a52310b72fd5f21842f49 SHA512 937d45eabea0853cd1b2e78e84cf33e7b55065857ffcf49fd87ccd60e21ae09c6dc7ab3649d48b37aeb1beaeeaf6c816e5ce035f0283707105296fb976044516
-DIST asdf-3.3.1.tar.gz 479255 BLAKE2B 5161b79741a52721eaa4da80a61bbe51e924967ecb744a087fdcbd99407abcc42faf39eafe6d30af7dd8af751a80caaf23e93ce42aa5f584123a1e8b528cc613 SHA512 bf5efec4518eb5312ce743c0fbe60c587bebfe26c36c833c163d67bf8631e18eeb293f2185e547f6be10da061a17f024d9f4a3a0808727d7b9b3a7d7a0faf133
-DIST uiop-3.3.2.tar.gz 98207 BLAKE2B a003fabde2ee66244e48caa5ae319fb7ce872dc72cdb8f66c39cfa97a5fc5307de667b48a403432cc3c5cf3d8bfa2e3d330ee91b6251add532ec462d0c4c1d29 SHA512 3af6bfc7d0aa6ee102d3d9cbef3277026d9d7ac4811f6c966b4a9f84ab1e0f128822bddcf8b221288a3c895fc5be377f0ae907e2a08f38e6b09f36e5b4635ecc
 DIST uiop-3.3.5.tar.gz 103922 BLAKE2B af730c5241245f7d6f41fff32c734a2e3f8c4a86590e5b2cacea0af1f71fdc8f89849c35cb906623d76046ee1928ad1b913364eea3819b546aa37a4494f1fa2b SHA512 33faf9c1d7e48d1573dd17201cbce312ef42edf64ad98576c25fdc51dcd0421322678e9e31f0558450768c6f742882fea80980d2c393b2d64359198091a939f6
-EBUILD uiop-3.1.5.ebuild 872 BLAKE2B 1a67368a313e8b3983690a808623bf6c0d7bfbc4b0ba27af149bd577ff8851f6dd4742b3c50b4141a99a66877085026099a0910c11d0afc816917536490a0789 SHA512 34c553b6dbdb4a5d74f2d9cc8b733e0f455e495b73dc613e3a3ab21f5303e5b42a1a01a57bdad96f0b9a2c2dcd2d4c55c2edce0e7c8dc6c2768f30bdd6debf68
-EBUILD uiop-3.3.1.ebuild 795 BLAKE2B 64bfcaffbeae8199d979ca5ea3c443a1ba94fada891057d526072e730466e4c8e9b18263890f98f070d1d50598166dce17467e7ca64a8e182d2851a0b1b5c015 SHA512 88636056c1dc49bdffb0d15c028eb146b1b3014eb29cc2128102d16fc302f9bd085b5b0a7ae5864fa42fdce13e578ac4568dd046ada44e3853a5296459ec9608
-EBUILD uiop-3.3.2.ebuild 468 BLAKE2B fa94a4e7072725315703ba2308de8d13f1d9918dfc090f91d908bca3832512682f6035f1dacbc5e3ce41e4ee26bf044c4196f4edb769254edf80c77f790aafa6 SHA512 8adca1bc57a19ce746e061c4a4504e4901beb41dc3b8c4ddf422bb149cd593b8d2d3a7fc175dda0d986e0055c24d28cd7097a718d5ac10f49d7d8d499f04cf58
-EBUILD uiop-3.3.5.ebuild 465 BLAKE2B 5c06d1bace007d2ab63964337ea6cba7e86b8c781125d0075a2e3c43e07957cce6235c7bad06191b9ffb8f2ee4408b576d76a5c572f5f7a02f928f3965459ed9 SHA512 50fea05c5e9cc4838ba95d1d48c58e9724501af8ca231235fe635a83a864e0283940a2e4571a0ebc26fab9e134445d6f728f68033e5bfa81a34eb68d6136389f
+EBUILD uiop-3.3.5.ebuild 462 BLAKE2B 7b008a9231c0d0a5ce7de0823f9428ca2c6fb3e8a2fb41fae254b0b165862ae0650a6dc46bff605a5dbd60f5c3c58c8ebd29c9b29c0a2d1deadebb2bcfdd8cb2 SHA512 c794e01e32474fc9a8562876f8e41c99b0f4ad66c646a045f81f0568b0e6034988d596b9cc57b200c56ad694b5d36e6724a1025d5a287f73fb7f26ffa1e1fc8f
 MISC metadata.xml 262 BLAKE2B 9d57142b15b4db8306f29f0644b2898c7b8674bdeccf72f654028ba92be886bcf341a224babb36e26363e35761f2f571637b4774f2bad6259202ac4b9c32eb19 SHA512 2066fb6068acc9947350a565fae1b067f16fb7b3223338d7d2c023caf443c472bab6024bf84c3b8c2d71a53cb37a61a682971864dba11be196ae22e4996cdff2
diff --git a/dev-lisp/uiop/uiop-3.1.5.ebuild b/dev-lisp/uiop/uiop-3.1.5.ebuild
deleted file mode 100644
index baf6885d2494..000000000000
--- a/dev-lisp/uiop/uiop-3.1.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="UIOP is a portability layer spun off ASDF3"
-HOMEPAGE="http://common-lisp.net/project/asdf/"
-SRC_URI="http://common-lisp.net/project/asdf/archives/asdf-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="~dev-lisp/asdf-${PV}"
-
-S="${WORKDIR}/asdf-${PV}/${PN}"
-
-src_install() {
-	insinto /usr/share/common-lisp/source/${PN}
-	doins -r contrib *.lisp ../version.lisp-expr uiop.asd asdf-driver.asd
-	dodir /usr/share/common-lisp/systems
-	dosym /usr/share/common-lisp/source/${PN}/uiop.asd /usr/share/common-lisp/systems/uiop.asd
-	dosym /usr/share/common-lisp/source/${PN}/asdf-driver.asd /usr/share/common-lisp/systems/asdf-driver.asd
-}
diff --git a/dev-lisp/uiop/uiop-3.3.1.ebuild b/dev-lisp/uiop/uiop-3.3.1.ebuild
deleted file mode 100644
index ab7fd579f317..000000000000
--- a/dev-lisp/uiop/uiop-3.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit common-lisp-3
-
-DESCRIPTION="UIOP is a portability layer spun off ASDF3"
-HOMEPAGE="http://common-lisp.net/project/asdf/"
-SRC_URI="http://common-lisp.net/project/asdf/archives/asdf-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="~dev-lisp/asdf-${PV}"
-
-S="${WORKDIR}/asdf-${PV}/${PN}"
-
-src_install() {
-	insinto "${CLSOURCEROOT}/${PN}"
-	doins -r contrib *.lisp ../version.lisp-expr "${PN}.asd" asdf-driver.asd
-	dodir "${CLSYSTEMROOT}"
-	dosym "${CLSOURCEROOT}/${PN}/${PN}.asd" "${CLSYSTEMROOT}/${PN}.asd"
-	dosym "${CLSOURCEROOT}/${PN}/asdf-driver.asd" "${CLSYSTEMROOT}/asdf-driver.asd"
-}
diff --git a/dev-lisp/uiop/uiop-3.3.2.ebuild b/dev-lisp/uiop/uiop-3.3.2.ebuild
deleted file mode 100644
index 7907302505f9..000000000000
--- a/dev-lisp/uiop/uiop-3.3.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit common-lisp-3
-
-DESCRIPTION="UIOP is a portability layer spun off ASDF3"
-HOMEPAGE="http://common-lisp.net/project/asdf/"
-SRC_URI="http://common-lisp.net/project/asdf/archives/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="~dev-lisp/asdf-${PV}"
diff --git a/dev-lisp/uiop/uiop-3.3.5.ebuild b/dev-lisp/uiop/uiop-3.3.5.ebuild
index d6cfc0b7e84d..d591555987e7 100644
--- a/dev-lisp/uiop/uiop-3.3.5.ebuild
+++ b/dev-lisp/uiop/uiop-3.3.5.ebuild
@@ -11,6 +11,6 @@ SRC_URI="http://common-lisp.net/project/asdf/archives/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 
 RDEPEND="~dev-lisp/asdf-${PV}"
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /dev-lisp
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)