gentoo auto-resync : 01:08:2023 - 22:48:35

4 files changed, 49 insertions, 6 deletions

diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index dac6ffe96550..1b5903421822 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,6 +1,7 @@
 AUX nim-0.20.0-paths.patch 934 BLAKE2B 6a4e44c5656cde6d5127bf6a6b8db92cdf8aada0892c27d536d0c1030ed7da8dc97138a8941030101918021f2a301fa683169c8a656fefc6fb7d0fcdb24029d4 SHA512 bf8dbc3e3861ec3ea2718092b981e495194ead5b547e69d01d5d842d128dc4b96b0ba3e95c78afd8fd822d594199315a01de370851ed8f594c091231b9a10ee9
 AUX nim-1.6.10-testament-skipfile.txt 1210 BLAKE2B d70268fcef2edb5383ca7dc696ae393432e0894c313d17e192e988e8826b5c296d3fcdd7bc5d547d62b1450f3c721fe3655166fd9ee3755f29c9ae8390453fba SHA512 a943fa520633b513ae3c5060a79b9501b34cad81bcbebbd803780506713fe1a9fd1580736e85032d0dedcd4190ebc37666ae94f4ca73bf5d88d51df523d2c4ea
-AUX nim-1.6.14-testament-skipfile.txt 1290 BLAKE2B 90924dbbb19768e46cd9d064eb6aa54fa706a4afe3d6e05fdd6a84c453cd4e1cb846ba3a63269c7051ebc120ce8a821694de9033b3415e9f16c2b994ed43d340 SHA512 3b9bb6cd4dc0ff078064a190d9667335a250b13386987cfc9c33debdddc634de18e5b6d9a5ab267de677ab0609a4e2783947f0487c0fc51e537a735717352f66
+AUX nim-1.6.14-clang16-musl-fix.patch 625 BLAKE2B 5081fe9f59d40b72a446c591d308d175adef745d0936613db649dea554610f6839993c181076aa4f9fa3b402c475fa2f360f8a612081428af630934088e0ecbc SHA512 838356e53a267d4a3f165973cea46c1b718b178079257ca3b129788dd4b8897a1cf870bd1ef171b91fea721f9de0835dec8fe38271581db61d32932736aa09da
+AUX nim-1.6.14-testament-skipfile.txt 1770 BLAKE2B 66f0bad52f0d3f374dfe040ff4ae92a71a9bba5bb3b827bc10f912845bfb970f90c00bf12d0253f1d60e45543f86960447e331d9b4d76483c7f77f1d4c756d93 SHA512 e975afe8d7e5ff050735f22ca04f078ce46a2277bd459eea7ec171ebe4308097439becd33301fd66bb35ef892d0f821e4e0394cb5143b97c66c7f1f614bb1b56
 AUX nim-1.6.6-csources-flags.patch 371 BLAKE2B 903e9738f6c87bc40ef922c5abde50edaff223cdf11befee0ece7b3a472a68b7dc211e1e6347a2181c68fe524693832f20309bf90aeb3aac9d76125f224587c9 SHA512 2753e14ada3093a2208636eb36eb2a79946f7c4858d86945b1d242d424b1a4350403b7d8f58af33c1c43a04b24465748cb7f26b7426e65b91d09cc61167d5de4
 AUX nim-sets.conf 162 BLAKE2B 976422f31cf8a64e1fad537f4db38a07e0022b9460936c63e0220cb3858ba02704857841d5010ad8c7bde0e6192c4c3c1329aeca8080a48a728e8b288cefc0fb SHA512 61a07de9973fc77998515bbb62498ffd1de991241bf32805f4acc0e4325e39d767ac862f2546757763aa8d0a7f35b95a9e1df91e6aa6f241eed6e93c8e3c46f0
 DIST nim-1.6.10.tar.xz 5216284 BLAKE2B d5b7bdc488086260b84700e3022ff7fc45b98d78574a3d2e288c95968a580fa644e47612dc60d6e63f5e85687f5b59a28128be746abc55bd6d4527344dc3ab14 SHA512 2ba6c4db68030ace2b4dd9b7f85d2b7c882c62e8f7f68bd0b82f548c91c300ab0e03c66f56c678127058f56b75a5550dec48d68eb6d666a179994cd1a6e2cc47
