gentoo resync : 23.06.2018

4 files changed, 75 insertions, 21 deletions

diff --git a/app-crypt/kbfs/Manifest b/app-crypt/kbfs/Manifest
index 08aa82de562f..4705a3580656 100644
--- a/app-crypt/kbfs/Manifest
+++ b/app-crypt/kbfs/Manifest
@@ -3,12 +3,14 @@ DIST kbfs-1.0.40.tar.gz 5432507 BLAKE2B 4d3c55d3c081cb7fea44d302a1a5598df515f98f
 DIST kbfs-1.0.44.tar.gz 5440024 BLAKE2B b8ab744b1bb9fa2e33bd382df92f1e50ed294446106d5723306465cbbadc0e960ad0da834671fa7f01e7ea8ff3486477972f44e927feefd1123d8a8ad4e376f5 SHA512 03e92303f140dbff059f8c954142d6180f388c1e50c2f8af02a30a740d440d5f79be47ad851d021a2b90525bf7b775e471780438b94d1d6403eddbdc0bd41e8e
 DIST kbfs-1.0.48.tar.gz 5639704 BLAKE2B 4d8152c8bf1a72b0493840c6ffa0da35ba6abcb677a9a15ee88745b7b870c9f2923061751e66b6d54ff12c92bcd74d7c6ce8320cb7c7cd6f75e1cd62ccf13803 SHA512 89b391223e2c7014e64c09e5303c7b89bea2508331b5d53facf8802de2442c4e53a4d79f65c085a2b3234762b334d3d36e903867ef841140d44207926d82991c
 DIST kbfs-2.0.0.tar.gz 5674786 BLAKE2B 65924644babbaf95867792da6a9c1f5c9c517bbe36292c3b5e40afaeb2879b1145d0b6017f3b66e6bc2ec4b858a312ab1d86ff1d8515f99c9004eeb1acaf8caa SHA512 6e51490b52cc5484d940ee057dc9b453a88d44622b1c533dd29e75eed5fa075f33d9cb6ac438401d80aa148d7561c1bc63deece5e75cdc30bb54102f2d00215b
+DIST kbfs-2.1.0.tar.gz 5703221 BLAKE2B 55daa1d8f1efe4a0264477b54c1ea8db74e972b1ecdd536f4ab8042e66117c6854889aeb203fa6fea6f757e928af514520be3732ee07ccc1289ccc9f5d3f27a8 SHA512 04dd058e97c85d5188cc61a56cc4a4468ec1d4d6b2f65cbe0edb88cec2864cef3525e6f48729761a2cc6fa79559794e5a3fd9663cb31dcaaaeff90a32f2a211a
 EBUILD kbfs-1.0.36.ebuild 984 BLAKE2B 84ea9e3a3db5917cf000e56f7c4826c9d5210bbb22e157310028421383e308e0e164be7d57e0838694730e1dff645ba89ad991d9beef17eb1bf0c0823ef55e13 SHA512 79cfb2c88f09d7cf0050f25e5c4e8fe9ffdbdafa5e62b6943b8d690eb766cb51d2b657774f0eab9ba561478fd3e22d416b409485f9ba38512247e66b6acf0d00
 EBUILD kbfs-1.0.40.ebuild 952 BLAKE2B 0ad195fc7cfba58e764692d2eff0de4e365ef86e11606552961484e54ffc93f54d522c8a3b0e5900ae5a25ec72cd3ea24d346f7578055d7ac9b82326a2cfc41a SHA512 36c347cfbe3ee81a11916193c7757f5ed71e8253449595c07a73db6b34d576f989a9a1f8605f695b30c27ef9fe89e47e81cd45f2405e65b92eae736a74d44f7b
 EBUILD kbfs-1.0.44-r1.ebuild 1033 BLAKE2B 46055ea689aad784f6f93704f0cb99abde81c367fb4c10a9825da8e83b86422f8cd78f099a1c8ad3da6f44ca4c91090502de7d90e0a6c5cdbe42e99c1a710597 SHA512 6813ae23ea413bd3a1ef5d84b3f0fa642510e98bf08f64ee95d7f7dcc8cf2008f470d7b7af1b1a3d51327949a01824f5e0e44c6e16fb7a91dc526379a8ebe391
 EBUILD kbfs-1.0.44.ebuild 952 BLAKE2B 0ad195fc7cfba58e764692d2eff0de4e365ef86e11606552961484e54ffc93f54d522c8a3b0e5900ae5a25ec72cd3ea24d346f7578055d7ac9b82326a2cfc41a SHA512 36c347cfbe3ee81a11916193c7757f5ed71e8253449595c07a73db6b34d576f989a9a1f8605f695b30c27ef9fe89e47e81cd45f2405e65b92eae736a74d44f7b
 EBUILD kbfs-1.0.48.ebuild 1001 BLAKE2B 83bb03c8b7d135e60d353c259effcd1ad6e2d5c8efd305b740961ad7b1921c8e30b37db8306644003df0a8a9d2b2f8f0cb4bbf63f3772f98d8c323681ef8043f SHA512 648be76efdd357dbfe3ed611c58cadd3b9fa30469392f6d3b3352bac961a421960a7d4919c5ea373c0418dd48a71fbe4e92044fb608f9b463b92fbc87a3e17a2
-EBUILD kbfs-2.0.0-r1.ebuild 1174 BLAKE2B b517c61c802bde845a815c72f2de5d2555bf8796488a30421ec2a8844a3c60cfbf7b3a45e666bf919989fe648f7a6c55a203b2adc59cda29261f82af611f57a5 SHA512 0ff66528fb5f66fc1583b47dc6321163dac6d46848862b73f16f33567aa7ad4983dfaf324e1d60ee5d8b9648c65e896964ee9a030d624d009308d7fa2b27f129
+EBUILD kbfs-2.0.0-r1.ebuild 1259 BLAKE2B 2245307f05dfceab185249d48b8ff5db84c5f1f052bf9068336677f1803ebf312ccfdf5ee3be92696e492b4338ef7a3522a47e5c5077908c6665428db1863c19 SHA512 9f028136347e29dfa3d87406fc7d352a2e4c051536c741063cc83650fc23f643288b5b671891377cf9923ac9f30c927979127a27a83fe9c6340515072621741c
 EBUILD kbfs-2.0.0.ebuild 1001 BLAKE2B 83bb03c8b7d135e60d353c259effcd1ad6e2d5c8efd305b740961ad7b1921c8e30b37db8306644003df0a8a9d2b2f8f0cb4bbf63f3772f98d8c323681ef8043f SHA512 648be76efdd357dbfe3ed611c58cadd3b9fa30469392f6d3b3352bac961a421960a7d4919c5ea373c0418dd48a71fbe4e92044fb608f9b463b92fbc87a3e17a2
-EBUILD kbfs-9999.ebuild 1007 BLAKE2B dcf566bc17fa1c74be4ade4e97aa418533a364850957c844b5c16d0b7e8417ed435642bb3e6750cb80603ce107fd7d4f8ae2d914882deff7d97baddaf6661eb5 SHA512 dcaaf8cbce2320affd5eef9c8b466a39faa5032370a0c1bef757798cbc992eaa72408e6b5aafed29f1f0bed7f13799ccb1bfd0f3770c21297ce969b3978760da
+EBUILD kbfs-2.1.0.ebuild 1259 BLAKE2B 2245307f05dfceab185249d48b8ff5db84c5f1f052bf9068336677f1803ebf312ccfdf5ee3be92696e492b4338ef7a3522a47e5c5077908c6665428db1863c19 SHA512 9f028136347e29dfa3d87406fc7d352a2e4c051536c741063cc83650fc23f643288b5b671891377cf9923ac9f30c927979127a27a83fe9c6340515072621741c
+EBUILD kbfs-9999.ebuild 1143 BLAKE2B 6a1f0b69fc416d0403194c0e77b8652d4d2e1d1104c9eff2bd516aa088aca067e5aaa11ef09eeaca3f721f236fb80b8a436a8fae5c4340f0f0f4b0ca655e9a40 SHA512 17ce0915dff90a653800d8bac496c3afaf38e458ed37a2bfdd7a61173ac698c735eb188810e06a899d3c71950a7dde8b46c8c0b1a966e9877e9d9812539a38f3
 MISC metadata.xml 482 BLAKE2B ea0f5fe2ae3d3c5cd10020f178e0233fe55a38174c10ccd54c50fcd2104c4a0dbe737b371cc49624fefbc2107b5697ee4c826466a5f14d7c952542edd1134414 SHA512 74eb8d2fb7b19f269dcf5dbc67a5f63cac1589343a069011dfe8492a0bc1d82b526a175b2fad91a00f7fd60e4a77bbf2b7f7dea4537d6ae9221a9e93ca2bdd60
diff --git a/app-crypt/kbfs/kbfs-2.0.0-r1.ebuild b/app-crypt/kbfs/kbfs-2.0.0-r1.ebuild
index c6b4d2bbe676..41a15fe68057 100644
--- a/app-crypt/kbfs/kbfs-2.0.0-r1.ebuild
+++ b/app-crypt/kbfs/kbfs-2.0.0-r1.ebuild
@@ -38,6 +38,11 @@ src_compile() {
 		golang-build_src_compile
 }
 
+src_test() {
+	EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
+		golang-build_src_test
+}
+
 src_install() {
 	dobin "${T}/kbfsfuse"
 	dobin "${T}/git-remote-keybase"
diff --git a/app-crypt/kbfs/kbfs-2.1.0.ebuild b/app-crypt/kbfs/kbfs-2.1.0.ebuild
new file mode 100644
index 000000000000..41a15fe68057
--- /dev/null
+++ b/app-crypt/kbfs/kbfs-2.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build systemd
+
+DESCRIPTION="Keybase Filesystem (KBFS)"
+HOMEPAGE="https://keybase.io/docs/kbfs"
+SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-crypt/gnupg
+	sys-fs/fuse
+	"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -vp "${S}/src/github.com/keybase" || die
+	ln -vs "${S}" "${S}/src/github.com/keybase/kbfs" || die
+}
+
+src_compile() {
+	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_test() {
+	EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
+		golang-build_src_test
+}
+
+src_install() {
+	dobin "${T}/kbfsfuse"
+	dobin "${T}/git-remote-keybase"
+	dobin "${T}/keybase-redirector"
+	systemd_douserunit "${S}/packaging/linux/systemd/kbfs.service"
+}
diff --git a/app-crypt/kbfs/kbfs-9999.ebuild b/app-crypt/kbfs/kbfs-9999.ebuild
index e3870b505ace..6c648020c5ec 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"
 }