gentoo resync : 29.10.2017

37 files changed, 202 insertions, 51 deletions

diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 02d94ab82dad..8966874f91f5 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -5,7 +5,7 @@ DIST certbot-0.19.0.tar.gz 1061557 SHA256 164b496cc111f19619da1eac9e3fe03baac5ad
 EBUILD certbot-apache-0.15.0.ebuild 1067 SHA256 e3301e6f2373be348fe85068bd1091a0c97be050aa8cee3fc13b5dc4ac60efec SHA512 023397617e302a728a4da177fafc3c745a7d3ad90d27f5f98adf222da8c8b4dbf898f7e828eb773b5e558f5fdf1a526f7320cc383ae37f6404941fd9e220dbf9 WHIRLPOOL a5a291f001a6654114dcb96aef3bf58c68dccad5121b2cb3219fb6a41e69e2b9e0c7821f542de212c9b7befd8eab90a57936c37787832b85c48e0cd192aac5f0
 EBUILD certbot-apache-0.17.0.ebuild 1067 SHA256 e3301e6f2373be348fe85068bd1091a0c97be050aa8cee3fc13b5dc4ac60efec SHA512 023397617e302a728a4da177fafc3c745a7d3ad90d27f5f98adf222da8c8b4dbf898f7e828eb773b5e558f5fdf1a526f7320cc383ae37f6404941fd9e220dbf9 WHIRLPOOL a5a291f001a6654114dcb96aef3bf58c68dccad5121b2cb3219fb6a41e69e2b9e0c7821f542de212c9b7befd8eab90a57936c37787832b85c48e0cd192aac5f0
 EBUILD certbot-apache-0.18.2.ebuild 1067 SHA256 e3301e6f2373be348fe85068bd1091a0c97be050aa8cee3fc13b5dc4ac60efec SHA512 023397617e302a728a4da177fafc3c745a7d3ad90d27f5f98adf222da8c8b4dbf898f7e828eb773b5e558f5fdf1a526f7320cc383ae37f6404941fd9e220dbf9 WHIRLPOOL a5a291f001a6654114dcb96aef3bf58c68dccad5121b2cb3219fb6a41e69e2b9e0c7821f542de212c9b7befd8eab90a57936c37787832b85c48e0cd192aac5f0
-EBUILD certbot-apache-0.19.0.ebuild 1067 SHA256 e3301e6f2373be348fe85068bd1091a0c97be050aa8cee3fc13b5dc4ac60efec SHA512 023397617e302a728a4da177fafc3c745a7d3ad90d27f5f98adf222da8c8b4dbf898f7e828eb773b5e558f5fdf1a526f7320cc383ae37f6404941fd9e220dbf9 WHIRLPOOL a5a291f001a6654114dcb96aef3bf58c68dccad5121b2cb3219fb6a41e69e2b9e0c7821f542de212c9b7befd8eab90a57936c37787832b85c48e0cd192aac5f0
-EBUILD certbot-apache-9999.ebuild 1067 SHA256 e3301e6f2373be348fe85068bd1091a0c97be050aa8cee3fc13b5dc4ac60efec SHA512 023397617e302a728a4da177fafc3c745a7d3ad90d27f5f98adf222da8c8b4dbf898f7e828eb773b5e558f5fdf1a526f7320cc383ae37f6404941fd9e220dbf9 WHIRLPOOL a5a291f001a6654114dcb96aef3bf58c68dccad5121b2cb3219fb6a41e69e2b9e0c7821f542de212c9b7befd8eab90a57936c37787832b85c48e0cd192aac5f0
+EBUILD certbot-apache-0.19.0.ebuild 1072 SHA256 45e3b66baa7f79ec27b58391edcb1791e0611985c43253772e98818bccd47a3b SHA512 bd39dfef6a1993ecd2d26fadbfddaf1794dcc93a4ea030bd162b51b1125fa1f32c6c4d605a93e0ad9e3825cdf11feb0f37997312e63ad1d593222af8000e6852 WHIRLPOOL 0566a894f3381c2f90f86f8273164f3ae40484efe02d098fd84b893f22c78eaec83f6198fe252fa8eabb3ab085b87af1b50d4ccf0fee9b2151cd3d7f89d86bd5
+EBUILD certbot-apache-9999.ebuild 1072 SHA256 45e3b66baa7f79ec27b58391edcb1791e0611985c43253772e98818bccd47a3b SHA512 bd39dfef6a1993ecd2d26fadbfddaf1794dcc93a4ea030bd162b51b1125fa1f32c6c4d605a93e0ad9e3825cdf11feb0f37997312e63ad1d593222af8000e6852 WHIRLPOOL 0566a894f3381c2f90f86f8273164f3ae40484efe02d098fd84b893f22c78eaec83f6198fe252fa8eabb3ab085b87af1b50d4ccf0fee9b2151cd3d7f89d86bd5
 MISC ChangeLog 650 SHA256 0ceb4da791e6e05a4380d4db4297da391135e1ce24d0658b3697a0598bffbf75 SHA512 c841c9a2340dbb950dd8fa0861a84c18744cce90c4c6bc0fcb5a1a4caa087c9ad69ce0e5b4d344107f3eff6fa579a60ec054fc3c159318e872413fd968b6a85d WHIRLPOOL 2bea921c94946c02aaccfa5b1be5d05e3103a3927d71425b68acf46762a6e20a8a023789b920136d30bede21359deee5c3746306d0ad7e1022db8dbe3e3a82b3
 MISC metadata.xml 334 SHA256 e1059ce7794fc4edc2c39a6a55932cfaa9e6d4b6de59d4b9dafdfa8f6f790084 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f WHIRLPOOL 8a5d0b99f05b3f8097607db4c03ceedea11dacf064a1acdbc9b97f8ec3a7379e487e9470977cf61ef2cb21ccc29959b371f3f7caec322648091d84f95d7db5d8
diff --git a/app-crypt/certbot-apache/certbot-apache-0.19.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.19.0.ebuild
index 93bc95551953..6dd43da7e5b4 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.19.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.19.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index 93bc95551953..6dd43da7e5b4 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/gentoo-keys/Manifest b/app-crypt/gentoo-keys/Manifest
index 4394c7144229..21f2478adc54 100644
--- a/app-crypt/gentoo-keys/Manifest
+++ b/app-crypt/gentoo-keys/Manifest
@@ -1,4 +1,5 @@
 DIST gentoo-keys-201607021514.tar.xz 32324 SHA256 5c9b3f47c00967534368e4a4e6e9cafa8ceee7c1b7bddf1a619bdf08a1c6b3da SHA512 0d41270ce04a5ecccc059112bbf16aeaa083fa18c921e1fd0412fee1189863cb2fe416105fd0952d30151935651c1cfa24c650b9201a0e231563efb0a0c55f89 WHIRLPOOL 811f6dd86ddd077bde823c172695248c64f1231b6c65a7562f3bc55bc397bc2449f55cc59863fde9918e7264d0a4faa7f159493d74f1f30a13d581fa8d199f5b
+EBUILD gentoo-keys-201607021514-r2.ebuild 563 SHA256 4e5e397898ba6e1ac445c1ab712ffc4b8c508dda3c44d28675850b022e559b90 SHA512 bb288c9af52562212e45ac922b6ed67ae4c994d616d0570a125a59b9cb9f86357cae54fe94707c6c5a12d308e00e2460c58d12a111955ecffe7b61e9f92a9547 WHIRLPOOL 486fe9b3dd58801f2b32e0c76611bd84615dc580e1f4b5870b89bae9d56da776092e390d0c01fb4d92e48b51a200f2c04d38c25b3c92676bf41a1b9abe344eaa
 EBUILD gentoo-keys-201607021514.ebuild 607 SHA256 1f93b48182e4e113772b1fc47c9f23cb38f327113f3a9ad5c9c088b32946edfb SHA512 18e5b969c4859d36b1deb694486c400d09433739d95d43595e625ced45c12ab3005621b70425c06a92fb5a691f8686aa7faaaedcbb9da647d21db7053228713c WHIRLPOOL b18d2563980c03f83fe319a37307c6e20b62151186093a7d67ea13ece169b92f8b0372dd8cbb3d9e6bd5e3960736885df250af5182734d4a06ca6da90d8bf01d
 MISC ChangeLog 2698 SHA256 61d2762434ff2001546293a5395a427f0db7e2c81456cd81f28991fd790fbf25 SHA512 dc9d70e7334d245180ba6a059739c1c3948716a0656fa973bb8dcb37befb163be0081b067c8c944c4601ab76625009e0d4b7fa5f3928bd3520204a2b38a2638a WHIRLPOOL 1d82fc745484170984486f94787ec032e036e81263a9524292306b04873399aef289e4bdfe8247626affd4ebddeeea5ce82333ea26ab8729bf6a4c9c9d2e3daf
 MISC ChangeLog-2015 874 SHA256 f04ade72c200e76ada4a57ad8a5a4332982047c8d6a5b69e62afa172d279016d SHA512 4cbb28306182954294d0b94aa4abe2c503f3239d8b9bfe2318d2f9854643eb5d86a95e783a162f0c704e701bfaf5c128be4508dfa9b5c793f56e1a0cde5c88a0 WHIRLPOOL 64351f549aa264313f8a6f3c363d26814ede8d25c6c0e241269c5b441253e30490311656208e7c05136d890c27160284b0d0ff0c9b2252c31d18e4c1843469b9
