7 files changed, 216 insertions, 54 deletions
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 8ece79cfc358..62581018737a 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/stklos/Manifest b/dev-scheme/stklos/Manifest
index 7d3e115908ef..8385d8a74744 100644
--- a/dev-scheme/stklos/Manifest
+++ b/dev-scheme/stklos/Manifest
@@ -1,5 +1,8 @@
 AUX stklos-1.70-configure-clang16.patch 760 BLAKE2B c89264cb8eec7ad18a9289bd1f7ffe9c8f522b47de15bd27a832b12fa30a26d4b6a8e0f09a949563d78bd882b6fe986c093eb30112ca6a14a11fcda5f42ad632 SHA512 fe84d85a70995947dd2f6ae2729a5e0e17186be83dbbc34ce14217bcc6d5c7a74d7edd63b67b84f7a04c823234a437b55cd74e9f254b9b07c5ae10606511dcc2
 AUX stklos-1.70-gentoo.patch 1937 BLAKE2B 42c534b6d84bc1c3a541bcb8e68ba0abf097f4ad0a1012df1a153ebed918bf2ea37e0c505c33cbdf07ab9dc57372df37a3fdefb3864201497f1cca6bfe888b64 SHA512 05f9c3263e46902c149cd4131c32092b24e4d2499596faa9c6d0d448a1e92a06eac466458e3cca5e688fa4a07e5e870ff81ca4d5a4171c50217b942ebf4850df
+AUX stklos-2.00-gentoo.patch 4196 BLAKE2B d75ea23e414b525497dff5d819e04b76ad724ea80866bc5e9c88543540c794fd85cf49d54a8452ecfc06f662eea338e90fe9ea761b71dc7f3ee8c093494c9667 SHA512 5febf74c446ec5bed0d6380ad8f9d8a9e6cc01ff26bcaa7908e6bfd9d24730cb53a14f30d6f8413e306f2793457938bb76e8218496296f2ccf1e53f00a319592
 DIST stklos-1.70.tar.gz 8767615 BLAKE2B 7cae5b5d0c9b2d9dcccc47e78e70a562f2d1751de068668777441d29ee15be7f3c5c285b8297e367311cd8c9695c9a2d083ad7ea1d9c21c838cf1d819f7cb82c SHA512 64da09171b191688f750f10c29f10cd7393f326555d4324344faeac63547a2548407490e44a50f0afa348487bd9cc5106f3c344cab6935f3a3516b3c064a596f
+DIST stklos-2.00.tar.gz 9661074 BLAKE2B c43918f182e8502d5ea4dd0a2d42ea4e788a573ca1184d4e3af792f3932b7a626280110c30bffa9771d73ed7fdc2a29db19bcd7ce8d5a219c1c0b9ef19195c6d SHA512 b98ad62713cb5e85d26378e73e2198d44676a0103c8e8444490cc555defc5b058652c514bdf3a27b0cc34c71b0b72d9f5fc440f260f6aa68064c5adda6571d5f
 EBUILD stklos-1.70-r1.ebuild 1058 BLAKE2B 9d5e1c88de4d0024acd0cbb115942cb3c1c898c8b115db913381393a656d3b6dbac1e05b914988223820fd044a7a3390d89f372e8b2bbfdcf1748447778b4b65 SHA512 3e6f45f637082e29789d373e697a497e027c3876c797ed729a9ebf744f5bd1901472a0157b36c147c60853c55882e0282c10d3a9bb6d571ac5ba7dd309c31960
+EBUILD stklos-2.00.ebuild 1111 BLAKE2B acaaa61c065061473f735b0d19a1709a56654c19a1db46b45fb2fd2b1dd6809be1b31573abcb3b670c61a2b35a4e02315cfafea1e4648f4d0bfd181f1052ea49 SHA512 6d08d5cb267c63bf2138f8166cca3f33aaf1f641138c1d20caf248eec9c6f264a6e821e1237d2b4097bd05aa62555b1969622653c166880b84ec88e97901a088
 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
new file mode 100644
index 000000000000..83c33b8f0b2a
--- /dev/null
+++ b/dev-scheme/stklos/files/stklos-2.00-gentoo.patch
@@ -0,0 +1,153 @@
+--- 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/stklos-2.00.ebuild b/dev-scheme/stklos/stklos-2.00.ebuild
new file mode 100644
index 000000000000..fad97e515254
--- /dev/null
+++ b/dev-scheme/stklos/stklos-2.00.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 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 )
+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/tinyscheme/Manifest b/dev-scheme/tinyscheme/Manifest
index bf002724fe13..9f4b6f8bc4cd 100644
--- a/dev-scheme/tinyscheme/Manifest
+++ b/dev-scheme/tinyscheme/Manifest
@@ -1,6 +1,4 @@
 AUX tinyscheme-makefile.patch 1049 BLAKE2B ddfd6371d76d52231319a9df7ad3bc1538eb334ed8e3210666ac83e997893aaa6fc9e2b76632b940921c64e83b98bb026079844e249e1d26cde070fa06f8cacf SHA512 dfd1ba72d4e32ed2d07ff20f88edebc203329a1ead3931c871fd22da1dd883ca48e5d5cb75c0689d4c8b0edc6d9e533a8716f2e2034444f303dc81f48b82ac92
