[gentoo-commits] repo/proj/guru:master commit in: dev-zig/zls/

[gentoo-commits] repo/proj/guru:master commit in: dev-zig/zls/

[Arthur Zamarin]

commit:     eaad72328d91430a3ca4ecdc86b06b135c5efecd
Author:     Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Fri Nov  4 17:19:35 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Nov  4 17:19:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=eaad7232

dev-zig/zls: new package, add 9999

Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>

 dev-zig/zls/metadata.xml    | 12 ++++++++++++
 dev-zig/zls/zls-9999.ebuild | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/dev-zig/zls/metadata.xml b/dev-zig/zls/metadata.xml
new file mode 100644
index 000000000..f7d26335b
--- /dev/null
+++ b/dev-zig/zls/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bratishkaerik@getgoogleoff.me</email>
+		<name>Eric Joldasov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">zigtools/zls</remote-id>
+		<bugs-to>https://github.com/zigtools/zls/issues</bugs-to>
+	</upstream>
+</pkgmetadata>

diff --git a/dev-zig/zls/zls-9999.ebuild b/dev-zig/zls/zls-9999.ebuild
new file mode 100644
index 000000000..bbb09a80b
--- /dev/null
+++ b/dev-zig/zls/zls-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit git-r3
+
+EGIT_REPO_URI="https://github.com/zigtools/zls"
+
+HOMEPAGE="https://github.com/zigtools/zls"
+DESCRIPTION="Zig LSP implementation + Zig Language Server"
+
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="~dev-lang/zig-9999"
+RDEPEND="${DEPEND}"
+
+# see https://github.com/ziglang/zig/issues/3382
+# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
+QA_FLAGS_IGNORED="usr/bin/zls"
+
+src_compile() {
+	zig build -Drelease-safe -Ddata_version=master --verbose || die
+}
+
+src_test() {
+	zig build test -Drelease-safe -Ddata_version=master --verbose || die
+}
+
+src_install() {
+	DESTDIR="${ED}" zig build install --prefix /usr -Drelease-safe -Ddata_version=master --verbose || die
+	dodoc README.md
+}
+
+pkg_postinst() {
+	elog "For creating or updating config run this command: zls --config"
+	elog "You can find more information about options here https://github.com/zigtools/zls#configuration-options"
+}

[gentoo-commits] repo/proj/guru:master commit in: dev-zig/zls/

[Viorel Munteanu]

commit:     33eb55c86bb93bebc9bec123f3e47671142033cf
Author:     Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Sun Feb  5 11:56:01 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Feb  5 11:56:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=33eb55c8

dev-zig/zls: update to latest master Zig

Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>

 dev-zig/zls/zls-9999.ebuild | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/dev-zig/zls/zls-9999.ebuild b/dev-zig/zls/zls-9999.ebuild
index bbb09a80b..b61f8139d 100644
--- a/dev-zig/zls/zls-9999.ebuild
+++ b/dev-zig/zls/zls-9999.ebuild
@@ -8,7 +8,7 @@ inherit git-r3
 EGIT_REPO_URI="https://github.com/zigtools/zls"
 
 HOMEPAGE="https://github.com/zigtools/zls"
-DESCRIPTION="Zig LSP implementation + Zig Language Server"
+DESCRIPTION="The officially unofficial Ziglang language server"
 
 LICENSE="MIT"
 SLOT="0"
@@ -17,23 +17,22 @@ DEPEND="~dev-lang/zig-9999"
 RDEPEND="${DEPEND}"
 
 # see https://github.com/ziglang/zig/issues/3382
-# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
+# For now, Zig Build System doesn't support CFLAGS/LDFLAGS/etc.
 QA_FLAGS_IGNORED="usr/bin/zls"
 
 src_compile() {
-	zig build -Drelease-safe -Ddata_version=master --verbose || die
+	zig build -Doptimize=ReleaseSafe -Ddata_version=master --verbose || die
 }
 
 src_test() {
-	zig build test -Drelease-safe -Ddata_version=master --verbose || die
+	zig build test -Doptimize=ReleaseSafe -Ddata_version=master --verbose || die
 }
 
 src_install() {
-	DESTDIR="${ED}" zig build install --prefix /usr -Drelease-safe -Ddata_version=master --verbose || die
+	DESTDIR="${ED}" zig build install --prefix /usr -Doptimize=ReleaseSafe -Ddata_version=master --verbose || die
 	dodoc README.md
 }
 
 pkg_postinst() {
-	elog "For creating or updating config run this command: zls --config"
 	elog "You can find more information about options here https://github.com/zigtools/zls#configuration-options"
 }

[gentoo-commits] repo/proj/guru:master commit in: dev-zig/zls/

[Viorel Munteanu]

commit:     873168168d68c015588118828bde624f9a00f960
Author:     Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Thu Mar  9 13:55:19 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Mar  9 14:13:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=87316816

dev-zig/zls: adjust ebuild (0.10.0) for slotted Zig

Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>

 dev-zig/zls/zls-0.10.0-r1.ebuild | 141 +++++++++++++++++++++++++++++++++++++++
 dev-zig/zls/zls-0.10.0.ebuild    |  56 ----------------
 2 files changed, 141 insertions(+), 56 deletions(-)

diff --git a/dev-zig/zls/zls-0.10.0-r1.ebuild b/dev-zig/zls/zls-0.10.0-r1.ebuild
new file mode 100644
index 000000000..da659404c
--- /dev/null
+++ b/dev-zig/zls/zls-0.10.0-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 2022-2023 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"
+
+KNOWN_FOLDERS_COMMIT="24845b0103e611c108d6bc334231c464e699742c"
+TRACY_COMMIT="f493d4aa8ba8141d9680473fad007d8a6348628e"
+SRC_URI="
+	https://github.com/ziglibs/known-folders/archive/${KNOWN_FOLDERS_COMMIT}.tar.gz -> known-folders-${KNOWN_FOLDERS_COMMIT}.tar.gz
+	https://github.com/wolfpld/tracy/archive/${TRACY_COMMIT}.tar.gz -> tracy-${TRACY_COMMIT}.tar.gz
+	https://github.com/zigtools/zls/archive/refs/tags/${PV}.tar.gz -> zls-${PV}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+EZIG_MIN="0.10"
+EZIG_MAX_EXCLUSIVE="0.11"
+
+DEPEND="|| ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} )"
+RDEPEND="${DEPEND}"
+
+# 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"
+
+PATCHES=(
+	"${FILESDIR}/zls-0.10.0-add-builtin-data-for-new-zig-versions.patch"
+)
+
+# : 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_prepare() {
+	rm -r src/known-folders || die
+	mv "../known-folders-${KNOWN_FOLDERS_COMMIT}" src/known-folders || die
+	rm -r src/tracy || die
+	mv "../tracy-${TRACY_COMMIT}" src/zinput || die
+
+	default
+}
+
+src_compile() {
+	ezig build -Drelease-safe -Ddata_version=0.10.0 --verbose || die
+}
+
+src_test() {
+	ezig build test -Drelease-safe -Ddata_version=0.10.0 --verbose || die
+}
+
+src_install() {
+	DESTDIR="${ED}" ezig build install --prefix /usr -Drelease-safe -Ddata_version=0.10.0 --verbose || die
+	dodoc README.md
+}
+
+pkg_postinst() {
+	elog "You can find more information about options here https://github.com/zigtools/zls#configuration-options"
+}

diff --git a/dev-zig/zls/zls-0.10.0.ebuild b/dev-zig/zls/zls-0.10.0.ebuild
deleted file mode 100644
index 3333f5a03..000000000
--- a/dev-zig/zls/zls-0.10.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-HOMEPAGE="https://github.com/zigtools/zls"
-DESCRIPTION="The officially unofficial Ziglang language server"
-
-KNOWN_FOLDERS_COMMIT="24845b0103e611c108d6bc334231c464e699742c"
-TRACY_COMMIT="f493d4aa8ba8141d9680473fad007d8a6348628e"
-SRC_URI="
-	https://github.com/ziglibs/known-folders/archive/${KNOWN_FOLDERS_COMMIT}.tar.gz -> known-folders-${KNOWN_FOLDERS_COMMIT}.tar.gz
-	https://github.com/wolfpld/tracy/archive/${TRACY_COMMIT}.tar.gz -> tracy-${TRACY_COMMIT}.tar.gz
-	https://github.com/zigtools/zls/archive/refs/tags/${PV}.tar.gz -> zls-${PV}.tar.gz
-"
-KEYWORDS="~amd64"
-
-LICENSE="MIT"
-SLOT="0"
-
-DEPEND="|| ( ~dev-lang/zig-0.10.1 ~dev-lang/zig-bin-0.10.1 )"
-RDEPEND="${DEPEND}"
-
-# 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"
-
-PATCHES=(
-	"${FILESDIR}/zls-0.10.0-add-builtin-data-for-new-zig-versions.patch"
-)
-
-src_prepare() {
-	rm -r src/known-folders || die
-	mv "../known-folders-${KNOWN_FOLDERS_COMMIT}" src/known-folders || die
-	rm -r src/tracy || die
-	mv "../tracy-${TRACY_COMMIT}" src/zinput || die
-
-	default
-}
-
-src_compile() {
-	zig build -Drelease-safe -Ddata_version=0.10.0 --verbose || die
-}
-
-src_test() {
-	zig build test -Drelease-safe -Ddata_version=0.10.0 --verbose || die
-}
-
-src_install() {
-	DESTDIR="${ED}" zig build install --prefix /usr -Drelease-safe -Ddata_version=0.10.0 --verbose || die
-	dodoc README.md
-}
-
-pkg_postinst() {
-	elog "You can find more information about options here https://github.com/zigtools/zls#configuration-options"
-}

