gentoo resync : 20.03.2022

3 files changed, 74 insertions, 2 deletions

diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest
index dec64c73d0e4..9b37253bb733 100644
--- a/dev-vcs/git-lfs/Manifest
+++ b/dev-vcs/git-lfs/Manifest
@@ -1,6 +1,8 @@
 DIST git-lfs-2.11.0.tar.gz 2839623 BLAKE2B e9d0e8ea37f19617a4f727abdc93c3c937052ad98b6ac40de27ced6b250789701797d04f1bf795b259e83155e5d8a1ca122dbf8b40503c2c41d6d891a3ecf096 SHA512 2117b425864a36f773c14d34c78999636d836646184cf8d89045ef6de90cbded873d4de4613ecfafb0fa2ea8ae068e11f5ae22eed6af01715b5fac9be70f033b
 DIST git-lfs-2.13.3.tar.gz 2901796 BLAKE2B 84bbce719e83229bbb7116f5c337e0748a2be223b260e03653dab23f6c8d20087a09695d6ef7abf45e128bfd79c5eb994cb14fb906330675174830603a2e3ba2 SHA512 2c9e10e4f2fdb5d6bae8994db5879f50596109f3057e7369a9edca3c13c3f4d77e268e3903a0abca60cf8e342ff54bc4920c01a530f8eb400e3a0cc11a171f74
+DIST git-lfs-3.1.2.tar.gz 3254358 BLAKE2B 77df9aef438c2d839b6a3690c6f34191b993180be7b3cbccedbe2d439cd8d77676f91a864598af40ebfe4d9d021bbc179bb6bcbb3635ca0a7ed78eecd2da0246 SHA512 de2b56146b929adf7f6ff1989f07d4aca59bde218a51273c0d443a4cace0ccfcf9d4d72c2458c53f95fe06f092baaf6ccbde304e9ca20691ccb9e7aa56f49ebb
 EBUILD git-lfs-2.11.0-r1.ebuild 1416 BLAKE2B 952314086d8a9716c49a72d5945aeb4cba5140451e45fc60eea7a04a10f7c07d5a9439f41ee30d542c938930bc37476e2d1471dfd4adf4d75b6b4dda45a1d125 SHA512 2b613f04ce9a31aa8c94603f4489ff22f85e5ede7b1deb5df5f4cd28c826e46cd6d28c7f14c3eca4d8f7425750aca8b2e2360c423ba93b1c68d2dcc8d6fdc1a0
 EBUILD git-lfs-2.13.3-r1.ebuild 1597 BLAKE2B a7d3bc880490893328cdc32e758514293e24097955037d4a874e22752c60393a2c9a10324ac701db3a3ace3d2ef64339c38789f9da7dc70bf254ac3b2301cd6d SHA512 5dc3bf175d04a149d8733442b87a914cad22ab98de6939c4f72386e5f471f0e7fc0dd146bf869c6c9986a87ecdaa9b5cac0273a756882ca85bbb6ff0cf900013
-EBUILD git-lfs-9999.ebuild 1598 BLAKE2B 37d77779c03abb5dea7f7edb0737aff64decd778f16f4433c193acf2d15015ef0a832d9f0de7483a772d3654b15fa60aef2d9fe107cf634b0e80b34a14e03338 SHA512 1fbfba9042c84cc89bc9500389a5db5587594ab02bb10f05786f430a45f607e12e7bda56c8e82744cc8ea73703086f3a2557ad3542b3699fe5c10d7d235ce37b
+EBUILD git-lfs-3.1.2.ebuild 1598 BLAKE2B 14f5a959326593d5b0545206ba890818105f526702fac76d4ff1e4aa3d48154db388c23d53cc7f9cb679bd57063c039d16903062de8497460ac4f2884815f2a6 SHA512 50876cf5f4ddeae292982dbae62a12bc06add7a8ec9119e89c7b62c5f2b7427d052e788e64462fb0e2ff4de90c5142e4d10dfd284ef7766ddcc2e1a10576e6dc
+EBUILD git-lfs-9999.ebuild 1598 BLAKE2B 14f5a959326593d5b0545206ba890818105f526702fac76d4ff1e4aa3d48154db388c23d53cc7f9cb679bd57063c039d16903062de8497460ac4f2884815f2a6 SHA512 50876cf5f4ddeae292982dbae62a12bc06add7a8ec9119e89c7b62c5f2b7427d052e788e64462fb0e2ff4de90c5142e4d10dfd284ef7766ddcc2e1a10576e6dc
 MISC metadata.xml 477 BLAKE2B f26242dee1117690332342dbd12f3739eeff572ff6e64ffb979a18c6fe7fca5e305beb08c9aab02ceb4c9dd1cbab6401a3a31d326f5d25d1ee30fb62fd711673 SHA512 9ae6594f42265b3f33cb977eaceab2a5fbb45f3e6a7c64c7cd4cfb88b8d56da0cc6f9d7564beda45969bb525f537e7a3e7d3b764456f3210c3e4c16e9d7545bb
diff --git a/dev-vcs/git-lfs/git-lfs-3.1.2.ebuild b/dev-vcs/git-lfs/git-lfs-3.1.2.ebuild
new file mode 100644
index 000000000000..820116904c3c
--- /dev/null
+++ b/dev-vcs/git-lfs/git-lfs-3.1.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 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.github.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 ~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 app-text/ronn ) )"
+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-9999.ebuild b/dev-vcs/git-lfs/git-lfs-9999.ebuild
index 9074b5b98409..820116904c3c 100644
--- a/dev-vcs/git-lfs/git-lfs-9999.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 EGO_PN=github.com/git-lfs/git-lfs
 inherit go-module