-DIST tinyscheme-1.41.tar.gz 61761 BLAKE2B b657376561eee0ceae02d102ae7da7ce777dcbc78c98b54b0c00c578fb06ccdd3fba8aca5ce150ca188917b8e5f1e9acb63c9c5dc2e050aafa78b0705a20d47c SHA512 a9c1c9cd7a11bf31e0f8ac813ebd6e731cb56b9526fd14d343d7f8c479a8e1b561b744b3f522512adc023cacd1acbf52aa18bf5d8db68f767971660305b79b0f
 DIST tinyscheme-1.42.tar.gz 62156 BLAKE2B 9ebda4e0d90c37bb5e9b8275e67912daebe3786163bdb0b5ad06ad48bdd98934f9ce8679c0d259276fd4a8595522cb06d384498fe283314b782e29bf723af522 SHA512 54841dddd151042a976343409d5fcd778390bfddad50986d2a19120ec1eede54e2a3150100f5331abcacc222d8d547abde2b65a427c0353c2534b5f52918606c
-EBUILD tinyscheme-1.41-r1.ebuild 1073 BLAKE2B 15ca47ef1b18b8ddddf0495fc06ce9d2a69a79214817cc4c227ff5946e85e451b361f531fcd1f5dc7cfe01b9b0ef100af15e835c17326972e38a2b2686cda727 SHA512 4279522d530b49bc66bc2e33c04ed4eff766aaedd04ca6eac92fea1d5ceed8dd45c39fb3580e45a0f0e1e76eec18a942572405e2dc2a57377df6d94599fda1e9
-EBUILD tinyscheme-1.42.ebuild 1073 BLAKE2B 48993e98bc02b95acd4e9b85b61cfdac7c6ef2cadab5757ed5e5b14172a7122591143812b14f4b055fccde697bd7a9817afe262d2b01e8fae1ee4d1d30f116ac SHA512 17a8006ede7c42cfcd296e09c7ea84b0394abd3a5e969c31fed61d16c382dfba1a1f28d8f4891ca2ed462eb2888689d5ddffc9df29f2823281482ef5deed52f2
+EBUILD tinyscheme-1.42.ebuild 1060 BLAKE2B 0a23e9d737edf5ac5c804bd512d6ae72a1e0ef603551ee783594d46feeeb6c1a31323422947ed5b5109cb39689d270f003b01a140ba03339eb255bb888747bb2 SHA512 d2d2a4544502e3bff91f589670697bbc06c3ca392eef10a9ba651b411b0913760fafaa6b60899fc95cb01452887bfea8b1700e2788c3de562f337f5f2ba7c427
 MISC metadata.xml 884 BLAKE2B 2c4e7346a43676652eae5b4cff9776430c7ebd7643106d487b410117fc488eb1741b8f5f454bd289b705e15be870af50c9b6ac16930983696439caf4438603cd SHA512 bbae3c7ecd0746d1e5796ab8444a74f4943e6774294bd5e8e375e7d85ac92f53920c714e6b86656e903430837aaf76e26b5b90519d158a18da507ab1155d7eeb
diff --git a/dev-scheme/tinyscheme/tinyscheme-1.41-r1.ebuild b/dev-scheme/tinyscheme/tinyscheme-1.41-r1.ebuild
deleted file mode 100644
index 04e8f5c1ab04..000000000000
--- a/dev-scheme/tinyscheme/tinyscheme-1.41-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Lightweight scheme interpreter"
-HOMEPAGE="https://tinyscheme.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND=""
-
-PATCHES=( "${FILESDIR}"/${PN}-makefile.patch )
-DOCS=( CHANGES {Manual,MiniSCHEMETribute,hack}.txt )
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	local tslib=lib${PN}$(get_libname)
-	local tslibx=lib${PN}$(get_libname ${PV})
-
-	newbin scheme ${PN}
-
-	newlib.so ${tslib} ${tslibx}
-	dosym ${tslibx} /usr/$(get_libdir)/${tslib}
-	use static-libs && dolib.a lib${PN}.a
-	einstalldocs
-
-	# bug #328967
-	insinto /usr/include
-	newins scheme.h ${PN}.h
-
-	local INIT_DIR=/usr/share/${PN}
-	insinto ${INIT_DIR}
-	doins init.scm
-	dodir /etc/env.d
-	echo "TINYSCHEMEINIT=\"${EPREFIX}${INIT_DIR}/init.scm\"" >"${ED}"/etc/env.d/50${PN}
-}
diff --git a/dev-scheme/tinyscheme/tinyscheme-1.42.ebuild b/dev-scheme/tinyscheme/tinyscheme-1.42.ebuild
index c8128168a6bd..f63b0a56b307 100644
--- a/dev-scheme/tinyscheme/tinyscheme-1.42.ebuild
+++ b/dev-scheme/tinyscheme/tinyscheme-1.42.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-inherit flag-o-matic multilib toolchain-funcs
+inherit multilib toolchain-funcs
 
 DESCRIPTION="Lightweight scheme interpreter"
 HOMEPAGE="https://tinyscheme.sourceforge.net/"