gentoo resync : 04.08.2018

37 files changed, 251 insertions, 170 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 4c4632f46d46..0c745067e722 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/codecrypt/Manifest b/app-crypt/codecrypt/Manifest
index b87f69c22d96..d79a2bdc513b 100644
--- a/app-crypt/codecrypt/Manifest
+++ b/app-crypt/codecrypt/Manifest
@@ -1,5 +1,5 @@
 DIST codecrypt-1.7.2.tar.gz 446975 BLAKE2B 40b7f97dae84a0fd621ee19c6bfeba47b781a7f856ce9c077445d6387b75b97dce0fc02ee9481241b246b0eb7de6b44ac014a708a8ceba629828ca9d63b8e24c SHA512 4ad2ad9e665e486e353b48efff344436b276eac2dcbddcf4330796b8f1f06284eaeec9c4f4ef63f61e4477c3bce0973f60f76291dce11bee31a75658bee6a3a0
 DIST codecrypt-1.8.tar.gz 471273 BLAKE2B 30547c299689547b50e2742e12dbfd32f420217a81813446b36bf5ea52929ca1f3b1968d76937de17e0f003c82186abfa683a6e30dc1fa5dc2ffe89594827ae4 SHA512 0e452f4e93498faa671a5927a3dd93b6dc66cbda7eb71cb33a509f8608573eff5ac8fed0d5e09911e03c153b88c9cb1bb54f7b2aeeb7b6c31eec918ad9685102
 EBUILD codecrypt-1.7.2.ebuild 672 BLAKE2B 525178d3411173523afa24e0df3fd117095f34fab99ed4d8666e2be34b7408de6311b06088a8cdcdc4dfc43f179c86abc70ed769aa0dd978ae5e3ec60730d176 SHA512 a43435250a021b7418bf2e5eb1573237bfda0690bd65e6df597700dd9ef3bdf7ac316ae164bded683e8e7412fe1e57bf7428b0f629d6f614f1b2b7ef64d68f5e
-EBUILD codecrypt-1.8.ebuild 698 BLAKE2B 1503c168832401752ed9c97900c491c6656facd16deb7864374fd6de64340d741b80b27ce1bd26d65ab15cf0079efccbaff6c0d3e1e462cd38eaec47ba09bad2 SHA512 2ee7d6740af6fd54cc77eb8dd3bb79b787c6a09256cc426a27bdece3c30735fb3d63b8dde6919ddaac5bb1bfe0ed7e1eb347b22f407682fb79f42a2962e7f874
+EBUILD codecrypt-1.8-r1.ebuild 713 BLAKE2B fbe2c5bcba08834f475dc9655fe6b8623f1d44a9cb2743e5762ea69f04832fcb7fbd02312ef200b628ad35e05bc3fdc5c3ea1436656943cac2ef08eab2e74030 SHA512 fcfe53551ce1fa4c5de259a162b6dc485a3efcd6a05bfe4deb66a437a4dba289d32f4de2608dbd01b2c70596a1cfba759b0326a70c785799789bc84ff9e5f811
 MISC metadata.xml 757 BLAKE2B 5346ca41ed3210ef96baa63fc22e5733d47d8998f7b0cca37cd0aed53b67a7adf5bd8cbedd68d4194476ec7ff0fe83196038766cdbb3580b185566abca76ad9e SHA512 f7e7f6a747c42a666bd0b5de69999fd377374da728c9c98f8e57fa4c7fd93e97a7a7a721c568ba920c4cbe5f5591f4174db99d89fd209df7aecbad06f59f75a3
diff --git a/app-crypt/codecrypt/codecrypt-1.8.ebuild b/app-crypt/codecrypt/codecrypt-1.8-r1.ebuild
index f885b161e891..effd43182526 100644
--- a/app-crypt/codecrypt/codecrypt-1.8.ebuild
+++ b/app-crypt/codecrypt/codecrypt-1.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,14 +15,13 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+cryptopp"
 
 DEPEND="dev-libs/gmp:=
-	cryptopp? ( dev-libs/crypto++ )
+	cryptopp? ( >=dev-libs/crypto++-7 )
 	sci-libs/fftw:3.0"
 RDEPEND="${DEPEND}"
-
 src_prepare() {
 	default
-	# workaround -- gentoo is missing crypto++ pkg-config file
-	sed -i -e 's/PKG_CHECK_MODULES(\[CRYPTOPP\],.*/LDFLAGS="$LDFLAGS -lcrypto++"/' configure.ac || die
+	# workaround -- the library renamed the pkg-config file
+	sed -i -e 's/PKG_CHECK_MODULES(\[CRYPTOPP\],.*/PKG_CHECK_MODULES([CRYPTOPP], [libcryptopp])/' configure.ac || die
 	eautoreconf
 }
 
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index 09a8bca846fe..9f94ea55286f 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -4,4 +4,4 @@ DIST efitools-1.7.0.tar.bz2 96042 BLAKE2B b0042df906282d878b1400c359c1eece24588f
 DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0 SHA512 114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a
 EBUILD efitools-1.7.0.ebuild 787 BLAKE2B 9c2daade67b20bb4fb7b38413ff174695a40889e509c0828f68fc8d1eb1a0d0c7ed2cdc32d05608cff53317c4ca4db3133ec041cb86ffdac2b1d1287c00c3043 SHA512 66b40139afd0f071db68891152a25c9d6993be948e100817b26eb3fa547d09580bd4e9bfff8916c58a7f2bd38bfe4221edd1452d58a59e251629f5689f88740e
 EBUILD efitools-1.8.1.ebuild 1349 BLAKE2B ffc55485773daf9bfab8069f8c6b1cce41daef3bcd6d5df82868aeec8e0c8fc83f69b2b4cf9565b66f8e03ada9042637902d54516772ff850d79c17423c595b4 SHA512 e686d262e3973b1fe727d960d3b97bb284b1d3795644a2dccb89204b377db0e30d2b435174ed5d622f00da2256994a4c997fe92fdc2954dfe1964d25a1ab0ef5
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 217 BLAKE2B 42ce05c77b1d33a62b5cd9e26a0dbc801edf537bd1482da9f3680a430e3714cd9adea45649fd6bec858e3de1863d0c855451ae8fe1e4b8aa2c6b2ae9a8e343a3 SHA512 b9ca3681462c901c78bdc3ee840596fb6f5151d6b555abd1b74c570fa83e9b5b964cc0988538c892bbf70d2963add9d39af56a6fe353ca7641a6f3aede49be82
diff --git a/app-crypt/efitools/metadata.xml b/app-crypt/efitools/metadata.xml
index 7a38bb900964..c1f7c0b4ef2a 100644
--- a/app-crypt/efitools/metadata.xml
+++ b/app-crypt/efitools/metadata.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>tamiko@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/gentoo-keys/Manifest b/app-crypt/gentoo-keys/Manifest
index ba91833f7fd7..e25bebcb9e27 100644
--- a/app-crypt/gentoo-keys/Manifest
+++ b/app-crypt/gentoo-keys/Manifest
@@ -1,3 +1,3 @@
 DIST gentoo-keys-201807020151.tar.xz 53024 BLAKE2B 351f42e70ca44ac0020d7a18cf7fc6792ff0baa539daa2248a2b45b0c70e0048d4bddfd970e864b4cfc60940eb6e45a733cfd2dc3244bc21483f045c1421eca4 SHA512 b669735427f877c74b317e469d655501dd930c17e6a25920f38f7d96d0f7ce7c3ced4dd2e9f236877e9ae1131904c488925f9464bc402f835efaf827aef67dba