diff --git a/app-crypt/gentoo-keys/gentoo-keys-201607021514-r2.ebuild b/app-crypt/gentoo-keys/gentoo-keys-201607021514-r2.ebuild
new file mode 100644
index 000000000000..faacb71d079b
--- /dev/null
+++ b/app-crypt/gentoo-keys/gentoo-keys-201607021514-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2014-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="A OpenPGP/GPG keyring of official Gentoo release media GPG keys"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Gentoo-keys"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/keyrings/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~ppc ~sparc ~x86 ~arm64 ~x86-fbsd ~amd64-fbsd ~m68k ~mips ~s390 ~sh"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /var/lib/gentoo/gkeys/keyrings
+	doins -r gentoo
+}
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 5d74585ffe30..a13c22ec3dba 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -10,7 +10,7 @@ DIST gnupg-2.2.1.tar.bz2 6537959 SHA256 34d70cd65b9c95f3f2f90a9f5c1e0b6a0fe039a8
 EBUILD gnupg-1.4.21.ebuild 3345 SHA256 6b441756eae4e86f212092330acea93ef31e82be0903df125e3060746726eecb SHA512 14a708c00e98c76fa6ef1f2d878f84f63d8e110f85b35b9c40b6da80525af685df09ea83eb1dd1fce1fe3016b9e12a46c02c91f11ea78496c12301acbf04d257 WHIRLPOOL afc261211aa9a4620501359bc7622e61916db6144d70dd3d5e48fe471952c4b865b1fe7911c64bdcdb848120b5620ad445f24aa36b452a02aaafcf21abde998d
 EBUILD gnupg-2.1.15.ebuild 4570 SHA256 8a8a2a347184293403d78eb604f2c520ac716e162cb8acfc21795952abe9b07f SHA512 385f5c40a42559e3b686d16dedc2ca442dd0a075514184e67eef97624cc419bd0bfc7f7ca6fdd3dc549cb4e3beafce656b725adcf201d27b151dab6456346875 WHIRLPOOL be781ec9278f2b9284e139dccbaa986a2c2860f74bd3933a6ce5e325b4ac6cd7b0301c31331955e308d71c754c2a00922a8a2ea8db7178ed73e9135a8d3293a8
 EBUILD gnupg-2.1.20-r1.ebuild 3102 SHA256 1e8c8bdee0c90d9ea51b3ed3e940a4f4e7e67c823816961ca75e02e8b726dc03 SHA512 68eafca6339bab0f118c5ff9119a984ee2b7432942929d429a430c053da568ed7729d13a507d073bebc8a273e74eb40f66585ef84cc9b83181f2ea5d6990d615 WHIRLPOOL 99ee773c6aec668d1e4ebbb9ef65792e26f01088d54443dff0578de61ca9d665ba30e96be80cd7e447abb9fed56f3061aff7c224941de90f31ee2134995a8adc
-EBUILD gnupg-2.2.0.ebuild 3124 SHA256 7605f5d6f19bf50ef51ba29412ac7d2be64bf7412678312f835557ae52ed6bab SHA512 3891728ab252676b298b4f5dd5791856b688f61baaf1f86be387195177331f5a296dad965e248595c1ccf150d15c74e3e8ac30ae74e205a1f45f2a32753ee09f WHIRLPOOL b2002be1e997cdfb3f264385795d5a03a0964cdb28293b7e5de511c97cd9bf6cae7d9b80edced641b99972323adb2b1bfd2fc8eeb4148c5e5bfbf83990f73284
+EBUILD gnupg-2.2.0.ebuild 3121 SHA256 675012bcc07f9bbec483224181dc240bf0fef4d6337160cd9b23efaee485b58c SHA512 d0970104cdb3642518cd986a1328cd06200dd8a472b306d490608aed27f40d83d176731bc62adeb3387505278ed56ce3f16ade2f30a55b4385a9112616aa12cf WHIRLPOOL d88b64ffc222abc32999c8aaeab7fc72e458c30e34c621b32e30ae7d49faa88f8f7712328413719d01070e8d80485438cf3e7f8a1ba4b6c2b2f037bd29f8d6b6
 EBUILD gnupg-2.2.1.ebuild 3224 SHA256 8087d59a0748422d7888180f3e7b4692285cebb9ce7a8ac802bf563558ef9e9d SHA512 ebe3107c7444f4f821760d854da5376a9953b7e6781673cc55b3704ce9accf5306277140648a047f9fe705c7e5ef7922e45c0fceb8508d80edd63b6dab08b579 WHIRLPOOL 1c9745178e0276a11bf73d31705318c40e6a0c2c9191cee90df14fc0e02856f0eb534ef036b6ee3815dc4eb574f31e12cb5b433424b9362e4d1513c7dde55699
 MISC ChangeLog 17653 SHA256 0f85d5aa5e23837a910ad2d14a05a1a3cd8a3bc9f59d4e0fcbc1b6cf30d8f166 SHA512 8e8d0cac1c1c9662d9754e1ee04399bffbd41eaec93d361bb01ac753d9907c60d56f184eb5e265f4817afe681f090b4d796274a2bb33988764e036fdb71dd2f1 WHIRLPOOL 960f2283993b2d007df253abd5a5b0eb0d1441df64262825785793cfd756f6d314c3186948fddfc946ed801e64834ac4909ab9654ceb8e2c45d9df3543ea6812
 MISC ChangeLog-2015 89046 SHA256 295a825284cc7d9b7148c77733782937402db7e07fd7fbf0a9f44861d2018ce7 SHA512 9920db843f9cc1863f3529ac2022f591de8f0b930f82b64ca2859d542af679de3dcc733e5b55b8de060df9bf01ce68cd1828d0c179b1f9f05093cd6566efddc6 WHIRLPOOL d21dbe313d4c1b0e50012e0cc05560d13b712875514dbbea2f56be40ce85c99db8a7693a0f4492dd631119d37cbc796546fe5b62f5d6a6baf598d0a94c0ac0a3
diff --git a/app-crypt/gnupg/gnupg-2.2.0.ebuild b/app-crypt/gnupg/gnupg-2.2.0.ebuild
index ba5fbde5fcc9..d4d043c3d242 100644
--- a/app-crypt/gnupg/gnupg-2.2.0.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.0.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 +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server"
 
 COMMON_DEPEND_LIBS="
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 54db65477c82..c3afda7f5fb6 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -19,9 +19,9 @@ DIST heimdal-7.1.0.tar.gz 9925587 SHA256 cee58ab3a4ce79f243a3e73f465dac19fe2b93e
 DIST heimdal-7.3.0.tar.gz 9927966 SHA256 351df17c11f723681a4eab832e880af4a28693d1ed6996b02671d676dcb3b7b5 SHA512 2a2a76e073ce429086c6e673d83974ba57c7778500f9b007fba033a0e31aed4c4e060d123c10c6d54eda9cda35faabc3df5fa92b560531e92eb8f3dff4eb9dc2 WHIRLPOOL 2a60146a6ca0edcef6072cdbdb1a7a986da82a14b459062530b390ab5d895b0e671f4e46c9a707ea846bcbc832585b1a2e78a593f065c6929fdd2b4b41f49e95
 DIST heimdal-7.4.0.tar.gz 9928553 SHA256 3de14ecd36ad21c1694a13da347512b047f4010d176fe412820664cb5d1429ad SHA512 3bb83974180e0f6fe2e1b2a11c51cf136c9a64f13f9ed7592f0039ccccd03c1a22081b7d88ae631f94cf46589ed399b79666eb814104f915faa70b53749863a7 WHIRLPOOL 337a6da67bb48e08ecab2119598c19e2ca9b0cdbd7ca163f6ea55ccb0a1290cc2906eee106b625a43243edd7d1677ff36ae318ab82f2d3e439b8f25002f7f001
 EBUILD heimdal-1.5.3-r2.ebuild 5024 SHA256 092d8f1583803c851a41fc2d1729ba0f8ca44a565a27b8eb9259229fab30a98c SHA512 bb82e78a56c619470f245b3cd65f8d8e3bb86bbc41d8217028372f15977603e10f6075aac8c08a7daf1e5b8cf85c50c5b95a344288f81b1dcaae3c0959002a8a WHIRLPOOL c276149edcef305a279dfc0d72e28c1a2e918a817f2ebd75ac084469de22c18b44bfe31ac2d5aa2dc1b4692c6673bbc99bd46df3deb191341a2b78f1451c04c0
