gentoo auto-resync : 03:03:2025 - 19:30:11

8 files changed, 129 insertions, 129 deletions

diff --git a/dev-lang/jwasm/Manifest b/dev-lang/jwasm/Manifest
index 26ee7297df5d..762e63847d44 100644
--- a/dev-lang/jwasm/Manifest
+++ b/dev-lang/jwasm/Manifest
@@ -1,9 +1,9 @@
-AUX jwasm-2.11-types-test.patch 1761 BLAKE2B b719bb79504e708925bfa407e72df7a37044b834bc3118fa9baf1a0cb478a0ab852872147148462188324954ef958af30cbcbca28fc992660276a15100ecb1b6 SHA512 0a4f3e613c8e724939ce9e23f8f4ce10ca89bf6c1579929719b3ccad62ac66cceecc3f8799c20c2875b7d4dcc7390bf0e4ca64aa08aab0b39bd7a4ab381b150b
 AUX jwasm-2.18-makefile-dep-fix.patch 280 BLAKE2B fe4abbede4922a66adcde0296c5d2421cefc4d4c387f000b7fc0f675bc980c6f51a57aaad52b243adb88a64063c6e63e5da4b937bf7baa589b7ee98473520917 SHA512 95ac9ce92ff9ce10771f304a029073da8be48f81c5f81a269c1785a6a94e9228c9fb348750a624b969aeefe687d5ab1416967f470b762cc26719acbe2a9a8f3b
+AUX jwasm-2.18-missing-includes.patch 1483 BLAKE2B 748f1c4e7fc5600270f9cfbf2f9da25b5cae1d4f59b39f38989ae8cfa6d52d098310bce865e69748d9fbe7cdf2a50b343e9b36849719e7b411a7514af8ea09c4 SHA512 47431ca5a9dc1c50dc0f8b84160d80c1fff654350893870f1a308a8b2f2401e5dde7d97bc11f31e6aceb69b134d5345c678904ca720882c6b6907bf5286ea5ff
 AUX jwasm-2.18-types-test.patch 1471 BLAKE2B 87c696bc22e8fb9584be5e6fde14dfaa9bf62e4e74ad2d4d542e07ac08be4591ecc920553d5b516d12518c7b35d626ef8121e0e8cd2c03e20a6ccb027e5f42b8 SHA512 ac7af52f85ebf430722d731518a6f8660369feff6d1318590c436b1080a0785b1a73e166235752e3b6631f86a9e19e8e7da76f628d2ba918bdae14db535df270
-AUX makefile-dep-fix.patch 497 BLAKE2B d0fc87c0aff19689efa2440c7d90d3f0d7c80310e40dad6f4dd938e139d5458b5e4ae72153cb38242ae683c887ce085494f358e3f67c2be028adeadf176403ac SHA512 29526a14d7a6bc775d6cd590b1c75a864eb04c365de736e93c810d715760ac4d76b6691f05f9077adec9c6938aefa8637d6efd9db67c81752e604308fffd64e6
-DIST jwasm-2.13.tar.gz 578365 BLAKE2B 8c6fbe3e6cb56c0fe8135c30c629534d2b6e2a2ed534249834e0e2674bf6635cb15ab94d4fa05c5378cb0db8569ddc3ba49d2d7c9615b7ddb769cba1a2d5b715 SHA512 03f80f4a74b39c6093f5cd5334364f7458836a52ad01279c95683e7053cb4211c40235e16f6f2ee40bc7316dcd8a4fbcb57bf3606d31249d96d01933a8aa0563
+AUX jwasm-2.19-respect-ldflags.patch 863 BLAKE2B 8a8dbd84a0d730d82d38921bbc7ff14919dbabeab90b9ec287425d235b8e243d9350f32666c32e7b6be2dc40180a76acaaf00e34ee2302a99518a4bc5f0fba18 SHA512 096db75a960767bfe9df068b90dc83c060997bbb31c7589abb0cfdf9425bf405d50b71141882c3c489f151c08e4a7a81ccd6501ed6467aeaf6d055892db68ff0
 DIST jwasm-2.18.tar.gz 1169949 BLAKE2B 2a5d6c37f27dd5193390a5b5ab7d7ec260a800ead132dda4a49b16b5ae43b53ef397b663166767c8f4ce2de69dd9fa61e59e0537d837ba85da38cb17aa0da6e0 SHA512 f5ca9d2ec80b979e2acec7246861e13e11717917f59df126f28339e3c1ded3405c8a93daaef6ee817bc217d593151010bf18c85c9fc03600ff70cb18e793309c
