7 files changed, 307 insertions, 7 deletions
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index cdbd5f748fe0..df2bd7b77709 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index 78c96f1e4e5c..24013ff45c74 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -1,4 +1,6 @@
 AUX clisp-2.49.92-after_glibc_cfree_bdb.patch 8499 BLAKE2B d093b76cdf25b0822aaca87bd6055c6b58edc68e387d78d7fd979171d881fe585b674246b3a2a6f37a8412b5aef1b997210b4019a1595a07b64471cb9324656f SHA512 1b8cb29bf9caa30ca05474a67202f72f013e57d6b0d2dff1fb5ab0472df9f5c5a5b5de46922c931fa9a4d4a0a25890a05e1f7d38ddfb56c967026eef80001919
+AUX clisp-2.49.92-gdbm_and_bdb5.3.patch 4492 BLAKE2B e590a72838a15fc72ec621058fb4a2b80070f2ed89110e7f0232052b630c1d3d5d356277ba3c476ce9bb8ed6279f5c05187bf5f28ec5efbfae05bb7fc2c5dcc9 SHA512 604f03d234eff2a575e0a0eaaf235911c8c9e1d8b8ba843ddc263c0a8b3297d66017c3f672b3710a9ff59a9904f7f2b8d3bcf1a39d1d4ac752c12fa027fce7d7
 DIST clisp-2.49.92.tar.bz2 9055207 BLAKE2B 6cf331eb9f99f62579e35469e2d01cae066083592ccc71cf483b70b4d1be349cdee9d403e0a7ed1ad1c8c5d805c1dab51c1a5031d77469ff8c4dc52eb58913df SHA512 cc9412a7b3f21c85b040bf5e660380fafb3c2374765a1c00272feb3f7838f2161e27a5d6295cef9976f0c4522f10796cf5ee5447716090d1cc69ecfe598ef306
 EBUILD clisp-2.49.92-r1.ebuild 4120 BLAKE2B 4c5c561486a39e75eafa4e888c0163a78bd2c9200a2c9d56b561052b574eed90f5ffbe6a18c7e3316a60bcd446c8e933f0675fe60abbb19bb8e7c14890e17cf7 SHA512 106014a3f803f9c1ed88cc80c265c56a1922f9f9d2cb8d25c596e87f617b88348fa85dffd970e80b74ba3ad651fc5bc019cd4a6c0c036e9cd450fc243ab16f5e
+EBUILD clisp-2.49.92-r2.ebuild 4640 BLAKE2B d21f60d71b82fee6656b1b0b72146ff7c43e13c6036ddbf80f224ad0ffa42e39a1cc3481fa1de5cbb3b6e9214fe13885c06609db9a421aa3dd2e225025aba7a5 SHA512 7dc8867b87a9302a8e7492b79287501ea94077d7160ebf09d8cee43e4e4b7027cdde3c62dfae129d58d654da75270399fed1bced9a8a090ad8afc02cab30d344
 MISC metadata.xml 1308 BLAKE2B 02dbccbb3e24ce041a0e2823ce2e815931d23c899d38d4196ace33ebe17d7f84604437b3fb40916c79d0fe58e1acda1fad27743df542e37e6b2bbbad694f185b SHA512 47baf028f20c851e2bd8d0e384c34e2961581221a308f969961b3148f6718255bcc9138fb8475ad6ffc1073aeb33bd05a8b89d3259da8ac7eb027147279c9bb6