-EBUILD heimdal-7.1.0.ebuild 4308 SHA256 66457b3af786a1bf0bc25c29e2ea65dfceb1a536d714ce07f87c133f4e75b386 SHA512 e31b14de2393c0b85042012abb95dcea54206187618d04f4414ecfc1ffeddc9db707cd7d87bd4ee3bbcff4f9d6156a5918e2810eb9da312859ebc97a76a6f5c9 WHIRLPOOL dcc455f8f4eafe97eee6a89f74bdc5b35f9b0beb9797eea4e293f5db1ce1ebaad66d2deaeec3dad05cacb46c8011f15ca8320fe3f4b2c87921fef13a216a9151
-EBUILD heimdal-7.3.0.ebuild 4308 SHA256 0afe18acc33d3b75b2ec2dd15d0da667ea49c8466eccf19d4cc8677092d50b87 SHA512 9ed5513715e4aee7b6ada52ce784cd84f105ddefcf0c2b5a6ee227f0d8c30e25d9eaaf0c8bf9e3038e09ce7cff2ac0eab7d532e61b6a8be1b8e998e33440e597 WHIRLPOOL 47fd1f2dbeb884bbec49404b1e1a73baa184c8eca81d8f1bbb1121f9bc7928a98acc23a3652b13736178289bf9c55a343e73640b3808ec5928c39f31e13e64ad
-EBUILD heimdal-7.4.0.ebuild 4304 SHA256 0b9b14ea382ae65fe378409b31b9ecbe38cf3ffd33b1022f0ce9351dbfb2f724 SHA512 d984b44fd34a60b9e67fb9021ab50e0ebae97487ac6dd4bd319d05616511e11d046f8bb5f29a67ab4f1cbb83b8a1d4624ac81c2e808fe7c510e638252207931d WHIRLPOOL 30baa69b42629fa2830c8be5a224ddbdf77122c31f5c5d9ddba31ed380336d206d39c03504bd9f0401b451750dfb7acfbefa5cd928b45f15a8e5059633c822fe
+EBUILD heimdal-7.1.0.ebuild 4391 SHA256 2a1ce6cb6b0fdef4f00023eb4a57a5f8f1a8cd9fad0924c50cf885a9062e6a32 SHA512 7ba0763e2db5fb26f8f4cdd9d8220caec49f918f7707f4e60499f36a7bc7d5259ce61f688778fbf6daf70ae5eb56b5953f5d8c5cc1c331626071620403f7b8bf WHIRLPOOL 8efbfc69d8dd0473b74162c368b67134da9540bed57b49020edd1372db77a1a1f6ab81e071c5b976c49da782c441dd5bdc2101a97c5efef8b90c2e50f04c41a3
+EBUILD heimdal-7.3.0.ebuild 4391 SHA256 2a1ce6cb6b0fdef4f00023eb4a57a5f8f1a8cd9fad0924c50cf885a9062e6a32 SHA512 7ba0763e2db5fb26f8f4cdd9d8220caec49f918f7707f4e60499f36a7bc7d5259ce61f688778fbf6daf70ae5eb56b5953f5d8c5cc1c331626071620403f7b8bf WHIRLPOOL 8efbfc69d8dd0473b74162c368b67134da9540bed57b49020edd1372db77a1a1f6ab81e071c5b976c49da782c441dd5bdc2101a97c5efef8b90c2e50f04c41a3
+EBUILD heimdal-7.4.0.ebuild 4386 SHA256 2609914870670405bd2f5eeb0a8a9b0812bd897d82f907df989d6d0b1cd5641a SHA512 2c8c11e021d828a4e49142389c6e3dd3d361d33ea889b6e2590043aa71e533e5483de9b3b32e087ed95f76d5a42d84fca22a21043ea414b0760d4fd3f4bff728 WHIRLPOOL 9e9bcd4d8f82f95ed38ab8959b780458beda89de9d3b00ea49d2c13e91ad4d9bb7252358258c0153bc02ab0dc61aae667f133482a4574ece4791632bd29ed0d2
 MISC ChangeLog 4413 SHA256 4c9d94b05877452f2233be9ffea999aba04d4078e63f17341138d0fb831105d4 SHA512 6a4e11a4509c2722a1e6e1bb65c6ea070b849b05aee166bd94dbd1fb831e5eb4af7c927b7735650d407732f11eead38816fd4d8693195df9378cb69d9e6cdfad WHIRLPOOL 13253e869e3da54af008bbf03059f3f9f150390b56f02e048e42fc9547e94d637b98d8579d1f488afe3805e7a38238d64eec87304c5d64d81c31b3b12f372df0
 MISC ChangeLog-2015 36803 SHA256 fe8e5e58312adc75a5d62ccbf1684f06783eb9aed087d8ffad5cd9c9179aac1e SHA512 48b692393c72ed2e98eaf8473bec195ea8645a14c4c7aa8c6318e567c110b3b2fda0fc745ca11487b2cce51fee6cb1d165e9bf6c7fcb60c05e8a2b1dfdf57bdf WHIRLPOOL dfc81a3dfba814ef43a5fc4d9ee965680b24320501f40b7218aa5a84002acb791302dad8718747bcf68a208aec306e65746b5c166b0492341b08c5a0c9f5045e
 MISC metadata.xml 638 SHA256 4abc8c61e0d5f828d838329d247bc6843cba316784ac65c59abd553b94138aca SHA512 1fb671028d7d798c9a6e0be09e77b94a2d7f25598f6d9238f1b7897c9fcd68bed1d3fe84e84d98c1f276979cf782fedb13f1ea44ad876c4658ce1f142aecdf5f WHIRLPOOL a565b94ef0058dc1318db1d141d538d28c93f0bdb3e85765420f1328afc1e350d76cba8ff0b75de0b7ac4bb0b0ca528608373166075e2f89a3108f5862471ed3
diff --git a/app-crypt/heimdal/heimdal-7.1.0.ebuild b/app-crypt/heimdal/heimdal-7.1.0.ebuild
index 416e7858a1c7..5a5572526bbe 100644
--- a/app-crypt/heimdal/heimdal-7.1.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,9 +15,13 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs test X"
+IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
 
-CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+CDEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
 	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
 	!berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
 	caps? ( sys-libs/libcap-ng )
diff --git a/app-crypt/heimdal/heimdal-7.3.0.ebuild b/app-crypt/heimdal/heimdal-7.3.0.ebuild
index 4591ceb4645b..5a5572526bbe 100644
--- a/app-crypt/heimdal/heimdal-7.3.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.3.0.ebuild
@@ -15,9 +15,13 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs test X"
+IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
 
-CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+CDEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
 	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
 	!berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
 	caps? ( sys-libs/libcap-ng )
diff --git a/app-crypt/heimdal/heimdal-7.4.0.ebuild b/app-crypt/heimdal/heimdal-7.4.0.ebuild
index b0582cd41968..b7ae49bd276b 100644
--- a/app-crypt/heimdal/heimdal-7.4.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.4.0.ebuild
@@ -14,10 +14,14 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs test X"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
+IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
 
-CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+CDEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
 	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
 	!berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
 	caps? ( sys-libs/libcap-ng )
diff --git a/app-crypt/kbfs/Manifest b/app-crypt/kbfs/Manifest
index 467a6790710c..bb87419448e1 100644
--- a/app-crypt/kbfs/Manifest
+++ b/app-crypt/kbfs/Manifest
@@ -1,3 +1,3 @@
-EBUILD kbfs-9999.ebuild 752 SHA256 b5abdbf2a7d44fb06da258e513484fdacb1842b6e0af64d8a4a38391a73ba5a7 SHA512 0b574434c4ddc944b55553233e8ddea35c3e4f9098f65afd97b72ff44c970dd8a0a54536f9a24ce3fa32c56e0a71a9540abc6a7414baa3d9ff527d82e59afd27 WHIRLPOOL 94db70cc1d7b1b79c7e405a1f2740b530b45406b0714f5fd55a613fbb8afba68db983794ab601e71091b18ed3051f6a92a7b1cd8a4b7334aa7239a65214559e7
+EBUILD kbfs-9999.ebuild 967 SHA256 5054322d131caffd30fa0873f7d18adce5c5c68821ea51632b783e3c9b51899e SHA512 99e2c177cfa9f4b9074600425f5587efe19c0341d49e62dd0ef02950c47f298c007ed027bd37ceb21719309241fe3ec1ecf40fa8b3c740c3cb8f1243145955f0 WHIRLPOOL ed749e6565e867811758e4f22a9ffbe1d496784a12151823c11d3cda3fd4f2c1eaae981d3fb8ce40496dfafdcfa23e874e53ae659cb14d63a280cfbfb310b9e7
 MISC ChangeLog 545 SHA256 7c3d6193bd8654db693f401ed27d9cc60dd12ff2a1e744134da2145a6760dca4 SHA512 6c61730b6049b93d8b9022fbd93cb94196c0b034c958008a03e5c357ffe5e2fe22666a09680db2e4969636a36d637d01c8b18149d5e0ef4b8fcb2bd02a5e2ccf WHIRLPOOL 534b0d371fa15d662c4ac4b2dee130ccad594eefb509804d7054266a42b75cf35fd3e7c5411255272436a2db5c4c01abbe41033a7d692afcb04e195b89bf3f06
-MISC metadata.xml 370 SHA256 7e81ec48aa303ecdf8c2328b1ec9017508864114a7bf600476ad16684c965bf4 SHA512 47d589c916847a608e4862d2c8f20d9207719c4feaa896a173456d419794d1528b63d0fb62effac28f309951215cc042f62cac44bdee384b4d50b4f626362c89 WHIRLPOOL d2c308a0d02e55a5e7b4cb81b24dff43e127f5fd921eb0360432d25c807fe0284a2cdc12c31bbe4ebfcda6554359a60dea2c46c6f2619eb3580b5e6c1f045117
+MISC metadata.xml 482 SHA256 b9283ac022494a7d9f4adddc6428bc85e66dd4cce954503e838be95b588bab8d SHA512 74eb8d2fb7b19f269dcf5dbc67a5f63cac1589343a069011dfe8492a0bc1d82b526a175b2fad91a00f7fd60e4a77bbf2b7f7dea4537d6ae9221a9e93ca2bdd60 WHIRLPOOL 84472ef3889a508e70031c65656914495d1dbc3c67067ec4cd5ec7534a7fb103a0dca71c8ff4de0acb426189f65df4e78c10738bbf7aea9f61b624cc15a4eed0
diff --git a/app-crypt/kbfs/kbfs-9999.ebuild b/app-crypt/kbfs/kbfs-9999.ebuild
index 4da71bde3c9a..b084faeb8f15 100644
--- a/app-crypt/kbfs/kbfs-9999.ebuild
+++ b/app-crypt/kbfs/kbfs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ EGIT_REPO_URI="https://github.com/keybase/kbfs.git"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="git"
 
 DEPEND="
 	>=dev-lang/go-1.6:0
