7 files changed, 104 insertions, 2 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index b667a154486a..336c6b85bc0c 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/kbfs/Manifest b/app-crypt/kbfs/Manifest
index 696fd1a1b0d0..bd56b33eea87 100644
--- a/app-crypt/kbfs/Manifest
+++ b/app-crypt/kbfs/Manifest
@@ -1,2 +1,4 @@
+DIST kbfs-1.0.36.tar.gz 5135197 BLAKE2B a0d40048d11347a72ac9fedb358be7bd8d425e9eafc32fce44e75583aa75fde00bee62d81e7d4bc1553aec3f72ca3af1dffd1ef710d897ce28cb26d152eab4aa SHA512 eb50c4fdd07e0d0e0bd62c48a60520fe48a6b64d97e6ac561d0c567e50c4863f9969697f78553360e6b42776af4974b086bd0be75db6de4c28a5c4a840725919
+EBUILD kbfs-1.0.36.ebuild 981 BLAKE2B f3a311d0644358ad3dab873def9a190f92fb9b6717ede8c73e575ff5a0d4fd4f8e022ebaf61cafabe9b7e972c174f8fee9dc4c0055652d24391d7cbe92b568b3 SHA512 4586fd55f96a723b41e5391ae78ad4b96313e8d314feb3e3daf0bdd2e61f917f6ba68d747350f65a4e7d486616c8ca2944baffd8448103e0e12929a607b8b37f
 EBUILD kbfs-9999.ebuild 967 BLAKE2B 9e1527b134c7b6bc4343852c5f132b44827b0097b8b5c0e46ee46136b9d2b19db69f9a07a1b7cfdd3f57fa73d94a73fbf00baae36cb63a1743e625db168681f5 SHA512 99e2c177cfa9f4b9074600425f5587efe19c0341d49e62dd0ef02950c47f298c007ed027bd37ceb21719309241fe3ec1ecf40fa8b3c740c3cb8f1243145955f0
 MISC metadata.xml 482 BLAKE2B ea0f5fe2ae3d3c5cd10020f178e0233fe55a38174c10ccd54c50fcd2104c4a0dbe737b371cc49624fefbc2107b5697ee4c826466a5f14d7c952542edd1134414 SHA512 74eb8d2fb7b19f269dcf5dbc67a5f63cac1589343a069011dfe8492a0bc1d82b526a175b2fad91a00f7fd60e4a77bbf2b7f7dea4537d6ae9221a9e93ca2bdd60
diff --git a/app-crypt/kbfs/kbfs-1.0.36.ebuild b/app-crypt/kbfs/kbfs-1.0.36.ebuild
new file mode 100644
index 000000000000..400d78a77deb
--- /dev/null
+++ b/app-crypt/kbfs/kbfs-1.0.36.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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="
+	>=dev-lang/go-1.6:0
+	>=app-crypt/keybase-1.0.36
+	"
+RDEPEND="
+	app-crypt/gnupg
+	sys-fs/fuse
+	"
+
+S="${WORKDIR}/src/github.com/keybase/kbfs"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -p "$(dirname "${S}")" || die
+	mv "kbfs-${PV}" "${S}" || 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
+}
+
+src_install() {
+	dobin "${T}/kbfsfuse"
+	use git && \
+		dobin "${T}/git-remote-keybase"
+}
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
index 0e4947e7a3ee..4baffda655d0 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -1,8 +1,10 @@
 DIST keybase-1.0.21.tar.gz 21127410 BLAKE2B 9f48b637aefa847ae5737937ed6bc3d9b7d222cda3ce5a388784104655092c1ad5fe0468680a1e0a02f5a7ea4fac1fb8e19430c9e4c3d542057953219976cd02 SHA512 60801ece5dc0df9f0da58143baf00729e1a79183d2b8209c405749f422dd8cecf7f4059e0799c88ca6e3f1e5a7ad8bd6805dd2401b0945954c6b1465c04974b5
 DIST keybase-1.0.33.tar.gz 29170354 BLAKE2B 78799ea49cde32e3c1be781e281b5ca188f7a5d846fcb7e41605d6e2526bc4e36f6ef991567631e9c72eeb6b194ebec740516e886f4af419b01e47622f030c42 SHA512 d02933e88613102e27a4aa5f2494ae2b55456cab8c5cadad9c412069b24c574a20609fc83b88bc8f9aa00bfd300822bc4c882392f65fec3e7a8056cebc6fb9d4
 DIST keybase-1.0.36.tar.gz 30043919 BLAKE2B 0053088754b0a4a47314032e87a7c5165aff59ded585ae20fb12c3dbf0c7437f7f0370f236fec0db501cacb3a75e87ed494df8f688d360c58904e851eb119f60 SHA512 c6bd4805240bdafd27eac382a30fac6e5ac3e6eb313dda027533c3a8f366077c894b38c1b972ff5688104e1ca4231cbf4242eeb168de9782bbac732da5639ed0
