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 7414F15801B for ; Wed, 26 Jul 2023 02:53:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24C3CE0924; Wed, 26 Jul 2023 02:53:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 082D4E0928 for ; Wed, 26 Jul 2023 02:53:16 +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 4DB6D34157D for ; Wed, 26 Jul 2023 02:53:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C896DD1 for ; Wed, 26 Jul 2023 02:53:12 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1690339745.8d7104db79317787d104095a0f5aca9cc2dce322.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-lfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/git-lfs/git-lfs-9999.ebuild X-VCS-Directories: dev-vcs/git-lfs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8d7104db79317787d104095a0f5aca9cc2dce322 X-VCS-Branch: master Date: Wed, 26 Jul 2023 02:53:12 +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: 162fbcaa-2114-4e8d-bf72-de39296017df X-Archives-Hash: b0936a6ad99ce6b67a98f25b431000e2 commit: 8d7104db79317787d104095a0f5aca9cc2dce322 Author: Nils Freydank posteo de> AuthorDate: Sat Jul 15 16:10:35 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jul 26 02:49:05 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d7104db dev-vcs/git-lfs: Update the live ebuild Getting the commit ID needs some love here, though. Signed-off-by: Nils Freydank posteo.de> Closes: https://github.com/gentoo/gentoo/pull/31898 Signed-off-by: Sam James gentoo.org> dev-vcs/git-lfs/git-lfs-9999.ebuild | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/dev-vcs/git-lfs/git-lfs-9999.ebuild b/dev-vcs/git-lfs/git-lfs-9999.ebuild index 9ca4bf2afe35..7b98fd42b0f3 100644 --- a/dev-vcs/git-lfs/git-lfs-9999.ebuild +++ b/dev-vcs/git-lfs/git-lfs-9999.ebuild @@ -1,26 +1,37 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2017-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 EGO_PN=github.com/git-lfs/git-lfs +# Update the ID as it's included in each build. +COMMIT_ID="77deabdf9a18f8a07ecfd3e0f4aa572ffbbab8d4" + inherit go-module DESCRIPTION="Command line extension and specification for managing large files with git" -HOMEPAGE="https://git-lfs.com/" +HOMEPAGE=" + https://git-lfs.com + https://github.com/git-lfs/git-lfs +" if [[ "${PV}" = 9999* ]]; then EGIT_REPO_URI="https://${EGO_PN}" inherit git-r3 else - SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + SRC_URI="https://${EGO_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + # Add the manually vendored tarball. + # Compress the tarball with: xz -9kT0 --memlimit-decompress=256M + SRC_URI+=" https://files.holgersson.xyz/gentoo/distfiles/golang-pkg-deps/${P}-deps.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" fi LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT" SLOT="0" IUSE="doc test" -BDEPEND="doc? ( app-text/ronn-ng )" +BDEPEND=" + doc? ( dev-ruby/asciidoctor ) +" RDEPEND="dev-vcs/git" RESTRICT+=" !test? ( test )" @@ -34,16 +45,22 @@ DOCS=( ) src_compile() { + export CGO_ENABLED=0 + # Flags -w, -s: Omit debugging information to reduce binary size, # see https://golang.org/cmd/link/. local mygobuildargs=( - -ldflags="-X ${EGO_PN}/config.GitCommit=${GIT_COMMIT} -s -w" - -mod vendor -v -work -x + -ldflags="-X ${EGO_PN}/config.GitCommit=${COMMIT_ID} -s -w" + -gcflags=" " + -trimpath + -v -work -x ) go build "${mygobuildargs[@]}" -o git-lfs git-lfs.go || die if use doc; then - ronn docs/man/*.ronn || die "man building failed" + for doc in docs/man/*adoc; + do asciidoctor -b manpage ${doc} || die "man building failed" + done fi } @@ -55,8 +72,7 @@ src_install() { src_test() { local mygotestargs=( - -ldflags="-X ${EGO_PN}/config.GitCommit=${GIT_COMMIT}" - -mod vendor + -ldflags="-X ${EGO_PN}/config.GitCommit=${COMMIT_ID}" ) go test "${mygotestargs[@]}" ./... || die }