gentoo auto-resync : 11:03:2023 - 12:07:11

3 files changed, 200 insertions, 110 deletions

diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index e225768171a5..1c579336cc20 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -3,11 +3,11 @@ AUX nim-1.6.10-testament-skipfile.txt 1210 BLAKE2B d70268fcef2edb5383ca7dc696ae3
 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
-DIST nim-1.6.6.tar.xz 5149956 BLAKE2B 2fd1b40f1ecc1200255052d9e013c55287d3e01337146d0b1386d0f3fc9c14fda1e8e82ee289e782c77a573c1ae0985ea7f900f61e6b9824a9eb4b5c803c7f71 SHA512 6ea8d3f61adae48184dd0e3ac393296fd3bd5ead818e7dee949f43eccbd0b6229ebfc474353ddd63cc734f82c3247998fbfe88362061983f978ad8d0ab7fa677
+DIST nim-1.6.12.tar.xz 5180496 BLAKE2B d7c04ffdde273336770d9397dd255b7cfc442f6be9592afbfa5ceb1ac7836a8213d5cea673477ab55bd56c004cc477a6023b6a2799715f46689f3e328302e433 SHA512 17c31024ee19dfa36f25bf8a5091992b24a4adb1a817246119a2fc552075999f698a92e66243ddd5ee69d966deead37535c9aac00ebece3854c930f905eeb030
 DIST nim-1.6.8.tar.xz 5219880 BLAKE2B 16eac6f302b4ef1df14deaa0350e0e5553c7613515cc3e79cbe025af70955bef29c8261a1f91ba901023d9c53f9f00d62116301eb5a4ee4bb5314bb1e25a5755 SHA512 dd046dd393136fdcb78f463e267756bdb990b08e80e3a8be7fec1995b47a930447468e12bb9a59db6ec5546117f62ff4ccd032959879ef2d1d06a7bc5c438f83
 DIST nim-patches-1.6.6.tar.gz 1975 BLAKE2B 75490f4c61f4d920aadb2ad5908cb2773e270f80cee95f937ede8125bad5688b71840ed7f48659db892e4017437a0454b38eab18ae8b13c6b48207d0a7714371 SHA512 4d1590e7d05ad64432b943f8da9edb2b05213400181d1e07a0e40f479afbceb1997d0ea0f05a73d550afe60cf4b657f7e34840907ea16c3b9e96824e9f29e0e5
 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.6-r3.ebuild 2541 BLAKE2B b48e502294c75eb8789d3352cbd45613dc6d98299c03e5471ead778aafa093758634efd526316f1a53dbfbbf1c2e5fba73a6c8ab53b3a36c7e108e2b739d2c73 SHA512 bf847f8f146c159f5bffce3e58391695afe417d0c17e786368ce2811d515bc69df4edfd6363c79e952f6f99f5f57e5fe37869087e3a0c575fcfa463a84a3718c
+EBUILD nim-1.6.12.ebuild 4460 BLAKE2B 8c8014f09bfb4d07d6ba73fb4fd3a842e4aa3b00af32b188446b5af2e0dcadfc7840ac8e6c000cd65660d04cea9a821209207d8b0b3b501cebaeffcd96998185 SHA512 e6351bbec713a4007f457f1e6c763b1e6807a85c2998d79c9092922b7738cb556b16d490141af519081e74fd9f8abfbc21b9be83247d256f6a564b60def94417
 EBUILD nim-1.6.8-r1.ebuild 2541 BLAKE2B 87b418ad6e1dd07c41a1b8a816afd4fdeaf562d06c84ce04219add81b367b5e5a6aeb9ff2e8d1250ce68bea097bc5946353691918a7f497998179128c114cd70 SHA512 655ed80e70ab3590ca805d6cd0ed4cd99839694ebfcd3a7b23b970d71ebe91de94254615a86b7deccc07b79537bfbc8df0623acde62f543711f9ed38bf04197f
 MISC metadata.xml 2157 BLAKE2B bbbc15b0c5590a22e276056a55ef09957ae5e5b0429122411e9d7570756873a5147bc8a00ee2bc97e887aa0d76668e3ecab10b495d67e5fd10174a0411d02f5f SHA512 b6d3010ddd9a0dc4e5f9698ac832cebe794c1b4b222d561448d9e43d9e3a581e5983c5d771bdad96957a100029efdb2804ff30b8b223b33ba5864e68fdb25519
