gentoo auto-resync : 18:06:2024 - 00:10:02

7 files changed, 69 insertions, 138 deletions

diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index 8001521180cd..fe5baf81cf5d 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,13 +1,9 @@
-AUX nim-0.20.0-paths.patch 934 BLAKE2B 6a4e44c5656cde6d5127bf6a6b8db92cdf8aada0892c27d536d0c1030ed7da8dc97138a8941030101918021f2a301fa683169c8a656fefc6fb7d0fcdb24029d4 SHA512 bf8dbc3e3861ec3ea2718092b981e495194ead5b547e69d01d5d842d128dc4b96b0ba3e95c78afd8fd822d594199315a01de370851ed8f594c091231b9a10ee9
-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-2.0.4-testament-skipfile.txt 2450 BLAKE2B 1f35f82e9cfa731267fd6de254d6e17e1b37833e8508af565d8b3e93e5edcabe93ea859528711ffbde13a2ad7ea85816f31f50c65713417ef9c2fcd2b056d787 SHA512 9608ed530c28a676ce01416a7dcb2dbcb8a7de3b7ff67ff15ba5eaf106b70f3658dd71dae7a1691d58b77c7ac1fe8023b4f8c4e1a4247169e79f656b0d356aef
+AUX nim-2.0.6-testament-skipfile.txt 2594 BLAKE2B 58af9e632d595e1dc8f6b4fadacf55f10697d75a1ff21a2a6be2feb14eb7e86c27d5fb10737614b2dad3eb7ee3b4a8d76d30ef1c7117e1b7738ca00960450c4c SHA512 940b9ad7eb1debee502568abf30f81970fc431785c3f9b00d8322eaa686f17e6b641e66baaecc7a6ec288076139d180f87978dec24a9ac949e14b5051829228f
 AUX nim-sets.conf 162 BLAKE2B 976422f31cf8a64e1fad537f4db38a07e0022b9460936c63e0220cb3858ba02704857841d5010ad8c7bde0e6192c4c3c1329aeca8080a48a728e8b288cefc0fb SHA512 61a07de9973fc77998515bbb62498ffd1de991241bf32805f4acc0e4325e39d767ac862f2546757763aa8d0a7f35b95a9e1df91e6aa6f241eed6e93c8e3c46f0
-DIST nim-1.6.14.tar.xz 5266632 BLAKE2B f6eadf44365a099f45d1b734dea494e5d098b0427791c19a5e0b7ee6fa8069fee606005920cbcbfd7c88a36ace870949ff797d1e37fc1f84e14d5dd1aeb4bd1d SHA512 6923ea98627ea48b5c939438618caa8e6860f248086e43bc101b543aa78e7c475bc8e56b8acb90dc4a3771ca0d2e27fbdda6a0b477dbb906acda8a7b39c272d3
 DIST nim-2.0.4.tar.xz 7620508 BLAKE2B cf7c737d734c5a468ac9229fb021bcd252c5c4f20ab091ec0ce27eb36ba44be8b438536aa39aa8c583483a7ce15dfbb91b1deb1c19794b3d77506d23096a4460 SHA512 1918b3d4a4fc02714677b2ca5051dc69e1d1daead2cf4dcc9b997076540d07d58ee4fe3049de86a37faa3143de1d3b95bedfa31f31d8463987bb267107459793
+DIST nim-2.0.6.tar.xz 7668088 BLAKE2B 1cc2b3be355b236b467fa6629747de55b60b6d2f3e9d8bc584fa4f30ba842d68a0db984aff234df1299b0a782af1d464382bb37fa62c0c7a952e667bf0d3c3be SHA512 9668b34decb55fd27f0edb8c6dcdd2d8dbed00f71e8ce5c177422aedbcc359f4b943b29a38875f4715c1903a32b8388e2a4662d5ceb301349b23eb2277dbde1e
 DIST nim-atlas-0.8.0.tar.gz 59097 BLAKE2B 231b238ac3b15cc2c2d9ad927f80ae72d8ae4c649277515f32df6cc04275ccd38db5307d627572af547501e6522c06c86dc279dc3e13b5385f14e24032f6fe69 SHA512 747c13e2c5bd45a1dc6c1426f8c7637f638ada9dd4c9aa3edf4ef8367060e73226dc4bcde6380fac25ed47ebf4097fd223c72fadc3cceba8c71dd0f0571e47eb