@@ -37,8 +37,16 @@ src_compile() {
 		-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/kbfs/metadata.xml b/app-crypt/kbfs/metadata.xml
index b925088bda74..00881f3d617a 100644
--- a/app-crypt/kbfs/metadata.xml
+++ b/app-crypt/kbfs/metadata.xml
@@ -8,4 +8,9 @@
 		The official Keybase implementation of the client-side code for the
 		Keybase filesystem (KBFS).
 	</longdescription>
+	<use>
+		<flag name="git">
+			Build the Git remote helper for storing repositories in Keybase
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-crypt/kencfs-plasma/Manifest b/app-crypt/kencfs-plasma/Manifest
index 334d6e22b548..3f84b4431204 100644
--- a/app-crypt/kencfs-plasma/Manifest
+++ b/app-crypt/kencfs-plasma/Manifest
@@ -1,3 +1,8 @@
+AUX kencfs-1.4.0-encfs5.patch 413 SHA256 4c0eab8077163535d519cdd9de70c8561a4f3f5698f8c1a9c559d3271b1ee317 SHA512 47cb411f80bb4270d3c7e0b132949e2b0185b5170228120ee336fc1bb8ee83c9c0a960746407e8934097381a558be941d08d6e28b774423e58102a3f82a66ae0 WHIRLPOOL 5565e1de3feb3c10ef76afd90015f633e7b90ea985956ad0e2f6d37905bbd4d8ca2c0eb93bf67140bdc7b9c7d3c56d3cd16017b530ee87b6ce4950c401cb035b
+AUX kencfs-1.6.2-desktop.patch 228 SHA256 d39d44d5714e6976e7cdf18abe22e0134b02800ca7c45651d98225fa310ddcf4 SHA512 0f96b65f43fd08cfa116381e5db1ceec81eebb076dca9349d7d3781651bdc7d04e8f4d0cc611f793e581416304174286db98c6aee814059520a47f26bf885d92 WHIRLPOOL 2685f3cd9f7fc2bb385a19d228e95d254255fd010f4dbb37ecb3b2ce7f506ff74d032874540d674ae915997a12c3b780d10e25952e19182b832ccef41d317b49
+AUX kencfs-plasma-2.0.1_alpha-include.patch 267 SHA256 d2fcbf056c642acd35a1b565b7cac9d94c3db2a04c842ba4e1a50ebf5f10707b SHA512 74646bab28c76db89d441e7528ad288f44522dc20f53b5b12b8140d1a61c86d9ae0fb9f559d37fe1de912f176a366000d77b67a3fe3657a3428304a2ce2a29a1 WHIRLPOOL b195a1780e7747800d144e423baaba27b07d5fb540b8a2ee1fef05d5335b7029318dea1a818f7ed153a914918d3313ff730b86767762e55726e9f46c4264f7d9
+DIST kencfs-1.6.4.tar.gz 221386 SHA256 3e88cd2bf0d11ce83746fb5b1e385f172ed506cde922ee2811f9cdbaaa80c4ca SHA512 44dacd0a17194b61d2d73820851b496d6052dbab3893a030db2e63c1be0d1569d80cc75ce0c179381e98b60c5e27ccead8ee257f53f57dea508808616abb514d WHIRLPOOL 8b7f372c8c8304f3a3249a74a565ea77c4c3f255c6db3cf66a2a62951be1b8010e9696dc5d5ac44ea1e39d189c63e4a1ccf562cd4886578e8a2383756e48d24b
 DIST kencfs-plasma-2.0.1a.tar.gz 216580 SHA256 8a46fd2f2f490323350ae17d34d7c10de1afe73943413a3e2cc10e52d3dd6eb6 SHA512 a9093680bb141c18e2d4ed8a966f7176c40c10fa0ee6e5cee25ae26ef3f94e6ffc7e3f0a7b55321640e4ba6e484d75755f901b53688dbfc5c22a1c0b1e01cfac WHIRLPOOL 146aedf68686611be6bbe69c7b9370e27780c7bf33f1ea962c4b48a895770be0b50a03257a8d74b38eef99fbbdfa85a7c116b7f7385b80e343a3063b79f895e6
-EBUILD kencfs-plasma-2.0.1_alpha.ebuild 896 SHA256 6988818e053f2daa732fe7fe75ee996960cda99570291c57bd3b365b03607fd2 SHA512 011f88640c115e3770f1fc58a01864d847b6e3d3b01842b55211241bbf6f01d3e1816cb034f09e569c70e60056705d06239a420af8150885b87be681f6c0c328 WHIRLPOOL 2bb43b2a5edef7af4a4f63d6e4148c1aae0dbbb4f24742c805576a366994cf70a3e0ed614c2a3a2194eeb31ccaea10526d8657f48ca5b44d6a8b64c704e22e9f
+EBUILD kencfs-plasma-1.6.4.ebuild 891 SHA256 db4cb243e3010bb7c5a2d6f6926bfc69df34aa73f6d482eadf779c7113e190ac SHA512 13da37f7e2323b1a889ef6bc23e6af36b818e37e6bf0a52258b36a15275b418455804dac67467ac2717448cf477d7c7fa68ca4d12c635f5259a0d645c867acb4 WHIRLPOOL d93ea87216c394866c6d14ee37d9d46192e30929ebbd05979f8cd61dd0296cd58d9fc0d3daf102dd965ee2dd3ecfaf19bcc992459e92eb80c710466505f2d4a4
+EBUILD kencfs-plasma-2.0.1_alpha.ebuild 942 SHA256 fadc04940792dc53bdf8a291877782e4e2603df4546e87211966bfaad6632cdb SHA512 bdc8261ada220cf77dac4f95ccbb38354e2b4d67e8219367ae3a949b1724a53d2c32e8c9381010d1449d73f85087d2feea00ec87c88d13671825f7d6d420d17e WHIRLPOOL c800b13a5d2e0a723823d06e528b4e209a3c454788b723fda4a192db9b01f362716b03fa40ea1a7af44789e19a14982a4e73ab7a58038dbcdb57373deb292771
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch b/app-crypt/kencfs-plasma/files/kencfs-1.4.0-encfs5.patch
index 6687ac0f1f9b..6687ac0f1f9b 100644
--- a/app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch
+++ b/app-crypt/kencfs-plasma/files/kencfs-1.4.0-encfs5.patch
diff --git a/app-crypt/kencfs/files/kencfs-1.6.2-desktop.patch b/app-crypt/kencfs-plasma/files/kencfs-1.6.2-desktop.patch
index 2d8683f11e46..2d8683f11e46 100644
--- a/app-crypt/kencfs/files/kencfs-1.6.2-desktop.patch
+++ b/app-crypt/kencfs-plasma/files/kencfs-1.6.2-desktop.patch
diff --git a/app-crypt/kencfs-plasma/files/kencfs-plasma-2.0.1_alpha-include.patch b/app-crypt/kencfs-plasma/files/kencfs-plasma-2.0.1_alpha-include.patch
new file mode 100644
index 000000000000..2bdd692c122f
--- /dev/null
+++ b/app-crypt/kencfs-plasma/files/kencfs-plasma-2.0.1_alpha-include.patch
@@ -0,0 +1,13 @@
+Fix build when kdelibs is not installed.
+
+--- a/mainwindow.cpp
++++ b/mainwindow.cpp
+@@ -52,7 +52,7 @@
+ 
+ QStandardItemModel *model;
+ 
+-#include <KDE/KWallet/Wallet>
++#include <KWallet>
+ using KWallet::Wallet;
+ Wallet *m_wallet;
+ QString WalletFolder="Kencfs-Plasma";
diff --git a/app-crypt/kencfs/kencfs-1.6.4.ebuild b/app-crypt/kencfs-plasma/kencfs-plasma-1.6.4.ebuild
index f998854329f5..3661c4b1d3f3 100644
--- a/app-crypt/kencfs/kencfs-1.6.4.ebuild
+++ b/app-crypt/kencfs-plasma/kencfs-plasma-1.6.4.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=6
 
+MY_PN="${PN/-plasma/}"
 inherit qmake-utils
 
 DESCRIPTION="GUI frontend for encfs"
 HOMEPAGE="https://www.linux-apps.com/content/show.php?content=134003"
-SRC_URI="https://dl.opendesktop.org/api/files/download/id/1486311191/${P}.tar.gz"
+SRC_URI="https://dl.opendesktop.org/api/files/download/id/1486311191/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -20,19 +21,21 @@ DEPEND="
 	kde-frameworks/kdelibs:4
 "
 RDEPEND="${DEPEND}
-	|| ( kde-frameworks/kwallet:5 kde-apps/kwalletd:4 )
+	kde-frameworks/kwallet:5
 	sys-fs/encfs
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.4.0-encfs5.patch"
-	"${FILESDIR}/${PN}-1.6.2-desktop.patch"
+	"${FILESDIR}/${MY_PN}-1.4.0-encfs5.patch"
+	"${FILESDIR}/${MY_PN}-1.6.2-desktop.patch"
 )
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 src_prepare() {
 	default
 
-	sed -i ${PN}.pro -e "/^doc.path =/s/${PN}/${PF}/" \
+	sed -i ${MY_PN}.pro -e "/^doc.path =/s/${MY_PN}/${MY_PN}-${PVR}/" \
 		|| die "sed docdir failed"
 }
 
