gentoo resync : 22.01.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-01-22 10:09:44 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-01-22 10:09:44 +0000
commit: 09351e78166b5e864197c4456ebae3f89dd0bed9 (patch)
tree: 41a96399f56ed3aa399006871bfce4430db84aa2 /app-crypt
parent: c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (diff)
48 files changed, 669 insertions, 192 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 618b02d08527..d6de858ef013 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 799691314d3a..2e6fc2927f86 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,8 @@
 DIST certbot-0.28.0.tar.gz 1253582 BLAKE2B f97a195afacd279b1dfc2d62ea45ae43dfd2d160f148200dd0756eda1c75561a6b1326a346f84c666c8409d339bc4341106ed4cfc684a7d868b6e1e10707ef78 SHA512 07c9bbad52acebc60e48d79619e4f12818d67c3b0f41ffa4fcd02098fb9da245e4006418f54c51c2e4bb9aaa01a21f7a083c9eb092f533e6676ed75ae8667a54
 DIST certbot-0.29.1.tar.gz 1265252 BLAKE2B dcb63862f427851655ae8282a3d479adc4aa2f553f510f3769d59748728505cb052291f728f1a01ad4efffa25d9aee6be881a9a7178fb0c025725780150ade45 SHA512 c9b976bec51c83412816726b709b79af0b464efa02f67c4ce7e754a2e6fa11e6811ca5db66616bd7b9e7920d6613665d3e58998c891bdb1452a5159a91971c56
 DIST certbot-0.30.0.tar.gz 1266974 BLAKE2B f6c0c6864297ba0f6fc3232e0655d79e0b045923c22015d34f706e392ef83ca95c19b36d47120500bf4a0561a277aced13f7fb49d7bdcdc8359113c617dca37c SHA512 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
-EBUILD acme-0.28.0.ebuild 1256 BLAKE2B 1101a641f6d41ae084d7fe938fc8c6b91ebb54240baf55db0c31ae3520e8e4de648499c0ba647db773fa6b7c45ab3fc98144f62ebe0abf9566e81f2f9d3aa5f0 SHA512 87d7f1770277cf994c779964c76cf636d41281b6c2614c06d40771bab54b3edac737249a45d7f0624b58014c7447cce3adc92fb68f1c4b23db2bd9301b2ed0a2
-EBUILD acme-0.29.1.ebuild 1256 BLAKE2B 4559bab05c5cea2a85872dd81986733c47f1b347639b403339b4b1038d7db9e03064c54ff6ba6cc48bd71247dbd7cdff05f1b67314c908b6acea5916fec6f6ef SHA512 aa0a41d1204daeb1d7ebc0d2882b19fb106a255bdf6f1c70fbe30f5c806ee2a7dd33af96dff0add1e380fcfb1134b87fbd1e8a97e30a1fb31a5790ff932bfd4e
-EBUILD acme-0.30.0.ebuild 1258 BLAKE2B 6b3a286bf2bb308c891549341dcce442160b2f43b7d121e827fd24ca3daeef6f694ee79789f5035e839361735ee31f9aac0e84f5d4265a556418854a2c360ce4 SHA512 2995c3fa6cbb586e7e2d40833513524922dffc4fd68c14fd937f76a1465df6695fe3b9eb4497850c26d268310e62d9fdd484423bd49a1154d1b7934ad3d6e7b1
-EBUILD acme-9999.ebuild 1261 BLAKE2B fd84623bd4510a088e0d27017f4e30a9b5214d1983298905163a4d944fb63bb1240b650a0ae1079398ccdd3c232fa58672b80f260deff64da0d62ef72c9d6a6f SHA512 0da048ccbf900d3dbde6b3d175a435e1337316d29bb900127c0429c434585a0f864aea1ba8af8262c1878ce77203d52d032614ca9722c063d7bf73607ea41cc0
+EBUILD acme-0.28.0.ebuild 1263 BLAKE2B e735418ba3c1a93fb9c4303991fc90e77dcd41bd092c2f95c59043682e33af1fceef60ffab3635d2b02f47fe47ae9a9c7f9b2e25ded5a0825a3ed0d4dc9fcb01 SHA512 0f96754b57b8b0af5d3c0708ab5be361a2b2b3cab5002c2d27bce20e1d45433b0c56823d3f79eedbc2476887dfd2125ce44385bec0583c255cfcb7f299154e45
+EBUILD acme-0.29.1.ebuild 1263 BLAKE2B 1ba41c5fde55e0926d7b98a6ea8991fc7dcaf9285cda1cf9191ba78c6a423ab46954173e31d768e215d43df9066c8b9c2177bb71a11d81e4f21ccd58035a8fea SHA512 420bbef6273fd518680b7a292b7a28d69dc68c2979f94c415b5ee2eba8b5213967048ab1e03d619bbcab6e0b9d079aa4f8e153e737ce26704701330642c471d0
+EBUILD acme-0.30.0.ebuild 1265 BLAKE2B 393a9517fb9eafff45a66ccccb2d2d3d86ea94e412b86530c5882ee79056635efcf8696db972942981e9fa47af51b19d339500c0e7251ed71bcb84449adc7df7 SHA512 67d7e6f1e2850828fa523438a0a292ec36e7f403651fa4f865820982783d8310a6e7a6caaf22bc4a6c35bc005c6d5563c752fe19aa9672ec463b296a2279bcb1
+EBUILD acme-9999.ebuild 1268 BLAKE2B 67c4ba32f3d774554c6e10fc7e0e9a5044149b602e07c739f04db8ef14cfc2e9037ea2e2f14e48cbe6e0e0a987f8bbaf3f5096f918ac78c0b791194d48adfe4a SHA512 a65c13409ba08c7a97e4a856c6e2017f73b5eeb0a7a4d274c2501a67e265b0d68af7dac04ec0ba363a993a64c9670894eb2f532517ce043f95f7bbc2549363a4
 MISC metadata.xml 342 BLAKE2B 770c32b421519cd6bdf7e09a71a1ee679a7fdf18e03587f75097a766c51dc878000184759e3c69f0c19afe060dd5578ff91e481644086e138dbb728619895130 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb
diff --git a/app-crypt/acme/acme-0.28.0.ebuild b/app-crypt/acme/acme-0.28.0.ebuild
index 2691a8a8d0d8..4c81e8bdcdbf 100644
--- a/app-crypt/acme/acme-0.28.0.ebuild
+++ b/app-crypt/acme/acme-0.28.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-0.29.1.ebuild b/app-crypt/acme/acme-0.29.1.ebuild
index 78a008d62240..f3343da762b4 100644
--- a/app-crypt/acme/acme-0.29.1.ebuild
+++ b/app-crypt/acme/acme-0.29.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-0.30.0.ebuild b/app-crypt/acme/acme-0.30.0.ebuild
index b79fcc1ee54b..e41e26ef0fc4 100644
--- a/app-crypt/acme/acme-0.30.0.ebuild
+++ b/app-crypt/acme/acme-0.30.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index d408adeca31b..cc2960bf38c0 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index b151620100b4..dbfef7ea99c5 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,8 @@
 DIST certbot-0.28.0.tar.gz 1253582 BLAKE2B f97a195afacd279b1dfc2d62ea45ae43dfd2d160f148200dd0756eda1c75561a6b1326a346f84c666c8409d339bc4341106ed4cfc684a7d868b6e1e10707ef78 SHA512 07c9bbad52acebc60e48d79619e4f12818d67c3b0f41ffa4fcd02098fb9da245e4006418f54c51c2e4bb9aaa01a21f7a083c9eb092f533e6676ed75ae8667a54
 DIST certbot-0.29.1.tar.gz 1265252 BLAKE2B dcb63862f427851655ae8282a3d479adc4aa2f553f510f3769d59748728505cb052291f728f1a01ad4efffa25d9aee6be881a9a7178fb0c025725780150ade45 SHA512 c9b976bec51c83412816726b709b79af0b464efa02f67c4ce7e754a2e6fa11e6811ca5db66616bd7b9e7920d6613665d3e58998c891bdb1452a5159a91971c56
 DIST certbot-0.30.0.tar.gz 1266974 BLAKE2B f6c0c6864297ba0f6fc3232e0655d79e0b045923c22015d34f706e392ef83ca95c19b36d47120500bf4a0561a277aced13f7fb49d7bdcdc8359113c617dca37c SHA512 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
-EBUILD certbot-apache-0.28.0.ebuild 1071 BLAKE2B 51fdb08a0f779a60f736026c00a219dfbf45724003865a9cf3649a02733a5483d9a2d57fd62a13fe197de011bd0937c73def29c4ff8b9d759a601b8c0257f75b SHA512 30ae244f7ddbc9e31de784b2bd9054e4c3f4fabef20f1af4aed6ab99f13c5e40432e98411980e08e1a8adf99a1de833025f6b44cefd5bf1e607efad4bb7ea5bc
-EBUILD certbot-apache-0.29.1.ebuild 1071 BLAKE2B afa71fa200f912a28e6cb90a0c62298f7f60d2c2de31a0b32995ef0b4d5726a4ea31748de8b914161c97586aed2a8bceec551a39e992bc876485cd2ecd08d238 SHA512 21f2538729f22b4ad166e4e8fe04e7a001d8e8a3cc42bc6025be0e3c807c3c1b9c70013a0d9bf6d742311bd149a752c77006c10a87739afed8b3962dcd6ebcd8
-EBUILD certbot-apache-0.30.0.ebuild 1073 BLAKE2B 75e4c40d462555cf08b8b73ead4bbe507da671c8e098a9cbf02da0341c76541f9adaeab42e6e9f14af7023d84761892c9d6d5727c1948ee811e89aa5a4dbf6b5 SHA512 3b491c732323caa509820593f7259f55ac7b6dd98da762a11a58c50b76745609e4feab86db70f85548f04df700968fc31e00dce532d0fbedc9d8fead848e69aa
-EBUILD certbot-apache-9999.ebuild 1076 BLAKE2B f5d78faa967a989ae85d7ab072dc7e4faff4825c4cf35d5f00af2817fdbc1a9c22d215043d673692634c51dc60e2a5cfcf73b5c286a4d35abb8e5e4e89268e5b SHA512 1ff731a1ab08da68b5932b527403f7c1cdc5372020211ba4b44fa5b9eb74db19bacdad424a1e841dc664519b9c383155e8eac60a3e6597f3280b5518deba6d3e
+EBUILD certbot-apache-0.28.0.ebuild 1078 BLAKE2B 27a1ca945009e85e65762e69b69c76edb574f64b53856e8ed285560d1585a62f25a6e0198905c5ad69115f40be0c37ec4bdf8687761ea0e936650334dd8a5001 SHA512 c29a7fcad1f9696d3c2d6a1a1e24d55d23849d726f8deb6858712e197527df72503f29cea7bac82171902609cd95b488870a80998ff984fb97454d0e619dd96a
+EBUILD certbot-apache-0.29.1.ebuild 1078 BLAKE2B 88db3076d6c2b3e9cb6a19c40ecfb4ed2f42e9f534040bfce18e785adeae93d963ffdf1f1a38ba2fe54e9bb749a8b8c1960af1e5319f884cb85a6e3ef19337d6 SHA512 d9bc1e40c1a77bc8f27725aea41fab71aa870cf4aef1e93f187ba2502bcb89304011e581052235838ad7282b03c6cff4f6f0d1264435d7f8ca53c9a3307ffa65
+EBUILD certbot-apache-0.30.0.ebuild 1080 BLAKE2B e7d4c037fae078bc6538768d507ac109af6c2d676187ed90aebc76ae1900532ae3fc7675ee3d4ba62d0dfefcc573eb3bc92bfdc33e0eede11fb7c0e066dace35 SHA512 672863267ac83c966c208c9ecf6fc83c704ea034092c30169064453fbe92cd3c73cfd2d6d6ace3f52c8d14d46f50e0b8e70b24ad282529f5f99acfe3b2f3bf94
+EBUILD certbot-apache-9999.ebuild 1083 BLAKE2B 0e03488f0c19b669c4412fa608b32a3c7b77093163f73779268eb0b1e45fdce664a998b7e6bab882e41ea9cbee1ba8f1caf3f0589b84695f0002712b8976c774 SHA512 0b25f93cb6c50b80edc1b65302d97f70d16f73ef46ede9d25314970eb7f02a8a87e318ecfc30e42819e6be8264e3a772d640b991eafed261aee4f68800ae1460
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.28.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.28.0.ebuild
index 5f448098501b..2ae0df4119f9 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.28.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.28.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 x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-apache/certbot-apache-0.29.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.29.1.ebuild
index 3460838eff46..8bf039bdf51a 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.29.1.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.29.1.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 x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-apache/certbot-apache-0.30.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.30.0.ebuild
index 9a6423344f6a..b6c158fb2f52 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.30.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.30.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 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~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 ab98ef4612cf..455c806f9fba 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 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 32cd8dfc1847..8969de9d7d70 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,8 @@
 DIST certbot-0.28.0.tar.gz 1253582 BLAKE2B f97a195afacd279b1dfc2d62ea45ae43dfd2d160f148200dd0756eda1c75561a6b1326a346f84c666c8409d339bc4341106ed4cfc684a7d868b6e1e10707ef78 SHA512 07c9bbad52acebc60e48d79619e4f12818d67c3b0f41ffa4fcd02098fb9da245e4006418f54c51c2e4bb9aaa01a21f7a083c9eb092f533e6676ed75ae8667a54
 DIST certbot-0.29.1.tar.gz 1265252 BLAKE2B dcb63862f427851655ae8282a3d479adc4aa2f553f510f3769d59748728505cb052291f728f1a01ad4efffa25d9aee6be881a9a7178fb0c025725780150ade45 SHA512 c9b976bec51c83412816726b709b79af0b464efa02f67c4ce7e754a2e6fa11e6811ca5db66616bd7b9e7920d6613665d3e58998c891bdb1452a5159a91971c56
 DIST certbot-0.30.0.tar.gz 1266974 BLAKE2B f6c0c6864297ba0f6fc3232e0655d79e0b045923c22015d34f706e392ef83ca95c19b36d47120500bf4a0561a277aced13f7fb49d7bdcdc8359113c617dca37c SHA512 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
