gentoo resync : 04.01.2022

20 files changed, 112 insertions, 265 deletions

diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 916467a2d9ec..ce2f7fecae07 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/abcl/Manifest b/dev-lisp/abcl/Manifest
index d006fd5eff4b..b44c34ff69c3 100644
--- a/dev-lisp/abcl/Manifest
+++ b/dev-lisp/abcl/Manifest
@@ -1,3 +1,3 @@
 DIST abcl-src-1.8.0.tar.gz 2613411 BLAKE2B cd50e5df0b7e48c902bc904ca4ea0e9c293241e04cfda154cb388c5f58da921645333fca8e0a95768a550fcb2a5b6346b3e8958745138ea6826f5c5a62ef0faf SHA512 90cc2d1e52a4dc83a0159a5763d2c7eb344952786a805a82180e0000a0cae26d89ae5a9293b629b7b5131eac05668fe21711abca32aebe05d7400187b0b3793b
-EBUILD abcl-1.8.0.ebuild 775 BLAKE2B a4672cdbe372616c76c270ce498a96e604667cf4e8420fe4753877bee70ff4284443a11c0873a89b988c6c60aacd94dec8c35459ab9c73ceaf8e4fc950fd0662 SHA512 f2f52762bd57100522c16a7ee912128497f8a62d6cda5cbf235a9723904fa0790e7d006dda42aa98ca3580fb08b0599a367bce37e51b9452146fc282933ddde4
+EBUILD abcl-1.8.0.ebuild 774 BLAKE2B cf3fc0ca35085a1cce606190c6165eae859911f1dfdccddfd74635060ac465c4a7abe4bcc690ee79acc45f0b03c6ce2dc81258f9d339eb48ee5217f0a3143c4c SHA512 3f8252ed25c396dcc2f86eeeb399721980a60b55db527b20dd85faa61489515b06a561c3c0d062fc981446a5c802cbf935ae3646f357c8dfdc34674f27ef8659
 MISC metadata.xml 510 BLAKE2B 60a7dcd088008c5e66f197d7cf3bbfadec55977620f2be7a80e52ec37f9fe4357de98dbda7d9243eaf260748b5fba6728bb5820e80b7c118e972997bf01bea43 SHA512 3130f34d272b11299a2e65338fc822e9e693f348e828bb79acc756461e4736a2030684087928c177e50bfae4099b9d537e067c961a44ecef622d2c42977c6c0e
diff --git a/dev-lisp/abcl/abcl-1.8.0.ebuild b/dev-lisp/abcl/abcl-1.8.0.ebuild
index ed631f697127..b1292825bfd6 100644
--- a/dev-lisp/abcl/abcl-1.8.0.ebuild
+++ b/dev-lisp/abcl/abcl-1.8.0.ebuild
@@ -7,7 +7,7 @@ inherit java-pkg-2 java-ant-2
 
 MY_P=${PN}-src-${PV}
 
-DESCRIPTION="Armed Bear Common Lisp is a Common Lisp implementation for the JVM."
+DESCRIPTION="Armed Bear Common Lisp is a Common Lisp implementation for the JVM"
 HOMEPAGE="http://common-lisp.net/project/armedbear/"
 SRC_URI="http://abcl.org/releases/${PV}/${MY_P}.tar.gz"
 
diff --git a/dev-lisp/asdf/Manifest b/dev-lisp/asdf/Manifest
index 8137d9be3987..0bd252fe3348 100644
--- a/dev-lisp/asdf/Manifest
+++ b/dev-lisp/asdf/Manifest
@@ -3,8 +3,10 @@ AUX source-registry.conf 138 BLAKE2B 1adc9396d0d23b361c52d70b1c10d7f5e031776b1a5
 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 1539 BLAKE2B b34931ef5a2730a3756e8560937823ec87c38ec548f427e0edfd2c865feaa31e8b03bc0764cbb52e736801d5bc905ed29527833892e6202a3f92e57acc5dc1c1 SHA512 0ae2d0b90e335657dd0ed999340ffba67515c9a54df63b8de25e01698c37c2b86126e3755dd06e5bfa7410a4caff3163f90a775ad58a26138de14e0255774fc5
 MISC metadata.xml 262 BLAKE2B 9d57142b15b4db8306f29f0644b2898c7b8674bdeccf72f654028ba92be886bcf341a224babb36e26363e35761f2f571637b4774f2bad6259202ac4b9c32eb19 SHA512 2066fb6068acc9947350a565fae1b067f16fb7b3223338d7d2c023caf443c472bab6024bf84c3b8c2d71a53cb37a61a682971864dba11be196ae22e4996cdff2