-EBUILD gentoo-keys-201807020151.ebuild 575 BLAKE2B 164315bb7f8aaf7e9e9be5a17cde523395c889b09f7ec03997794d345ec745f4c34f7fa0163f7b96b039f97687a02aa3cb1301ed1e6d567b7df838f206d61133 SHA512 d5d742618b419f79b5bf9363313ffeba0225dc5e6a4ccaf183ebf5de4eca55a181c352465cd3147fff3cde41bab0c59533cc7ee57af478aa4eccb5e22e6d08a8
+EBUILD gentoo-keys-201807020151.ebuild 570 BLAKE2B c3315cf909caf322e23f54c110b5813562c54747e7561e4aac9c51d6de2eb1d1a0b843e1fa092d5cf3abb666e1eb7f65f92f5f319b43aa372743eaa7c7feb629 SHA512 8ec502e9965ee23712183730e9f0eaef364668eefd589c67ddae916efdf5cc871bd15cfb9d5d1b63e2fa1b6282cff6c039fc92ffed4ba6e4a5b62e21ba9621e3
 MISC metadata.xml 257 BLAKE2B cf62bcaddae6a9a234fa866aa93f3f8435bc640ded3947993321f8a85e622a2cc0d3df0290bec76b227a4286544314e6a31dc37026482541b4922d6dc11d174a SHA512 62e56bca988936416042bb794e7c8dad9930a46c1f81f51c60a22f3f43e2d0babaacdbef430a6f8ecc8ea7d949effa6136b6d066dabb0a80fde55c36ea3c080c
diff --git a/app-crypt/gentoo-keys/gentoo-keys-201807020151.ebuild b/app-crypt/gentoo-keys/gentoo-keys-201807020151.ebuild
index 50b441af5487..f0d9517344dd 100644
--- a/app-crypt/gentoo-keys/gentoo-keys-201807020151.ebuild
+++ b/app-crypt/gentoo-keys/gentoo-keys-201807020151.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~dolsen/releases/keyrings/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 x64-cygwin amd64-fbsd amd64-linux x86-fbsd"
 
 S="${WORKDIR}"
 
diff --git a/app-crypt/glep63-check/Manifest b/app-crypt/glep63-check/Manifest
index 6f403e9ea45d..f992158e4f21 100644
--- a/app-crypt/glep63-check/Manifest
+++ b/app-crypt/glep63-check/Manifest
@@ -1,5 +1,7 @@
-DIST glep63-check-1.tar.gz 4632 BLAKE2B 3632199ca9ca8516a833aa6d93885f40a761c47ab5bc5685582c6c8e294af0d5a6e258656208c9a65c1c5d4852d5e32374a77b39a0dcf491605df4b733d2c162 SHA512 16e3031b9b04af09ba446c76e8776d802d197d2d1f934c9a409509a81fd299306b451ea3e52d1ac5b75c9d0c9a0d7f93b73e26732ecf51c5c3afe53f0c0868aa
-DIST glep63-check-2.tar.gz 5818 BLAKE2B 4cb99945e5bf3067e579feb630c8c5e3a33abdbc66cbdc90f00104a926880b29b61b22a8e151d1a35765787b80a1567fc6823259e94df0ab72810e9d76ea61a3 SHA512 bc3029e3886ad881f134da0e0821ed5bc908f7583d8031f76000827640d60e85adc182555163e6ef4138c1d1c9abb3e314ae5548acf82e384d66eac6d1e1b8c7
-EBUILD glep63-check-1.ebuild 599 BLAKE2B 57129139a3c4999c93ddcfb915459471963e5fe70029ead8f91d3b5fbfcc7a13ea49bff7c24b50cfbcd3930aef2b8eba5d2cc107f4dd59030a61d58b2f93d6c4 SHA512 104d354b826ab4c9c4c01b587410de5a136239d8e1073d6aa8c5e97b28ac7e5d5e039154b72a913c1557035fe74b2b1988f4fbbc16bfa17efa01393d65f30da1
-EBUILD glep63-check-2.ebuild 599 BLAKE2B 57129139a3c4999c93ddcfb915459471963e5fe70029ead8f91d3b5fbfcc7a13ea49bff7c24b50cfbcd3930aef2b8eba5d2cc107f4dd59030a61d58b2f93d6c4 SHA512 104d354b826ab4c9c4c01b587410de5a136239d8e1073d6aa8c5e97b28ac7e5d5e039154b72a913c1557035fe74b2b1988f4fbbc16bfa17efa01393d65f30da1
+DIST glep63-check-4.tar.gz 5898 BLAKE2B b28dd0843138bb54c81142959a28b121b043b7da4e3dc797b8ad3ebabfde6f850a11c40e94e3d20b9cf152b2138165733ba36754859081eb59bbbd5e99f2b98e SHA512 65a40ce097937df0517f86d1b32fd47e23d39abc6a49fa45dfa9075e7f7a163c2c2e25f6e39538a5e47c295bfdb2390bc4909e14a06b21f2bf14edf8cf43f199
+DIST glep63-check-5.tar.gz 61234 BLAKE2B 15b2e38e00ec044c963f4aaea9be4bf0659441a94ba9958aa1e70ecd425cc9f3dada31ab194092abdf9953ca10d711aa0cdd615365a6e78761b07fb0739fadd5 SHA512 d79a2e2a92dc4f123fbfa73df501fb9a0829a879e0d3674e8d6a854b8a2b437698b77793d92c6862d646a58ef302638cb9e5d152f60e634c9ec06e804dea79b4
+DIST glep63-check-6.tar.gz 61318 BLAKE2B 9310a70556deabf90003c154c326480e7a5fb58992bf79201100c21fbbeb17ebfdb560d861586d1c206a8d4ed3e64500a8eca4d99dacd072dce121736cdb2d3e SHA512 f0729683095222f60243923bcb7d9c1b984eb10cb0d8a0da2ec756b40a11c3f4f3de466fa533a66d4f645a2de09137a12a47eda5e80d7d5d562b0926a30b1a72
+EBUILD glep63-check-4.ebuild 603 BLAKE2B b062189a109fb0227031fba2c627065b8badf676f9b2db60d8e1b847dc59e3e801ea392a47c2d67e7eb801b44df689f3dc486cef33496c62baaeb387f4821e59 SHA512 65ec1371049758b84c7f50f3afc3042df99ead045cfeafd4e61beae02ba36bab4802b1ffce8ee94ccdf32bf7c993b4d1f9f1b872d631640549e0be449e64c72d
+EBUILD glep63-check-5.ebuild 643 BLAKE2B 72915256273a72d0f55c1a7b8ffa0cf778304ebcdeca731ecef29669f051193cf86927bd79bc3aea45d7382afaffe05e01f71cfcb008fb02f75b917cf81dbefd SHA512 24bbf7e9b7589c6cdd3de5c6bf4000d4464f539943e84398524331f26e873a3b04d722aae65bf528cf94a105fd4a8b3651c9f449af9c48810620507bd4411dce
+EBUILD glep63-check-6.ebuild 665 BLAKE2B bee30971b92dfd8f54b3ed5e97accaab4fd5b90f5ac6304c389e3b3279402042d13c9499e646d2b3f007121927edd9bc8a7e9eaf8e7eef2a1ef5ea58491507a5 SHA512 b9c90d5f74e37de3ffaf0c1da2d5b80c368aead33b7036fd6530e39b774ca8f801f04a08e9976fe9774214032d139a84fdfc9df2f7d88276ae7d4e5da5d97e2b
 MISC metadata.xml 513 BLAKE2B dc5036a6556ebfefbbfc1ad01f436b9793c5c0c51e7cbda49ee896ff364a30761f92ec63531317b4bd55bb9cc018d6ee62d07776a61ba75d7d1245c3d0c1339a SHA512 44aac823dedeb848696d166e28d151449b59d30a7dd87a0c2c339c044e2704908a1882e3b818ad7007822b5fd2efc52ad81564fad953862851b44480d61642fe