-EBUILD certbot-nginx-0.28.0.ebuild 1005 BLAKE2B 55e7500f529acdb8b4b3c295ac43f2ee12678e6cbb14b8f47513998f69cb1de9e4f0c7ae6dd0aa5830c40cc1fbdb67eb022f782d7dde58ba2f622e2c6e32e54c SHA512 fc7acbea6c8861a8c990ba111affd9c1f691a05cabe8efbc3b0c47c5df014cde1d7d88542530cb4cfacb662c99e6c673615d2cb63c0fc776ce2c1ea7ce311a1d
-EBUILD certbot-nginx-0.29.1.ebuild 1005 BLAKE2B a9e9f85396a9fc18084a74caa949cf7693a5b3e4b731045bec2c5c1726ef09d32e4e3e64720ecdc52079a1520b880010f48896c52add34c715cb98da2e48ecf6 SHA512 7aa953233fb0f5e04e8802ab72cbedb871d16f009e10afbe248979bb7b1ad96b3378139ae89359de65f39f24008fcd07676beb677f2b98add3d42cf8cd76cccb
-EBUILD certbot-nginx-0.30.0.ebuild 1007 BLAKE2B 2b99b5fbc275b3a54a0f9c41c51575a0552f21b425571bcc07da81ccb882b1b10ebea1a752f2df12e29044eb3c5f6c7953cb7293284f3e3acc7af35aaa02397c SHA512 6681aa87e4f95b474fd2a4b653bca7a28c5a90eb7ad4cfc83b475f7552a4ba6044c9b3d3e3261679b5cfab1005eda89ed68fc118b1a7099db01183a10df98042
-EBUILD certbot-nginx-9999.ebuild 1007 BLAKE2B 110322858d0488b879819c7f39e46508a247c7e4e3f08ec31b57c966b4bd2a60f042cced7205bce027e788f2d6076d61f465226d26ab3d22855e7b41667d7734 SHA512 362ae77ad464c4406a1944c49c46516c81baeaf062e8308bca596e3d209f1b2403cccd5979d424aaa639090db5ad30d51b7c367cd383d0a8140399ceb06deac5
+EBUILD certbot-nginx-0.28.0.ebuild 1012 BLAKE2B 3ce93c595046b07cdad135f1f32d63ef4fd651113c5fffe1308840d030065f568279fe20d709f39bbeaa7f6f9adf8699334f3296a88a42a447a22e399a9a9635 SHA512 48eefc48703ce39e925915ed0011ec3601f945ff675ea5fa09d09ba213bda5496337e4c4209c75c0b173ab0075737f564437ca3feff753f27350790f74237aa1
+EBUILD certbot-nginx-0.29.1.ebuild 1012 BLAKE2B e6611cbbb8f7eb76ee4d81f78389afc3a2698ef0909ff67d91d77bc3e92a68e728434b3a237c6791991ca82e014506bd83016e6a5da163792a32581d68967bbf SHA512 cd52ce383de026c14c54f24b30ad044074c16c26760ea8f22d8e56f5f4afae3e1f0368cad36cadb8839b3e062daa6bc2744393b6cf9b8402292c3c66bdeb7a71
+EBUILD certbot-nginx-0.30.0.ebuild 1014 BLAKE2B e49941f79f8c7b2e55480aa96f72c52d9f2e79e7e8d62055c35589a31022d60b40e10fa47b55058f17b92d74f23ae4245dcb1f08062c39e85a7b326529708307 SHA512 ae848d635d1479aa216d908724d478ff7cbaffe67724c287e7de5c0de81b96281b09acaf5d8267ea446ba31b3d36beb3c2c52d2675a95f4ed8255a153da49dca
+EBUILD certbot-nginx-9999.ebuild 1014 BLAKE2B 4b719b8703b3639e58ee36c5c0d03d6e5890a5b5c9848b1dc13eae93fb2bd542f8de9f3ddc1bb683d88481f851ee2594987868d519cc59fc8a4cfb8022aed212 SHA512 5beee8a666a3dd36a13b83e65616b6a0f3b11dd90d98a360447807e5b7e02b4a0029f4221dd0eee842a9106255c1d61958373b0c2a50a1d72cf707cd2ccd0e1d
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.28.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.28.0.ebuild
index 6b17f2f6b5a5..6b6c1d3784c8 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.28.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.28.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.29.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.29.1.ebuild
index 9c1a8e9d9fab..ec0e921c2c8f 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.29.1.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.29.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.30.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.30.0.ebuild
index 09f9842d8186..b84d186a8cd7 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.30.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.30.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index 760abf28a407..b3315cd42643 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 4ae87f9bd8ff..56a26bb60552 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,8 @@
 DIST certbot-0.28.0.tar.gz 1253582 BLAKE2B f97a195afacd279b1dfc2d62ea45ae43dfd2d160f148200dd0756eda1c75561a6b1326a346f84c666c8409d339bc4341106ed4cfc684a7d868b6e1e10707ef78 SHA512 07c9bbad52acebc60e48d79619e4f12818d67c3b0f41ffa4fcd02098fb9da245e4006418f54c51c2e4bb9aaa01a21f7a083c9eb092f533e6676ed75ae8667a54
 DIST certbot-0.29.1.tar.gz 1265252 BLAKE2B dcb63862f427851655ae8282a3d479adc4aa2f553f510f3769d59748728505cb052291f728f1a01ad4efffa25d9aee6be881a9a7178fb0c025725780150ade45 SHA512 c9b976bec51c83412816726b709b79af0b464efa02f67c4ce7e754a2e6fa11e6811ca5db66616bd7b9e7920d6613665d3e58998c891bdb1452a5159a91971c56
 DIST certbot-0.30.0.tar.gz 1266974 BLAKE2B f6c0c6864297ba0f6fc3232e0655d79e0b045923c22015d34f706e392ef83ca95c19b36d47120500bf4a0561a277aced13f7fb49d7bdcdc8359113c617dca37c SHA512 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
-EBUILD certbot-0.28.0.ebuild 1255 BLAKE2B 1eb7b0ba190095afae66c34ce1e8003b452a1a070488108958ce8f7cd1bf9b3bd8e4c1ea26db52f485967e44c0c5db53c8ea5b7708c97990d122bd08e8dc09b3 SHA512 01f0fd02eddddf7ce34706c9a6750595b990b6a2a646717f9c59cacab2dd8a75fd3f6677435088f165ba2b2026232f4621acadca0e93ecc939b703ac1a9e6bd2
-EBUILD certbot-0.29.1.ebuild 1255 BLAKE2B 0483b70b580cb40b8dc79022d598b6b1c09582914bf8a7094b3e37eac2087316881f6a634124907642fe2b0bbd133cba65c972e31e674a904eff80270d39233f SHA512 210060e1a0bb3cd401e10b30ec939707c832de8189f08639e6c3748d7d099c726c31ab44ca721960ac6a103f9e9d83a0e99dd91216c524c998a1e491acc9ec4c
-EBUILD certbot-0.30.0.ebuild 1257 BLAKE2B 39b357315cc059538366cb9078f353426db4f090a39fe5aeaf982f3c7658e6385a08880e5f1479f2e1c2bd28140016866ab2d337c763836fffd5ca599d343e6b SHA512 02e074359ff23d4098d5e64de44524a21ab9b8e137e3d3c929b2a487191e98ae58df814fefd1f290145911ba0bbdb47b7a1dd8c5d33de82c5305ac40274b7038
-EBUILD certbot-9999.ebuild 1257 BLAKE2B 08b62efdd4741ce9ed78c81e48182afb05fe104c892da56df8282e7c08bd35daa5eafcddda84514c67f056e3f6820c8897e81e459ebd3d225b136d61887995a6 SHA512 bc955fb2479aec38207b64beca8c586c870b11ab84b2a737b4da5c392036f6543f64bc6e0b94caa89d52722a6f188b42de6e8b0e05ebc512535ce66f783d5aa7
+EBUILD certbot-0.28.0.ebuild 1262 BLAKE2B 10b0b4238f94daebe0f2beb7c51fd5a0e164745411f0ba139f41b60389370e5cadbb14e6863c9d200ff71bc460911b83588d87c428850c8e78d17b505125b7bd SHA512 978d9e2aa68a6c0d19812dab857bb5dce04c9aad45ad247a0e24a403799e8d348acfd2879061868016b3ef6b3ddd34b43bd7baf00c52c357783e3b121468f86f
+EBUILD certbot-0.29.1.ebuild 1262 BLAKE2B d2fd392ad43dcf2319140eac1bbedb551814cc20ede0d21a6817cecae422acbf22001de635089d3097219976bb963824645252365e72bba5c070372c2991f793 SHA512 f117d8a3441fb390f7908eb608df300f9e24301a87dede456d7d78f8bdc27bc1fe78c6c7c40937427661544a80a23c11d6d98c83eb8ceacb3fd9e9894140c580
+EBUILD certbot-0.30.0.ebuild 1264 BLAKE2B e4bd0cd95b5c26602e0b81ac96ff16fec065274b9be1991bd3422088ce49cc3574d7739bc9a701bc9025738d28f037419eb099f97bf96168b1e5d5774931231a SHA512 8b40d7de6b2140aad5d207b86327b16d70502bc0137c5035c2926c65d3a7bb205ca00b8143fa10d4d98457290f57a76600c7345740551874833afb9eb9db666b
+EBUILD certbot-9999.ebuild 1264 BLAKE2B 52ed04c95b7c55e6693acf9dd4699dc781d62d34344f5700b20b64d89ef26fd13c5dab56686e3c136068b86f6ff28804d96f146cd5e067455386b4c4fb86f3a4 SHA512 01de2ba9f1bef37e6d7383aff36af69fa5aa614862909b8a97f9d00708e5e1b4026499ffb04ba5052a363f35a260c7f177e2f221e9f7b5b173cdb011558dcb1c
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.28.0.ebuild b/app-crypt/certbot/certbot-0.28.0.ebuild
index 997ec14b98c9..23369bbd4ef0 100644
--- a/app-crypt/certbot/certbot-0.28.0.ebuild
+++ b/app-crypt/certbot/certbot-0.28.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 inherit distutils-r1
diff --git a/app-crypt/certbot/certbot-0.29.1.ebuild b/app-crypt/certbot/certbot-0.29.1.ebuild
index 2740075dda10..c4d5a2b84884 100644
--- a/app-crypt/certbot/certbot-0.29.1.ebuild
+++ b/app-crypt/certbot/certbot-0.29.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 inherit distutils-r1
diff --git a/app-crypt/certbot/certbot-0.30.0.ebuild b/app-crypt/certbot/certbot-0.30.0.ebuild
index eb64b7bed99f..f5ff7c45897b 100644
--- a/app-crypt/certbot/certbot-0.30.0.ebuild
+++ b/app-crypt/certbot/certbot-0.30.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 inherit distutils-r1
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index bb543bdc2d05..f029016bfb6a 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 inherit distutils-r1
diff --git a/app-crypt/etcd-ca/Manifest b/app-crypt/etcd-ca/Manifest
index 62b1dfbb490b..f2698c4afff5 100644
--- a/app-crypt/etcd-ca/Manifest
+++ b/app-crypt/etcd-ca/Manifest
@@ -1,6 +1,3 @@
-DIST etcd-ca-0_p20140903.zip 1178338 BLAKE2B 03cbed5111037f547391281e65d5bc9e9e61fbc1c5ddceb9e3ccba2a3714c964304e230407ba3dc6eebae695f3ed51c29dbb0babbf913ef02f10d3650a781bca SHA512 f421be2c835e7ed701f698d8a48cf25fe011ba3a831ff8fa3a80f5f074f6b70fed7f71d64c488cce5e12af8b8ae29685a1b19f8f2cd487954019d483d90f5e1c
 DIST etcd-ca-0_p20150423.tar.gz 55031 BLAKE2B 39f12fe140a5490e512e9d14c58c58f452769788f0c4c6a8a521590d19a254009c28e134611a10a40c8edc2820c4a333e9c2676e7ace2ad5af88e4245d23432a SHA512 8c7ecb80e056da77997283ff2defb6df9a9acef250b0fac8e18c2bca71cccfedf6d782b7c9bf6491574d88ac5fa358f9bc5f540aa718a2470655d75f2f54fff4