diff --git a/dev-lisp/asdf/asdf-3.3.5.ebuild b/dev-lisp/asdf/asdf-3.3.5.ebuild
new file mode 100644
index 000000000000..31ecf4bf0366
--- /dev/null
+++ b/dev-lisp/asdf/asdf-3.3.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 || die
+		dodoc *.{html,css,ico,png} ${PN}.pdf
+		dodoc -r asdf
+	)
+
+	if has_version ">=dev-lisp/sbcl-1.4.0" ; then
+		(
+			cd doc || die
+			doinfo ${PN}.info
+		)
+	fi
+}
+
+src_compile() {
+	emake
+
+	use doc && emake -C doc
+}
+
+src_test() {
+	common-lisp-export-impl-args "$(common-lisp-find-lisp-impl)"
+
+	rm test/test-program.script || die
+
+	# sbcl in common-lisp.eclass has --non-interactive in the binary name
+	# which seems to break this?
+	test/run-tests.sh ${CL_BINARY/--non-interactive/} || die
+}
+
+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/cl-ppcre-unicode/Manifest b/dev-lisp/cl-ppcre-unicode/Manifest
index 058d8cd03167..68f4e608aa50 100644
--- a/dev-lisp/cl-ppcre-unicode/Manifest
+++ b/dev-lisp/cl-ppcre-unicode/Manifest
@@ -1,5 +1,5 @@
 DIST cl-ppcre-2.0.11.tar.gz 158418 BLAKE2B d65aa1a565dbe6c9d10e4dafe323ab1332929e46e00ea2e9775ad940ed5ac983520c0e423daa17bf0173420d2269b5af2fd9b52f8d3dbcb0c778e03e61ef052d SHA512 c693c568065c0571e5509599018e58951425a857cec3793312af0d22e248e32233f924eafc8ba67fbedad38cb3f4efa11343b785b073eaac53c31871422488b1
 DIST cl-ppcre-2.1.0.tar.gz 159051 BLAKE2B d1b9dd93c3f4c4c3a23a7c01f28cc4a8cc8543bfa3280f60b53d61dadb377f9e45c0f79592323bb7dcaf06721d899159f958f5b7d391370eeb5c6ede81a7a0cd SHA512 c9c95c58628fd5ecebf6e24e0c26913719360c325e90e78c256d1306eb8c2cbe85a2a5f617fdb6c2a7091bd80f4021ad0d294371b2696ad8e5873eca13aab866
-EBUILD cl-ppcre-unicode-2.0.11.ebuild 639 BLAKE2B 85753d445f675c5b3d5be5360dbc63f68c3d03eda705ad2528342911ad815b0e2b4fe7b519b7c92b3e4c89443c635e61c2526ee28b1d1f25e08fc2bc3af5dd39 SHA512 2cd35a3f05ca5e96febb6886abce59229c65abf7b662b32deb8ed47f560606b6e6030a94bb9d19a2ebd43b6bbca1a989b78861dbaa2b82240c9f3162809bbe80
-EBUILD cl-ppcre-unicode-2.1.0.ebuild 641 BLAKE2B e977f0fa3a3237b507a0f773696a7179fd5ea62a6a4b2a6ccc4f1c23661dda84792836d4f6cb5ca8d24097233eae98e51fa92ae2a33d7464d37ce6d41cd5fc01 SHA512 e06ec96347dda45bd8ccd620a3558a9385cad620cf723484e7314970956c3904a3c710fcba888eb95883d67d4000965eabdecb780b1d9fb3e12f0000873e42fe
+EBUILD cl-ppcre-unicode-2.0.11.ebuild 635 BLAKE2B 86bacd24aee1cbc4f6b896a45abf129b95e2d55c0878c78def72ab38c249e9fcd7337b4dce6fdc6255930119e7952b31106a352ab7475123df0d1f5def494a96 SHA512 d0e95339960e246333bcfc3b551470e66d4ea0dd61d7a4f57cdac03314023072f05364edbfebb8ba5a5d3ba991da3507fbb7b355f94731ea79c20920d3a4f634
+EBUILD cl-ppcre-unicode-2.1.0.ebuild 637 BLAKE2B 6cd535248eb0855f2d698accc951db7a1c2648f8bf067643b63c894ea1c0cd9d032cc61f560c3753dd51955416f94f122a08b7ffaf4febe511b2da7d7a45446f SHA512 1ae87eebd5a9c355f45b686451cd3f64f52b4b18bff58fb127884eea1e7dec9cd80701fcaccb570894322a2140d203bd36b8019409d614c3bc74e460280bddf9
 MISC metadata.xml 648 BLAKE2B dda312f58db10dc566b82f4f351644faf562d1e4c760bc34372b6ed7dc70ef4a61862fb610ddf81f26766f6c1e11647ac03394e4bd23658384360b785255e92a SHA512 3aa5df5d070f7d01aa3cbc8122df760e7cbacd95220cb9c23026ba739c0771d991b0bf1eb1343fa3502184b0dc3e2ac49482f377ff7d88f82b856b0c11fff867