diff --git a/app-crypt/kencfs-plasma/kencfs-plasma-2.0.1_alpha.ebuild b/app-crypt/kencfs-plasma/kencfs-plasma-2.0.1_alpha.ebuild
index 51d97e164f65..5b6df0f1ffd6 100644
--- a/app-crypt/kencfs-plasma/kencfs-plasma-2.0.1_alpha.ebuild
+++ b/app-crypt/kencfs-plasma/kencfs-plasma-2.0.1_alpha.ebuild
@@ -30,6 +30,8 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}/${P}-include.patch" )
+
 src_prepare() {
 	default
 
diff --git a/app-crypt/kencfs/Manifest b/app-crypt/kencfs/Manifest
deleted file mode 100644
index 3241f02151f0..000000000000
--- a/app-crypt/kencfs/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX kencfs-1.4.0-encfs5.patch 413 SHA256 4c0eab8077163535d519cdd9de70c8561a4f3f5698f8c1a9c559d3271b1ee317 SHA512 47cb411f80bb4270d3c7e0b132949e2b0185b5170228120ee336fc1bb8ee83c9c0a960746407e8934097381a558be941d08d6e28b774423e58102a3f82a66ae0 WHIRLPOOL 5565e1de3feb3c10ef76afd90015f633e7b90ea985956ad0e2f6d37905bbd4d8ca2c0eb93bf67140bdc7b9c7d3c56d3cd16017b530ee87b6ce4950c401cb035b
-AUX kencfs-1.6.2-desktop.patch 228 SHA256 d39d44d5714e6976e7cdf18abe22e0134b02800ca7c45651d98225fa310ddcf4 SHA512 0f96b65f43fd08cfa116381e5db1ceec81eebb076dca9349d7d3781651bdc7d04e8f4d0cc611f793e581416304174286db98c6aee814059520a47f26bf885d92 WHIRLPOOL 2685f3cd9f7fc2bb385a19d228e95d254255fd010f4dbb37ecb3b2ce7f506ff74d032874540d674ae915997a12c3b780d10e25952e19182b832ccef41d317b49
-DIST kencfs-1.6.4.tar.gz 221386 SHA256 3e88cd2bf0d11ce83746fb5b1e385f172ed506cde922ee2811f9cdbaaa80c4ca SHA512 44dacd0a17194b61d2d73820851b496d6052dbab3893a030db2e63c1be0d1569d80cc75ce0c179381e98b60c5e27ccead8ee257f53f57dea508808616abb514d WHIRLPOOL 8b7f372c8c8304f3a3249a74a565ea77c4c3f255c6db3cf66a2a62951be1b8010e9696dc5d5ac44ea1e39d189c63e4a1ccf562cd4886578e8a2383756e48d24b
-EBUILD kencfs-1.6.4.ebuild 832 SHA256 e695d523b5078cc5537bf8323e25c9a681b892d932c7007831f368fe96b9e52d SHA512 a849eb9d03e52c4401f1320d2aa2d51cc60f5411748a3c7b06c88efc1f18fb0db8be77bc7e33b531287b4e0e491b7160ea35a281d66b3b85845a5a1e4736a7fb WHIRLPOOL bd2327b4d5cb1f4f19e56a7420997fb33e8eeccbf5adb98dfbcb7d580010307e4dc2c8cf6b45bdb1c5d151d60a3767ff5250c81b95dcf09fc20587d41cc1e6e5
-MISC ChangeLog 3459 SHA256 b79badaf2ac0ea794180447405622082098e4e7cac9a35435ec1ee44c58d8032 SHA512 16d14016c0d406385e5c95926dd4267ef49904b86843220f1a7bee6ae095286324a98973c6b540c953e269e15e4fa2784189caca43f5489423235e926899009c WHIRLPOOL c1d29c802eb5da17421e02396725ac04b604accf9042213c667fd0176d52308f982d84112e25f3ed2234a5b0f7b218f4ec084cea11f801857ca5a7c3ed423327
-MISC ChangeLog-2015 2644 SHA256 01a32d4dfeca20561235cc382f170cda00ea155b5863970820ecfe5298e58f84 SHA512 24df8a5a5ead26fe64c9f9059d52fa74be7bf5da54ca07eb327b57f38f30c90221c519868ad9c8deffd16a9f3f71022848d2a5b7adbed3dcef03679094ea0141 WHIRLPOOL 1e4c5302fa53aa2b738c4b8c9e619b6122ee391e574986fa8943a8f5f50baaf04a471d76f0371e00befe5fa27e8da65a5196c8d72507df012d68ae44897c5f6d
-MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/app-crypt/kencfs/metadata.xml b/app-crypt/kencfs/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/app-crypt/kencfs/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="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest
index b23b8c2923f4..1126d177203c 100644
--- a/app-crypt/libscrypt/Manifest
+++ b/app-crypt/libscrypt/Manifest
@@ -2,7 +2,7 @@ AUX libscrypt-1.21-build.patch 2460 SHA256 00b2c3a5f2f4692d25e3e6c411e146aca50b7
 DIST libscrypt-1.20.tar.gz 18451 SHA256 6074add2170b7d00e080fe3a58d3dec76850a4f272d488f5e8cc3c4acb6d8e21 SHA512 c7db096c740681c328d4c156372147331c0441906c1f17656a8ddd8345348091295749c4e3105bf26106f826327acac9bda97efec4ce50ac56d64f903c59e9af WHIRLPOOL 5d854936f955fbc08ec7d31e89396d3198ea58cac326ea8ceaedcc360e412cefc9e75b49a959870924cabe79ccf14453209cf450ff0256873c1de744f65706ac
 DIST libscrypt-1.21.tar.gz 19425 SHA256 68e377e79745c10d489b759b970e52d819dbb80dd8ca61f8c975185df3f457d3 SHA512 0f894bc2f47016cdd043ea692a4e4b08891b1a961443265230d5ccb76820d40e50b0d4d63588c44c985cd24e214f07b126d30989d3ce4cd79366f3b8f16c4d34 WHIRLPOOL 7fda5f5118c981d595f9f624ae40674c29fba6ee529ec8f4861b88d9bf11321b7a1285fabd1218356b59e889ddb96c4018513441fb4cebd302639085fcc097d0
 EBUILD libscrypt-1.20.ebuild 722 SHA256 1ab36b25bee260ef3ae5026e0a303fb92d82f7d072e4cbe98b402d78e3b52870 SHA512 482d125da9d0f3a062c84ef70452f6da4c24d3b6fac1eed53b2ffae2faf6b15e14216b8d95522d3fa45306a64a97ddf0e0b5e91f15d0d9319caf174182ca07ec WHIRLPOOL 88ef5dc28d4cc45db4fd515b6e83c090adcd5eb006d995a2db89bebcb823af6cbff87ad429872d70de9c12e2cb5bd209e2764dc50146745f049cddc2618f4bca
-EBUILD libscrypt-1.21.ebuild 711 SHA256 82be4ba258c8907ff2bb9a4dfdeb30da5bfc9a7b7c3de4e672aca3b2970331e7 SHA512 b5bb5c5eaa5c04da9c8f046589938e5bc40f28ed5e4c1b3c4970dd20bca9cab2ac045a99849c6544a788774cefa6b6e130a70b24f457ef57a9f9b799c0e3630f WHIRLPOOL d2f824e0cb4702e9b9dae242c4913fadcc04546fb6c9b3c0a6290972c830643e73db832e7db07ca2d11332dbcf4659fba28690bd7428d28448cad06abaeec5de
+EBUILD libscrypt-1.21.ebuild 710 SHA256 9e1cd1a7e2fb18d37762538fdfd47bf440117589cf33eed7e07e84e7f7cfed01 SHA512 f47b2b835acd83b9f4409533eb1d7c88c53d5c5fbfc208d8d07976992cc0787da134c455a42ce36ec5e8da1abd977953821324cbf633267a691a136c98a86cf3 WHIRLPOOL 979ef44ca648fc559816e1f925c2a0e854358790af09f2f18435168896b9d692b310be50ade44c63598ee98b366981a5e45d1e4aa5058061469e3716069d1ee3
 MISC ChangeLog 2235 SHA256 21a74e80d7dadde6500f36f2081d49630f95ae0b1c3567ae0b4171af45128369 SHA512 5b1798c1479023fe7c895ec5be6db22e40937415b296066de34d0ee02df7750c2d2bfbdf4f4bb3ff738fedccf64b5603d4d1796ffd63525491628727981bcae6 WHIRLPOOL 64021d97cd706b62d3056db19c4336573d55e55043bc581daeb96114be0bcc981d82619283fe02e93f8df51ab65dc18a974e43aa96400572fb446c2e840b8245
 MISC ChangeLog-2015 1140 SHA256 a4212ea3aa533d9b211b3e83f179f0e4d09b0bebd48ef69a1df2e3f736ee4afc SHA512 606ad54de1d822941fa5dac04d6c962ae5eb3059a0819bf26d19ba985b3ebdf0768ae66d7ff02c722711bb216bec08a6c6c5cc55c035622b995b19db1905b14a WHIRLPOOL 028fa99a6acbe34a196e6d3ddf14ec422ee0394dee5f1a0a39e5cbf8282ecc9c388cc249629522bfd32606b4c91ad91218e573c1847d7a0beb5bb7ec596cf399
 MISC metadata.xml 345 SHA256 2b9eaf348e1fb04d7b556aff418828ed4fd94c3f97391cf82d2185822f766091 SHA512 d123a54ae5536171b145454494d00e340797239bc5614a36451b9b975ad7bb2f38c5330069e78dd99f1d23cdb6f252736885af78d8cef63eb57dc93d68033383 WHIRLPOOL 7f355b8ac2c2547ea7ae61e0c17adc027216cf63e468a133a523432189ddf72d51ebba4400ea9ea23a991e2ceff43ec819c0c7230a70c1667fe38048f2f98b24
diff --git a/app-crypt/libscrypt/libscrypt-1.21.ebuild b/app-crypt/libscrypt/libscrypt-1.21.ebuild
index bd109f48244d..a2a17c257efb 100644
--- a/app-crypt/libscrypt/libscrypt-1.21.ebuild
+++ b/app-crypt/libscrypt/libscrypt-1.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-crypt/paperkey/Manifest b/app-crypt/paperkey/Manifest
index 27e242688959..d5a393b9c2f3 100644
--- a/app-crypt/paperkey/Manifest
+++ b/app-crypt/paperkey/Manifest
@@ -1,5 +1,7 @@
 DIST paperkey-1.4.tar.gz 259446 SHA256 e12bb0ec835127d12a922a8d60b3dfdb3ca8ee60bb5b4d15ae4cea85bbcf336f SHA512 d0e87760bfd66c39c407f59f94cdd3dfd8f399a51b854a2485f923f4f1faa95a40a68ffd018b9141b923c1db346993600e5e3644314e4f8c94585d47f1367e9c WHIRLPOOL 6a02bc0161e165b6e483ac08904943348ec0a10eba509028d5d092e1cec03d9e906e2d1307c16cb256fe4965a62c5c791becc0cc27200ab0b993de985cf629e5
+DIST paperkey-1.5.tar.gz 266722 SHA256 be4fab67fdbb3e67675dc77fb1c3295a3b13f61706718ea3e016eff88d70faef SHA512 3abe6be913748c08dd2a8fad1e0624dd77a14972abdc76722507ec454aa31cd24fe9ae9f85e256300e568fbc84da6369fbf07f93ae8520f71c46edae4f0f6fe6 WHIRLPOOL fec9855999ca783522bc11f5897abef32a4686e5699fe3a7ee330a9b1b6236a6fbd3c50c05802c3df003723010eded6ebf91fce2db3bd4e5b150be3ba873a4f4
 EBUILD paperkey-1.4.ebuild 342 SHA256 977f87381d6900efa3200c21b29e934cb5441735f267a30b7557471cf13d46c8 SHA512 841f89c09c1af3c4e7a05a356bb3f90d04037ab17cd176d2b14f0827f7a26db630b66f3e559dbbc23563d04ad30019181651a4837bf9a72d7e9703f8892e9839 WHIRLPOOL 17269d28c8d1f72ac1aed1ec6740128f0f99a2824eeeacd895f7f1c7e46c7e0504565cd61a236a90b6e68d89ab832f90c524302e1cae6fa826ccb2d85ef39c9c
+EBUILD paperkey-1.5.ebuild 344 SHA256 847ad55e62e22555d34e7bea7eb8eb36e738e4e17f35cf3bfce75382aa56a221 SHA512 00dbd8a2b5c837b3d45578a5baac4e7f771f36197f9b7597afea20a283e9e76cc7a29cf07de427e420797d61eaf62201fcb1c0a46484faeb3c9fbc1ce9860e64 WHIRLPOOL 1ebf65280456af2367c6b9b2ea552c3993f01ec12ba13d8b2937ec6da62511d9b91f677fa1f0312f8edd36bde331bd5334059c3e9b8ea0c73de131c0c2566ed3
 MISC ChangeLog 2325 SHA256 7a7bba35e17201236f7c243e643c9f144b7043cb9b197fd9ad24be0205a3dbfc SHA512 6b36c95162d9f98a6a3735b45ab36ca5e544a4b1358a2346eb7123d51b6425c206cfb3cfd9d43c6d52ee400ebc7493ae53945b10d30f057d1ed1dcc1287c86e2 WHIRLPOOL 426005e4f69c1ac7a52950154baec75c21eeb7d9d4c8f8214ee29fe4b379dc8e7b6fedab4fc6f2722025648d890f1a550d5441932d277c8ba7263f377972eba2
 MISC ChangeLog-2015 479 SHA256 64093dd473dd377b2686c39ba837560907c7583e25e72cf75089a8fd5b9927da SHA512 7e0f016db4af516f9745a78c0e1540c01d82b385cc15d8119a6c3f588bd08d1765132bf6b10bc3399bf51cdcd08787f8c671f2cc3537b275510c3f064f86c7b8 WHIRLPOOL 57f8a41ca0bf0a1ba61d27bda375c34b721dd6883af5059a446713a03e521615917a087333a49b3cc5d9fa5ab80a5f8b8386d0c86fca695c21d765002859e8b4
 MISC metadata.xml 245 SHA256 6fedd876236c2f1fe2687e73628381650ebecef9734f88f6d483bec5bf475a7f SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4 WHIRLPOOL 4957affde63b54e118270c40ce12683872777b41ec1a798f7b03807a99917148279d392f71cbcf95ec4e5d586ee5fc0400aea77d9e46083873a441a4907ba13d
diff --git a/app-crypt/paperkey/paperkey-1.5.ebuild b/app-crypt/paperkey/paperkey-1.5.ebuild
new file mode 100644
index 000000000000..92d3e57c7bc0
--- /dev/null
+++ b/app-crypt/paperkey/paperkey-1.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="OpenPGP key archiver"
+HOMEPAGE="http://www.jabberwocky.com/software/paperkey/"
+SRC_URI="http://www.jabberwocky.com/software/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DOCS="README"
diff --git a/app-crypt/pesign/Manifest b/app-crypt/pesign/Manifest
index 48a61cc78654..d48894851f31 100644
--- a/app-crypt/pesign/Manifest
+++ b/app-crypt/pesign/Manifest
@@ -3,8 +3,8 @@ AUX pesign-0.112-fix-cli-opts.patch 2228 SHA256 387de650336376a8b5edb2cdc4097114
 AUX pesign-0.112-fix-initializer.patch 388 SHA256 417d2a19d929627a0dec093767bbd19f0c7774184e0f5e607ef90a789e9b630b SHA512 1b76c6dfe7ddc76a2051038894b7e2da72c01ebc05a46d4b6ebc05a092a55d699161e04c4df73d1afb7752e6a138ed8c9c28eda55897c82934ca852be42dae84 WHIRLPOOL 05d5c1a34ff01767ca211545922c9e13208f5ec9fab99738da307465838f78111152adc18d952ca3ea7fcd35a4a8077c33b4cce77583bb98c9c9c09c0d52850f
 DIST pesign-0.108.tar.gz 96838 SHA256 2019882be0286df1c58efa8c588332106b89418a6bd0fce3de8da4ca16636986 SHA512 f72fb9c3e843341300b68e06bb153690734f6e506cdd9f0d9362c760ff48194ed1ed29e0b58a5050e7331069ad47a9902cc9e34bf616667baf84208f2b69a918 WHIRLPOOL 0af005d0b6dbdff23787c009153cae07c6907d111f57831611e85c49656e29e150ffd71683f349880cfb8975547ea3a3e655cdce31b047b355ecf097e7c7ba77
 DIST pesign-0.112.tar.gz 107632 SHA256 df4f5459137126e2fdb06484d755a81b6ec9a7b50099dcc3088ea2d41047cd06 SHA512 9a0cd266f973fbd7bbbd23939d0be3c34dbccd9ab20941bf967ca1b18aa5bf5d2c41cdef0799399e09e7b0fc59a0b34bc660afb6da292eb1c127db2893362018 WHIRLPOOL e5f3d3801ff7df7d643e87bc851f2645931e18df140b25a7add4136db1bd89c2a8da75d8f018533d5b16ab80695740d00ac379e166993a1912ba9ad2abee6791
-EBUILD pesign-0.108.ebuild 1180 SHA256 e4160868100683edb31bb37759b251a1413dba87d6e3a68fcc64e5387a5edda8 SHA512 53c6e8b00914f01cdfbfcce7badbf4c888a6d23276e9787e34750a2aa85783018084ff25883a313b5b2b67a1b82a6b6888bf971f48c39f37e26c01e74183a7dd WHIRLPOOL 973c67e3c80c29539bcf90de723d98ccf58c67c5c0d8bb723331fd4526f8739fb02e9aa315124e883d71df03c7c6208f6922b882cba7b96a457a3df154c70950
-EBUILD pesign-0.112.ebuild 1000 SHA256 30ead77c615a8212ac27a62b312f52bf2306d74096b654b3b09f193116a51e1a SHA512 cc54e08354b28e7ee96304543815f9dd29ecd9e30709bd6f3861ab04286c7c6bfc3f0e66a5a936222741209d2b649af1349b632826cc914268162dc35d5ae2cd WHIRLPOOL 1b99b77badcb4a12f8bf51c97923f83b34bc2a80bc8e0eedb8dddd093740abaf6a497aa91e4c2138177034b8f261e8888fde02c61cfef3fdbb8830c54b1132f9
+EBUILD pesign-0.108.ebuild 1209 SHA256 20d390bb9c11d7adb607b58d0c1e17faa8a6c339a7985bc89863af7d54c0d97f SHA512 db47d7a32a93460ed56c49607c5f5a2d42775dc799fec79f19fe0ab2dcc70bb11448dc7266a41dd4c1c9c586ad36d77d678baf4cb5a089e36da7825cacfbf673 WHIRLPOOL fe27a9240d81c92208bbea8ac79a3e30d044f356b546d7e8f7b49974c1d437e0a0b73c8bbf2bd2a2af7b40f3b4bfba01e5efd52832ddb2c4d78a94d94e6ae9cb
+EBUILD pesign-0.112.ebuild 1029 SHA256 894acac7612a7138b281ebe0cd4acf0c5e7bf961930d33b30da3c4bd4e4c3b2d SHA512 8c19ec52ca3894113e5c65cf75f2a1f184d737872f8c8d37b3112f4521ed7ad172f5d44947307c8ac5c346da6cfead236eadd2622e1c0589446aa41fcf6ad148 WHIRLPOOL 675b9c26a6b27c2c336df91ac8d93b2338629a2dd6f7b4f3f7a93f6bc14273432f8002737d5269dc26946d625fd311ff6952e42e4dea3aec6a762818d0b53904
 MISC ChangeLog 2454 SHA256 f5c5d6fa0fad7b3b0c0c691d91f52a97156350b9ab9afb72d8f23c2ef6c6db0c SHA512 c0e8166c72bdd47be814ac780c46f33d2eb7b15666a686aed4c8c568a0c0fda1bd4eabc5f2b2a04d49644e7e16199487668715a783390ee1a1470e5791f33d82 WHIRLPOOL f644d83492550f0293c5b304a2d629f6f8e744d34dece049c2cd3f5603eb87431ab8ec39a88dab0bb7809d7d7603f6cfe4fa165b6e8d5186416e97212c86cc7e
 MISC ChangeLog-2015 1045 SHA256 c4b1ea3c1832dbd4f460aa346974789fb65824cbd69aacb24dc3a8834377e6be SHA512 970be07aec9815faf2ffbf9855c8331c07eabec884c70d7382d980fc1f376f7f77977f6e653c20e820073db5b001539132a38cc0586ae4db43d036c641d4ab3e WHIRLPOOL 1c9b8f75019201c42ebabb79f89313eb144b2fb33a56cf17857973b8284c0078c337c46194a27ff17ff163ba2fbd268f873993f5e0bdfe87fdc8aed3c31460c2
 MISC metadata.xml 466 SHA256 ed83ff7c2420eafe66aed4da117b1869c3dfb4f4a29865b4b18ca5ca6ccc9e28 SHA512 cffb289b804411ba72b52113ac4784e2873c0c0730496eb3b29a35c2d2a8891031f579e70cb7a64f0da685fedbcf3f0787ed2c630664cb6c363ddbd66e0d1364 WHIRLPOOL 22ad17121a5743d51a59b78837933e65de31de9032bf9da4e92d28655d4568dcb2f186f8f196bff9be901ccb4923afdda989dab0646c96ba08910ce58bfa713d
diff --git a/app-crypt/pesign/pesign-0.108.ebuild b/app-crypt/pesign/pesign-0.108.ebuild
index 5c3ee729fc91..6413ee2491d5 100644
--- a/app-crypt/pesign/pesign-0.108.ebuild
+++ b/app-crypt/pesign/pesign-0.108.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,6 +16,8 @@ IUSE="libressl"
 
 RDEPEND="
 	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/popt
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	sys-apps/util-linux
diff --git a/app-crypt/pesign/pesign-0.112.ebuild b/app-crypt/pesign/pesign-0.112.ebuild
index 01a0925a2bd8..a5d5bac847a7 100644
--- a/app-crypt/pesign/pesign-0.112.ebuild
+++ b/app-crypt/pesign/pesign-0.112.ebuild
@@ -16,6 +16,8 @@ IUSE="libressl"
 
 RDEPEND="
 	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/popt
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	sys-apps/util-linux
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index d40d1cb57af0..a11b14fa9b0e 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -1,6 +1,6 @@
 DIST rhash-1.3.4-src.tar.gz 249357 SHA256 406662c4703bd4cb1caae26f32700951a5e12adf39f141d3f40e0b461b1e9e49 SHA512 a78be309011798d5e55023eb93f898c10254a42270288fa5ec68ad446b5f3d001e8c6f893683e5171e3858c86d45ce2ce16eefde1173209e1925420c27a7ff7a WHIRLPOOL 5883dcbf0c2bf51036434d1906b85b615eae65ef2729a68d7ac637e2bea3c494cd3ee7fa9a60d3c4f3241bc4fd5c62c8f7e058c0e53649d50dade241e06dda2e
 DIST rhash-1.3.5-src.tar.gz 316867 SHA256 98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e SHA512 e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c WHIRLPOOL 80540e96b554fad8c18da431677a0bdc361f7c406b746050bd25ad0b2eeb9d318f1ef0d87ef002d8b8c6fa7db6d789391115358a1676358afd478564d193b229
 EBUILD rhash-1.3.4.ebuild 2642 SHA256 e9823e366370edf45b8270b31aec98ad33c175bc25e2d52057eb4a1b9c71fdeb SHA512 a869ce272ad55fc586fcd7ec563e9856ff0a87757914756e1ba46fd3da34ba3a467d5e0454e8d530c9c72975bd5e06f5b42f072ba8301546d01226753dd1d52a WHIRLPOOL 4bde3bb3e0a8a2f815e166ff91dd606434d2026024c9d889479df2982cadd17b45196f05906570926123e65be153a8f1cfd74ab8243df1e0294c49c8c814b66f
-EBUILD rhash-1.3.5.ebuild 2592 SHA256 49406971d0fd5f1ecb89f502505b485e4ae737087a22e79b89b81d8f28e4312b SHA512 ab1dd06b06b54697f52da7c2263d57d9598ccf5f2b620886120900ef6643db33559df3c113f5c37996df3074a9c220fb14e5e35b507644b230aa5207335c5cfc WHIRLPOOL b15db2e3f14a362e0944840f8f0e1b5a0c3679eed5d762cca7634a5ab1a64e47f91515966c10a49a713bcf3df2daf09fb492519b1bcaeb103caaad831eabea25
+EBUILD rhash-1.3.5.ebuild 2591 SHA256 be1ef694a1e7667cd7f96d1260aea5e5eb99f855f3c8d48de7729e9332e45f5e SHA512 a3a0465fb6453b98974defebc4d8e3140a57a5ea978a19d84ea8b3bdcc5d89ee73e20335bb4549c98239d99c2ead559dde398d1f0f2da2e19a064cc291792747 WHIRLPOOL 2c5a624234a0e1e8111656d9b004055e66c07b2f7a374d69c2b7976f4123bda435ffa9ea0ac38ae305a72030d6614d8a647d29887a2701aea47aecf1186a9b3b
 MISC ChangeLog 1898 SHA256 42a9aa251be9c53c86632be46f1a40bb42fccdc94077e44e67f137f16898c43c SHA512 3c7c8dc6b1497db03e2e09c856cd0cde5947e94bbaa1116d088148d01901459d61b4ec50579dd165fd6a22edb2e28f5ca05b62413a0baeea5b47580b89d2e8f6 WHIRLPOOL fc96a4e7ad467ac1a07d19736becfe148f718979e14ba6fee1d037d6901c0601a60444de8c5f232d4870c91c91e54e9cd8c4fd34c6768209977896a34599f2a9
 MISC metadata.xml 843 SHA256 89065f6503470d30fefb7f8c0edb4d8acc8fb486e2f9c4f0e68756ae073bbf7e SHA512 360de1b8627471599f06a5bbd34a4359be7bd5bc39fe97d7db3da57794e2ace132539e56a2cc971b53911887b314a8ff1c689063c86d70473ac771062f1f3b4f WHIRLPOOL b56ecfad838655183ee34037e82528f2a839309a03a26726fbfb6b4868813b9785db132b5f54acca7e400692dd27afff7733518353ada932cb3efd27322cd1a5
diff --git a/app-crypt/rhash/rhash-1.3.5.ebuild b/app-crypt/rhash/rhash-1.3.5.ebuild
index 381e852a6f7a..ae45a3261d4f 100644
--- a/app-crypt/rhash/rhash-1.3.5.ebuild
+++ b/app-crypt/rhash/rhash-1.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug nls openssl static-libs"
 
 RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )"