-EBUILD etcd-ca-0_p20140903.ebuild 929 BLAKE2B 2c6f8694dd500aeff35c1925b373134296577d0942affad0e0acde462c512d58604d457d90325d7d23f2c070d4aa8f16985cd46f88dc8f5cb31f7d725bc9204e SHA512 98a1776ec66eabf0ef6affb98d8b776f2daad41ff8720f250544244771e84527dbc98696d3e0a72ea65f6566b5bbc6fe3b5d025866637af3f1b10c1bc66c1454
 EBUILD etcd-ca-0_p20150423-r1.ebuild 937 BLAKE2B ac39f3eb6727c70ee40fabbe66c182cc717f74babe50d9dbd801e7f4f41647184bebc01dd74f4678fefde0ab9be517022e17ab3bf3a653489cf9ad10a9499aa9 SHA512 ed1420735f5e2cbf8d1e7c046ddc0173106df26dd6582c966c85c896db89de314f69917cafad5745f9a823f4457b742a6ada32297371cd77b65e39167d0b9cc8
-EBUILD etcd-ca-0_p20150423.ebuild 935 BLAKE2B 338b801ffdd4b8d935f173188cabdcf6365f167cdee0cfa306e3f37f88a5a77aef7fceeb343e88bd14d02aa2c8db864ab44ebe0ecb98a744d4d1d38f8b0db76e SHA512 604b68e2d014312880926d96c60ad2449c778212da665c8dbe7c80df8037a6a4ffe2f0a5f5907965d43bbaa50bdd52e1e23c60233091557db469fb16f692c494
 MISC metadata.xml 516 BLAKE2B 01fc47d377c8b962727968e132a8ef1bf86da96ed28dde03bad5dd6210918a7d5ed8edc5f8ead6a0a7782f5cf4976cc5bde402101870f2790acccc10732bc29c SHA512 9ff6311f1a9df79aacd48286034c31cbdfd7adad917b3e0206d457b2ea42524b7690e48e9dce982d7661407b3e8ea1237f7321f75048d9439ae89c0f759c159b
diff --git a/app-crypt/etcd-ca/etcd-ca-0_p20140903.ebuild b/app-crypt/etcd-ca/etcd-ca-0_p20140903.ebuild
deleted file mode 100644
index 7a2e5a7d05d4..000000000000
--- a/app-crypt/etcd-ca/etcd-ca-0_p20140903.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-DESCRIPTION="A simple certificate manager written in Go. Easy to use with limited capability"
-HOMEPAGE="https://github.com/coreos/etcd-ca"
-EGIT_COMMIT="812f3626796be16d9db052720ce9c54f5a40bb26"
-SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.zip -> ${P}.zip"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc"
-DEPEND=">=dev-lang/go-1.2"
-RDEPEND=""
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-src_prepare() {
-	sed -e "s:^\(go install\)\(.*\)$:\\1 -x -ldflags=\"-v -linkmode=external -extldflags '${LDFLAGS}'\" \\2:" \
-		-i build || die
-}
-
-src_compile() {
-	CGO_CFLAGS="${CFLAGS}" ./build || die
-}
-
-# go tool: no such tool "cover"; to install:
-#    go get code.google.com/p/go.tools/cmd/cover
-#src_test() {
-#	./test || die
-#}
-
-src_install() {
-	dobin "${S}"/bin/${PN}
-	dodoc README.md
-	use doc && dodoc -r Documentation
-}
diff --git a/app-crypt/etcd-ca/etcd-ca-0_p20150423.ebuild b/app-crypt/etcd-ca/etcd-ca-0_p20150423.ebuild
deleted file mode 100644
index a2f532734373..000000000000
--- a/app-crypt/etcd-ca/etcd-ca-0_p20150423.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-DESCRIPTION="A simple certificate manager written in Go. Easy to use with limited capability"
-HOMEPAGE="https://github.com/coreos/etcd-ca"
-EGIT_COMMIT="31fef42f75294cf8bf1e7facf82648de0c2d87a3"
-SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc"
-DEPEND=">=dev-lang/go-1.2"
-RDEPEND=""
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-src_prepare() {
-	sed -e "s:^\(go install\)\(.*\)$:\\1 -x -ldflags=\"-v -linkmode=external -extldflags '${LDFLAGS}'\" \\2:" \
-		-i build || die
-}
-
-src_compile() {
-	CGO_CFLAGS="${CFLAGS}" ./build || die
-}
-
-# go tool: no such tool "cover"; to install:
-#    go get code.google.com/p/go.tools/cmd/cover
-#src_test() {
-#	./test || die
-#}
-
-src_install() {
-	dobin "${S}"/bin/${PN}
-	dodoc README.md
-	use doc && dodoc -r Documentation
-}
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index c3ed29d6fbb3..43d4b1c06d2e 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1,5 +1,7 @@
 DIST gcr-3.20.0.tar.xz 1324216 BLAKE2B dca283d1bde4994ee60666b2d5fdc4f0861df453355dcf20cea22a87808da0b9284506460ecdfe779ab9ecdf4ce17e231bd1d9426d677511684c35e43da19550 SHA512 0acd0fb085a38507b1cc895ac773f91c6f4e14d2ea7e27b8e74c85ef78426597b6ea08ebee696452b0651939ec4a0d8a4a2523c41b3a8a0bd1b0d7b338b1d9c7
 DIST gcr-3.28.0.tar.xz 1329044 BLAKE2B b35bca9b62605c4e0c3d71604ea5e6b7cdd97bb3257aabb26b8834622abdeec29798429b84f88254a1f8b04894f5cac2ef63c2a0bfd47ad32761d8d73cd0b189 SHA512 8d5e650cb369fa889b0adfdc1dc1cb5f8b184881256e6c0a2ed456074a54ceb61d64c0929c093bec66c0d5a15c1718f6e3736a1b25b6d7076081df93b49419e0
+DIST gcr-3.28.1.tar.xz 1334896 BLAKE2B e7035dd0ac5ef9e9b0898e3e4512768ec7cb548cf0ec4ace5a4f0f9a63d3015f8a041bc6f0a0c990c1666eb92c047eab4c19338a8ccf2d8aa9b11830dbd9d5c5 SHA512 ae36c39584d6bc2ba9d86de8bc71eac21fb3251b966ab1eddf467d01ed5789ba6e6597c83ea2ed9403e632893e7c7cb6c17e04878d726b72528af9199bebb3da
 EBUILD gcr-3.20.0.ebuild 1851 BLAKE2B 532e60ee150d6886ea24abda75d29b90acc66f7e055e5941a8c53293dc5491e3850729bc68b8a9f7d5658e0a2b5dd97dc3c0e1a75418fdbf132e0c6b4dbbde29 SHA512 f0c952bff3d6f66c8d75a0671cd886ac0611bd60f7b8a3b29dc71798d545baee9f2e2842ac76a87e34acb05fb200a472fc3bf58d4c0201e5fbaf60bb96efcbbe
 EBUILD gcr-3.28.0.ebuild 1893 BLAKE2B 0a79b21a6797ec4b833b2892632a6597b98db2a6d003abcb98e49cf6c27fa82c7d428ec6c2f63dbcad00a16d4aad52032b8539088bd784e9da8012645d693528 SHA512 cd974cf395b549c1b80a727c9d240fceb75783232fbfc864c9a823be43ffa38339ca40d32473ab29e44b2c1f60859dd5df8bba1d0f51057ebff097e180a08747
+EBUILD gcr-3.28.1.ebuild 1898 BLAKE2B 47fb703bf73521ae6793f28683f3f4308bc1f3097f19e236197a90929d49561bfca5533cdecd8945d3bc80100e90967879e8f866112626b7f4bf7299aba2f6c5 SHA512 3dfd706c254795d9e6ed3911d125d6950032c7ff6ab090b717089b4605975dbb5dca5947fa70bbee5a2864c35cbd9d9894b82049d4b714faca553023d7050790
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/gcr-3.28.1.ebuild b/app-crypt/gcr/gcr-3.28.1.ebuild
new file mode 100644
index 000000000000..58b6d1814b0a
--- /dev/null
+++ b/app-crypt/gcr/gcr-3.28.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
+HOMEPAGE="https://git.gnome.org/browse/gcr"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0/1" # subslot = suffix of libgcr-3
+
+IUSE="debug gtk +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+COMMON_DEPEND="
+	>=app-crypt/p11-kit-0.19
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libgcrypt-1.2.2:0=
+	>=dev-libs/libtasn1-1:=
+	>=sys-apps/dbus-1
+	gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-keyring-3.3
+"
+# gcr was part of gnome-keyring until 3.3
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-libs/gobject-introspection-common
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	dev-libs/vala-common
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+# eautoreconf needs:
+#	dev-libs/gobject-introspection-common
+#	dev-libs/vala-common
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Disable stupid flag changes
+	sed -e 's/CFLAGS="$CFLAGS -g"//' \
+		-e 's/CFLAGS="$CFLAGS -O0"//' \
+		-i configure.ac configure || die
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with gtk) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		$(usex debug --enable-debug=yes --enable-debug=default) \
+		--disable-update-icon-cache \
+		--disable-update-mime
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/app-crypt/gentoo-keys/Manifest b/app-crypt/gentoo-keys/Manifest
index e25bebcb9e27..2b3633209da1 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 570 BLAKE2B c3315cf909caf322e23f54c110b5813562c54747e7561e4aac9c51d6de2eb1d1a0b843e1fa092d5cf3abb666e1eb7f65f92f5f319b43aa372743eaa7c7feb629 SHA512 8ec502e9965ee23712183730e9f0eaef364668eefd589c67ddae916efdf5cc871bd15cfb9d5d1b63e2fa1b6282cff6c039fc92ffed4ba6e4a5b62e21ba9621e3
+DIST gentoo-keys-201901130136.tar.xz 57124 BLAKE2B 93963930743ec3b6497b90de7080c5796af90601b311a0ad1d0049f945ae63e384526c3858bb1b209e2ddcf26a862f6ea3b474fc69ed4a22f1ec5c2be4ae952f SHA512 2c87a85d2c5e2c51af8f64183a0cc4d372dd84af9aa3d7e92ae0d9dc804c5109c0c7121419503213eba3fcb8f7fa81ccaf0550418991f8d6b4b43560e02f777b
+EBUILD gentoo-keys-201901130136.ebuild 570 BLAKE2B 64fbbe42a60cfb06a39dbeb4e2f01ee3c9204820f6830ddd36e544b07341307f7f6e15c26eb58ec93ca9c7c1d864c70f08dc9ffffe7210c54a2752a51b6eaac5 SHA512 3fffb3523a551faa5a91d50a53db579cf6fb7af5cf5c210ac04098cf1a680cc83030b9df486dee38d3e192a26e6fe7470b547eed28ffe84f462a7430eb8ac0cd
 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-201901130136.ebuild