diff --git a/app-crypt/glep63-check/glep63-check-1.ebuild b/app-crypt/glep63-check/glep63-check-4.ebuild
index 1ffa43933fbc..58a8418fc785 100644
--- a/app-crypt/glep63-check/glep63-check-1.ebuild
+++ b/app-crypt/glep63-check/glep63-check-4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
 inherit python-single-r1
 
diff --git a/app-crypt/glep63-check/glep63-check-2.ebuild b/app-crypt/glep63-check/glep63-check-5.ebuild
index 1ffa43933fbc..b1ee063dd914 100644
--- a/app-crypt/glep63-check/glep63-check-2.ebuild
+++ b/app-crypt/glep63-check/glep63-check-5.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} pypy3 )
 
-inherit python-single-r1
+inherit distutils-r1
 
 DESCRIPTION="GLEP 63 compliance checker for OpenPGP keys"
 HOMEPAGE="https://github.com/mgorny/glep63-check/"
@@ -14,16 +14,13 @@ SRC_URI="https://github.com/mgorny/glep63-check/archive/v${PV}.tar.gz -> ${P}.ta
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
 
-RDEPEND="${PYTHON_DEPS}
-	app-crypt/gnupg"
+RDEPEND="app-crypt/gnupg"
+DEPEND="test? ( ${RDEPEND} )"
 
