commit: df8729934c545eb419da3f847d41cb760191a67f Author: Jeffrey Lin <jeffrey <AT> icurse <DOT> nl> AuthorDate: Sun Sep 16 16:45:34 2018 +0000 Commit: Ettore Di Giacinto <mudler <AT> gentoo <DOT> org> CommitDate: Sun Sep 23 11:24:48 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df872993
dev-vcs/git-lfs: update 9999 Signed-off-by: Jeffrey Lin <jeffrey <AT> icurse.nl> Package-Manager: Portage-2.3.49, Repoman-2.3.10 Signed-off-by: Ettore Di Giacinto <mudler <AT> gentoo.org> dev-vcs/git-lfs/git-lfs-9999.ebuild | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/dev-vcs/git-lfs/git-lfs-9999.ebuild b/dev-vcs/git-lfs/git-lfs-9999.ebuild index 7a32ca36cc9..90878f67a22 100644 --- a/dev-vcs/git-lfs/git-lfs-9999.ebuild +++ b/dev-vcs/git-lfs/git-lfs-9999.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -EGO_PN="github.com/git-lfs/${PN}" +EGO_PN="github.com/${PN}/${PN}" if [[ ${PV} == *9999 ]]; then - inherit golang-vcs + inherit golang-build golang-vcs else SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" - inherit golang-vcs-snapshot + inherit golang-build golang-vcs-snapshot fi DESCRIPTION="command line extension and specification for managing large files with Git" @@ -20,20 +20,13 @@ LICENSE="MIT BSD BSD-2 BSD-4 Apache-2.0" SLOT="0" IUSE="+doc" -# since version 2.0.2 git-lfs uses time.Until that was introduced in golang >=1.8 -# https://github.com/golang/go/commit/67ea710792eabdae1182e2bf4845f512136cccce -DEPEND=">=dev-lang/go-1.8.1:= - doc? ( app-text/ronn )" - +DEPEND="doc? ( app-text/ronn )" RDEPEND="dev-vcs/git" S="${WORKDIR}/${P}/src/${EGO_PN}" src_compile() { - # can't use golang-build_src_compile for go generate - # and others steps executed by build.go - GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \ - go run script/*.go -cmd build || die "build failed" + golang-build_src_compile if use doc; then ronn docs/man/*.ronn || die "man building failed" @@ -41,7 +34,6 @@ src_compile() { } src_install() { - dobin bin/git-lfs - + dobin git-lfs use doc && doman docs/man/*.1 }