gentoo resync : 20.03.2022

4 files changed, 100 insertions, 6 deletions

diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index 5cf0bb8d6c9e..a31aa17d93a2 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,6 +1,8 @@
 AUX nim-0.20.0-paths.patch 934 BLAKE2B 6a4e44c5656cde6d5127bf6a6b8db92cdf8aada0892c27d536d0c1030ed7da8dc97138a8941030101918021f2a301fa683169c8a656fefc6fb7d0fcdb24029d4 SHA512 bf8dbc3e3861ec3ea2718092b981e495194ead5b547e69d01d5d842d128dc4b96b0ba3e95c78afd8fd822d594199315a01de370851ed8f594c091231b9a10ee9
 DIST nim-1.4.8.tar.xz 4786360 BLAKE2B 961b38275c4f9de87ac522c5b47368ce7f5543811a2dfd7b4f3fd79a104bcd0458caaaaab1705f99eb42c64735ca5f71d5018f8a8275a430d883233b28b1d412 SHA512 e6b245271495880f0eea271c46b4f5ce9168a421716a9a22367b6be3c2a9822937aad1f48eb61c151b040ac961728a89c8a6d143c8300057c0d8c1f2d66f3dd3
 DIST nim-1.6.2.tar.xz 5181616 BLAKE2B adedbcaad1b135b6f99459894856190103e2d2b678849e0418f77c02a54fde44224456ea13949f3fe9f5f020a90adde46593497895674bd9ae892b17708df292 SHA512 052b62c987035f7633f965356993cd4eec686f4f4f5c675cf966d82cb30fcf574045887a4402bcc20e487299fb5e8f65a921951c2dc21ac334e695e31d95d992
-EBUILD nim-1.4.8.ebuild 2077 BLAKE2B 4b7c5e23e6c97fa7af2de1a51ddcc5a63302c3fb6ada26255e80e76b42b6013adcf98d1f9a02a58ef435e2fd23777d172e9891b88c9e9caab370f07d7b4141ba SHA512 5d893a6d79c7d72019033e0755c60e18d0194a75e1772d708f358892d6259973eebbc6663e5ba23c22e4858c4c75672384221d3aec3526f4eb236ef0106d31bd
-EBUILD nim-1.6.2.ebuild 2138 BLAKE2B 788b1f95410760f1bb885eb2ac529d465cf914470f48a45114fc09130b05d58b4acac8b8717ab4ca4285edc1c778c5698119ea363a0dd0a717f6fa58eaee96d0 SHA512 aa39f4489821deab10aae2cc7e8bde91a248dd4c29cd43868f7f9d716d677fc4cbfd1809378fbb24060902e75183985ed5e3694b07f38c4eb56a6943caf0f9a9
+DIST nim-1.6.4.tar.xz 5130208 BLAKE2B d0f297581677bbb9fb185a8b4198f48bb58efe81a1624f62051bc1e0a93f879a0cec172f11a41784ca715ba3c151dc5307e96c15c54908aa40df406040891d6c SHA512 f4d082f37f0e675e8cdb4340d67f2e58b5e6ac5bb51dab1ded5417097f3b86d71fa585ef12ee1c3cd5b17285589cbe9d5658fcb29c98547f7967a1b6f0cb4646
+EBUILD nim-1.4.8.ebuild 2078 BLAKE2B 2a9781ebc99b6ae00c67f3034e71b8adff46f1452f628187975219ea73ee6c60f6176dc55fa0520cd83f0969302906fe79f5d87aae17cf539447a8fb1e1bf169 SHA512 3d38c1304c76727461e7e7bcc5b85770c42364da5b3c01fcada9c8528146687cab141e9acbf47b82ef85c68f892882c0266c76fb25d3ee39e84422dafee6be73
+EBUILD nim-1.6.2.ebuild 2139 BLAKE2B 9ce2020017887e5403aefd67712ffbf0b4f6c42c7f5ad96eddac2fef3afdafbd6f6264dd27eea2b6968b0dd816d714ccb1a8bf7debed5a338cf7a65c24ce4eb7 SHA512 b910a98baac46d490be0764b79f6438a61e2ed6dfa5f998102bf52ae7dead628a1aabb2e488860c61d6f9eef54f27477797e654a588c4ee8ba67cbe3ef8c13eb
+EBUILD nim-1.6.4.ebuild 2150 BLAKE2B df6e12e923f86d1ae2fd7f97c3d58884aaffae1f6db49f1fe0bda6d4f566716b398f638277697ad3850f8d00bdda1f36508e0740a7c7b1e6cc728b1671db7382 SHA512 5fa6a5df5374ef85198095e08647a3c1bad33ad999eb18458ae593b65f964c30c805488eab360a793a5a0c8ca9df6dba45d000edbbff16d6e19602339f6d3786
 MISC metadata.xml 1894 BLAKE2B 8ba43a558af584b0c455e16f6d710a2482fbd3d8a4ae80817ee0080165227e931f40b2269d6316ca4fc8773cea0e6d941feafcc30d8a2eb5eb0843d8f7e7df71 SHA512 6fbc92e65c8a85c82cba372aba12133acc626c2a33ec35aff4a02246e70f64dd06c51af121f17fb5cbab48df1aafa3e9af9375a1ccbd769590e26078a7dacf88
