From d1ff69c7b3de3dc6a86ea45082e97f42b74c0565 Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 28 Jan 2022 07:20:47 +0000 Subject: dev-vcs/git-lfs: allow app-text/ronn-ng instead of app-text/ronn ronn is going away and is replaced by ronn-ng. (Revbump because otherwise the package manager has no reason to be aware that it can be liberated of app-text/ronn and choose app-text/ronn-ng otherwise, when app-text/ronn gets masked.) Bug: https://bugs.gentoo.org/770907 Signed-off-by: Sam James --- dev-vcs/git-lfs/git-lfs-2.11.0-r1.ebuild | 62 ++++++++++++++++++++++++++++ dev-vcs/git-lfs/git-lfs-2.11.0.ebuild | 62 ---------------------------- dev-vcs/git-lfs/git-lfs-2.13.3-r1.ebuild | 70 ++++++++++++++++++++++++++++++++ dev-vcs/git-lfs/git-lfs-2.13.3.ebuild | 70 -------------------------------- dev-vcs/git-lfs/git-lfs-9999.ebuild | 4 +- 5 files changed, 134 insertions(+), 134 deletions(-) create mode 100644 dev-vcs/git-lfs/git-lfs-2.11.0-r1.ebuild delete mode 100644 dev-vcs/git-lfs/git-lfs-2.11.0.ebuild create mode 100644 dev-vcs/git-lfs/git-lfs-2.13.3-r1.ebuild delete mode 100644 dev-vcs/git-lfs/git-lfs-2.13.3.ebuild (limited to 'dev-vcs') diff --git a/dev-vcs/git-lfs/git-lfs-2.11.0-r1.ebuild b/dev-vcs/git-lfs/git-lfs-2.11.0-r1.ebuild new file mode 100644 index 000000000000..5db47f6cb90f --- /dev/null +++ b/dev-vcs/git-lfs/git-lfs-2.11.0-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +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 )" + +src_compile() { + set -- go build \ + -ldflags="-X ${EGO_PN}/config.GitCommit=${GIT_COMMIT}" \ + -mod vendor -v -work -x \ + -o git-lfs git-lfs.go + echo "$@" + "$@" || die + + if use doc; then + ronn docs/man/*.ronn || die "man building failed" + fi +} + +src_install() { + dobin git-lfs + dodoc {CHANGELOG,CODE-OF-CONDUCT,CONTRIBUTING,README}.md + use doc && doman docs/man/*.1 +} + +src_test() { + set -- go test \ + -ldflags="-X ${EGO_PN}/config.GitCommit=${GIT_COMMIT}" \ + -mod vendor \ + ./... + echo "$@" + "$@" || 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-2.11.0.ebuild b/dev-vcs/git-lfs/git-lfs-2.11.0.ebuild deleted file mode 100644 index 6fdbdcf910e1..000000000000 --- a/dev-vcs/git-lfs/git-lfs-2.11.0.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -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 )" -RDEPEND="dev-vcs/git" - -RESTRICT+=" !test? ( test )" - -src_compile() { - set -- go build \ - -ldflags="-X ${EGO_PN}/config.GitCommit=${GIT_COMMIT}" \ - -mod vendor -v -work -x \ - -o git-lfs git-lfs.go - echo "$@" - "$@" || die - - if use doc; then - ronn docs/man/*.ronn || die "man building failed" - fi -} - -src_install() { - dobin git-lfs - dodoc {CHANGELOG,CODE-OF-CONDUCT,CONTRIBUTING,README}.md - use doc && doman docs/man/*.1 -} - -src_test() { - set -- go test \ - -ldflags="-X ${EGO_PN}/config.GitCommit=${GIT_COMMIT}" \ - -mod vendor \ - ./... - echo "$@" - "$@" || 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-2.13.3-r1.ebuild b/dev-vcs/git-lfs/git-lfs-2.13.3-r1.ebuild new file mode 100644 index 000000000000..2cf565a6aba2 --- /dev/null +++ b/dev-vcs/git-lfs/git-lfs-2.13.3-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +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-2.13.3.ebuild b/dev-vcs/git-lfs/git-lfs-2.13.3.ebuild deleted file mode 100644 index 5c5be39ec301..000000000000 --- a/dev-vcs/git-lfs/git-lfs-2.13.3.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -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 )" -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 641f9c79a60b..9074b5b98409 100644 --- a/dev-vcs/git-lfs/git-lfs-9999.ebuild +++ b/dev-vcs/git-lfs/git-lfs-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,7 +20,7 @@ LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT" SLOT="0" IUSE="doc test" -BDEPEND="doc? ( app-text/ronn )" +BDEPEND="doc? ( || ( app-text/ronn-ng app-text/ronn ) )" RDEPEND="dev-vcs/git" RESTRICT+=" !test? ( test )" -- cgit v1.2.3-65-gdbad