[gentoo-commits] repo/proj/guru:dev commit in: dev-zig/zls/
commit: 5de3d475f386f7fe7f8d9c23b2e3e5b11dc48dce
Author: Eric Joldasov getgoogleoff me>
AuthorDate: Tue Oct 10 02:43:11 2023 +
Commit: Eric Joldasov getgoogleoff me>
CommitDate: Tue Oct 10 02:43:11 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5de3d475
dev-zig/zls: sync with latest Zig changes
Related: https://github.com/ziglang/zig/pull/17392 .
Signed-off-by: Eric Joldasov getgoogleoff.me>
dev-zig/zls/zls-.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dev-zig/zls/zls-.ebuild b/dev-zig/zls/zls-.ebuild
index fe83830faf..ef9785f27b 100644
--- a/dev-zig/zls/zls-.ebuild
+++ b/dev-zig/zls/zls-.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:dev commit in: dev-zig/zls/
commit: 0eb28c38bc75d8241423749cc2edad4cd8555673
Author: Eric Joldasov getgoogleoff me>
AuthorDate: Tue Aug 22 11:15:27 2023 +
Commit: Eric Joldasov getgoogleoff me>
CommitDate: Sat Aug 26 17:00:38 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0eb28c38
dev-zig/zls: fix for
See upstream PR https://github.com/zigtools/zls/pull/1415 and
commit
https://github.com/zigtools/zls/commit/f95a0efca127c01450cd3beaf35e407e6dc1ff35
Signed-off-by: Eric Joldasov getgoogleoff.me>
dev-zig/zls/zls-.ebuild | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/dev-zig/zls/zls-.ebuild b/dev-zig/zls/zls-.ebuild
index f38e48ae05..fe83830faf 100644
--- a/dev-zig/zls/zls-.ebuild
+++ b/dev-zig/zls/zls-.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:dev commit in: dev-zig/zls/
commit: e8354425d475c98040823f67ac2faa3800d81870
Author: Eric Joldasov getgoogleoff me>
AuthorDate: Thu Mar 9 14:13:14 2023 +
Commit: Eric Joldasov getgoogleoff me>
CommitDate: Thu Mar 9 14:13:35 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e8354425
dev-zig/zls: adjust ebuild () for slotted Zig
Signed-off-by: Eric Joldasov getgoogleoff.me>
dev-zig/zls/zls-.ebuild | 99 +
1 file changed, 91 insertions(+), 8 deletions(-)
diff --git a/dev-zig/zls/zls-.ebuild b/dev-zig/zls/zls-.ebuild
index 267e3221a..f38e48ae0 100644
--- a/dev-zig/zls/zls-.ebuild
+++ b/dev-zig/zls/zls-.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-"
+EZIG_MIN=""
+EZIG_MAX_EXCLUSIVE="1"
+
+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
[gentoo-commits] repo/proj/guru:dev commit in: dev-zig/zls/
commit: 873168168d68c015588118828bde624f9a00f960
Author: Eric Joldasov getgoogleoff me>
AuthorDate: Thu Mar 9 13:55:19 2023 +
Commit: Eric Joldasov getgoogleoff me>
CommitDate: Thu Mar 9 14:13:35 2023 +
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 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 0..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
[gentoo-commits] repo/proj/guru:dev commit in: dev-zig/zls/
commit: a2b58e6e72311d39f49141d8a389fc66d8db67e0
Author: Eric Joldasov getgoogleoff me>
AuthorDate: Tue Mar 7 08:42:46 2023 +
Commit: Eric Joldasov getgoogleoff me>
CommitDate: Tue Mar 7 08:43:31 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a2b58e6e
dev-zig/zls: fix for
Signed-off-by: Eric Joldasov getgoogleoff.me>
dev-zig/zls/zls-.ebuild | 7 +++
1 file changed, 7 insertions(+)
diff --git a/dev-zig/zls/zls-.ebuild b/dev-zig/zls/zls-.ebuild
index b61f8139d..267e3221a 100644
--- a/dev-zig/zls/zls-.ebuild
+++ b/dev-zig/zls/zls-.ebuild
@@ -20,6 +20,13 @@ RDEPEND="${DEPEND}"
# For now, Zig Build System doesn't support CFLAGS/LDFLAGS/etc.
QA_FLAGS_IGNORED="usr/bin/zls"
+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"
+}
+
src_compile() {
zig build -Doptimize=ReleaseSafe -Ddata_version=master --verbose || die
}
[gentoo-commits] repo/proj/guru:dev commit in: dev-zig/zls/
commit: 33eb55c86bb93bebc9bec123f3e47671142033cf
Author: Eric Joldasov getgoogleoff me>
AuthorDate: Sun Feb 5 11:56:01 2023 +
Commit: Eric Joldasov getgoogleoff me>
CommitDate: Sun Feb 5 11:56:10 2023 +
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 getgoogleoff.me>
dev-zig/zls/zls-.ebuild | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/dev-zig/zls/zls-.ebuild b/dev-zig/zls/zls-.ebuild
index bbb09a80b..b61f8139d 100644
--- a/dev-zig/zls/zls-.ebuild
+++ b/dev-zig/zls/zls-.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-"
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:dev commit in: dev-zig/zls/
commit: eaad72328d91430a3ca4ecdc86b06b135c5efecd
Author: Eric Joldasov getgoogleoff me>
AuthorDate: Fri Nov 4 17:19:35 2022 +
Commit: Eric Joldasov getgoogleoff me>
CommitDate: Fri Nov 4 17:19:35 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=eaad7232
dev-zig/zls: new package, add
Signed-off-by: Eric Joldasov getgoogleoff.me>
dev-zig/zls/metadata.xml| 12
dev-zig/zls/zls-.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 0..f7d26335b
--- /dev/null
+++ b/dev-zig/zls/metadata.xml
@@ -0,0 +1,12 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ bratishkae...@getgoogleoff.me
+ Eric Joldasov
+
+
+ zigtools/zls
+ https://github.com/zigtools/zls/issues
+
+
diff --git a/dev-zig/zls/zls-.ebuild b/dev-zig/zls/zls-.ebuild
new file mode 100644
index 0..bbb09a80b
--- /dev/null
+++ b/dev-zig/zls/zls-.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-"
+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;
+}