diff --git a/app-crypt/tpm-emulator/Manifest b/app-crypt/tpm-emulator/Manifest
index b7ba90461811..1378169f953c 100644
--- a/app-crypt/tpm-emulator/Manifest
+++ b/app-crypt/tpm-emulator/Manifest
@@ -1,7 +1,7 @@
 AUX tpm-emulator.confd-0.7.4 34 SHA256 3af4a1b3f83919225c4a66f3de3159bed4e8eec4d55e9da848018c5ea66541ee SHA512 61b5145d3fa5b778ba09e66a25ea183165fafbdafe54aa77d171aed2a87f6b5febc918d33603a9bf58320e9ff3f79e3ec58d03d4674562d31c1c90b942faf504 WHIRLPOOL e95e8e0326f2c64695b63ba8242bf0ff9cdf256411b05b9aff9553b5bb69266d5a8bc1aef0cca701502ad94852cec254dfa0e74fdf546952f13afdabd9cc3598
 AUX tpm-emulator.initd-0.7.4 1100 SHA256 db1036e23b953ce7568eec3fe0ad0842d102429c06c87655065a51d6924b0cf4 SHA512 5fab6f4c9b7057fa1bf23b179747d125ec77729a1a69b762735c429824ce6dfee3033012b027a44e5c731ec86a4e78b8b64c44d27b207867a26a9663382a84f9 WHIRLPOOL 25b5c8fc5689dc5625149e34fec2b9e8b0b503bbf31d2360f9a033f854b23b86858114dbd0262d687bc538d9878651307c2cf0d2e99eb9878e3eb28c1c4515ba
 DIST tpm_emulator-0.7.4.tar.gz 214145 SHA256 4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459 SHA512 4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35 WHIRLPOOL c75d49e834f8df6c810d7cb7ca3553e742fde0fd6050af7f7aeda8bbdf652084dda6600719eb0b816e1d51bbc5d9f0e119ea40ce3e59af05fd8d55971056fd6f
