From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 44BD715800A for ; Tue, 17 Dec 2024 20:59:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32622E0824; Tue, 17 Dec 2024 20:59:56 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 30C20E0824 for ; Tue, 17 Dec 2024 20:59:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C22E134072E for ; Tue, 17 Dec 2024 20:59:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1AC36159E for ; Tue, 17 Dec 2024 20:59:52 +0000 (UTC) From: "Eric Joldasov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Eric Joldasov" Message-ID: <1734469141.2092a860d555ab358ba5edd031f3114f4222ed57.bratishkaerik@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-zig/zls/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-zig/zls/Manifest dev-zig/zls/zls-0.13.0.ebuild dev-zig/zls/zls-9999.ebuild X-VCS-Directories: dev-zig/zls/ X-VCS-Committer: bratishkaerik X-VCS-Committer-Name: Eric Joldasov X-VCS-Revision: 2092a860d555ab358ba5edd031f3114f4222ed57 X-VCS-Branch: dev Date: Tue, 17 Dec 2024 20:59:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e0e861fc-395f-4153-9e1a-b7d67d260525 X-Archives-Hash: feafb2c53064c946c381abcbbebf0865 commit: 2092a860d555ab358ba5edd031f3114f4222ed57 Author: Eric Joldasov landless-city net> AuthorDate: Tue Dec 17 20:58:57 2024 +0000 Commit: Eric Joldasov getgoogleoff me> CommitDate: Tue Dec 17 20:59:01 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2092a860 dev-zig/zls: drop 0.13.0 Signed-off-by: Eric Joldasov landless-city.net> dev-zig/zls/Manifest | 1 - dev-zig/zls/zls-0.13.0.ebuild | 160 ------------------------------------------ dev-zig/zls/zls-9999.ebuild | 1 + 3 files changed, 1 insertion(+), 161 deletions(-) diff --git a/dev-zig/zls/Manifest b/dev-zig/zls/Manifest index 5ab1e76c9..655e662e5 100644 --- a/dev-zig/zls/Manifest +++ b/dev-zig/zls/Manifest @@ -4,6 +4,5 @@ DIST known_folders-12209cde192558f8b3dc098ac2330fc2a14fdd211c5433afd33085af75caa DIST tracy-f493d4aa8ba8141d9680473fad007d8a6348628e.tar.gz 5401470 BLAKE2B 8a027bfe82842d6d3caeddcf03499a3671a99f2210a40b434e9893a60da88775c19738230e8d55cb1de020fe9f0d7d414df76f36f4a55b04a0c41c8c0de8232b SHA512 e8a844ff015b4c7a261e3251be33deced4f4a29a8fc8254244c125b391266e7a38bdf8d988ff4aac10bd0ee5538fca1e274a0d91dcde08d0bd021006cb326e6f DIST zls-0.10.0-data-for-0.10.1.tar.xz 16668 BLAKE2B 76d6381ad09f050bccb468f2bbe3973d2059a8f09a22b39a76f0d959b46e5b72871e24267e03ae58d149628a5af728ed058e7be15c992dffc1f4072195b4beb4 SHA512 fe2ab662feee8e687a03497f7f383cf9edb2b2de7fce614f5138ead6fc45f337fd85e8cba0e352e6905618df43bae737977d70a783d4a3339e9df1f6bbe714c0 DIST zls-0.10.0.tar.gz 320226 BLAKE2B fc9c7c6e37d9347710520ddf0bc90b704ff6115210e044e68a973a2edefe024d14cf410ed0fe74400c1bed8b57f8316dc4298561f78de3abe112bc38df70404b SHA512 16a55ef0ecfac1bf43c4d917741db8389dc835cfdd9e78e9853180dad7218656c6a09b67b7185e7d87ccb2196a4deb457c3d476300eff01ce8c9bfab597576ad -DIST zls-0.13.0-deps.tar.xz 20824 BLAKE2B 8bb7a54311c3eeb38127bc7c2c3e961790d93d5d3bc00ddc725eac5a8bcbf338e58bea53224e857d7281b8ffd426976e9365c994479e5ca57cd0b1f5a234d896 SHA512 81da5f9d8abf7c20e00c3a326ac64e9fb36188404e632e3fc2b4cbab0632a03266745b7cb3e64ccea7b938af6ef0197d8ab2ef6f1211e487efd1b72651bbff60 DIST zls-0.13.0-version_data.tar.xz 14080 BLAKE2B af304ba9c6e1aa370a49254b88aa3209957c94b363bb9c2252bd7b066b6c2782c568bf2b61164d75e7aa08260dd3187e9417c583738ca41be0d2c0afd3b18cdf SHA512 8a79a5608d98619e6228bacdf929e1443814c7b37e131279ffc89066a1ae5ca00fa9edb8fe57145bd4044fc7d870893067605ec3ec0bc7fafb3145e6af159186 DIST zls-0.13.0.tar.gz 352025 BLAKE2B e244763f7270f25680b17f1c525f8ae7a268857d60393672ca1003518cf6d5ae243f384cf9d5d84f4eb27545f02dfe389c3068c5e6f91a2b3fa49df0fc4d89a9 SHA512 92b20418d1410f013ac3d4cbe432ab1b748454d013a2d1be5abd47b91ea7d2340d55b775a66eb116f4641e9f2fc3baf84a44ba8f58b1a774254e7428449bb088 diff --git a/dev-zig/zls/zls-0.13.0.ebuild b/dev-zig/zls/zls-0.13.0.ebuild deleted file mode 100644 index 45d25ec9a..000000000 --- a/dev-zig/zls/zls-0.13.0.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo - -DESCRIPTION="The officially unofficial Ziglang language server" -HOMEPAGE="https://github.com/zigtools/zls" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/zigtools/zls" - inherit git-r3 - - EZIG_MIN="9999" - EZIG_MAX_EXCLUSIVE="99991" - BDEPEND="dev-lang/zig:9999" -else - SRC_URI=" - https://github.com/zigtools/zls/archive/refs/tags/${PV}.tar.gz -> zls-${PV}.tar.gz - https://codeberg.org/BratishkaErik/distfiles/releases/download/zls-${PV}/zls-${PV}-deps.tar.xz - https://codeberg.org/BratishkaErik/distfiles/releases/download/zls-${PV}/zls-${PV}-version_data.tar.xz - " - KEYWORDS="~amd64" - - EZIG_MIN="0.13" - EZIG_MAX_EXCLUSIVE="0.14" - BDEPEND="|| ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} )" -fi - -LICENSE="MIT" -SLOT="0" - -RDEPEND="${BDEPEND}" - -DOCS=( README.md ) - -# see https://github.com/ziglang/zig/issues/3382 -# For now, Zig Build System doesn't support CFLAGS/LDFLAGS/etc. -QA_FLAGS_IGNORED="usr/bin/zls" - -# : copied from sys-fs/ncdu : -# Many thanks to Florian Schmaus (Flowdalic)! -# Adapted from https://github.com/gentoo/gentoo/pull/28986 -# Set the EZIG environment variable. -zig-set_EZIG() { - [[ -n ${EZIG} ]] && return - - if [[ -n ${EZIG_OVERWRITE} ]]; then - export EZIG="${EZIG_OVERWRITE}" - return - fi - - local candidates candidate selected selected_ver - - candidates=$(compgen -c zig-) - - for candidate in ${candidates}; do - if [[ ! ${candidate} =~ zig(-bin)?-([.0-9]+) ]]; then - continue - fi - - local ver - if (( ${#BASH_REMATCH[@]} == 3 )); then - ver="${BASH_REMATCH[2]}" - else - ver="${BASH_REMATCH[1]}" - fi - - if [[ -n ${EZIG_EXACT_VER} ]]; then - ver_test "${ver}" -ne "${EZIG_EXACT_VER}" && continue - - selected="${candidate}" - selected_ver="${ver}" - break - fi - - if [[ -n ${EZIG_MIN} ]] \ - && ver_test "${ver}" -lt "${EZIG_MIN}"; then - # Candidate does not satisfy EZIG_MIN condition. - continue - fi - - if [[ -n ${EZIG_MAX_EXCLUSIVE} ]] \ - && ver_test "${ver}" -ge "${EZIG_MAX_EXCLUSIVE}"; then - # Candidate does not satisfy EZIG_MAX_EXCLUSIVE condition. - continue - fi - - if [[ -n ${selected_ver} ]] \ - && ver_test "${selected_ver}" -gt "${ver}"; then - # Candidate is older than the currently selected candidate. - continue - fi - - selected="${candidate}" - selected_ver="${ver}" - done - - if [[ -z ${selected} ]]; then - die "Could not find (suitable) zig installation in PATH" - fi - - export EZIG="${selected}" - export EZIG_VER="${ver}" -} - -# Invoke zig with the optionally provided arguments. -ezig() { - zig-set_EZIG - - # Unfortunately, we cannot add more args here, since syntax is different - # for every subcommands. Yes, even target/cpu :( f.i. : - # -target/-mcpu for zig build-exe vs -Dtarget/-Dcpu for zig build- - # -OReleaseSafe for zig build-exe vs -DReleaseSafe for zig build - # (or even none, if hardcoded by upstream so choice is -Drelease=true/false) - # Ofc we can patch this, but still... - - edo "${EZIG}" "${@}" -} - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - - cd "${S}" || die - ezig build --fetch --global-cache-dir "${WORKDIR}/zig-eclass/" || die "Pre-fetching Zig modules failed" - local ZLS_GEN_FLAGS="--generate-version-data master --generate-version-data-path version_data.zig" - ezig build gen --verbose -- ${ZLS_GEN_FLAGS} || die "Pre-generating Zig version data failed" - else - default_src_unpack - fi -} - -src_configure() { - export ZBS_ARGS=( - --prefix usr/ - -Doptimize=ReleaseSafe - --system "${WORKDIR}/zig-eclass/p/" - -Dversion_data_file_path=version_data.zig - --verbose - ) -} - -src_compile() { - ezig build "${ZBS_ARGS[@]}" -} - -src_test() { - ezig build test "${ZBS_ARGS[@]}" -} - -src_install() { - DESTDIR="${ED}" ezig build install "${ZBS_ARGS[@]}" - einstalldocs -} - -pkg_postinst() { - elog "You can find more information about options here: https://github.com/zigtools/zls/wiki/Configuration" -} diff --git a/dev-zig/zls/zls-9999.ebuild b/dev-zig/zls/zls-9999.ebuild index 40f7c46cb..c468a8238 100644 --- a/dev-zig/zls/zls-9999.ebuild +++ b/dev-zig/zls/zls-9999.ebuild @@ -11,6 +11,7 @@ declare -g -r -A ZBS_DEPENDENCIES=( [known_folders-12209cde192558f8b3dc098ac2330fc2a14fdd211c5433afd33085af75caa9183147.tar.gz]='https://github.com/ziglibs/known-folders/archive/0ad514dcfb7525e32ae349b9acc0a53976f3a9fa.tar.gz' ) +# Sync with "minimum_build_zig_version" from upstream's "build.zig". if [[ ${PV} == 9999 ]]; then ZIG_SLOT="9999"