6 files changed, 3 insertions, 260 deletions
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?]