From: "Eric Joldasov" <bratishkaerik@getgoogleoff.me>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-zig/zls/
Date: Wed, 7 Aug 2024 10:15:08 +0000 (UTC) [thread overview]
Message-ID: <1723025699.def6d46411c6008422bd13d342a3986a9ac9c170.bratishkaerik@gentoo> (raw)
commit: def6d46411c6008422bd13d342a3986a9ac9c170
Author: Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Wed Aug 7 10:09:53 2024 +0000
Commit: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
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() {
next reply other threads:[~2024-08-07 10:15 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-07 10:15 Eric Joldasov [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-07 14:50 [gentoo-commits] repo/proj/guru:dev commit in: dev-zig/zls/ Eric Joldasov
2024-12-27 19:21 Eric Joldasov
2024-12-17 20:59 Eric Joldasov
2024-12-15 12:20 Eric Joldasov
2024-12-15 12:20 Eric Joldasov
2024-08-24 11:16 Eric Joldasov
2024-08-09 17:04 Eric Joldasov
2024-08-07 10:16 Eric Joldasov
2024-08-07 9:17 Eric Joldasov
2024-08-07 9:09 Eric Joldasov
2024-08-01 6:25 Eric Joldasov
2024-07-31 19:33 Eric Joldasov
2024-07-31 19:09 Eric Joldasov
2023-10-10 2:48 Eric Joldasov
2023-08-26 17:01 Eric Joldasov
2023-03-09 14:14 Eric Joldasov
2023-03-09 14:14 Eric Joldasov
2023-03-07 8:43 Eric Joldasov
2023-02-05 11:56 Eric Joldasov
2022-11-04 17:22 Eric Joldasov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1723025699.def6d46411c6008422bd13d342a3986a9ac9c170.bratishkaerik@gentoo \
--to=bratishkaerik@getgoogleoff.me \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox