gentoo auto-resync : 04:11:2023 - 22:13:37

4 files changed, 89 insertions, 4 deletions

diff --git a/dev-lang/eisl/Manifest b/dev-lang/eisl/Manifest
index 8c4bf170c86b..44500570dbcc 100644
--- a/dev-lang/eisl/Manifest
+++ b/dev-lang/eisl/Manifest
@@ -1,5 +1,8 @@
 AUX eisl-2.85-Makefile.patch 987 BLAKE2B b5823a4579915fb7785548622f5d3fbbd968d8b4a20467cb0cbc01dd9ce9f137d324126056a13174bf70b4d787277a4580c7485d86e603217cd8e290160525e4 SHA512 c25e8d084294ef757c3b51f0c640e3b994a4cec0aebda930cf3059e628aaeb3a4bdbd709d3079f3f800159adda61e200ff28aa0314cfe81da4f5cadbef8165e2
+AUX eisl-3.60-Makefile.patch 883 BLAKE2B 42419e7db0c5b960e218e821cd53d11caaa1a48d74c3e3d810c387e7e74f4fb2699d1cc54fc59c4201664a35384288c1f43e9910cabca9747f2522f2dc3aa364 SHA512 de22e920debb00b2988b8cd9d63c50c7c43d680c5b668f32dd9841a50875f7a857f5c320a00311f4d4adbff857298bf1e25f19f6a0baa7f0cba81ac63aaacd0f
 DIST eisl-3.50.tar.gz 2428194 BLAKE2B bab17dc6ab00f894cd4e9558a1bbc4bca9eb2770de46eb30d015e9e7542c774f2d55427bea05d5c5c6d910eec9a9de3d84568f9ec12043f20bbcdc542f0294ff SHA512 53d23a86a5b15ff04c268db348b5edb61eb0709cb1ef21e5b9ca7eda8954a0ab2b9dad345c3a9d80325cbfe35e879516b0d8d98609cf68dcad8898b5ce10c175
+DIST eisl-3.60.tar.gz 2429781 BLAKE2B 7a5752df5682444fb3a1381030e1c73a1859021d9d18a5c2f0afc257012ef12d169c952044202f6f591965cbee4caab269ee362d317d6f87d09077d1f217857d SHA512 400e2a6e8c3de9fe97a240adbab6ec61ccff69a1b407443b7c832b357a390d16cef1090494f314cd3d16278cca131695345b8c6e0fe51e658c45dd3bea20e4f6
 EBUILD eisl-3.50.ebuild 998 BLAKE2B 1e725a17e5904c483f2779e81d66204ec183b84cdfe5b7fe83d9e9c0d4ecd9b93fd13f3b8851296bb43b5337ef471bb3f6457e413499f3a70c8c8a712acecd1f SHA512 caaddb4d8cdf118e1e3fa1a942bcf2349264113b41a3d2f136c22e2080fad502d32553839ba4d19a71ef36dea32ea721894bb906e2c6da4b2aee8af6cd6d43e5
-EBUILD eisl-9999.ebuild 999 BLAKE2B 21d34e1a7d23a40dd779098282230a358203183c855f71ae91fef97fd6e1b61b321cb8644d62a04c7a1c1b6846d218ea956e887d9b5a9c8710f6cc79fee18dde SHA512 21343f2866e7988267ba157c1d56d73c0f87d567bfae4cb306752f9739ad47774a5a38611cd770432f912580438c094f22d0c453a9667f964ee86c40c33dbd3b
+EBUILD eisl-3.60.ebuild 1005 BLAKE2B bf9361efcf3f564ea3dd41a9f9d404b95b774df7f88b6280fa1d41d67eebbe1063d6f49876068478d31d11dc0846247b7655d4022ca07cd26c4ee869856acd6b SHA512 dfb4fc078498d62a137dcac57a0cd7bf5c7efb85bf4b9cbec3406ebbe432906e1d621ddf282145a3037bdd1a84b603b665d14638adf4d2894441da7b9c7a3b8c
+EBUILD eisl-9999.ebuild 1005 BLAKE2B bf9361efcf3f564ea3dd41a9f9d404b95b774df7f88b6280fa1d41d67eebbe1063d6f49876068478d31d11dc0846247b7655d4022ca07cd26c4ee869856acd6b SHA512 dfb4fc078498d62a137dcac57a0cd7bf5c7efb85bf4b9cbec3406ebbe432906e1d621ddf282145a3037bdd1a84b603b665d14638adf4d2894441da7b9c7a3b8c
 MISC metadata.xml 631 BLAKE2B fd171b07cf1f7beae7be774a5da360d466c83f01a6bd52dc69af436926ae5aebec27a2723c11498be21c4f96f6b82c6aa3571f4b84e763459ef78086450252f2 SHA512 dd9e329f24ce6d3922e92e81d36234b93151f71c88d6ba4b38557565a7c1c3bc4b7172d4d55f1d2d5bd6c5cada449691067cc71abd4d456941f6a8b78fe0df87
