18 files changed, 509 insertions, 502 deletions
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 21335002f697..9a5b3ba11532 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/chez/Manifest b/dev-scheme/chez/Manifest
index 535373f5d5e0..323117bda8a0 100644
--- a/dev-scheme/chez/Manifest
+++ b/dev-scheme/chez/Manifest
@@ -1,5 +1,5 @@
 DIST chez-10.0.0.tar.gz 9109529 BLAKE2B 66b37350b0d711c4f86b8c0e0e9ca6f0c7de22591b592ff0950822c2cf4a489db1fbb2f655cbecf4a771740ffd9bba638481f20d59c5c8143468d333d57f4907 SHA512 094298744bd69033366305330d660299023c5bc5776df86f28af119f9f4cddc463366fc8f955084463137b6186843fcd34026d2714b932baa4841d6522a8dd92
 DIST chez-10.1.0.tar.gz 9123504 BLAKE2B 1cdca246dc8cc9747e0895265ae4c89cc366c6b05c1ae73191ad4e6fc547165303d09ae1eba1389c787bca2e8a0eb384b52d79e149eb582c8833494ce57925c0 SHA512 83d7d20a4caa4df88bf6463a8802aba512df4f8fb27e0c9c3ae677813ba5b60c6fb794bd1246025286663d0decd13ddbfc007fa3f3ed22980621f532ac54c513
 EBUILD chez-10.0.0.ebuild 2342 BLAKE2B d3e0e9a0c5650064dcbc4d58df19c3d43f0529ab673e0eef0d7f08bcfd446fc4d967ddf732390194b859e5478b673970c17541ed83d901e576fe5592e5378b4d SHA512 058ea0cd72ede1bdc372283338dad08f8502de53b89073a7e3e49f8e48551859c8148c9c1341a441ab90e11866e61dc57cb339e4a0e8a7eedc0ee03eef8e7337
-EBUILD chez-10.1.0.ebuild 2521 BLAKE2B 4219166d1e59086868c684a1480d80dab4e69461b85c25bc645848178bf4c548be83590b3450dd39907e4a88c47e2a72487db7148010852c5b2411a28869fece SHA512 cfaedb6a74422108a8f39dc0d3134ae440308be2c03c7200997f36ee46081d7b88bae2ee5650496d5a37154f968465b0c4dc3fa01887ff5d0bffd4e23c3b431d
+EBUILD chez-10.1.0.ebuild 2520 BLAKE2B 98cec494f5c94c86bd4d9c572a9cb26ef850aab883a4800a9db3c63f95d224a8550ae9f2d9569323414378e7fe5cd302aebc4512336336410f81e3b99adbfa60 SHA512 02005041bf4b2f6de239b4d604d7155e1595444309cea4f76ae685f8d195732bef0f73b0e383acb5f5602df6ae27090bb12b38d6aedde61bcf225423812604d7
 MISC metadata.xml 1133 BLAKE2B d942a29915bfb91b3c4708d2bb6715d88d2755f8da304063248c09b46b3d6d661ad8fe8df8ab88fa8dd693a867a8bc90f804e4231e0e0c9aed1a15d6611648ab SHA512 8728cad76b3ffedb2ca2bfd70831de84bf2037f0f4e53af71554a1749aeb645018207a25f7c9aaf0f5880c239437380016d5270a76565deae86dd249ad3a9b6a
