* [gentoo-commits] repo/gentoo:master commit in: dev-lang/nim/files/, dev-lang/nim/
@ 2019-06-08 9:09 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2019-06-08 9:09 UTC (permalink / raw
To: gentoo-commits
commit: 5a9f7f6fdc932784ef8488bc89c42160f3be4bc3
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 8 09:08:06 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jun 8 09:09:14 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a9f7f6f
dev-lang/nim: bump up to 0.20.0
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-lang/nim/Manifest | 1 +
dev-lang/nim/files/nim-0.20.0-paths.patch | 36 ++++++++++++++
dev-lang/nim/nim-0.20.0.ebuild | 82 +++++++++++++++++++++++++++++++
3 files changed, 119 insertions(+)
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index 3de80cdb9b0..907dcc3e525 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,2 +1,3 @@
DIST nim-0.19.4.tar.xz 4284092 BLAKE2B 7fcc4d4c13cd5ab0b9ac7b98b3ffff99ffcb77d0a23bb731b92813b5d96f5ce88303cb0196ad425f5944744f30aa1d257dc90714f6d11c1a26726ad4512206b7 SHA512 0cf87368b51bc305935b350b63c535ed268c066258ef731b73c12afaa9a3c20760876e3c4bec46448051fe8bacb6c4f1ef84f2ec3789f601a4786408bf3da06c
DIST nim-0.19.6.tar.xz 4166952 BLAKE2B 6be2cf16bc7807fe78e3d30d9533ab3c1eff1c2042c6af1aca0d7e8330597f2aaa363085f8da2448075be6cb1feb07186c28a32fb58f120af8f4db009dcd4561 SHA512 9728825e349570ec187c031725162b70fdb1a43229732d33fcfa61dde84fb6392c7265a456ce925fd7d1d782d7f9881398173bf69c0d1ecdbefbbb6bd57f6041
+DIST nim-0.20.0.tar.xz 4997088 BLAKE2B fd03837c1674052145cbed631be4d4028a31fdd46d8b730734781b65d5bbcd9cb118ef7ac14c1bc16f7e056365b5bddf32160bf84566ac4815cb12e330f8e712 SHA512 e41fc9f9337535d07ebdd14ae8195bf9c666a0a242516f24d50241e69d50e89fcb9ac1a0b1fbeee0bc75b0218aeb18698ff2ac87447005dad52dc18da80bb02d
diff --git a/dev-lang/nim/files/nim-0.20.0-paths.patch b/dev-lang/nim/files/nim-0.20.0-paths.patch
new file mode 100644
index 00000000000..a314eae2299
--- /dev/null
+++ b/dev-lang/nim/files/nim-0.20.0-paths.patch
@@ -0,0 +1,36 @@
+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/nim-0.20.0.ebuild b/dev-lang/nim/nim-0.20.0.ebuild
new file mode 100644
index 00000000000..bb41a8721fe
--- /dev/null
+++ b/dev-lang/nim/nim-0.20.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="doc +readline test"
+
+RESTRICT=test # need to sort out depends and numerous failures
+
+RDEPEND="
+ readline? ( sys-libs/readline:0= )
+"
+DEPEND="
+ ${DEPEND}
+ test? ( net-libs/nodejs )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.20.0-paths.patch
+)
+
+_run() {
+ echo "$@"
+ "$@" || die "'$*' failed"
+}
+
+nim_use_enable() {
+ [[ -z $2 ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
+ use $1 && echo "-d:$2"
+}
+
+src_compile() {
+ export XDG_CACHE_HOME=${T}/cache #667182
+ tc-export CC LD
+
+ _run ./build.sh
+
+ _run ./bin/nim --parallelBuild:$(makeopts_jobs) c koch
+ _run ./koch boot --parallelBuild:$(makeopts_jobs) -d:release $(nim_use_enable readline useGnuReadline)
+ # build nimble and friends
+ # --stable to avoid pulling HEAD nimble
+ PATH="./bin:$PATH" _run ./koch --stable tools
+
+ if use doc; then
+ PATH="./bin:$PATH" _run ./koch doc
+ fi
+}
+
+src_test() {
+ PATH="./bin:$PATH" _run ./koch test
+}
+
+src_install() {
+ PATH="./bin:$PATH" _run ./koch install "${ED%/}"
+ rm -r "${ED%/}/usr/share/nim/doc" || die "failed to remove 'doc'"
+
+ exeinto /usr/bin
+
+ local bin_exe
+ for bin_exe in bin/*; do
+ # './koch install' installs only 'nim' binary
+ # but not the rest
+ [[ ${bin_exe} == bin/nim ]] && continue
+ doexe "${bin_exe}"
+ done
+
+ if use doc; then
+ insinto /usr/share/doc/${PF}
+ dodoc doc/html/*.html
+ fi
+
+ newbashcomp tools/nim.bash-completion ${PN}
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/nim/files/, dev-lang/nim/
@ 2019-07-17 21:14 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2019-07-17 21:14 UTC (permalink / raw
To: gentoo-commits
commit: c303b04668fdffbee357f04420dd9402e0324585
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 21:14:18 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 21:14:18 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c303b046
dev-lang/nim: drop old
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-lang/nim/Manifest | 2 -
dev-lang/nim/files/nim-0.19.0-paths.patch | 36 --------------
dev-lang/nim/nim-0.19.4.ebuild | 81 -------------------------------
dev-lang/nim/nim-0.19.6.ebuild | 81 -------------------------------
4 files changed, 200 deletions(-)
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index face92c84e6..5f50cb7fb21 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,4 +1,2 @@
-DIST nim-0.19.4.tar.xz 4284092 BLAKE2B 7fcc4d4c13cd5ab0b9ac7b98b3ffff99ffcb77d0a23bb731b92813b5d96f5ce88303cb0196ad425f5944744f30aa1d257dc90714f6d11c1a26726ad4512206b7 SHA512 0cf87368b51bc305935b350b63c535ed268c066258ef731b73c12afaa9a3c20760876e3c4bec46448051fe8bacb6c4f1ef84f2ec3789f601a4786408bf3da06c
-DIST nim-0.19.6.tar.xz 4166952 BLAKE2B 6be2cf16bc7807fe78e3d30d9533ab3c1eff1c2042c6af1aca0d7e8330597f2aaa363085f8da2448075be6cb1feb07186c28a32fb58f120af8f4db009dcd4561 SHA512 9728825e349570ec187c031725162b70fdb1a43229732d33fcfa61dde84fb6392c7265a456ce925fd7d1d782d7f9881398173bf69c0d1ecdbefbbb6bd57f6041
DIST nim-0.20.0.tar.xz 4997088 BLAKE2B fd03837c1674052145cbed631be4d4028a31fdd46d8b730734781b65d5bbcd9cb118ef7ac14c1bc16f7e056365b5bddf32160bf84566ac4815cb12e330f8e712 SHA512 e41fc9f9337535d07ebdd14ae8195bf9c666a0a242516f24d50241e69d50e89fcb9ac1a0b1fbeee0bc75b0218aeb18698ff2ac87447005dad52dc18da80bb02d
DIST nim-0.20.2.tar.xz 5032768 BLAKE2B 583e0b5cede279a0c0a60d4209f9be6237ff5ac070c0e82a075a242d08086e59c88c2ab29cbf3d2c6d7a455709b64086afd11e4928fcc9e81979d5296ef38b64 SHA512 231d95950ca5a7abe86175f93085ea27fae493e4f8dde3c9e086993431f9517781ceffeb4f9e761eb524523df3703d0a315fe53e32bc6daea6a684bf90589282
diff --git a/dev-lang/nim/files/nim-0.19.0-paths.patch b/dev-lang/nim/files/nim-0.19.0-paths.patch
deleted file mode 100644
index 71ccb140d54..00000000000
--- a/dev-lang/nim/files/nim-0.19.0-paths.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Default to <prefix>/usr/bin install.
-
-https://bugs.gentoo.org/635032
---- a/tools/niminst/install.tmpl
-+++ b/tools/niminst/install.tmpl
-@@ -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/nim-0.19.4.ebuild b/dev-lang/nim/nim-0.19.4.ebuild
deleted file mode 100644
index 2dc958a2a86..00000000000
--- a/dev-lang/nim/nim-0.19.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 multiprocessing
-
-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="doc +readline test"
-
-RESTRICT=test # need to sort out depends and numerous failures
-
-RDEPEND="
- readline? ( sys-libs/readline:0= )
-"
-DEPEND="
- ${DEPEND}
- test? ( net-libs/nodejs )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.19.0-paths.patch
-)
-
-_run() {
- echo "$@"
- "$@" || die "'$*' failed"
-}
-
-nim_use_enable() {
- [[ -z $2 ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
- use $1 && echo "-d:$2"
-}
-
-src_compile() {
- export XDG_CACHE_HOME=${T}/cache #667182
-
- _run ./build.sh
-
- _run ./bin/nim --parallelBuild:$(makeopts_jobs) c koch
- _run ./koch boot --parallelBuild:$(makeopts_jobs) -d:release $(nim_use_enable readline useGnuReadline)
- # build nimble and friends
- # --stable to avoid pulling HEAD nimble
- PATH="./bin:$PATH" _run ./koch --stable tools
-
- if use doc; then
- PATH="./bin:$PATH" _run ./koch doc
- fi
-}
-
-src_test() {
- PATH="./bin:$PATH" _run ./koch test
-}
-
-src_install() {
- PATH="./bin:$PATH" _run ./koch install "${ED%/}"
- rm -r "${ED%/}/usr/share/nim/doc" || die "failed to remove 'doc'"
-
- exeinto /usr/bin
-
- local bin_exe
- for bin_exe in bin/*; do
- # './koch install' installs only 'nim' binary
- # but not the rest
- [[ ${bin_exe} == bin/nim ]] && continue
- doexe "${bin_exe}"
- done
-
- if use doc; then
- insinto /usr/share/doc/${PF}
- dodoc doc/html/*.html
- fi
-
- newbashcomp tools/nim.bash-completion ${PN}
-}
diff --git a/dev-lang/nim/nim-0.19.6.ebuild b/dev-lang/nim/nim-0.19.6.ebuild
deleted file mode 100644
index 2dc958a2a86..00000000000
--- a/dev-lang/nim/nim-0.19.6.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 multiprocessing
-
-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="doc +readline test"
-
-RESTRICT=test # need to sort out depends and numerous failures
-
-RDEPEND="
- readline? ( sys-libs/readline:0= )
-"
-DEPEND="
- ${DEPEND}
- test? ( net-libs/nodejs )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.19.0-paths.patch
-)
-
-_run() {
- echo "$@"
- "$@" || die "'$*' failed"
-}
-
-nim_use_enable() {
- [[ -z $2 ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
- use $1 && echo "-d:$2"
-}
-
-src_compile() {
- export XDG_CACHE_HOME=${T}/cache #667182
-
- _run ./build.sh
-
- _run ./bin/nim --parallelBuild:$(makeopts_jobs) c koch
- _run ./koch boot --parallelBuild:$(makeopts_jobs) -d:release $(nim_use_enable readline useGnuReadline)
- # build nimble and friends
- # --stable to avoid pulling HEAD nimble
- PATH="./bin:$PATH" _run ./koch --stable tools
-
- if use doc; then
- PATH="./bin:$PATH" _run ./koch doc
- fi
-}
-
-src_test() {
- PATH="./bin:$PATH" _run ./koch test
-}
-
-src_install() {
- PATH="./bin:$PATH" _run ./koch install "${ED%/}"
- rm -r "${ED%/}/usr/share/nim/doc" || die "failed to remove 'doc'"
-
- exeinto /usr/bin
-
- local bin_exe
- for bin_exe in bin/*; do
- # './koch install' installs only 'nim' binary
- # but not the rest
- [[ ${bin_exe} == bin/nim ]] && continue
- doexe "${bin_exe}"
- done
-
- if use doc; then
- insinto /usr/share/doc/${PF}
- dodoc doc/html/*.html
- fi
-
- newbashcomp tools/nim.bash-completion ${PN}
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/nim/files/, dev-lang/nim/
@ 2023-01-03 21:39 Maciej Barć
0 siblings, 0 replies; 6+ messages in thread
From: Maciej Barć @ 2023-01-03 21:39 UTC (permalink / raw
To: gentoo-commits
commit: 86595aa55fdefac85478ee78cea0d18abe525ae3
Author: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat Nov 26 11:36:12 2022 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Jan 3 21:39:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86595aa5
dev-lang/nim: revbump (enable docs, parallel build)
* install @nim-rebuild set
* bump nim-patches ver
* build docs
* install zsh completions
* enable parallel build
Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in>
Closes: https://github.com/gentoo/gentoo/pull/28451
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
dev-lang/nim/Manifest | 1 +
dev-lang/nim/files/nim-sets.conf | 5 ++
dev-lang/nim/nim-1.6.10-r1.ebuild | 108 ------------------------------
dev-lang/nim/nim-1.6.10-r2.ebuild | 136 ++++++++++++++++++++++++++++++++++++++
4 files changed, 142 insertions(+), 108 deletions(-)
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index c47f0791449f..cf65e8eb2065 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -2,3 +2,4 @@ DIST nim-1.6.10.tar.xz 5216284 BLAKE2B d5b7bdc488086260b84700e3022ff7fc45b98d785
DIST nim-1.6.6.tar.xz 5149956 BLAKE2B 2fd1b40f1ecc1200255052d9e013c55287d3e01337146d0b1386d0f3fc9c14fda1e8e82ee289e782c77a573c1ae0985ea7f900f61e6b9824a9eb4b5c803c7f71 SHA512 6ea8d3f61adae48184dd0e3ac393296fd3bd5ead818e7dee949f43eccbd0b6229ebfc474353ddd63cc734f82c3247998fbfe88362061983f978ad8d0ab7fa677
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
diff --git a/dev-lang/nim/files/nim-sets.conf b/dev-lang/nim/files/nim-sets.conf
new file mode 100644
index 000000000000..294d9835364c
--- /dev/null
+++ b/dev-lang/nim/files/nim-sets.conf
@@ -0,0 +1,5 @@
+# Installed packages for which vdb *DEPEND includes dev-lang/nim.
+[nim-rebuild]
+class = portage.sets.dbapi.VariableSet
+variable = BDEPEND
+includes = dev-lang/nim
diff --git a/dev-lang/nim/nim-1.6.10-r1.ebuild b/dev-lang/nim/nim-1.6.10-r1.ebuild
deleted file mode 100644
index 4634c652fad3..000000000000
--- a/dev-lang/nim/nim-1.6.10-r1.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/1.6.6.tar.gz
- -> ${PN}-patches-1.6.6.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-1.6.6
-}
-
-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
-}
diff --git a/dev-lang/nim/nim-1.6.10-r2.ebuild b/dev-lang/nim/nim-1.6.10-r2.ebuild
new file mode 100644
index 000000000000..5140ee232527
--- /dev/null
+++ b/dev-lang/nim/nim-1.6.10-r2.ebuild
@@ -0,0 +1,136 @@
+# 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"
+RESTRICT="test" # need to sort out depends and numerous failures
+
+BDEPEND="sys-process/parallel"
+
+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}"/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 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}"
+
+ edo ./koch test
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/nim/files/, dev-lang/nim/
@ 2023-09-02 13:08 Maciej Barć
0 siblings, 0 replies; 6+ messages in thread
From: Maciej Barć @ 2023-09-02 13:08 UTC (permalink / raw
To: gentoo-commits
commit: 89002f07d53580ff2714efcb9689f631d6a363e7
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 2 12:57:47 2023 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sat Sep 2 13:07:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89002f07
dev-lang/nim: drop old 1.6.10-r2
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
dev-lang/nim/Manifest | 1 -
.../nim/files/nim-1.6.10-testament-skipfile.txt | 40 -----
dev-lang/nim/nim-1.6.10-r2.ebuild | 195 ---------------------
3 files changed, 236 deletions(-)
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index aa6d9035a713..47c04511aadc 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,3 +1,2 @@
-DIST nim-1.6.10.tar.xz 5216284 BLAKE2B d5b7bdc488086260b84700e3022ff7fc45b98d78574a3d2e288c95968a580fa644e47612dc60d6e63f5e85687f5b59a28128be746abc55bd6d4527344dc3ab14 SHA512 2ba6c4db68030ace2b4dd9b7f85d2b7c882c62e8f7f68bd0b82f548c91c300ab0e03c66f56c678127058f56b75a5550dec48d68eb6d666a179994cd1a6e2cc47
DIST nim-1.6.14.tar.xz 5266632 BLAKE2B f6eadf44365a099f45d1b734dea494e5d098b0427791c19a5e0b7ee6fa8069fee606005920cbcbfd7c88a36ace870949ff797d1e37fc1f84e14d5dd1aeb4bd1d SHA512 6923ea98627ea48b5c939438618caa8e6860f248086e43bc101b543aa78e7c475bc8e56b8acb90dc4a3771ca0d2e27fbdda6a0b477dbb906acda8a7b39c272d3
DIST nim-patches-1.6.6_p1.tar.gz 2632 BLAKE2B 64980d9510dc48e3c566473dc618d00cafba04783882d62b12015e8435c9c0515d7726da30f0b74dca6a41aa88a9c9aed2189a65b3325c28839d0051de8a3365 SHA512 7ba251675cd564452669bf5ec3748565db818324f58506f20a5036e4b54df10f4d7c149cece8cb97c853222cfa7d4d8d26856d92aaa25e613e31c6f5c2a8243d
diff --git a/dev-lang/nim/files/nim-1.6.10-testament-skipfile.txt b/dev-lang/nim/files/nim-1.6.10-testament-skipfile.txt
deleted file mode 100644
index 46d22c9fe915..000000000000
--- a/dev-lang/nim/files/nim-1.6.10-testament-skipfile.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-# broken
-tests/assert/tassert_c.nim
-tests/async/tasync_traceback.nim
-tests/errmsgs/tcall_with_default_arg.nim
-tests/errmsgs/tproper_stacktrace.nim
-tests/errmsgs/tproper_stacktrace2.nim
-tests/errmsgs/tproper_stacktrace3.nim
-tests/js/tmangle.nim
-tests/js/twritestacktrace.nim
-tests/lent/tbasic_lent_check.nim
-tests/misc/trunner.nim
-tests/misc/tstrace.nim
-tests/pragmas/thintprocessing.nim
-tests/pragmas/tused.nim
-tests/pragmas/twarning_off.nim
-tests/stdlib/tos.nim
-tests/stdlib/tstackframes.nim
-tests/stdlib/tstats.nim
-tests/system/talloc.nim
-tests/testament/tshould_not_work.nim
-# require network
-tests/stdlib/thttpclient.nim
-tests/stdlib/tnetconnect.nim
-tests/stdlib/tssl.nim
-# don't work without megatest
-tests/misc/tjoinable.nim
-tests/testament/tjoinable.nim
-# don't work with "--hint:all:off" hack
-tests/concepts/t3330.nim
-tests/stylecheck/t20397_2.nim
-tests/stylecheck/treject.nim
-tests/stylecheck/tusages.nim
-# need external dependencies
-tests/manyloc/keineschweine/keineschweine.nim
-tests/manyloc/nake/nakefile.nim
-tests/niminaction/Chapter7/Tweeter/src/tweeter.nim
-# need functional valgrind
-tests/destructor/tnewruntime_strutils.nim
-tests/destructor/tv2_raise.nim
-tests/views/tsplit_into_openarray.nim
diff --git a/dev-lang/nim/nim-1.6.10-r2.ebuild b/dev-lang/nim/nim-1.6.10-r2.ebuild
deleted file mode 100644
index 282de83f53e2..000000000000
--- a/dev-lang/nim/nim-1.6.10-r2.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# 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 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 nimflags=(
- # Leave only the safe hints enabled
- --hint:all:off
- --hint:User:on
- --hint:UserRaw:on
- )
- local testament_args=(
- --skipFrom:"${FILESDIR}/${P}-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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/nim/files/, dev-lang/nim/
@ 2024-06-17 20:43 Maciej Barć
0 siblings, 0 replies; 6+ messages in thread
From: Maciej Barć @ 2024-06-17 20:43 UTC (permalink / raw
To: gentoo-commits
commit: f89aed15a4ed40b8b64052e261bf91835c9b9051
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 17 17:38:59 2024 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 20:42:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f89aed15
dev-lang/nim: bump to 2.0.6
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
dev-lang/nim/Manifest | 1 +
.../nim/files/nim-2.0.6-testament-skipfile.txt | 85 ++++++++++
dev-lang/nim/nim-2.0.6.ebuild | 183 +++++++++++++++++++++
3 files changed, 269 insertions(+)
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index 68a08b1bb1b5..daffde1bb3ac 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/dev-lang/nim/files/nim-2.0.6-testament-skipfile.txt b/dev-lang/nim/files/nim-2.0.6-testament-skipfile.txt
new file mode 100644
index 000000000000..6a99c9d8037f
--- /dev/null
+++ b/dev-lang/nim/files/nim-2.0.6-testament-skipfile.txt
@@ -0,0 +1,85 @@
+# -*- 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
+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
+tests/stdlib/tssl.nim
+# don't work without megatest
+tests/misc/tjoinable.nim
+tests/testament/tjoinable.nim
+# don't work with "--hint:all:off" hack
+tests/concepts/t3330.nim
+tests/stylecheck/t20397_2.nim
+tests/stylecheck/treject.nim
+tests/stylecheck/tusages.nim
+# need external dependencies
+tests/manyloc/keineschweine/keineschweine.nim
+tests/manyloc/nake/nakefile.nim
+tests/niminaction/Chapter7/Tweeter/src/tweeter.nim
+# need functional valgrind
+tests/destructor/tnewruntime_strutils.nim
+tests/destructor/tv2_raise.nim
+tests/views/tsplit_into_openarray.nim
diff --git a/dev-lang/nim/nim-2.0.6.ebuild b/dev-lang/nim/nim-2.0.6.ebuild
new file mode 100644
index 000000000000..524cd020c819
--- /dev/null
+++ b/dev-lang/nim/nim-2.0.6.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/
+ https://github.com/nim-lang/Nim/"
+SRC_URI="
+ https://nim-lang.org/download/${P}.tar.xz
+ 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="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
+ )
+ )
+"
+
+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"
+
+ 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
+
+ cp -r "${WORKDIR}/atlas-${ATLAS_V}" "${S}/dist/atlas" || die
+}
+
+src_compile() {
+ local -x PATH="${S}/bin:${PATH}"
+
+ edo ./build.sh --parallel "$(makeopts_jobs)"
+
+ ebegin "Waiting for unfinished parallel jobs"
+ while [[ ! -f "bin/nim" ]] ; do
+ sleep 3
+ done
+ sleep 10
+ eend 0
+
+ edo chmod +x ./bin/nim
+ 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() {
+ 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}-2.0.6-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 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 | 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
+ ;;
+ esac
+
+ touch "${checkpoint}" || die
+ done
+
+ [[ "${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}/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
+ 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
+
+ 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
+
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/nim/files/, dev-lang/nim/
@ 2024-10-13 19:23 Maciej Barć
0 siblings, 0 replies; 6+ messages in thread
From: Maciej Barć @ 2024-10-13 19:23 UTC (permalink / raw
To: gentoo-commits
commit: d08bff831f01ecab100ad13b25968915854db95f
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 18:38:11 2024 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 19:23:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d08bff83
dev-lang/nim: use the makefile for initial compilation
Closes: https://bugs.gentoo.org/941480
Closes: https://bugs.gentoo.org/940306
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
dev-lang/nim/files/nim-2.2.0-makefile.patch | 11 +++++++++++
dev-lang/nim/nim-2.0.8.ebuild | 27 +++++++++++++--------------
dev-lang/nim/nim-2.2.0.ebuild | 27 +++++++++++++--------------
3 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/dev-lang/nim/files/nim-2.2.0-makefile.patch b/dev-lang/nim/files/nim-2.2.0-makefile.patch
new file mode 100644
index 000000000000..e16b54b998c2
--- /dev/null
+++ b/dev-lang/nim/files/nim-2.2.0-makefile.patch
@@ -0,0 +1,11 @@
+--- a/makefile
++++ b/makefile
+@@ -3,7 +3,7 @@
+ # To regenerate run ``niminst csource`` or ``koch csource``
+
+ CC ?= gcc
+-CFLAGS += -Ic_code -w -fmax-errors=3 -O3 -fno-strict-aliasing -fno-ident -fno-math-errno
++CFLAGS += -Ic_code -fno-strict-aliasing -fno-ident -fno-math-errno
+ LDFLAGS +=
+ binDir = bin
+
diff --git a/dev-lang/nim/nim-2.0.8.ebuild b/dev-lang/nim/nim-2.0.8.ebuild
index 02819c44e274..d922c4ede0a2 100644
--- a/dev-lang/nim/nim-2.0.8.ebuild
+++ b/dev-lang/nim/nim-2.0.8.ebuild
@@ -42,6 +42,8 @@ BDEPEND="
)
"
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-makefile.patch" )
+
src_configure() {
xdg_environment_reset # bug #667182
@@ -83,22 +85,19 @@ src_configure() {
}
src_compile() {
- local -x PATH="${S}/bin:${PATH}"
+ emake CC="$(tc-getCC)"
- edo ./build.sh --parallel "$(makeopts_jobs)"
+ local -x PATH="${S}/bin:${PATH}"
+ local -a nimflags=(
+ -d:release
+ --listCmd
+ --parallelBuild:$(makeopts_jobs)
+ )
- ebegin "Waiting for unfinished parallel jobs"
- while [[ ! -f "bin/nim" ]] ; do
- sleep 3
- done
- sleep 10
- eend 0
-
- edo chmod +x ./bin/nim
- 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
+ edo ./bin/nim compile "${nimflags[@]}" koch
+ edo ./koch boot "${nimflags[@]}" -d:nimUseLinenoise --skipParentCfg:off
+ edo ./koch tools "${nimflags[@]}"
+ edo ./bin/nim compile "${nimflags[@]}" ./tools/niminst/niminst.nim
}
src_test() {
diff --git a/dev-lang/nim/nim-2.2.0.ebuild b/dev-lang/nim/nim-2.2.0.ebuild
index e2962efd86a9..a61554bf2851 100644
--- a/dev-lang/nim/nim-2.2.0.ebuild
+++ b/dev-lang/nim/nim-2.2.0.ebuild
@@ -39,6 +39,8 @@ BDEPEND="
)
"
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-makefile.patch" )
+
src_configure() {
xdg_environment_reset # bug #667182
@@ -80,22 +82,19 @@ src_configure() {
}
src_compile() {
- local -x PATH="${S}/bin:${PATH}"
+ emake CC="$(tc-getCC)"
- edo ./build.sh --parallel "$(makeopts_jobs)"
+ local -x PATH="${S}/bin:${PATH}"
+ local -a nimflags=(
+ -d:release
+ --listCmd
+ --parallelBuild:$(makeopts_jobs)
+ )
- ebegin "Waiting for unfinished parallel jobs"
- while [[ ! -f "bin/nim" ]] ; do
- sleep 3
- done
- sleep 10
- eend 0
-
- edo chmod +x ./bin/nim
- 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
+ edo ./bin/nim compile "${nimflags[@]}" koch
+ edo ./koch boot "${nimflags[@]}" -d:nimUseLinenoise --skipParentCfg:off
+ edo ./koch tools "${nimflags[@]}"
+ edo ./bin/nim compile "${nimflags[@]}" ./tools/niminst/niminst.nim
}
src_test() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-10-13 19:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-08 9:09 [gentoo-commits] repo/gentoo:master commit in: dev-lang/nim/files/, dev-lang/nim/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2019-07-17 21:14 Sergei Trofimovich
2023-01-03 21:39 Maciej Barć
2023-09-02 13:08 Maciej Barć
2024-06-17 20:43 Maciej Barć
2024-10-13 19:23 Maciej Barć
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox