[gentoo-commits] repo/gentoo:master commit in: app-crypt/kbfs/

[Nicolas Bock]

commit:     22fc382893467a8f4a3a58db4e27b6d513bd98aa
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 18 04:23:26 2018 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> 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 <nicolasbock <AT> 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"
 }