index f0d9517344dd..e02ab94f751a 100644
--- a/app-crypt/gentoo-keys/gentoo-keys-201807020151.ebuild
+++ b/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2018 Gentoo Foundation
+# Copyright 2014-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index b6846d9c51cc..c0476dfa088b 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,5 +1,5 @@
 DIST gpgme-1.11.1.tar.bz2 1419232 BLAKE2B 93980c24e6d692f35105db23a02db891ef022addd583d5bda8e55ec3552dfebb87c9feebb74fdd59fa353a3b08571e51537f8dcaf63af018beff467a848e97e9 SHA512 42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a
 DIST gpgme-1.12.0.tar.bz2 1658803 BLAKE2B 630646af597074c06a99c1170c4f8170ad0fe4ba643a27a87a61dd8df681ca14f023b07817657bb049eaeaef01df3975bd1fe1b75a026634a62f832c6c311b56 SHA512 c228b3df28377df882be536ada56dc9c73150048a58e591aa4495f89c854af95820152cd60139840f994c249e9c7df50d8b89eb9d6dc4ce02aa80bbfebcdd014
 EBUILD gpgme-1.11.1.ebuild 2872 BLAKE2B cb6c595f8424e43cd318f65b213ed768a7d055554b7b4b7af65d7dc84af4d1216f5f777ad3d53541838fefd99e2db38151ede5d79dbfd3becb588599c33f657e SHA512 c7218db05ea51baa786bb7e800eb95ad367c21470505f9ea14bcffe38e61c13ce6c46bbfd80e3a9b70fde757bdf761fc9a01b43fa5c34ff8c69c714df1c961d7
-EBUILD gpgme-1.12.0.ebuild 2881 BLAKE2B 6e171e8cbfd00804f334dfebe888d13759c7da8ef6478ead0725c8b51cb2f8da6dc6edf911aede93f92666e974a8d2a57057d311d27ba2dab69e1edbebf81a92 SHA512 6b052e328ed378263b29e148bba84791d533fac820defd17812428821ef129b6864b662691da0db4895839393bcfc34f8881f08d04a862efd6203d74a6e37967
+EBUILD gpgme-1.12.0.ebuild 2883 BLAKE2B 0791a9a3446c3f27f33c15551119bde323f1847af34fc0a66e35fe4781ad00f83b37ababb40ff049d44d15354b4261d61274f7953651cf21ae00c2118bdde39c SHA512 0d56644e2bbc117864a5bfea61c54c0617e92bdb012330d6fa3a5e8d2e9b918aa73264b2c69b193b024a31527723f2ed9a2a2d0399661de11d2b2a2c0b8d55e6
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/app-crypt/gpgme/gpgme-1.12.0.ebuild b/app-crypt/gpgme/gpgme-1.12.0.ebuild
index a84457c507be..9de3eaff88aa 100644
--- a/app-crypt/gpgme/gpgme-1.12.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.12.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
index 5564155f8c58..78ec55e6ca29 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -1,11 +1,13 @@
 DIST keybase-2.10.1.tar.gz 38275486 BLAKE2B 0c99c3bc9aad0610473f43bfefb467d2be5aca8af95207a2ecbb60c99bf8a5d87004c54e8af9e5c2f6068a03fc3c980c7d910f20a2ee0bc5f39937ff63c86a47 SHA512 f4acf70b0fceaeb6a2a7da89661c7c2a59fc8ccf10a6aafbbc75d43af04295250237845b4de06170287b5edcc2366d1390b5b7038ecfcbaa501753b41fd22911
 DIST keybase-2.11.0.tar.gz 38490645 BLAKE2B 58771d880a412e2cd0bc585ff2d2922092d49a132d4526de91796fccca95351a2422a45e63296b1fb8d502087c17147727e8c406b8d13884da538ab308b88d5e SHA512 b150184e692c81243a8f83b828ec8ef4f6b324a6cbd0b1cb9cf5e89eebbec7a6183a2af3b8d26c663ab677aa38753c328e190b46035c3815af8373d8ff4b26fa
+DIST keybase-2.13.1.tar.gz 41319007 BLAKE2B e29cc87822086936510c83f0678cd85e89960c82bd7bbca784d17cfcb06d3f650c7d7bd0934381b6868d67490e8868c7df2df6abc7ddd7275fcdc4e92996b7f0 SHA512 c0cad522f14cf39f08c841ff90f96662f3f5d9fe3c8e8156755a8805757c5d206991410a2511315b8c00dcafcc5e23e5449d37d13f399e6692e0c6d4fb1c0b61
 DIST keybase-2.6.0.tar.gz 34597277 BLAKE2B 3380cf081ed4e0c211ca47164a5d813e0ca647b004d8e54aae4ec51d24f0cd26437008dbdb2e81cf5372c943c2181e424918425cf11687b0629dae8df5020ada SHA512 25515e69e86c870b45852e93957ec37c7af9bbe3a4a8f8f2cb1ab9f4d02236b9de57fc6294b93aa4f6378ee8d33e03a2773aa445db5d8a34c3fbfe34eed256fe
 DIST keybase-2.7.3.tar.gz 34648144 BLAKE2B 6da664847640c35b1028868651e31b99fd154520942cb9fc3922565906b288c9b808c7368199ec3a37216e1b2c6930f2951b58cee543a72fb69d96006bbb33fa SHA512 0b3fc5f7830862ffdddd70606bbe2fd2b5dd2e5e4fb24349dc57ed0e8f2bd0cc9a9aba0f00b8080f910d877db5f092757d209f01de83f7113ed9d99aed68342d
 DIST keybase-2.8.0.tar.gz 34545469 BLAKE2B 53b348d4956542e51f19b5d4209cdcdc2b1873421153cf62f376f733207131c4d82c5cccf162b8a98909406e49bee3972e1deac478e006571ebcd5a94d20ede5 SHA512 01319ee36d50d928e195d854a3c332d7f327cabd8cdf930f643f3d373a6bd644634a56137f5f02477c15fc261cee3c01cb87efbb80333b7c7299a2048d9f1be1
 DIST keybase-2.9.0.tar.gz 34703406 BLAKE2B ec8bd076d07eeb40ecd978c049f57f0df0ae858fa966d90a521685838fb3c1a01b38a7cc584ecfde174ea51b3cca06440ae7c53074fd58151af1621144f431b8 SHA512 01938d83806260e6c7a1065b73ae4d8f82f776d3a81d70d9c8b2e8df9fd4f05dcbf45e23a78ca34573cca8a11b0592dae6c4aa1b20e4777c9ba69af0af5f3e41
 EBUILD keybase-2.10.1.ebuild 1306 BLAKE2B 298b5302aa97f4216d73eabab9585bd9352de3a18bf844a53fb522dfd6f95030dfdc8ae2776a71bb9c5250b341202f6042c4e31ae3b17d6a1471e884bcf623fb SHA512 e310ac6ed6d1601b7a8e5a8720075f66705b64302aadc4c8487fcad5532462146ae720d11d858fdf70486ef578f101ec2b5627a000197205b8c78e7ebf8aea67
 EBUILD keybase-2.11.0.ebuild 1305 BLAKE2B 29acf15d150fc08ccb39337e771a51e475d38ce546c7c5212dee2b488f7021db8ab585295f9c4844452ee6953be263f5095cae91056da9720ab2372b413788e0 SHA512 478d0e83bc45797d444ca387880d811a14b0c24139f2ac0ae9a57ee8c28a6fc6feb8d369ef40b63d176c9dff73aaa76b679a67adf660220bdfc2998cdcc14ad5
+EBUILD keybase-2.13.1.ebuild 1306 BLAKE2B c6607f27d1433f6405e605cb66efcfd8198bc6c5de194748c2620609d11c22541128a96d16eb561a57015f586cc2219e0cd3070dd62b71c75f0dc71495433513 SHA512 54a92ee6235461d3c8ef8293d8334a9b89c94fffc71373cf95d25c47be6e8cf977f642b54e86a21a8e809f5cebd00afb6d7651baa080185b460f2680f18d414d
 EBUILD keybase-2.6.0.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
 EBUILD keybase-2.7.3.ebuild 1305 BLAKE2B fe25947ce4516417eaaf427eacc71513b6839e53e31e440298e75f4427108a7c6f6d0fcbc0e9e5b388a305a2f7149a7ff58ef1ee7b32a7eaf17d16e0bb6fcf86 SHA512 36496057ccfe5cb5aa103122c3681136d1950bbe6de331496298730e116f021d7552cdb2030d3cbfd124d6d77f20478bd7beb30c432ff3ec7f64a4ae05ae2bd3
 EBUILD keybase-2.8.0.ebuild 1305 BLAKE2B a7fdda95b324d7d65ca9d66c67d872059fa5734965bd24a0d4b40d86590a6d17a4809491490055141948040be0e199aac499e9af6fa6916e2aae48d7c94dcb12 SHA512 b3fd771e61c9ce8fb141253fce08762c2056916e4d7281e4bf27274c5c889632a34e9d69e1ced5439dd7ef97953d97c2a186c8652cb2ff57cdb1c4190713be16
diff --git a/app-crypt/keybase/keybase-2.13.1.ebuild b/app-crypt/keybase/keybase-2.13.1.ebuild
new file mode 100644
index 000000000000..f2abdbb420ff
--- /dev/null
+++ b/app-crypt/keybase/keybase-2.13.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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-2.11.0"
+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/libnitrokey/Manifest b/app-crypt/libnitrokey/Manifest
index e7d606f5fdaa..3297af5f11c4 100644
--- a/app-crypt/libnitrokey/Manifest
+++ b/app-crypt/libnitrokey/Manifest
@@ -1,4 +1,4 @@
 DIST libnitrokey-3.3.tar.gz 76581 BLAKE2B 1a662fb94184355dc5cae2f8e3109fc82a96aed06c726e04c4fcfef3aef0423150ac1f4647e4bf3585de7805e70cd67534d72f1255c9f80b57afa2aec36fc9d3 SHA512 fe3b6c7bdeb78f736fe7aa7475880a293c516119ac049ff47ddbaba626f2d70addee4d0cd3a38ea706b94717f51c4fb56f687d5a9bb9f10895836c5adc98b11b
-EBUILD libnitrokey-3.3.ebuild 1145 BLAKE2B 01a32d7b4498ede0e645ed6747e5d2901bacfe8602d598be4b92ff7952597f430b4b68123d60d8dc4277af4bba88b3598e0dd52fe645862d0b470ef0c9c4fc74 SHA512 bd3ddfb326baf091cdd4062819e2cc5635c4aaeb1f4b9436465f89e1cbb58289ca9ca061a6c938ef711604879dbcdb32e475d22184f5480b0c42b67bc1499fb1
-EBUILD libnitrokey-9999.ebuild 1145 BLAKE2B 01a32d7b4498ede0e645ed6747e5d2901bacfe8602d598be4b92ff7952597f430b4b68123d60d8dc4277af4bba88b3598e0dd52fe645862d0b470ef0c9c4fc74 SHA512 bd3ddfb326baf091cdd4062819e2cc5635c4aaeb1f4b9436465f89e1cbb58289ca9ca061a6c938ef711604879dbcdb32e475d22184f5480b0c42b67bc1499fb1
+EBUILD libnitrokey-3.3.ebuild 1144 BLAKE2B 93f37c6add38858d6c19d978f0c407cb84dad8440d28f25a320e0f74ee005ba73a10079c4312bf8b3660741987332f681f0d727d96a974edb2ee50a3ac737d1c SHA512 9ab98b973a550402b3189e4af1cba6018cbfe5019980d4eaa494fc4b00e33755182114af3763b821b91d8a2cb3bab53f2e927dcab08f88cd311c53004e99aad0
+EBUILD libnitrokey-9999.ebuild 1144 BLAKE2B 93f37c6add38858d6c19d978f0c407cb84dad8440d28f25a320e0f74ee005ba73a10079c4312bf8b3660741987332f681f0d727d96a974edb2ee50a3ac737d1c SHA512 9ab98b973a550402b3189e4af1cba6018cbfe5019980d4eaa494fc4b00e33755182114af3763b821b91d8a2cb3bab53f2e927dcab08f88cd311c53004e99aad0
 MISC metadata.xml 397 BLAKE2B ec7996ade24566ed79175f047e18c18a7c51e3946c65c4b3cd986d3fe6372ed2a79ca13b6e2d0a21b5e907a2f8e27e7061ad9ce893ffbd93ead06c8814f4d00c SHA512 457d69deef3f3bcca1ac0b0a15d20ca03bf012523a03c311c5be065ad50a43ef5d7e0d7fb949a6a63f3198c35313d83e0e7a8ef882c1095234f93a2dd8be416e