-EBUILD jwasm-2.13.ebuild 770 BLAKE2B 33703e3a7a239568439286ca9f05dc33c679bd70f7255047295cd8e883a7207efa53c5ee484e74687469ca86e743453b679e5eb35a423b46666dfbd1b2f64d5d SHA512 238fceaf1b4f2f5d27345ee462a7e174a4a345d609173d6a6202c346544482277a1e579a133f4096af419ecb94108d7496ea5e261d3f13c13e8f1ca279598445
-EBUILD jwasm-2.18.ebuild 795 BLAKE2B 5e1808902a079f9f5c140e297adc6ef5c9d28140609cef5fdf26ff40ed0a7470589dabbaa4efcaa8891df07ad6fc6354658158bde4713f16bc58de210a5e175b SHA512 b60a20031d097c233e2e71c2d8886cffd3aabc6f16ff3ac79eb18c20b894305d9d181af8dba4528e5fc0170ba7057ab1f2fa44aa3d2c72f6aff140d9c61d39d9
+DIST jwasm-2.19.tar.gz 1187558 BLAKE2B ab932d61fddcb8b422ae8b4be43bc4d7b8a3b229b4f720768c69d41302b47d1fe1cf1d2761838f97ac4241a7e5cf2ca3f8f23cc4636365caca38e3c66a38924f SHA512 0b017f0f43d36a74faab2bc2da4023cc933f3b0c81eb65c59a98d0dedee20eaf6a5979943c387f39e34a188b5a7ec787e8effc61d1e70635b795e106e52399d0
+EBUILD jwasm-2.18-r1.ebuild 989 BLAKE2B 53ae6fb3b9bcf3b36902290c9cea281294155aa3f671dabb4c964cadde6b2df87f189d384f65a031219bdb232bc96abf797f1787b15eebec653a59eff9467074 SHA512 f3ce0795d889989be346d0a32326a62a5c858ff8e9bdc645accd5ca1efc0975cf1a70c52c94a1185beef997bde5675b115977119f8eddc382111d31767331b91
+EBUILD jwasm-2.19.ebuild 949 BLAKE2B 264ea3bdd328ab323f2d74e1f5b7f0ec6dbe5c0027a906ea973cc9e7ae25c02e2f5d9d4c6387108c1df4d1da70f1c9320c9abbf38eee14439e72c34ef2423f2c SHA512 c7e0487d8d17c53ee435d141448dc0566c8b0dca8b182cc4fb0f1d990a8c1c71be0691ba45625afe5bdc7bddc2be3d4c7a0fbbdfd408b6a5d0442c9e826064a2
 MISC metadata.xml 307 BLAKE2B c7eb2546ed5af50a82d536311203f569ef0d7450c7b3a40cf342ede488b4b1cf5bff66a3b54e0eb9c201e3468f1f76756a88f989a60ed9d528f3d5124abd302e SHA512 6f5dfb2ca18c019747390572a642bc7172a98ef80b9a099bbe08b561713e81c025eb8b14c391465ea2678dc0e00fc7bcda4d367ae8d27cfb65f7893f129cc907
