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 AE8B5158042 for ; Tue, 29 Oct 2024 14:06:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D719FE0855; Tue, 29 Oct 2024 14:06:43 +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 BE93FE0843 for ; Tue, 29 Oct 2024 14:06:43 +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 0D639342FE2 for ; Tue, 29 Oct 2024 14:06:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5D67C2145 for ; Tue, 29 Oct 2024 14:06:40 +0000 (UTC) From: "David Roman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Roman" Message-ID: <1730153304.1d7914418b697ed09d4b1e4774c2dd02267e9064.davidroman@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: www-apps/mycorrhiza/ X-VCS-Repository: repo/proj/guru X-VCS-Files: www-apps/mycorrhiza/mycorrhiza-9999.ebuild X-VCS-Directories: www-apps/mycorrhiza/ X-VCS-Committer: davidroman X-VCS-Committer-Name: David Roman X-VCS-Revision: 1d7914418b697ed09d4b1e4774c2dd02267e9064 X-VCS-Branch: master Date: Tue, 29 Oct 2024 14:06:40 +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: a5cb4587-6452-40af-a9a6-6a98113fc5f0 X-Archives-Hash: 2ad63bf70bb1003533d7ac29802fd9e3 commit: 1d7914418b697ed09d4b1e4774c2dd02267e9064 Author: Eric Joldasov landless-city net> AuthorDate: Mon Oct 28 22:08:24 2024 +0000 Commit: David Roman gmail com> CommitDate: Mon Oct 28 22:08:24 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1d791441 www-apps/mycorrhiza: sync 9999 with 1.15.1 Signed-off-by: Eric Joldasov landless-city.net> www-apps/mycorrhiza/mycorrhiza-9999.ebuild | 36 ++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/www-apps/mycorrhiza/mycorrhiza-9999.ebuild b/www-apps/mycorrhiza/mycorrhiza-9999.ebuild index a25c3ce31..aaa026ade 100644 --- a/www-apps/mycorrhiza/mycorrhiza-9999.ebuild +++ b/www-apps/mycorrhiza/mycorrhiza-9999.ebuild @@ -1,35 +1,53 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit go-module git-r3 +inherit go-module DESCRIPTION="Git-based wiki engine written in Go using mycomarkup" HOMEPAGE="https://mycorrhiza.wiki" -EGIT_REPO_URI="https://github.com/bouncepaw/mycorrhiza" +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/bouncepaw/mycorrhiza" + inherit git-r3 +else + SRC_URI=" + https://github.com/bouncepaw/mycorrhiza/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://codeberg.org/BratishkaErik/distfiles/releases/download/mycorrhiza-${PV}/mycorrhiza-${PV}-vendor.tar.xz + " + KEYWORDS="~amd64 ~x86" +fi LICENSE="AGPL-3 MIT Apache-2.0 BSD BSD-2 CC-BY-4.0" SLOT="0" -BDEPEND=">=dev-lang/go-1.19.0" +RESTRICT="mirror" + +BDEPEND=">=dev-lang/go-1.22" RDEPEND="dev-vcs/git" +DOCS=( "README.md" ) + src_unpack() { - git-r3_src_unpack - go-module_live_vendor + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + go-module_live_vendor + fi + go-module_src_unpack } src_compile() { - ego build -buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath . + GOFLAGS+=" -mod=vendor -trimpath" + local go_ldflags="-s -linkmode external -extldflags \"${LDFLAGS}\"" + ego build ${GOFLAGS} -ldflags="${go_ldflags}" . } src_install() { dobin mycorrhiza + + einstalldocs doman help/mycorrhiza.1 - dodoc Boilerplate.md - dodoc README.md } pkg_postinst() {