diff --git a/app-crypt/libnitrokey/libnitrokey-3.3.ebuild b/app-crypt/libnitrokey/libnitrokey-3.3.ebuild
index 32cf1940ee3a..a9e23e365158 100644
--- a/app-crypt/libnitrokey/libnitrokey-3.3.ebuild
+++ b/app-crypt/libnitrokey/libnitrokey-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,7 +31,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
-	test? ( >=dev-cpp/catch-2.2.0 )"
+	test? ( >=dev-cpp/catch-2.2.0:0 )"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/app-crypt/libnitrokey/libnitrokey-9999.ebuild b/app-crypt/libnitrokey/libnitrokey-9999.ebuild
index 32cf1940ee3a..a9e23e365158 100644
--- a/app-crypt/libnitrokey/libnitrokey-9999.ebuild
+++ b/app-crypt/libnitrokey/libnitrokey-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,7 +31,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
-	test? ( >=dev-cpp/catch-2.2.0 )"
+	test? ( >=dev-cpp/catch-2.2.0:0 )"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 510608446a2e..15a50062ceb9 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,3 +1,5 @@
 DIST libsecret-0.18.6.tar.xz 487836 BLAKE2B d38a41743142d33e634d77bbf55ccab044def9658b3f50bd3f8cec9be6372ad1a56dcc4de58126cba1246c16da2863c003bf14ea6c8a90d8667658cf492f4b9a SHA512 4997519762f1470cfc0a4b3a791362d030af3c9b6ce6f58f8f8073b3a8adeea9b8caacedc884163997081dc39f395f9172330dbb41fed45d6c43ac5809de48e3
+DIST libsecret-0.18.7.tar.xz 508392 BLAKE2B 9774df97c2abb362940c3b373e381afb82ee6af3866cdc18ad52159e824dd9097739d4900eb2dffe117e5b28e2057d0db0cadc3b02e063112309b63fd4d1b870 SHA512 a8890ec52dcfba585fd665ee89e81f4a1d6a04b67bcf4f3422f27973a4ef6fc1281bf54e92160d39dd696ae08a633bab5fe25c1124baf32eb5b414e98ddfa084
 EBUILD libsecret-0.18.6-r1.ebuild 2660 BLAKE2B 4840e5cfcc512aeef800d324f77d9d083d690963042903c0bdd6513a146b565106057b9ab9969b5ea905118e36cd06c9d12d025865ef190ab15c94383cc81ab5 SHA512 160be3b6686b700fe5d69251f1560cf6f15ecb5ebd9f0a1298952501294e60938584fc8ab62c0f36da32db4809710827c59f41782f5d756b65ec25aaab4cd997
