[gentoo-commits] repo/gentoo:master commit in: dev-lang/eisl/, dev-lang/eisl/files/

["Maciej Barć" <xgqt@gentoo.org>]

commit:     1f41d6b722590a98ab8ad0de3e93c4a538bec7d9
Author:     NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com>
AuthorDate: Sun Jan 12 14:12:15 2025 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 14:25:55 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f41d6b7

dev-lang/eisl: add 5.41

With backported upstream patch to fix build with C23.
Patch would be unneeded next upstream release.

Bug: https://bugs.gentoo.org/942206
Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/40102
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-lang/eisl/Manifest                       |  1 +
 dev-lang/eisl/eisl-5.41.ebuild               | 57 ++++++++++++++++++++++++++++
 dev-lang/eisl/files/eisl-5.41-makefile.patch | 52 +++++++++++++++++++++++++
 3 files changed, 110 insertions(+)

diff --git a/dev-lang/eisl/Manifest b/dev-lang/eisl/Manifest
index 1dd4d617c243..628e5197844d 100644
--- a/dev-lang/eisl/Manifest
+++ b/dev-lang/eisl/Manifest
@@ -1,3 +1,4 @@
 DIST eisl-5.38.tar.gz 3136867 BLAKE2B cfe62da4882a8f687c683345c3518a7245bdfc87b17dd6b956cc3b5db494631c6cb3a2ca24ecfe1454671e8d1e14c9052ae4c119b4855c585fbb93c99af0ddba SHA512 4bed412660700ddba7a8015b1488adcaf9ff89aed5ac5af0a51c65af76ec78fa4dab04b092c4ad7404ce3fb071dff7d219810c4422a983375e5634861de81698
 DIST eisl-5.39.tar.gz 3137025 BLAKE2B 1aca7df4b629b9e9b71fa8355654d65a84cf3f08a59111a978f6d3868377f2fb857041a83f2044dc3d367624b910aaee701d5a4b0dea2d4aa94c49f0aaa60ef4 SHA512 976f5ae8eab96be135ab52b2abdac36ebeef6987ff4091639f29105d9b81f2f4f092a38d60e8ad0f746a42dedc362f95e4a26a8e375bff2f3fc7f7215243dd2b
 DIST eisl-5.40.tar.gz 3140344 BLAKE2B aa00ff32302a6a9f1d9772f8e9c2690e47f1d466ec433c2f4519434a599d8b6bdb923e3bbdb1a278b3aaa1274ea139ff46e1bb736f972ab495f0dfc031de1916 SHA512 44e2ca7a35c3e200e7d8b0bd948427e0bfa81e678269df81d3e36e601123c1528c25a4b2d13b5d92956378b27c5211caa5e51113763099af4b9b65bf369382fd
+DIST eisl-5.41.tar.gz 3140179 BLAKE2B b60ec0209313973af31b0940317fdecd8e87c9de46093830d7e3c3924bbab9ef5da638a67b43b91a3c351d3d357817fcf26a56aeb2203e3f2a1865c797c743b1 SHA512 1b87a4c16b75289a95ffee20b7182151701736c96f3ddcdf1e00ef51356b668059b43cab39e9dd3b1f193b102f1f7cd32e435c0d212342e2544fff9507dfb99a

diff --git a/dev-lang/eisl/eisl-5.41.ebuild b/dev-lang/eisl/eisl-5.41.ebuild
new file mode 100644
index 000000000000..0cbe742c8a06
--- /dev/null
+++ b/dev-lang/eisl/eisl-5.41.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Interpreter and compiler compatible with the ISLisp standard"
+HOMEPAGE="https://github.com/sasagawa888/eisl/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/sasagawa888/${PN}.git"
+else
+	SRC_URI="https://github.com/sasagawa888/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+RESTRICT="test"  # Tests run cppcheck (and fail)
+
+DOCS=( README{,-ja}.md documents )
+
+RDEPEND="
+	sys-libs/ncurses:=
+"
+DEPEND="
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.60-Makefile.patch"
+	"${FILESDIR}/${PN}-5.41-makefile.patch" )
+
+src_compile() {
+	# bug https://bugs.gentoo.org/939771
+	# don't clean and compile in one invocation with --shuffle possible
+	emake CC="$(tc-getCC)" clean
+	emake CC="$(tc-getCC)" edlis eisl
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe edlis eisl
+
+	# Compilation of ISLisp files on installation fails.
+	# Do not compile them and mimic "make install".
+	insinto "/usr/share/${PN}"
+	doins -r library
+	doins fast.h ffi.h
+
+	einstalldocs
+}

diff --git a/dev-lang/eisl/files/eisl-5.41-makefile.patch b/dev-lang/eisl/files/eisl-5.41-makefile.patch
new file mode 100644
index 000000000000..eff42346b85d
--- /dev/null
+++ b/dev-lang/eisl/files/eisl-5.41-makefile.patch
@@ -0,0 +1,52 @@
+Upstream commit https://github.com/sasagawa888/eisl/commit/5bd9332998e23298a3d0a3fb7066bdf98dbe5b0b
+Fixes for https://github.com/sasagawa888/eisl/issues/335 https://github.com/sasagawa888/eisl/issues/334
+Edited to accomodate our makefile patch
+Bug https://bugs.gentoo.org/939771
+Bug https://bugs.gentoo.org/942206
+should be fropped from 5.42
+
+From 5bd9332998e23298a3d0a3fb7066bdf98dbe5b0b Mon Sep 17 00:00:00 2001
+From: sasagawa888 <ken-s@tkcnf.or.jp>
+Date: Sun, 12 Jan 2025 09:08:47 +0900
+Subject: [PATCH] Modify makefile
+
+---
+ makefile | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/makefile b/makefile
+index 2755d0c8..b666f95d 100644
+--- a/makefile
++++ b/makefile
+@@ -42,7 +42,7 @@ else
+ 		endif
+ 	endif
+ endif
+-CFLAGS += $(INCS) -g $(CURSES_CFLAGS) -U_XOPEN_SOURCE -Inana/src
++CFLAGS += $(INCS) -g $(CURSES_CFLAGS) -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -Inana/src
+ DFLAGS := --preview=all --de -w --O3 --release --betterC
+ SRC_CII := cii/src/except.c cii/src/fmt.c cii/src/str.c cii/src/text.c
+ SRC_D := dextension.d disl.d
+@@ -1545,6 +155,22 @@ ifeq ($(DEBUG),1)
+ main.o: nana/src/nana-config.h
+ endif
+ 
++main.o: function.o extension.o syntax.o data.o gbc.o cell.o error.o bignum.o compute.o edit.o syn_highlight.o long.o link.o
++function.o: function.c eisl.h 
++extension.o: extension.c eisl.h 
++syntax.o: syntax.c eisl.h 
++data.o: data.c eisl.h 
++gbc.o: gbc.c eisl.h 
++cell.o: cell.c eisl.h 
++error.o: error.c eisl.h 
++bignum.o: bignum.c eisl.h 
++compute.o: compute.c eisl.h 
++edit.o: edit.c eisl.h 
++syntax_highlight.o: syntax_highlight.c eisl.h 
++long.o: long.c eisl.h 
++link.o: link.c eisl.h 
++
++
+ nana/src/nana-config.h:
+ 	-cd nana; autoreconf -fi; ./configure
+