[gentoo-commits] repo/proj/guru:master commit in: dev-zig/zls/

[Viorel Munteanu]

commit:     e8354425d475c98040823f67ac2faa3800d81870
Author:     Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Thu Mar  9 14:13:14 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Mar  9 14:13:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e8354425

dev-zig/zls: adjust ebuild (9999) for slotted Zig

Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>

 dev-zig/zls/zls-9999.ebuild | 99 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 91 insertions(+), 8 deletions(-)

diff --git a/dev-zig/zls/zls-9999.ebuild b/dev-zig/zls/zls-9999.ebuild
index 267e3221a..f38e48ae0 100644
--- a/dev-zig/zls/zls-9999.ebuild
+++ b/dev-zig/zls/zls-9999.ebuild
@@ -1,42 +1,125 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit git-r3
+inherit edo git-r3
 
 EGIT_REPO_URI="https://github.com/zigtools/zls"
 
-HOMEPAGE="https://github.com/zigtools/zls"
 DESCRIPTION="The officially unofficial Ziglang language server"
+HOMEPAGE="https://github.com/zigtools/zls"
 
 LICENSE="MIT"
 SLOT="0"
 
-DEPEND="~dev-lang/zig-9999"
+EZIG_MIN="9999"
+EZIG_MAX_EXCLUSIVE="99991"
+
+DEPEND="dev-lang/zig:${EZIG_MIN}"
 RDEPEND="${DEPEND}"
 
 # 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() {
 	git-r3_src_unpack
 	cd "${S}" || die
 	# "zig build" doesn't have "fetch" subcommand yet
-	zig build --help || die "Fetching Zig modules failed"
+	ezig build --help || die "Fetching Zig modules failed"
 }
 
 src_compile() {
-	zig build -Doptimize=ReleaseSafe -Ddata_version=master --verbose || die
+	ezig build -Doptimize=ReleaseSafe -Ddata_version=master --verbose || die
 }
 
 src_test() {
-	zig build test -Doptimize=ReleaseSafe -Ddata_version=master --verbose || die
+	ezig build test -Doptimize=ReleaseSafe -Ddata_version=master --verbose || die
 }
 
 src_install() {
-	DESTDIR="${ED}" zig build install --prefix /usr -Doptimize=ReleaseSafe -Ddata_version=master --verbose || die
+	DESTDIR="${ED}" ezig build install --prefix /usr -Doptimize=ReleaseSafe -Ddata_version=master --verbose || die
 	dodoc README.md
 }
 

[gentoo-commits] repo/proj/guru:master commit in: dev-zig/zls/

[David Roman]

commit:     0eb28c38bc75d8241423749cc2edad4cd8555673
Author:     Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Tue Aug 22 11:15:27 2023 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sat Aug 26 17:00:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0eb28c38

dev-zig/zls: fix for 9999

See upstream PR https://github.com/zigtools/zls/pull/1415 and
commit https://github.com/zigtools/zls/commit/f95a0efca127c01450cd3beaf35e407e6dc1ff35

Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>

 dev-zig/zls/zls-9999.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev-zig/zls/zls-9999.ebuild b/dev-zig/zls/zls-9999.ebuild