-src_compile() {
-	python_fix_shebang glep63-check
-}
-
-src_install() {
-	dobin glep63-check
+python_test() {
+	"${EPYTHON}" -m unittest -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/app-crypt/glep63-check/glep63-check-6.ebuild b/app-crypt/glep63-check/glep63-check-6.ebuild
new file mode 100644
index 000000000000..0719917e3491
--- /dev/null
+++ b/app-crypt/glep63-check/glep63-check-6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="GLEP 63 compliance checker for OpenPGP keys"
+HOMEPAGE="https://github.com/mgorny/glep63-check/"
+SRC_URI="https://github.com/mgorny/glep63-check/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-crypt/gnupg"
+DEPEND="
+	test? (
+		${RDEPEND}
+		sys-libs/libfaketime
+	)"
+
+python_test() {
+	"${EPYTHON}" -m unittest -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index f3bf452f908a..6981e045b380 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -3,6 +3,6 @@ DIST gnupg-1.4.21.tar.bz2 3689305 BLAKE2B 0c26c9c3aeae2bf2eafa858bc3bd15cc2702bc
 DIST gnupg-2.2.8.tar.bz2 6632465 BLAKE2B e13bdfb2b17f87dd2122da5a489318bfcefec26c0fbb65dc6a36034314985bbd405cb22cfaf9bffa4c7928657cbc63d363f16b77d00bf86737b73c73ffbce4f2 SHA512 24271ec2663b941ed5e72e2179b48ac73d5cd838292aa9d4954952b11713f4b466f30e6af632b22c9e7c284350e300a07046d41d0ab73dcbd1639b303cd09007
 DIST gnupg-2.2.9.tar.bz2 6659547 BLAKE2B 3715fa0fcfbed24b0c985811c14e5a8c84caef0e66937ec7eb2ebefb4603a2c9a994d3c73224941254c685ca32cd83d7bb924fb7171ee569b346f2092ed7ae5d SHA512 96faf227bef78fee99ff20606f3ce74eddc407c3864b928f8676a80f50dfaf2dd291eaeeaa0d291a254275a87e4f8506df9ed31c1cfc7652999208c292a16922
 EBUILD gnupg-1.4.21.ebuild 3345 BLAKE2B 611a2e3c8d3a47337a17891ce9df00d0aca121f827169ea1aec9cb8c44b3f38858e1c8d39d08985f71790127bbbe64b16f0293b368d8dc627700fc1cc31983d7 SHA512 14a708c00e98c76fa6ef1f2d878f84f63d8e110f85b35b9c40b6da80525af685df09ea83eb1dd1fce1fe3016b9e12a46c02c91f11ea78496c12301acbf04d257
-EBUILD gnupg-2.2.8.ebuild 3209 BLAKE2B 59e3d8e013e62af26653917e524a51ea1804dc77bbf164157ec85344f0df4655bd60c090487790820717bf3fc7864da76dc5edf5709d50446afbc1bb81bac737 SHA512 ebfc7525a171336c97b957102ec798f87f454296ce3f6904f8dad6e2f9a5b00c689663120c8eede207f520660ba2ee12c52065b6f65f788d8c29e5fd2b23ba50
+EBUILD gnupg-2.2.8.ebuild 3208 BLAKE2B 609025449f857d4d72346cdfd77704735dec6ced0c6dca813d84206ffd7aec48e2d6d057e3180ecb24b9835beaa39e9f6490528c993d36e05b6b316d3df1c7cc SHA512 3f9d67cb2630b46c68f53b2085e3075203b6cc792d58d6c5e91b26debf4c10cfe6723b40501df3c26069b08823e1b304e228f97ad21273ec94a03c82e3a1833c
 EBUILD gnupg-2.2.9.ebuild 3219 BLAKE2B 2dd09e94733c03b6ee8e1bd2fcb949bc1a5b861698dff5f2176628fb360a14d40318fc678b16d8ace0fd403f6c96b334bb3ad1c4399a4c5d8a7b89855dcbd7cf SHA512 01f76f52f46977ded9ef667d372b30ae53d51e53c5572ab126c84db0e074acd8174538eb68e17c43238d898e8d7f7fb36d677147b3dbe0de3cf04f59375353ae
 MISC metadata.xml 1198 BLAKE2B 745e725cf4c88e72dae88f6c2030ec755a79c449c68caaf0fbd1af6f996791500ae9490127cc50cc165180f754de1c71216e89fb899329c0b108810a866612cf SHA512 cd4ad4996e1c641bf8b6815a72f90427fa3c20864fe440157068ebb38300228e907ccf34fca2fd9ba821eeadee741c0cf8d8b09ce60c965f340e64c4fae3c069
diff --git a/app-crypt/gnupg/gnupg-2.2.8.ebuild b/app-crypt/gnupg/gnupg-2.2.8.ebuild
index a7cb03c7e859..695868c7e325 100644
--- a/app-crypt/gnupg/gnupg-2.2.8.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~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 ~m68k ~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="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server"
 
 COMMON_DEPEND_LIBS="
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 359cf50a2f55..ae5534153879 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,5 +1,5 @@
 DIST gpgme-1.10.0.tar.bz2 1370162 BLAKE2B b421d91a4fcd2e8887dc1a5c276fe1cce66f379741d86dfca751f4863039c39ccaf492c7683d6f6a0de407d2a6056e3496e45e3d472eef36a879e8b903e58c57 SHA512 8ffa348ef4775ed3209486444d54411e28c9a0ff1d7a4315feb0b2856ccd5d110b219100ea41262ca0016af69a1936d79fee0eadf2599c7c5bbeed05d11f7ab5
 DIST gpgme-1.11.1.tar.bz2 1419232 BLAKE2B 93980c24e6d692f35105db23a02db891ef022addd583d5bda8e55ec3552dfebb87c9feebb74fdd59fa353a3b08571e51537f8dcaf63af018beff467a848e97e9 SHA512 42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a
 EBUILD gpgme-1.10.0.ebuild 2856 BLAKE2B 91de73844ba2c16d354d10aa6e1172365dbbbeddec97efabbcaa66bba316c86d357d24b3f0db8f34bd423f4976f5be25fe0dffe08eb8f881e7aa4395fd4c101c SHA512 a77cd079ba24dc9967a90ccf5278bd4d5991b10df9823d4c6bc6e7eea6b40fbed1fb067d69576ac6fdd7b6d26b02f4f0311c07c4d5c736ad3a431166d3344ee9
-EBUILD gpgme-1.11.1.ebuild 2858 BLAKE2B ecb8b064deee7e3f387768d48a128311afe7763c7683a0d4e8775357b259a35cf7b9937514f93463e9470e3fddb76b1870edb1addb03fdbd0f9ad006aaa8819e SHA512 d99dfba8c1d3a2ee1f60f59b626679140cceaac75674a607690ffbeb15db3dc8e3df541538984d1a2f01578dc6182fcc17fc44617b39c855ad9b25b1c7b8e506
+EBUILD gpgme-1.11.1.ebuild 2857 BLAKE2B fafc243807672d08f09f3a9be6f1390028a90f43523c867430ff4c2f86850a3e80b515ed9c471973a80ed2c0e2b36842166dc8ae6de1ee14f64e58e8ff3615f4 SHA512 4643013dfd31c558900a37faf39737da1cac1f160213cee99e765fa94b32c4b6fd2242eb28e6319b6cd0fbb9ab1f47cf588280b126b2bc25bfadb582cd2048e4
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/app-crypt/gpgme/gpgme-1.11.1.ebuild b/app-crypt/gpgme/gpgme-1.11.1.ebuild
index 4291744d3054..fff6fce3f72a 100644
--- a/app-crypt/gpgme/gpgme-1.11.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-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 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs cxx python qt5"
 
 COMMON_DEPEND=">=app-crypt/gnupg-2
diff --git a/app-crypt/hashcat/Manifest b/app-crypt/hashcat/Manifest
index eb2411974397..c69dd06d7810 100644
--- a/app-crypt/hashcat/Manifest
+++ b/app-crypt/hashcat/Manifest
@@ -1,5 +1,5 @@
-DIST hashcat-4.0.1.tar.gz 3905127 BLAKE2B 534270c7409f5a3dc4995a81fab63e6bfcd6b2bd4bb549f96b44e9c6bf24ce67505eb82803ace29fba69526c7c0703c66de9cc68cefcca79ef58040165041756 SHA512 7300b16ebd601fdbdbfd66adeba072c6f4f4dd5898dd85824513b97cc7848f4c2ae0fe523cfe7803fdba7954966ea289275fa5d49ff792706f73394e2bd95e77
 DIST hashcat-4.1.0.tar.gz 3956136 BLAKE2B f9d6f9322e4c50ee1e156c283da1257a24f0e2cb22618cf93b8b11dd1964f6741f409429ee904412f70301e4b2381b388bcab0296a30ea3a94569efe7aaaeec6 SHA512 c9e01847c89dd8521da8734ea324c69f1e9bfef50c059e9dc29d4b947fe090405774a57ae688f907698c7d9a2d1f087b730e0a994dc5ed0d5d937a9ef950dd73
-EBUILD hashcat-4.0.1.ebuild 1286 BLAKE2B b0b59548ed67a9b36d1459088722bc7c7be89b0a77fb82d92fa9d3871630184fbdbaffa0143d42e9b764a456317c02b4d9da3189bfc5226967cf33e9a3114d6b SHA512 d8700a5c15502370e29555cbf39209db75e46936ff5cf522c6a67a7839399cfa9000f667d49b6b04b6a88e6b9ec68e31fe56a930e809602eaf475e0fb7013b13
-EBUILD hashcat-4.1.0.ebuild 1286 BLAKE2B 97238cdc5fd31bc6dbc6c1d1d350effcc2e6a309524215cea15650d69f7abbd11a91d0c30c4ae50db94970349a3528753147d511b1088df8733149c7f2636ee4 SHA512 da135ef8fdda9ca5f4785e0d4151c9e60f77a086db9510b90412d396f80d232b2f1d7b828c1fbb48e619ea3f1d927e422eca62bff2350f37fd447a4456131bfb
+DIST hashcat-4.2.0.tar.gz 3965021 BLAKE2B ad208f2debe1e4ece893e4a277b199962aa98aab57a2e78aef1d4177dcf7fc03bf262657dfe0f51c2ae845c8ed92232de7131f909d63bdc91e9f14e0b9602bb6 SHA512 686975db24737a718b484dd84b66807dfbe9694f1832da648b3c3b9fc8b859cd5c4c4d0aebf04ae862de38656d92c989e4e9515a07bec19b3779d74350beb0bd
+EBUILD hashcat-4.1.0.ebuild 1286 BLAKE2B 7389102e6de56b262f34a0a0605872ac61d97b062c343d7fbb92ecbc859f43dfa2251f91b2d30294c4e0fabc575328102fd69410aed9e389b04c9c5075fa6836 SHA512 05b38f2388ef2a71cc2fb5ff33ac0cebd534e43681c11a4a06707b05686d7e2a9731783090f9e1da858f78ab327b3a22ea406342a4afe6ee439f4a8c85d386a0
+EBUILD hashcat-4.2.0.ebuild 1331 BLAKE2B 77912c87e618afd7fb5af50e3ab3ce1baf440264917748374959ee78b5d6de3357df9e10bc86f15d2ad82051ba7b3e01f0856590412276c763ffebca3ad75c83 SHA512 73864af8522408362ac12e501407ea9245a2987c540b707dddcc3bd4c60c7ebdc30f4fab7a4902d7044396e990a7ca544120a891f06662fa017cb15d81b99498
 MISC metadata.xml 327 BLAKE2B 2f5c4cb3a51fe231059a9cf3b11875b9acc86dc51ccbd98e6f62fa85a3b546db1f5b6460e3be1ed26b239d5806c4dc787afb0cdf07b31b4a9330ab19339d3186 SHA512 024401252f35e93caa0ec7a48a7df7b71c18e4c7e71eb495f3ee5598fec5f3332c44fd3cf5d6b86d3d885649e6da15a8e7b5bac4e9205f552f8c8ec3f0fcd496
diff --git a/app-crypt/hashcat/hashcat-4.1.0.ebuild b/app-crypt/hashcat/hashcat-4.1.0.ebuild
index cd473accdb50..3e73a946a9c2 100644
--- a/app-crypt/hashcat/hashcat-4.1.0.ebuild
+++ b/app-crypt/hashcat/hashcat-4.1.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/hashcat/hashcat"
 SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="custom-cflags video_cards_nvidia"
 DEPEND="virtual/opencl"
diff --git a/app-crypt/hashcat/hashcat-4.0.1.ebuild b/app-crypt/hashcat/hashcat-4.2.0.ebuild
index d867ebec2e8e..c9b418c2da79 100644
--- a/app-crypt/hashcat/hashcat-4.0.1.ebuild
+++ b/app-crypt/hashcat/hashcat-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,10 +10,11 @@ HOMEPAGE="https://github.com/hashcat/hashcat"
 SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
-IUSE="custom-cflags video_cards_nvidia"
-DEPEND="virtual/opencl"
+IUSE="video_cards_nvidia"
+DEPEND="virtual/opencl
+	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
diff --git a/app-crypt/kbfs/Manifest b/app-crypt/kbfs/Manifest
index 4705a3580656..1af4a762bc39 100644
--- a/app-crypt/kbfs/Manifest
+++ b/app-crypt/kbfs/Manifest
@@ -4,6 +4,7 @@ DIST kbfs-1.0.44.tar.gz 5440024 BLAKE2B b8ab744b1bb9fa2e33bd382df92f1e50ed294446
 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
+DIST kbfs-2.3.0.tar.gz 5718571 BLAKE2B 300106465081e91bdd1a74631eff12bdf82a3042ce6c3f532c0b61016291769a8e0f87af0cbc0b34b3d3c95ec054580654e8152bf97a56c0dfe3641b88483d79 SHA512 c7521f9664ec78fc8fd1a6d9f3e86f4680260ed507223c2a6a2694ff686984bfc615ac454da10ff7b01247866ad65a5e719e3fb8db5f0c3044e019ab7a82356f
 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
@@ -12,5 +13,6 @@ EBUILD kbfs-1.0.48.ebuild 1001 BLAKE2B 83bb03c8b7d135e60d353c259effcd1ad6e2d5c8e
 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-2.1.0.ebuild 1259 BLAKE2B 2245307f05dfceab185249d48b8ff5db84c5f1f052bf9068336677f1803ebf312ccfdf5ee3be92696e492b4338ef7a3522a47e5c5077908c6665428db1863c19 SHA512 9f028136347e29dfa3d87406fc7d352a2e4c051536c741063cc83650fc23f643288b5b671891377cf9923ac9f30c927979127a27a83fe9c6340515072621741c
+EBUILD kbfs-2.3.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.3.0.ebuild b/app-crypt/kbfs/kbfs-2.3.0.ebuild
new file mode 100644
index 000000000000..41a15fe68057
--- /dev/null
+++ b/app-crypt/kbfs/kbfs-2.3.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/keybase/Manifest b/app-crypt/keybase/Manifest
index af571f7ae0bc..14256b24ddf1 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -3,6 +3,7 @@ DIST keybase-1.0.44.tar.gz 31729876 BLAKE2B 945700824e630591f7b79dd5e8253156ee8e
 DIST keybase-1.0.48.tar.gz 34026876 BLAKE2B c620a664b47f66932d1b49c22509aac73a6c82d77399019284f2887cdbf5166477ca824fcb2c2099d175fe4a38436c84c15b96a1c4faa4cdda62a9044b95e1c4 SHA512 fac72b7827dff350589e28e0d602b024130bc6bee8dd282dc141db773e493fcd4043aef6ce5382f92e1841619245c5819adf23d6dcf32b409939c275f40a03f1
 DIST keybase-2.0.0.tar.gz 34340958 BLAKE2B fa9bcf2285a987131e00a5bc8b06ad09fa86f3bf3de87cc4e48669131fcf93e2c515435fc1e9d6663455d16744889131d09b5957fa5f78f9d3ecc91d10667bc1 SHA512 d7b91c9a0ef69442501956ba3a09f40490adf76ef38bf945617793a8238daee68f3fc2be7a5d2118531c2364f5604016ec241226a22bd217dbab3dafbf77fd25
 DIST keybase-2.1.0.tar.gz 34444571 BLAKE2B 834f1001b136461c5665f12530d660e619d93c8b4e4b5f0c96da94af23f0667c778d7ddabc65d0585ac472cd91f89240bc4260b2034bf20c26b4047839570299 SHA512 0d71a22b5f56442fdc03848f831487da097dc817bfcacfb5a8eea1a9a13e87d231619216b6bab61862de71289373977c4c8d345518152137c8804005bf20e3e4
+DIST keybase-2.3.0.tar.gz 34524576 BLAKE2B 5793892b6bcfeafbaebb4a38d35e77d9267a74243da61ecbb7472026b3c500cc6f6cc49dbbec2add65cecae2ce209bb24bc03f2eb393307b82958afeb8824537 SHA512 f2b92ec21fd8cfa182aac7655b836415b902c599f9e3a08a3f84d35c3f3728027a8eef8a06fb8ed4ba77b9a66888f49fd89013304f948c0f0276705f16ca4396
 EBUILD keybase-1.0.41-r1.ebuild 1406 BLAKE2B 98696edcda23f847bbae3bafba3746cab2ca20b63b097b9609fbe89f563d23273039cc0851314d28df3367f002392cfd27dbb0a47a6fb2770e6f3618f1761924 SHA512 8b2c29ff8ebc3c942c1d9bcf0a14b45381853ad72593a18f0c92123e2d915c62ab4b92ed61f121c9c23f0397d966423eb2b2fa2636f591f6cf73a5b490b2c1ce
 EBUILD keybase-1.0.41-r2.ebuild 1410 BLAKE2B e5b26e70ba64cec09589f277189035526d3ac4e7125515aaf849b068718108e2307f5c4dccfdbe122695de46ae03865224ed44dd72480882912b71afaa4e3c4d SHA512 e5b394c14fa27db7def0bcfa9c42e0d33a0414a24beb902f0379e9b902ba104d8dc2583ebf0d349849e7390f2f9de82e48f6ebad401bbf6c5c9a23b5b66ae391
 EBUILD keybase-1.0.41.ebuild 959 BLAKE2B f94747768552a47f9ca7f9d786d6933caa3fb8df52e183cea08f953cc5e611e94e16bcf107d086a0c625ae888e907d583cd43af1147da5ab0d46eaafd148fb75 SHA512 6c8f0f09c879583bda20b6a693fee84d7ac8434d01c2e60131bf85ceec27eea91874870543b5c1b26e133ef7afd0e7f185ed582b4d49ff669cfa2cc1e0f76db7
@@ -11,5 +12,6 @@ EBUILD keybase-1.0.44.ebuild 1594 BLAKE2B 45c65cd0f7b749d8d07a06426b6ab9d7fe16ac
 EBUILD keybase-1.0.48.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
 EBUILD keybase-2.0.0.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
 EBUILD keybase-2.1.0.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
+EBUILD keybase-2.3.0.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
 EBUILD keybase-9999.ebuild 1268 BLAKE2B 7c57de5a44a42066ff20ace9720cbf1dbeb2b900794a94b82be66c4becbbfcc0148cd5038de6bb2f412b1dc86c4b23af336b81748e81fcf5069548c9cd9e26d3 SHA512 7b56be4322b630105f093853cb33afd2377b1df1b9ddb75e44579c64b76918940a0576aee4a39df55b49f0307b08144a3418a8835bb2cdcd0d3b868886ca0e3e
 MISC metadata.xml 465 BLAKE2B a1dcb592edbf2e5a45bd985adea8fa09504f75b17f689f38c415dff3efd0a4c67b3476c8c7568dc2b8351117281c94da4235cb1b9144d1636f04ae3b2055164e SHA512 68da266d0856035ec7f0b2ac5f8746ad6c7afa023ccf2d592be43fbf45f12f1443afdceb075ab57efeeceb97dfcc0a3997ed7177e12ae6291467e97c17e10810
diff --git a/app-crypt/keybase/keybase-2.3.0.ebuild b/app-crypt/keybase/keybase-2.3.0.ebuild
new file mode 100644
index 000000000000..af077ef41e52
--- /dev/null
+++ b/app-crypt/keybase/keybase-2.3.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build systemd
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	~app-crypt/kbfs-${PV}"
+RDEPEND="
+	app-crypt/gnupg"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	ln -vs "client-${PV}" "${P}" || die
+	mkdir -vp "${S}/src/github.com/keybase" || die
+	ln -vs "${S}" "${S}/src/github.com/keybase/client" || die
+}
+
+src_compile() {
+	EGO_PN="github.com/keybase/client/go/keybase" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase" \
+		golang-build_src_compile
+}
+
+src_test() {
+	EGO_PN="github.com/keybase/client/go/keybase" \
+		golang-build_src_test
+}
+
+src_install() {
+	dobin "${T}/keybase"
+	dobin "${S}/packaging/linux/run_keybase"
+	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
+	dodir "/opt/keybase"
+	insinto "/opt/keybase"
+	doins "${S}/packaging/linux/crypto_squirrel.txt"
+}
+
+pkg_postinst() {
+	elog "Start/Restart keybase: run_keybase"
+	elog "Run the service:       keybase service"
+	elog "Run the client:        keybase login"
+	ewarn "Note that the user keybasehelper is obsolete and can be removed"
+}
diff --git a/app-crypt/openpgp-keys-gentoo-mirror/Manifest b/app-crypt/openpgp-keys-gentoo-mirror/Manifest
deleted file mode 100644
index 7ab690d1ef9e..000000000000
--- a/app-crypt/openpgp-keys-gentoo-mirror/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gentoo-mirror.asc.20180203.gz 3054 BLAKE2B 4904aee11e80aaab7113356eba5aa8fcaced960b253bf5ba40addc6e4026fa7342319517af3549e902c547d42775fffd8713f1873ac9685d5dfe0207655bbfa5 SHA512 429e1226c535b1c3e0a87b471bf03a6c216086a5d801f77b5061b8f00b44a597e5569b5be58ca3a01aaa2d18c1e323532587e7403ab5ef51d718690d0bad2059
-DIST gentoo-mirror.asc.20180528.gz 5954 BLAKE2B 4942ac019249a6fe0c03a4cd33b472b2df82faabb8df1bba9af61dd12d52a5059a5c3ffc20f8c3cd8c5b20d24fd110f4dc0d9f11aaaa439cf07985842c993f40 SHA512 b0856f7ee62798e7b259bba17d7ee63a3bc5c78bbe901d0a45d951f47c1cc435a6b21812bf4287cb45520061713ec1885bfc07e5c2baf76c17a2d3f2584f1685
-EBUILD openpgp-keys-gentoo-mirror-20180203.ebuild 600 BLAKE2B 298ad89c2541312023283c0ef39342244c6611c0d9fea252417be1dfda81418fe70a2be86ef3410edc196cad37094e97cc5cf7c92f5ad642a3f737a3b9c8b4b0 SHA512 3e6d5c63648664253dc6b07e25b1dcedf6af316f19587d6e024be6c3c397769ea15737fd836f6873313ca12bf5d8a1ea780959ddb8d4a143dd163129bc1e36e4
-EBUILD openpgp-keys-gentoo-mirror-20180528.ebuild 600 BLAKE2B 298ad89c2541312023283c0ef39342244c6611c0d9fea252417be1dfda81418fe70a2be86ef3410edc196cad37094e97cc5cf7c92f5ad642a3f737a3b9c8b4b0 SHA512 3e6d5c63648664253dc6b07e25b1dcedf6af316f19587d6e024be6c3c397769ea15737fd836f6873313ca12bf5d8a1ea780959ddb8d4a143dd163129bc1e36e4
-MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-crypt/openpgp-keys-gentoo-mirror/metadata.xml b/app-crypt/openpgp-keys-gentoo-mirror/metadata.xml
deleted file mode 100644
index 0319eec4c8be..000000000000
--- a/app-crypt/openpgp-keys-gentoo-mirror/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180203.ebuild b/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180203.ebuild
deleted file mode 100644
index fc597b55ac39..000000000000
--- a/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180203.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP key used to sign gentoo-mirror commits"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Repository_mirror_and_CI"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-mirror.asc.${PV}.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/openpgp-keys
-	newins "gentoo-mirror.asc.${PV}" gentoo-mirror.asc
-}
diff --git a/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180528.ebuild b/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180528.ebuild
deleted file mode 100644
index fc597b55ac39..000000000000
--- a/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180528.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP key used to sign gentoo-mirror commits"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Repository_mirror_and_CI"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-mirror.asc.${PV}.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/openpgp-keys
-	newins "gentoo-mirror.asc.${PV}" gentoo-mirror.asc
-}
diff --git a/app-crypt/openpgp-keys-gentoo-release/Manifest b/app-crypt/openpgp-keys-gentoo-release/Manifest
index 73fd393b5fd9..0c39a76d4835 100644
--- a/app-crypt/openpgp-keys-gentoo-release/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-release/Manifest
@@ -1,10 +1,4 @@
 DIST gentoo-release-test-sigs-20180706.tar.gz 1437 BLAKE2B 00fb0a491c84853068ea578e68e8ab0a57842f6098c14da7ec44faf20abb23deef480aca958a7e352b9c55a024681eabc0c9aaf400e5dcbf8873277a3a940e38 SHA512 2a7cc2c650693c0e1fdf7083d77bf975e05ece3ab1495ed03362d02e8411481c80a62a9f21b23861bdc602d74c656a618e9a39d2bdef7ccd253ea9f3e4c7531a