@@ -9,5 +10,5 @@ DIST nim-1.6.14.tar.xz 5266632 BLAKE2B f6eadf44365a099f45d1b734dea494e5d098b0427
 DIST nim-patches-1.6.6_p1.tar.gz 2632 BLAKE2B 64980d9510dc48e3c566473dc618d00cafba04783882d62b12015e8435c9c0515d7726da30f0b74dca6a41aa88a9c9aed2189a65b3325c28839d0051de8a3365 SHA512 7ba251675cd564452669bf5ec3748565db818324f58506f20a5036e4b54df10f4d7c149cece8cb97c853222cfa7d4d8d26856d92aaa25e613e31c6f5c2a8243d
 EBUILD nim-1.6.10-r2.ebuild 4413 BLAKE2B 4a321ed1751fb582bba04413759d78e061d6d00751b6c1e15668b05ab2e57552a726bf0ac33b49355a881bb6543bd5357ca874cb39b6294d562c2a7900cd64b9 SHA512 afe55c756bf43f875d810e551f2f0d9f746bef5800de269d4a20260bbd6750647bd7da4352502f2e61e60b67f00156975eaf314e5beb373e65e0664152c7f104
 EBUILD nim-1.6.12.ebuild 4459 BLAKE2B d237b8243dcbb0ab941155e5a8abec2295f628ab98d2a92d5e8aee3d661e44d546fb71c36bfbec2fb29958a5736149d4a055a6b5b517a1ab42d3733b7d37f813 SHA512 ad440e3e94f3c91b1366e919b431ca1e51d967b94758921158799981749aeb4d7be9d953ba017811082778d8d3d5023896ea03b95551e2883cc2c90ef8afc15b
-EBUILD nim-1.6.14.ebuild 4460 BLAKE2B 2dd6af1faf63cedd9c5edcded85d27c03cce9823c75832f14dd0f5a7035d0c5e2a24005f1a9dd6dd2fc84ba1b500be6e9147a083894fdf2580e5454092fa4edc SHA512 99371a0f29a93ab01ec5ff4f7c758e450954142c367e7558120633434818c7e0b66b538fc7b843c69a98f5f88868c01bebf5b8faba83a03682c9dfd17758f34d
+EBUILD nim-1.6.14-r1.ebuild 4818 BLAKE2B a78de75cae0d2f960d4c4f7418209506f0b94f41fd6429478af4dda35de0a1b48f4dc3b60930aed4cb0afe5e1d52b7f38b9f4e1f2882eb1722e2ffea50e35844 SHA512 588b417384b10afce724880b81df4c2efbe34bede5aa24ca567e236bb1d653e2089b7d649c1b2b4b744beb08678e8035eb33ce57ca768ea4b467c02c1308b7ca
 MISC metadata.xml 2157 BLAKE2B bbbc15b0c5590a22e276056a55ef09957ae5e5b0429122411e9d7570756873a5147bc8a00ee2bc97e887aa0d76668e3ecab10b495d67e5fd10174a0411d02f5f SHA512 b6d3010ddd9a0dc4e5f9698ac832cebe794c1b4b222d561448d9e43d9e3a581e5983c5d771bdad96957a100029efdb2804ff30b8b223b33ba5864e68fdb25519
diff --git a/dev-lang/nim/files/nim-1.6.14-clang16-musl-fix.patch b/dev-lang/nim/files/nim-1.6.14-clang16-musl-fix.patch
new file mode 100644
index 000000000000..1bc4f8f25d55
--- /dev/null
+++ b/dev-lang/nim/files/nim-1.6.14-clang16-musl-fix.patch
@@ -0,0 +1,13 @@
+Bug: https://bugs.gentoo.org/894410
+Refer: https://github.com/nim-lang/Nim/issues/20886#issuecomment-1511708198
+--- a/lib/system/threadlocalstorage.nim
++++ b/lib/system/threadlocalstorage.nim
+@@ -129,7 +129,7 @@ else:
+   when (defined(linux) or defined(nintendoswitch)) and defined(amd64):
+     type
+       SysThread* {.importc: "pthread_t",
+-                  header: "<sys/types.h>" .} = distinct culong
++                  header: "<sys/types.h>" .} = distinct pointer
+       Pthread_attr {.importc: "pthread_attr_t",
+                     header: "<sys/types.h>".} = object
+         abi: array[56 div sizeof(clong), clong]
diff --git a/dev-lang/nim/files/nim-1.6.14-testament-skipfile.txt b/dev-lang/nim/files/nim-1.6.14-testament-skipfile.txt
index b0317176ac0d..2e7e0b48f9fc 100644
--- a/dev-lang/nim/files/nim-1.6.14-testament-skipfile.txt
+++ b/dev-lang/nim/files/nim-1.6.14-testament-skipfile.txt
@@ -1,11 +1,13 @@
 # broken
 tests/assert/tassert_c.nim
 tests/async/tasync_traceback.nim