index f38e48ae05..fe83830faf 100644
--- a/dev-zig/zls/zls-9999.ebuild
+++ b/dev-zig/zls/zls-9999.ebuild
@@ -108,18 +108,20 @@ src_unpack() {
 	cd "${S}" || die
 	# "zig build" doesn't have "fetch" subcommand yet
 	ezig build --help || die "Fetching Zig modules failed"
+	local ZLS_GEN_FLAGS="--generate-version-data master --generate-version-data-path version_data_offline.zig"
+	ezig build gen --verbose -- ${ZLS_GEN_FLAGS} || die "Pre-generating Zig version data failed"
 }
 
 src_compile() {
-	ezig build -Doptimize=ReleaseSafe -Ddata_version=master --verbose || die
+	ezig build -Doptimize=ReleaseSafe -Dversion_data_file_path=version_data_offline.zig --verbose || die
 }
 
 src_test() {
-	ezig build test -Doptimize=ReleaseSafe -Ddata_version=master --verbose || die
+	ezig build test -Doptimize=ReleaseSafe -Dversion_data_file_path=version_data_offline.zig --verbose || die
 }
 
 src_install() {
-	DESTDIR="${ED}" ezig build install --prefix /usr -Doptimize=ReleaseSafe -Ddata_version=master --verbose || die
+	DESTDIR="${ED}" ezig build install --prefix /usr -Doptimize=ReleaseSafe -Dversion_data_file_path=version_data_offline.zig --verbose || die
 	dodoc README.md
 }
 

[gentoo-commits] repo/proj/guru:master commit in: dev-zig/zls/

[Rui Huang]

commit:     5de3d475f386f7fe7f8d9c23b2e3e5b11dc48dce
Author:     Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Tue Oct 10 02:43:11 2023 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Tue Oct 10 02:43:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5de3d475

dev-zig/zls: sync 9999 with latest Zig 9999 changes

Related: https://github.com/ziglang/zig/pull/17392 .

Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>

 dev-zig/zls/zls-9999.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-zig/zls/zls-9999.ebuild b/dev-zig/zls/zls-9999.ebuild
index fe83830faf..ef9785f27b 100644
--- a/dev-zig/zls/zls-9999.ebuild
+++ b/dev-zig/zls/zls-9999.ebuild
@@ -106,8 +106,7 @@ ezig() {
 src_unpack() {
 	git-r3_src_unpack
 	cd "${S}" || die
-	# "zig build" doesn't have "fetch" subcommand yet
-	ezig build --help || die "Fetching Zig modules failed"
+	ezig build --fetch || die "Fetching Zig modules failed"
 	local ZLS_GEN_FLAGS="--generate-version-data master --generate-version-data-path version_data_offline.zig"
 	ezig build gen --verbose -- ${ZLS_GEN_FLAGS} || die "Pre-generating Zig version data failed"
 }

[gentoo-commits] repo/proj/guru:master commit in: dev-zig/zls/

[Lucio Sauer]

commit:     821d74545ddbc7d3a5278fe2a9b8990c0981124d
Author:     Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Wed Jul 31 19:07:27 2024 +0000
Commit:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Wed Jul 31 19:07:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=821d7454

dev-zig/zls: update link to configuration options in tip for 9999

Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>

 dev-zig/zls/zls-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-zig/zls/zls-9999.ebuild b/dev-zig/zls/zls-9999.ebuild
index ef9785f27..d5b61e56a 100644
--- a/dev-zig/zls/zls-9999.ebuild
+++ b/dev-zig/zls/zls-9999.ebuild
@@ -125,5 +125,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "You can find more information about options here https://github.com/zigtools/zls#configuration-options"
+	elog "You can find more information about options here: https://github.com/zigtools/zls/wiki/Configuration"
 }

[gentoo-commits] repo/proj/guru:master commit in: dev-zig/zls/

[Lucio Sauer]

commit:     2afc5e89f06a2d9d3310e84cfdcdef0a1908cbb0
Author:     Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Wed Jul 31 19:26:35 2024 +0000
Commit:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Wed Jul 31 19:31:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2afc5e89

dev-zig/zls: add 0.12.0

Bug: https://bugs.gentoo.org/918715

Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>

 dev-zig/zls/Manifest          |   3 +
 dev-zig/zls/zls-0.12.0.ebuild | 136 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 139 insertions(+)