+EBUILD libsecret-0.18.7.ebuild 2649 BLAKE2B 1ae04eccc247529a08f3e52747d8db6f03e11c37f7bf672cf35020ea006cec9b77c83aeacde3540f035a372268ace53c88624178567d7bf75175de6766556929 SHA512 2fc273d7d573c9fc56e78712d94e419dce1a1a9559ca9262c53c2165e7ef28fdd10a084baf9c561046c647c55cd656b1a81f70ede2de1f914ad544fc961789e0
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.18.7.ebuild b/app-crypt/libsecret/libsecret-0.18.7.ebuild
new file mode 100644
index 000000000000..c56261e9fbf6
--- /dev/null
+++ b/app-crypt/libsecret/libsecret-0.18.7.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+VALA_USE_DEPEND=vapigen
+
+inherit gnome2 multilib-minimal python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+
+IUSE="+crypt +introspection test vala"
+# Tests fail with USE=-introspection, https://bugs.gentoo.org/655482
+REQUIRED_USE="test? ( introspection )
+	vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}]
+	crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.29:= )
+"
+PDEPEND=">=gnome-base/gnome-keyring-3
+"
+# PDEPEND to avoid circular dep (bug #547456)
+# gnome-keyring needed at runtime as explained at https://bugs.gentoo.org/475182#c2
+# Add ksecrets to PDEPEND when it's added to portage
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.9
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? (
+		$(python_gen_any_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
+		introspection? ( >=dev-libs/gjs-1.32 )
+	)
+	vala? ( $(vala_depend) )
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version --host-root "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	has_version --host-root "dev-python/mock[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/dbus-python[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+
+	# Drop unwanted CFLAGS modifications
+	sed -e 's/CFLAGS="$CFLAGS -\(g\|O0\|O2\)"//' -i configure || die
+}
+
+multilib_src_configure() {
+	local ECONF_SOURCE=${S}
+	gnome2_src_configure \
+		--enable-manpages \
+		--disable-strict \
+		--disable-coverage \
+		--disable-static \
+		$(use_enable crypt gcrypt) \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_enable vala) \
+		LIBGCRYPT_CONFIG="${EPREFIX}/usr/bin/${CHOST}-libgcrypt-config"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/libsecret/html docs/reference/libsecret/html || die
+	fi
+}
+
+multilib_src_test() {
+	# tests fail without gobject-introspection
+	multilib_is_native_abi && virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index f371f8c1bc0c..f3f56eea7e29 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -16,8 +16,10 @@ AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad
 AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a831f36e7abe3e27cdd9b42f2b703cd6ddad1ac60d75feff4d74bf31dbf146ee2cbfdd34ac38c11908d44162e77a SHA512 4b7121da07b11fa65db4edc185c57197ebb25ed5c49797e36bc31b8b7bbb22a6f512f4a986c8430dfc31b1b8fcfba66dcfe154cd6eeb8b4bb445d5006fff3802
 DIST krb5-1.16.1.tar.gz 9477480 BLAKE2B 16bdd7d6d03ddbd4b070663c3a7a3d2331d54e8590b24f1dc162be2531bfbbbd65878d426a160c65ffc1ba4751f16bbbd177a8a91c01002fde0e886cc1bd91b9 SHA512 fa4ec14a4ffe690861e2dd7ea39d7698af2058ce181bb733ea891f80279f4dde4bb891adec5ccb0eaddf737306e6ceb1fe3744a2946e6189a7d7d2dd3bc5ba84
 DIST krb5-1.16.2.tar.gz 9652415 BLAKE2B 21c4d56e43476a9b87a4ca9a8b7d0dd5739d3d70731fb4727de5ae248d8638e2016581cd2462f5e2ec7950d9e216aa165199505e581fa10db81ce26062fc097e SHA512 738c071a90e0f38680bb17bdcf950310bc4549f3cb851e1d34de11239ae88178e6ee1a5e5d48c6d3efef544339b07d22dba5347dd763a4266d8d4df7cf47afc9
+DIST krb5-1.16.3.tar.gz 9656985 BLAKE2B 92e6d2b5f27e80f495d7bb3fb64acfb03530156fb8e1a07dbc8d045616fd2ac4be8047d844580e3aa01d5e8b733ceea9024290dcc53b691696201f02a31e3034 SHA512 77da5f8bb19108e158c3df5a17b9141b7cbbae7d01f9f0dca5c504dc4b468953d67a1f4566bed5a062d8ff8e0d80796094dea12d2e45bdda810a1633bb08318d
 DIST krb5-1.16.tar.gz 9474479 BLAKE2B 0c5caa0a0d2308a447d47ab94d7b8dc92a67ad78b3bac1678c3f3ece3905f27feda5a23d28b3c13ebd64d1760726888c759fb19da82ad960c6f84a433b753873 SHA512 7e162467b95dad2b6aaa11686d08a00f1cc4eb08247fca8f0e5a8bcaa5f9f7b42cdf00db69c5c6111bdf9eb8063d53cef3bb207ce5d6a287615ca10b710153f9
 EBUILD mit-krb5-1.16-r2.ebuild 4212 BLAKE2B eac567c47b44a75e06ea412da95ecfb5e65278132cca0757cc83804b71a61a55c6e6c226c2033eac323d237bcb804f674b033403c95caadd7fc35a8d6b5a57a7 SHA512 8c0d1dfb71cd9d5c08bbad176b1ed1b232f31da0e6dc09c1f239f6c90f55879774ef0b9b41b9a4ad5ab67896d1dbb2138bb13087152cb348bd52ea639de78a98
 EBUILD mit-krb5-1.16.1.ebuild 4172 BLAKE2B 4b120ec5bb2d750c6d76c1f6fda2cd21aedbfe771eb234e4d7b392868b6e9d9bcef4b6897df456d8ae30b9cc96a8b83636028d854cb2646172c4f0c27ecc0087 SHA512 af0736e57376a42e44e4a2d97587386590c5a3c5de56485b6db2016494b2bc392ba4bf573462576de5a909fd963da8095d349eaa5866f3ec3ffd427224650eb3
 EBUILD mit-krb5-1.16.2.ebuild 4294 BLAKE2B 4e36bfd702bf28bf73d81265a4d410ce53631c012b9090b6296f1ccb0b923b598ba7bf378451a3490d7018b0681fc9a882805707feb165975ef9ee072536cc89 SHA512 f026e3e3f59e6d4747a3bc3e71292092668f388b61a6d53db437b6fc79311f11c95f6d70e21c36911733900556015a4ebbfa01fc7bcca073561359ce72e9659f
+EBUILD mit-krb5-1.16.3.ebuild 4295 BLAKE2B 6f2dc38c4b968839716e94fd35f22b89cd2027d4cc5fdf7fe74589c791432708bea98077d9f2013fea995493d4ff001369a8dc222b066873cf17f5863f11c779 SHA512 22d2e16c9baf75fe7fe81300e804a9d7285957249cfa65bf5ca08c30d3b40d8678529bf152181b61c2dfd739cd50e88e3e680fd621d41f0eb5c2a5e332336b4a
 MISC metadata.xml 828 BLAKE2B f317440eac9d164e0640cb059dee0c3bdcfeaeb2d0e346d962f09b7152224efc10084611768663b84c67fdf73c9d89481370fe0b70ffe14aa10a360f60bd00f6 SHA512 c0f45699280d49b91eab24de6cbb28900170c3c4526b8c6ef0f6a996d3e53abd49911ce4f6ce7b28c69d37e86cc9e5b830977b9640809734e7fccf078886685c
diff --git a/app-crypt/mit-krb5/mit-krb5-1.16.3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16.3.ebuild
new file mode 100644
index 000000000000..bfc097ea1972
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.16.3.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd
+
+MY_P="${P/mit-}"
+P_DIR=$(ver_cut 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="cpu_flags_x86_aes doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
+
+# Test suite require network access
+#RESTRICT="test"
+
+CDEPEND="
+	!!app-crypt/heimdal
+	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	pkinit? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
+	xinetd? ( sys-apps/xinetd )
+	"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	virtual/yacc
+	cpu_flags_x86_aes? (
+		amd64? ( dev-lang/yasm )
+		x86? ( dev-lang/yasm )
+	)
+	doc? ( virtual/latex-base )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/tcl:0
+		dev-util/dejagnu
+		dev-util/cmocka
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+	eapply "${FILESDIR}/${PN}-libressl-version-check.patch"
+
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	use keyutils || export ac_cv_header_keyutils_h=no
+	ECONF_SOURCE=${S} \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+		$(use_enable nls) \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	rmdir "${ED}"/var/lib/{run/krb5kdc,run}
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dodoc -r doc/html
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
index fca383926336..55355b5964e3 100644
--- a/app-crypt/monkeysphere/Manifest
+++ b/app-crypt/monkeysphere/Manifest
@@ -15,10 +15,12 @@ DIST monkeysphere_0.37.orig.tar.gz 99557 BLAKE2B d32d127927bcf3494933282fcc343ff
 DIST monkeysphere_0.38.orig.tar.gz 107546 BLAKE2B 627b0fbed52e651d57fd359e79b91689eeca47ea58335125061cba72f863a582d39536504124e18805c39b3c43e5096edb6db0e32c5c80570689bd55e2936a3b SHA512 fd87460fe16b0133fd507ff93926a5dea6419343b45c3ba33e6e981333646f4fa840c127bb1f3e7750bc3ede66c5e07f4155557a8354cf38d89159422dca390f
 DIST monkeysphere_0.39.orig.tar.gz 107735 BLAKE2B 5e4df72c8c78f6325f79c93b7de1407af2ceb1d2b6be43476d3e0dc5b2505ae97c589deec2bcb64a7dbb3a661221891b89e126086d08df09aef07b07452344f7 SHA512 069acbc3e4f1409a130d4efc95875c72b9e4c55af6ff211fb954a90ff26605ecf9cdbbe7d7f7849de479cafaab7957a33fccefd5f2d54a2317f18bc5454190c2
 DIST monkeysphere_0.41.orig.tar.gz 109040 BLAKE2B dadbd65c879bc8e73e7dd1360ebe7f7242aef125af3907d4487f8d0711afda6d87736ab82938867201eead5c1008d192dbd90602eff5a4843d990b3c87ee2949 SHA512 fcc3dd6c191635ed7ef27a8219d4c9d7043629dc8a02de947fcc4dfc8e612ec767f68d4e4c41252a0c0fc80e4184018e53991d85fcde50cb5def75b925341962
+DIST monkeysphere_0.42.orig.tar.gz 110415 BLAKE2B 281ce2841b9f088f632aa6f487dc6b669911dc343bd2cbbe3dddfcc2ace9a1f2f747bfbb6d831c071a5ebae9c34d4809b1b1f90277e7d3fe1e8f0d42f363f52f SHA512 82e3b0f5f5532c75c1ccf2bd6269f7f4292f38956236fdb7813117a85ef36852b7d7c000552555ab0e233df9a84d7f4e5e86edd007bfcebdd6cde2e808f489f5
 EBUILD monkeysphere-0.36-r1.ebuild 1187 BLAKE2B 6b0f8b0e240a372e13b1aaf0dd4f7fdbfd08093d2e8f9e0a3dc71e7590643eb814978573a9098a134f402470162459832040252bcb19657a958e7ede5caada87 SHA512 380cd2eb925360506c6a3237d642131c9a6e257e219d19d5b6902034b056f6984296f9f1621d81c012f75456658eb57487fa609a0748df7aa11397fc0d5b89bc
 EBUILD monkeysphere-0.36-r2.ebuild 1781 BLAKE2B 76df9b0b9204bdc2b9250b00e30660ac613c34efa3a2bff2f7a01aa05bf838455c8fd0dda653594619e0255b42ddf7ebcd8f5d3dc3ee65e949948d7249424395 SHA512 f6da7b96ffce5bc0e6eb4fa83df65f47b12882b65fe44f3c8e45b2d38387cc82de9185262ad6fe93a9cddb61929ea3651c7a30979a572dc9ac5a1d24550255f8
 EBUILD monkeysphere-0.37.ebuild 1459 BLAKE2B e9196602c64910a1cc816993c36fce60926354958403c78753cd9eaf5b737ecc6194639614387fa8bd65c4cfb398d0eb548583a95f2b20649f8d7ec575e7355a SHA512 5181dc7b06a7a5910bafe37438c152f54d4c0f6949cc6fc8a8e203324d16c345e18475c7a854709c722ff3d4d72c66b121a653c6f86d3a33a24ad16b0097f0c3
 EBUILD monkeysphere-0.38.ebuild 1635 BLAKE2B 7382941a153716cdafcb925258a75e52cc334cd2ec467f4a1908a03388c92dcc13b05a144d259f727acc93bb5b02133e15e7b91af8d7f1606c2c98de08bea371 SHA512 6dd69c21f73158cc68e4df4c4ba9a3e15387d20effadf8bb3566955acd8b62d9c5e59c8b47d98d3470dc5cfaa9e28e343ac8cec43aed5642b1568352150c3041
 EBUILD monkeysphere-0.39.ebuild 1441 BLAKE2B 588283fd2a272a963781f0ee4a6a1e24b157642a987bd4a54d40e82a3d5cca3d3cb8d408250a369916041abe16ae722824ad863ba4cb374144a0388cd4b841a6 SHA512 1eac7528acd605c46e1b0c869afc43e6e603b4f191650568b5ca9c478f22efdd0b41c31d09daf341309d8a31cdac8f2bc1ac29408f48315709a9923589f46b1a
 EBUILD monkeysphere-0.41.ebuild 1372 BLAKE2B a290eb661701e8e2e930a25c584d54fc9c31b9373e0d181ffaa03074d04b8c39c7540c9e2a5bb4fc4558354103d34d9ebcdee29a5d941b32a7be673f2efb7f9f SHA512 5f044379bf2b0577bd322685eed5951c6271e8b55ee8338ccc517fc239f743ee43160c32b8293e8a8c345ef395fea7845e1cb4ddc33a705f75c5ef25f227b91f
+EBUILD monkeysphere-0.42.ebuild 1371 BLAKE2B a2c27a481725a6167955da764046e66e10f03897c448b2852dac1006b3471a32ffef480bb610e2c9c5f9c1269bd9390c6ec50cf85883a97346b17aae9833a759 SHA512 6cec984b7674b6a7b38cc65ac9e46d796292c9a17535b726c699836acee7f1694a3cb2f01dc8217263eaf0df1ed95eb82913962756f7bbf95a83f74e41dc9d4f
 MISC metadata.xml 251 BLAKE2B 958e5ce6ef310471d4c88ef4cfd054eb9476b56abe4e8b82b003632bae4d56a800530601a7fd4b0129fdf22fe5124e8642f60835c6792cdfe38e09afb2d701ec SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd
diff --git a/app-crypt/monkeysphere/monkeysphere-0.42.ebuild b/app-crypt/monkeysphere/monkeysphere-0.42.ebuild
new file mode 100644
index 000000000000..4223ab8f9879
--- /dev/null
+++ b/app-crypt/monkeysphere/monkeysphere-0.42.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
+HOMEPAGE="http://web.monkeysphere.info/"
+
+LICENSE="GPL-3"
+SLOT="0/0"
+IUSE=""
+SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DOCS=( README Changelog )
+
+## Tests fail upstream for SSH connection. Issue has been reported.
+RESTRICT="test"
+
+DEPEND="app-crypt/gnupg:0=
+	net-misc/socat:0=
+	dev-perl/Crypt-OpenSSL-RSA:0=
+	dev-perl/Digest-SHA1:0=
+	app-misc/lockfile-progs:0="
+
+RDEPEND="${DEPEND}"
+
+pkg_setup()
+{
+	einfo "Creating named group and user"
+	enewgroup monkeysphere
+	enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
+	# Using fperms and fowner in src_install leave unusable config with error
+	# Authentication refused: bad ownership or modes for directory /var/lib/monkeysphere
+	chown root:monkeysphere /var/lib/monkeysphere
+	chmod 751 /var/lib/monkeysphere
+}
+
+src_prepare()
+{
+	sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
+}
+
+src_install()
+{
+	default
+	dodir /var/lib/monkeysphere
+}
+
+pkg_postinst()
+{
+	monkeysphere-authentication setup || die
+}
diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest
index c4379291ef8a..ecc25962e01f 100644
--- a/app-crypt/nitrocli/Manifest
+++ b/app-crypt/nitrocli/Manifest
@@ -1,21 +1,23 @@
+DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
 DIST argparse-0.2.2.crate 19440 BLAKE2B 7b15b2072ff52149bc08c5d02a266f2eef78a3aa8844e49154cf2ae1a9cb960ddc2a96a065b4aa44637aca8216211f2965291364d9f06ff6f68524a1f15dfed9 SHA512 97691566d3adc6f6be1c00cdca48424fd3576c372d1c995e7e31658bd20e17ef13553f7de21968ba189fd812928aeb93ef0fa89fe2fd258f45a0a8e095783706
+DIST base32-0.4.0.crate 7791 BLAKE2B 6e457d08f6fe17159b0231b62774d2c366c623b07c7b37196edb8f33b886cdf7affece70afae6dd0b64fc4d2be10d3a01f2f0b81ed12d5c5e1cf50d39c80e68b SHA512 4c999f2fcded06d803471d08b8d9e42512a85f81974388afb3d5b450c86e5ea60e7b1fdaccc49b1e0346663827408f847e897523955edcaf397f20fe97038345
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
-DIST cc-1.0.25.crate 43191 BLAKE2B 2f715c36150ea81406ac34224ebc5e0b95ba1bc5f80d36e78af6e6f4027521bd5e163c3ff0f08dac8b0791b797e1498c8a1151dfbc72a8a8008546e0b44ecf83 SHA512 0ae0d47c9ceb67aa0ec25b7b98ab4d378bd7a58fb7bbcd9bcc804a0deadcfae904f9353c218d63b8e7046b388c67d5316248accf1f8b69822c0f58ff465652a3
 DIST cc-1.0.28.crate 42422 BLAKE2B 632455257fdfe0be6efddc6aee1a32a8a450c49f3a49b7dd13f770cda69334acb0d11e69a4bd4b94c09133ab4319a529c29de993b960276f7506511e4c0fda9a SHA512 2d1e8e34dd8d60aafb0337a86516b152f7f5b04ed5313079fcce66460b5d9c753afbf5e5ba13ada56bbaa7f5ffa1678eb3c2e27b9d58cdcec9f1a5374e6a32ab
+DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
-DIST hid-0.4.1.crate 4121 BLAKE2B 8af6af754c129f3eeaaa35e3b03361fd2a658cdee017701573e79ed40e86900e137ae6a10c844f90ce8c29ecb577d892a8a9b065520eb360734c9bf52bcae6ce SHA512 5529be48d9c0cfb7bdafee029a45fe471cd8996cabe7d584615ccbfea244700a1cf7d78cdaaf8f36ac3d6ddca466d36569fb12e1c1eaaa45091899e57a1d21ce
-DIST hidapi-sys-0.1.4.crate 2391 BLAKE2B 5d8309bad190bdba91aee84239bb0965fdc0093a16a835b99ddfc13633dff6568c66f13c917d9e20cd4e1e453b3dd46ff071f729aba3ea1d99de8388997b193e SHA512 4e2c0a7ee48cb7c7c8bdaaf7c3fd22f58f8995ea2b14caab0cb03efef64711fbe35b435c9f4132e35fb02ea27ee77788be11b3c459f5a290e7297f4d0f9426ac
+DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
 DIST libc-0.2.45.crate 349425 BLAKE2B ded7a699266fb8c8003181dbbb0a8ed9fb27613951b72d538e05bf1d262810dac7edb47560d06989d0d24a9cfac18f22744efed44d12452fa41ba68cb4b8e4cc SHA512 8188400f2f9fabd7c1e0dd1172032eb25bde2702019aec4e3e0c8b936209347baea347ff8d85fee3e93031df0741d32faed151c2b553151e95ae8321bb653381
-DIST nitrocli-0.1.3.crate 23497 BLAKE2B a61cbf26ae5503a77c534efcfffadcd56a1ea15dc34fcfff50765fcee1c22b64f54b76d9cf23ce9ec58d37132be13e313e643379f1330e9d43b2e7492fa627db SHA512 43880b6cb9bb152a1179d02b4290ff6c4dbbdae3c5cb46c0c5cdc382d2a5d8322de97d94b1842b6e93bba97bc3d451bc8946da6d6c0b66fb7d9ed8936df2c263
-DIST nitrocli-0.2.0.crate 43024 BLAKE2B d3dea35dc88fe71b5b87666f1c79c41a56a7dc3a45c7252b342e937f69de4d4e29e217f0ffad5dc2fe2e0fca1841e6ce84ce7544b16c847bf4aacd17e45d6215 SHA512 aca356201c29ed670595d2d637edc2ce15df0a59a6843c68632b702fc92dd8df85cf6e17eed6d5d95e8dd2e83e1f15c3691f2e9bd1aeb0fc908c2217af7e74ae
+DIST memchr-2.1.2.crate 19520 BLAKE2B 4a8409fa4e019ab5cdbfc2787eeebacbbcfd21415d1ea6a3796ef18434ddfad0f63f6df3027eea5d286e08eda892e21cae66e3f25ffee9d6a2a3327b841e5377 SHA512 ba3bad3b911fdd767b6c770209e93dfc367c6228117a5d85bfa95d70ec66df9842f3cf788ac560d1255415dba49028187542000b9a71fbe79ec51a386afda38f
 DIST nitrocli-0.2.1.crate 45957 BLAKE2B 0908dc34ee3ed65ea6221a0fd7ff7231c8a2cb64c5643a8ad0fa4b785d6d974c0528f81448412ae93f7d05f9f66fec794e71e686576b4b3f7298e96fd852087d SHA512 a13e8cf8bd471e1c9b71ec1714ae591ffc07df3588b3902250eef1e15ae53ff97b3ef965c8cd56ee63e5d82c5cefdb4c143181eb33329e3cab01bf71f1ece8d7
-DIST nitrokey-0.2.1.crate 20573 BLAKE2B db7a20121a36d198f1b84e24ea79bdbb18dcb428ec9a84b7180f2157fa14b8ad78a3adcf2162da5bfcd8e112d71b2b05031c694a830e9c6c327c7518360f2f2f SHA512 5f2d87f628028f4ffedc07dd056287744ef558de9e9fc21ba0e7e1a87c138acb7bbc9b0fb9b2b086845f13ffde131b0ff22dfb0b5b32713279a260a7a8ce3829
+DIST nitrocli-0.2.2.crate 53443 BLAKE2B b4385b6031f99719dbfde97248df07975d008b2d57fb2c6597e935b0f1d5f338ba4284988a9eb1a1b8b3d07db9b1b0f638acc30a0e6599f7ed09cf7c33211994 SHA512 76aa5e20afb7627730dbf45c6686f1b2ab7d9c6a2121a6c5827c563f4f3f5b8a293729d63cc2b17a7373bc246fd70e73f63e990c95cad7089864611148a50ea1
 DIST nitrokey-0.2.3.crate 21180 BLAKE2B ece6df9f4d755d9aa3d8f332ba6505e3a0c3b2d0136d376987aaa8beb5b39197a0d9b28341af53a08b9996c612af9b6957fd55ccbab156439920fbd7e97ec505 SHA512 b267526a0a81612d9671d53927b2478c2817d9347a2ce8cce7cfde4e0983434083d748c065b995047c19ebec72a26b1ee1b7e9351ae6d34f3ada91fbb3a316d9
+DIST nitrokey-0.3.1.crate 24023 BLAKE2B e12a8f1a8f2366714ed762093260a001ea2d5efadd0624e5d7b710a5a3ae8bc0012fe6098c69873ca63703e6fe64cb1d9ec400be51fb0b096821769358129e61 SHA512 343f82ad6e643c7353ba5acb2eeb1cd70b4f678f579a7a14ebe5c68fd868bd03447c917495b7fe5e44c4476ca5b40754a58083ab605436c6262ff0699104e4b4
 DIST nitrokey-sys-3.4.1.crate 61726 BLAKE2B 98a1cfa696434372d980ff5f645de77479e2e7977334df805d67d970df262e19c11c5880343c5bfc1a1b2abe7d29a34762bd90ad926c7cf7ba486e0b513c84fa SHA512 cc9cfbbebbad8a5c5846c60ad4125c87a64624ee90302327b03a94b1494d2329e45bbb09d58a3a00d465b23915faff3d3d787f64c0edcce6c63f25ab7830af13
-DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
-DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
+DIST nitrokey-test-0.1.1.crate 8044 BLAKE2B de775515a73a500d3c37a58431c14a1cb6d2f715808c855466b78373f983b948b9e257f03fbcb16729a3f17a3f930ddf3eaac913955286e27e0b27f573659d04 SHA512 4dfbc79e64ed77f58599bc570b126f7975e614de07fa30b3c7da421bf184fbf059f401da42110b14eae5a953599e3875430cd4f0e117df5ce9bd03a753026cec
+DIST proc-macro2-0.4.24.crate 30970 BLAKE2B d6b0a5fe633c5773e6d8b4bc2c9f32c66f8072f85ff48bf449fd3d8ada87e639ee730f8bd3d3170acd1528806698bcf1c329c57f102cd79833f96e2fd1bb7e0e SHA512 57ae6a761fcc14f22277df025db6b09f1173035e1496d1c4906d9af9231c19f0b93750abf36e4013ae82799069869047a7e3f1b3e095344e55c603fe5a462d03
+DIST quote-0.6.10.crate 15795 BLAKE2B f81cf2cc13efb42bcf90f4c9cce832d94b2138428d133516d579a0eed157bacda9f5b29cd1c604a89261390ec011fe4825c31788486db007efd97fbb3de261f6 SHA512 92250a3664fe872175ee8c8aa7c4fec121ffe6fcec11a957646fab1297e9e946be03924ce1d7897125cdc0d4883400ac05774ed55a32f943a129fa8d48a1a162
 DIST rand-0.6.1.crate 126613 BLAKE2B e7779ba6b13aa58edc3632f250787d35ad486185d3307d17528b12bb6d2adf6eef8aa91c5f51f021fb8e037d4ab1fb64fa364ec093fae0a5bd79095d51e06791 SHA512 dab500d25d538d28bac5b9b60e3b262f64e9d0581c5c17f165890497f7cb459603b815e8a43451610e75d8f5390aa41aad57dcb532307c479ebb99f475f4d4a4
 DIST rand_chacha-0.1.0.crate 11637 BLAKE2B 423f7e835d9c69f49f991ef2ad00c40c8af929935de531821ef32054b39bed54991709e04b352a9f429c7c49f17548084f703353df3a768f1f31a655111b8ebd SHA512 b911dea149eeb859e532d17074a4db8527da2d048b6f59b0d58fdbb51dfe3e839092e1c614e748f471a7381d28605e994ef8783643bb419eedb2c4e04f3dd0a3
 DIST rand_core-0.3.0.crate 20581 BLAKE2B fe46ab0ef5fe8f5f5695906336683350abd7aca246a537e2e4bc9fcf10686d39aaac259584f17c022200ec1139e01e817f71caf33933ad3f353baa10e6cd11ab SHA512 a476510ef936571e3351f42e0f1c615530732b7c66f41975fef10dc6b8f4d8536a6d8166bb90d6da2bb997108ee3e87f4d80884264b239680e6ffd3494dcb748
@@ -23,13 +25,20 @@ DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818
 DIST rand_isaac-0.1.0.crate 16011 BLAKE2B 84cd447debff595683ceb97ae2b03cb31ca6e342769dc1ccfca0a20e5bc8474ca3c40cce4bfc3be59b2bc0c849b74848f8916a2bfcf9bf7c0d54b2e8b5ae3c67 SHA512 addd5b4fb2bfdafec8b3d50f607099ce8d9fd7c5cb5cfcd6603368e5022dda7562e2deb2efcf4d5f3304f248629160f906554ed40a0d7cbb19c4b807a36dc74e
 DIST rand_pcg-0.1.1.crate 10881 BLAKE2B adafb2f28603e4c1ccced838b1946b4d0de94f7d11c85b1a0fdd69a1de3a7c3e1b3030af25b600441c08e2eb73595ff4bad195e5d2ef04f3fa2da5f9614e14f8 SHA512 5104d9a3352f631eb7775218fae6da430d0b26c500aa10a333baa0b1b3d4ff7ff6e8a0162cfe8f514382b0a9342a00e3d2ad6b0313047c5e0c324f3184cfa9e3
 DIST rand_xorshift-0.1.0.crate 9194 BLAKE2B e35999cedfb58b4c2192fcb0d4b606b1535a4ff32cf0f9a8d337f029704cff285af741b507c98afa27040e04f2be23d53a7c749fbd86242469a4a85d61939f64 SHA512 6bdec89da3e3c07c8fe42ba4ce5c24d76ea81b522fad533ae172c5d402f109fd9ce793bc13647dc1db188202bd78f48a9ad55f0caa43f1b88c711f3f2c18a0bb
+DIST regex-1.1.0.crate 241219 BLAKE2B 37441c1cedfa7fac3904a3a261f618afbdc64e9bcbd9f6913c551ac2cffd454456fce71ae1aefda70cf32d000d990d4e97d9867ffa042abf0e71bdc9df3cbec1 SHA512 f60d9e7c5a8647a1e0d35e995e799335ae695903985cd9f90923ab6483172602e9493005b7c7bd3dee0824de992dcd2f03320d58419206a0d5cfb675c68c4745
+DIST regex-syntax-0.6.4.crate 272048 BLAKE2B 921cb35d306d796baeb9e3f2fd243bd6c90e92ff175cb9be23e12b1a0f19f51a40075aaf66a56e32fe9b1f08eb30b2a1f47469127061542c96b4f68733780b9a SHA512 7a199c43668f7d660a28a1324ce1951cd6ec299cd98edbfde3b6a6d172e9f1a52135457673b432a0318163a5c23e541abca58607623a310f15fbefeafb50ee3b
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+DIST syn-0.15.23.crate 145369 BLAKE2B f66939982ee09090f2baf1cc4522615e6975d4350c7c65b3b0a3568cd3b3aef04231f6c23b818333107af784780366cafe7d726f03f346ed227c1db6cca522c1 SHA512 d447ec08199d36e289ea303ee8e871e13e002a4d67c396187ef56eb16b69cf21d64becd24fd8d2f7a1c826685f7b6df747903e7eb8cc5c334ee0528998597128
+DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
+DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
+DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
+DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
+DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD nitrocli-0.1.3.ebuild 948 BLAKE2B 86abae2029cee3e94851333b46dfdead6f9a6999dda733f8a133110049778a9e3fa6c245fe0859461b133e3686442cdea885e16df597a5e6f74ce0bad01579db SHA512 1203513b9633a1e84cf907d0877cfb1507ea0bea674b1751aceda583b8970f999b09938234a0efc0f8087dfe731d1338464fdb7467204fe1b26f9787fce9a8e3
-EBUILD nitrocli-0.2.0.ebuild 1152 BLAKE2B 3fbcd7ad0bfa1d92fbb7c6d74d38aca5ddda18cad7b46035c1fca1c34f1d541e64d1be27bd6f7a696f3037a6bb4634ed431b28924d2e872de72cfd0b33a8ba1f SHA512 e6b3832f794f6d5311d31c30c3bf0546956a089702b54d2b28bf1ab5dcbc528dea60fe01ee89718980357457e1e571864fd7c278829052f0addf5d10429bb643
 EBUILD nitrocli-0.2.1.ebuild 1075 BLAKE2B e6a76c66202678c8d652a35220a9f71b6cdd95648535ccaf5dd270ee8885157aecf02d8d7ca9430adecc040a81c4aa83bb13c92cb98268858dfc743bb285d33f SHA512 393aa066d0508bdfe7c979198f269946e9f2ad506c85061131fac6b102317d6a4a6147e105d7795c8977712bd8e3a1b307746fb85d20a0a9ccf257d1f88a83a0
+EBUILD nitrocli-0.2.2.ebuild 1536 BLAKE2B f435c1a84cb4ec0e0cfb8ff8e467fd1995f6939180cb4a9161c1f0b73ac01949d67480d11c96830e5171fec0b920f9c1ea1eed1fda2e5aee4e92be90f0e51754 SHA512 3c36f03822e07998c679dafbb7a62ea33ea72db38480e8645713fde4dbb8dc74c69abe5121a6f3a0b31b79491b6b80e26a251000a37cf61c0a5acb98fb7eb6d7
 MISC metadata.xml 683 BLAKE2B a973761f8df97168483a0adc13bf44f088f13fb9c472986cffed08d53f69cdbc27a4bc195babcd86796853968c8face6c00004e060086b2ba4d09c52ce978815 SHA512 3f4615ba5af13e358c1c3a4b28c3dbec77c0b99af4692c0b2feedb4f21a1e5f8f76cb7fbd2cdaa5a8c899d340094b8029a6967dd68d591586bef551f8eb61b1f
diff --git a/app-crypt/nitrocli/nitrocli-0.1.3.ebuild b/app-crypt/nitrocli/nitrocli-0.1.3.ebuild
deleted file mode 100644
index 1424608aca74..000000000000
--- a/app-crypt/nitrocli/nitrocli-0.1.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-cc-1.0.25
-hid-0.4.1
-hidapi-sys-0.1.4
-libc-0.2.45
-nitrocli-0.1.3
-pkg-config-0.3.14
-"
-
-inherit cargo
-
-DESCRIPTION="A command line tool for interacting with the Nitrokey Storage"
-HOMEPAGE="https://github.com/d-e-s-o/nitrocli"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-BDEPEND="
-	>=dev-lang/rust-1.31.0
-"
-DEPEND="
-	dev-libs/hidapi
-"
-# We require gnupg for /usr/bin/gpg-connect-agent.
-RDEPEND="
-	${DEPEND}
-	app-crypt/gnupg
-"
-
-# Requires a Nitrokey in pristine configuration.
-RESTRICT="test"
-QA_FLAGS_IGNORED="/usr/bin/nitrocli"
-
-src_install() {
-	cargo install -j $(makeopts_jobs) --path=. --root="${D}/usr" $(usex debug --debug "") \
-		|| die "cargo install failed"
-	rm "${D}/usr/.crates.toml" || die "failed to remove .crates.toml"
-
-	einstalldocs
-	doman "${S}/doc/nitrocli.1"
-}
diff --git a/app-crypt/nitrocli/nitrocli-0.2.0.ebuild b/app-crypt/nitrocli/nitrocli-0.2.2.ebuild
index 193d981b9610..bd432facd469 100644
--- a/app-crypt/nitrocli/nitrocli-0.2.0.ebuild
+++ b/app-crypt/nitrocli/nitrocli-0.2.2.ebuild
@@ -4,16 +4,44 @@
 EAPI=7
 
 CRATES="
+aho-corasick-0.6.9
 argparse-0.2.2
+base32-0.4.0
 bitflags-1.0.4
-cc-1.0.25
+cc-1.0.28
+cfg-if-0.1.6
+cloudabi-0.0.3
 fuchsia-zircon-0.3.3
 fuchsia-zircon-sys-0.3.3
+lazy_static-1.2.0
 libc-0.2.45
-nitrocli-0.2.0
-nitrokey-0.2.1
+libc-0.2.45
+memchr-2.1.2
+nitrocli-0.2.2
+nitrokey-0.3.1
 nitrokey-sys-3.4.1
-rand-0.4.3
+nitrokey-test-0.1.1
+proc-macro2-0.4.24
+quote-0.6.10
+rand-0.6.1
+rand-0.6.1
+rand_chacha-0.1.0
+rand_core-0.3.0
+rand_hc-0.1.0
+rand_isaac-0.1.0
+rand_pcg-0.1.1
+rand_xorshift-0.1.0
+regex-1.1.0
+regex-syntax-0.6.4
+rustc_version-0.2.3
+semver-0.9.0
+semver-parser-0.7.0
+syn-0.15.23
+thread_local-0.3.6
+ucd-util-0.1.3
+unicode-xid-0.1.0
+utf8-ranges-1.0.2
+version_check-0.1.5
 winapi-0.3.6
 winapi-i686-pc-windows-gnu-0.4.0
 winapi-x86_64-pc-windows-gnu-0.4.0
@@ -28,7 +56,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
+IUSE=""
 
 BDEPEND="
 	>=dev-lang/rust-1.31.0
@@ -42,17 +70,15 @@ RDEPEND="
 	app-crypt/gnupg
 "
 
+# Uses a plugged-in Nitrokey and runs tests on it. These tests assumes a
+# pristine configuration and will modify the device's state. Not meant
+# to be run as part of the installation.
+RESTRICT="test"
 QA_FLAGS_IGNORED="/usr/bin/nitrocli"
 
 src_install() {
-	cargo install -j $(makeopts_jobs) --path=. --root="${D}/usr" $(usex debug --debug "") \
-		|| die "cargo install failed"
-	rm "${D}/usr/.crates.toml" || die "failed to remove .crates.toml"
+	cargo_src_install --path=.
 
 	einstalldocs
 	doman "${S}/doc/nitrocli.1"
 }
-
-src_test() {
-	cargo test -j $(makeopts_jobs) $(usex debug "" --release) -v || die "cargo test failed"
-}
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index f64369fb256a..05ca3e759439 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -3,5 +3,7 @@ AUX freebsd-triplet.patch 800 BLAKE2B 43f1f7e1fa43313e2f323a3e5031a463185c2388a3
 AUX rhash-1.3.6-no_echon.patch 1224 BLAKE2B 949b6aa839667a6fef3c3a668b6cadc451986ba837807b3d7a56b80f50c8248d734745f886d40d341a99fefaf439f95bdeb0382ee15ea9e4f8561f98703fba2d SHA512 3771077c64c28b1fcf310d7a449d3e1eb951d1669b2ad3ddffe76d98ac5821ea8af40013984c65f28c7fce3434b7173a74a77120847f557cab2dedefac0c8b58
 AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836f8a431d950392dafb46be646048a0ab4dc4a31ac20b6676fa8627b39bbb30a990861cf8d3cfc742f8 SHA512 7a4c2bf019cbcde021bb79572abdbc9b42f995ada5bb9798fed127d79c44ed9d4b9544c1413952604b1dd45ed307acdacba6675419f6331d75ecf34c15b8f5ca
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
+DIST rhash-1.3.7-src.tar.gz 362981 BLAKE2B bc248e0dcdf2337e46292f1bcdff0ce027705679ab937c8aa13139226bc09f3815ba23d8383f624dfba255c54378473f6b0b28a710611cdc83150055b8d649d0 SHA512 182f474b0f0a39f9e0adb7e34fcc5ddca6f00e75d7cf6b846da33af166257b2ed38be70aa71e6732c4e6cbdd156712790b8bc5340933b65f3ce57269835d1585
 EBUILD rhash-1.3.6-r1.ebuild 1917 BLAKE2B 4276bd7da9604398f8e150a6cc8585fba3b7b90011e4dd60ff2f133996ffdb80b9e85659239669fc1faeb0e5856dec1b6cae1966d1d21952b947740d4dc5b656 SHA512 efad5669c2917a07bc709d433bbda42d4d8ab7b1a88740a495f9329c79b48dde44c60f2dec5b0dbf04ca6797f7ad9423c82b73700797dd8a613dddcad1d0c64c
+EBUILD rhash-1.3.7.ebuild 1900 BLAKE2B fc04872b62b571d6faa946477e169e417a82870980f711fa6030d5a91d227d3e8ad56718478cbc2af7b37552871b676e0d42d7ae543c12fa2c82c17bf1745bb6 SHA512 1e28644c0f3c8d884621b3d7f5e8e09e56510482956809eb22b16a22ed83f02ab4ad0efd35522173e715f6b98e39ae1f913bf35daf38a755f1fdcdfc5cdac114
 MISC metadata.xml 753 BLAKE2B 09d65c4222a77b9cdab0e82e8b3a38a63762c9e691285f712e09e99ecf28937d70436ac0dc56a890ea1f6ca9981c7f02383ce92a0da6a0c5ca11af2b3598e77e SHA512 d9a8480839af7651eb09b1210b2b0f736d01018cd1863eb17f24f0f51024c234f6f5036745f2034e89bcbd85f396b194184fc987adba43d9d0bebfa0b65d635a
diff --git a/app-crypt/rhash/rhash-1.3.7.ebuild b/app-crypt/rhash/rhash-1.3.7.ebuild
new file mode 100644
index 000000000000..e179038547c0
--- /dev/null
+++ b/app-crypt/rhash/rhash-1.3.7.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="Console utility and library for computing and verifying file hash sums"
+HOMEPAGE="http://rhash.anz.ru/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="debug nls libressl ssl static-libs"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+)"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/RHash-${PV}"
+
+src_prepare() {
+	default
+	# fix Solaris detection, upstream:
+	# https://github.com/rhash/RHash/pull/81
+	sed -i -e 's/sunos)/solaris2.*)/' configure || die
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	set -- \
+		./configure \
+		--target="${CHOST}" \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--sysconfdir="${EPREFIX}"/etc \
+		--disable-openssl-runtime \
+		--disable-static \
+		--enable-lib-shared \
+		$(use_enable debug) \
+		$(use_enable nls gettext) \
+		$(use_enable ssl openssl) \
+		$(use_enable static-libs lib-static)
+
+	echo "${@}"
+	"${@}" || die "configure failed"
+}
+
+# We would add compile-gmo to the build targets but install-gmo always
+# recompiles unconditionally. :(
+
+multilib_src_install() {
+	# -j1 needed due to race condition.
+	emake DESTDIR="${D}" -j1 \
+		  install{,-lib-headers,-pkg-config} \
+		  $(use nls && echo install-gmo) \
+		  $(use kernel_Winnt || echo install-lib-so-link)
+}
+
+multilib_src_test() {
+	emake test
+}
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
index c377f779261a..1f98875df8bb 100644
--- a/app-crypt/tpm2-abrmd/Manifest
+++ b/app-crypt/tpm2-abrmd/Manifest
@@ -1,4 +1,4 @@
-AUX tpm2-abrmd-2.0.3-build.patch 1219 BLAKE2B 3fdaf5018e2dca93c146be69505d48c3caf4a5cc07f1d658628c0297bbff2e2c2b22ecc0118bfb868409a84befa6f261c798387bd380038af11ddddcd4361eea SHA512 a4337ad1543e1580f5db8421a01c4031c6689bc0988e0c1ec4024ff003aa03c53bec68e5b27b25321d2828fa920129596fc3100c226bd91301eda6059af02248
+AUX tpm2-abrmd-2.0.3-build.patch 2266 BLAKE2B ae973682cd38c80405bbfb6c1cee5070c4df08579fe82dc169c04ff547f73d851eeeae0eafea8119dfe6569caace196ef1c523a673f6227ebfa2553cde631c47 SHA512 87ed96de2c8bd39b89e5570540ba84735b0fc3ded0c804b349f0d6588047b93df0df4fddacbe0e73c88c354ff38e9c8646a32eaf105de9f580f278be67a2b3e3
 AUX tpm2-abrmd.confd 17 BLAKE2B f3b6301cb29f0f741c26025bded10af8948eb7f16faca051828b063f4fdab823309fac085e69e281600f77646f3e2bd91c1a5079bd675569aef8db762fdbe991 SHA512 ca7c4782ccc3ee7592bb4b24a6a81c624d22969cf9b9e1c3e22d45e85d3720836b1f22735ccf2ba51258c6eb0b30c4d88d7bed893f58b1aac7423fb7013529f9
 AUX tpm2-abrmd.initd 390 BLAKE2B 5dbaccf073eba208e13c24f92127e41c4c71fe62dd9bf2062301efbcc16daa1559ffba127399a189d6466e21a8cf9b85ac0e09d34f495be58430eb3cfe0886ef SHA512 aef622face110e22831dddab8a6474b4d003e6d50da9d334653a88ef0a7fca88377379a56fef9c404af5222c8c2fb97090eca913aa7d96183c4e14d7ab470044
 DIST tpm2-abrmd-2.0.3.tar.gz 563029 BLAKE2B 89c20066b05818825a2addacaf123568ec095d021e9811b78d11c336af9a9e97fe280a08b4478331663efd1da9b2db54207ca53728398aefe4407bfe4b0c7efd SHA512 70b431b9d09e1c1db819aabf6ca8e40a7553573339f43a6c872ad685b7822e5046bd8ede25dcd0608ce2d8fa32257f6c1dd7f234aa7d6a447ac795625d4e0fac
diff --git a/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch b/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch
index 72e823405e91..07c607579f12 100644
--- a/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch
+++ b/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch
@@ -30,3 +30,42 @@ index ecbc3bb..5973ff5 100644
  
  AC_SUBST([PATH])
  
+From 353c5e962f46e3739b1e92cbf6b1f3eb500157fc Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Thu, 17 Jan 2019 23:56:50 +0200
+Subject: [PATCH] tests: run without X
+
+Solves:
+
+$ DISPLAY= make check
+
+FAIL: test/tss2-tcti-tabrmd_unit
+
+** (process:17633): CRITICAL **: 23:53:22.403: failed to allocate dbus proxy object:
+Error spawning command line ?dbus-launch --autolaunch=4f9189e347d5cdf343
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+
+https://github.com/tpm2-software/tpm2-abrmd/pull/577
+---
+ .travis.yml | 2 +-
+ Makefile.am | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b32a5fb..2598f13 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -76,7 +76,8 @@ XFAIL_TESTS = \
+ TEST_EXTENSIONS = .int
+ AM_TESTS_ENVIRONMENT = \
+     TEST_FUNC_LIB=$(srcdir)/scripts/int-test-funcs.sh \
+-    PATH=./src:$(PATH)
++    PATH=./src:$(PATH) \
++    dbus-launch
+ INT_LOG_COMPILER = $(srcdir)/scripts/int-test-setup.sh
+ INT_LOG_FLAGS = --tabrmd-tcti=$(TABRMD_TCTI)
+ 
+-- 
+2.19.2
+
author	V3n3RiX <venerix@redcorelinux.org>	2019-01-22 10:09:44 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-01-22 10:09:44 +0000
commit	09351e78166b5e864197c4456ebae3f89dd0bed9 (patch)
tree	41a96399f56ed3aa399006871bfce4430db84aa2 /app-crypt
parent	c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (diff)