diff --git a/dev-lang/nim/nim-1.6.12.ebuild b/dev-lang/nim/nim-1.6.12.ebuild
new file mode 100644
index 000000000000..675ddf78b6f6
--- /dev/null
+++ b/dev-lang/nim/nim-1.6.12.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PATCH_PV="1.6.6_p1"
+
+inherit bash-completion-r1 edo multiprocessing toolchain-funcs xdg-utils
+
+DESCRIPTION="Compiled, garbage-collected systems programming language"
+HOMEPAGE="https://nim-lang.org/"
+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
+	)
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc experimental test-js test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-db/sqlite:3
+		dev-libs/boehm-gc
+		dev-libs/libffi
+		dev-libs/libpcre:3
+		dev-libs/openssl
+		media-libs/libsdl
+		media-libs/libsfml
+	)
+"
+BDEPEND="
+	sys-process/parallel
+	test? (
+		test-js? (
+			net-libs/nodejs
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.20.0-paths.patch
+	"${FILESDIR}"/${PN}-1.6.6-csources-flags.patch
+)
+
+# 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)"
+		gcc.linkerexe:"$(tc-getCC)"
+		gcc.cpp.exe:"$(tc-getCXX)"
+		gcc.cpp.linkerexe:"$(tc-getCXX)"
+		gcc.options.speed:"${CFLAGS}"
+		gcc.options.size:"${CFLAGS}"
+		gcc.options.debug:"${CFLAGS}"
+		gcc.options.always:"${CPPFLAGS}"
+		gcc.options.linker:"${LDFLAGS}"
+		gcc.cpp.options.speed:"${CXXFLAGS}"
+		gcc.cpp.options.size:"${CXXFLAGS}"
+		gcc.cpp.options.debug:"${CXXFLAGS}"
+		gcc.cpp.options.always:"${CPPFLAGS}"
+		gcc.cpp.options.linker:"${LDFLAGS}"
+
+		$([[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] && echo '--colors:"off"')
+		-d:"release"
+		--parallelBuild:"$(makeopts_jobs)"
+
+		# 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}
+}
+
+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"
+}
+
+src_compile() {
+	local -x PATH="${S}/bin:${PATH}"
+
+	edo ./build.sh --parallel "$(makeopts_jobs)"
+
+	ebegin "Waiting for unfinished jobs"
+	while [[ ! -f "bin/nim" ]]; do
+		sleep 1
+	done
+	eend 0
+
+	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
+}
+
+src_test() {
+	local -x PATH="${S}/bin:${PATH}"
+	local -a nimflags=(
+		# Leave only the safe hints enabled.
+		--hint:all:off
+		--hint:User:on
+		--hint:UserRaw:on
+	)
+	local -a testament_args=(
+		--skipFrom:"${FILESDIR}/${PN}-1.6.10-testament-skipfile.txt"
+		--nim:"bin/nim"
+		--targets:"$(usex test-js 'c js' 'c')"
+	)
+
+	[[ "${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)
+
+	# AdditionalCategories from "testament/categories.nim".
+	categories+=( debugger examples lib )
+
+	local tcat 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[@]}"
+				;;
+		esac
+
+		touch "${checkpoint}" || die
+	done
+}
+
+src_install() {
+	local -x PATH="${S}/bin:${PATH}"
+
+	edo ./koch install "${ED}"
+	einstalldocs
+
+	# "./koch install" installs only "nim" binary but not the rest.
+	local exe
+	for exe in bin/* ; do
+		[[ "${exe}" == bin/nim ]] && continue
+		dobin "${exe}"
+	done
+
+	newbashcomp tools/nim.bash-completion nim
+	newbashcomp dist/nimble/nimble.bash-completion nimble
+
+	insinto /usr/share/zsh/site-functions
+	newins tools/nim.zsh-completion _nim
+	newins dist/nimble/nimble.zsh-completion _nimble
+
+	# Install the @nim-rebuild set for Portage.
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/nim-sets.conf nim.conf
+}
diff --git a/dev-lang/nim/nim-1.6.6-r3.ebuild b/dev-lang/nim/nim-1.6.6-r3.ebuild
deleted file mode 100644
index 6314b192e44d..000000000000
--- a/dev-lang/nim/nim-1.6.6-r3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 edo multiprocessing toolchain-funcs xdg-utils
-
-DESCRIPTION="compiled, garbage-collected systems programming language"
-HOMEPAGE="https://nim-lang.org/"
-SRC_URI="
-	https://nim-lang.org/download/${P}.tar.xz
-	experimental? (
-		https://git.sr.ht/~cyber/${PN}-patches/archive/${PV}.tar.gz
-			-> ${PN}-patches-${PV}.tar.gz
-	)
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="experimental"
-RESTRICT="test"  # need to sort out depends and numerous failures
-
-# BDEPEND="sys-process/parallel"
-# BDEPEND="test? ( net-libs/nodejs )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20.0-paths.patch
-	"${FILESDIR}"/${PN}-1.6.6-csources-flags.patch
-)
-
-# 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)"
-	gcc.linkerexe:"$(tc-getCC)"
-	gcc.cpp.exe:"$(tc-getCXX)"
-	gcc.cpp.linkerexe:"$(tc-getCXX)"
-	gcc.options.speed:"${CFLAGS}"
-	gcc.options.size:"${CFLAGS}"
-	gcc.options.debug:"${CFLAGS}"
-	gcc.options.always:"${CPPFLAGS}"
-	gcc.options.linker:"${LDFLAGS}"
-	gcc.cpp.options.speed:"${CXXFLAGS}"
-	gcc.cpp.options.size:"${CXXFLAGS}"
-	gcc.cpp.options.debug:"${CXXFLAGS}"
-	gcc.cpp.options.always:"${CPPFLAGS}"
-	gcc.cpp.options.linker:"${LDFLAGS}"
-
-	$([[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] && echo '--colors:"off"')
-	-d:"release"
-	--parallelBuild:"$(makeopts_jobs)"
-	EOF
-}
-
-src_prepare() {
-	default
-
-	# note: there are consumers in the ::guru overlay
-	use experimental && eapply "${WORKDIR}"/${PN}-patches-${PV}
-}
-
-src_configure() {
-	xdg_environment_reset  # bug 667182
-
-	unset NIMBLE_DIR
-	tc-export CC CXX LD
-
-	nim_gen_config
-}
-
-src_compile() {
-	local -x PATH="${S}/bin:${PATH}"
-
-	# Build from C sources
-	# Compiling with sys-process/parallel fails for some reason but hopefully
-	# we'll be able to enable it later...
-	edo bash build.sh  # --parallel "$(makeopts_jobs)"
-
-	edo ./bin/nim compile koch
-	edo ./koch boot -d:nimUseLinenoise --skipParentCfg:off
-	edo ./koch tools
-}
-
-src_test() {
-	local -x PATH="${S}/bin:${PATH}"
-
-	edo ./koch test
-}
-
-src_install() {
-	local -x PATH="${S}/bin:${PATH}"
-
-	edo ./koch install "${ED}"
-
-	# "./koch install" installs only "nim" binary
-	# but not the rest
-	exeinto /usr/bin
-	local exe
-	for exe in bin/* ; do
-		[[ "${exe}" == bin/nim ]] && continue
-		doexe "${exe}"
-	done
-
-	newbashcomp tools/nim.bash-completion nim
-	newbashcomp dist/nimble/nimble.bash-completion nimble
-}