diff --git a/dev-zig/zls/Manifest b/dev-zig/zls/Manifest
index 1bb0f6d7b..26493cccf 100644
--- a/dev-zig/zls/Manifest
+++ b/dev-zig/zls/Manifest
@@ -1,3 +1,6 @@
 DIST known-folders-24845b0103e611c108d6bc334231c464e699742c.tar.gz 6618 BLAKE2B cdfe56329edcf50a07eea919b1a753ce965eeaa3c1d9e08289d74704809e489a7a674fb41c0fa16115a406512477cfa99953d434d44c52429c241df7e7bb4f1d SHA512 4ac156ad51793a733d8fd5a24936bd7b0bb8a527b9d19d9cb7d43c9ec7ac983f37dfc00fdfec23147964689201cdbee213e66b4af0917b0bb324b02e8a3a7151
 DIST tracy-f493d4aa8ba8141d9680473fad007d8a6348628e.tar.gz 5401470 BLAKE2B 8a027bfe82842d6d3caeddcf03499a3671a99f2210a40b434e9893a60da88775c19738230e8d55cb1de020fe9f0d7d414df76f36f4a55b04a0c41c8c0de8232b SHA512 e8a844ff015b4c7a261e3251be33deced4f4a29a8fc8254244c125b391266e7a38bdf8d988ff4aac10bd0ee5538fca1e274a0d91dcde08d0bd021006cb326e6f
 DIST zls-0.10.0.tar.gz 320226 BLAKE2B fc9c7c6e37d9347710520ddf0bc90b704ff6115210e044e68a973a2edefe024d14cf410ed0fe74400c1bed8b57f8316dc4298561f78de3abe112bc38df70404b SHA512 16a55ef0ecfac1bf43c4d917741db8389dc835cfdd9e78e9853180dad7218656c6a09b67b7185e7d87ccb2196a4deb457c3d476300eff01ce8c9bfab597576ad
+DIST zls-0.12.0-deps.tar.xz 20804 BLAKE2B 94a01028a56a4e5f692301435619c9132a70bd28b1ec78d381519108c6b6878fcf0d085080406b6855cdc68f5ac79b7e5eb0320747579b752cb2f2d79f89b89a SHA512 786dca28b56ffedf7a52cb2527f3fbc2b7e8207f6cec4667447ac30fa9237dca7e926fd3c6bb43d7868676e363a8a508775ef218a8050034bd1bc836ba64bf23
+DIST zls-0.12.0-version_data.tar.xz 16104 BLAKE2B 70a0a9933e3e9897537f048231117f1b151334af9d4d3ff5400f2b740e872f6c3df2b2e387a2f5c27bb5f20165e3632c90955b694de80e9cefc2d463f73d7647 SHA512 fda868da04daebd7b163e155049ed14af55373b09e546208100537b9827ff7a37ae3d02325cc06aa76db6f8e3fdf6ec26c9872f6c89bbe5c4a3a1aa230803000
+DIST zls-0.12.0.tar.gz 341927 BLAKE2B e347bb166f4b784dfaa154cac7459418a0fd6833823db843b3e83d351ff20d8fb0ce0e15c9d00d84c81d819710332bc95b7d59ee1a2c3930b2bfa12f65e250c1 SHA512 d27653ae57c89f5fea03ecaaefa4c273a6a3694db24a1ebdf735c7ef0ca145e2d61c8f19d18bd5434659ac8ed0f5f715e6d15e4252db87ad89ac9402f580a860

diff --git a/dev-zig/zls/zls-0.12.0.ebuild b/dev-zig/zls/zls-0.12.0.ebuild
new file mode 100644
index 000000000..552a8e97c
--- /dev/null
+++ b/dev-zig/zls/zls-0.12.0.ebuild
@@ -0,0 +1,136 @@
+# 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"
+
+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
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+EZIG_MIN="0.12"
+EZIG_MAX_EXCLUSIVE="0.13"
+
+DEPEND="|| ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} )"
+RDEPEND="${DEPEND}"
+
+# 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_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[@]}" || die
+}
+
+src_test() {
+	ezig build test "${ZBS_ARGS[@]}" || die
+}
+
+src_install() {
+	DESTDIR="${ED}" ezig build install "${ZBS_ARGS[@]}" || die
+	dodoc README.md
+}
+
+pkg_postinst() {
+	elog "You can find more information about options here: https://github.com/zigtools/zls/wiki/Configuration"
+}

[gentoo-commits] repo/proj/guru:master commit in: dev-zig/zls/

[Lucio Sauer]

commit:     0f5b8d6ee3076d23e67087bc03857058a9a731a2
Author:     Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Thu Aug  1 06:22:10 2024 +0000
Commit:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Thu Aug  1 06:24:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0f5b8d6e

dev-zig/zls: add `doc` upstream metadata

Suggested by https://www.github.com/antecrescent in
https://www.github.com/gentoo/guru/commit/2afc5e89f06a2d9d3310e84cfdcdef0a1908cbb0#commitcomment-144875110 .

Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>

 dev-zig/zls/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-zig/zls/metadata.xml b/dev-zig/zls/metadata.xml