-EBUILD tpm-emulator-0.7.4-r1.ebuild 1645 SHA256 feac767d59c90a46c69ad9cc5d17dee6b5112ef7c611854d9c581fa407e67b58 SHA512 3de1ecea2853ebc08e6d1f39f998c267348c3f8f5bdf1df10892bb1341e57dbc35e5df2ba7eb65781998dca0428ca912c4744a0e05d1045755ad94b80c672e3a WHIRLPOOL f54eb925f8198ae6c4bc1e8208aa95a2fa9faf6811d51ab972b5f14e9b5f9cae4683f7199d02229a87d9ce680b6db0d13e3ef8d0c97ba37f1057505cc2a0f967
+EBUILD tpm-emulator-0.7.4-r1.ebuild 1668 SHA256 dea25c9dddabd7f87aece320809d552c3fccec059a55fc0a7efa4bb1f888d2e9 SHA512 d35b538d777a826a7d9e329edb1b69ca3974205a2d71aacec3138575ff0a693d92119fca21b15de2baf11dff8eaa2885a0917f31ac3d99f5623dd3ad06d87932 WHIRLPOOL 4d9fa7bbff0236cee544f4989e8f6905ecc15639b3535d7f306dac6f45efaa5d0ff9eec620e8700651bb73aa8ff25f4c6a07c041936b7032d1a37c7557255e98
 MISC ChangeLog 3387 SHA256 f55e1133580bf004cfe86cdd6497dd73f9e4da8376f4f153f800836595d19e39 SHA512 f5282dd2eae01c78af9221eb8c04e4b66a9b5ca8e2a9f675354a8bfb0aeff852c6c589eb3710bee63ae7ade9601c6273ef1658408e69ff75d0808160e47d318a WHIRLPOOL 5a2ab0aeb39d795129ab9244babe18c93f3c013871110406bc60f1e4f9a078c0c31b53ba46d0c2f0c3ff45a85a7a6625cb7014db484da39bdbb8da74e8863839
 MISC ChangeLog-2015 4068 SHA256 cf829802bcc9ccc92c8962e33f031b5a73ea11e79d4bd4df8088db6bbc1b3101 SHA512 bbf9dd6c4bdbbb0a0dec33a11bbfebd995e8d50b78126d0c9281e856d41316b7593c5b4080319d50e1e923e3c7a01488f4b29cfff81187290870a9bd6ff77e3b WHIRLPOOL b53340261f9e958ff00ebfcdf0f6bd854b8dada9d4d4ff5ce62616fe0b5e15211fc771d7b569154da4d8f4659229cffc5bf6a7f72bb2b3551777ce4375050c63
 MISC metadata.xml 322 SHA256 cf1287a6ed50b56fe582bdf43aa900fc5c4d4cf6c14d5ff97d04c7012ed9370a SHA512 59ca2140630f6c408c51176a30ad8357ecaf8c1a3b37b495176b25cf2b1cb259882dded5072440cfbfe2d16741520a0b30b41384db89c794ec183b318419b578 WHIRLPOOL 7feeeddeadeaa17e666f1a304709b12ea88edbfc603f706eba71776e935b788e3d8462297166ff4bdab7079359be9448f8a4200cb01722845cfea1031d7e0156
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild b/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
index 2e719e5b28ba..8f55dd6e71a8 100644
--- a/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
+++ b/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+MODULES_OPTIONAL_USE="modules"
 inherit user linux-mod cmake-utils udev
 
 MY_P=${P/-/_}