diff --git a/dev-lang/eisl/eisl-3.60.ebuild b/dev-lang/eisl/eisl-3.60.ebuild
new file mode 100644
index 000000000000..866b41aa1866
--- /dev/null
+++ b/dev-lang/eisl/eisl-3.60.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 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" )
+
+src_compile() {
+	emake CC="$(tc-getCC)" clean 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/eisl-9999.ebuild b/dev-lang/eisl/eisl-9999.ebuild
index 987db06ada03..866b41aa1866 100644
--- a/dev-lang/eisl/eisl-9999.ebuild
+++ b/dev-lang/eisl/eisl-9999.ebuild
@@ -8,12 +8,14 @@ inherit toolchain-funcs
 DESCRIPTION="Interpreter and compiler compatible with the ISLisp standard"
 HOMEPAGE="https://github.com/sasagawa888/eisl/"
 
-if [[ ${PV} == *9999* ]] ; then
+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
 
@@ -26,7 +28,7 @@ DOCS=( README{,-ja}.md documents )
 RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.85-Makefile.patch )
+PATCHES=( "${FILESDIR}/${PN}-3.60-Makefile.patch" )
 
 src_compile() {
 	emake CC="$(tc-getCC)" clean edlis eisl
@@ -38,7 +40,7 @@ src_install() {
 
 	# Compilation of ISLisp files on installation fails.
 	# Do not compile them and mimic "make install".
-	insinto /usr/share/${PN}
+	insinto "/usr/share/${PN}"
 	doins -r library
 	doins fast.h ffi.h
 
diff --git a/dev-lang/eisl/files/eisl-3.60-Makefile.patch b/dev-lang/eisl/files/eisl-3.60-Makefile.patch
new file mode 100644
index 000000000000..3c9c763fd608
--- /dev/null
+++ b/dev-lang/eisl/files/eisl-3.60-Makefile.patch
@@ -0,0 +1,32 @@
+--- a/makefile
++++ b/makefile
+@@ -39,7 +39,7 @@ else
+ 		endif
+ 	endif
+ endif
+-CFLAGS += $(INCS) -g -Wall -Wextra -D_FORTIFY_SOURCE=2 $(CURSES_CFLAGS) -U_XOPEN_SOURCE -Inana/src
++CFLAGS += $(INCS) -g $(CURSES_CFLAGS) -U_XOPEN_SOURCE -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
+@@ -69,7 +69,7 @@ ifeq ($(DEBUG),1)
+ 		LDFLAGS += -fsanitize=undefined
+ 	endif
+ else
+-	CFLAGS += -O3 -flto -DNDEBUG=1 -DWITHOUT_NANA=1
++	CFLAGS += -DNDEBUG=1 -DWITHOUT_NANA=1
+ 	SRC_CII += cii/src/mem.c
+ endif
+ OBJ_CII := $(SRC_CII:.c=.o)
+@@ -87,11 +87,8 @@ ifeq  ($(shell uname -n),raspberrypi)
+ 	CFLAGS += -D__rpi__
+ endif
+ ifneq ($(DEBUG),1)
+-	LDFLAGS += -flto
+ 	ifeq  ($(shell uname),Darwin)
+ 		LDFLAGS += -Wl,-S,-x
+-	else
+-		LDFLAGS += -s
+ 	endif
+ endif
+ PREFIX := /usr/local