index 388538c59..8ac9557cd 100644
--- a/dev-zig/zls/metadata.xml
+++ b/dev-zig/zls/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">zigtools/zls</remote-id>
+		<doc lang="en">https://github.com/zigtools/zls/wiki</doc>
 		<bugs-to>https://github.com/zigtools/zls/issues</bugs-to>
 	</upstream>
 </pkgmetadata>

[gentoo-commits] repo/proj/guru:master commit in: dev-zig/zls/

[Lucio Sauer]

commit:     def6d46411c6008422bd13d342a3986a9ac9c170
Author:     Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Wed Aug  7 10:09:53 2024 +0000
Commit:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Wed Aug  7 10:14:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=def6d464

dev-zig/zls: combine and unify 0.13.0 and 9999 ebuilds

Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>

 dev-zig/zls/zls-0.13.0.ebuild | 44 ++++++++++++++++++++++++++++++-----------
 dev-zig/zls/zls-9999.ebuild   | 46 ++++++++++++++++++++++++++++++-------------
 2 files changed, 65 insertions(+), 25 deletions(-)

diff --git a/dev-zig/zls/zls-0.13.0.ebuild b/dev-zig/zls/zls-0.13.0.ebuild
index 691fe9037..45d25ec9a 100644
--- a/dev-zig/zls/zls-0.13.0.ebuild
+++ b/dev-zig/zls/zls-0.13.0.ebuild
@@ -8,21 +8,30 @@ inherit edo
 DESCRIPTION="The officially unofficial Ziglang language server"
 HOMEPAGE="https://github.com/zigtools/zls"
 
-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
-"
+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"
-KEYWORDS="~amd64"
 
-EZIG_MIN="0.13"
-EZIG_MAX_EXCLUSIVE="0.14"
-
-DEPEND="|| ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} )"
-RDEPEND="${DEPEND}"
+RDEPEND="${BDEPEND}"
 
 DOCS=( README.md )
 