diff --git a/dev-lisp/clisp/clisp-2.49.92-r2.ebuild b/dev-lisp/clisp/clisp-2.49.92-r2.ebuild
new file mode 100644
index 000000000000..167263a375bf
--- /dev/null
+++ b/dev-lisp/clisp/clisp-2.49.92-r2.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="Portable, bytecode-compiled implementation of Common Lisp"
+HOMEPAGE="https://clisp.sourceforge.io/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="2/8"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+# "jit" disabled ATM
+IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk +pcre postgres +readline svm threads +unicode +zlib"
+# Needs work still
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-lisp/asdf-2.33-r3
+	>=dev-libs/libsigsegv-2.10
+	>=dev-libs/ffcall-1.10
+	virtual/libcrypt:=
+	virtual/libiconv
+	dbus? ( sys-apps/dbus )
+	fastcgi? ( dev-libs/fcgi )
+	gdbm? ( sys-libs/gdbm:= )
+	gtk? (
+		>=gnome-base/libglade-2.6
+		>=x11-libs/gtk+-2.10:2
+	)
+	postgres? ( >=dev-db/postgresql-8.0:* )
+	readline? ( >=sys-libs/readline-7.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:5.3 )
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="X? ( x11-misc/imake )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-after_glibc_cfree_bdb.patch
+	"${FILESDIR}"/${P}-gdbm_and_bdb5.3.patch
+)
+
+BUILDDIR="builddir"
+
+enable_modules() {
+	[[ $# = 0 ]] && die "${FUNCNAME[0]} must receive at least one argument"
+
+	local m
+	for m in "$@" ; do
+		einfo "Enabling module ${m}"
+		myconf+=( --with-module=${m} )
+	done
+}
+
+src_prepare() {
+	default
+
+	# More than -O1 breaks alpha
+	if use alpha; then
+		sed -i -e 's/-O2//g' src/makemake.in || die
+	fi
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	# Not local so enable_modules() can use it
+	myconf=(
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--enable-portability
+		$(use_with readline)
+		$(use_with unicode)
+		--hyperspec=${CLHSROOT}
+	)
+
+	# Temporary workaround for bug #932564 with GCC 15
+	# This can be dropped with a new release.
+	strip-flags
+	tc-is-gcc && {
+		append-flags -fno-tree-dce -fno-tree-dse -fno-tree-pta
+	}
+
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/856103
+	# https://gitlab.com/gnu-clisp/clisp/-/issues/49
+	filter-lto
+
+	if use alpha; then
+		# We need this to build on alpha
+		replace-flags -O? -O1
+	elif use x86; then
+		# bug #585182
+		append-flags -falign-functions=4
+	fi
+
+	# built-in features
+	myconf+=(
+		--with-ffcall
+		--without-dynamic-modules
+	)
+
+	# There's a problem with jit_allocai function
+	#if use jit; then
+	#	myconf+=" --with-jitc=lightning"
+	#fi
+
+	if use threads; then
+		myconf+=( --with-threads=POSIX_THREADS )
+	fi
+
+	# modules not enabled:
+	#  * berkdb: must figure out a way to make the configure script pick up the
+	#            currect version of the library and headers
+	#  * dirkey: fails to compile, requiring windows.h, possibly wrong #ifdefs
+	#  * matlab, netica: not in portage
+	#  * oracle: can't install oracle-instantclient
+	#
+	# default modules
+	enable_modules rawsock
+	# optional modules
+	use elibc_glibc && enable_modules bindings/glibc
+	use X && enable_modules clx/new-clx
+	if use postgres; then
+		enable_modules postgresql
+		append-cppflags -I$(pg_config --includedir)
+	fi
+	if use berkdb; then
+		enable_modules berkeley-db
+		append-cppflags -I"${EPREFIX}"/usr/include/db5.3
+	fi
+	use dbus && enable_modules dbus
+	use fastcgi && enable_modules fastcgi
+	use gdbm && enable_modules gdbm
+	use gtk && enable_modules gtk2
+	use pcre && enable_modules pcre
+	use svm && enable_modules libsvm
+	use zlib && enable_modules zlib
+
+	if use hyperspec; then
+		CLHSROOT="file://${EPREFIX}/usr/share/hyperspec/HyperSpec/"
+	else
+		CLHSROOT="http://www.lispworks.com/reference/HyperSpec/"
+	fi
+
+	myconf+=(
+		--config
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+	)
+
+	# configure chokes on --sysconfdir option
+	edo ./configure "${myconf[@]}" ${BUILDDIR}
+
+	IMPNOTES="file://${EPREFIX}/usr/share/doc/${PN}-${PVR}/html/impnotes.html"
+	sed -i "s,http://clisp.cons.org/impnotes/,${IMPNOTES},g" \
+		"${BUILDDIR}"/config.lisp || die "Cannot fix link to implementation notes"
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}"/fonts
+	# parallel build fails
+	emake -C "${BUILDDIR}" -j1
+}
+
+src_test() {
+	emake -C "${BUILDDIR}" -j1 check
+	# Test non-portable features and modules
+	emake -C "${BUILDDIR}" -j1 extracheck mod-check
+}
+
+src_install() {
+	pushd "${BUILDDIR}" || die
+	emake -j1 DESTDIR="${D}" prefix="${EPREFIX}"/usr install-bin
+	doman clisp.1
+	dodoc ../SUMMARY README* ../src/NEWS ../unix/MAGIC.add ../ANNOUNCE
+	popd || die
+
+	dodoc doc/{CLOS-guide,LISP-tutorial}.txt
+	docinto html
+	dodoc doc/impnotes.{css,html} doc/regexp.html doc/clisp.png
+}
diff --git a/dev-lisp/clisp/files/clisp-2.49.92-gdbm_and_bdb5.3.patch b/dev-lisp/clisp/files/clisp-2.49.92-gdbm_and_bdb5.3.patch
new file mode 100644
index 000000000000..360b5b269aac
--- /dev/null
+++ b/dev-lisp/clisp/files/clisp-2.49.92-gdbm_and_bdb5.3.patch
@@ -0,0 +1,105 @@
+cherry picked from:
+i
+https://gitlab.com/gnu-clisp/clisp/-/commit/fe98f04798677f3b85f24e1a3d267e926ca031cc
+https://gitlab.com/gnu-clisp/clisp/-/commit/14017a35e2c1dc02b18f09b6d079eeb441bb9b92
+https://gitlab.com/gnu-clisp/clisp/-/commit/50120fab20ac508852938ebe7cd73dc09d5a50a1
+
+diff --git a/modules/berkeley-db/bdb.c b/modules/berkeley-db/bdb.c
+index 1efa285..86d9645 100644
+--- a/modules/berkeley-db/bdb.c
++++ b/modules/berkeley-db/bdb.c
+@@ -2758,8 +2758,8 @@ DEFUN(BDB:TXN-RECOVER, dbe &key FIRST :NEXT)
+   DB_ENV *dbe = (DB_ENV*)bdb_handle(popSTACK(),`BDB::DBE`,BH_VALID);
+   u_int32_t tx_max;
+   DB_PREPLIST *preplist;
+-  int status, ii;
+-  u_int32_t retnum;
++  int status;
++  long ii, retnum;
+   SYSCALL(dbe->get_tx_max,(dbe,&tx_max));
+   preplist = (DB_PREPLIST*)clisp_malloc(tx_max * sizeof(DB_PREPLIST));
+   begin_blocking_system_call();
+diff --git a/modules/berkeley-db/configure b/modules/berkeley-db/configure
+index 8a4cf06..c0f1346 100755
+--- a/modules/berkeley-db/configure
++++ b/modules/berkeley-db/configure
+@@ -5712,7 +5712,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ int
+ main ()
+ {
+-DB db; db.stat(&db,NULL,0,NULL);
++DB *db; db_create(&db,NULL,0); db->stat(db,NULL,NULL,0);
+   ;
+   return 0;
+ }
+@@ -5747,7 +5747,7 @@ void my_callback (const DB_ENV* dbe, const char *errpfx, const char *msg) {}
+ int
+ main ()
+ {
+-DB_ENV dbe; dbe.set_errcall(&dbe,&my_callback);
++DB_ENV *dbe; db_env_create(&dbe,0); dbe->set_errcall(dbe,&my_callback);
+   ;
+   return 0;
+ }
+@@ -5780,7 +5780,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ int
+ main ()
+ {
+-DB db; db.get_transactional(&db);
++DB *db; db_create(&db,NULL,0); db->get_transactional(db);
+   ;
+   return 0;
+ }
+diff --git a/modules/berkeley-db/configure.in b/modules/berkeley-db/configure.in
+index 623d633..475251a 100644
+--- a/modules/berkeley-db/configure.in
++++ b/modules/berkeley-db/configure.in
+@@ -38,7 +38,7 @@ AC_CHECK_SIZEOF(db_recno_t,,[#include <stdio.h>
+ dnl <http://www.sleepycat.com/docs/ref/upgrade.4.3/stat.html>
+ AC_CACHE_CHECK([whether DB->stat() accepts TXNid],ac_cv_db_stat_accept_txn,[
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <db.h>],
+-[[DB db; db.stat(&db,NULL,0,NULL);]])],
++[[DB *db; db_create(&db,NULL,0); db->stat(db,NULL,NULL,0);]])],
+ ac_cv_db_stat_accept_txn=yes,ac_cv_db_stat_accept_txn=no)])
+ if test "$ac_cv_db_stat_accept_txn" = "yes"; then
+ AC_DEFINE(HAVE_DB_STAT_ACCEPT_TXN,1,[Define to 1 if DB->stat() accepts TXNid])
+@@ -51,7 +51,7 @@ CFLAGS_save="$CFLAGS"
+ CFLAGS="$CFLAGS -Werror"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <db.h>
+ void my_callback (const DB_ENV* dbe, const char *errpfx, const char *msg) {}],
+-[[DB_ENV dbe; dbe.set_errcall(&dbe,&my_callback);]])],
++[[DB_ENV *dbe; db_create(&db,NULL,0); dbe->set_errcall(&dbe,&my_callback);]])],
+ ac_cv_dbe_set_errcall_accept_dbe=yes,ac_cv_dbe_set_errcall_accept_dbe=no)
+ CFLAGS=$CFLAGS_save])
+ if test "$ac_cv_dbe_set_errcall_accept_dbe" = "yes"; then
+@@ -63,7 +63,7 @@ dnl unannounced!
+ AC_CACHE_CHECK([whether DB->get_transactional() accepts just 1 argument],
+ ac_cv_db_get_transactional_1arg,[
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <db.h>],
+-[[DB db; db.get_transactional(&db);]])],
++[[DB *db; db_create(&db,NULL,0); db->get_transactional(db);]])],
+ ac_cv_db_get_transactional_1arg=yes,ac_cv_db_get_transactional_1arg=no)])
+ if test "$ac_cv_db_get_transactional_1arg" = "yes"; then
+ AC_DEFINE(HAVE_DB_GET_TRANSACTIONAL_1ARG,1,
+diff --git a/modules/gdbm/gdbm.c b/modules/gdbm/gdbm.c
+index a42706e..d81d7e3 100644
+--- a/modules/gdbm/gdbm.c
++++ b/modules/gdbm/gdbm.c
+@@ -66,7 +66,7 @@ DEFCHECKER(check_gdbm_errno, prefix=GDBM, NO-ERROR MALLOC-ERROR              \
+            READER-CANT-REORGANIZE UNKNOWN-UPDATE ITEM-NOT-FOUND              \
+            REORGANIZE-FAILED CANNOT-REPLACE ILLEGAL-DATA OPT-ALREADY-SET     \
+            OPT-ILLEGAL)
+-static _Noreturn void error_gdbm (char *fatal_message) {
++static _Noreturn void error_gdbm (const char *fatal_message) {
+   end_blocking_system_call(); /* in case we are called from _gdbm_fatal() */
+   pushSTACK(`GDBM::GDBM-ERROR`);
+   pushSTACK(`:MESSAGE`);
+@@ -126,7 +126,7 @@ static object open_gdbm (object path, int bsize, int rw, int mode) {
+   GDBM_FILE gdbm;
+   with_string_0(path, GLO(pathname_encoding), name, {
+       SYSCALL(gdbm = gdbm_open(name, bsize, rw, mode,
+-                               (void (*)(void))error_gdbm));
++                               error_gdbm));
+     });
+   if (gdbm == NULL) error_gdbm(NULL);
+   return allocate_fpointer(gdbm);
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index c3635c889410..720c40ff9cae 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -14,13 +14,13 @@ 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.5.8-ppc64le-linux-binary.tar.bz2 10025597 BLAKE2B aac079e3585ebe9d5b610cf096e958edfd4410361b0d96b2fa88a285cbdce4133d89e1ddf0cf6729d43d6c3057365d07a3d73362f906fd8798b76c993210a8e5 SHA512 443ab604caa768c756f3322d7c599142a50227914bcd6be12434432daf1e3d5af0740d1ebdb166b856cc77ddf02451e29fcef9e29099f7bc4fb49ad61db17674
 DIST sbcl-2.3.3-armhf-linux-binary.tar.bz2 9932803 BLAKE2B 77e0da4a60fd74caaef3adbf29446a50323c18433cc36418d9e670e410882137cdd482ef4b2da989190c27d1cc737dba0848ad652044832337e39243088813f3 SHA512 b9810c2fe9f34ee974cb90b3b79dbb4c77053300fd029eae216fbb2772da539f2b71ca13c868772adf618f364fc73994a3a467e0a535fe5195b7eb6b0fee3571
-DIST sbcl-2.5.0-source.tar.bz2 8204593 BLAKE2B 069f91090b9f89c97823608c36f88e6becdcdd2cc984b8fbb23564a0c55494a7bb8a9c77823c6bf8f9aebbb0e8880ffddd327267161396e8302f6f44bb8f9cfc SHA512 78aa874fc52cbde3f47ce07b2d847d9cd665df5ac5a3bb4682e5afca696bdb223347184aacd27e0b927ebcfb3bdbcd449c57444c906cf44d44a4d6dfa19fc12a
-DIST sbcl-2.5.0-x86-64-linux-binary.tar.bz2 11406596 BLAKE2B 28730fb30aba90a86d456df57086bdcb139a1bfa78d3bdf66e756407d131683de36a379fcce8679a9cf422d59ebd170fa9b25814f78ce145ad2878a8b2feeec4 SHA512 f71fbf29b0d4e62afe331dff15c6fd7a78857505ba610b094bc877e51b83047658a2b3e5aa1aa4c13f12ebbf5849672e8c16549ce7166d594024a610e023482a
 DIST sbcl-2.5.2-source.tar.bz2 8227645 BLAKE2B 8133bd1b37cf3b5e663e1525dd979528079d4ae9a81cdca282666ca6ef9283fcfc07e5b1c62304feec5ec45852ff038ce41493fa88825d79886c5245dbb515a5 SHA512 241d66c6b6e6c326ce83390dc51ec2badba117a7baa3d04fcf9573518b805371ca8855ed637b6038ea1436722eb671f93a4bb150911bbf6e41c7eb1604e01b8b
 DIST sbcl-2.5.2-x86-64-linux-binary.tar.bz2 11428065 BLAKE2B 861187e820b1e13be72b1f0f713e09811ddbb966dd97c71542feaae87caad4776b3e926234b52de21096c8165eec9bc29f81a49f511ef307e0d1b670a6933546 SHA512 bf155efe84dc3815513f9426af7f57e448742a332ee3a2515c4163d3c4e2a20a5fbb9cef6fe7620703a453bf497201aca4a168e58ac2e649da3a31b2dfbba596
 DIST sbcl-2.5.3-source.tar.bz2 8238032 BLAKE2B bcbfe163e2c06eb9c66cc0f94b919c4efd1ad2b8271367eedda224fa6363e9913ccba708734b5a26698770a37613e1513ac9abed0d234cb962474eef65d96db2 SHA512 2b1abc173a62b38b7edb9067e480780ed0ad31b8e7844320d174fc0e5bb4487635ca3af4dbb6274916b4283f3f3d8146f11c963d07720b0c42a7d2a86c1093a8
 DIST sbcl-2.5.3-x86-64-linux-binary.tar.bz2 11960275 BLAKE2B dbba5f0a9fc39740557ac67f24ba58085ba5e317daf0465c0ffc4218c4d17dc0ba737e38df1918bf74eab5833891438bd0cc3a3e8d2132229ece513f76c0055b SHA512 0e14ddaaccc153e292fa35f0f25b655a975c121c230370d2f9bd2629ff852d524faab302051dcedeecabf818238ab98f40f7a16b020d908fe1bebd91177ac283
-EBUILD sbcl-2.5.0.ebuild 9295 BLAKE2B 8c73002a8d11e937c9ba6527215748262b345cbc5d1be5883dbbf9790739159e024fa4e9b74446f6fbea260fa3ac42613e653e38b58c618d282683a3f77bc50a SHA512 c3a8c8dc14f20038514ce35418d4764780006bbe586d4f2ba4fdfe2f1a1e1f03d240aa8d4c115af9a445b212703dc6e8183be8b17d57faf55a48ef526bee9f08
-EBUILD sbcl-2.5.2.ebuild 9299 BLAKE2B e02dd3d037dc8a02dc039e2e77c2685bc9f968b3fa7f8a267bc993bfbde93198cade8bad735df40cd390354fec323f4d8fb9634d9438dce9ff52dc12749da35f SHA512 612b87dda3f51dddf66542ca8769003de94c55b2f3f638250884ee08d2d766e69bbbfdeccff1697ab80ba1496e4fb8746269f0a12b4b8ef09e8f4af94d9eb835
+DIST sbcl-2.5.4-source.tar.bz2 8252514 BLAKE2B 9953e7ecfbef7fda728747d5aade2bc16074578bd7d07924e150f88072fb0ecbcf54a1a8a8e7f8bb4590186a8c639f240e74ebb5b4ebb6626ac7c1b7f8fd39e7 SHA512 f0e6c25c37d7c83c0ee8ae94f78438b2c0ed6491f080afec84c5cd7bc1eb65ba43982d8092b637b77d8764d6cb0de4b337c250f840184f27fe21e3944fdce31c
+DIST sbcl-2.5.4-x86-64-linux-binary.tar.bz2 12030625 BLAKE2B eb176f3e16158e5afd44634b7e69229acb84ae799997e5504c328dc9d92fe378fbcc5ffa9f65441d63a7b7f02d9dd1547ff8f91ae9afb3328b704b28707b796d SHA512 fa962120a2f806289c6c8b60d40b9f6fd5c852d2dec48f0546780be7f4aa5d64e337924074e61573b38587839597398e82a2988aae579b7163960bb45466e4a2
+EBUILD sbcl-2.5.2.ebuild 9295 BLAKE2B 797baed2ddadc73ffd5e855633f9fa5831fd7815cea77f24602c6bf8cd8ed42b1efa72799b79388ea3ab65875f251e743683be0ad6164d40d12d9838d40781c3 SHA512 8a32aa241f9d78dbbdbc0c960477020d5b3ff4f538a53ef0e26651ee0ddb198d61ae5614613ce2494d4b41b3355240b8f5ea937a48f55d8bd35641f0cd9055fa
 EBUILD sbcl-2.5.3.ebuild 9299 BLAKE2B d1ba6a9eaaa5bb21c08c15d720d0d1d843e9e6d146ad8fade9350b7b6c804c90a67c595a2c47e09027709dc692078cd25538dfce8b9acdaa63a1ebbc90f59564 SHA512 de4ce60d7bfd7c7db055112d07e3e8169a82c86cfaed23cfcb8937cda2ebd585c5529f52aa1e1cecb9fdc2d68a7b1c8100d07d933c04ba0af16eb377a736f0c6
+EBUILD sbcl-2.5.4.ebuild 9299 BLAKE2B 31839da42e50f663bb13777c454401eee180fdfa9129bf0a6f2be18f93beb83e42dba8192334c7f251ffc19aaa0aa5a7ec1da5aca388e0a25579f2193b7ec4a9 SHA512 178f9977dc4960dda351500173ae3f6a534e95241737fda0b0b285dda23d313d9564ca7405749c6398eb8d1357a63754fb11b443c11bb97d5419e5fbbc35f9fa
 MISC metadata.xml 1498 BLAKE2B 26fd9f6375ae06e3158d09608aeb5ea4a50e6ce7dd002c7c8f7827cf05798aebd7cba2b630238495ab0a27152ef6e485af2101446dd31e9592e9ffb14fb012b2 SHA512 c56fbecceb20c9550b4f5a07662276af099e7a600ad4f93139e25618aefd57bc45489fd85049da35b1f19937f2293640c1f953cb76780b849435b26f1f27285f
diff --git a/dev-lisp/sbcl/sbcl-2.5.2.ebuild b/dev-lisp/sbcl/sbcl-2.5.2.ebuild
index 70b28f1977f6..c37539cb6be2 100644
--- a/dev-lisp/sbcl/sbcl-2.5.2.ebuild
+++ b/dev-lisp/sbcl/sbcl-2.5.2.ebuild
@@ -41,7 +41,7 @@ SRC_URI="https://downloads.sourceforge.net/sbcl/${P}-source.tar.bz2
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="-* amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="system-bootstrap debug doc source +threads +unicode +zstd"
 
 CDEPEND=">=dev-lisp/asdf-3.3:= \
diff --git a/dev-lisp/sbcl/sbcl-2.5.0.ebuild b/dev-lisp/sbcl/sbcl-2.5.4.ebuild
index c1136ebd893a..c944a41e634e 100644
--- a/dev-lisp/sbcl/sbcl-2.5.0.ebuild
+++ b/dev-lisp/sbcl/sbcl-2.5.4.ebuild
@@ -7,7 +7,7 @@ inherit 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.5.0
+BV_AMD64=2.5.4
 BV_PPC=1.2.7
 BV_PPC64LE=1.5.8
 BV_SPARC=1.0.28
@@ -41,7 +41,7 @@ SRC_URI="https://downloads.sourceforge.net/sbcl/${P}-source.tar.bz2
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="-* amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="system-bootstrap debug doc source +threads +unicode +zstd"
 
 CDEPEND=">=dev-lisp/asdf-3.3:= \