-DIST gentoo-release.asc.20180323.gz 40546 BLAKE2B 7fed70d734a73368e4772cbca7810e8d61ad3b483e0e0c115072de9f96332b0c8c3c9f091b0ee1cdd056c775db1121deee77d6a629e0b99a4c67d485ccacdfe6 SHA512 31ffdf1e23ea6a36c5f4ab6bd49b9c0323b6b03627a9001589030b2b10e95459b959ee931762bcd43fb94b28eaba5d5ede290b1a41ce3ec0ad1b7b8b0f98d48a
-DIST gentoo-release.asc.20180530.gz 47465 BLAKE2B de37e8e84570debd8b39003bc65ada276f730e8a792b8990c87f4ffd7bbefd2cf49e44b53d3554fc6ecc302da65c8fc480821fd6e9f11324d5ed08a5fac861ef SHA512 63fcb06ae84657cde66fa74bd2b499936906d7aef36c46d19439c72a8c0f199cdc273d7e25004c60b23c50684365192b2a304f26c2b173564a216316eb22f66a
-DIST gentoo-release.asc.20180703.gz 46676 BLAKE2B 934db8c5896aa9fc268820c3349a60854e0a99586c84dbb16e92528b2fac7c043033f68f790bf737fa6835138bdf4dc7ae0df4d67ed96bd8664b16cd42db50a1 SHA512 85ceed12ca105a8dc9767c61b6ff391ed9d3ec2a116ed39b130aa75fa60998d0c2569677b783937bf4cae1cf91f472c9f16fb87abee051fa26f3c7b96bef0b27
 DIST gentoo-release.asc.20180706.gz 44805 BLAKE2B 1ba26b90e564738a1282c5febe426628144ab70e526397b866f97214254c73bbb517cdaa48ba0e83ca75a7d88cd622375fda0f362c43d13b66720ffb682682d2 SHA512 ba48cb6d7e72c6a720df3ff2430a4b4dd261f947c23762cd0c1255a93391d10becfb491db1bb80b295edd1f8192580315d5c7be3670b8689ef702ed228b05894
