summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Barć <xgqt@gentoo.org>2024-06-17 15:42:59 +0200
committerMaciej Barć <xgqt@gentoo.org>2024-06-17 22:42:58 +0200
commit97623a9f6c11a8fe3136c3995653e172939a761a (patch)
tree9f74306e3ba6dc999882ab3c061bb9c45fa737e8 /dev-lang
parentmedia-sound/pavucontrol-qt: add 2.0.0 (diff)
downloadgentoo-97623a9f6c11a8fe3136c3995653e172939a761a.tar.gz
gentoo-97623a9f6c11a8fe3136c3995653e172939a761a.tar.bz2
gentoo-97623a9f6c11a8fe3136c3995653e172939a761a.zip
dev-lang/nim: drop old 1.6.14-r1
Closes: https://bugs.gentoo.org/900881 Signed-off-by: Maciej Barć <xgqt@gentoo.org>
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/nim/Manifest2
-rw-r--r--dev-lang/nim/files/nim-0.20.0-paths.patch36
-rw-r--r--dev-lang/nim/files/nim-1.6.14-clang16-musl-fix.patch13
-rw-r--r--dev-lang/nim/files/nim-1.6.14-testament-skipfile.txt61
-rw-r--r--dev-lang/nim/files/nim-1.6.6-csources-flags.patch11
-rw-r--r--dev-lang/nim/metadata.xml1
-rw-r--r--dev-lang/nim/nim-1.6.14-r1.ebuild211
7 files changed, 0 insertions, 335 deletions
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index 62f7ed856e14..68a08b1bb1b5 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,4 +1,2 @@
-DIST nim-1.6.14.tar.xz 5266632 BLAKE2B f6eadf44365a099f45d1b734dea494e5d098b0427791c19a5e0b7ee6fa8069fee606005920cbcbfd7c88a36ace870949ff797d1e37fc1f84e14d5dd1aeb4bd1d SHA512 6923ea98627ea48b5c939438618caa8e6860f248086e43bc101b543aa78e7c475bc8e56b8acb90dc4a3771ca0d2e27fbdda6a0b477dbb906acda8a7b39c272d3
DIST nim-2.0.4.tar.xz 7620508 BLAKE2B cf7c737d734c5a468ac9229fb021bcd252c5c4f20ab091ec0ce27eb36ba44be8b438536aa39aa8c583483a7ce15dfbb91b1deb1c19794b3d77506d23096a4460 SHA512 1918b3d4a4fc02714677b2ca5051dc69e1d1daead2cf4dcc9b997076540d07d58ee4fe3049de86a37faa3143de1d3b95bedfa31f31d8463987bb267107459793
DIST nim-atlas-0.8.0.tar.gz 59097 BLAKE2B 231b238ac3b15cc2c2d9ad927f80ae72d8ae4c649277515f32df6cc04275ccd38db5307d627572af547501e6522c06c86dc279dc3e13b5385f14e24032f6fe69 SHA512 747c13e2c5bd45a1dc6c1426f8c7637f638ada9dd4c9aa3edf4ef8367060e73226dc4bcde6380fac25ed47ebf4097fd223c72fadc3cceba8c71dd0f0571e47eb
-DIST nim-patches-1.6.6_p1.tar.gz 2632 BLAKE2B 64980d9510dc48e3c566473dc618d00cafba04783882d62b12015e8435c9c0515d7726da30f0b74dca6a41aa88a9c9aed2189a65b3325c28839d0051de8a3365 SHA512 7ba251675cd564452669bf5ec3748565db818324f58506f20a5036e4b54df10f4d7c149cece8cb97c853222cfa7d4d8d26856d92aaa25e613e31c6f5c2a8243d
diff --git a/dev-lang/nim/files/nim-0.20.0-paths.patch b/dev-lang/nim/files/nim-0.20.0-paths.patch
deleted file mode 100644
index a314eae2299b..000000000000
--- a/dev-lang/nim/files/nim-0.20.0-paths.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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/files/nim-1.6.14-clang16-musl-fix.patch b/dev-lang/nim/files/nim-1.6.14-clang16-musl-fix.patch
deleted file mode 100644
index 1bc4f8f25d55..000000000000
--- a/dev-lang/nim/files/nim-1.6.14-clang16-musl-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Bug: https://bugs.gentoo.org/894410
-Refer: https://github.com/nim-lang/Nim/issues/20886#issuecomment-1511708198
---- a/lib/system/threadlocalstorage.nim
-+++ b/lib/system/threadlocalstorage.nim
-@@ -129,7 +129,7 @@ else:
- when (defined(linux) or defined(nintendoswitch)) and defined(amd64):
- type
- SysThread* {.importc: "pthread_t",
-- header: "<sys/types.h>" .} = distinct culong
-+ header: "<sys/types.h>" .} = distinct pointer
- Pthread_attr {.importc: "pthread_attr_t",
- header: "<sys/types.h>".} = object
- abi: array[56 div sizeof(clong), clong]
diff --git a/dev-lang/nim/files/nim-1.6.14-testament-skipfile.txt b/dev-lang/nim/files/nim-1.6.14-testament-skipfile.txt
deleted file mode 100644
index 2e7e0b48f9fc..000000000000
--- a/dev-lang/nim/files/nim-1.6.14-testament-skipfile.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-# broken
-tests/assert/tassert_c.nim
-tests/async/tasync_traceback.nim
-tests/coroutines/twait.nim
-tests/errmsgs/t14444.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/js/tmangle.nim
-tests/js/twritestacktrace.nim
-tests/lent/tbasic_lent_check.nim
-tests/misc/trunner.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/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/files/nim-1.6.6-csources-flags.patch b/dev-lang/nim/files/nim-1.6.6-csources-flags.patch
deleted file mode 100644
index 9a39a900e82a..000000000000
--- a/dev-lang/nim/files/nim-1.6.6-csources-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build.sh
-+++ b/build.sh
-@@ -60,7 +60,7 @@
- fi
- CC="sem -j $parallel --id $$ ${CC}"
- fi
--COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -fmax-errors=3 -O3 -fno-strict-aliasing -fno-ident $extraBuildArgs"
-+COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -fmax-errors=3 -fno-strict-aliasing -fno-ident $extraBuildArgs"
- LINK_FLAGS="${LDFLAGS:-} "
- PS4=""
- # platform detection
diff --git a/dev-lang/nim/metadata.xml b/dev-lang/nim/metadata.xml
index 43513b90b646..b2fef7a3d52d 100644
--- a/dev-lang/nim/metadata.xml
+++ b/dev-lang/nim/metadata.xml
@@ -41,7 +41,6 @@
<remote-id type="github">nim-lang/Nim</remote-id>
</upstream>
<use>
- <flag name="experimental">Apply experimental patches</flag>
<flag name="test-js">Enable tests that require Node.js</flag>
</use>
</pkgmetadata>
diff --git a/dev-lang/nim/nim-1.6.14-r1.ebuild b/dev-lang/nim/nim-1.6.14-r1.ebuild
deleted file mode 100644
index 07e043cf4ffb..000000000000
--- a/dev-lang/nim/nim-1.6.14-r1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2024 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}
-
- # refer: https://github.com/nim-lang/Nim/issues/20886#issuecomment-1511708198
- # bug: https://bugs.gentoo.org/894410
- use elibc_musl && eapply "${FILESDIR}"/${PN}-1.6.14-clang16-musl-fix.patch
-}
-
-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 parallel jobs"
- while [[ ! -f "bin/nim" ]] ; do
- sleep 3
- done
- sleep 10
- eend 0
-
- edo chmod +x ./bin/nim
- edo ./bin/nim compile koch
- edo ./koch boot -d:nimUseLinenoise --skipParentCfg:off
- edo ./koch tools
-
- if use doc; then
- local -a docargs=(
- # set git tag
- --git.commit:v${PV}
- # skip runnableExamples as some of them need net
- --docCmd:skip
- # make logs less verbose
- --hints:off
- --warnings:off
- )
- edo ./koch doc "${docargs[@]}"
- HTML_DOCS=( web/upload/${PV}/. )
- fi
-}
-
-src_test() {
- local -x PATH="${S}/bin:${PATH}"
- local -a nimflags=(
- # Leave only the safe hints enabled.
- --hint:all:off
- --hint:User:on
- --hint:UserRaw:on
- )
- local -a testament_args=(
- --skipFrom:"${FILESDIR}/${PN}-1.6.14-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 | ic | valgrind )
- einfo "Skipped 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}"
- 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
-}