diff --git a/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.0.11.ebuild b/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.0.11.ebuild
index 34ef1cfdf678..0a98f781406a 100644
--- a/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.0.11.ebuild
+++ b/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.0.11.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit common-lisp-3
 
-DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp."
+DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp"
 HOMEPAGE="http://weitz.de/cl-ppcre/
 		  http://www.cliki.net/cl-ppcre"
 SRC_URI="https://github.com/edicl/cl-ppcre/archive/v${PV}.tar.gz -> cl-ppcre-${PV}.tar.gz"
diff --git a/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.1.0.ebuild b/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.1.0.ebuild
index 8203612b0edc..140ebc0154d6 100644
--- a/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.1.0.ebuild
+++ b/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.1.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit common-lisp-3
 
-DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp."
+DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp"
 HOMEPAGE="http://weitz.de/cl-ppcre/
 		  http://www.cliki.net/cl-ppcre"
 SRC_URI="https://github.com/edicl/cl-ppcre/archive/v${PV}.tar.gz -> cl-ppcre-${PV}.tar.gz"
diff --git a/dev-lisp/cl-ppcre/Manifest b/dev-lisp/cl-ppcre/Manifest
index c2f3d14488c3..bae536b16bf4 100644
--- a/dev-lisp/cl-ppcre/Manifest
+++ b/dev-lisp/cl-ppcre/Manifest
@@ -1,5 +1,5 @@
 DIST cl-ppcre-2.0.11.tar.gz 158418 BLAKE2B d65aa1a565dbe6c9d10e4dafe323ab1332929e46e00ea2e9775ad940ed5ac983520c0e423daa17bf0173420d2269b5af2fd9b52f8d3dbcb0c778e03e61ef052d SHA512 c693c568065c0571e5509599018e58951425a857cec3793312af0d22e248e32233f924eafc8ba67fbedad38cb3f4efa11343b785b073eaac53c31871422488b1
 DIST cl-ppcre-2.1.0.tar.gz 159051 BLAKE2B d1b9dd93c3f4c4c3a23a7c01f28cc4a8cc8543bfa3280f60b53d61dadb377f9e45c0f79592323bb7dcaf06721d899159f958f5b7d391370eeb5c6ede81a7a0cd SHA512 c9c95c58628fd5ecebf6e24e0c26913719360c325e90e78c256d1306eb8c2cbe85a2a5f617fdb6c2a7091bd80f4021ad0d294371b2696ad8e5873eca13aab866
-EBUILD cl-ppcre-2.0.11.ebuild 714 BLAKE2B 6ac97f59ba11da102219ac54c28ef70b8880d0104296506c1f4fb348f508c9029d05dbfdf94a943c98e515dd13c6884f6b836812896f4d673c3bbe30473a99d8 SHA512 989a3f6dbf2468d8bf3dfb8e70a6189acd7fc63cee69bea26a81519d777a96b03d7722a2d9651f7cf82d1933dba1a5a912d0782bb520300dbc78e875caf551cc
-EBUILD cl-ppcre-2.1.0.ebuild 717 BLAKE2B 655377ddc98620bae830d3855130b9cd97b02c1e40810a4b8fa57573b81c10a37592032f3879a6b3272260f46529c29005aabd83dcbbb51546aced5f54540d3a SHA512 0432c0c205cd654fd96de60b8f2e2a9c6db847fbea3e2ca2173a3cf175544b4cc7beda3822ab4bcdca5ea604fa58a552cf8d7282d3124ade6902630d7a518aaf
+EBUILD cl-ppcre-2.0.11.ebuild 710 BLAKE2B 6a8f63e50ca1095fb2a3c08c04b5504baaa492b7ccd6f2dc52e5cbef5cc5f4bfddb2a863ee4013be8f3bff6647c9d925dd10058e03dd0e307fb181493a28023d SHA512 f57734226584643c61a85898981704f86b56bbf44e7a61ad19de325e5398ac9e6c5d680d852b2abec6958144b7faf9d3e58a4420a35cbbcc5c4d4702988cc28b
+EBUILD cl-ppcre-2.1.0.ebuild 713 BLAKE2B 3e6dd52a7aeec800912ec8b646394cf8f9a64fc03237638b383c7a5bd5dfc8e4d1ab5b7611e3d6a605010fb4962c25e1110d7fe64671f6d69b0db4c11a3a6616 SHA512 3d0d2539d24be30cf8eb0d5b2f6de7ff639efd79e87ace7685c53096ac6ef7d0c145466f852172e8c894a0422d23aef9270faf8ac7706d7193bdf6de0e630666
 MISC metadata.xml 1061 BLAKE2B 7ce31764fc9f36a8ef5acb29fe2f5ed14b3abf64db4c65ca0c090fd9ba086f720ee49ce0fc599fdaeff3a052742dfcf65f66e2851d9592baadbbf49c5f31a9c3 SHA512 69df3fb80850f822f4c68eee7c8fbf5df26a04105e51dcc53038a46f472d41ee6481b0f4733360b3647797887cefeb9c4f79d063bd7472a125098475e620f74c
