gentoo auto-resync : 16:09:2022 - 11:14:45

4 files changed, 24 insertions, 32 deletions

diff --git a/dev-lang/eisl/Manifest b/dev-lang/eisl/Manifest
index a16a9a35392e..6b0e440f7e50 100644
--- a/dev-lang/eisl/Manifest
+++ b/dev-lang/eisl/Manifest
@@ -1,10 +1,9 @@
-AUX eisl-2.50-Makefile.patch 923 BLAKE2B 33c1effb134e13383d46a1b8af3a0873262bf79cd0d09769229479ba1de5a7d5d1e64c90355d865a74a7bb2e75a6d3cdec6242026b5763812cc0c405ef21572a SHA512 050ff2148f989cc60d6de16e8c3a06827ea4cfb9dc6e8e7d0be9d8d7beca0420e2f231d60bf2fae219eb0413ca4331bc1b22f56946af4779171fa98054219be3
-AUX eisl-2.50-compat-no-cdefs.patch 207 BLAKE2B d8d2dd5133ed5fef70bc426829424633cbe1de079e9651df968d55c476c3eaf094d6e276abcd0cf59da4757434aed0c854b6bc7a0ddac1911ef2ea840e9bfaaf SHA512 8cb511c88de2dd1618720a6e15fa96850e3e4676cdb8aafe75e1cf5d2d70402ebc54fe73884acab7d38aec23a372670ec12b449e4dab2a3e08910d7157b09420
 AUX eisl-2.62-Makefile.patch 946 BLAKE2B 0ab2263a0893a0ca0c21a48f9b2ce302bb1691be42ec28f429f16dd7f2c2d4f8eeff37b24671ffa574aa79416a34d93259fd3001ee36d0a3175fa84cdb6055eb SHA512 418ca1374605f565573b2b1eb93a0b0ab05b10037627343c86dd30e97933da36c43badefe6344526ec827e453aba489b66e2eda392ec01be9213b9e5b80bebc9
-DIST eisl-2.50.tar.gz 1757697 BLAKE2B 83c68213522320c815d9c7930c58181adba6f7fd3387421b7c7de55aca0fb6cabd78f65543c71adb89408531ea59855aafcf5bafd466bf517626a49cd252641f SHA512 4865c09dbbc0db885af69ec5ef0a731e2f55455f296b343b1cb05d3233e1e18c397b3b0a21eb0a6a86f85f20bf4e62f5e968fdf3cab45f6b5e3e3f9ee27d5e80
+AUX eisl-2.63-Makefile.patch 996 BLAKE2B 972f8fd7d0005a97d9390be4957a46b2f36881e95447d6d71fb46a1c704ae0554d8e98d78cb64234b72e23f9846aebbccf086472722a42235e69b6784bc323d3 SHA512 6ae9bdde343bcd2050ea47cbed5278d16b41cf73f98606e3e1936713d28cb4264002fcbfede4108097f198ded9a7065120911f5242ee1999957481ab66184e29
 DIST eisl-2.60.tar.gz 1858691 BLAKE2B 9fc235c13f8e4c83a19bfffaaf94d19b07ae6cb5b1b60041d45da47451fee535a8153be9c360c5b496e33dba0618cc4d871d50a5f5d044675070ce406d635a0a SHA512 abb30b8b8ac1fe39f40292b3e6393d35f3de0cc736aa70125e86d624f32f8ce2b5cbcbbf417e080afc4dc3d49294c42283bfa3f59665e15a7545c10b245ff723
 DIST eisl-2.62.tar.gz 2004955 BLAKE2B a69651f002d8ca418cb863670ddd5931ac8afbbe8dd922fe71717ec8d9e3edbd802dd70ea9035264bba50f4dbcac2657d59d9fd58733c8fce1572ac95b7693e8 SHA512 69674bab8bbb91ebc27abe319afeb71d6cef4eaa74e969b8c3e174f254422fcdeba006d11454fc9d82f1e96bc9b51e8f4a1c7a8a20f14b0006e596eea680397b
-EBUILD eisl-2.50.ebuild 733 BLAKE2B a83c010cf807d9803b602d7532983b78e84aa40276e5695c9e385a046c6c9f3a649cb9670009853f267015ac4b21c775f07646397168e9532127451d373e461e SHA512 f9ed33141108315c4ec81d813989fd0dd2010a68235be62446d9b07072e5391a8750e9942f5368cf35fb7fdd847683da533369c6ac1eb850be6a0c4c22eea7d1
+DIST eisl-2.63.tar.gz 2004974 BLAKE2B f563c28ebfa6f45b1d5ace1087646fa63e99b98a6f44f42ed74f2bc4d7e29083bc1ad6c4e5234b5cdaf391fd07900fb309c153107a12e553b7636f978084a776 SHA512 fb2cead1cddb98ce63d471ef04f31cda3a8426d627f7d333fa5dc74401a075d923060dfb98ee9d399116535632983e649f2a99440157825f0528da03dae5d051
 EBUILD eisl-2.60.ebuild 738 BLAKE2B 163178edae5d53b4ef7fa5ac7110e4355bc694969185fd21f43b532c42a5f1d68b589e6695eed59dc8fbef7e7f05cecb7795e27b5c3415d0720e2472b1c041f7 SHA512 283286aa287256608258d55a4f7936aecd28380b6086eb972dc13876dacd964430d728b705473558ea18d2feeccc70933d47eb7888cc027623397418a16808d2
 EBUILD eisl-2.62.ebuild 874 BLAKE2B 10e2619ab900d581161d371bbe4aefc24752216f814aba28c65ac0b98f3eba2b007ed330183e7b2b72f3cbe197f4521e022aff90ee2755195ea033c71f7b6a2b SHA512 69435c9bd770e4f356d8e3861dcfd8c83779e1ac4e925e4dd808fad542b37f2a97688e4f99a4e3d5b174053261157e3cdc05c8c2e697dfe3c27a89b357bc4484