-EBUILD openpgp-keys-gentoo-release-20180323.ebuild 597 BLAKE2B b8296757f86faabba07fc698f2386a2d1d4738e68edb29c93cde7b922c4b799ca4eeba111ea707131e99ccab45838aaa88b5b84c780648109e0af86a2d17e485 SHA512 967c6ea7620e97213347c2bfd70a6ee2dc8ec7a0aebd11d6db0973937dd7f89e8fc10ba3c2ca0115866c96d24a2ee9c6891b63cdaa91c8a077caa800fd880b3a
-EBUILD openpgp-keys-gentoo-release-20180530.ebuild 597 BLAKE2B b8296757f86faabba07fc698f2386a2d1d4738e68edb29c93cde7b922c4b799ca4eeba111ea707131e99ccab45838aaa88b5b84c780648109e0af86a2d17e485 SHA512 967c6ea7620e97213347c2bfd70a6ee2dc8ec7a0aebd11d6db0973937dd7f89e8fc10ba3c2ca0115866c96d24a2ee9c6891b63cdaa91c8a077caa800fd880b3a
-EBUILD openpgp-keys-gentoo-release-20180703.ebuild 597 BLAKE2B b8296757f86faabba07fc698f2386a2d1d4738e68edb29c93cde7b922c4b799ca4eeba111ea707131e99ccab45838aaa88b5b84c780648109e0af86a2d17e485 SHA512 967c6ea7620e97213347c2bfd70a6ee2dc8ec7a0aebd11d6db0973937dd7f89e8fc10ba3c2ca0115866c96d24a2ee9c6891b63cdaa91c8a077caa800fd880b3a
 EBUILD openpgp-keys-gentoo-release-20180706.ebuild 1145 BLAKE2B 937f2632087e94da638b49d8eda2af8344d1bfc9599b53450159bf6310e5a3ccb779d54ee7b692168a4e23568f148af275eb4fde4d907f0f69c8b80220cb4672 SHA512 d288fbfa00b490fa833ac744fd58ff3ed2219b5d5c69c9d23efe548cf0629ab4afb3925f907080083fb6d8205424c15477e029ec99df81aa279530a560cfa028
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180323.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180323.ebuild
deleted file mode 100644
index 8d339d4fb133..000000000000
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180323.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
-HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/openpgp-keys
-	newins "gentoo-release.asc.${PV}" gentoo-release.asc
-}
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180530.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180530.ebuild
deleted file mode 100644
index 8d339d4fb133..000000000000
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180530.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
-HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/openpgp-keys
-	newins "gentoo-release.asc.${PV}" gentoo-release.asc
-}
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180703.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180703.ebuild
deleted file mode 100644
index 8d339d4fb133..000000000000
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180703.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
-HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/openpgp-keys
-	newins "gentoo-release.asc.${PV}" gentoo-release.asc
-}
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 80b400b4b611..1440f39d9c14 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -3,5 +3,5 @@ DIST p11-kit-0.23.2.tar.gz 1022733 BLAKE2B 09d1e1c9c9cc9bd330923f6aa37026b6f3b67
 DIST p11-kit-0.23.9.tar.gz 1091561 BLAKE2B 9ad061e703f8a7bcf677d974316adc3c96c34765bcee9834e65850b16fd7afa6ab2ffade18a65b99b85ec1af877d74938cf9369797f914d622c15e218801351a SHA512 6a8a569483763d3ffacadf669b8ba9b9be38a77dd8dc366ca0cb91c44753517fa1879d4422e4e8dfbcac594565727839a619566a170c0f94f8e112f18b0086ed
 EBUILD p11-kit-0.23.12.ebuild 1990 BLAKE2B 6b92e6fc4f04fe9459c89b9451da33f2d4cce5f1b8e679c0004d4c92ebc97a3e4caaa015a795cd04a62eee4716be3e1774d9b0e22e81f15c478d24f1f56998f5 SHA512 8a06d412f57e3b7121e20fccfb6c324c334856813cba60ba2edd27fa942d2e995874e5abb31bb259b313535f7a1b9b71fd7f7e489135954e8f99e67d64d7cb63
 EBUILD p11-kit-0.23.2.ebuild 1311 BLAKE2B 6f255091c7997b46f069719d8b9c20258ea36cd44bd06907d2620686714c6b8a5e4f68d9bfd5487ea5f6b0a5166af1bcdd3c9b4d3cbbb23641954cc882208491 SHA512 f953eb10926bdee9eb715cfa4333eea30e238f46795caec23cf495f573fd33fd464705de86c9ab9af55eb98d4652c6204dfce578abc854af44343ece85f3c70c