diff --git a/dev-lisp/cl-ppcre/cl-ppcre-2.0.11.ebuild b/dev-lisp/cl-ppcre/cl-ppcre-2.0.11.ebuild
index df216d535ff0..8a19e08dbe89 100644
--- a/dev-lisp/cl-ppcre/cl-ppcre-2.0.11.ebuild
+++ b/dev-lisp/cl-ppcre/cl-ppcre-2.0.11.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit common-lisp-3
 
-DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp."
+DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp"
 HOMEPAGE="http://weitz.de/cl-ppcre/
 		  http://www.cliki.net/cl-ppcre"
 SRC_URI="https://github.com/edicl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-lisp/cl-ppcre/cl-ppcre-2.1.0.ebuild b/dev-lisp/cl-ppcre/cl-ppcre-2.1.0.ebuild
index 70c99953770f..668039a6537c 100644
--- a/dev-lisp/cl-ppcre/cl-ppcre-2.1.0.ebuild
+++ b/dev-lisp/cl-ppcre/cl-ppcre-2.1.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit common-lisp-3
 
-DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp."
+DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp"
 HOMEPAGE="http://weitz.de/cl-ppcre/
 		  http://www.cliki.net/cl-ppcre"
 SRC_URI="https://github.com/edicl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-lisp/cl-unicode/Manifest b/dev-lisp/cl-unicode/Manifest
index 8e8797790231..1941fecf22ea 100644
--- a/dev-lisp/cl-unicode/Manifest
+++ b/dev-lisp/cl-unicode/Manifest
@@ -1,3 +1,3 @@
 DIST cl-unicode-0.1.5.tar.gz 485666 BLAKE2B 9db0714c24de4c5c79f3d7eeb471ac5d7a06dd29abd1c3c4b728c9ce98b175ea97ed20923c957a75ac7dee290f095a5c28c92da5ddc7e808d28ca624d84a37cd SHA512 0b66c0e711f7e37423aa638b43017adff648189a32032702b082dff140b2255847a15572a20f21e6f82a2e8cbd547f7f99bf9176e4fa464aa1d938575d8a2390
-EBUILD cl-unicode-0.1.5.ebuild 1068 BLAKE2B 934f0abff66f151646c4e884c540bc80ff58e50cfb6ae6b9c7a21c4c4499c7727c64c61a4cb30fefd990bd4bb26b121be91cb4ee2b78405fe6d979c35832b8ff SHA512 0b314acfac0367f59ec5690e71052a78a400f7e1631845a82152eff78328322b5f065ad227a3c74174385fe1ef4387361a9048dcc0e65bd6bb736daf48bc0a7a
+EBUILD cl-unicode-0.1.5.ebuild 1064 BLAKE2B 2697ef735e0a986d41955c41caebc5c1e8b0cf27e2a7b4f3f09191335d743f8b6bef8b1460294ec5ab9877cce9ebaa856289bc05483fa71a6d47a9a28fee542c SHA512 72d4a4a9bc2ef0150cf91df1a06a9c23a43019fa3c9192402ed309ccdf4986368beb841b972cd50ca17003d7d79fea14319c99529866ecd9874e7d04672df099
 MISC metadata.xml 1363 BLAKE2B 8447b4312a9619c24014f437792e17af4f4dd38998b9f4e595c0ca139ecaca0834543b86af20b5c567ea8d57ca9f24cdfe8d21f6ec25caa30f662f77f88fd94b SHA512 99b0cee1e43de0b1adb5746076e2501eded398dc8f2f3d6486a086985d77af9ef1644b0a8f31a3410ab0d0f6d5be740cac3024a6cd7afd76f3a46e09f129ffb1
diff --git a/dev-lisp/cl-unicode/cl-unicode-0.1.5.ebuild b/dev-lisp/cl-unicode/cl-unicode-0.1.5.ebuild
index bff440548364..d088c26abc3a 100644
--- a/dev-lisp/cl-unicode/cl-unicode-0.1.5.ebuild
+++ b/dev-lisp/cl-unicode/cl-unicode-0.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit common-lisp-3 xdg-utils
 
 MY_P="v${PV}"
 
-DESCRIPTION="Provides Common Lisp implementations with knowledge about Unicode characters."
+DESCRIPTION="Provides Common Lisp implementations with knowledge about Unicode characters"
 HOMEPAGE="http://weitz.de/cl-unicode/"
 SRC_URI="https://github.com/edicl/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-lisp/clx/Manifest b/dev-lisp/clx/Manifest
