gentoo auto-resync : 26:07:2023 - 04:30:05

3 files changed, 116 insertions, 11 deletions

diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest
index 490b9bf43c8f..148308943a0d 100644
--- a/dev-vcs/git-lfs/Manifest
+++ b/dev-vcs/git-lfs/Manifest
@@ -1,4 +1,7 @@
 DIST git-lfs-3.2.0.tar.gz 3270970 BLAKE2B fc235d48e44f8a0f446b05914cd110e6486481482b2884483dcf04198a3275a633cd8090e1591975f8b84ba678c258581e3510fc0d478d5fc72abf6aa98bd5c0 SHA512 c2ba8cecd5b3519a032f446b0c3043352f37f3c67ff3c2304a38beb176f0ae8efd1deaeb8bd54a35d7dd7dcd988da67249c896dffd83fc293b165a3e6bb02d66
+DIST git-lfs-3.3.0-deps.tar.xz 24664124 BLAKE2B d22a7c7943a917746d1cf22db30582a8bc15e21fd1afe3194aae07316ddb68072ef2d183eef5b909566c640aa435f62aac0658ccbcb8148efe9506c102795656 SHA512 801d278eb76236ce683797ca7a9520b8dfe1ebdb59ccc4ba0526878f5e794d30199604004949e906ae6cccb68ea3b8e3afdacbd6de5e8a79448dfa09744af66c
+DIST git-lfs-3.3.0.tar.gz 656080 BLAKE2B 33cd41c3669f0eb5b94299ca192ede32337b521c812ceb3ecc1e07f2375b80037b62948b8d4e345cd86324d4e781024b691e809550f61302a60962b1c8400c4c SHA512 c339a61c23950d249ac135d75c9b9c4b871f491535d6d6a0accbf06efe36798566502ab310396f44acdc1d93aa7358a719a81428042fb2eda1ab237b08e4ba41
 EBUILD git-lfs-3.2.0-r1.ebuild 1588 BLAKE2B fb151ac33a3e9e4446851d80acfea3251262e201d3da3a878098fad8359cd18251534c4c2d945df50f40ed18f454744d108dc281f470e64a46204f66413526c8 SHA512 823ee195a154ab795a19dc333c519dd3d1c5456eebaf43b5e3d1037fe5901fae9946936f960fb519c7ff3eb2e43f93d6fe498fea0ab14fe4223b5af0b3705878
-EBUILD git-lfs-9999.ebuild 1568 BLAKE2B f6cf9c546676ed2296f035a53c166145c1b6052545343411586bab906a5cd1cdd330316335e73ea5a5c825a87e6ce40f17b20a58b3458aae065e255d0b4edd32 SHA512 d8d8f078e8bab2f4f0cac360d71a943ce575a17f723149649f3e7c4e7200e058bc504b04a586952d321ab9d15f129228bb98aa6ab0d053d037dfce31a7a7661f
+EBUILD git-lfs-3.3.0.ebuild 2013 BLAKE2B 2b8058ae82d1103141e7c5a2f4e326c00b7af3ac7bbdc0363ab6872e1030890936fc761fbc9718cdb12e920e89b0902325556cc1ac28df9e53dc1d1b72652b30 SHA512 701c68ffc160153f6c97826a01f11bb1e12ffa0efa905d50bdb1228372877362764a75f8b4f8359a7f1339656601f8aa310f40079c38cf5f955c35180cd8c9fa
+EBUILD git-lfs-9999.ebuild 2013 BLAKE2B 2b8058ae82d1103141e7c5a2f4e326c00b7af3ac7bbdc0363ab6872e1030890936fc761fbc9718cdb12e920e89b0902325556cc1ac28df9e53dc1d1b72652b30 SHA512 701c68ffc160153f6c97826a01f11bb1e12ffa0efa905d50bdb1228372877362764a75f8b4f8359a7f1339656601f8aa310f40079c38cf5f955c35180cd8c9fa
 MISC metadata.xml 477 BLAKE2B f26242dee1117690332342dbd12f3739eeff572ff6e64ffb979a18c6fe7fca5e305beb08c9aab02ceb4c9dd1cbab6401a3a31d326f5d25d1ee30fb62fd711673 SHA512 9ae6594f42265b3f33cb977eaceab2a5fbb45f3e6a7c64c7cd4cfb88b8d56da0cc6f9d7564beda45969bb525f537e7a3e7d3b764456f3210c3e4c16e9d7545bb
diff --git a/dev-vcs/git-lfs/git-lfs-3.3.0.ebuild b/dev-vcs/git-lfs/git-lfs-3.3.0.ebuild
new file mode 100644
index 000000000000..7b98fd42b0f3
--- /dev/null
+++ b/dev-vcs/git-lfs/git-lfs-3.3.0.ebuild
@@ -0,0 +1,86 @@
+# 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
+	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/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? ( dev-ruby/asciidoctor )
+"
+RDEPEND="dev-vcs/git"
+
+RESTRICT+=" !test? ( test )"
+
+DOCS=(
+	CHANGELOG.md
+	CODE-OF-CONDUCT.md
+	CONTRIBUTING.md
+	README.md
+	SECURITY.md
+)
+
+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=${COMMIT_ID} -s -w"
+		-gcflags=" "
+		-trimpath
+		-v -work -x
+	)
+	go build "${mygobuildargs[@]}" -o git-lfs git-lfs.go || die
+
+	if use doc; then
+		for doc in docs/man/*adoc;
+			do asciidoctor -b manpage ${doc} || die "man building failed"
+		done
+	fi
+}
+
+src_install() {
+	dobin git-lfs
+	einstalldocs
+	use doc && doman docs/man/*.1
+}
+
+src_test() {
+	local mygotestargs=(
+		-ldflags="-X ${EGO_PN}/config.GitCommit=${COMMIT_ID}"
+	)
+	go test "${mygotestargs[@]}" ./... || die
+}
+
+pkg_postinst () {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog ""
+		elog "Run 'git lfs install' once for each user account manually."
+		elog "For more details see https://bugs.gentoo.org/show_bug.cgi?id=733372."
+	fi
+}
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
 }