-EBUILD p11-kit-0.23.9.ebuild 1982 BLAKE2B 12d3e64b9c5211271bfc6a8f2def055e7cdcff658ca21f878cba37d4bf927bf766027c44946eecd7cd7e3a0961c63140b70b68d9b9bbf04fb8ec4b5170f01dfb SHA512 c2bc6ecec23aa018102013931ae5ea116d60b5682e8739716c07b794545c9ed2e813ec8b544b60c08553e7eecfde1d72d71fc2096dc80658a4575ca9f142be9f
+EBUILD p11-kit-0.23.9.ebuild 1981 BLAKE2B ea17f5981f26ee2d34d5bfa1737a7cc4e9ff182dd56997bf7e1af26500a09ac325379dfb17c00ecdb5085346a58ce8d52ac7c05cb4185b97fefb67d3fb94e1ae SHA512 2265c63bf95e9899303bc8b12ca7a511cfa99e20ffcc214014d4c7cce2d6ec55cdf2afb69c7790eb074546c50768f085c0a02ad43ebcfa2798db43693f4e7b57
 MISC metadata.xml 454 BLAKE2B 82db424896936d17b167806a47d54674d1d6eebe192ad1f8b4e985b00f74f10aa5f18ea587b866906571a91dcfda83626f6b25ebdbd6a6e02da65b34511b2b0e SHA512 24042c945cc3ab622b74c30eaa08819ebce4af9320b083ceb1f3f4db110fba6539121b4dbf0d245afdc395a9854bec022575861f7ae4e9418018d6bddbd4a888
diff --git a/app-crypt/p11-kit/p11-kit-0.23.9.ebuild b/app-crypt/p11-kit/p11-kit-0.23.9.ebuild
index 62bc6419cd69..9b870b147b09 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.9.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~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 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asn1 debug +libffi +trust"
 REQUIRED_USE="trust? ( asn1 )"
 