index eb818c118428..7f5bb355de68 100644
--- a/dev-lisp/clx/Manifest
+++ b/dev-lisp/clx/Manifest
@@ -1,3 +1,3 @@
 DIST clx-0.7.5.tar.gz 468904 BLAKE2B 30ce4de52fdbbc935bf5653f54a588537670b7d55dc038f32b4527e5f3d7b2dfe6afde3d28debf7ab5a08994155ec390f1e70dfbe45e8831fe7a977d245c9d7a SHA512 9228c37a99dcaee637c64c58183220c1ed3745e683c877f843c7de5b052d7355a3ddd50687371e8388c05bcedda062008299476b82dc8a3d26b605dde1dfa997
-EBUILD clx-0.7.5.ebuild 873 BLAKE2B 93020909fac799e07295870fe88b602290c7fa1d000e124517035c63290b819a09bde4eb02712e1fc19ec19f3e8504d59279dfa3dfdcef5c41d19dcce7629714 SHA512 c6c97d093a932be32f857fe8400d39dc5d716bf3f7a266bbc6f33f697e60adeec194974e9b04610cdf621dcec33e8096ef77926596d24ecd49dd1d45076ec1f0
+EBUILD clx-0.7.5.ebuild 872 BLAKE2B b8e1bebb8c095bf33cb51801c1497587ef562f4c01daf21e959f1dc1944da99bb002b1c54183af711b49130ffc1e00dc086ef88a0113f09eecf2cdb46d9acc0b SHA512 c7e6e57e9adc0dd5e355a17cdfee413346c6af25426cfffd4b881bd88c99870c29c1caf5c0d6bb7fea12dc0066a94dc583a3a9df71bfa7e0be41d226174013af
 MISC metadata.xml 841 BLAKE2B b48e0da7b3ddc82519601e37a6796fc5d2165c0847b46fa67e56f3b75cdbb948b785b20c55474fa8161369645ff7a845eafed085e954345535cfeb7a7c9bafcf SHA512 0dd0b7e5f7f3a590a5b6c250a853e66f332c7c26e4b1085130ce5ecc0069800539be2a2196dd4d43060e1b5ce8e5f665a461ea51e6692e9611c90ccb28152fb0
diff --git a/dev-lisp/clx/clx-0.7.5.ebuild b/dev-lisp/clx/clx-0.7.5.ebuild
index fa078123a738..06e69d160335 100644
--- a/dev-lisp/clx/clx-0.7.5.ebuild
+++ b/dev-lisp/clx/clx-0.7.5.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit common-lisp-3
 
-DESCRIPTION="CLX is the Common Lisp interface to the X11 protocol primarily for SBCL."
+DESCRIPTION="CLX is the Common Lisp interface to the X11 protocol primarily for SBCL"
 HOMEPAGE="http://www.cliki.net/CLX"
 SRC_URI="https://github.com/sharplispers/clx/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 1c0bc0479cfb..52981e1dc86c 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -32,15 +32,12 @@ DIST sbcl-1.4.2-arm64-linux-binary.tar.bz2 10578821 BLAKE2B 1cd25c548be0f1b7ec01
 DIST sbcl-1.4.3-x86-linux-binary.tar.bz2 10227185 BLAKE2B 6d77c4f4177cbdb72fb9bab0da5bd91e0aa8deafffd238818a2551332f0ab246715d9489b5c1156f3481aa7fb79d161a988404620fc09fe86ff927543a1ee678 SHA512 41cd63d61dd7c46370341dce39a362287a23b528bfebe8e5571614aeefdea03d318207d25562e995db9ccedb6c1f50ea4d66627721f0fd9486e99440126e6a38
 DIST sbcl-1.4.8-x86-64-linux-binary.tar.bz2 10353701 BLAKE2B 5b56f46fbdb87f015ed1fe103b6caaf43d2d424b45e2574e306b3d3cbc3c7bdfa48847a2e6d7d819e6bf4b59fa02ea01f9ce6b023802ae6f91fc7f56e5a260de SHA512 f3cb3c30dec1b7e6ac0c1b67de26192723871f8a8d543a41d7c4d04b0813fd7da1043433237b648a2c23f73169fe38f2ec3a3c2bd412eb4c9d36ed929c40f27d
 DIST sbcl-1.4.9-source.tar.bz2 6051607 BLAKE2B 8abcaf73233ea1a23d47987b16554636dcf94acfbc7ab731f0730fdb4a8176593fb3ab52d9b25b3dd56753cd984f7e0eddb1585a142eb7ad1aa5e3e03d7b0ca9 SHA512 e0248f460f9737d47653dd520732062d2637813b550df356ecc90aa6d21fbdd74f03182d1e890c09c1da742f7d57b4fbd04a4e6dc36999aca51bb6c2952ac236
