gentoo auto-resync : 07:08:2024 - 12:37:20

6 files changed, 102 insertions, 4 deletions

diff --git a/dev-lang/jwasm/Manifest b/dev-lang/jwasm/Manifest
index cbab8bb00264..40f93d17d09d 100644
--- a/dev-lang/jwasm/Manifest
+++ b/dev-lang/jwasm/Manifest
@@ -1,5 +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-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
-EBUILD jwasm-2.13.ebuild 771 BLAKE2B 249ed2462c3eddafd5e78580a41d3837d9187481272007ec100d4e514866743de09888ee1dcee89adadfc4a3f773bc8d3cbcfdd59606ea5ecaa63158b9c678f1 SHA512 ce900c45292c5cbcec98a1c4f357005b40b59fba8e50ae961a72383f00dac0a920a8dc70f38e070b1038b47142f1eab9f65ef8ad1422053e7a5c1b1257fc08c2
-MISC metadata.xml 294 BLAKE2B 27e182db85c289075151811df775761aa9d9ed661474dcc710e084d3c325924d88b1c57389554a65383de3acf15ec4cce9a18e8cbffdd2a9230212279dad9174 SHA512 ef96dd7f6948e978281b5259ff6392aa72c90a672f4eef3394feece7e6c39c1ab96b42b8a2bbc3645dcb0d036778ac83055c9b76656f8d03f0a27dbf60084a0c
+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 796 BLAKE2B e284f0def853b7c31fea11dee8a7256765a958d1a0b805ec2b267ab247f0cce2fa0e4acb3d4a8b680eb83e4468efc256f35378e136093501c389e3160187c30d SHA512 baa339ca4a4a7cd43cba7da462d43fd14deec4e9df5dc2e897312cc017c5e13336e25bfcef322f4896188074370a4e88d1ce0ac6f2408f95092cbc03d53a3acb
+MISC metadata.xml 307 BLAKE2B c7eb2546ed5af50a82d536311203f569ef0d7450c7b3a40cf342ede488b4b1cf5bff66a3b54e0eb9c201e3468f1f76756a88f989a60ed9d528f3d5124abd302e SHA512 6f5dfb2ca18c019747390572a642bc7172a98ef80b9a099bbe08b561713e81c025eb8b14c391465ea2678dc0e00fc7bcda4d367ae8d27cfb65f7893f129cc907
diff --git a/dev-lang/jwasm/files/jwasm-2.18-makefile-dep-fix.patch b/dev-lang/jwasm/files/jwasm-2.18-makefile-dep-fix.patch
new file mode 100644
index 000000000000..277216cf18ef
--- /dev/null
+++ b/dev-lang/jwasm/files/jwasm-2.18-makefile-dep-fix.patch
@@ -0,0 +1,11 @@
+--- a/GccUnix.mak
++++ b/GccUnix.mak
+@@ -30,7 +30,7 @@ include gccmod.inc
+ 
+ #.c.o:
+ #	$(CC) -c $(inc_dirs) $(c_flags) -o $(OUTD)/$*.o $<
+-$(OUTD)/%.o: src/%.c
++$(OUTD)/%.o: src/%.c | $(OUTD)
+ 	$(CC) -c $(inc_dirs) $(c_flags) -o $(OUTD)/$*.o $<
+ 
+ all:  $(OUTD) $(OUTD)/$(TARGET1)
diff --git a/dev-lang/jwasm/files/jwasm-2.18-types-test.patch b/dev-lang/jwasm/files/jwasm-2.18-types-test.patch
new file mode 100644
index 000000000000..37b35208e96f
--- /dev/null
+++ b/dev-lang/jwasm/files/jwasm-2.18-types-test.patch
@@ -0,0 +1,47 @@
+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>
+--- 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     \

+--- /dev/null
++++ b/src/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/jwasm-2.13.ebuild b/dev-lang/jwasm/jwasm-2.13.ebuild
index 0242aa2b604c..2cac391deb8d 100644
--- a/dev-lang/jwasm/jwasm-2.13.ebuild
+++ b/dev-lang/jwasm/jwasm-2.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/JWasm/JWasm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Watcom-1.0"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND=""
 DEPEND=""
diff --git a/dev-lang/jwasm/jwasm-2.18.ebuild b/dev-lang/jwasm/jwasm-2.18.ebuild
new file mode 100644
index 000000000000..f583e3ffd328
--- /dev/null
+++ b/dev-lang/jwasm/jwasm-2.18.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit 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
+)
+
+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 build/GccUnixR/jwasm
+	dodoc -r README.md History.txt Html/
+}
diff --git a/dev-lang/jwasm/metadata.xml b/dev-lang/jwasm/metadata.xml
index 28db5ef5b1ca..1c0ee30d49c1 100644
--- a/dev-lang/jwasm/metadata.xml
+++ b/dev-lang/jwasm/metadata.xml
@@ -4,6 +4,6 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">jwasm</remote-id>
-		<remote-id type="github">JWasm/JWasm</remote-id>
+		<remote-id type="github">Baron-von-Riedesel/JWasm</remote-id>
 	</upstream>
 </pkgmetadata>