diff --git a/dev-lang/jwasm/files/jwasm-2.11-types-test.patch b/dev-lang/jwasm/files/jwasm-2.11-types-test.patch
deleted file mode 100644
index 047d1d005510..000000000000
--- a/dev-lang/jwasm/files/jwasm-2.11-types-test.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b19339d4356efbd9b49f73e67ed7c09b9dad4b75 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 16 May 2013 12:24:17 +0300
-Subject: [PATCH 1/2] types: add sanity tests for used sizes
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- GccUnix.mak |  2 +-
- checks.c    | 26 ++++++++++++++++++++++++++
- 2 files changed, 27 insertions(+), 1 deletion(-)
- create mode 100644 checks.c
-
-diff --git a/gccmod.inc b/gccmod.inc
-index 70f388a..86cb2bf 100644
---- a/gccmod.inc
-+++ b/gccmod.inc
-@@ -6,6 +6,7 @@ $(OUTD)/atofloat.o \
- $(OUTD)/backptch.o \

- $(OUTD)/bin.o      \

- $(OUTD)/branch.o   \

-+$(OUTD)/checks.o   \

- $(OUTD)/cmdline.o  \

- $(OUTD)/codegen.o  \

- $(OUTD)/coff.o     \

-diff --git a/checks.c b/checks.c
-new file mode 100644
-index 0000000..af8630f
---- /dev/null
-+++ b/checks.c
-@@ -0,0 +1,26 @@
-+/****************************************************************************

-+*

-+*  This code is Public Domain.

-+*

-+*  ========================================================================

-+*

-+* Description:  make sure "inttype.h" filelds are of the desired size.

-+*

-+****************************************************************************/

-+

-+#include "inttype.h"

-+
-+/* fails to compile if type sizes are of unexpected size */
-+static void validate_inttype_sizes()
-+{
-+/* try to create */
-+#define T_IS_SIZE(__type, __expected_size, __test_name) \
-+    char __test_name[2 * (sizeof (__type) == (__expected_size)) - 1];
-+
-+    T_IS_SIZE(uint_8,  1, size_of_uint_8_must_be_1_byte);
-+    T_IS_SIZE(uint_16, 2, size_of_uint_16_must_be_2_bytes);
-+    T_IS_SIZE(uint_32, 4, size_of_uint_32_must_be_4_bytes);
-+    T_IS_SIZE(uint_64, 8, size_of_uint_64_must_be_8_bytes);
-+
-+#undef T_IS_SIZE
-+}
--- 
-1.8.2.1
diff --git a/dev-lang/jwasm/files/jwasm-2.18-missing-includes.patch b/dev-lang/jwasm/files/jwasm-2.18-missing-includes.patch
new file mode 100644
index 000000000000..08a6aa40ebd2
--- /dev/null
+++ b/dev-lang/jwasm/files/jwasm-2.18-missing-includes.patch
@@ -0,0 +1,56 @@
+From fa8bf4476f74679c1a5e1a4ca55bf5327b4bd558 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@gentoo.org>
+Date: Mon, 3 Mar 2025 12:16:23 +0100
+Subject: [PATCH] add missing includes
+
+Several includes are missing based on linux man pages:
+
+- strings.h for strcasecmp
+- alloca.h  for alloca
+- stdio.h   for fileno
+
+The compilation with GCC 15 fails without those with implicit function
+declaration error.
+---
+
+Upstream-PR: https://github.com/Baron-von-Riedesel/JWasm/pull/34
+
+diff --git a/src/H/globals.h b/src/H/globals.h
+index 2992cc7..607e5f5 100644
+--- a/src/H/globals.h
++++ b/src/H/globals.h
+@@ -39,6 +39,7 @@
+ 

+ #if defined(__UNIX__) || defined(__CYGWIN__) || defined(__DJGPP__) /* avoid for MinGW! */

+ 

++#include <strings.h>

+ #define _stricmp strcasecmp

+ #ifndef __WATCOMC__

+ #define _memicmp strncasecmp