-DIST sbcl-2.1.10-source.tar.bz2 6680771 BLAKE2B 9d427c2c4330ee9f675cad27e8a37b20f010f900a840dc7e878d0f2d703b7a0f8704b8ac3be1d6e191ffa933338702039e3c3d105160e3c8468c99bcd703989b SHA512 83c4064b0b99e673221abbc5fd8d6c463dd2368dac7438215f0b0f847fab3999f470d15fe5a6ed504983b80d9160771c3ccb1485e4c3c973be03634ca0d7678b
-DIST sbcl-2.1.10-x86-64-linux-binary.tar.bz2 10185352 BLAKE2B 48f55807411f4614b40c447081f45597ad8ec720b1903ff57625093c9fa3b915e7f0fa31a7295d5594c5bedd2ed2da84d498df99eaa10e85761cca07c7d30f6d SHA512 557323cf0dfc5bb0a1c4908e5b46371e6f01ad8c05513d03db3e66a4e4ad0ec5bd3c57fed252209dffb8bc2179404f7626a196af19a087187ad6c4f5ba9408bf
 DIST sbcl-2.1.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.1.8-source.tar.bz2 6663139 BLAKE2B 3a1bdadfcda284c6f7c909f996bc9f9a5d0a1132a55b68d435d89138b2d144f48848d33f1c38d2b7728711660b59a0ee70e3d76f88f6528dc37e3661c7621f62 SHA512 0e2d839d262cb60b35a20558bb64b5bf4b4158dd8008c1efef74b99e300e4412b20fd9af99633ad5a0cc3c91bbfc34405ce7012d95195517d6b6f425904fb4d3
-DIST sbcl-2.1.8-x86-64-linux-binary.tar.bz2 10118495 BLAKE2B 5fd53f4e491018f4abd98ef3026982d80777f8ef38e046078679e452a00b3fddecf65139f69d1c43e21c13e1ef9b061c8d89c09de2454376a0a4e9aea2ec90f0 SHA512 9415290c1cd7d4fcb2f4da689c341af3d52346e25059a118a06fc2dd24f622ed0a7f664adddba3adb2b0ceb07c6a49a3ac9dbacf2e326d5813c44d330a6fe258
+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
 EBUILD sbcl-1.3.11.ebuild 7866 BLAKE2B 88e6b869fe4655f2a971a53213844fb08a4c6b59bc42a57dd2616c39df93e9721304f6a94b457ed3ac07ee7abb1f8321a747901f42f211b87e6a5041624c4e90 SHA512 41dfd91a56ee2dd4e2421c4fac03cd4263f4fdaee60db9e81745ec552199a7a97083194f72e1585bee7241e593a10eab3c57cbd300858e1752b909412ffca1d7
 EBUILD sbcl-1.4.9.ebuild 8213 BLAKE2B c227898102be21a2ef44b906e4316f07ad6711ef4bfd662fe391aaebbe6a515158fd41a05db644604f6fd494c04af7cb08b93e4a1dd40aa146ccbe08115be247 SHA512 674cfadbccca53a1cc4f665aa935cbc7a65cefbdd70bfb3f9b14f3b813706b2b5273380e67ca4a76b81aaa5363423feeb74fafe423121ff7e8c7427b48cc39c1
-EBUILD sbcl-2.1.10.ebuild 8235 BLAKE2B a2a46212aa7e780880bf719c3de825b85f3000f7907ded5e09dde35568e70c2cf8459a9bdaad3685701ec27e7e5753fc45ee8c09be9e115952e95404c9f5ea8a SHA512 d41bbf38261d95cc12c823173485fb8f6e32222ab9e41eb641ae5280921f856af85e4a1c72ac817b98147d251713fedb573b4015847a3cd85d0f66e0b29ed6d3
 EBUILD sbcl-2.1.11.ebuild 8235 BLAKE2B b860b17283d857d81f6ed5896dc7dfa5c3431a0eb078c6677d838b547b4632598b45b6ab66c6f8992c1c1a5154405d05f64b6967cd9847facb1778e9d54f34b0 SHA512 5bed30802da976c5b73692392e13479529f4d1c9dd87498a60f2a2590545756ea65ce3f6e45df0bdf3cf889dee21cbacf08300af859e7984b8727c7d2b0aa6fb