+tests/coroutines/twait.nim
 tests/errmsgs/t14444.nim
 tests/errmsgs/tcall_with_default_arg.nim
 tests/errmsgs/tproper_stacktrace.nim
 tests/errmsgs/tproper_stacktrace2.nim
 tests/errmsgs/tproper_stacktrace3.nim
+tests/exception/t13115.nim
 tests/js/tmangle.nim
 tests/js/twritestacktrace.nim
 tests/lent/tbasic_lent_check.nim
@@ -21,6 +23,22 @@ tests/stdlib/tstackframes.nim
 tests/stdlib/tstats.nim
 tests/system/talloc.nim
 tests/testament/tshould_not_work.nim
+# broken on musl + llvm
+tests/coroutines/tgc.nim
+tests/coroutines/twait.nim
+tests/misc/t18077.nim
+tests/misc/temit.nim
+tests/nimdoc/t15916.nim
+tests/nimdoc/trunnableexamples.nim
+tests/nimdoc/trunnableexamples2.nim
+tests/objects/tobjcov.nim
+tests/objects/toop1.nim
+tests/stdlib/tencodings.nim
+tests/stdlib/tgetaddrinfo.nim
+tests/stdlib/tstdlib_various.nim
+tests/stdlib/tstreams.nim
+tests/stdlib/ttimes.nim
+tests/vm/tvmmisc.nim
 # require network
 tests/stdlib/thttpclient.nim
 tests/stdlib/tnetconnect.nim
diff --git a/dev-lang/nim/nim-1.6.14.ebuild b/dev-lang/nim/nim-1.6.14-r1.ebuild
index c6bf55d99f89..85bb540e41e0 100644
--- a/dev-lang/nim/nim-1.6.14.ebuild
+++ b/dev-lang/nim/nim-1.6.14-r1.ebuild
@@ -81,6 +81,10 @@ src_prepare() {
 
 	# note: there are consumers in the ::guru overlay
 	use experimental && eapply "${WORKDIR}"/nim-patches-${PATCH_PV}
+
+	# refer: https://github.com/nim-lang/Nim/issues/20886#issuecomment-1511708198
+	# bug: https://bugs.gentoo.org/894410
+	use elibc_musl && eapply "${FILESDIR}"/${PN}-1.6.14-clang16-musl-fix.patch
 }
 
 src_configure() {
@@ -148,28 +152,35 @@ src_test() {
 	# AdditionalCategories from "testament/categories.nim".
 	categories+=( debugger examples lib )
 
-	local tcat checkpoint
+	local test_return=0
+
+	local tcat
+	local checkpoint
 	for tcat in "${categories[@]}"; do
 		# Use checkpoints for less painful testing.
 		checkpoint="${T}/.testament-${tcat}"
+
 		[[ -f "${checkpoint}" ]] && continue
 
 		case ${tcat} in
 			testdata )
 				:
-			;;
+				;;
 			arc | ic | valgrind )
 				einfo "Skipped category '${tcat}'"
 				;;
 			* )
 				einfo "Running tests in category '${tcat}'"
-				edo ./bin/testament "${testament_args[@]}" \
-					category "${tcat}" "${nimflags[@]}"
+				nonfatal edo ./bin/testament "${testament_args[@]}" \
+						 category "${tcat}" "${nimflags[@]}" || test_return=1
 				;;
 		esac
 
 		touch "${checkpoint}" || die
 	done
+
+	[[ "${test_return}" -eq 1 ]] &&
+		die "tests failed, please inspect the failed test categories above"
 }
 
 src_install() {