-DIST nim-patches-1.6.6_p1.tar.gz 2632 BLAKE2B 64980d9510dc48e3c566473dc618d00cafba04783882d62b12015e8435c9c0515d7726da30f0b74dca6a41aa88a9c9aed2189a65b3325c28839d0051de8a3365 SHA512 7ba251675cd564452669bf5ec3748565db818324f58506f20a5036e4b54df10f4d7c149cece8cb97c853222cfa7d4d8d26856d92aaa25e613e31c6f5c2a8243d
-EBUILD nim-1.6.14-r1.ebuild 4861 BLAKE2B f6480ce8179fec0ee1c00a6a76894a3953b948ac94aa8b2c9b371bbe2a15770ac7e3c1dbb77290bb7671b7837e5199966dc069cf7381a0f038792e4e6b1ffb50 SHA512 fdb03289139a7a9c1ae298b3472cde63d187186790c0a2cb402e38dd4147c99be3e2e3d8fcb0594771077c92382f93c009672ae690d1f10cff46d7f74ab6786e
 EBUILD nim-2.0.4.ebuild 4408 BLAKE2B 290abe3fe80d779a72c07f81d4e6d7d93b569c003bcd1f85b0e9309345373edf5acf0090be8c8d127635e6d4b653a36fc0724038fe1708bdc17576a4c69f4c03 SHA512 b8fc6f49eb8921afe3bb731f2323567720ea04daac05e4a352ba8cfec82f0bf6af4872c5e3c7d596a4dacc77da45f3bea3b5d3a150857920d84bf28c7c505a53