diff --git a/dev-lang/nim/nim-1.4.8.ebuild b/dev-lang/nim/nim-1.4.8.ebuild
index 512bc61b2ef0..d0ec48b68ee2 100644
--- a/dev-lang/nim/nim-1.4.8.ebuild
+++ b/dev-lang/nim/nim-1.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ RDEPEND="
 	readline? ( sys-libs/readline:0= )
 "
 DEPEND="
-	${DEPEND}
+	${RDEPEND}
 	test? ( net-libs/nodejs )
 "
 
diff --git a/dev-lang/nim/nim-1.6.2.ebuild b/dev-lang/nim/nim-1.6.2.ebuild
index 51069ac3166b..28eae69957ac 100644
--- a/dev-lang/nim/nim-1.6.2.ebuild
+++ b/dev-lang/nim/nim-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ IUSE="debug +readline"
 RESTRICT="test"  # need to sort out depends and numerous failures
 
 RDEPEND="readline? ( sys-libs/readline:0= )"
-DEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 #	test? ( net-libs/nodejs )
 
 PATCHES=( "${FILESDIR}"/${PN}-0.20.0-paths.patch )
diff --git a/dev-lang/nim/nim-1.6.4.ebuild b/dev-lang/nim/nim-1.6.4.ebuild
new file mode 100644
index 000000000000..11af93abf307
--- /dev/null
+++ b/dev-lang/nim/nim-1.6.4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 multiprocessing toolchain-funcs
+
+DESCRIPTION="compiled, garbage-collected systems programming language"
+HOMEPAGE="https://nim-lang.org/"
+SRC_URI="https://nim-lang.org/download/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug +readline"
+RESTRICT="test"  # need to sort out depends and numerous failures
+
+RDEPEND="readline? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}"
+# BDEPEND="test? ( net-libs/nodejs )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.20.0-paths.patch )
+
+# Generated by nim
+QA_FLAGS_IGNORED="
+usr/bin/atlas
+usr/bin/nim
+usr/bin/nim_dbg
+usr/bin/nimble
+usr/bin/nimgrep
+usr/bin/nimpretty
+usr/bin/nimsuggest
+usr/bin/testament
+"
+
+_run() {
+	echo "Running: ${@}"
+	PATH="${S}/bin:${PATH}" "${@}" || die "Failed: \"${*}\""
+}
+
+nim_use_enable() {
+	[[ -z "${2}" ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
+	use "${1}" && echo "-d:${2}"
+}
+
+src_configure() {
+	export XDG_CACHE_HOME="${T}/cache"  # 667182
+	unset NIMBLE_DIR
+	tc-export CC CXX LD
+
+	local build_type
+	if use debug ; then
+		build_type="debug"
+	else
+		build_type="release"
+	fi
+	export NIM_OPTS=( --parallelBuild:$(makeopts_jobs) -d:${build_type} )
+
+	# Override defaults
+	echo "gcc.exe            = \"$(tc-getCC)\""  >> config/nim.cfg || die
+	echo "gcc.linkerexe      = \"$(tc-getCC)\""  >> config/nim.cfg || die
+	echo "gcc.cpp.exe        = \"$(tc-getCXX)\"" >> config/nim.cfg || die
+	echo "gcc.cpp.linkerexe  = \"$(tc-getCXX)\"" >> config/nim.cfg || die
+}
+
+src_compile() {
+	_run bash ./build.sh
+
+	_run ./bin/nim ${NIM_OPTS[@]} compile koch
+	_run ./koch boot ${NIM_OPTS[@]} $(nim_use_enable readline useGnuReadline)
+	_run ./koch tools ${NIM_OPTS[@]}
+}
+
+src_test() {
+	_run ./koch test
+}
+
+src_install() {
+	_run ./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
+}