+diff --git a/src/H/memalloc.h b/src/H/memalloc.h
+index d2a8460..7a4e364 100644
+--- a/src/H/memalloc.h
++++ b/src/H/memalloc.h
+@@ -44,6 +44,7 @@ extern void MemFree( void *ptr );
+ 

+ #elif defined(__GNUC__) || defined(__TINYC__)

+ 

++#include <alloca.h>

+ #define myalloca  alloca

+ #ifndef __FreeBSD__  /* added v2.08 */

+ #include <malloc.h>  /* added v2.07 */

+diff --git a/src/omf.c b/src/omf.c
+index 8d98b1f..d90afae 100644
+--- a/src/omf.c
++++ b/src/omf.c
+@@ -62,6 +62,7 @@
+ 

+ #if TRUNCATE

+ #if defined(__UNIX__) || defined(__CYGWIN__) || defined(__DJGPP__)

++#include <stdio.h>

+ #include <unistd.h>

+ #else

+ #include <io.h>

+-- 
+2.45.3
+
diff --git a/dev-lang/jwasm/files/jwasm-2.19-respect-ldflags.patch b/dev-lang/jwasm/files/jwasm-2.19-respect-ldflags.patch
new file mode 100644
index 000000000000..5c4c2d0f7411
--- /dev/null
+++ b/dev-lang/jwasm/files/jwasm-2.19-respect-ldflags.patch
@@ -0,0 +1,29 @@
+From 5521f0dd6da40cc2a0325f0b2136fa066345328f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@gentoo.org>
+Date: Mon, 3 Mar 2025 12:53:38 +0100
+Subject: [PATCH] respect LDFLAGS
+
+---
+ GccUnix.mak | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/GccUnix.mak b/GccUnix.mak
+index 5afdce2..588b155 100644
+--- a/GccUnix.mak
++++ b/GccUnix.mak
+@@ -39,11 +39,7 @@ $(OUTD):
+ 	mkdir -p $(OUTD)
+ 
+ $(OUTD)/$(TARGET1) : $(OUTD)/main.o $(proj_obj)
+-ifeq ($(DEBUG),0)
+-	$(CC) $(OUTD)/main.o $(proj_obj) -s -o $@ -Wl,-Map,$(OUTD)/$(TARGET1).map
+-else
+-	$(CC) $(OUTD)/main.o $(proj_obj) -o $@ -Wl,-Map,$(OUTD)/$(TARGET1).map
+-endif
++	$(CC) $(LDFLAGS) $(OUTD)/main.o $(proj_obj) -o $@ -Wl,-Map,$(OUTD)/$(TARGET1).map
+ 
+ $(OUTD)/msgtext.o: src/msgtext.c src/H/msgdef.h
+ 	$(CC) -c $(inc_dirs) $(c_flags) -o $*.o src/msgtext.c
+-- 
+2.45.3
+
diff --git a/dev-lang/jwasm/files/makefile-dep-fix.patch b/dev-lang/jwasm/files/makefile-dep-fix.patch
deleted file mode 100644
index 1b97a7c5aca4..000000000000
--- a/dev-lang/jwasm/files/makefile-dep-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Bug: https://bugs.gentoo.org/881519
-
-diff --git a/GccUnix.mak b/GccUnix.mak
-index 3f53d5b..8eb434e 100644
---- a/GccUnix.mak
-+++ b/GccUnix.mak
-@@ -31,13 +31,13 @@ include gccmod.inc
- 
- #.c.o:
- #	$(CC) -c $(inc_dirs) $(c_flags) -o $(OUTD)/$*.o $<
--$(OUTD)/%.o: %.c
-+$(OUTD)/%.o: %.c | $(OUTD)
- 	$(CC) -c $(inc_dirs) $(c_flags) -o $(OUTD)/$*.o $<
- 
- all:  $(OUTD) $(OUTD)/$(TARGET1)
- 
- $(OUTD):
--	mkdir $(OUTD)
-+	mkdir -p $(OUTD)
- 
- $(OUTD)/$(TARGET1) : $(OUTD)/main.o $(proj_obj)
- ifeq ($(DEBUG),0)
diff --git a/dev-lang/jwasm/jwasm-2.13.ebuild b/dev-lang/jwasm/jwasm-2.13.ebuild
deleted file mode 100644
index 2cac391deb8d..000000000000
--- a/dev-lang/jwasm/jwasm-2.13.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="MASM-compatible TASM-similar assembler (fork of Wasm)"
-HOMEPAGE="https://github.com/JWasm/JWasm"
-SRC_URI="https://github.com/JWasm/JWasm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Watcom-1.0"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND=""
-DEPEND=""
-BDEPEND=""
-
-S="${WORKDIR}/JWasm-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.11-types-test.patch
-	"${FILESDIR}/makefile-dep-fix.patch"
-)
-
-src_prepare() {
-	default
-
-	# don't strip binary
-	sed -i GccUnix.mak -e 's/ -s / /g' || die
-}
-
-src_compile() {
-	emake -f GccUnix.mak CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dobin GccUnixR/jwasm
-	dodoc *.txt Doc/*.txt
-}
diff --git a/dev-lang/jwasm/jwasm-2.18.ebuild b/dev-lang/jwasm/jwasm-2.18-r1.ebuild
index 465a5756422b..513ad11b1401 100644
--- a/dev-lang/jwasm/jwasm-2.18.ebuild
+++ b/dev-lang/jwasm/jwasm-2.18-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="MASM-compatible TASM-similar assembler (fork of Wasm)"
 HOMEPAGE="https://github.com/Baron-von-Riedesel/JWasm"
@@ -17,6 +17,7 @@ KEYWORDS="amd64 ~x86"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.18-types-test.patch
 	"${FILESDIR}"/${PN}-2.18-makefile-dep-fix.patch
+	"${FILESDIR}"/${PN}-2.18-missing-includes.patch #944893
 )
 
 src_prepare() {
@@ -27,7 +28,9 @@ src_prepare() {
 }
 
 src_compile() {
-	emake -f GccUnix.mak CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}"
+	# -std=c17 and -D_POSIX_C_SOURCE=200809L are both related to bug #944893
+	append-cflags -std=c17
+	emake -f GccUnix.mak CC="$(tc-getCC) ${CFLAGS} -D_POSIX_C_SOURCE=200809L ${LDFLAGS}"
 }
 
 src_install() {
diff --git a/dev-lang/jwasm/jwasm-2.19.ebuild b/dev-lang/jwasm/jwasm-2.19.ebuild
new file mode 100644
index 000000000000..817473af0ee0
--- /dev/null
+++ b/dev-lang/jwasm/jwasm-2.19.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="MASM-compatible TASM-similar assembler (fork of Wasm)"
+HOMEPAGE="https://github.com/Baron-von-Riedesel/JWasm"
+SRC_URI="https://github.com/Baron-von-Riedesel/JWasm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/JWasm-${PV}"
+
+LICENSE="Watcom-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.18-types-test.patch
+	"${FILESDIR}"/${PN}-2.18-makefile-dep-fix.patch
+	"${FILESDIR}"/${PN}-2.18-missing-includes.patch #944893
+	"${FILESDIR}"/${PN}-2.19-respect-ldflags.patch
+)
+
+src_compile() {
+	# -std=c17 and -D_POSIX_C_SOURCE=200809L are both related to bug #944893
+	append-cflags -std=c17
+	emake -f GccUnix.mak CC="$(tc-getCC)" extra_c_flags="-D_POSIX_C_SOURCE=200809L ${CFLAGS}"
+}
+
+src_install() {
+	dobin build/GccUnixR/jwasm
+	dodoc -r README.md History.txt Html/
+}