diff --git a/app-crypt/ssh-multiadd/Manifest b/app-crypt/ssh-multiadd/Manifest
index e14f3feadac3..77eb0df69d66 100644
--- a/app-crypt/ssh-multiadd/Manifest
+++ b/app-crypt/ssh-multiadd/Manifest
@@ -1,3 +1,3 @@
 DIST ssh-multiadd-1.3.2.tar.gz 14035 BLAKE2B 1de9e8593be128b792d6babe9ada37e7f611045d573e3430c0bc08a66d9c6acb00f5f6c453b22fd2308233cc8e58c62ab116de1aae702d066f664036bb029027 SHA512 fd4f26bfa5e2f654fc650470353901c6f418685f971ec4b5834afd0136e77469523c49b7cacb1b9716ff6c8cbbe810a057b214927f0325524170db84aebacbb3
 EBUILD ssh-multiadd-1.3.2-r1.ebuild 682 BLAKE2B 03116f84d519517597ea91bad356c8b1f78fa976df95a6719d2c14c6d7d77abe5e9c82b77a6e7fb0ec498e170c63033fb1437324be4e6eb990ec499460e2321b SHA512 5744aadd5c4ae1070299465beecde93886f481d763576a6bcf09c03e13f9849dc4516bd5c435cd1b7ca1664dae2167c1a46650442b4571c4a7bac5e1a76646ea
-MISC metadata.xml 489 BLAKE2B ddca902fdd544bc9272fdf6ba38c9e84f6fe97f1b16fb3d118e8b1e8116d0823a8422a5a14e5b3542e06bb7d9424b1da3e53a65527d13bb0a7177c06ff47bcb6 SHA512 4b0ca57e691272aa2c8dcb4272a22d964355191b1dbed5751a58d6c4cad9b083ec0416b0583294abeccadec2f4da5334555484fcbd6f533a2033de129dcf26b3
+MISC metadata.xml 251 BLAKE2B 958e5ce6ef310471d4c88ef4cfd054eb9476b56abe4e8b82b003632bae4d56a800530601a7fd4b0129fdf22fe5124e8642f60835c6792cdfe38e09afb2d701ec SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd
diff --git a/app-crypt/ssh-multiadd/metadata.xml b/app-crypt/ssh-multiadd/metadata.xml
index d24c4924b930..91439c59951d 100644
--- a/app-crypt/ssh-multiadd/metadata.xml
+++ b/app-crypt/ssh-multiadd/metadata.xml
@@ -2,15 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ashmew2@gmail.com</email>
-		<name>Ashish Gupta</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>k_f@gentoo.org</email>
 		<name>Kristian Fiskerstrand</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 644facf944cf..b3595b5ca0be 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,4 +1,6 @@
 AUX xca-1.0.0-desktop.patch 391 BLAKE2B 1cbec5681df8da9230b783c8ea048a199bd31a38fce6781dcd86b926e03b245de05b148d8df9034f5c7470dcf5823bd4a080cbb011a1a32fc0b96d8a8a5d950d SHA512 5dd62d8d2f4485b6155e466bb9a012f44104ff36c97bae61e8155880b937fc1271e94fb5b83627bd828e3cde0ab421a150458d050cb512d633d1c5c97f80f163
 DIST xca-1.4.1.tar.gz 959107 BLAKE2B 7437cdbaa5277998de200e9a5ad3a7d44aed9ae8af8fd926d7ed1917d49bec79562455ca2e82557149d748840f299ffd66edfc7f265be7d5bdcd6e4fe8dbaf9b SHA512 8294669c4887ba7a9060c3c2c06014b8a1807898569842ed61c066e8a864de014fba51a2ff867b579048083fdd4934cc7f97c92268de4944bf4aafea9c2e7b42
-EBUILD xca-1.4.1.ebuild 1180 BLAKE2B f865e4def8314ca7effeb87b6a38c30a3ce2a5f96fff87fc25280459e1224bdfce0623a5d3f6e21b435ba0c2dc0abe1e69e34e2c085b7a10d082d884ef9d33a2 SHA512 35e94c1323c4664cca88e396a45a6d06c50d98535349d28311edd774907aaa5d7815b93018d9ac6872815e39b763652188a953d4d8865b5f8197a5192fd8e693
+DIST xca-2.1.0.tar.gz 1055745 BLAKE2B c3ea2953be7cacb8c4c6fb6911f2e51806d40f294d8c9daef1d47da4f3e6ffa4933d199b8b92cab828286ececab2ea7195d5a46455e4d4703f0a67d0d7861db9 SHA512 ad46b290067b0a22bb6baeb0d065879bea74cd2c853f67c2be3d0c2bdaa5ca4ebef606c0f08bd0b130df4ec13418d470062b708ab479800eab7c18dffa46af03
+EBUILD xca-1.4.1.ebuild 1205 BLAKE2B f99cee8ebf2a07078045f01b4adf8db7736376b20536f00fe458824cc03f87c264a566cefdac56a2705ab5f4fc45d783ba6ca085eee7126e452d09ef2da7a4c0 SHA512 a59498a8576994a5cb9dfec0c204d65e5a2cdd2f0963c5c93ad2148fccfff93fab7658b512c40d7fe8364a39fe5d023332008308aeff35acf96dc18ad3079a6a
+EBUILD xca-2.1.0.ebuild 1452 BLAKE2B e4c94fca222d135959d2a897460177a0a804ec52fe557cd9ab61ac33571e9da6819a7b6d985d0b3182678a822bbc1d393f44d7d1b7633ddddf5d25451e420ba7 SHA512 e008114523bdd00806571cbbde4bac62f14201c0c02195f25a035a575c089fbee87b40cfd0606d26f6aab44f9eda2e3f0c367ff1253ad16aab2ce3fb7685ff30
 MISC metadata.xml 313 BLAKE2B 6e1376d870ee5ab083ed80dcc19c1acd60d487e285e9bdba7b92c13e97cb05a3a6fa8bc4c6107d5d54470e6ca93889fca15c1a2f7e690a169ca7aff64bd2499e SHA512 ebc38746afd94878384ef0e4d7933e2a7433216716b1854cfc0227c3f0abf0847d784d36de4b04a778743e442298abd3769329deecdc771003681ecd3dbf3fa1
diff --git a/app-crypt/xca/xca-1.4.1.ebuild b/app-crypt/xca/xca-1.4.1.ebuild
index 06f30c351d9c..894cba578bee 100644
--- a/app-crypt/xca/xca-1.4.1.ebuild
+++ b/app-crypt/xca/xca-1.4.1.ebuild
@@ -21,7 +21,8 @@ RDEPEND="
 	!libressl? ( dev-libs/openssl:0=[bindist=] )
 	libressl? ( dev-libs/libressl:0= )
 	doc? ( app-text/linuxdoc-tools )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
diff --git a/app-crypt/xca/xca-2.1.0.ebuild b/app-crypt/xca/xca-2.1.0.ebuild
new file mode 100644
index 000000000000..1577add7f676
--- /dev/null
+++ b/app-crypt/xca/xca-2.1.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit xdg-utils
+
+DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
+HOMEPAGE="http://hohnstaedt.de/xca/"
+SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="bindist doc libressl"
+
+RDEPEND="
+	dev-libs/libltdl:0=
+	dev-qt/qtgui:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	!libressl? ( dev-libs/openssl:0=[bindist=] )
+	libressl? ( dev-libs/libressl:0= )
+	doc? ( app-text/linuxdoc-tools )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
+)
+
+src_configure() {
+	econf \
+		--with-qt-version=5 \
+		$(use_enable doc) \
+		STRIP=true
+}
+
+src_compile() {
+	# enforce all to avoid the automatic silent rules
+	emake all
+}
+
+src_install() {
+	# non standard destdir
+	emake install destdir="${ED}"
+	einstalldocs
+
+	insinto /etc/xca
+	doins misc/*.txt
+
+	ewarn "Make a backup copy of your database!"
+	ewarn "This version completely changes the database format to SQL(ite)"
+	ewarn "Don't try to open it with older versions of XCA (< 1.4.0). They will corrupt the database."
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}