@@ -13,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="libressl ssl modules"
+IUSE="libressl ssl"
 RDEPEND="ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index f386c1f24095..0816590f570b 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,3 +1,5 @@
 DIST yubikey-manager-qt-0.3.1.tar.gz 175215 SHA256 e41bcda5aae5e0f92158f591e8e584d25c9b4872475f8e4253c7a7671e94c859 SHA512 d47a6b75b50c2dca073ab74ea2d7c7c46ff86ec338f52d49afd39796cc1f3de7ddd74664b5f60f9013393b9ca24621da63d218eb3c2cb3017fefed2370b269d1 WHIRLPOOL 1d6de66f0450d72e29b9e9a2a959f4ca8ed7c8614b976115ecfb433e8b5f1795d12e6d907f73152b6bef3de6510cbcf236b2386b18a3cba2094269f78522196a
+DIST yubikey-manager-qt-0.3.2.tar.gz 175662 SHA256 5dd780c75e17a141ab882c8c10b04dcfcc61dae7e574c1404a606b05b047cae1 SHA512 5ae0b802f041a37a67bef6f7c8b5224fe47d145bcb3bef8c42e300048e849bbcf333de6d15a9a671ced21741d412af9419c08fd3b018276ce997b3cdd5ba55f5 WHIRLPOOL 5284a3e2f1e64d3b793b82d1064feab7325de12c0b8b6b5328f66440668d7b2628a5dc0df2d0b3b5e3a72a6f4aca511777cd6e2ae9fb3f337cc908cb1a2f1586
 EBUILD yubikey-manager-qt-0.3.1.ebuild 1043 SHA256 3244211d12397be8fe7ac51c50de02f9fc43dfdb664eff6f5c6ebf351e397602 SHA512 74a284e243a833f9e8f7eee39f9ec82004f4fbc9059fdc306b6e5b173904931437199cc982221c257fe79567db6002b03c26c3a1eab88bd8deca62c13986e788 WHIRLPOOL 35d74d60c28a240c49fe7ad6775a9d0a4437a48db690f8b5a3509cdbec812c112b79445d2b742cdd3810501ac45cda3a14b2cf99bd99d4c817917b8589bb8c12
+EBUILD yubikey-manager-qt-0.3.2.ebuild 1168 SHA256 53deb7ff9ddb036123a9b4c6325c489dad5f63dc4c16ff055744b7f365470cec SHA512 fcc73dae2936bdc038d43ac092c23bb2f43d956d779b87a97d41bd38b61b68c9b85bc6be40c2210b6fcbb8eb5d93be73ff50dabbf23d2aacdcf1b98144e5e002 WHIRLPOOL 6269ed15d20b838343f9f922d3eb0fb9e1aa72804f67ed5b8c36bb4ef2e447bfbd2a9196cbdfe9cbdf2e6fcc7b9bfe61d63fc55189b9dc4b65b207c5497e1967
 MISC metadata.xml 245 SHA256 6fedd876236c2f1fe2687e73628381650ebecef9734f88f6d483bec5bf475a7f SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4 WHIRLPOOL 4957affde63b54e118270c40ce12683872777b41ec1a798f7b03807a99917148279d392f71cbcf95ec4e5d586ee5fc0400aea77d9e46083873a441a4907ba13d
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.3.2.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.3.2.ebuild
new file mode 100644
index 000000000000..74f07962a8de
--- /dev/null
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.3.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit eutils qmake-utils python-single-r1 vcs-snapshot
+
+DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
+SRC_URI="https://github.com/Yubico/yubikey-manager-qt/archive/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=app-crypt/yubikey-manager-0.4[${PYTHON_USEDEP}]
+	dev-python/pyotherside[${PYTHON_USEDEP}]
+	dev-qt/qtsingleapplication[qt5]
+	dev-qt/qtdeclarative:5
+	dev-qt/qtquickcontrols:5[widgets]
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	rm -rf vendor ykman-gui/vendor || die
+	sed -i -e "s/ykman-cli//" ${PN}.pro || die
+	sed -i -e "/qtsingleapplication.pri/d" -e "/CONFIG += c++11/a CONFIG += qtsingleapplication" -i ykman-gui/ykman-gui.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+	domenu resources/ykman-gui.desktop
+	doicon -s 128 resources/icons/ykman.png
+}
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index 498a27dc476f..b590bf146e83 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,5 +1,7 @@
 DIST yubikey-manager-0.3.3.tar.gz 51223 SHA256 5447c026739d33455ac8ae13ccaef2df231a28dda75ffbd62c91a7c5ce5d30b5 SHA512 ced7acb848747399d4b9f0214044dd40c38b332c2f8557485d61f2f0cb857a9f47d12df59ea6a7bded1076b5d539bc171d1dbc9fd8899699c0cb3cb65b0800d7 WHIRLPOOL f68c896cb10b72271a6f42e34baf3671bfcd9ccd69c688db5fd06fd6672d1cbd12271ccc563f400d922eaf842bd7e5d73af9cac0f725927f7efe4ac520d3790b
 DIST yubikey-manager-0.4.5.tar.gz 55315 SHA256 d91f5b549b23bfc6c04d9446b9ced6c6f80aac702b26a1fa4d1b8df5eb9a36d8 SHA512 232ce7557aaab3c8a27dfa2ceaab0491ac1f97d4332b25e7f77c968da48c9303627defd0246b1e97c7ed766e6a667ac996ac0430cfeb4e7310a0cfc4a633d1b2 WHIRLPOOL 15be6470b114a70d6c960b2518f94799b05e85be5a4c32d23f3e9a8eb20be681f66aed7aee65ea138d2de495e4215730b1ec7dcf99e4328561f205bf71fb69a6
+DIST yubikey-manager-0.4.6.tar.gz 55065 SHA256 6f9aae731e1c71ea65bea48911aa33a29b284afbabe9430f84e07a27cfcfcbeb SHA512 fd52cb346e95b3184fd8e4bbb8e227c75780d7fcf5057712c6def866ea951700f8cdd1286ff857e32754d539dfc7093d809fc585191b05c57f5f983d5b288e7e WHIRLPOOL 1d9178c82b3ffa0622ce57ae372f966a6f729489518d3d85a19062c5dfe82700d21b60992665f497eac623a91c26d913aa813e2d990f93e563b565fe925587c0
 EBUILD yubikey-manager-0.3.3.ebuild 736 SHA256 177041478e894a931a82bdb0fbbd1f08b1f5f7ed384b48e03901a78b7d26aa54 SHA512 16b96e49659f6a5a4b9b3e90a61896de9d6cbcf991e2d9a44df81c48be8f7936f5de7aec380538cbc8ed034b54617928b456b53a2c322631dda476c6e6fe2d8f WHIRLPOOL d849bca0f1d79d58d1fa7f66d977a4e50625b020c49f87ba8022a40ba63b5b980d14700a2631a41f4d2c879b458a3fbc592e7a2f826a6b9729f1a02ea5bff414
 EBUILD yubikey-manager-0.4.5.ebuild 858 SHA256 0ee32b8f039b3ceaf111bc5e341b95a5da2a32ddbbabacc05000e55370f91a21 SHA512 25ace32bacc3ea4dafcc330222cd21b327e859ce138a4a2be4f07a322860dbf503ff00f9b32cd282ff8a97ade6aac59b4b9230ec23cf78b583bec490a614ed79 WHIRLPOOL 42d88df2ab156100d10c345b41aab277e60382d685adf8e1362af166c62a55a5688cef33b709589540c9c6f324d68a5ec25c5ba87b368f44c5129060f249cf22
+EBUILD yubikey-manager-0.4.6.ebuild 858 SHA256 0ee32b8f039b3ceaf111bc5e341b95a5da2a32ddbbabacc05000e55370f91a21 SHA512 25ace32bacc3ea4dafcc330222cd21b327e859ce138a4a2be4f07a322860dbf503ff00f9b32cd282ff8a97ade6aac59b4b9230ec23cf78b583bec490a614ed79 WHIRLPOOL 42d88df2ab156100d10c345b41aab277e60382d685adf8e1362af166c62a55a5688cef33b709589540c9c6f324d68a5ec25c5ba87b368f44c5129060f249cf22
 MISC metadata.xml 466 SHA256 66cba5a1c03e19490dd5cb31c9c66afcf1ba81d808e9f8cd7dd78cde93af2a32 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b WHIRLPOOL 38ddba3bc57a218731b1269a6bec87f4171de5a4c25db52aa3b58f1f03833b1f64382e73cc8bdae61987c40f1c56cc9fe96f19547b6b44528eea67de7ea17d5d
diff --git a/app-crypt/yubikey-manager/yubikey-manager-0.4.6.ebuild b/app-crypt/yubikey-manager/yubikey-manager-0.4.6.ebuild
new file mode 100644
index 000000000000..d5ad29c57862
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-0.4.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit distutils-r1
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test" # Testing requires RSA keys which are not present in the tarball
+
+RDEPEND="
+	app-crypt/libu2f-host
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	dev-python/pyusb[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	sys-auth/ykpers
+"