@@ -110,6 +119,19 @@ ezig() {
 	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/

diff --git a/dev-zig/zls/zls-9999.ebuild b/dev-zig/zls/zls-9999.ebuild
index 3cdd0da1d..45d25ec9a 100644
--- a/dev-zig/zls/zls-9999.ebuild
+++ b/dev-zig/zls/zls-9999.ebuild
@@ -3,21 +3,35 @@
 
 EAPI=8
 
-inherit edo git-r3
-
-EGIT_REPO_URI="https://github.com/zigtools/zls"
+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"
 
-EZIG_MIN="9999"
-EZIG_MAX_EXCLUSIVE="99991"
-
-DEPEND="dev-lang/zig:${EZIG_MIN}"
-RDEPEND="${DEPEND}"
+RDEPEND="${BDEPEND}"
 
 DOCS=( README.md )
 
@@ -106,12 +120,16 @@ ezig() {
 }
 
 src_unpack() {
-	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"
+	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() {

[gentoo-commits] repo/proj/guru:master commit in: dev-zig/zls/

[Lucio Sauer]

commit:     61e3a28a8a67222943ab97bcfaf604462ce72e5d
Author:     Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Wed Aug  7 09:13:13 2024 +0000
Commit:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Wed Aug  7 09:13:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=61e3a28a

dev-zig/zls: sync 9999 ebuild with 0.13.0

Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>

 dev-zig/zls/zls-9999.ebuild | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/dev-zig/zls/zls-9999.ebuild b/dev-zig/zls/zls-9999.ebuild
index d5b61e56a..3cdd0da1d 100644
--- a/dev-zig/zls/zls-9999.ebuild
+++ b/dev-zig/zls/zls-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,6 +19,8 @@ EZIG_MAX_EXCLUSIVE="99991"
 DEPEND="dev-lang/zig:${EZIG_MIN}"
 RDEPEND="${DEPEND}"
 
+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"
@@ -105,23 +107,34 @@ ezig() {
 
 src_unpack() {
 	git-r3_src_unpack
+
 	cd "${S}" || die
-	ezig build --fetch || die "Fetching Zig modules failed"
-	local ZLS_GEN_FLAGS="--generate-version-data master --generate-version-data-path version_data_offline.zig"
+	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"
 }
 
+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 -Doptimize=ReleaseSafe -Dversion_data_file_path=version_data_offline.zig --verbose || die
+	ezig build "${ZBS_ARGS[@]}"
 }
 
 src_test() {
-	ezig build test -Doptimize=ReleaseSafe -Dversion_data_file_path=version_data_offline.zig --verbose || die
+	ezig build test "${ZBS_ARGS[@]}"
 }
 
 src_install() {
-	DESTDIR="${ED}" ezig build install --prefix /usr -Doptimize=ReleaseSafe -Dversion_data_file_path=version_data_offline.zig --verbose || die
-	dodoc README.md
+	DESTDIR="${ED}" ezig build install "${ZBS_ARGS[@]}"
+	einstalldocs
 }
 
 pkg_postinst() {

[gentoo-commits] repo/proj/guru:master commit in: dev-zig/zls/

[Lucio Sauer]

commit:     f6910ff72fb20cf5200972b1f053ef40eaecd432
Author:     Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Wed Aug  7 09:06:25 2024 +0000
Commit:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Wed Aug  7 09:06:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f6910ff7

dev-zig/zls: add 0.13.0

Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>

 dev-zig/zls/Manifest          |   3 +
 dev-zig/zls/zls-0.13.0.ebuild | 138 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/dev-zig/zls/Manifest b/dev-zig/zls/Manifest
index fad748f47..f5690dd7d 100644
--- a/dev-zig/zls/Manifest
+++ b/dev-zig/zls/Manifest
@@ -5,3 +5,6 @@ DIST zls-0.10.0.tar.gz 320226 BLAKE2B fc9c7c6e37d9347710520ddf0bc90b704ff6115210
 DIST zls-0.12.0-deps.tar.xz 20804 BLAKE2B 94a01028a56a4e5f692301435619c9132a70bd28b1ec78d381519108c6b6878fcf0d085080406b6855cdc68f5ac79b7e5eb0320747579b752cb2f2d79f89b89a SHA512 786dca28b56ffedf7a52cb2527f3fbc2b7e8207f6cec4667447ac30fa9237dca7e926fd3c6bb43d7868676e363a8a508775ef218a8050034bd1bc836ba64bf23
 DIST zls-0.12.0-version_data.tar.xz 16104 BLAKE2B 70a0a9933e3e9897537f048231117f1b151334af9d4d3ff5400f2b740e872f6c3df2b2e387a2f5c27bb5f20165e3632c90955b694de80e9cefc2d463f73d7647 SHA512 fda868da04daebd7b163e155049ed14af55373b09e546208100537b9827ff7a37ae3d02325cc06aa76db6f8e3fdf6ec26c9872f6c89bbe5c4a3a1aa230803000
 DIST zls-0.12.0.tar.gz 341927 BLAKE2B e347bb166f4b784dfaa154cac7459418a0fd6833823db843b3e83d351ff20d8fb0ce0e15c9d00d84c81d819710332bc95b7d59ee1a2c3930b2bfa12f65e250c1 SHA512 d27653ae57c89f5fea03ecaaefa4c273a6a3694db24a1ebdf735c7ef0ca145e2d61c8f19d18bd5434659ac8ed0f5f715e6d15e4252db87ad89ac9402f580a860
+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
new file mode 100644
index 000000000..691fe9037
--- /dev/null
+++ b/dev-zig/zls/zls-0.13.0.ebuild
@@ -0,0 +1,138 @@
+# 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"
+
+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
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+EZIG_MIN="0.13"
+EZIG_MAX_EXCLUSIVE="0.14"
+
+DEPEND="|| ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} )"
+RDEPEND="${DEPEND}"
+
+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_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"
+}

[gentoo-commits] repo/proj/guru:master commit in: dev-zig/zls/

[Lucio Sauer]

commit:     07e54ac272995d9442f34dd3c337e88584a0a0a2
Author:     Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Wed Aug  7 10:16:23 2024 +0000
Commit:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Wed Aug  7 10:16:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=07e54ac2

dev-zig/zls: fix NonexistentDeps for 0.10.0-r2

Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>

 dev-zig/zls/zls-0.10.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-zig/zls/zls-0.10.0-r2.ebuild b/dev-zig/zls/zls-0.10.0-r2.ebuild
index d165a26ba..7f8c84c95 100644
--- a/dev-zig/zls/zls-0.10.0-r2.ebuild
+++ b/dev-zig/zls/zls-0.10.0-r2.ebuild
@@ -24,7 +24,7 @@ KEYWORDS="~amd64"
 EZIG_MIN="0.10"
 EZIG_MAX_EXCLUSIVE="0.11"
 
-DEPEND="|| ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} )"
+DEPEND="dev-lang/zig-bin:0.10"
 RDEPEND="${DEPEND}"
 
 # see https://github.com/ziglang/zig/issues/3382

[gentoo-commits] repo/proj/guru:master commit in: dev-zig/zls/

[Lucio Sauer]

commit:     b3035b78ded22fcf7f3417d3c0b3550240a35096
Author:     Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Fri Aug  9 17:04:17 2024 +0000
Commit:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Fri Aug  9 17:04:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b3035b78

dev-zig/zls: drop 0.12.0

Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>

 dev-zig/zls/Manifest          |   3 -
 dev-zig/zls/zls-0.12.0.ebuild | 136 ------------------------------------------
 2 files changed, 139 deletions(-)

diff --git a/dev-zig/zls/Manifest b/dev-zig/zls/Manifest
index f5690dd7d..71ed868ea 100644
--- a/dev-zig/zls/Manifest
+++ b/dev-zig/zls/Manifest
@@ -2,9 +2,6 @@ DIST known-folders-24845b0103e611c108d6bc334231c464e699742c.tar.gz 6618 BLAKE2B
 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.12.0-deps.tar.xz 20804 BLAKE2B 94a01028a56a4e5f692301435619c9132a70bd28b1ec78d381519108c6b6878fcf0d085080406b6855cdc68f5ac79b7e5eb0320747579b752cb2f2d79f89b89a SHA512 786dca28b56ffedf7a52cb2527f3fbc2b7e8207f6cec4667447ac30fa9237dca7e926fd3c6bb43d7868676e363a8a508775ef218a8050034bd1bc836ba64bf23
-DIST zls-0.12.0-version_data.tar.xz 16104 BLAKE2B 70a0a9933e3e9897537f048231117f1b151334af9d4d3ff5400f2b740e872f6c3df2b2e387a2f5c27bb5f20165e3632c90955b694de80e9cefc2d463f73d7647 SHA512 fda868da04daebd7b163e155049ed14af55373b09e546208100537b9827ff7a37ae3d02325cc06aa76db6f8e3fdf6ec26c9872f6c89bbe5c4a3a1aa230803000
-DIST zls-0.12.0.tar.gz 341927 BLAKE2B e347bb166f4b784dfaa154cac7459418a0fd6833823db843b3e83d351ff20d8fb0ce0e15c9d00d84c81d819710332bc95b7d59ee1a2c3930b2bfa12f65e250c1 SHA512 d27653ae57c89f5fea03ecaaefa4c273a6a3694db24a1ebdf735c7ef0ca145e2d61c8f19d18bd5434659ac8ed0f5f715e6d15e4252db87ad89ac9402f580a860
 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.12.0.ebuild b/dev-zig/zls/zls-0.12.0.ebuild
deleted file mode 100644
index 552a8e97c..000000000
--- a/dev-zig/zls/zls-0.12.0.ebuild
+++ /dev/null
@@ -1,136 +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"
-
-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
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-EZIG_MIN="0.12"
-EZIG_MAX_EXCLUSIVE="0.13"
-
-DEPEND="|| ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} )"
-RDEPEND="${DEPEND}"
-
-# 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_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[@]}" || die
-}
-
-src_test() {
-	ezig build test "${ZBS_ARGS[@]}" || die
-}
-
-src_install() {
-	DESTDIR="${ED}" ezig build install "${ZBS_ARGS[@]}" || die
-	dodoc README.md
-}
-
-pkg_postinst() {
-	elog "You can find more information about options here: https://github.com/zigtools/zls/wiki/Configuration"
-}

[gentoo-commits] repo/proj/guru:master commit in: dev-zig/zls/

[David Roman]

commit:     816df82ac73f412c37495aeded527763b16e0270
Author:     Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Sat Aug 24 11:12:46 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sat Aug 24 11:15:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=816df82a

dev-zig/zls: fix 9999, langref is no longer fetched during building

It's now commited in ZLS repo instead, see
https://github.com/zigtools/zls/pull/2000 .

Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>

 dev-zig/zls/zls-9999.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dev-zig/zls/zls-9999.ebuild b/dev-zig/zls/zls-9999.ebuild
index 45d25ec9a..4966ee4a7 100644
--- a/dev-zig/zls/zls-9999.ebuild
+++ b/dev-zig/zls/zls-9999.ebuild
@@ -125,8 +125,6 @@ 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
@@ -137,7 +135,6 @@ src_configure() {
 		--prefix usr/
 		-Doptimize=ReleaseSafe
 		--system "${WORKDIR}/zig-eclass/p/"
-		-Dversion_data_file_path=version_data.zig
 		--verbose
 	)
 }