gentoo auto-resync : 09:04:2024 - 12:31:21

4 files changed, 109 insertions, 72 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index cf6640bd6d14..a23d7c1339ba 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest
index ba0888d6b432..4cac200be9dc 100644
--- a/dev-vcs/git-lfs/Manifest
+++ b/dev-vcs/git-lfs/Manifest
@@ -1,7 +1,8 @@
-DIST git-lfs-3.2.0.tar.gz 3270970 BLAKE2B fc235d48e44f8a0f446b05914cd110e6486481482b2884483dcf04198a3275a633cd8090e1591975f8b84ba678c258581e3510fc0d478d5fc72abf6aa98bd5c0 SHA512 c2ba8cecd5b3519a032f446b0c3043352f37f3c67ff3c2304a38beb176f0ae8efd1deaeb8bd54a35d7dd7dcd988da67249c896dffd83fc293b165a3e6bb02d66
 DIST git-lfs-3.4.0-deps.tar.xz 19912396 BLAKE2B 0e2e50e7b7566fe93d87f86c4b3a3a3f5f0cefc734af83516a5d3122d101333df5ed65cf848e727a1b7593ffdffeee72108221951313f47775b265f4fbdcb1be SHA512 50f7eba5abd4a3ad83e1cd74d7d413e8f708b796b67d60d404af512823423532e1bbbfaa5385ee668cbdd6ec0bce89b862db571c76e5a3f0d0cee5097ccc73d2
 DIST git-lfs-3.4.0.tar.gz 674499 BLAKE2B 8232c7492a453fc5a8855b13cfbf95c64a9c614d740bebebefcc44f6a7e2daddaee0dee3f8d8ba653999b8516c47a491af6449b5daf5e3861f3530d372b213e4 SHA512 ff0d624bc48d9ab4332943af8212652d9959e8f9d6a356a3722047903e01bc1dcf04178b97d58a327d0a381569854034c4a1dc2baea9976a8f20d97d7e637f31
-EBUILD git-lfs-3.2.0-r1.ebuild 1588 BLAKE2B fb151ac33a3e9e4446851d80acfea3251262e201d3da3a878098fad8359cd18251534c4c2d945df50f40ed18f454744d108dc281f470e64a46204f66413526c8 SHA512 823ee195a154ab795a19dc333c519dd3d1c5456eebaf43b5e3d1037fe5901fae9946936f960fb519c7ff3eb2e43f93d6fe498fea0ab14fe4223b5af0b3705878
+DIST git-lfs-3.5.1-deps.tar.xz 21401028 BLAKE2B a011061ebae15c7d80d908d46051c95462b617073623be83c067cfc9b028eb8f803f53dcb17a6e19d8e1bfd9c2349db9f7a000d91008b1c375bfc73de4793b25 SHA512 1879624ee84e5d138f8dcb9cb626822d0a2e063705cb424db5c9f9d609af496104655ebb878ec950112b8b39d147141ff86b6474ad8210384dd93318034c19a4
+DIST git-lfs-3.5.1.tar.gz 683872 BLAKE2B c99d85474cb8544ea2fca7daa6fc57affeabeb7bde517366c885360f613012c3b852d95abd647adfda806f0a057c6df355db0cf49f8d408460c0e2498b836ab5 SHA512 7755f8fbf18d5870eb95d13e1af763e9c8b127ecace67c95d54100eb9d735df41b649d1777f7051ba018eacba34f732a51b3bf5f1376dedf4778b5ae0c81cf40
 EBUILD git-lfs-3.4.0-r1.ebuild 2683 BLAKE2B 006f9dcc94771ef8e4cd9978d94d04f617f745717b5191de7c412ce2e8fa81657f0992f8e962a501962b611db95e5b5a60405eea0b91a256d80a2c4881d7de4a SHA512 500ce38e21b836806a61b4f3b660991066d6d3f99c1d4056dbd583280c9410e16bbdb461eb6576f18f1e93eccbee63e52fb61f52b084cfca6a608f5816c57eb9