+DIST keybase-1.0.39.tar.gz 30226025 BLAKE2B 5d10e4afe3f0f1691221cbf69ff3e427fe318768e74f5891d32416e92ad5c1c45ad3ff0c83ea2d2405f4492a2d2af989ff587c60c9a5677ae580c9502e9a5726 SHA512 def416bad6fc3513a3341aecaf03bce356a890667e4c64f9edc1c469b3a1f167c3022f6c1aabaa48257983aaa9826b45117ada6cc26bf862c97092c904cd32f1
 EBUILD keybase-1.0.21.ebuild 917 BLAKE2B 2b07280d94ecfbd1e1320b2822ef82c00956cfc2d739ea32a372cb0923363578210dd2af4da73bd1608c7eb712dbb9126cd22d352579abf9c9db9fe567ebfb8f SHA512 eea7d2c7a7df423dfa99f7a4e5b1fcac446bc9a170a26f0cd6bc4a695e9a1f1c8008b558bcbf39a0e90e531c88bba2e77a352a7ae72cfca259e6907265373b38
 EBUILD keybase-1.0.33.ebuild 917 BLAKE2B 2b07280d94ecfbd1e1320b2822ef82c00956cfc2d739ea32a372cb0923363578210dd2af4da73bd1608c7eb712dbb9126cd22d352579abf9c9db9fe567ebfb8f SHA512 eea7d2c7a7df423dfa99f7a4e5b1fcac446bc9a170a26f0cd6bc4a695e9a1f1c8008b558bcbf39a0e90e531c88bba2e77a352a7ae72cfca259e6907265373b38
 EBUILD keybase-1.0.36.ebuild 959 BLAKE2B 36385869dc6a89104de7df5986b086c1531819a46351c62578e8d672ea4e5271b137a1cb84221de497a7b560937ce14a60ae3c60ea3634d77aad175cc5033f6a SHA512 c81f68541117d81ea1b5f68877e8ecb07962b4677d4039f74d815b15468bc6a72c68991dd76f12ce14cb43f5b81b9e897d136a9cfa69d02f77e7797aed0e3076
+EBUILD keybase-1.0.39.ebuild 959 BLAKE2B 36385869dc6a89104de7df5986b086c1531819a46351c62578e8d672ea4e5271b137a1cb84221de497a7b560937ce14a60ae3c60ea3634d77aad175cc5033f6a SHA512 c81f68541117d81ea1b5f68877e8ecb07962b4677d4039f74d815b15468bc6a72c68991dd76f12ce14cb43f5b81b9e897d136a9cfa69d02f77e7797aed0e3076
 EBUILD keybase-9999.ebuild 893 BLAKE2B dd27632b3d771ba1e50bf4ba115f4e7a4b096d2245b7e8ed2f0bee425ebcef5ff01f430d7880466705a5b217415b5057ba0a9360d7efcfaa766528fc24799494 SHA512 763f66c3a48a668a5382cad7ddef2d1bc2c4874a6bf226f2930401f1e932104631a68ee89b9cd37bf794959447b64381c04ea60567c38ecb625b64d9267ed5a5
 MISC metadata.xml 465 BLAKE2B a1dcb592edbf2e5a45bd985adea8fa09504f75b17f689f38c415dff3efd0a4c67b3476c8c7568dc2b8351117281c94da4235cb1b9144d1636f04ae3b2055164e SHA512 68da266d0856035ec7f0b2ac5f8746ad6c7afa023ccf2d592be43fbf45f12f1443afdceb075ab57efeeceb97dfcc0a3997ed7177e12ae6291467e97c17e10810
