From 70a8e0f526762c28622fae5f944f8f59f9abf728 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 25 Sep 2023 11:25:16 +0100 Subject: gentoo auto-resync : 25:09:2023 - 11:25:16 --- dev-vcs/Manifest.gz | Bin 11526 -> 11522 bytes dev-vcs/git-lfs/Manifest | 4 +- dev-vcs/git-lfs/git-lfs-3.4.0-r1.ebuild | 105 ++++++++++++++++++++++++++++++++ dev-vcs/git-lfs/git-lfs-3.4.0.ebuild | 92 ---------------------------- dev-vcs/git-lfs/git-lfs-9999.ebuild | 17 +++++- 5 files changed, 122 insertions(+), 96 deletions(-) create mode 100644 dev-vcs/git-lfs/git-lfs-3.4.0-r1.ebuild delete mode 100644 dev-vcs/git-lfs/git-lfs-3.4.0.ebuild (limited to 'dev-vcs') diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz index 2cd3b6cc1a27..c5f5702734e6 100644 Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest index cd4c68b112c5..45aaee619225 100644 --- a/dev-vcs/git-lfs/Manifest +++ b/dev-vcs/git-lfs/Manifest @@ -2,6 +2,6 @@ DIST git-lfs-3.2.0.tar.gz 3270970 BLAKE2B fc235d48e44f8a0f446b05914cd110e6486481 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 -EBUILD git-lfs-3.4.0.ebuild 2314 BLAKE2B 49ed8f3eadbf7fc9a88121cd31306177ee19451fedcf0e57f181b3113f5471073c0d205bba1e8fa12c07ed4c648ce5c524b14cd2f9716e0957c159ea588ed15d SHA512 0933bff8ec022e49a190555c0ee04688048198dce21649bf047c6c4746a65a06c8aed1dc0be14f7cac89f0d73c27d7b5ec2bdffd612c6a59fdf605a52c0f14d1 -EBUILD git-lfs-9999.ebuild 2314 BLAKE2B 49ed8f3eadbf7fc9a88121cd31306177ee19451fedcf0e57f181b3113f5471073c0d205bba1e8fa12c07ed4c648ce5c524b14cd2f9716e0957c159ea588ed15d SHA512 0933bff8ec022e49a190555c0ee04688048198dce21649bf047c6c4746a65a06c8aed1dc0be14f7cac89f0d73c27d7b5ec2bdffd612c6a59fdf605a52c0f14d1 +EBUILD git-lfs-3.4.0-r1.ebuild 2684 BLAKE2B 9299001c5d8620bf2a850a8336ebd50329d9d0fcb865a2023bb34865eff3190b651d859f74ca9eb65dcfb9a61671f4be93a6c8ab50ef437e20d8f1a129c0bb09 SHA512 0d56bd6d3d42006749d21d18c96c601b74fc5f62b930c611164917b12522f562258796cd1047bfef4d4d1ee60e866cf0163869e1ea8513799d096d9f3cf63d1b +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.4.0-r1.ebuild b/dev-vcs/git-lfs/git-lfs-3.4.0-r1.ebuild new file mode 100644 index 000000000000..cbd1a55aa124 --- /dev/null +++ b/dev-vcs/git-lfs/git-lfs-3.4.0-r1.ebuild @@ -0,0 +1,105 @@ +# 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="d06d6e9efd78ff4f958b072146ce167d87f60285" + +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: + # 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 +} diff --git a/dev-vcs/git-lfs/git-lfs-3.4.0.ebuild b/dev-vcs/git-lfs/git-lfs-3.4.0.ebuild deleted file mode 100644 index 10b83717c479..000000000000 --- a/dev-vcs/git-lfs/git-lfs-3.4.0.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# 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="d06d6e9efd78ff4f958b072146ce167d87f60285" - -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}/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: - # 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 - ) - 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 10b83717c479..cbd1a55aa124 100644 --- a/dev-vcs/git-lfs/git-lfs-9999.ebuild +++ b/dev-vcs/git-lfs/git-lfs-9999.ebuild @@ -6,7 +6,7 @@ EGO_PN=github.com/git-lfs/git-lfs # Update the ID as it's included in each build. COMMIT_ID="d06d6e9efd78ff4f958b072146ce167d87f60285" -inherit go-module +inherit go-module shell-completion DESCRIPTION="Command line extension and specification for managing large files with git" HOMEPAGE=" @@ -61,18 +61,31 @@ src_compile() { -trimpath -v -work -x ) - go build "${mygobuildargs[@]}" -o git-lfs git-lfs.go || die + 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 } -- cgit v1.2.3