-EBUILD sbcl-2.1.8.ebuild 8233 BLAKE2B 821930297b7257d4f009b9866e8e3ef28000ff1cc13c81d2986570f98731c2c0f7173975a2ab58e8aeda569178eed25c4bcbcb75225889b54ec92b6a796755a1 SHA512 7ceb8d67cc5daa95907623ed09dc8e01dacf13774d6c733d0b70c39a86a8b5ce2b6dba1a0b61aba2f9276400b801256fd40c8592bf952e65a4cb4f05183bcc12
+EBUILD sbcl-2.2.0.ebuild 8234 BLAKE2B 1ce14dbab087c5a76ccf6fe75d72d1a046e9b2b1f81512d0fa26573043d0a6bdf0d2ab9ee734319338a0445c0a27709f678fe2a804b19eb56231dece2908250a SHA512 a2e7f31c7cbc27d66bd7d02def600b2c8eb1de811eff35f49091d3bd215cd448111b2636d7b7fe312b48930008c49dc4d5e7423f028b8ca09f8ad2daebc351dc
 MISC metadata.xml 1185 BLAKE2B fa1ce4556cb77fa154914a28fdd2e5dcec45498961875461f465978de4467ff16a329bfdd8a0fe161ba579639808b48af76bcd6fd22165a73d803983e6c10c91 SHA512 51bda1487ee9f95ba0e343f2990f465524590a88baba942819339697b446db3c7054d08791579c77472654f69e3f0fed8077ef2f0a9cb2314067fceff4c2c67c