-MISC metadata.xml 2157 BLAKE2B bbbc15b0c5590a22e276056a55ef09957ae5e5b0429122411e9d7570756873a5147bc8a00ee2bc97e887aa0d76668e3ecab10b495d67e5fd10174a0411d02f5f SHA512 b6d3010ddd9a0dc4e5f9698ac832cebe794c1b4b222d561448d9e43d9e3a581e5983c5d771bdad96957a100029efdb2804ff30b8b223b33ba5864e68fdb25519
+EBUILD nim-2.0.6.ebuild 4406 BLAKE2B 00439d84d1f76331bac382f0fdd258e89ad6c66262071bad61bf201605f74da30e02a8f7f67a9db8af1464798b10098ad145c993b167e84adc927f0a91c17a95 SHA512 af8b9f0637c8dd3b8a280ce1d145f32e1524689e20120840894f419e5e261433c76770120fa0ea434ce70f99e8f594a1008b03e585087d5620ec98a045a8f185
+MISC metadata.xml 2093 BLAKE2B 250d27e71538be674ff7f32fe55089fca33f0d6ab55fdbe2b0f858f3d4373e729f273c16b2bf0bc3265be4289e7de1438096bf60e69bd0100e126fc5cc6173eb SHA512 74a188f13cc0653aa30d0c18126ed1cfb11d4325d71ffca6af03ad62b135796cd64d269e2ea85280cd1e486b527947b287eee4db648600451336e323882ff0e3
diff --git a/dev-lang/nim/files/nim-0.20.0-paths.patch b/dev-lang/nim/files/nim-0.20.0-paths.patch
deleted file mode 100644
index a314eae2299b..000000000000
--- a/dev-lang/nim/files/nim-0.20.0-paths.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Default to <prefix>/usr/bin install.
-
-https://bugs.gentoo.org/635032
---- a/tools/niminst/install.nimf
-+++ b/tools/niminst/install.nimf
-@@ -28,13 +28,13 @@ if [ $# -eq 1 ] ; then
-       echo "sh deinstall.sh DIR"
-       exit 1
-       ;;
--    "/usr/bin")
--      bindir=/usr/bin
--      configdir=/etc/?proj
--      libdir=/usr/lib/?proj
--      docdir=/usr/share/?proj/doc
--      datadir=/usr/share/?proj/data
--      nimbleDir="/opt/nimble/pkgs/?c.nimblePkgName-?c.version"
-+    *)
-+      bindir=$1/usr/bin
-+      configdir=$1/etc/?proj
-+      libdir=$1/usr/lib/?proj
-+      docdir=$1/usr/share/?proj/doc
-+      datadir=$1/usr/share/?proj/data
-+      nimbleDir=$1"/opt/nimble/pkgs/?c.nimblePkgName-?c.version"
-       ;;
-     "/usr/local/bin")
-       bindir=/usr/local/bin
-@@ -68,6 +68,9 @@ if [ $# -eq 1 ] ; then
-       ;;
-   esac
- 
-+  mkdir -p $bindir
-+  mkdir -p $datadir
-+
-   mkdir -p $libdir
-   mkdir -p $docdir
-   mkdir -p $configdir
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
deleted file mode 100644
index 1bc4f8f25d55..000000000000
--- a/dev-lang/nim/files/nim-1.6.14-clang16-musl-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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.6-csources-flags.patch b/dev-lang/nim/files/nim-1.6.6-csources-flags.patch
deleted file mode 100644
index 9a39a900e82a..000000000000
--- a/dev-lang/nim/files/nim-1.6.6-csources-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build.sh
-+++ b/build.sh
-@@ -60,7 +60,7 @@
-   fi
-   CC="sem -j $parallel --id $$ ${CC}"
- fi
--COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -fmax-errors=3 -O3 -fno-strict-aliasing -fno-ident $extraBuildArgs"
-+COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -fmax-errors=3 -fno-strict-aliasing -fno-ident $extraBuildArgs"
- LINK_FLAGS="${LDFLAGS:-} "
- PS4=""
- # platform detection
diff --git a/dev-lang/nim/files/nim-1.6.14-testament-skipfile.txt b/dev-lang/nim/files/nim-2.0.6-testament-skipfile.txt
index 2e7e0b48f9fc..6a99c9d8037f 100644
--- a/dev-lang/nim/files/nim-1.6.14-testament-skipfile.txt
+++ b/dev-lang/nim/files/nim-2.0.6-testament-skipfile.txt
@@ -1,23 +1,47 @@
+# -*- conf -*-
+# broken, bug https://bugs.gentoo.org/930542
+tests/c/temit.nim
+tests/ccgbugs/t10964.nim
+tests/niminaction/Chapter3/ChatApp/src/client.nim
+tests/niminaction/Chapter3/various3.nim
+tests/niminaction/Chapter6/WikipediaStats/concurrency.nim
+tests/niminaction/Chapter6/WikipediaStats/concurrency_regex.nim
+tests/niminaction/Chapter6/WikipediaStats/parallel_counts.nim
+tests/niminaction/Chapter8/sdl/sdl_test.nim
+tests/parallel/tdeepcopy.nim
+tests/parallel/tdeepcopy2.nim
+tests/parallel/tflowvar.nim
+tests/parallel/tlet_spawn.nim
+tests/parallel/tpi.nim
+tests/parallel/tsysspawn.nim
+tests/parallel/twaitany.nim
+tests/stdlib/thttpclient_ssl.nim
+tests/stdlib/tthreadpool.nim
 # broken
 tests/assert/tassert_c.nim
 tests/async/tasync_traceback.nim
 tests/coroutines/twait.nim
+tests/dll/nimhcr_unit.nim
 tests/errmsgs/t14444.nim
+tests/errmsgs/t23536.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/exception/t22469.nim
 tests/js/tmangle.nim
 tests/js/twritestacktrace.nim
 tests/lent/tbasic_lent_check.nim
 tests/misc/trunner.nim
+tests/misc/tsizeof4.nim
 tests/misc/tstrace.nim
 tests/misc/twarningaserror.nim
 tests/parser/t20922.nim
 tests/pragmas/thintprocessing.nim
 tests/pragmas/tused.nim
 tests/pragmas/twarning_off.nim
+tests/range/tcompiletime_range_checks.nim
 tests/stdlib/tos.nim
 tests/stdlib/tstackframes.nim
 tests/stdlib/tstats.nim
diff --git a/dev-lang/nim/metadata.xml b/dev-lang/nim/metadata.xml
index 43513b90b646..b2fef7a3d52d 100644
--- a/dev-lang/nim/metadata.xml
+++ b/dev-lang/nim/metadata.xml
@@ -41,7 +41,6 @@
     <remote-id type="github">nim-lang/Nim</remote-id>
   </upstream>
   <use>
-    <flag name="experimental">Apply experimental patches</flag>
     <flag name="test-js">Enable tests that require Node.js</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-lang/nim/nim-1.6.14-r1.ebuild b/dev-lang/nim/nim-2.0.6.ebuild
index 07e043cf4ffb..524cd020c819 100644
--- a/dev-lang/nim/nim-1.6.14-r1.ebuild
+++ b/dev-lang/nim/nim-2.0.6.ebuild
@@ -3,24 +3,23 @@
 
 EAPI=8
 
-PATCH_PV="1.6.6_p1"
+ATLAS_V="0.8.0"
 
 inherit bash-completion-r1 edo multiprocessing toolchain-funcs xdg-utils
 
 DESCRIPTION="Compiled, garbage-collected systems programming language"
-HOMEPAGE="https://nim-lang.org/"
+HOMEPAGE="https://nim-lang.org/
+	https://github.com/nim-lang/Nim/"
 SRC_URI="
 	https://nim-lang.org/download/${P}.tar.xz
-	experimental? (
-		https://git.sr.ht/~cyber/${PN}-patches/archive/${PATCH_PV}.tar.gz
-			-> nim-patches-${PATCH_PV}.tar.gz
-	)
+	https://github.com/nim-lang/atlas/archive/refs/tags/${ATLAS_V}.tar.gz
+		-> nim-atlas-${ATLAS_V}.tar.gz
 "
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="doc experimental test-js test"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test-js test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -43,13 +42,15 @@ BDEPEND="
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20.0-paths.patch
-	"${FILESDIR}"/${PN}-1.6.6-csources-flags.patch
-)
+src_configure() {
+	xdg_environment_reset  # bug #667182
+
+	unset NIMBLE_DIR
+	tc-export CC CXX LD
+
+	mkdir "${HOME}/.parallel" || die
+	touch "${HOME}/.parallel/will-cite" || die "parallel setup failed"
 
-# Borrowed from nim-utils.eclass (guru overlay).
-nim_gen_config() {
 	cat > nim.cfg <<- EOF || die "Failed to create Nim config"
 		cc:"gcc"
 		gcc.exe:"$(tc-getCC)"
@@ -74,29 +75,8 @@ nim_gen_config() {
 		# some tests don't work with processing hints
 		--processing:"off"
 	EOF
-}
-
-src_prepare() {
-	default
-
-	# 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() {
-	xdg_environment_reset  # bug 667182
-
-	unset NIMBLE_DIR
-	tc-export CC CXX LD
-
-	nim_gen_config
-
-	mkdir "${HOME}"/.parallel || die
-	touch "${HOME}"/.parallel/will-cite || die "parallel setup failed"
+	cp -r "${WORKDIR}/atlas-${ATLAS_V}" "${S}/dist/atlas" || die
 }
 
 src_compile() {
@@ -112,23 +92,10 @@ src_compile() {
 	eend 0
 
 	edo chmod +x ./bin/nim
-	edo ./bin/nim compile koch
-	edo ./koch boot -d:nimUseLinenoise --skipParentCfg:off
-	edo ./koch tools
-
-	if use doc; then
-		local -a docargs=(
-			# set git tag
-			--git.commit:v${PV}
-			# skip runnableExamples as some of them need net
-			--docCmd:skip
-			# make logs less verbose
-			--hints:off
-			--warnings:off
-		)
-		edo ./koch doc "${docargs[@]}"
-		HTML_DOCS=( web/upload/${PV}/. )
-	fi
+	edo ./bin/nim compile -d:release koch
+	edo ./koch boot -d:nimUseLinenoise -d:release --skipParentCfg:off
+	edo ./koch tools -d:release
+	edo ./bin/nim compile -d:release ./tools/niminst/niminst.nim
 }
 
 src_test() {
@@ -140,13 +107,13 @@ src_test() {
 		--hint:UserRaw:on
 	)
 	local -a testament_args=(
-		--skipFrom:"${FILESDIR}/${PN}-1.6.14-testament-skipfile.txt"
+		--skipFrom:"${FILESDIR}/${PN}-2.0.6-testament-skipfile.txt"
 		--nim:"bin/nim"
 		--targets:"$(usex test-js 'c js' 'c')"
 	)
 
-	[[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] && \
-		testament_args+=( --colors:off )
+	[[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] \
+		&& testament_args+=( --colors:off )
 
 	local -a categories
 	readarray -t categories < <(find tests -mindepth 1 -maxdepth 1 -type d -printf "%P\n" | sort)
@@ -164,39 +131,42 @@ src_test() {
 
 		[[ -f "${checkpoint}" ]] && continue
 
-		case ${tcat} in
+		case "${tcat}" in
 			testdata )
 				:
 				;;
-			arc | ic | valgrind )
-				einfo "Skipped category '${tcat}'"
+			arc | gc | ic | js | msgs | stylecheck \
+				| testament | untestable | objects | valgrind )
+				einfo "Skipped nim test category: ${tcat}"
 				;;
 			* )
 				einfo "Running tests in category '${tcat}'"
 				nonfatal edo ./bin/testament "${testament_args[@]}" \
-						 category "${tcat}" "${nimflags[@]}" || test_return=1
+						 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"
+	[[ "${test_return}" -eq 1 ]] \
+		&& die "tests failed, please inspect the failed test categories above"
 }
 
 src_install() {
 	local -x PATH="${S}/bin:${PATH}"
 
-	edo ./koch install "${ED}"
-	einstalldocs
+	edo ./koch install "${ED}/usr/lib"
+	dosym -r /usr/lib/nim/bin/nim /usr/bin/nim
 
 	# "./koch install" installs only "nim" binary but not the rest.
+	exeinto /usr/bin
 	local exe
-	for exe in bin/* ; do
-		[[ "${exe}" == bin/nim ]] && continue
-		dobin "${exe}"
-	done
+	while read -r exe ; do
+		einfo "Installing nim support tool: ${exe}"
+		doexe "${exe}"
+	done < <(find ./bin -type f -not -iname nim)
 
 	newbashcomp tools/nim.bash-completion nim
 	newbashcomp dist/nimble/nimble.bash-completion nimble
@@ -207,5 +177,7 @@ src_install() {
 
 	# Install the @nim-rebuild set for Portage.
 	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/nim-sets.conf nim.conf
+	newins "${FILESDIR}/nim-sets.conf" nim.conf
+
+	einstalldocs
 }