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 ABD14138334 for ; Mon, 18 Jun 2018 04:31:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 75214E089A; Mon, 18 Jun 2018 04:31:01 +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 3418BE089A for ; Mon, 18 Jun 2018 04:31: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 739E0335C7E for ; Mon, 18 Jun 2018 04:30:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A84E52E0 for ; Mon, 18 Jun 2018 04:30:57 +0000 (UTC) From: "Nicolas Bock" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nicolas Bock" Message-ID: <1529296201.22fc382893467a8f4a3a58db4e27b6d513bd98aa.nicolasbock@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/kbfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/kbfs/kbfs-9999.ebuild X-VCS-Directories: app-crypt/kbfs/ X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: 22fc382893467a8f4a3a58db4e27b6d513bd98aa X-VCS-Branch: master Date: Mon, 18 Jun 2018 04:30:57 +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: bff0fcf2-2f77-4f7f-ad52-74789b9ea066 X-Archives-Hash: 35c8ba81ef91d26699663e3293ecad83 commit: 22fc382893467a8f4a3a58db4e27b6d513bd98aa Author: Nicolas Bock gentoo org> AuthorDate: Mon Jun 18 04:23:26 2018 +0000 Commit: Nicolas Bock gentoo org> CommitDate: Mon Jun 18 04:30:01 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22fc3828 app-crypt/kbfs: Fix live ebuild This change adds all of the features of kbfs-2.0.0 to the live ebuild. Signed-off-by: Nicolas Bock gentoo.org> Package-Manager: Portage-2.3.40, Repoman-2.3.9 app-crypt/kbfs/kbfs-9999.ebuild | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/app-crypt/kbfs/kbfs-9999.ebuild b/app-crypt/kbfs/kbfs-9999.ebuild index e3870b505ac..6c648020c5e 100644 --- a/app-crypt/kbfs/kbfs-9999.ebuild +++ b/app-crypt/kbfs/kbfs-9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit git-r3 systemd +inherit git-r3 golang-build systemd DESCRIPTION="Keybase Filesystem (KBFS)" HOMEPAGE="https://keybase.io/docs/kbfs" @@ -14,37 +14,33 @@ SLOT="0" KEYWORDS="" IUSE="git" -DEPEND=">=dev-lang/go-1.6:0" +DEPEND="" RDEPEND=" app-crypt/gnupg sys-fs/fuse " -S="${WORKDIR}/src/github.com/keybase/kbfs" - src_unpack() { git-r3_src_unpack - mkdir -p "$(dirname "${S}")" || die - ln -s "${WORKDIR}/${P}" "${S}" || die + mkdir -vp "${S}/src/github.com/keybase" || die + ln -vs "${S}" "${S}/src/github.com/keybase/kbfs" || die } src_compile() { - GOPATH="${WORKDIR}" \ - go build -v -x \ - -tags production \ - -o "${T}/kbfsfuse" \ - github.com/keybase/kbfs/kbfsfuse - use git && \ - GOPATH="${WORKDIR}" \ - go build -v -x \ - -tags production \ - -o "${T}/git-remote-keybase" \ - github.com/keybase/kbfs/kbfsgit/git-remote-keybase + EGO_PN="github.com/keybase/kbfs/kbfsfuse" \ + EGO_BUILD_FLAGS="-tags production -o ${T}/kbfsfuse" \ + golang-build_src_compile + EGO_PN="github.com/keybase/kbfs/kbfsgit/git-remote-keybase" \ + EGO_BUILD_FLAGS="-tags production -o ${T}/git-remote-keybase" \ + golang-build_src_compile + EGO_PN="github.com/keybase/kbfs/redirector" \ + EGO_BUILD_FLAGS="-tags production -o ${T}/keybase-redirector" \ + golang-build_src_compile } src_install() { dobin "${T}/kbfsfuse" - use git && \ - dobin "${T}/git-remote-keybase" + dobin "${T}/git-remote-keybase" + dobin "${T}/keybase-redirector" systemd_douserunit "${S}/packaging/linux/systemd/kbfs.service" }