diff options
Diffstat (limited to 'dev-lang/nim')
-rw-r--r-- | dev-lang/nim/Manifest | 10 | ||||
-rw-r--r-- | dev-lang/nim/files/nim-sets.conf | 5 | ||||
-rw-r--r-- | dev-lang/nim/nim-1.6.10-r2.ebuild | 136 | ||||
-rw-r--r-- | dev-lang/nim/nim-1.6.4.ebuild | 92 | ||||
-rw-r--r-- | dev-lang/nim/nim-1.6.6-r2.ebuild | 106 | ||||
-rw-r--r-- | dev-lang/nim/nim-1.6.6-r3.ebuild (renamed from dev-lang/nim/nim-1.6.8.ebuild) | 12 | ||||
-rw-r--r-- | dev-lang/nim/nim-1.6.8-r1.ebuild (renamed from dev-lang/nim/nim-1.6.10.ebuild) | 6 |
7 files changed, 155 insertions, 212 deletions
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest index f92ad9a10eca..02a4fa22d954 100644 --- a/dev-lang/nim/Manifest +++ b/dev-lang/nim/Manifest @@ -1,12 +1,12 @@ AUX nim-0.20.0-paths.patch 934 BLAKE2B 6a4e44c5656cde6d5127bf6a6b8db92cdf8aada0892c27d536d0c1030ed7da8dc97138a8941030101918021f2a301fa683169c8a656fefc6fb7d0fcdb24029d4 SHA512 bf8dbc3e3861ec3ea2718092b981e495194ead5b547e69d01d5d842d128dc4b96b0ba3e95c78afd8fd822d594199315a01de370851ed8f594c091231b9a10ee9 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.4.tar.xz 5130208 BLAKE2B d0f297581677bbb9fb185a8b4198f48bb58efe81a1624f62051bc1e0a93f879a0cec172f11a41784ca715ba3c151dc5307e96c15c54908aa40df406040891d6c SHA512 f4d082f37f0e675e8cdb4340d67f2e58b5e6ac5bb51dab1ded5417097f3b86d71fa585ef12ee1c3cd5b17285589cbe9d5658fcb29c98547f7967a1b6f0cb4646 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 -EBUILD nim-1.6.10.ebuild 2567 BLAKE2B e12db79387175ec7021f1a4410a9479a103ec7996ca4dc4af712c706a6848da0ed868a2a94307dfe532bff0b6a24eb85e5c970e1948f19023fa5a1b421cb8f87 SHA512 bb6075b7aa4b8dae2420546a1f857ecb0bd9da16cfbe1b4a31cc5bf2eefb0e9abbbe8d3df31d96cb48b95587f839cf96f56b4f5d94bca8818fd6314d38eaf7c0 -EBUILD nim-1.6.4.ebuild 2150 BLAKE2B df6e12e923f86d1ae2fd7f97c3d58884aaffae1f6db49f1fe0bda6d4f566716b398f638277697ad3850f8d00bdda1f36508e0740a7c7b1e6cc728b1671db7382 SHA512 5fa6a5df5374ef85198095e08647a3c1bad33ad999eb18458ae593b65f964c30c805488eab360a793a5a0c8ca9df6dba45d000edbbff16d6e19602339f6d3786 -EBUILD nim-1.6.6-r2.ebuild 2565 BLAKE2B bc888ebb22d8932fb905088d2f8042e0bde6e0e1ff495967d130f3477e6494c392f04b17dea7c49b35eac3c56d5534427e9384b92a365f0539a5c63a452d7bb3 SHA512 6e116b206c24927c30513ee97cd9035952380b1b88bb240ffc8909a1989d0fbba9827685fd4ab759e02077422afdd0cad28028980ffd7ebfef47d11d3c163b16 -EBUILD nim-1.6.8.ebuild 2567 BLAKE2B e12db79387175ec7021f1a4410a9479a103ec7996ca4dc4af712c706a6848da0ed868a2a94307dfe532bff0b6a24eb85e5c970e1948f19023fa5a1b421cb8f87 SHA512 bb6075b7aa4b8dae2420546a1f857ecb0bd9da16cfbe1b4a31cc5bf2eefb0e9abbbe8d3df31d96cb48b95587f839cf96f56b4f5d94bca8818fd6314d38eaf7c0 +DIST nim-patches-1.6.6_p1.tar.gz 2632 BLAKE2B 64980d9510dc48e3c566473dc618d00cafba04783882d62b12015e8435c9c0515d7726da30f0b74dca6a41aa88a9c9aed2189a65b3325c28839d0051de8a3365 SHA512 7ba251675cd564452669bf5ec3748565db818324f58506f20a5036e4b54df10f4d7c149cece8cb97c853222cfa7d4d8d26856d92aaa25e613e31c6f5c2a8243d +EBUILD nim-1.6.10-r2.ebuild 3148 BLAKE2B 842cea7af252fcab429d8e63b2b1f2542a748abdd6564b43e1062c8b22e11f708e775382bcbe3970eee2d218be0b244111cdc3896b85e7f98d9ce423b5059d4f SHA512 6b94d93f7468503f056adec0208cc138215c0ae575cc009aa8fb5c00d4acf356db923a1418054487dcd2af27a8baa657b094d47cff111678f014fb68072a01ed +EBUILD nim-1.6.6-r3.ebuild 2541 BLAKE2B b48e502294c75eb8789d3352cbd45613dc6d98299c03e5471ead778aafa093758634efd526316f1a53dbfbbf1c2e5fba73a6c8ab53b3a36c7e108e2b739d2c73 SHA512 bf847f8f146c159f5bffce3e58391695afe417d0c17e786368ce2811d515bc69df4edfd6363c79e952f6f99f5f57e5fe37869087e3a0c575fcfa463a84a3718c +EBUILD nim-1.6.8-r1.ebuild 2541 BLAKE2B 87b418ad6e1dd07c41a1b8a816afd4fdeaf562d06c84ce04219add81b367b5e5a6aeb9ff2e8d1250ce68bea097bc5946353691918a7f497998179128c114cd70 SHA512 655ed80e70ab3590ca805d6cd0ed4cd99839694ebfcd3a7b23b970d71ebe91de94254615a86b7deccc07b79537bfbc8df0623acde62f543711f9ed38bf04197f MISC metadata.xml 1975 BLAKE2B 892f172a8f69200207ce9f3f9415ec08adddf30e52d975a706c2de75e643a9a7e1e9911340ff9aaf9d74feb8e159172c90ecb7eb75642319afc8a5ab3d04f030 SHA512 69772a1e0469fdd71e28037eb2ecba46b78355a120fbacfb1c520e0e5c6c5a0b68fc5b7b0695f4ca7e682031f68a4350fe8108e97e64eb6b86b49fdc57b07977 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-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 +} diff --git a/dev-lang/nim/nim-1.6.4.ebuild b/dev-lang/nim/nim-1.6.4.ebuild deleted file mode 100644 index 11af93abf307..000000000000 --- a/dev-lang/nim/nim-1.6.4.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# 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 -} diff --git a/dev-lang/nim/nim-1.6.6-r2.ebuild b/dev-lang/nim/nim-1.6.6-r2.ebuild deleted file mode 100644 index 79f9edc5c376..000000000000 --- a/dev-lang/nim/nim-1.6.6-r2.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2022 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="debug 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:"$(usex debug debug 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 -} diff --git a/dev-lang/nim/nim-1.6.8.ebuild b/dev-lang/nim/nim-1.6.6-r3.ebuild index 00b90b784ff9..6314b192e44d 100644 --- a/dev-lang/nim/nim-1.6.8.ebuild +++ b/dev-lang/nim/nim-1.6.6-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,15 +10,15 @@ 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 + 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="debug experimental" +IUSE="experimental" RESTRICT="test" # need to sort out depends and numerous failures # BDEPEND="sys-process/parallel" @@ -49,7 +49,7 @@ nim_gen_config() { gcc.cpp.options.linker:"${LDFLAGS}" $([[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] && echo '--colors:"off"') - -d:"$(usex debug debug release)" + -d:"release" --parallelBuild:"$(makeopts_jobs)" EOF } @@ -58,7 +58,7 @@ src_prepare() { default # note: there are consumers in the ::guru overlay - use experimental && eapply "${WORKDIR}"/${PN}-patches-1.6.6 + use experimental && eapply "${WORKDIR}"/${PN}-patches-${PV} } src_configure() { diff --git a/dev-lang/nim/nim-1.6.10.ebuild b/dev-lang/nim/nim-1.6.8-r1.ebuild index 00b90b784ff9..4634c652fad3 100644 --- a/dev-lang/nim/nim-1.6.10.ebuild +++ b/dev-lang/nim/nim-1.6.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="debug experimental" +IUSE="experimental" RESTRICT="test" # need to sort out depends and numerous failures # BDEPEND="sys-process/parallel" @@ -49,7 +49,7 @@ nim_gen_config() { gcc.cpp.options.linker:"${LDFLAGS}" $([[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] && echo '--colors:"off"') - -d:"$(usex debug debug release)" + -d:"release" --parallelBuild:"$(makeopts_jobs)" EOF } |