+EBUILD eisl-2.63.ebuild 874 BLAKE2B 10e2619ab900d581161d371bbe4aefc24752216f814aba28c65ac0b98f3eba2b007ed330183e7b2b72f3cbe197f4521e022aff90ee2755195ea033c71f7b6a2b SHA512 69435c9bd770e4f356d8e3861dcfd8c83779e1ac4e925e4dd808fad542b37f2a97688e4f99a4e3d5b174053261157e3cdc05c8c2e697dfe3c27a89b357bc4484
 MISC metadata.xml 631 BLAKE2B fd171b07cf1f7beae7be774a5da360d466c83f01a6bd52dc69af436926ae5aebec27a2723c11498be21c4f96f6b82c6aa3571f4b84e763459ef78086450252f2 SHA512 dd9e329f24ce6d3922e92e81d36234b93151f71c88d6ba4b38557565a7c1c3bc4b7172d4d55f1d2d5bd6c5cada449691067cc71abd4d456941f6a8b78fe0df87
diff --git a/dev-lang/eisl/eisl-2.50.ebuild b/dev-lang/eisl/eisl-2.63.ebuild
index d2ff0a7a86a7..3b3256166271 100644
--- a/dev-lang/eisl/eisl-2.50.ebuild
+++ b/dev-lang/eisl/eisl-2.63.ebuild
@@ -8,29 +8,33 @@ inherit toolchain-funcs
 DESCRIPTION="Interpreter and compiler compatible with the ISLisp standard"
 HOMEPAGE="https://github.com/sasagawa888/eisl/"
 SRC_URI="https://github.com/sasagawa888/eisl/archive/v${PV}.tar.gz
-			-> ${P}.tar.gz"
+	-> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RESTRICT="test"  # Tests run cppcheck (and fail)
 
-DOCS=( README-ja.md README.md documents )
+DOCS=( README{,-ja}.md documents )
 
 RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-Makefile.patch
-	"${FILESDIR}"/${P}-compat-no-cdefs.patch
-)
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
 
 src_compile() {
-	emake CC="$(tc-getCC)" clean all
+	emake CC="$(tc-getCC)" clean edlis eisl
 }
 
 src_install() {
-	dobin edlis eisl
+	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-2.50-compat-no-cdefs.patch b/dev-lang/eisl/files/eisl-2.50-compat-no-cdefs.patch
deleted file mode 100644
index d4cb1f6f2bf4..000000000000
--- a/dev-lang/eisl/files/eisl-2.50-compat-no-cdefs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/compat/cdefs.h
-+++ b/compat/cdefs.h
-@@ -3,8 +3,6 @@
- #ifndef COMPAT_CDEFS_H
- #define COMPAT_CDEFS_H
- 
--#include <sys/cdefs.h>
--
- #ifndef __dead
- #define __dead \
-         __attribute__((__noreturn__))
diff --git a/dev-lang/eisl/files/eisl-2.50-Makefile.patch b/dev-lang/eisl/files/eisl-2.63-Makefile.patch
index 3c30adff8fd2..81f3f6aa1aeb 100644
--- a/dev-lang/eisl/files/eisl-2.50-Makefile.patch
+++ b/dev-lang/eisl/files/eisl-2.63-Makefile.patch
@@ -1,15 +1,15 @@
 --- a/makefile
 +++ b/makefile
-@@ -29,7 +29,7 @@ else
- 		CURSES_LIBS := $(shell ncurses6-config --libs)
+@@ -31,7 +31,7 @@ else
+ 		endif
  	endif
  endif
--CFLAGS := $(INCS) -Wall -Wextra -D_FORTIFY_SOURCE=2 $(CURSES_CFLAGS) -U_XOPEN_SOURCE -D_XOPEN_SOURCE=700 -Inana/src
-+CFLAGS += $(INCS) -Wall -Wextra $(CURSES_CFLAGS) -U_XOPEN_SOURCE -D_XOPEN_SOURCE=700 -Inana/src
- DFLAGS := --O3 --release --betterC
+-CFLAGS := $(INCS) -Wall -Wextra -D_FORTIFY_SOURCE=2 $(CURSES_CFLAGS) -U_XOPEN_SOURCE -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED -Inana/src
++CFLAGS += $(INCS) -Wall -Wextra $(CURSES_CFLAGS) -U_XOPEN_SOURCE -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED -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
-@@ -42,7 +42,7 @@ ifeq ($(DEBUG),1)
+@@ -57,7 +57,7 @@ ifeq ($(DEBUG),1)
  		LDFLAGS := -fsanitize=undefined
  	endif
  else
@@ -18,12 +18,12 @@
  	SRC_CII += cii/src/mem.c
  endif
  OBJ_CII := $(SRC_CII:.c=.o)
-@@ -56,11 +56,10 @@ else
- 	CFLAGS += -std=c17
+@@ -75,11 +75,10 @@ ifeq  ($(shell uname -n),raspberrypi)
+ 	CFLAGS += -D__rpi__
  endif
  ifneq ($(DEBUG),1)
 -	LDFLAGS += -flto
- 	ifeq ($(OPSYS),macos)
+ 	ifeq  ($(shell uname),Darwin)
  		LDFLAGS += -Wl,-S,-x
  	else
 -		LDFLAGS += -s