diff --git a/dev-scheme/chez/chez-10.1.0.ebuild b/dev-scheme/chez/chez-10.1.0.ebuild
index 04a3776df09e..ae3f1ceded3f 100644
--- a/dev-scheme/chez/chez-10.1.0.ebuild
+++ b/dev-scheme/chez/chez-10.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/csv${PV//a}"
 
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~x86"
 fi
 
 # Chez Scheme itself is Apache 2.0, but it vendors Nanopass and stex
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 84f805a34d41..1a3ae3517010 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -17,6 +17,9 @@ DIST guile-1.8.8.tar.gz 3956654 BLAKE2B 4820d635ac2c57526c0c03f3e0e6e4ac4276533e
 DIST guile-2.2.7.tar.xz 10881984 BLAKE2B e2b1fe7cb010371beaaf32f8f173397c90fd291ed7d5835b9d976f37fd133254841b4179bd1e1cd02e604c7befcab6c25f85d20ba0850f96978f7c32ca1fe6d8 SHA512 6f60b3489e26f5ff32b55c89316cdcdbf3ec1f4344726006e445f24098c922c50becdc748f1b66d2b271dc002e409ee6210bf85da779cee1f68c9111b3b5c543
 DIST guile-3.0.10.tar.xz 5802280 BLAKE2B 2b41f1afb282eb4672f5aca5b044f47a12509745f5580fc4a621e7555c8b884f92dc76bc78fbdf8a64d59cf1de65b230ce03b0a34bbcb77307a7c9453a277ac6 SHA512 8b58e6c70cd48af85a0b346fcdf488fd5ac8d8678181c9c469895bf6ddab909c415e471776fdcda3c234e00fae80bdd4518c17ff16cf8107a36d2990a4face1d
 EBUILD guile-1.8.8-r102.ebuild 4647 BLAKE2B 1d7df68dbe6855e010355cd30f3b6525015a4062b467598d547f38e94550e8c525e808c640a4778509d655aa697527117471fb564a466b3b16c8843161dfcfcd SHA512 dd3c1e9f10a4707af184d945cfd3721d1ce7ecea632919fd2b737a01530a0beef22feb89d191aa28b9665cd3c53cad0c83a17576c23a8538fff9afd0d4f343ad
+EBUILD guile-1.8.8-r103.ebuild 5022 BLAKE2B 9c85432d85f77f97d933ee35208bb0c3e1de9b49c705889ef6b9420da7eb95dd6c5f8692ec7503d79ddcca6c97fc88e068b450056936add1e5e39bb50515ccf7 SHA512 b96720e1d06cc815f210ee345decddc28acfbfe7a1f26a105c8a90acc3fc9d49470b4e8f72d7ba1e4c998e392f74abb4579ea55fe7ce4a792c4aee0df4e74da1
 EBUILD guile-2.2.7-r102.ebuild 3177 BLAKE2B 8afe7cbad7399b85cac552f641287fcbbabdf97b096c5f37ebfafc27a71b5f6e372a774f8ef5143688a40891034b1fd0f4bfb3a795c265dd482dc303de93a48c SHA512 506ed1070867014aa905f58ccd7aeffd9374c33bc90c2b5cf2f33977f31d8b3829e36b9c9b1b6b9112d6405e5a376fcf578b60c0e4b2d87af6e92bf194ef1cc0
+EBUILD guile-2.2.7-r103.ebuild 3584 BLAKE2B 7ea7be5e7794d45d90f30e4260cf733c0ed2e448d93a28a844cebdc2fd725251b6be407b7cf64a7292eec9f93da95bf58a45a1c77f7814f13f20ad742c16774d SHA512 e7e923c163c019b519813658f8a66ef7a14f53007ac3f3964d8491350a3d55f8f67ca7710a56b0bb5f5a3a761470aa0be9fe27ed2240cf281333d1d0cdda472b
 EBUILD guile-3.0.10-r102.ebuild 3344 BLAKE2B ad7eea29a076e68df7d2e47b3a97b1f7d618520c90e55828c9e0b9bf0d471661d8efdf32718d0df76a4eb9c7e5ad61d52add8e7b17a864b186145e800423a159 SHA512 f2b81318d22bc90eb858a714c2121555d3251a6df56c542b21998cc39471963f533ceac56c96997bef5424998ecefc2b3d8dc17c42961497dd31f97ec72087f8
+EBUILD guile-3.0.10-r103.ebuild 3728 BLAKE2B 09658d90e7da8179b7c1b5af013a9e71f8248ac2883bebc6565c389c7cf72176d5395bb4db934aea34d1b3b00ea3d83a8ce9865968648e1c4301f5a57df8f197 SHA512 c11df4b05a356d9f953547cf03cbee2c3e61863679e9308e7ec73811f78abb5f1a886761f9b03248043f99bc4502f16da9b6e952c43ed684d46a0614c48cf4c3
 MISC metadata.xml 1423 BLAKE2B 1e1d2bc292338c5cab820a087f22fd4bd9517b85a6a1d52175cc666f329a2ce1f9cfcea6da01a02328395e15b0dbcb91e755fa8dde6709d1bbc47a0b34bb1e22 SHA512 013db66fb8ed106d739faad36c5b2014917526791839ea1e9bb9d4f588de666eb9a662dd5550be7f781a3346314d885742586ce9382d6745b3f7a9c1e9c37cc7
diff --git a/dev-scheme/guile/guile-1.8.8-r103.ebuild b/dev-scheme/guile/guile-1.8.8-r103.ebuild
new file mode 100644
index 000000000000..3b17e3397a10
--- /dev/null
+++ b/dev-scheme/guile/guile-1.8.8-r103.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic elisp-common
+
+DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
+HOMEPAGE="https://www.gnu.org/software/guile/"
+SRC_URI="mirror://gnu/guile/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos"
+IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads"
+RESTRICT="!regex? ( test )"
+
+RDEPEND="
+	>=dev-libs/gmp-4.1:0=
+	dev-libs/libltdl:0=
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	virtual/libcrypt:=
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-apps/texinfo
+	dev-build/libtool
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+IDEPEND="
+	app-eselect/eselect-guile
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix_guile-config.patch
+	"${FILESDIR}"/${P}-gcc46.patch
+	"${FILESDIR}"/${P}-gcc5.patch
+	"${FILESDIR}"/${P}-makeinfo-5.patch
+	"${FILESDIR}"/${P}-gtexinfo-5.patch
+	"${FILESDIR}"/${P}-readline.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${P}-sandbox.patch
+	"${FILESDIR}"/${P}-mkdir-mask.patch
+	"${FILESDIR}"/${PN}-1.8.8-texinfo-6.7.patch
+)
+
+DOCS=( AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS )
+
+# Where to install data files.
+GUILE_DATA="${EPREFIX}/usr/share/guile-data/${SLOT}"
+GUILE_PCDIR="${EPREFIX}/usr/share/guile-data/${SLOT}/pkgconfig"
+GUILE_INFODIR="${EPREFIX}"/usr/share/guile-data/"${SLOT}"/info
+
+src_prepare() {
+	default
+
+	sed \
+		-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" \
+		-e "/AM_PROG_CC_STDC/d" \
+		-i guile-readline/configure.in || die
+
+	mv "${S}"/configure.{in,ac} || die
+	mv "${S}"/guile-readline/configure.{in,ac} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# See bug #178499.  filter-flags no longer works since the compiler
+	# will vectorize by default when optimizing.
+	append-flags -fno-tree-vectorize -fno-strict-aliasing
+
+	#will fail for me if posix is disabled or without modules -- hkBst
+	myconf=(
+		--program-suffix="-${SLOT}"
+		--infodir="${GUILE_INFODIR}"
+		--includedir="${EPREFIX}/usr/include/guile/${SLOT}"
+
+		--disable-error-on-warning
+		--disable-static
+		--enable-posix
+		$(use_enable networking)
+		$(use_enable readline)
+		$(use_enable regex)
+		$(use deprecated || use_enable discouraged)
+		$(use_enable deprecated)
+		$(use_enable emacs elisp)
+		$(use_enable nls)
+		--disable-rpath
+		$(use_enable debug-freelist)
+		$(use_enable debug-malloc)
+		$(use_enable debug guile-debug)
+		$(use_with threads)
+		--with-modules
+	)
+	econf "${myconf[@]}" EMACS=no
+}
+
+src_compile() {
+	emake
+
+	# Above we have disabled the build system's Emacs support;
+	# for USE=emacs we compile (and install) the files manually
+	if use emacs; then
+		cd emacs || die
+		elisp-compile *.el || die
+	fi
+}
+
+# Akin to (and taken from) toolchain-autoconfs eclass
+guile_slot_info() {
+	rm -f dir || die
+
+	pushd "${D}/${GUILE_INFODIR}" >/dev/null || die
+	for f in *.info*; do
+		# Install convenience aliases for versioned Guile pages.
+		ln -s "$f" "${f/./-${SLOT}.}" || die
+	done
+	popd >/dev/null || die
+
+	docompress "${GUILE_INFODIR}"
+}
+
+src_install() {
+	default
+
+	dodir "${GUILE_PCDIR}"
+	sed -e "/libdir/i bindir=${ESYSROOT}/usr/bin" \
+		-e "/libguileinterface/a guile=\${bindir}/guile-${SLOT}" \
+		-i "${ED}"/usr/$(get_libdir)/pkgconfig/guile-1.8.pc || die
+	mv "${ED}"/usr/$(get_libdir)/pkgconfig/guile-1.8.pc "${D}/${GUILE_PCDIR}"/guile-1.8.pc || die
+
+	sed -i "1s/guile/guile-1.8/" "${ED}"/usr/bin/guile-config-1.8 || die
+
+	for script in PROGRAM autofrisk doc-snarf generate-autoload punify \
+				  read-scheme-source scan-api snarf-guile-m4-docs use2dot \
+				  api-diff  display-commentary frisk lint read-rfc822 \
+				  read-text-outline snarf-check-and-output-texi summarize-guile-TODO; do
+		sed "s/GUILE-guile/GUILE-guile-1.8/" \
+			-i "${ED}"/usr/share/guile/1.8/scripts/${script}-1.8 || die
+		mv "${ED}"/usr/share/guile/1.8/scripts/${script}{-1.8,} || die
+	done
+
+	mv "${ED}"/usr/share/aclocal/guile{,-"${SLOT}"}.m4 || die
+	find "${ED}" -name '*.la' -delete || die
+
+	guile_slot_info
+
+	local major="$(ver_cut 1 "${SLOT}")"
+	local minor="$(ver_cut 2 "${SLOT}")"
+	local idx="$((99999-(major*1000+minor)))"
+	newenvd - "50guile${idx}" <<-EOF
+	PKG_CONFIG_PATH="${GUILE_PCDIR}"
+	INFOPATH="${GUILE_INFODIR}"
+	EOF
+
+	# necessary for registering slib, see bug 206896
+	keepdir /usr/share/guile/site
+
+	if use emacs; then
+		elisp-install ${PN}-${SLOT} emacs/*.{el,elc}
+		elisp-make-site-file "50${PN}-${SLOT}-gentoo.el"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	if has_version app-eselect/eselect-guile; then
+		eselect guile update # Nonfatal
+	fi
+	return 0
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+
+	# A pkg_postinst for the replacing package will be called after.
+	if has_version app-eselect/eselect-guile \
+			&& ! [[ "${REPLACED_BY_VERSION}" ]]; then
+		eselect guile update # Nonfatal
+	fi
+	return 0
+}
diff --git a/dev-scheme/guile/guile-2.2.7-r103.ebuild b/dev-scheme/guile/guile-2.2.7-r103.ebuild
new file mode 100644
index 000000000000..5beb7b70b30b
--- /dev/null
+++ b/dev-scheme/guile/guile-2.2.7-r103.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
+HOMEPAGE="https://www.gnu.org/software/guile/"
+SRC_URI="mirror://gnu/guile/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="$(ver_cut 1-2)"  # See (guile)Parallel Installations.
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos"
+IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
+REQUIRED_USE="regex" # workaround for bug 596322
+RESTRICT="strip"
+
+RDEPEND="
+	>=dev-libs/boehm-gc-7.0:=[threads?]
+	dev-libs/gmp:=
+	dev-libs/libffi:=
+	dev-libs/libltdl:=
+	dev-libs/libunistring:0=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	virtual/libcrypt:=
+	!dev-scheme/guile:12
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	dev-build/libtool
+	sys-devel/gettext
+"
+IDEPEND="
+	app-eselect/eselect-guile
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch"
+	"${FILESDIR}/${PN}-2.2.7-stack-up.patch"
+)
+
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
+GUILE_INFODIR="${EPREFIX}"/usr/share/guile-data/"${SLOT}"/info
+
+DOCS=( GUILE-VERSION HACKING README )
+
+src_configure() {
+	# see bug #676468
+	mv prebuilt/32-bit-big-endian{,.broken} || die
+
+	econf \
+		--infodir="${GUILE_INFODIR}" \
+		--program-suffix="-${SLOT}" \
+		--disable-error-on-warning \
+		--disable-rpath \
+		--disable-static \
+		--enable-posix \
+		--without-libgmp-prefix \
+		--without-libiconv-prefix \
+		--without-libintl-prefix \
+		--without-libltdl-prefix \
+		--without-libreadline-prefix \
+		--without-libunistring-prefix \
+		$(use_enable debug guile-debug) \
+		$(use_enable debug-malloc) \
+		$(use_enable deprecated) \
+		$(use_enable networking) \
+		$(use_enable nls) \
+		$(use_enable regex) \
+		$(use_with threads)
+}
+
+# Akin to (and taken from) toolchain-autoconfs eclass
+guile_slot_info() {
+	rm -f dir || die
+
+	pushd "${D}/${GUILE_INFODIR}" >/dev/null || die
+	for f in *.info*; do
+		# Install convenience aliases for versioned Guile pages.
+		ln -s "$f" "${f/./-${SLOT}.}" || die
+	done
+	popd >/dev/null || die
+
+	docompress "${GUILE_INFODIR}"
+}
+
+src_install() {
+	default
+
+	# From Novell
+	# https://bugzilla.novell.com/show_bug.cgi?id=874028#c0
+	dodir /usr/share/gdb/auto-load/$(get_libdir)
+	mv "${ED}"/usr/$(get_libdir)/libguile-*-gdb.scm "${ED}"/usr/share/gdb/auto-load/$(get_libdir) || die
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Move the pkg-config files to guile-data.  In future versions, this
+	# should be handled by --with-pkgconfigdir (patch waiting on
+	# upstream).
+	local datadir=/usr/share/guile-data/"${SLOT}"
+	local pcdir="${EPREFIX}${datadir}"/pkgconfig
+	mkdir -p "${ED}${datadir}" || die
+	mv "${ED}"/usr/share/aclocal/guile{,-"${SLOT}"}.m4 || die
+	mv "${ED}"/usr/$(get_libdir)/pkgconfig/ \
+	   "${ED}/${pcdir}" || die
+
+	guile_slot_info
+
+	local major="$(ver_cut 1 "${SLOT}")"
+	local minor="$(ver_cut 2 "${SLOT}")"
+	local idx="$((99999-(major*1000+minor)))"
+	newenvd - "50guile${idx}" <<-EOF
+	PKG_CONFIG_PATH="${pcdir}"
+	INFOPATH="${GUILE_INFODIR}"
+	EOF
+}
+
+pkg_postinst() {
+	if has_version app-eselect/eselect-guile; then
+		eselect guile update # Nonfatal
+	fi
+	return 0
+}
+
+pkg_postrm() {
+	# A pkg_postinst for the replacing package will be called after.
+	if has_version app-eselect/eselect-guile \
+			&& ! [[ "${REPLACED_BY_VERSION}" ]]; then
+		eselect guile update # Nonfatal
+	fi
+	return 0
+}
diff --git a/dev-scheme/guile/guile-3.0.10-r103.ebuild b/dev-scheme/guile/guile-3.0.10-r103.ebuild
new file mode 100644
index 000000000000..7ba9f8e94f3b
--- /dev/null
+++ b/dev-scheme/guile/guile-3.0.10-r103.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
+HOMEPAGE="https://www.gnu.org/software/guile/"
+SRC_URI="mirror://gnu/guile/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="$(ver_cut 1-2)"  # See (guile)Parallel Installations.
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos"
+
+IUSE="debug debug-malloc +deprecated +jit +networking +nls +regex +threads" # upstream recommended +networking +nls
+REQUIRED_USE="regex" # workaround for bug #596322
+RESTRICT="strip"
+
+RDEPEND="
+	>=dev-libs/boehm-gc-7.0[threads?]
+	dev-libs/gmp:=
+	dev-libs/libffi:=
+	dev-libs/libatomic_ops
+	dev-libs/libunistring:=
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	virtual/libcrypt:=
+	!dev-scheme/guile:12
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	dev-build/libtool
+	sys-devel/gettext
+"
+IDEPEND="
+	app-eselect/eselect-guile
+"
+
+# guile generates ELF files without use of C or machine code
+# It's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
+DOCS=( ABOUT-NLS AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.3-gentoo-sandbox.patch
+	"${FILESDIR}/${PN}-3.0-fix-32bit-BE.patch"
+	"${FILESDIR}/${PN}-3.0.10-backport-issue72913.patch"
+	"${FILESDIR}/${PN}-3.0.10-c23.patch"
+)
+
+# Where to install data files.
+GUILE_DATA="${EPREFIX}/usr/share/guile-data/${SLOT}"
+GUILE_PCDIR="${EPREFIX}/usr/share/guile-data/${SLOT}/pkgconfig"
+GUILE_INFODIR="${GUILE_DATA}"/info
+
+src_prepare() {
+	default
+
+	# Needed for fix-32bit-BE.patch
+	eautoreconf
+}
+
+src_configure() {
+	# See bug #676468 (may be able to drop this if we adapt fix-32bit-BE.patch)?
+	mv prebuilt/32-bit-big-endian{,.broken} || die
+
+	# bug #944029
+	append-cflags -std=gnu17
+
+	local -a myconf=(
+		--program-suffix="-${SLOT}"
+		--infodir="${GUILE_INFODIR}"
+		--with-pkgconfigdir="${GUILE_PCDIR}"
+
+		--disable-error-on-warning
+		--disable-rpath
+		--disable-lto
+		--enable-posix
+		--without-libgmp-prefix
+		--without-libiconv-prefix
+		--without-libintl-prefix
+		--without-libreadline-prefix
+		--without-libunistring-prefix
+		$(use_enable debug guile-debug)
+		$(use_enable debug-malloc)
+		$(use_enable deprecated)
+		$(use_enable jit)
+		$(use_enable networking)
+		$(use_enable nls)
+		$(use_enable regex)
+		$(use_with threads)
+	)
+
+	econf "${myconf[@]}"
+}
+
+# Akin to (and taken from) toolchain-autoconfs eclass
+guile_slot_info() {
+	rm -f dir || die
+
+	pushd "${D}/${GUILE_INFODIR}" >/dev/null || die
+	for f in *.info*; do
+		# Install convenience aliases for versioned Guile pages.
+		ln -s "$f" "${f/./-${SLOT}.}" || die
+	done
+	popd >/dev/null || die
+
+	docompress "${GUILE_INFODIR}"
+}
+
+src_install() {
+	default
+
+	# From Novell https://bugzilla.novell.com/show_bug.cgi?id=874028#c0
+	dodir /usr/share/gdb/auto-load/$(get_libdir)
+	mv "${ED}"/usr/$(get_libdir)/libguile-*-gdb.scm "${ED}"/usr/share/gdb/auto-load/$(get_libdir) || die
+
+	mv "${ED}"/usr/share/aclocal/guile{,-"${SLOT}"}.m4 || die
+	find "${ED}" -name '*.la' -delete || die
+
+	guile_slot_info
+
+	local major="$(ver_cut 1 "${SLOT}")"
+	local minor="$(ver_cut 2 "${SLOT}")"
+	local idx="$((99999-(major*1000+minor)))"
+	newenvd - "50guile${idx}" <<-EOF
+	PKG_CONFIG_PATH="${GUILE_PCDIR}"
+	INFOPATH="${GUILE_INFODIR}"
+	EOF
+}
+
+pkg_postinst() {
+	if has_version app-eselect/eselect-guile; then
+		eselect guile update # Nonfatal
+	fi
+	return 0
+}
+
+pkg_postrm() {
+	# A pkg_postinst for the replacing package will be called after.
+	if has_version app-eselect/eselect-guile \
+			&& ! [[ "${REPLACED_BY_VERSION}" ]]; then
+		eselect guile update # Nonfatal
+	fi
+	return 0
+}
diff --git a/dev-scheme/racket/Manifest b/dev-scheme/racket/Manifest
index 8f208dcfb2f6..e4235ad15c19 100644
--- a/dev-scheme/racket/Manifest
+++ b/dev-scheme/racket/Manifest
@@ -1,8 +1,5 @@
-AUX racket-8.14-compiler-elf.patch 1294 BLAKE2B 0d70496751906726f07b4966b14a5c10a872eb4b9000beeb8d20f9c5d1605c205933dccddfdc62d60549a2d8f2dac8fd0d2bf7ef9853a5b75b7b87160742613d SHA512 e80785c8aa306e7a92b8cd4be94f1b513e123f33b2d9fb49f3ba5808fb1ab93de7ad1708349ce933acf54db5622316a15d739de2d59538369ec1eafbee79b7b5
-DIST racket-8.14-src-builtpkgs.tgz 157264256 BLAKE2B a6b5e61785abd8869db7800f5a5b5113e8462a8c887a8d1c7d9ed2af0c54ff37865d79a27a132bf9e50d0a4d2f4f58769707e9076591fdb6958c40e380df74d6 SHA512 b5eca5050aa1eab880ba0d1571c12577c80c9cd8e945caf8d07ae81864e964899f547b58e9d901444bb09575ace2c422b61fc1fc62d8c7df5b51a425b874c176
+AUX racket-8.15-gcc15.patch 734 BLAKE2B d786bbd2f08168b349f4780859d2f1d872969f9e77630e576be507016062285b9b99e39c3e502ca3da7db9d932f84b17ec6746eddfee78063f24aa66ab6ac3dc SHA512 58ae08eafe27b2b218ccb77e0810b67ccc76f540ceb113863987ee628d13df83e6d68c77d711d0d372de928eec5b5dbb44d33235b846cce94975daf556800a8f
 DIST racket-8.15-src-builtpkgs.tgz 157495068 BLAKE2B eda021f0def3ca2581271a26d1ab0537bf6cc6645ee3aeb4f1bbb51e2c169b9fb10c93d34aee9794f94a1a05ccbb3f198903306438fe4af108e14a3191989c80 SHA512 17ff51fc085f8b7aaf293ae75a4fc5063e7e77a4c405eaa57b5e7b1c0e260b1219749ae45defa4f3bbae6aca8fed3836924e0a8625d1bd0c45f15db57878a194
-DIST racket-minimal-8.14-src-builtpkgs.tgz 23391100 BLAKE2B 4b95b98c142d49c6f9ab5c7a654cd854183f2f088b8e8fc841ee2aaa65192ee5230634ca36caa26ffbc9bff5b1591f524ca84a4a13512249afc005998c97bd49 SHA512 f84a50be0d8a401d47d7517e6dc4b8a730b85ad80d1786edaa95b5cf86f4979e69d0f958a99de79631ed5885c4daf6092f39f1ac791f35422fe6d587e4d81465
 DIST racket-minimal-8.15-src-builtpkgs.tgz 23385589 BLAKE2B 1b55778966188d36b97e32f886562b8a8b08543b62b68d20fd3a7352c41b764386745f93915ca1edb9f785d13bac6f99618c39f7532a584fac704212c8123eb5 SHA512 2d52a0d7350f7c81b1696e657016ce93fb216419c875a3d43d41d9bc7d1d28589bb60d976e6dbd256e050ee2d8532e5f35a6fb461b5232c423fe56c9d8bf3596
-EBUILD racket-8.14-r1.ebuild 5660 BLAKE2B 9b94da1e9de282bca0899a8df986d0d55f0cb2bee57f879e294064b3822f33ebbbec22ad137b4f737c0c4bd66e3de34243571d4444e683c3913190800fb1183b SHA512 1452d2f3bea3e3d59f1eda4af02bb9daf18a078a62ae8b96ee32de547967c45436e298ae1c23f4f616b55f2f6663ec87fb76ac421a52c914a19a01157328372a
-EBUILD racket-8.15.ebuild 5586 BLAKE2B 880db6314862bca4641060907050b8b33422eb432dd9298e553ab52a95170c3ecb1c258a4ca360053d47435f8f14522a1f3615772b35acabf8bdb8690ca33638 SHA512 265993b34bb80956729fe5715edd30932a15990aec62709023d0907826007ef59b8743e9d241e2c6f1c878b31196651faf0a7b32cd40c5ef6ba08186f04fb2e1
+EBUILD racket-8.15.ebuild 5635 BLAKE2B 8f078ff6468ec59f0ba3680b107a7f78e180cf6f09888fba074664aedb51d681e0e7c7db9ef4e18e38d82fbb5ee6385cbcf2e56c66df931c9038b7972f9ce3b9 SHA512 af7d262c1404ed2990ab2d848fb739aa257dbf5b0f5cbfdbdb3f9f364b47e9448abb7ee689b728fa2ecae78b8eabfe6321525899ae5f11545f3df94b97d3fd84
 MISC metadata.xml 1944 BLAKE2B 477ffcf4419da2ce44c7b408d5e819b178a4144017a76717c5442aed799b3fb038e66042be4222be96e4877851b14312c236fa7834bc39c4e370473324e92371 SHA512 07887703f94d291984de4064522a764eda0be3a23e909dc6994ccfe4d2d67d366a0088ca5287905c586de84a3967c1e6d81a1030d0d7e6a92ddbcd5b29000bd4
diff --git a/dev-scheme/racket/files/racket-8.14-compiler-elf.patch b/dev-scheme/racket/files/racket-8.14-compiler-elf.patch
deleted file mode 100644
index 3ba22ffca38e..000000000000
--- a/dev-scheme/racket/files/racket-8.14-compiler-elf.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-This was modified to make it apply for distribution tarball.
-
-From bf288da1171e884537760d2f5723ceb03840de98 Mon Sep 17 00:00:00 2001
-From: Matthew Flatt <mflatt@racket-lang.org>
-Date: Mon, 26 Aug 2024 07:42:26 -0600
-Subject: [PATCH] raco exe: repair ELF update to add a section
-
-When a NOBITS section is misinterpreted as taking up space in the
-file, and when that space would overlap with the string-constant
-update, then an incorrect update to the virtual-memory size of the
-section was planned. That adjustment, in turn, could trigger
-disallowed virtual-address shifts to PROGBITS sections that are later
-in memory, leading to a "cannot move SHT_PROGBITS section" error.
----
- racket/collects/compiler/private/elf.rkt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/racket/collects/compiler/private/elf.rkt b/racket/collects/compiler/private/elf.rkt
-index c3009727cfd..a0fbef331db 100644
---- a/collects/compiler/private/elf.rkt
-+++ b/collects/compiler/private/elf.rkt
-@@ -256,6 +256,7 @@
- (define (find-section-by-offset offset sections)
-   (for/or ([s (in-list sections)])
-     (and (section-alloc? s)
-+         (not (= SHT_NOBITS (section-type s)))
-          (offset . >= . (section-offset s))
-          (offset . < . (+ (section-offset s)
-                           (section-size s)))
diff --git a/dev-scheme/racket/files/racket-8.15-gcc15.patch b/dev-scheme/racket/files/racket-8.15-gcc15.patch
new file mode 100644
index 000000000000..4e9ae88c22ea
--- /dev/null
+++ b/dev-scheme/racket/files/racket-8.15-gcc15.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/944149
+https://github.com/racket/racket/issues/5183
+https://github.com/racket/racket/commit/72b83f784ad1c6fb6ee3fb7b31df165bebfb21ed
+
+From 72b83f784ad1c6fb6ee3fb7b31df165bebfb21ed Mon Sep 17 00:00:00 2001
+From: Matthew Flatt <mflatt@racket-lang.org>
+Date: Sun, 19 Jan 2025 11:03:31 -0700
+Subject: [PATCH] rktio: add missing signal-handler argument
+
+Closes #5183
+--- a/rktio/rktio_process.c
++++ b/rktio/rktio_process.c
+@@ -390,7 +390,7 @@ void centralized_done_with_process_id(int pid, int in_group)
+   pthread_mutex_unlock(&child_wait_lock);
+ }
+ 
+-static void got_sigchld()
++static void got_sigchld(int ignored)
+ { 
+   /* handle doesn't need to to anything, since sigwait()
+      in a thread does the work. */
diff --git a/dev-scheme/racket/racket-8.14-r1.ebuild b/dev-scheme/racket/racket-8.14-r1.ebuild
deleted file mode 100644
index 0b2d07689b88..000000000000
--- a/dev-scheme/racket/racket-8.14-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs desktop optfeature toolchain-funcs readme.gentoo-r1
-
-DESCRIPTION="General purpose, multi-paradigm Lisp-Scheme programming language"
-HOMEPAGE="https://racket-lang.org/
-	https://github.com/racket/racket/"
-
-SRC_URI="
-	minimal? ( https://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz )
-	!minimal? ( https://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )
-"
-S="${WORKDIR}/${P}/src"
-
-# See https://blog.racket-lang.org/2019/11/completing-racket-s-relicensing-effort.html
-LICENSE="|| ( MIT Apache-2.0 ) chez? ( Apache-2.0 ) !chez? ( LGPL-3 )"
-
-# Bytecode generated by Racket is not compatible between versions.
-# The bytecode version should be denoted by SLOT, in most cases
-# PV == SLOT but this has to be checked carefully and in cases
-# where we use _p, _pre, etc it will have to be set manually.
-SLOT="0/${PV}"
-
-KEYWORDS="amd64 ~arm ~ppc ppc64 x86"
-IUSE="+chez +doc +futures iconv +jit minimal ncurses +places +threads"
-# * "chez" - see bug #809785 re chez/threads
-# * "iconv" - required for "doc"
-REQUIRED_USE="
-	chez? ( futures places ) futures? ( jit threads ) places? ( threads )
-	doc? ( iconv )
-"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/libffi:=
-	ncurses? (
-		sys-libs/ncurses:=
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	doc? (
-		>=media-libs/libjpeg-turbo-3.0.3
-		dev-libs/glib:2
-		media-libs/fontconfig
-		x11-libs/cairo
-		x11-libs/pango
-	)
-"
-
-CHECKREQS_DISK_BUILD="1700M"
-# "mred" and "mzscheme" are binaries generated by Racket, not CC
-QA_FLAGS_IGNORED="usr/bin/mred usr/bin/mzscheme"
-
-DOC_CONTENTS="
-If you wish to use sys-libs/readline instead of dev-libs/libedit
-for readline-like features in the Racket's REPL you can install
-the package 'readline-gpl' using raco, Racket's package manager
-https://pkgs.racket-lang.org/package/readline-gpl
-"
-
-# Package database files (for pkg_preinst & pkg_config)
-PKGDB=(
-	/usr/share/racket/info-cache.rktd
-	/usr/share/racket/links.rktd
-	/usr/share/racket/pkgs/pkgs.rktd
-)
-
-src_prepare() {
-	# Prepare the environment.
-	unset PLTADDONDIR PLTCOLLECTS PLTCONFIGDIR PLTUSERHOME
-
-	default
-
-	# Remove bundled libffi.
-	rm -r "${S}/bc/foreign/libffi" || die "failed to remove bundled libffi"
-
-	cd "${WORKDIR}/${P}" || die
-
-	eapply "${FILESDIR}/${P}-compiler-elf.patch"
-}
-
-src_configure() {
-	# Compilation of Zuo does not respect the autoconf configuration.
-	tc-export CC
-
-	einfo "Configuring Zuo in ${S}/zuo"
-	pushd "${S}/zuo" >/dev/null || die
-	econf
-	popd >/dev/null || die
-
-	einfo "Configuring Racket in ${S}"
-	# Libtool:
-	#   According to vapier, we should use the bundled libtool
-	#   such that we don't preclude cross-compile.
-	#   Thus don't use --enable-lt=/usr/bin/libtool
-	# Backend:
-	#   --enable-bc builds Racket w/o chez backend
-	# C Libraries:
-	#   --enable-libs & --disable-shared is the way to build
-	#   .a files that are needed to embed Racket into programs
-	#   https://docs.racket-lang.org/inside/cs-embedding.html
-	local -a myconf=(
-		--disable-shared
-		--disable-strip
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--enable-libs
-		$(usex chez "--enable-cs --enable-csonly" "--enable-bc --enable-bconly")
-		$(use_enable doc docs)
-		$(use_enable iconv)
-		$(use_enable ncurses curses)
-	)
-	# Some options are togglable only for the BC version (are forced in CS)
-	! use chez && myconf+=(
-			--enable-float
-			--enable-foreign
-			--enable-gracket
-			--enable-libffi
-			$(use_enable futures)
-			$(use_enable jit)
-			$(use_enable places)
-			$(use_enable threads pthread)
-		)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	# Compile Racket.
-	CC_FOR_BUILD="$(tc-getCC)" default
-
-	# Recompile Zuo with optimizations.
-	emake -C zuo
-}
-
-src_install() {
-	# Install Racket.
-	default
-
-	# Install Zuo.
-	emake -C zuo DESTDIR="${ED}" install
-
-	# raco needs decompressed files for packages doc installation, bug #662424
-	use doc && docompress -x "/usr/share/doc/${PF}"
-
-	# Create missing desktop files and icon.
-	if ! use minimal ; then
-		newicon "${ED}/usr/share/racket/drracket-exe-icon.png" racket.png
-
-		make_desktop_entry "gracket" "GRacket" "racket" "Development;Education;"
-		make_desktop_entry "plt-games" "PLT Games" "racket" "Education;Game;"
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# If we are merging the same SLOT check if package
-	# database files exist and do not overwrite them
-	if has_version "${CATEGORY}/${PN}:${SLOT}" ; then
-		echo "We are installing the same SLOT: ${SLOT}"
-
-		local rktd
-		for rktd in "${PKGDB[@]}" ; do
-			if [[ -f "${EROOT}/${rktd}" ]] && [[ -f "${ED}/${rktd}" ]] ; then
-				einfo "Keeping old file: ${rktd}"
-
-				mv "${ED}/${rktd}" "${ED}/${rktd}.bak" ||
-					die "failed to create a backup of ${rktd}"
-
-				cp "${EROOT}/${rktd}" "${ED}/${rktd}" ||
-					die "failed to create a copy of ${rktd}"
-			fi
-		done
-	fi
-}
-
-get_outsiders() {
-	racket -l raco -- pkg show -i | grep 'link' | sed 's|link.*||g'
-}
-
-pkg_postinst() {
-	# If we have any pkgs not included in Racket main distribution (outsiders),
-	# then we have to re-setup them or during installation other pkgs will want
-	# to recompile parts of "outsider" pkgs they depend upon (and fail).
-	local -a outsiders=( $(get_outsiders) )
-	if [[ -n "${outsiders[@]}" ]] ; then
-		ebegin "Running \"raco setup\" for outsider packages"
-		echo "Outsiders: ${outsiders[@]}"
-
-		raco setup --all-users --force --no-docs --no-user --pkgs "${outsiders[@]}"
-		eend 0  # do not fail
-	fi
-
-	optfeature "readline editing features in REPL" dev-libs/libedit
-	optfeature "generating PDF files using Scribble" dev-texlive/texlive-fontsextra
-
-	readme.gentoo_print_elog
-}
diff --git a/dev-scheme/racket/racket-8.15.ebuild b/dev-scheme/racket/racket-8.15.ebuild
index abd4774efd67..1c4a4d40ed04 100644
--- a/dev-scheme/racket/racket-8.15.ebuild
+++ b/dev-scheme/racket/racket-8.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ LICENSE="|| ( MIT Apache-2.0 ) chez? ( Apache-2.0 ) !chez? ( LGPL-3 )"
 # where we use _p, _pre, etc it will have to be set manually.
 SLOT="0/${PV}"
 
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ppc64 x86"
 IUSE="+chez +doc +futures iconv +jit minimal ncurses +places +threads"
 # * "chez" - see bug #809785 re chez/threads
 # * "iconv" - required for "doc"
@@ -71,6 +71,10 @@ PKGDB=(
 	/usr/share/racket/pkgs/pkgs.rktd
 )
 
+PATCHES=(
+	"${FILESDIR}"/racket-8.15-gcc15.patch
+)
+
 src_prepare() {
 	# Prepare the environment.
 	unset PLTADDONDIR PLTCOLLECTS PLTCONFIGDIR PLTUSERHOME
diff --git a/dev-scheme/stklos/Manifest b/dev-scheme/stklos/Manifest
index 4e9938f5b6ee..36dcca382b5f 100644
--- a/dev-scheme/stklos/Manifest
+++ b/dev-scheme/stklos/Manifest
@@ -1,9 +1,4 @@
-AUX stklos-2.00-gentoo.patch 4196 BLAKE2B d75ea23e414b525497dff5d819e04b76ad724ea80866bc5e9c88543540c794fd85cf49d54a8452ecfc06f662eea338e90fe9ea761b71dc7f3ee8c093494c9667 SHA512 5febf74c446ec5bed0d6380ad8f9d8a9e6cc01ff26bcaa7908e6bfd9d24730cb53a14f30d6f8413e306f2793457938bb76e8218496296f2ccf1e53f00a319592
-AUX stklos-2.00-ldflags.patch 377 BLAKE2B 0686dac938c87f92abffb56ebf94ade15e6f8f3d37a252cae77c377bf78083010010320a00a86884347a33526bee418a2e009464418fc32176211cff2d7bd1bd SHA512 086743b22c351fedc0021ab18d0fc4a699a9c098a6541ec3d85b81d579738d35928d3c244f71a5ce38e03476e04f4d077daa0ef655a47d0c4bac632c34e2ff2c
-AUX stklos-2.00-threads.patch 428 BLAKE2B 02659b90916259514642890d6bb887c52ab6bf74a9902a7eb4e142bc19c95606b8670c3634e1bbff3173db25bdf7f4e260f53eac8bec27155ff9fbd71b3d6b40 SHA512 9585001643c708b3834ee2c7935c6bd04423981d64c66b961387dfca449b61aadd81b5639e2e384b5545e83048604c3ef6bdd239ac73534d8f0e7d335ecc1155
 AUX stklos-2.10-gentoo.patch 1928 BLAKE2B 75918928b2979c7f9f344f2f0cf08e207b5ebdc94acac2e3f3d8f84dc99d39b9056ebe7d6bfa50dd1014caca196beebb6c0694cc9ce7f060e6a2b70d01ba321f SHA512 31c0e70cb279c4910b265003aae206f75f3688a799904589fc5f3ea20c9966abfa41ea5b53b42879905ee6618a009c0f422e6fe437f6e7c18eb98248a8b0489f
-DIST stklos-2.00.tar.gz 9661074 BLAKE2B c43918f182e8502d5ea4dd0a2d42ea4e788a573ca1184d4e3af792f3932b7a626280110c30bffa9771d73ed7fdc2a29db19bcd7ce8d5a219c1c0b9ef19195c6d SHA512 b98ad62713cb5e85d26378e73e2198d44676a0103c8e8444490cc555defc5b058652c514bdf3a27b0cc34c71b0b72d9f5fc440f260f6aa68064c5adda6571d5f
 DIST stklos-2.10.tar.gz 10280638 BLAKE2B d08b3ca4422e497a4adba1d810c97af6cfa262443214127eb0c82bedb21885bc1dcea5cf8f13387a1bfaf9182a9590d9557368ee2840d5c11d4b15f5e0ffe427 SHA512 41981794bd2a8a600a03b543e87c02d1072c8dd3449704d6bb55586cc45e50c4654d8dd3f2b9ac1efc89cee41da8d3667b895d641ff1817a8d14944b1dcd66cd
-EBUILD stklos-2.00-r1.ebuild 1178 BLAKE2B aa8921a201f00fbfa4ca7d6450ce64f7e78d474af39a9708f92d66f751a2f9195dc2d3bbd8edd26da3ada0dd61bfbc7a7c5c64e40643cd92d51b7e92be363ae7 SHA512 c5b5df9f9298fb22f08bab8b6a2c399b55cb6865b3785e9d460b9481ed55f2badcd45e19775edc83aeabe4dd100692f99ab19087ed5b1ad87e64d8a963710aa5
-EBUILD stklos-2.10.ebuild 1106 BLAKE2B aa050ce7793aef6b0741c30bbcc910b15932ccb63777cd934dccf62c0403454643cd073b1c9cef59fd18509acd22910286ecdede18561afbb6925ffc01893eff SHA512 7da3d05cc7a7d2087ae5d8449c2b096964634bc427f64e5256a8e54054fe56d275d63708ebd7e17e8b1d5873c0167c215d58818f42c9cd6daa44120bffbc60ab
+EBUILD stklos-2.10.ebuild 1104 BLAKE2B 99e6178073a88f80beff2c90dfc8521b71689ef032617b2307438b3a8087c3e586fcfb1e2a715ae36d55ed13b922771c5c86341e34bc0ad3fc2d6a559aa11b73 SHA512 ec5e5ca08b0712c986a8a15a7004af51ce0505b36eaa06c950f6d7f05dcb8ef474838591e38e14f1dc1c3f62bd137102461481f0b92bd47114c8f5a03c386b10
 MISC metadata.xml 739 BLAKE2B df32d98cff79f6d4e998c695eae85344c5b8d83c94fd8a6de47b5b11a2f874585ccdb3a05d7e29aa46f31799f3e3fd6ccf6f6674b7791c9710e89112a9075bdb SHA512 c6cd89f69ca1ed11a87164618dad3a5a566b6b930fb28fe37e8e6f16a8b76a53569c18d7569038bb47f7cbc175c42261d863afa1f1fb96286bf08cd70b5b12de
diff --git a/dev-scheme/stklos/files/stklos-2.00-gentoo.patch b/dev-scheme/stklos/files/stklos-2.00-gentoo.patch
deleted file mode 100644
index 83c33b8f0b2a..000000000000
--- a/dev-scheme/stklos/files/stklos-2.00-gentoo.patch
+++ /dev/null
@@ -1,153 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -143,28 +143,10 @@
-    htmldir="${docdir}/html"
- fi
- 
--# Manage standard options --libdir and --datadir
--# If the user doesn't specify these option, we fix
--#   libdir to ${prefix}/lib/
--#   datadir to ${prefix}/share
--# Otherwise, we take the user provided values.
--#
--# In any case, we will place our files in the stklos/${VERSION} subdir
--
--if test "$LIBDIR" == ""  ; then
--   # user has not given a "--libdir" option. Use ${prefix}/lib/stklos/${VERSION}
--   libdir="${prefix}/lib/${PACKAGE_TARNAME}/${VERSION}"
--fi
--
--if test "$DATADIR" == ""  ; then
--   # user has not given a "--datadir" option. Use ${prefix}/share/stklos/${VERSION}
--   datadir="${prefix}/share/${PACKAGE_TARNAME}/${VERSION}"
--fi
--
- ### Initialize the extra conf file in src
- PREFIX=$prefix
--SCMDIR=$datadir
--EXECDIR=$libdir
-+SCMDIR="${datadir}/${PACKAGE_TARNAME}/${VERSION}"
-+EXECDIR="${libdir}/${PACKAGE_TARNAME}/${VERSION}"
- 
- 
- ### Determine the kind of the machine which is running this script
---- a/lib/Lalr.d/Makefile.am
-+++ b/lib/Lalr.d/Makefile.am
-@@ -33,8 +33,8 @@
- all: lalr.ostk calc
- 
- install-sources: install
--	mkdir -p $(schemedir)
--	cp lalr.stk $(DESTDIR)/$(schemedir)
-+	mkdir -p $(DESTDIR)$(schemedir)
-+	cp lalr.stk $(DESTDIR)$(schemedir)
- 
- uninstall-hook:
- 	rm  -f $(DESTDIR)/$(schemedir)/lalr.stk
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -174,7 +174,7 @@
- 	@for i in $(SUBDIRS) ;do \
- 	   (cd $$i; $(MAKE) install-sources)\
- 	done
--	cp $(SRC_STK) $(scheme_BOOT) $(DESTDIR)/$(schemedir)
-+	cp $(SRC_STK) $(scheme_BOOT) $(DESTDIR)$(schemedir)
- 
- 
- # Explicit some dependencies here
---- a/lib/SILex.d/Makefile.am
-+++ b/lib/SILex.d/Makefile.am
-@@ -25,8 +25,8 @@
- SRC= silex.scm multilex.scm
- 
- install-sources:
--	mkdir -p  $(DESTDIR)/$(schemedir)
--	cp $(SRC) $(DESTDIR)/$(schemedir)
-+	mkdir -p  $(DESTDIR)$(schemedir)
-+	cp $(SRC) $(DESTDIR)$(schemedir)
- 
- 
- uninstall-hook:
---- a/lib/scheme/Makefile.am
-+++ b/lib/scheme/Makefile.am
-@@ -189,7 +189,7 @@
- 	@for i in $(SUBDIRS) ;do \
- 	   (cd $$i; $(MAKE) install-sources)\
- 	done
--	cp $(scheme_sources) $(schemedir)
-+	cp $(scheme_sources) $(DESTDIR)$(schemedir)
- 
- clean:
- 	(cd vector; $(MAKE) clean)
---- a/lib/scheme/vector/Makefile.am
-+++ b/lib/scheme/vector/Makefile.am
-@@ -130,8 +130,8 @@
- #======================================================================
- 
- install-sources:
--	mkdir -p $(srfidir)
--	cp $(srfi_sources) $(srfi_interm) $(srfidir)
-+	mkdir -p $(DESTDIR)$(srfidir)
-+	cp $(srfi_sources) $(srfi_interm) $(DESTDIR)$(srfidir)
- 
- # we also clean the TAG.stk files -- $(srfi-interm) --, which are NOT
- # srfi_OBJS (should not be installed with other objects):
---- a/lib/srfi/160/Makefile.am
-+++ b/lib/srfi/160/Makefile.am
-@@ -140,8 +140,8 @@
- #======================================================================
- 
- install-sources:
--	mkdir -p $(srfidir)
--	cp $(srfi_sources) $(srfidir)
-+	mkdir -p $(DESTDIR)$(srfidir)
-+	cp $(srfi_sources) $(DESTDIR)$(srfidir)
- 
- clean:
- 	rm -f $(srfi_OBJS) *-incl.c *~
---- a/lib/srfi/Makefile.am
-+++ b/lib/srfi/Makefile.am
-@@ -383,7 +383,7 @@
- 	@for i in $(SUBDIRS) ;do \
- 	   (cd $$i; $(MAKE) install-sources)\
- 	done
--	cp $(srfi_sources) $(srfidir)
-+	cp $(srfi_sources) $(DESTDIR)$(srfidir)
- 
- clean:
- 	rm -f $(srfi_OBJS) *-incl.c *~
---- a/lib/stklos/Makefile.am
-+++ b/lib/stklos/Makefile.am
-@@ -75,7 +75,7 @@
- 
- # ======================================================================
- install-sources:
--	cp $(scheme_sources) $(schemedir)
-+	cp $(scheme_sources) $(DESTDIR)$(schemedir)
- 
- clean:
- 	rm -f $(ALL_OBJS) *-incl.c  *~
---- a/lib/streams/Makefile.am
-+++ b/lib/streams/Makefile.am
-@@ -75,7 +75,7 @@
- 
- # ======================================================================
- install-sources:
--	install $(scheme_sources) $(schemedir)
-+	install $(scheme_sources) $(DESTDIR)$(schemedir)
- 
- clean:
- 	rm -f $(ALL_OBJS) *-incl.c  *~
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -110,8 +110,8 @@
- 
- 
- install-exec-hook:
--	mv $(bindir)/stklos $(bindir)/stklos-@VERSION@
--	ln -s stklos-@VERSION@ $(bindir)/stklos
-+	mv $(DESTDIR)$(bindir)/stklos $(DESTDIR)$(bindir)/stklos-@VERSION@
-+	ln -s stklos-@VERSION@ $(DESTDIR)$(bindir)/stklos
- 
- 
- doc:  $(DOCDB)
diff --git a/dev-scheme/stklos/files/stklos-2.00-ldflags.patch b/dev-scheme/stklos/files/stklos-2.00-ldflags.patch
deleted file mode 100644
index 9e695718e6b0..000000000000
--- a/dev-scheme/stklos/files/stklos-2.00-ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -195,12 +195,6 @@
- lib/streams: lib
- lib/srfi: lib/scheme lib/stklos lib/streams
- 
--readline-complete.@SH_SUFFIX@: readline-complete.c
--	@CC@ @CFLAGS@ @STKCFLAGS@ @SH_COMP_FLAGS@ -I../src @GCINC@ \
--	-c -o $*.o $*.c
--	@SH_LOADER@ @SH_LOAD_FLAGS@ -o $*.@SH_SUFFIX@ $*.o @DLLIBS@ @RDLINE@
--	/bin/rm -f $*.o
--
- #
- # SRFIs support
- #
diff --git a/dev-scheme/stklos/files/stklos-2.00-threads.patch b/dev-scheme/stklos/files/stklos-2.00-threads.patch
deleted file mode 100644
index 0a32bc5de7d8..000000000000
--- a/dev-scheme/stklos/files/stklos-2.00-threads.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/stklos.h
-+++ b/src/stklos.h
-@@ -46,15 +46,15 @@
- #include <memory.h>
- #include <locale.h>
- #include <stdint.h>
--#ifndef THEADS_NONE
-+
-+#include "stklosconf.h"
-+#include "extraconf.h"
-+#ifndef THREADS_NONE
- #  include <pthread.h>
- #  define GC_THREADS 1
- #  define _REENTRANT 1
- #endif
- 
--#include "stklosconf.h"
--#include "extraconf.h"
--
- /* To debug the GC uncomment the following line */
- /* #define GC_DEBUG 1 */
- 
diff --git a/dev-scheme/stklos/stklos-2.00-r1.ebuild b/dev-scheme/stklos/stklos-2.00-r1.ebuild
deleted file mode 100644
index a7f5f7d4abfd..000000000000
--- a/dev-scheme/stklos/stklos-2.00-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Fast and light Scheme implementation"
-HOMEPAGE="https://stklos.net/"
-SRC_URI="https://${PN}.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="threads"
-
-RDEPEND="dev-libs/boehm-gc[threads?]
-	dev-libs/gmp:=
-	dev-libs/libffi:=
-	dev-libs/libpcre2:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-ldflags.patch
-	"${FILESDIR}"/${P}-threads.patch
-)
-DOCS=( AUTHORS ChangeLog NEWS.md PACKAGES-USED {PORTING-NOTES,README}.md SUPPORTED-SRFIS )
-
-src_prepare() {
-	default
-
-	if ! use threads; then
-		sed -i '/threads.adoc/d' doc/refman/${PN}.adoc
-		rm -f tests/srfis/2{16,30}.stk
-	fi
-	eautoreconf
-	export LD="$(tc-getCC)"
-	export STKLOS_CONFDIR="${T}"/.config/${PN}
-}
-
-src_configure() {
-	econf \
-		--enable-threads=$(usex threads pthreads none) \
-		--without-provided-bignum \
-		--without-provided-ffi \
-		--without-provided-gc \
-		--without-provided-regexp
-}
-
-src_compile() {
-	emake
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	default
-	einstalldocs
-}
diff --git a/dev-scheme/stklos/stklos-2.10.ebuild b/dev-scheme/stklos/stklos-2.10.ebuild
index 17f5eaa272a9..2893bf029731 100644
--- a/dev-scheme/stklos/stklos-2.10.ebuild
+++ b/dev-scheme/stklos/stklos-2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="threads"
 
 RDEPEND="dev-libs/boehm-gc[threads?]