+EBUILD git-lfs-3.5.1.ebuild 2742 BLAKE2B cb5b3e89fe9233ce6b577cd6e9b6a5baccfd27a5bd31289a2f3a8c4c7137ade67c6aa37bd5c53b0b4507bc343acdd7398550d5f1e6cc22c0499c73100aee7809 SHA512 b8cb88c3bf082a79fc55d820b7e442ffda5da5fef7559d8cd6907d0ea150368ab2a94d35bbd95c69f19c95f9532565ead1c689252388f8b4cfb9b4a173f698d7
 EBUILD git-lfs-9999.ebuild 2684 BLAKE2B 9299001c5d8620bf2a850a8336ebd50329d9d0fcb865a2023bb34865eff3190b651d859f74ca9eb65dcfb9a61671f4be93a6c8ab50ef437e20d8f1a129c0bb09 SHA512 0d56bd6d3d42006749d21d18c96c601b74fc5f62b930c611164917b12522f562258796cd1047bfef4d4d1ee60e866cf0163869e1ea8513799d096d9f3cf63d1b
 MISC metadata.xml 477 BLAKE2B f26242dee1117690332342dbd12f3739eeff572ff6e64ffb979a18c6fe7fca5e305beb08c9aab02ceb4c9dd1cbab6401a3a31d326f5d25d1ee30fb62fd711673 SHA512 9ae6594f42265b3f33cb977eaceab2a5fbb45f3e6a7c64c7cd4cfb88b8d56da0cc6f9d7564beda45969bb525f537e7a3e7d3b764456f3210c3e4c16e9d7545bb
diff --git a/dev-vcs/git-lfs/git-lfs-3.2.0-r1.ebuild b/dev-vcs/git-lfs/git-lfs-3.2.0-r1.ebuild
deleted file mode 100644
index a86412aadad5..000000000000
--- a/dev-vcs/git-lfs/git-lfs-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-EGO_PN=github.com/git-lfs/git-lfs
-inherit go-module
-
-DESCRIPTION="Command line extension and specification for managing large files with git"
-HOMEPAGE="https://git-lfs.com/"
-
-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 ~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 )"
-RDEPEND="dev-vcs/git"
-
-RESTRICT+=" !test? ( test )"
-
-DOCS=(
-	CHANGELOG.md
-	CODE-OF-CONDUCT.md
-	CONTRIBUTING.md
-	README.md
-	SECURITY.md
-)
-
-src_compile() {
-	# 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
-	)
-	go build "${mygobuildargs[@]}" -o git-lfs git-lfs.go || die
-
-	if use doc; then
-		ronn docs/man/*.ronn || die "man building failed"
-	fi
-}
-
-src_install() {
-	dobin git-lfs
-	einstalldocs
-	use doc && doman docs/man/*.1
-}
-
-src_test() {
-	local mygotestargs=(
-		-ldflags="-X ${EGO_PN}/config.GitCommit=${GIT_COMMIT}"
-		-mod vendor
-	)
-	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-3.5.1.ebuild b/dev-vcs/git-lfs/git-lfs-3.5.1.ebuild
new file mode 100644
index 000000000000..d834b83cee10
--- /dev/null
+++ b/dev-vcs/git-lfs/git-lfs-3.5.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 2017-2024 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="e237bb3a364603cbb92cabc34b8401d1ad5d795b"
+
+inherit go-module shell-completion
+
+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}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	# Add the manually vendored tarball.
+	# 1) Create a tar archive optimized to reproduced by other users or devs.
+	# 2) Compress the archive using XZ limiting decompression memory for
+	#    pretty constraint systems.
+	# Use something like:
+	# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+	# tar cf $P-deps.tar go-mod \
+	#	--mtime="1970-01-01" --sort=name --owner=portage --group=portage
+	# xz -k -9eT0 --memlimit-decompress=256M $P-deps.tar
+	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
+	)
+	ego build "${mygobuildargs[@]}" -o git-lfs git-lfs.go
+
+	if use doc; then
+		for doc in docs/man/*adoc;
+			do asciidoctor -b manpage ${doc} || die "man building failed"
+		done
+	fi
+
+	# Generate auto-completion scripts.
+	# bug 914542
+	./git-lfs completion bash > "${PN}.bash" || die
+	./git-lfs completion fish > "${PN}.fish" || die
+	./git-lfs completion zsh > "${PN}.zsh" || die
+}
+
+src_install() {
+	dobin git-lfs
+	einstalldocs
+
+	# Install auto-completion scripts generated earlier.
+	# bug 914542
+	newbashcomp "${PN}.bash" "${PN}"
+	dofishcomp "${PN}.fish"
+	newzshcomp "${PN}.zsh" "_${PN}"
+
+	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
+}