diff --git a/dev-lisp/sbcl/sbcl-2.1.8.ebuild b/dev-lisp/sbcl/sbcl-2.1.8.ebuild
deleted file mode 100644
index 9ee0c49df737..000000000000
--- a/dev-lisp/sbcl/sbcl-2.1.8.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib flag-o-matic pax-utils toolchain-funcs
-
-#same order as http://www.sbcl.org/platform-table.html
-BV_X86=1.4.3
-BV_AMD64=2.1.8
-BV_PPC=1.2.7
-BV_SPARC=1.0.28
-BV_ALPHA=1.0.28
-BV_ARM=1.4.11
-BV_ARM64=1.4.2
-BV_X64_MACOS=1.2.11
-BV_PPC_MACOS=1.0.47
-BV_X86_SOLARIS=1.2.7
-BV_X64_SOLARIS=1.2.7
-BV_SPARC_SOLARIS=1.0.23
-
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
-HOMEPAGE="http://sbcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
-	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
-	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
-	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
-	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
-	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
-	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
-	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
-	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
-	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
-	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
-	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
-	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="debug doc source +threads +unicode zlib"
-
-CDEPEND=">=dev-lisp/asdf-3.3:="
-DEPEND="${CDEPEND}
-		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
-RDEPEND="${CDEPEND}
-		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
-
-# Disable warnings about executable stacks, as this won't be fixed soon by upstream
-QA_EXECSTACK="usr/bin/sbcl"
-
-CONFIG="${S}/customize-target-features.lisp"
-ENVD="${T}/50sbcl"
-
-# Prevent ASDF from using the system libraries
-CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
-ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
-
-usep() {
-	use ${1} && echo "true" || echo "false"
-}
-
-sbcl_feature() {
-	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
-}
-
-sbcl_apply_features() {
-	sed 's/^X//' > "${CONFIG}" <<-'EOF'
-	(lambda (list)
-	X  (flet ((enable  (x) (pushnew x list))
-	X         (disable (x) (setf list (remove x list))))
-	EOF
-	if use x86 || use amd64; then
-		sbcl_feature "$(usep threads)" ":sb-thread"
-	fi
-	sbcl_feature "true" ":sb-ldb"
-	sbcl_feature "false" ":sb-test"
-	sbcl_feature "$(usep unicode)" ":sb-unicode"
-	sbcl_feature "$(usep zlib)" ":sb-core-compression"
-	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
-	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
-	X    )
-	X  list)
-	EOF
-	cat "${CONFIG}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv sbcl-*-* sbcl-binary || die
-	cd "${S}"
-}
-
-src_prepare() {
-	# bug #468482
-	eapply "${FILESDIR}"/concurrency-test-2.0.1.patch
-	# bugs #486552, #527666, #517004
-	eapply "${FILESDIR}"/bsd-sockets-test-2.0.5.patch
-	# bugs #560276, #561018
-	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
-	# bug #767742
-	eapply "${FILESDIR}"/etags-2.1.0.patch
-
-	eapply "${FILESDIR}"/verbose-build-2.0.3.patch
-
-	eapply_user
-
-	# Make sure the *FLAGS variables are sane.
-	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
-	strip-unsupported-flags
-	filter-flags -fomit-frame-pointer -Wl,-s
-	filter-ldflags -s
-
-	# original bugs #526194, #620532
-	# this broke no-pie default builds, c.f. bug #632670
-	# Pass CFLAGS down by appending our value, to let users override
-	# the default values.
-	# Keep passing LDFLAGS down via the LINKFLAGS variable.
-	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
-		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
-		-i src/runtime/GNUmakefile || die
-
-	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
-		-i make-config.sh || die
-
-	# Use installed ASDF version
-	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
-	# Avoid installation of ASDF info page. See bug #605752
-	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
-
-	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
-
-	# Some shells(such as dash) don't have "time" as builtin
-	# and we don't want to DEPEND on sys-process/time
-	sed "s,^time ,," -i make.sh || die
-	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
-	# #define SBCL_HOME ...
-	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
-	# change location of /etc/sbclrc ...
-	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
-
-	find . -type f -name .cvsignore -delete
-}
-
-src_configure() {
-	# customizing SBCL version as per
-	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
-	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
-
-	# applying customizations
-	sbcl_apply_features
-}
-
-src_compile() {
-	local bindir="${WORKDIR}"/sbcl-binary
-
-	# clear the environment to get rid of non-ASCII strings, see bug #174702
-	# set HOME for paludis
-	env - HOME="${T}" PATH="${PATH}" \
-		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
-		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
-		GNUMAKE=make ./make.sh \
-		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
-		|| die "make failed"
-
-	# need to set HOME because libpango(used by graphviz) complains about it
-	if use doc; then
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/manual info html || die "Cannot build manual"
-		env - HOME="${T}" PATH="${PATH}" \
-			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
-			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
-			make -C doc/internals info html || die "Cannot build internal docs"
-	fi
-}
-
-src_test() {
-	ewarn "Unfortunately, it is known that some tests fail eg."
-	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
-	ewarn "development and not of Gentoo's side. Please, before filing"
-	ewarn "any bug(s) search for older submissions. Thank you."
-	time ( cd tests && sh run-tests.sh )
-}
-
-src_install() {
-	# install system-wide initfile
-	dodir /etc/
-	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
-	;;; The following is required if you want source location functions to
-	;;; work in SLIME, for example.
-	X
-	(setf (logical-pathname-translations "SYS")
-	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
-	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
-	X
-	;;; Setup ASDF2
-	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
-	EOF
-
-	# Install documentation
-	unset SBCL_HOME
-	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
-		sh install.sh || die "install.sh failed"
-
-	# bug #517008
-	pax-mark -mr "${D}"/usr/bin/sbcl
-
-	# rm empty directories lest paludis complain about this
-	find "${ED}" -empty -type d -exec rmdir -v {} +
-
-	if use doc; then
-		dodoc -r doc/internals/sbcl-internals
-
-		doinfo doc/manual/*.info*
-		doinfo doc/internals/sbcl-internals.info
-
-		docinto internals-notes
-		dodoc doc/internals-notes/*
-	else
-		rm -Rv "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	# install the SBCL source
-	if use source; then
-		./clean.sh
-		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
-		for d in contrib/*/; do
-			cp -av "$d" "${ED}/usr/$(get_libdir)/sbcl/" || die
-		done
-	fi
-
-	# necessary for running newly-saved images
-	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
-	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
-	doenvd "${ENVD}"
-}
diff --git a/dev-lisp/sbcl/sbcl-2.1.10.ebuild b/dev-lisp/sbcl/sbcl-2.2.0.ebuild
index 47cda449fe43..3f76c8467042 100644
--- a/dev-lisp/sbcl/sbcl-2.1.10.ebuild
+++ b/dev-lisp/sbcl/sbcl-2.2.0.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=8
@@ -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.1.10
+BV_AMD64=2.2.0
 BV_PPC=1.2.7
 BV_SPARC=1.0.28
 BV_ALPHA=1.0.28
diff --git a/dev-lisp/uiop/Manifest b/dev-lisp/uiop/Manifest
index 30410fc5006d..0f0001c43d0b 100644
--- a/dev-lisp/uiop/Manifest
+++ b/dev-lisp/uiop/Manifest
@@ -1,7 +1,9 @@
 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 460 BLAKE2B 4d9984bd08d692b0964f58ec47c75a20186a729657c2f2f9c2f848ba488146b532f9a57ba946db80cf3b82f2bdaaab183799b1c9fd71fca5eff1247069070893 SHA512 81762a985a7fa4ae46c2d9a3234cde799347d6c9f8374826b659f2a6ab842612faf38167d59deb983a6bb26cfcd695721490fa2b77c2d711438275cb6b542b9a
 MISC metadata.xml 262 BLAKE2B 9d57142b15b4db8306f29f0644b2898c7b8674bdeccf72f654028ba92be886bcf341a224babb36e26363e35761f2f571637b4774f2bad6259202ac4b9c32eb19 SHA512 2066fb6068acc9947350a565fae1b067f16fb7b3223338d7d2c023caf443c472bab6024bf84c3b8c2d71a53cb37a61a682971864dba11be196ae22e4996cdff2
diff --git a/dev-lisp/uiop/uiop-3.3.5.ebuild b/dev-lisp/uiop/uiop-3.3.5.ebuild
new file mode 100644
index 000000000000..fa5fabdb9254
--- /dev/null
+++ b/dev-lisp/uiop/uiop-3.3.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+RDEPEND="~dev-lisp/asdf-${PV}"