summaryrefslogtreecommitdiff
path: root/dev-lang
diff options
context:
space:
mode:
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/Manifest.gzbin19506 -> 19514 bytes
-rw-r--r--dev-lang/eisl/Manifest4
-rw-r--r--dev-lang/eisl/eisl-2.69.ebuild (renamed from dev-lang/eisl/eisl-2.67.ebuild)2
-rw-r--r--dev-lang/nim/Manifest10
-rw-r--r--dev-lang/nim/files/nim-sets.conf5
-rw-r--r--dev-lang/nim/nim-1.6.10-r2.ebuild136
-rw-r--r--dev-lang/nim/nim-1.6.4.ebuild92
-rw-r--r--dev-lang/nim/nim-1.6.6-r2.ebuild106
-rw-r--r--dev-lang/nim/nim-1.6.6-r3.ebuild (renamed from dev-lang/nim/nim-1.6.10.ebuild)12
-rw-r--r--dev-lang/nim/nim-1.6.8-r1.ebuild (renamed from dev-lang/nim/nim-1.6.8.ebuild)6
-rw-r--r--dev-lang/tcc/Manifest4
-rw-r--r--dev-lang/tcc/tcc-0.9.27_p20211022.ebuild5
-rw-r--r--dev-lang/tcc/tcc-9999.ebuild7
13 files changed, 169 insertions, 220 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index a88103e11ff9..5a92c34835bd 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
Binary files differ
diff --git a/dev-lang/eisl/Manifest b/dev-lang/eisl/Manifest
index 8b7df1650a0b..de6564b13078 100644
--- a/dev-lang/eisl/Manifest
+++ b/dev-lang/eisl/Manifest
@@ -2,8 +2,8 @@ AUX eisl-2.63-Makefile.patch 996 BLAKE2B 972f8fd7d0005a97d9390be4957a46b2f36881e
AUX eisl-2.67-Makefile.patch 981 BLAKE2B f237f8757f527e8d2e3fb9a207cb0ccbc94427c77b0c0a0df12cea5f32ea8975277a427a017e32071c3dd050596fa3c4719068bebd00a16080ba01199b750537 SHA512 eedc5921f166093d48ed62718028bfca76962b6525d17c9cf2e392942b313bcd5b07a6ceb2782cfaa7e0065e37c68a0d21f546586fa61cb53b0f6b5d56d96502
DIST eisl-2.63.tar.gz 2004974 BLAKE2B f563c28ebfa6f45b1d5ace1087646fa63e99b98a6f44f42ed74f2bc4d7e29083bc1ad6c4e5234b5cdaf391fd07900fb309c153107a12e553b7636f978084a776 SHA512 fb2cead1cddb98ce63d471ef04f31cda3a8426d627f7d333fa5dc74401a075d923060dfb98ee9d399116535632983e649f2a99440157825f0528da03dae5d051
DIST eisl-2.65.tar.gz 2025074 BLAKE2B d4703b696ea28dd5113dba199ccaf6a37955ca27297efaff4fc7c575fb94d0adfca1a3ae3b2f2baa8fc17ab04cc1b0a5ee0eb2059743a0828b81d6a324a574ce SHA512 7e2f64b37211b119e8a12975403ceec7b0861826a5de0c5e776f1140323f5ee73c75443f2e3438dda4d4cf7e1a8738c6883b1ab6d579558813fa5ddbc6be7898
-DIST eisl-2.67.tar.gz 2123775 BLAKE2B 317440287e331eb4b4994fb17abe3ab2750410b8984a42760901fce6eedac895b3feca1f5ace709b59f78b5f4a71afe8bf13a6a9df36bcb583486d377b12149f SHA512 8c5262eb945a96f08b2c9f0211b78ddc1251af2024f807cc0d6277795ee5231313594bf267efcf59f10b302dd1e67cb8a8e0978d5de9c0154b369694696f8a85
+DIST eisl-2.69.tar.gz 2124476 BLAKE2B 8aa1c63f669f7fc04ca9d3f751cb298d3499d52007ccee7f6bc7d1a0cf6d4539e6d6dd9e76d2fa2ff887a26235ffcaa545d59d2c6c045b8d5f44913798e683af SHA512 3131f917408f768df51f488aadcc168705c118970a984ba5d72a5beb1a39cdd1327d3bc282108ec865df75110ef97c7f25ecfccf3fd552b5cdb0539ca3ca33b5
EBUILD eisl-2.63.ebuild 874 BLAKE2B 10e2619ab900d581161d371bbe4aefc24752216f814aba28c65ac0b98f3eba2b007ed330183e7b2b72f3cbe197f4521e022aff90ee2755195ea033c71f7b6a2b SHA512 69435c9bd770e4f356d8e3861dcfd8c83779e1ac4e925e4dd808fad542b37f2a97688e4f99a4e3d5b174053261157e3cdc05c8c2e697dfe3c27a89b357bc4484
EBUILD eisl-2.65.ebuild 880 BLAKE2B 1930928d50094260796379906e7b0b4daf9b78036f0dc5a05de8068797ddb0548ccb575dc1e89be78122c979adb8d91ecd1e465af07b709a7fdaa3657f013d3c SHA512 4e1c465a1ea0a72521adf4dedb878148d75aabdb515eeeaaea9a8805e20105e2a14e7e46d6089dfc3795828038c32e0dfaca35206f7d350c65550673b11bbe06
-EBUILD eisl-2.67.ebuild 874 BLAKE2B de0deca1b9189f01308d8cfceea57d6974245b162345ef10fa0ba0b9fe8ece14fa2de485dc3185094a569528b298efe0a9929480588f95f155b20eab46681c94 SHA512 dac188cbac69da559a3fcd6efbd4d8c95fa93cf8b95b9b107de5c2c48b22cec82c8a32493bc2e8d352786c917bc59f97e50cfc9b3edf77fdb5d2167fe5273b07
+EBUILD eisl-2.69.ebuild 880 BLAKE2B 6b593c8a07e1959a701ac46d2f8458d6ef95286e5cd69e4108cf8f05c2dd1eafa4b632b3af250f4bb4d24813ce94bf48b9623064238766b2bd653d76e5a0514f SHA512 c5e6c7bf69fc643edc8a1917d98054b960983a4f53397e9d02da2447dfda0471ff250cda650b3623cf5dd6d9da32e5bcb628b84e911fbb4c837d3abf9dbd9c27
MISC metadata.xml 631 BLAKE2B fd171b07cf1f7beae7be774a5da360d466c83f01a6bd52dc69af436926ae5aebec27a2723c11498be21c4f96f6b82c6aa3571f4b84e763459ef78086450252f2 SHA512 dd9e329f24ce6d3922e92e81d36234b93151f71c88d6ba4b38557565a7c1c3bc4b7172d4d55f1d2d5bd6c5cada449691067cc71abd4d456941f6a8b78fe0df87
diff --git a/dev-lang/eisl/eisl-2.67.ebuild b/dev-lang/eisl/eisl-2.69.ebuild
index 90b033daee8b..97bd3630d4a3 100644
--- a/dev-lang/eisl/eisl-2.67.ebuild
+++ b/dev-lang/eisl/eisl-2.69.ebuild
@@ -20,7 +20,7 @@ DOCS=( README{,-ja}.md documents )
RDEPEND="sys-libs/ncurses:="
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.67-Makefile.patch )
src_compile() {
emake CC="$(tc-getCC)" clean edlis eisl
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.10.ebuild b/dev-lang/nim/nim-1.6.6-r3.ebuild
index 00b90b784ff9..6314b192e44d 100644
--- a/dev-lang/nim/nim-1.6.10.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.8.ebuild b/dev-lang/nim/nim-1.6.8-r1.ebuild
index 00b90b784ff9..4634c652fad3 100644
--- a/dev-lang/nim/nim-1.6.8.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
}
diff --git a/dev-lang/tcc/Manifest b/dev-lang/tcc/Manifest
index 2a2ace469ca5..580a060ae944 100644
--- a/dev-lang/tcc/Manifest
+++ b/dev-lang/tcc/Manifest
@@ -1,4 +1,4 @@
DIST tcc-0.9.27_p20211022.tar.gz 893631 BLAKE2B f1a82498db65a9944f04a6c35897db6ceeea0e5d14ac383acc6b334fb2aa921a0e7b4badf647c101d064ceae1ee8d79ab91674a2d0faa2899b831a57e6148174 SHA512 5f40a0d31d63e876d1fb233758d9f58be2f14807bbc0847b7df3eb6bb8df0946100b58edb5a29caea8770201d02275daf0a3ca7668141151e931204ad7100fb3
-EBUILD tcc-0.9.27_p20211022.ebuild 2021 BLAKE2B b3f991ab2b3554d71645b813befa48536811132d5059dfdb5fd5ea3301ff7f62c7a19ac75cca6011a043dc620aa149e8812895a66d782c64b3cd10dae69cb6de SHA512 9a3a751d393b7cdf22e856e8b846657f2685b527c254f2d20ac13507b20317e6000d6f27281621d2833f97e17147402c0e6a2f10924848255fedba34d53c4857
-EBUILD tcc-9999.ebuild 2007 BLAKE2B 7b1b313b68d691c8c2ef3858aad9a2c9a997d0bf599cc3bc5866225f55153cd1fc7096f98b0814deaf14c5ab2b19020296c93b37208dfb076afa0e981ae5b511 SHA512 f6bb17a06beae9bfee1535f0b8e515cffc34408f816e6b5118f096ae7415b22e3aea78a55a77a45442ebef18c98e629f82afb4db58c7fbf2f72acdbcab4071f2
+EBUILD tcc-0.9.27_p20211022.ebuild 2105 BLAKE2B 8772fda997fd49f893eb501ac5621cec7a6472663ea624a3fb1b6b96d14d58cd0f13b5dc07d77506ca775dbd1aff87a6d5d6d31527f16e578d3424b0ae659dc5 SHA512 80dbe0828c10ed86914a6362db875d8b480d5c290053f758d935e6e7f73c31bf172bd7dfac4484542d144ff2f56f4e250eee561cfc3cee3b864a0908cbec20ca
+EBUILD tcc-9999.ebuild 2105 BLAKE2B 8772fda997fd49f893eb501ac5621cec7a6472663ea624a3fb1b6b96d14d58cd0f13b5dc07d77506ca775dbd1aff87a6d5d6d31527f16e578d3424b0ae659dc5 SHA512 80dbe0828c10ed86914a6362db875d8b480d5c290053f758d935e6e7f73c31bf172bd7dfac4484542d144ff2f56f4e250eee561cfc3cee3b864a0908cbec20ca
MISC metadata.xml 241 BLAKE2B ac22a6a72982cebf268e9d367947dc556420370c70b1f6e26531950f7f2c89734cd293fad93dfea0345fd020a97b8f9304c1362a2ccd6225b22aac1f7b674b17 SHA512 b59cc421f52bc545bc8667dcbf6b4891e29180ef1984596ccc20886071e5f080bed259026c2831c6418131802b93ad945137fe4406d042feb02d9bfdc14c431c
diff --git a/dev-lang/tcc/tcc-0.9.27_p20211022.ebuild b/dev-lang/tcc/tcc-0.9.27_p20211022.ebuild
index f99fb69925e6..a6f9afd599ac 100644
--- a/dev-lang/tcc/tcc-0.9.27_p20211022.ebuild
+++ b/dev-lang/tcc/tcc-0.9.27_p20211022.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
@@ -45,6 +45,9 @@ src_prepare() {
}' examples/ex*.c || die
sed -i -e '1s/$/ -lX11/' examples/ex4.c || die
+ # bug 888115
+ sed -i -e "s|/usr/local/bin/tcc|/usr/bin/tcc|g" tcc-doc.texi || die
+
# Fix texi2html invocation
sed -i -e 's/-number//' Makefile || die
sed -i -e 's/--sections//' Makefile || die
diff --git a/dev-lang/tcc/tcc-9999.ebuild b/dev-lang/tcc/tcc-9999.ebuild
index ebcf4086791e..a6f9afd599ac 100644
--- a/dev-lang/tcc/tcc-9999.ebuild
+++ b/dev-lang/tcc/tcc-9999.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
@@ -22,7 +22,7 @@ fi
LICENSE="LGPL-2.1"
SLOT="0"
if [[ ${PV} != *9999* ]] ; then
- KEYWORDS="~amd64 ~x86 ~amd64-linux"
+ KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux"
fi
BDEPEND="dev-lang/perl" # doc generation
@@ -45,6 +45,9 @@ src_prepare() {
}' examples/ex*.c || die
sed -i -e '1s/$/ -lX11/' examples/ex4.c || die
+ # bug 888115
+ sed -i -e "s|/usr/local/bin/tcc|/usr/bin/tcc|g" tcc-doc.texi || die
+
# Fix texi2html invocation
sed -i -e 's/-number//' Makefile || die
sed -i -e 's/--sections//' Makefile || die