From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EAA59138334 for ; Sun, 23 Sep 2018 11:27:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9B1D4E07C7; Sun, 23 Sep 2018 11:27:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 72796E07C7 for ; Sun, 23 Sep 2018 11:27:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A4BC1335CC7 for ; Sun, 23 Sep 2018 11:26:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D0B4D3E0 for ; Sun, 23 Sep 2018 11:26:56 +0000 (UTC) From: "Ettore Di Giacinto" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ettore Di Giacinto" Message-ID: <1537701888.df8729934c545eb419da3f847d41cb760191a67f.mudler@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-lfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/git-lfs/git-lfs-9999.ebuild X-VCS-Directories: dev-vcs/git-lfs/ X-VCS-Committer: mudler X-VCS-Committer-Name: Ettore Di Giacinto X-VCS-Revision: df8729934c545eb419da3f847d41cb760191a67f X-VCS-Branch: master Date: Sun, 23 Sep 2018 11:26:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c1b7a4a6-0cc6-4d78-adbb-5c35e1105578 X-Archives-Hash: b2bbdea049459826f698bdd818db28f7 commit: df8729934c545eb419da3f847d41cb760191a67f Author: Jeffrey Lin icurse nl> AuthorDate: Sun Sep 16 16:45:34 2018 +0000 Commit: Ettore Di Giacinto gentoo 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 icurse.nl> Package-Manager: Portage-2.3.49, Repoman-2.3.10 Signed-off-by: Ettore Di Giacinto 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 }