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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 87654159C9B for ; Wed, 7 Aug 2024 10:33:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF0DBE2D26; Wed, 7 Aug 2024 10:33:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B510BE2D25 for ; Wed, 7 Aug 2024 10:33:46 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 061A63430BA for ; Wed, 7 Aug 2024 10:33:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99A8C1EC5 for ; Wed, 7 Aug 2024 10:33:43 +0000 (UTC) From: "Lucio Sauer" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lucio Sauer" Message-ID: <1723025699.def6d46411c6008422bd13d342a3986a9ac9c170.watermanpaint@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-zig/zls/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-zig/zls/zls-0.13.0.ebuild dev-zig/zls/zls-9999.ebuild X-VCS-Directories: dev-zig/zls/ X-VCS-Committer: watermanpaint X-VCS-Committer-Name: Lucio Sauer X-VCS-Revision: def6d46411c6008422bd13d342a3986a9ac9c170 X-VCS-Branch: master Date: Wed, 7 Aug 2024 10:33:43 +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: ef557a0d-26a4-4ba2-9e8a-8c1dd335bda4 X-Archives-Hash: 9130889d8bf8ccae2f37db952f2b9182 commit: def6d46411c6008422bd13d342a3986a9ac9c170 Author: Eric Joldasov landless-city net> AuthorDate: Wed Aug 7 10:09:53 2024 +0000 Commit: Lucio Sauer posteo 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 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() {