diff --git a/app-crypt/keybase/keybase-1.0.39.ebuild b/app-crypt/keybase/keybase-1.0.39.ebuild
new file mode 100644
index 000000000000..9a1ab8b086c0
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.39.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/go-1.6:0"
+RDEPEND="
+	app-crypt/gnupg"
+
+S="${WORKDIR}/src/github.com/keybase/client"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -p "$(dirname "${S}")" || die
+	mv "client-${MY_PV}" "${S}" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}:${S}/go/vendor" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/keybase" \
+		github.com/keybase/client/go/keybase || die
+}
+
+src_install() {
+	dobin "${T}/keybase"
+	dobin "${S}/packaging/linux/run_keybase"
+}
+
+pkg_postinst() {
+	elog "Run the service: keybase service"
+	elog "Run the client:  keybase login"
+}
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 75e167fd0e18..01341db9a9c5 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -3,5 +3,5 @@ AUX pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch 1571 BLAKE2B
 AUX pinentry-1.0.0-build.patch 6634 BLAKE2B f5bd7f10e62ea603add875e14a69f30fbc6a2f8df463fa5c70531dd3f425a9219e36198380fcdd0906b670692bba49fb157807fae1c05a7be6f420b27e7426c0 SHA512 cd71552db3c4ab3bd7dd34d5009ad332e5a430ae1e909085cac6a04e63801086cac18916af65a37c110c2b667054c356f38dcc8af43468a23b1b562bf6dbafec
 AUX pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch 1900 BLAKE2B b9e7aa8f87615d4780af3361dd85907bf249891c108d51c001b44a5b55c697573c314e20fa2d8ec3df95c71b3aabfd2099e4efce4a0fdc3265fc483e785c3c23 SHA512 0b35900e4641c72c6b28b19bd252ffcabe14669e037c710a1057157fac0b65c709711a5667b66fd07afb433fc1c67509ec84eaddb822213d3ddc4ff7b549967e
 DIST pinentry-1.0.0.tar.bz2 436930 BLAKE2B 949be8de8504a42cd5bd6ffebe331a825db7ff3c2ccc5fc554155b7621fddf9df957aa92063eb1a06c6964826a296bf60a4cc46cf2886552e37703a62042f35a SHA512 f109236707c51871b5020ef807a551366461fafcfbe09bf8cda19d4b163a42cf622562b905ceb41429f1d648b3f3d27807538709da6a135b67f9888709eccd62
-EBUILD pinentry-1.0.0-r2.ebuild 2888 BLAKE2B aa1c9770945d000d5ae644a23d8c3b5f32c2cee171b3fef8f63aef60aa27b55fb4a4d0a7a58773749680ce8700e0b894e538608072c3c8cf50ac5d178d38f06f SHA512 046581b037bfe95b7da1653a580833028c95db2b8c312f6e0fa4c3b9e30da327b419c8d6b9856fe77b8cb817316c0fc485486b9b95e46128a70eab94df8f0253
+EBUILD pinentry-1.0.0-r2.ebuild 2887 BLAKE2B 15277cbbc30e3e1026cf40b24806d298ceef948a9114deb96912a8dc2c4cc3107d87f6008a8cdafc21243037471c06afc6cc7c0a2a2c8573ee6bdce4cbc987ef SHA512 6d556a616ef2da65cf54c8d8e241a48008c8edf5da3d7f88780566167e2cc70c2df47265ac5ed304272d08e53aa54a802622d37fd700307d1a2e46ba1e9c5c14
 MISC metadata.xml 352 BLAKE2B 75bb4d471f7b82b6cfe614d5c2ed226df087792ed84803ce4b011c5ad0a5a1548a87c6ab4c17ffeef53eb64bdea262fda4f89d27c38950ff1ced736b38d7df59 SHA512 3817eb6ad931ab0ee363ed7f8612b08a44c0d02e7abb9d0734452c289350c9909ca4208acad01c54a3f1b260417c400f4692e37b34113c6d618680d41796e2d0
diff --git a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
index d283e76beb57..d667bef785ec 100644
--- a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
+++ b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps emacs gnome-keyring gtk ncurses qt5 static"
 
 CDEPEND="