gentoo resync : 10.02.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-02-10 15:40:27 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-02-10 15:40:27 +0000
commit: 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (patch)
tree: cee0a97398040001220ece3cd48c3d568bcddb4a /app-crypt
parent: 1db00cc6e94b90c08090bb5b8c406622946c4ae5 (diff)
49 files changed, 347 insertions, 646 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index f254a0306edd..380ecd59297e 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index b8eea31bd456..4a3e7b6b0cda 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-0.29.1.tar.gz 1265252 BLAKE2B dcb63862f427851655ae8282a3d479adc4aa2f553f510f3769d59748728505cb052291f728f1a01ad4efffa25d9aee6be881a9a7178fb0c025725780150ade45 SHA512 c9b976bec51c83412816726b709b79af0b464efa02f67c4ce7e754a2e6fa11e6811ca5db66616bd7b9e7920d6613665d3e58998c891bdb1452a5159a91971c56
-DIST certbot-0.30.0.tar.gz 1266974 BLAKE2B f6c0c6864297ba0f6fc3232e0655d79e0b045923c22015d34f706e392ef83ca95c19b36d47120500bf4a0561a277aced13f7fb49d7bdcdc8359113c617dca37c SHA512 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
 DIST certbot-0.30.1.tar.gz 1267198 BLAKE2B dc1ce89f376d8cd0ca02dbec50cb39e8c7fc5e140c342b8b80e1226ddffa0a3cf798683679d7815cc9da24ce0371e19f5288619ba69941226f6170f8ec9948fc SHA512 31b790ed6911a9e632327d0833209c679535403d71a9977c8b785cc7585c67a4e18971b33f407598da4c7c67e073b0c2164203df34ec69bf3a0feb6bb326fbce
-EBUILD acme-0.29.1.ebuild 1263 BLAKE2B 1ba41c5fde55e0926d7b98a6ea8991fc7dcaf9285cda1cf9191ba78c6a423ab46954173e31d768e215d43df9066c8b9c2177bb71a11d81e4f21ccd58035a8fea SHA512 420bbef6273fd518680b7a292b7a28d69dc68c2979f94c415b5ee2eba8b5213967048ab1e03d619bbcab6e0b9d079aa4f8e153e737ce26704701330642c471d0
-EBUILD acme-0.30.0.ebuild 1265 BLAKE2B 393a9517fb9eafff45a66ccccb2d2d3d86ea94e412b86530c5882ee79056635efcf8696db972942981e9fa47af51b19d339500c0e7251ed71bcb84449adc7df7 SHA512 67d7e6f1e2850828fa523438a0a292ec36e7f403651fa4f865820982783d8310a6e7a6caaf22bc4a6c35bc005c6d5563c752fe19aa9672ec463b296a2279bcb1
-EBUILD acme-0.30.1.ebuild 1269 BLAKE2B 2a40ff630b70761a98d9a69428863ccaf9b5e944082079841fe29efa08e5b5dd0a8f7d8fad38d2e078497a99682471201bd87e9f0170cba1eba0c57ef2700a50 SHA512 7e52abd6d65d2bc76ae9d495f2eb6b3d380452a47757fe9294c04d4e121873e13c75ff7f950c905c08e03904e01dc9ac921736e6121940753dbebc06d6043a69
+DIST certbot-0.31.0.tar.gz 1267960 BLAKE2B 4097a3d278d86589e7273c3f5c4f809f0a5777319856a2aea27233ee99eadf2e7c075c5400970be6a2f11032e54457c9705ef45b85e9d158bc04c7761e59a23a SHA512 9202800649691e9b2d6b4c898b975d11ef3aba8f34903c93a11eafa5300f64c939547cfbbe34ac664de293d2540b143f14d3117969e4a6dfc55d624cfae44fea
+EBUILD acme-0.30.1.ebuild 1267 BLAKE2B e078066c1470516142932c097afab73641b9c5e6cb7b8df411dbd40d898fd743a4cfe0032b793882c59ce3487f609eff0cf5fc588b5f09d36caeb63c2564be3c SHA512 6af21d683a48f864f1c12f4892152ea0c0f22dc44dc39cefa05cbb973ab39cb4f8f9ebde6e6ff0e6a77cca6aa1dcf5840e28e29b6812ea9e71116295a336a972
+EBUILD acme-0.31.0.ebuild 1269 BLAKE2B 2a40ff630b70761a98d9a69428863ccaf9b5e944082079841fe29efa08e5b5dd0a8f7d8fad38d2e078497a99682471201bd87e9f0170cba1eba0c57ef2700a50 SHA512 7e52abd6d65d2bc76ae9d495f2eb6b3d380452a47757fe9294c04d4e121873e13c75ff7f950c905c08e03904e01dc9ac921736e6121940753dbebc06d6043a69
 EBUILD acme-9999.ebuild 1269 BLAKE2B 2a40ff630b70761a98d9a69428863ccaf9b5e944082079841fe29efa08e5b5dd0a8f7d8fad38d2e078497a99682471201bd87e9f0170cba1eba0c57ef2700a50 SHA512 7e52abd6d65d2bc76ae9d495f2eb6b3d380452a47757fe9294c04d4e121873e13c75ff7f950c905c08e03904e01dc9ac921736e6121940753dbebc06d6043a69
 MISC metadata.xml 342 BLAKE2B 770c32b421519cd6bdf7e09a71a1ee679a7fdf18e03587f75097a766c51dc878000184759e3c69f0c19afe060dd5578ff91e481644086e138dbb728619895130 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb
diff --git a/app-crypt/acme/acme-0.29.1.ebuild b/app-crypt/acme/acme-0.29.1.ebuild
deleted file mode 100644
index f3343da762b4..000000000000
--- a/app-crypt/acme/acme-0.29.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	nosetests -w ${PN} || die
-}
diff --git a/app-crypt/acme/acme-0.30.1.ebuild b/app-crypt/acme/acme-0.30.1.ebuild
index cc94bdaee734..d4ea2b9f2e65 100644
--- a/app-crypt/acme/acme-0.30.1.ebuild
+++ b/app-crypt/acme/acme-0.30.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 ~arm64 ~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.31.0.ebuild
index e41e26ef0fc4..cc94bdaee734 100644
--- a/app-crypt/acme/acme-0.30.0.ebuild
+++ b/app-crypt/acme/acme-0.31.0.ebuild
@@ -24,10 +24,10 @@ SLOT="0"
 IUSE="test"
 
 RDEPEND="
-	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
 	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index ff8478eb6788..9840114a31bd 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-0.29.1.tar.gz 1265252 BLAKE2B dcb63862f427851655ae8282a3d479adc4aa2f553f510f3769d59748728505cb052291f728f1a01ad4efffa25d9aee6be881a9a7178fb0c025725780150ade45 SHA512 c9b976bec51c83412816726b709b79af0b464efa02f67c4ce7e754a2e6fa11e6811ca5db66616bd7b9e7920d6613665d3e58998c891bdb1452a5159a91971c56
-DIST certbot-0.30.0.tar.gz 1266974 BLAKE2B f6c0c6864297ba0f6fc3232e0655d79e0b045923c22015d34f706e392ef83ca95c19b36d47120500bf4a0561a277aced13f7fb49d7bdcdc8359113c617dca37c SHA512 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
 DIST certbot-0.30.1.tar.gz 1267198 BLAKE2B dc1ce89f376d8cd0ca02dbec50cb39e8c7fc5e140c342b8b80e1226ddffa0a3cf798683679d7815cc9da24ce0371e19f5288619ba69941226f6170f8ec9948fc SHA512 31b790ed6911a9e632327d0833209c679535403d71a9977c8b785cc7585c67a4e18971b33f407598da4c7c67e073b0c2164203df34ec69bf3a0feb6bb326fbce
-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-0.30.1.ebuild 1080 BLAKE2B e7d4c037fae078bc6538768d507ac109af6c2d676187ed90aebc76ae1900532ae3fc7675ee3d4ba62d0dfefcc573eb3bc92bfdc33e0eede11fb7c0e066dace35 SHA512 672863267ac83c966c208c9ecf6fc83c704ea034092c30169064453fbe92cd3c73cfd2d6d6ace3f52c8d14d46f50e0b8e70b24ad282529f5f99acfe3b2f3bf94
+DIST certbot-0.31.0.tar.gz 1267960 BLAKE2B 4097a3d278d86589e7273c3f5c4f809f0a5777319856a2aea27233ee99eadf2e7c075c5400970be6a2f11032e54457c9705ef45b85e9d158bc04c7761e59a23a SHA512 9202800649691e9b2d6b4c898b975d11ef3aba8f34903c93a11eafa5300f64c939547cfbbe34ac664de293d2540b143f14d3117969e4a6dfc55d624cfae44fea
+EBUILD certbot-apache-0.30.1.ebuild 1078 BLAKE2B 88db3076d6c2b3e9cb6a19c40ecfb4ed2f42e9f534040bfce18e785adeae93d963ffdf1f1a38ba2fe54e9bb749a8b8c1960af1e5319f884cb85a6e3ef19337d6 SHA512 d9bc1e40c1a77bc8f27725aea41fab71aa870cf4aef1e93f187ba2502bcb89304011e581052235838ad7282b03c6cff4f6f0d1264435d7f8ca53c9a3307ffa65
+EBUILD certbot-apache-0.31.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.29.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.29.1.ebuild
deleted file mode 100644
index 8bf039bdf51a..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-0.29.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	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 ~arm64 x86"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=app-crypt/certbot-0.26.0[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests || die
-}
diff --git a/app-crypt/certbot-apache/certbot-apache-0.30.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.30.1.ebuild
index b6c158fb2f52..8bf039bdf51a 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.30.1.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.30.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 ~arm64 ~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.31.0.ebuild
index b6c158fb2f52..b6c158fb2f52 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.30.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.31.0.ebuild
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 6b746174a536..70380f4908b6 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-0.29.1.tar.gz 1265252 BLAKE2B dcb63862f427851655ae8282a3d479adc4aa2f553f510f3769d59748728505cb052291f728f1a01ad4efffa25d9aee6be881a9a7178fb0c025725780150ade45 SHA512 c9b976bec51c83412816726b709b79af0b464efa02f67c4ce7e754a2e6fa11e6811ca5db66616bd7b9e7920d6613665d3e58998c891bdb1452a5159a91971c56
-DIST certbot-0.30.0.tar.gz 1266974 BLAKE2B f6c0c6864297ba0f6fc3232e0655d79e0b045923c22015d34f706e392ef83ca95c19b36d47120500bf4a0561a277aced13f7fb49d7bdcdc8359113c617dca37c SHA512 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
 DIST certbot-0.30.1.tar.gz 1267198 BLAKE2B dc1ce89f376d8cd0ca02dbec50cb39e8c7fc5e140c342b8b80e1226ddffa0a3cf798683679d7815cc9da24ce0371e19f5288619ba69941226f6170f8ec9948fc SHA512 31b790ed6911a9e632327d0833209c679535403d71a9977c8b785cc7585c67a4e18971b33f407598da4c7c67e073b0c2164203df34ec69bf3a0feb6bb326fbce
-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-0.30.1.ebuild 1014 BLAKE2B e49941f79f8c7b2e55480aa96f72c52d9f2e79e7e8d62055c35589a31022d60b40e10fa47b55058f17b92d74f23ae4245dcb1f08062c39e85a7b326529708307 SHA512 ae848d635d1479aa216d908724d478ff7cbaffe67724c287e7de5c0de81b96281b09acaf5d8267ea446ba31b3d36beb3c2c52d2675a95f4ed8255a153da49dca
+DIST certbot-0.31.0.tar.gz 1267960 BLAKE2B 4097a3d278d86589e7273c3f5c4f809f0a5777319856a2aea27233ee99eadf2e7c075c5400970be6a2f11032e54457c9705ef45b85e9d158bc04c7761e59a23a SHA512 9202800649691e9b2d6b4c898b975d11ef3aba8f34903c93a11eafa5300f64c939547cfbbe34ac664de293d2540b143f14d3117969e4a6dfc55d624cfae44fea
+EBUILD certbot-nginx-0.30.1.ebuild 1012 BLAKE2B e6611cbbb8f7eb76ee4d81f78389afc3a2698ef0909ff67d91d77bc3e92a68e728434b3a237c6791991ca82e014506bd83016e6a5da163792a32581d68967bbf SHA512 cd52ce383de026c14c54f24b30ad044074c16c26760ea8f22d8e56f5f4afae3e1f0368cad36cadb8839b3e062daa6bc2744393b6cf9b8402292c3c66bdeb7a71
+EBUILD certbot-nginx-0.31.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.29.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.29.1.ebuild
deleted file mode 100644
index ec0e921c2c8f..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-0.29.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	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 ~arm64 x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=app-crypt/certbot-0.22.0[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.26.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.30.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.30.1.ebuild
index b84d186a8cd7..ec0e921c2c8f 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.30.1.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.30.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 ~arm64 ~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.31.0.ebuild
index b84d186a8cd7..b84d186a8cd7 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.30.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.31.0.ebuild
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 84f5dde73394..426999e1ea72 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-0.29.1.tar.gz 1265252 BLAKE2B dcb63862f427851655ae8282a3d479adc4aa2f553f510f3769d59748728505cb052291f728f1a01ad4efffa25d9aee6be881a9a7178fb0c025725780150ade45 SHA512 c9b976bec51c83412816726b709b79af0b464efa02f67c4ce7e754a2e6fa11e6811ca5db66616bd7b9e7920d6613665d3e58998c891bdb1452a5159a91971c56
-DIST certbot-0.30.0.tar.gz 1266974 BLAKE2B f6c0c6864297ba0f6fc3232e0655d79e0b045923c22015d34f706e392ef83ca95c19b36d47120500bf4a0561a277aced13f7fb49d7bdcdc8359113c617dca37c SHA512 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
 DIST certbot-0.30.1.tar.gz 1267198 BLAKE2B dc1ce89f376d8cd0ca02dbec50cb39e8c7fc5e140c342b8b80e1226ddffa0a3cf798683679d7815cc9da24ce0371e19f5288619ba69941226f6170f8ec9948fc SHA512 31b790ed6911a9e632327d0833209c679535403d71a9977c8b785cc7585c67a4e18971b33f407598da4c7c67e073b0c2164203df34ec69bf3a0feb6bb326fbce
-EBUILD certbot-0.29.1.ebuild 1262 BLAKE2B d2fd392ad43dcf2319140eac1bbedb551814cc20ede0d21a6817cecae422acbf22001de635089d3097219976bb963824645252365e72bba5c070372c2991f793 SHA512 f117d8a3441fb390f7908eb608df300f9e24301a87dede456d7d78f8bdc27bc1fe78c6c7c40937427661544a80a23c11d6d98c83eb8ceacb3fd9e9894140c580
-EBUILD certbot-0.30.0.ebuild 1264 BLAKE2B 87d7d0de1448b779c4e44b28ff1dda3fa2441b0779b1a00a2d3efe6db1b9489b595cb3f4c31989e2cdcb3c0cd9c1ad47058e6530365107dbc3d2b85f108e803f SHA512 687528fcff2f41b4923edae2f5ce30daf04fe5671f359a2b8e33fcfb840560bbab7514a61417b56b2e5171a251a8e5acc5a19cf2fd1e3adf5c356079897f0c6d
-EBUILD certbot-0.30.1-r1.ebuild 1264 BLAKE2B 87d7d0de1448b779c4e44b28ff1dda3fa2441b0779b1a00a2d3efe6db1b9489b595cb3f4c31989e2cdcb3c0cd9c1ad47058e6530365107dbc3d2b85f108e803f SHA512 687528fcff2f41b4923edae2f5ce30daf04fe5671f359a2b8e33fcfb840560bbab7514a61417b56b2e5171a251a8e5acc5a19cf2fd1e3adf5c356079897f0c6d
+DIST certbot-0.31.0.tar.gz 1267960 BLAKE2B 4097a3d278d86589e7273c3f5c4f809f0a5777319856a2aea27233ee99eadf2e7c075c5400970be6a2f11032e54457c9705ef45b85e9d158bc04c7761e59a23a SHA512 9202800649691e9b2d6b4c898b975d11ef3aba8f34903c93a11eafa5300f64c939547cfbbe34ac664de293d2540b143f14d3117969e4a6dfc55d624cfae44fea
+EBUILD certbot-0.30.1-r1.ebuild 1262 BLAKE2B d2fd392ad43dcf2319140eac1bbedb551814cc20ede0d21a6817cecae422acbf22001de635089d3097219976bb963824645252365e72bba5c070372c2991f793 SHA512 f117d8a3441fb390f7908eb608df300f9e24301a87dede456d7d78f8bdc27bc1fe78c6c7c40937427661544a80a23c11d6d98c83eb8ceacb3fd9e9894140c580
+EBUILD certbot-0.31.0.ebuild 1266 BLAKE2B 69d4a9b53f5d36c9d01e1ffce38f91267ea097d58c346c041c4c71fbe220e17a80d3493de919afc1c277bff0cb05d7a88157a67fc775b851e99085d3ab193746 SHA512 2dfdce6eb12914f93d2d0e2e7193a5828dc30391b2efc9eaee1f606c9afb36fec583b6ddb73ffc5279ed6a14660628615175023aebd15f6daec1e3f3b1c68f80
 EBUILD certbot-9999.ebuild 1264 BLAKE2B 87d7d0de1448b779c4e44b28ff1dda3fa2441b0779b1a00a2d3efe6db1b9489b595cb3f4c31989e2cdcb3c0cd9c1ad47058e6530365107dbc3d2b85f108e803f SHA512 687528fcff2f41b4923edae2f5ce30daf04fe5671f359a2b8e33fcfb840560bbab7514a61417b56b2e5171a251a8e5acc5a19cf2fd1e3adf5c356079897f0c6d
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.29.1.ebuild b/app-crypt/certbot/certbot-0.29.1.ebuild
deleted file mode 100644
index c4d5a2b84884..000000000000
--- a/app-crypt/certbot/certbot-0.29.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
-	dev-python/josepy[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	pytest -vv ${PN} || die
-}
diff --git a/app-crypt/certbot/certbot-0.30.1-r1.ebuild b/app-crypt/certbot/certbot-0.30.1-r1.ebuild
index 7dcb4fadad64..c4d5a2b84884 100644
--- a/app-crypt/certbot/certbot-0.30.1-r1.ebuild
+++ b/app-crypt/certbot/certbot-0.30.1-r1.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 ~arm64 ~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.31.0.ebuild
index 7dcb4fadad64..24ed55a9e6c8 100644
--- a/app-crypt/certbot/certbot-0.30.0.ebuild
+++ b/app-crypt/certbot/certbot-0.31.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
 	dev-python/josepy[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
diff --git a/app-crypt/cfssl/Manifest b/app-crypt/cfssl/Manifest
index ee728fdb267e..65ce28d81d04 100644
--- a/app-crypt/cfssl/Manifest
+++ b/app-crypt/cfssl/Manifest
@@ -1,3 +1,3 @@
 DIST cfssl-1.3.2.tar.gz 6867118 BLAKE2B 775b3419ecf878d9add13faf03a3e1d4cca7b30d965f1ca55c8faa5abf679188a1ea1f80c1416f19c85bc551395628a31da8669ca647e1c1e7a1a313d68f4c7b SHA512 aba27a282c8ca8e95769996aea7e5300b0c3f8fea7ae26484d19a7e1a0330f0b3a0649407062f1a10e8c93136693954e3b24c92456f69db3abee509f982ba554
-EBUILD cfssl-1.3.2.ebuild 754 BLAKE2B b7e10271d0901f3caf57b8549aa6f1d8c9ab5dec8061552f1dc51fa60d671ea8b309db06717dfc74867e61560e7243850e36b4d7ef13515ef78c72b84ec3b087 SHA512 878de06fbe027df328ec2af15bbf0b7a526ef03acd4e754028403b6d338d182d7711da861d4336a028d7192f744d176e5ee14b236a773efa9e0b69f5a4bdc916
+EBUILD cfssl-1.3.2.ebuild 750 BLAKE2B 68a9cb8b12c8f5accdd88c17dfbb061ba9213e5ba3e975ccc3b40bc69d6a16e8b4092462f45c84863e576a3586dca0d2d256b03a0fce8a4dc679f933a0645a76 SHA512 aefe6c912d5b40145a01bcdc273abacc1a93e5c76b12f26b0a04db13e6fccb9041939469fd98ed507adc5ca4ca84ecdf8833422643f87777331ddf27ca9448fe
 MISC metadata.xml 326 BLAKE2B 519dd19dc05c50ee2b35580a1ca47b6be4438fcd5737775b098f2bf7cebd7ec3ff88a3d5c9c27a256cedaaddac4b6eeb20f1dfb442d651a7ec31453c309c7c52 SHA512 11be8680812e220202583bd324d756909056b58b9fdc74c769bd1beacc97292c9dc0d7a396bc6018c77d050081654726dfc659b43efc957175d2e2fc57039ffa
diff --git a/app-crypt/cfssl/cfssl-1.3.2.ebuild b/app-crypt/cfssl/cfssl-1.3.2.ebuild
index 6b1f640b3abc..79ee3c130db1 100644
--- a/app-crypt/cfssl/cfssl-1.3.2.ebuild
+++ b/app-crypt/cfssl/cfssl-1.3.2.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
@@ -7,7 +7,7 @@ EGO_PN="github.com/cloudflare/${PN}"
 inherit golang-build golang-vcs-snapshot
 
 SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="Cloudflare's PKI and TLS toolkit"
 HOMEPAGE="https://github.com/cloudflare/cfssl"
diff --git a/app-crypt/dieharder/Manifest b/app-crypt/dieharder/Manifest
index 63945c55c8be..e79435669466 100644
--- a/app-crypt/dieharder/Manifest
+++ b/app-crypt/dieharder/Manifest
@@ -1,4 +1,6 @@
 AUX dieharder-3.31.1-build.patch 623 BLAKE2B a914f3b8f805725db9d30687b9265814661c9d00a5bc6246785eaab304e130dce417025153cd8b530ad0d3ed179583d865133c9bca3bee6ec2b427e78c1d527c SHA512 8d98efdcbfd4cea06d1cae1a1fbea1305e366c030c99b3abb944d1a47543e9b592304f60cd8dbfe9b3fa77ec9ee61c2537bf2390f072ced7d36ad7eb9550e4ea
+AUX dieharder-3.31.1-urandom-64bit.patch 2689 BLAKE2B 9c7d27bdfdf53b5884d9fcb32331231ce034bd4342e73822e8f6b224de6b44fb2b49fd7a0e86d5f5334d61bf231ca0a6f8cd2254fd28a74db5dd580e495c81e2 SHA512 2c99ab9df82fca20123ec3950032b9c6b6e8cd919ef06e0a7ac72818474b5147d68e195db5334fd9689580cc1d669b9893f3784ad645a69598b707537ae63851
 DIST dieharder-3.31.1.tgz 1149780 BLAKE2B 12937b54e713ce87d6cb815b9b1e00989085b7661538316649caea4a514518528039441d0d42f377c363c62db179f362feb9d64612a75f724ac363744f884a47 SHA512 e01ed4266b4fe5d5fadde3c92c30e430d0ca5f7fedd26b26ed2ab98b7602aa9c35bb5c8fd9314ef2f5235b5087645ab13e5e6550156e26643baa5aeb77088dc5
 EBUILD dieharder-3.31.1-r1.ebuild 925 BLAKE2B 48250e24e6a46d7c9700977dc8258b88fb7e0cb13396602b2b0ac1ca7815fc9cd3a34179191575e152ba35a9e05266a3b9bc4e644bd35016a4140af6b4c4184d SHA512 cf58af12c733a0270cef42542e65b4a61a6885edd84a80eb5b5b6b4d09d980be98ea488b7083897897c2841e042c80cf6099ad1a813c50bad94e2609e07a2081
+EBUILD dieharder-3.31.1-r2.ebuild 1032 BLAKE2B 61a90032f3a2b04291c854f9e972500581cae84d1b65c55a1c58d3c47470ea2e9f3566b0b2ec025eae394798f2513ff855c8f9f76c3460d877967d656bb88f49 SHA512 e4d5bfbe9f40b35f5a4a88f976ff46dd37b4b46c89822802703177c36a9abe8f2dfccc6e99a38129fe6faacc09d1f5c19bbb11c54e22564af357a29da2bed9b2
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/dieharder/dieharder-3.31.1-r2.ebuild b/app-crypt/dieharder/dieharder-3.31.1-r2.ebuild
new file mode 100644
index 000000000000..5a949f9d0350
--- /dev/null
+++ b/app-crypt/dieharder/dieharder-3.31.1-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="An advanced suite for testing the randomness of RNG's"
+HOMEPAGE="http://www.phy.duke.edu/~rgb/General/dieharder.php"
+SRC_URI="http://www.phy.duke.edu/~rgb/General/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+RESTRICT="test"
+
+RDEPEND="sci-libs/gsl"
+DEPEND="${RDEPEND}
+	doc? ( dev-tex/latex2html )"
+
+DOCS=(
+	NOTES
+)
+HTML_DOCS=()
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-urandom-64bit.patch"
+)
+
+pkg_setup() {
+	use doc && DOCS+=(
+		ChangeLog
+		manual/dieharder.pdf manual/dieharder.ps
+	)
+	use doc && HTML_DOCS+=(
+		dieharder.html
+	)
+}
+
+src_compile() {
+	emake -j1
+	use doc && emake -C manual
+}
+
+src_test() {
+	"${S}/dieharder/dieharder" -g 501 -a
+}
+
+src_install() {
+	default
+
+	docinto "dieharder"
+	dodoc dieharder/README dieharder/NOTES
+	docinto "libdieharder"
+	dodoc libdieharder/README libdieharder/NOTES
+}
diff --git a/app-crypt/dieharder/files/dieharder-3.31.1-urandom-64bit.patch b/app-crypt/dieharder/files/dieharder-3.31.1-urandom-64bit.patch
new file mode 100644
index 000000000000..c5615b673fd0
--- /dev/null
+++ b/app-crypt/dieharder/files/dieharder-3.31.1-urandom-64bit.patch
@@ -0,0 +1,87 @@
+diff -ru dieharder-3.31.1/libdieharder/rng_dev_arandom.c dieharder-3.31.1_fixed/libdieharder/rng_dev_arandom.c
+--- dieharder-3.31.1/libdieharder/rng_dev_arandom.c	2011-10-14 15:41:37.000000000 +0200
++++ dieharder-3.31.1_fixed/libdieharder/rng_dev_arandom.c	2014-01-03 22:51:30.010534418 +0100
+@@ -6,6 +6,7 @@
+  */
+ 
+ #include <dieharder/libdieharder.h>
++#include <stdint.h>
+ 
+ static unsigned long int dev_arandom_get (void *vstate);
+ static double dev_arandom_get_double (void *vstate);
+@@ -21,7 +22,7 @@
+ dev_arandom_get (void *vstate)
+ {
+   dev_arandom_state_t *state = (dev_arandom_state_t *) vstate;
+-  unsigned long int j;
++  uint32_t j;
+ 
+   if(state->fp != NULL) {
+     fread(&j,sizeof(j),1,state->fp);
+@@ -36,7 +37,7 @@
+ static double
+ dev_arandom_get_double (void *vstate)
+ {
+-  return dev_arandom_get (vstate) / (double) UINT_MAX;
++  return dev_arandom_get (vstate) / (double) UINT32_MAX;
+ }
+ 
+ static void
+diff -ru dieharder-3.31.1/libdieharder/rng_dev_random.c dieharder-3.31.1_fixed/libdieharder/rng_dev_random.c
+--- dieharder-3.31.1/libdieharder/rng_dev_random.c	2011-10-14 15:41:37.000000000 +0200
++++ dieharder-3.31.1_fixed/libdieharder/rng_dev_random.c	2014-01-03 22:50:57.852321485 +0100
+@@ -6,6 +6,7 @@
+  */
+ 
+ #include <dieharder/libdieharder.h>
++#include <stdint.h>
+ 
+ static unsigned long int dev_random_get (void *vstate);
+ static double dev_random_get_double (void *vstate);
+@@ -21,7 +22,7 @@
+ dev_random_get (void *vstate)
+ {
+   dev_random_state_t *state = (dev_random_state_t *) vstate;
+-  unsigned long int j;
++  uint32_t j;
+ 
+   if(state->fp != NULL) {
+     fread(&j,sizeof(j),1,state->fp);
+@@ -36,7 +37,7 @@
+ static double
+ dev_random_get_double (void *vstate)
+ {
+-  return dev_random_get (vstate) / (double) UINT_MAX;
++  return dev_random_get (vstate) / (double) UINT32_MAX;
+ }
+ 
+ static void
+diff -ru dieharder-3.31.1/libdieharder/rng_dev_urandom.c dieharder-3.31.1_fixed/libdieharder/rng_dev_urandom.c
+--- dieharder-3.31.1/libdieharder/rng_dev_urandom.c	2011-10-14 15:41:37.000000000 +0200
++++ dieharder-3.31.1_fixed/libdieharder/rng_dev_urandom.c	2014-01-03 23:06:24.124239582 +0100
+@@ -3,6 +3,7 @@
+  */
+ 
+ #include <dieharder/libdieharder.h>
++#include <stdint.h>
+ 
+ /*
+  * This is a wrapping of the /dev/random hardware rng
+@@ -21,7 +22,7 @@
+ dev_urandom_get (void *vstate)
+ {
+   dev_urandom_state_t *state = (dev_urandom_state_t *) vstate;
+-  unsigned long int j;
++  uint32_t j;
+ 
+   if(state->fp != NULL) {
+     fread(&j,sizeof(j),1,state->fp);
+@@ -36,7 +37,7 @@
+ static double
+ dev_urandom_get_double (void *vstate)
+ {
+-  return dev_urandom_get (vstate) / (double) UINT_MAX;
++  return dev_urandom_get (vstate) / (double) UINT32_MAX;
+ }
+ 
+ static void
diff --git a/app-crypt/easy-rsa/Manifest b/app-crypt/easy-rsa/Manifest
index 432775dc6bda..527e0c264f3c 100644
--- a/app-crypt/easy-rsa/Manifest
+++ b/app-crypt/easy-rsa/Manifest
@@ -1,6 +1,8 @@
 AUX 65easy-rsa 37 BLAKE2B 4a53c21a6027a9c5857d93e23703651b3d2642f54ce4519e727dd421230662f27f2ab45761041cf5b6b6cd654831d33297f1656eab26c496ee3e4f9d39f6ac3d SHA512 2f8c4f489ebd2ad2e5a0d45351361ecfc06a9481d9e15ea48215addb82ddf2083a85acb0a5c171d0c7e5406152d3679a5a7835e22ba9953e554614d94026d778
 DIST EasyRSA-3.0.4.tgz 37721 BLAKE2B 84d81eb86dfee42f6de935cbd308262d36626170880a24d260dd8ae708d6340feb63866cb1704c9209675112eef4a251399e19948e88067e90b410c00707a770 SHA512 0bc145e510891af022c05427436c3ec7a29fce9d83e022954acd0cc470c88c43f5549af0b6263b46e8dc5fd167621a118cba0c01a514c51032cea8f1efbb9787
 DIST easy-rsa-3.0.5.tar.gz 638366 BLAKE2B 990ef0cc7effd80d06d15dbb2dc3ef9a0a282a4adb501475fbd43c1b50bead374ba78ee9652e9c0f8d2e54354be4da6a0ae302e4ef2d576bd7fd981d59566d64 SHA512 9231ca7fda489a230d8418679d8824503ae680e2de6682d5f2d2fa716597f7df5980b7b88a3f6eb4fa0b7d9bbead59a1e2e4b8f4a5a36bda7f78ffa8f3c23d34
+DIST easy-rsa-3.0.6.tar.gz 663190 BLAKE2B 2c7f526c3ddddf13b4c6193bcd52bc992b9e81db28dec8cd9b5f44aba231eed18b6f25c64a42072a6409a5dd23db21fa8ccefc210ce924c68ad3a79475d2eaa1 SHA512 ce553b483ed2facab71d9bc212c4a454c6ed4a6489a0b963c4fc190916c71d048955e1e24d3e58a39438a51a83a02bf696bb2b9292c6ff665113043509062eb1
 EBUILD easy-rsa-3.0.4.ebuild 848 BLAKE2B 9f2f6974e21b91114185a3859d83e6d1274d8b02803fcf9ec949e8e27db807f2efd592f774ceeb0aeb41523f94080420a81a0126f3fa688aaef5637a4a07145b SHA512 3410d194d52040259e599093380d2ba443bc51258a6785505eb53326ebada4981938d533b202e79da67d794836d83aa161298227daedc67eb55ecd4be296d56e
 EBUILD easy-rsa-3.0.5.ebuild 819 BLAKE2B fc974df53e777c3fd4ea955db397bbafffd59ca982cf0dcb74c49ed3601757ec0952ccbce667d01aa7fca855cd0233391cb2d6576d3121ffa5887e5dce05f3df SHA512 1e8f1d0e31e9922206381920128aa9a4eec1c8e9468b23991605cf3efccea128d95e2029864df8f86f0ae7dffa5ba96309d518d627f51bf966010f12fdc71f85
+EBUILD easy-rsa-3.0.6.ebuild 822 BLAKE2B 588b8a4069147bb3aafa608f66c0baf42d06f219f4614604944da8c5aeb7d8b68958b7f4094d81d68025b9ab9995bb7b23ac496b598487b8da044c923971ace6 SHA512 ddab34c9b4552c149f4230f342fe8126416561fdd9f8430f97b23d8b54fa7e601fc2d97fe0cbcf9f4e169c70bade9a8c6d9e515e099108e46853e4c9b715fc48
 MISC metadata.xml 321 BLAKE2B 453742eb4f4eebfc23e6d9889fe78d2894c3f49bde81f56827c271dbf8281a2b6016205843a0aabd5ea574776785327a83b017389bcf41aeb5f5402c04e7a97b SHA512 e643d4681855376cdc17865fc1b4106a56861f7bc080ccf808a485594e3ca35fcfa72fcd2ad49af69275d569468c1684ebe784cb16e47cc528187bdeaba6a051
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
new file mode 100644
index 000000000000..f827f0cc84ee
--- /dev/null
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Small RSA key management package, based on OpenSSL"
+HOMEPAGE="https://openvpn.net/"
+SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="libressl"
+
+DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0 )
+	libressl? ( dev-libs/libressl )"
+RDEPEND="${DEPEND}
+	!<net-vpn/openvpn-2.3"
+
+src_install() {
+	exeinto /usr/share/easy-rsa
+	doexe easyrsa3/easyrsa
+	insinto /usr/share/easy-rsa
+	doins -r easyrsa3/{vars.example,openssl-easyrsa.cnf,x509-types}
+	dodoc README.quickstart.md ChangeLog
+	dodoc -r doc
+	doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
+}
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
index 78ec55e6ca29..75ff5c51d6e2 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -1,16 +1,10 @@
 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
+DIST keybase-3.0.0.tar.gz 47018995 BLAKE2B 73aaa00a94af707dc7e0713c4e0a5b2d7d7ae8a6ebd6fecae6bfdaf7c011b0d6cbea472940f718316aff45da4c4eccde73c15df6a77229bd09be704ebb949ca1 SHA512 40ddbd6fc5201bbca087490022b021e6abc201dc428327e8974953d0e5cd403324cebf1ace29a22126eee0d1e36f84e85d443a236a7271ccdd79605abfe6fa72
 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
-EBUILD keybase-2.9.0.ebuild 1305 BLAKE2B a7fdda95b324d7d65ca9d66c67d872059fa5734965bd24a0d4b40d86590a6d17a4809491490055141948040be0e199aac499e9af6fa6916e2aae48d7c94dcb12 SHA512 b3fd771e61c9ce8fb141253fce08762c2056916e4d7281e4bf27274c5c889632a34e9d69e1ced5439dd7ef97953d97c2a186c8652cb2ff57cdb1c4190713be16
+EBUILD keybase-3.0.0.ebuild 1306 BLAKE2B c6607f27d1433f6405e605cb66efcfd8198bc6c5de194748c2620609d11c22541128a96d16eb561a57015f586cc2219e0cd3070dd62b71c75f0dc71495433513 SHA512 54a92ee6235461d3c8ef8293d8334a9b89c94fffc71373cf95d25c47be6e8cf977f642b54e86a21a8e809f5cebd00afb6d7651baa080185b460f2680f18d414d
 EBUILD keybase-9999.ebuild 1268 BLAKE2B 7c57de5a44a42066ff20ace9720cbf1dbeb2b900794a94b82be66c4becbbfcc0148cd5038de6bb2f412b1dc86c4b23af336b81748e81fcf5069548c9cd9e26d3 SHA512 7b56be4322b630105f093853cb33afd2377b1df1b9ddb75e44579c64b76918940a0576aee4a39df55b49f0307b08144a3418a8835bb2cdcd0d3b868886ca0e3e
 MISC metadata.xml 465 BLAKE2B a1dcb592edbf2e5a45bd985adea8fa09504f75b17f689f38c415dff3efd0a4c67b3476c8c7568dc2b8351117281c94da4235cb1b9144d1636f04ae3b2055164e SHA512 68da266d0856035ec7f0b2ac5f8746ad6c7afa023ccf2d592be43fbf45f12f1443afdceb075ab57efeeceb97dfcc0a3997ed7177e12ae6291467e97c17e10810
diff --git a/app-crypt/keybase/keybase-2.6.0.ebuild b/app-crypt/keybase/keybase-2.6.0.ebuild
deleted file mode 100644
index af077ef41e52..000000000000
--- a/app-crypt/keybase/keybase-2.6.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build systemd
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	~app-crypt/kbfs-${PV}"
-RDEPEND="
-	app-crypt/gnupg"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	ln -vs "client-${PV}" "${P}" || die
-	mkdir -vp "${S}/src/github.com/keybase" || die
-	ln -vs "${S}" "${S}/src/github.com/keybase/client" || die
-}
-
-src_compile() {
-	EGO_PN="github.com/keybase/client/go/keybase" \
-		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase" \
-		golang-build_src_compile
-}
-
-src_test() {
-	EGO_PN="github.com/keybase/client/go/keybase" \
-		golang-build_src_test
-}
-
-src_install() {
-	dobin "${T}/keybase"
-	dobin "${S}/packaging/linux/run_keybase"
-	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
-	dodir "/opt/keybase"
-	insinto "/opt/keybase"
-	doins "${S}/packaging/linux/crypto_squirrel.txt"
-}
-
-pkg_postinst() {
-	elog "Start/Restart keybase: run_keybase"
-	elog "Run the service:       keybase service"
-	elog "Run the client:        keybase login"
-	ewarn "Note that the user keybasehelper is obsolete and can be removed"
-}
diff --git a/app-crypt/keybase/keybase-2.8.0.ebuild b/app-crypt/keybase/keybase-2.8.0.ebuild
deleted file mode 100644
index 07db7abdce2b..000000000000
--- a/app-crypt/keybase/keybase-2.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 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.8.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/keybase/keybase-2.9.0.ebuild b/app-crypt/keybase/keybase-2.9.0.ebuild
deleted file mode 100644
index 07db7abdce2b..000000000000
--- a/app-crypt/keybase/keybase-2.9.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 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.8.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/keybase/keybase-2.7.3.ebuild b/app-crypt/keybase/keybase-3.0.0.ebuild
index 0aa18c80d292..f2abdbb420ff 100644
--- a/app-crypt/keybase/keybase-2.7.3.ebuild
+++ b/app-crypt/keybase/keybase-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-	~app-crypt/kbfs-2.6.0"
+	~app-crypt/kbfs-2.11.0"
 RDEPEND="
 	app-crypt/gnupg"
 
diff --git a/app-crypt/moolticute/Manifest b/app-crypt/moolticute/Manifest
index 99138a5a0224..2c1ea26ac6f2 100644
--- a/app-crypt/moolticute/Manifest
+++ b/app-crypt/moolticute/Manifest
@@ -1,6 +1,8 @@
 AUX 50-mooltipass.rule 84 BLAKE2B 574568b60d33216a8de4a90866f2dd4a53d5369fb7e112c6125b8492e8cdaff51067dffe4e36e07fa24cf8a9aaaa77a388f3217ad039a51d7ba0781239020a43 SHA512 26f8a9f2c5fb2f3a87a486f91d5fae7069955dc528eacb8a37a833d393be38b70e3a9784024287cdfeb93a90abad83400395bb803e82a091100bd44cb7b2c28d
 AUX moolticuted.init 309 BLAKE2B 1f967b7e497e7e2d5547baf3e1b18127590997d8221ed34da1b4b4b2843bb1590fbb0c4153cb89d7f68b4fc0852e66f38879362fdd482414e4b6ba6862f06e30 SHA512 bbb80cf14d3adf744538f03513b461eb8bd2b633ef314f9e935e919f288f629aa8d84ff856e3aa104a2933e16143fbdbff90d9df8651473c39907f5aff580ed0
 DIST moolticute-0.30.1.tar.gz 5562456 BLAKE2B 104f4bd10edf4147d205fec69ec48eddf31150f898242819be25b83fa5f8ddcd51fd016aa2331b9b94fc8c60062745f0d06e5f0b4a30222c1cc44d54eccd6521 SHA512 463b549fbcdbdff3da51a0b781e7ff2c4ca33ebd22ff355b24f13db3c77b3f3fe38d3d97ff260829517d5d93c43b7d746ff58e3fca3d838f7e32de7066c5288a
+DIST moolticute-0.30.8.tar.gz 5587730 BLAKE2B a8ef141d7b8ed4d79a43652760626c4b608d7c92270a4d7f384bd240a5f90d6264d2714f3513acaa86f22135a1c885d6f713252ef69794e301a1b658aa1c47a3 SHA512 e5f848252d1deabfa8767284c2c34329a98f5849f8b2bdc62d454cc0e331d58fcd78e0845683931460c20be13d2f1baf3aee32a9f3244e769d5d4c222e182706
 EBUILD moolticute-0.30.1.ebuild 1238 BLAKE2B 096d598a023077e72c94bfe46340876bd0ef7a90a32c33dc78432c05bb5d07be44cde00dc32e264095b28c76d79b3176edc60aad0a79abefb92de546a08bf2a0 SHA512 cedbceb5b01d35e6d4f06f6fb9b1644750ea03c91b3dc0dd8bfb8e4fdaca1a822b2ff613c2d9f2beb704014e8c2c82e05e192eb66b30ddd95664b8394f50e46b
-EBUILD moolticute-9999.ebuild 1241 BLAKE2B d12fb1de10aead21f1c5a6fc7faf3719b05d3bac598d681bf8529c2bea92a904c10cca4b46314ddc01f3cbc531cd2dd288d242425106c84229e12daef03fa084 SHA512 02e813bc70f79954b3b54aa6aae08d6a4158db83ae03aa6c9926248da80ed4aae9b497d26bbb70d9061e886f4d3b7d64cefe49524a8cd1612af7313b7aa6b4bd
+EBUILD moolticute-0.30.8.ebuild 1242 BLAKE2B f52f229deb940d549f4ad402337a8a7b106ddc2127a03e4c606c468fae0bbfda3feef77240ba04ea64e874f68ffd6244f407ade3d35aecb64299c1be843f7713 SHA512 cdbbb1bd735ca5ed3af6b3153055a1f023776ee3b699c04d356c7f2b47e44172da67137644373da53d9a12acfe2471f3bcc217d14cc1b376648e5abae1649134
+EBUILD moolticute-9999.ebuild 1242 BLAKE2B f52f229deb940d549f4ad402337a8a7b106ddc2127a03e4c606c468fae0bbfda3feef77240ba04ea64e874f68ffd6244f407ade3d35aecb64299c1be843f7713 SHA512 cdbbb1bd735ca5ed3af6b3153055a1f023776ee3b699c04d356c7f2b47e44172da67137644373da53d9a12acfe2471f3bcc217d14cc1b376648e5abae1649134
 MISC metadata.xml 530 BLAKE2B ab8901536d9ea0b2841cc0cb604cb7e0eab2765079d1964e561bcc61d10ba780cbce831eec8532cc5ed6866df98d0580ff9294ff10d571910bb67d10f065947c SHA512 8551a8d709f3a2fd054a948839518383d3d8f7187b507bcc275d5daa601e53fe1cc1cf3eb7c13c61f6318055964a0a1afba525726e65cd1e3f025b0266997d0e
diff --git a/app-crypt/moolticute/moolticute-0.30.8.ebuild b/app-crypt/moolticute/moolticute-0.30.8.ebuild
new file mode 100644
index 000000000000..efd4c37a4de9
--- /dev/null
+++ b/app-crypt/moolticute/moolticute-0.30.8.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mooltipass/moolticute.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/mooltipass/moolticute/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+inherit gnome2-utils qmake-utils udev
+
+DESCRIPTION="Mooltipass crossplatform daemon/tools"
+HOMEPAGE="https://github.com/mooltipass/moolticute"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/libusb-1.0.20
+	dev-qt/qtdbus:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qttest:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	default
+
+	# Fill version.h with package version
+	if [[ ${PV} != 9999* ]]; then
+		sed -i "s/\"git\"/\"v${PV/_/-}\"/" src/version.h || die
+	fi
+}
+
+src_configure() {
+	eqmake5 PREFIX="/usr" Moolticute.pro
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	udev_dorules "${FILESDIR}/50-mooltipass.rule"
+	newinitd "${FILESDIR}/moolticuted.init" moolticuted
+}
+
+pkg_postinst() {
+	udev_reload
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-crypt/moolticute/moolticute-9999.ebuild b/app-crypt/moolticute/moolticute-9999.ebuild
index da3da6c6597f..efd4c37a4de9 100644
--- a/app-crypt/moolticute/moolticute-9999.ebuild
+++ b/app-crypt/moolticute/moolticute-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
@@ -6,7 +6,6 @@ EAPI=6
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mooltipass/moolticute.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/mooltipass/moolticute/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
@@ -23,6 +22,7 @@ IUSE=""
 
 RDEPEND="
 	>=dev-libs/libusb-1.0.20
+	dev-qt/qtdbus:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest
index ecc25962e01f..8838181a1c1f 100644
--- a/app-crypt/nitrocli/Manifest
+++ b/app-crypt/nitrocli/Manifest
@@ -9,12 +9,14 @@ DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e409
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
 DIST libc-0.2.45.crate 349425 BLAKE2B ded7a699266fb8c8003181dbbb0a8ed9fb27613951b72d538e05bf1d262810dac7edb47560d06989d0d24a9cfac18f22744efed44d12452fa41ba68cb4b8e4cc SHA512 8188400f2f9fabd7c1e0dd1172032eb25bde2702019aec4e3e0c8b936209347baea347ff8d85fee3e93031df0741d32faed151c2b553151e95ae8321bb653381
+DIST libc-0.2.47.crate 351491 BLAKE2B 10ff90405b911c40478793cadc9a1962e14eb4d7b4ff758554a225bb87340989bbd6089441eaa2638db93782de7d0faba20f77a7e3569a52cec40ba55eb56c06 SHA512 f0eddcbe456b1ee2da22963585ff689ad44f0f8d70af33d9bec41a1ec5a1b3dee26fbeaa29786792cd44d020fc56461b44bbb2da962662377552fa562b2694f6
 DIST memchr-2.1.2.crate 19520 BLAKE2B 4a8409fa4e019ab5cdbfc2787eeebacbbcfd21415d1ea6a3796ef18434ddfad0f63f6df3027eea5d286e08eda892e21cae66e3f25ffee9d6a2a3327b841e5377 SHA512 ba3bad3b911fdd767b6c770209e93dfc367c6228117a5d85bfa95d70ec66df9842f3cf788ac560d1255415dba49028187542000b9a71fbe79ec51a386afda38f
-DIST nitrocli-0.2.1.crate 45957 BLAKE2B 0908dc34ee3ed65ea6221a0fd7ff7231c8a2cb64c5643a8ad0fa4b785d6d974c0528f81448412ae93f7d05f9f66fec794e71e686576b4b3f7298e96fd852087d SHA512 a13e8cf8bd471e1c9b71ec1714ae591ffc07df3588b3902250eef1e15ae53ff97b3ef965c8cd56ee63e5d82c5cefdb4c143181eb33329e3cab01bf71f1ece8d7
 DIST nitrocli-0.2.2.crate 53443 BLAKE2B b4385b6031f99719dbfde97248df07975d008b2d57fb2c6597e935b0f1d5f338ba4284988a9eb1a1b8b3d07db9b1b0f638acc30a0e6599f7ed09cf7c33211994 SHA512 76aa5e20afb7627730dbf45c6686f1b2ab7d9c6a2121a6c5827c563f4f3f5b8a293729d63cc2b17a7373bc246fd70e73f63e990c95cad7089864611148a50ea1
-DIST nitrokey-0.2.3.crate 21180 BLAKE2B ece6df9f4d755d9aa3d8f332ba6505e3a0c3b2d0136d376987aaa8beb5b39197a0d9b28341af53a08b9996c612af9b6957fd55ccbab156439920fbd7e97ec505 SHA512 b267526a0a81612d9671d53927b2478c2817d9347a2ce8cce7cfde4e0983434083d748c065b995047c19ebec72a26b1ee1b7e9351ae6d34f3ada91fbb3a316d9
+DIST nitrocli-0.2.3.crate 60731 BLAKE2B 52e8a13179ef0391698b87e0172b4beae902c7586b48718538e55f2497a1d31dd645224041a81c8311512a905cd574f34f817b66b2b2f469c1a278437a6cba93 SHA512 e3467dedecc27dbe8b818c63bce9e29d22bf65af03ff53c4f85f1c3730f4b55a359dfe210875efdc8bee7e05147e066ca963d9a5ff1b68b5fc258c8a7d4d82e0
 DIST nitrokey-0.3.1.crate 24023 BLAKE2B e12a8f1a8f2366714ed762093260a001ea2d5efadd0624e5d7b710a5a3ae8bc0012fe6098c69873ca63703e6fe64cb1d9ec400be51fb0b096821769358129e61 SHA512 343f82ad6e643c7353ba5acb2eeb1cd70b4f678f579a7a14ebe5c68fd868bd03447c917495b7fe5e44c4476ca5b40754a58083ab605436c6262ff0699104e4b4
+DIST nitrokey-0.3.4.crate 27462 BLAKE2B 07412e0d3d98a0fcaa54be3d494b107a0a4d999da41dc39f8710a5eb845911d175ca15918e212a1025a34e3ddfff89b5ca4a138d66effd47b639afcb19572ca4 SHA512 abb43ca94b7d4ba55cfabce56b712c99bc4e50671149ae2001de77c2cfae25f17465130729a4a856005a692b846c67b54b2992e41b708e8ad94a8c3af0843e20
 DIST nitrokey-sys-3.4.1.crate 61726 BLAKE2B 98a1cfa696434372d980ff5f645de77479e2e7977334df805d67d970df262e19c11c5880343c5bfc1a1b2abe7d29a34762bd90ad926c7cf7ba486e0b513c84fa SHA512 cc9cfbbebbad8a5c5846c60ad4125c87a64624ee90302327b03a94b1494d2329e45bbb09d58a3a00d465b23915faff3d3d787f64c0edcce6c63f25ab7830af13
+DIST nitrokey-sys-3.4.3.crate 61875 BLAKE2B 8c2abf91a40f54907f225c21df9d1e40ac22022a3b8229a8bd6c7a5cb8f87df74675ed5eadf6441bc81025e0cf3ebb21d8301004fe1fc76799e11568317bbf0e SHA512 ae69bc8d3fd0a58224ecfaacd159fbab4f7686daaecd96480a6c824ffbd22a8d2c948c5b2c803fa20ae41adfd4334c6462335f5d02dd7acbae0ab19b33cf0a3b
 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
@@ -23,8 +25,10 @@ DIST rand_chacha-0.1.0.crate 11637 BLAKE2B 423f7e835d9c69f49f991ef2ad00c40c8af92
 DIST rand_core-0.3.0.crate 20581 BLAKE2B fe46ab0ef5fe8f5f5695906336683350abd7aca246a537e2e4bc9fcf10686d39aaac259584f17c022200ec1139e01e817f71caf33933ad3f353baa10e6cd11ab SHA512 a476510ef936571e3351f42e0f1c615530732b7c66f41975fef10dc6b8f4d8536a6d8166bb90d6da2bb997108ee3e87f4d80884264b239680e6ffd3494dcb748
 DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
 DIST rand_isaac-0.1.0.crate 16011 BLAKE2B 84cd447debff595683ceb97ae2b03cb31ca6e342769dc1ccfca0a20e5bc8474ca3c40cce4bfc3be59b2bc0c849b74848f8916a2bfcf9bf7c0d54b2e8b5ae3c67 SHA512 addd5b4fb2bfdafec8b3d50f607099ce8d9fd7c5cb5cfcd6603368e5022dda7562e2deb2efcf4d5f3304f248629160f906554ed40a0d7cbb19c4b807a36dc74e
+DIST rand_os-0.1.1.crate 18553 BLAKE2B 5b74bbce5ee3f20f7c92204c4b60f9450b3a19518356c70737c8dad9873da775c90b8786bc75f0fa166388f6bfc585240c56445a39603704df5e99a4c505e17a SHA512 a7ccc054fd4a60e868520af3fc15e6eb22e62411975923e4d968a4825a48cbf87238338cbf1336792d996da5cc2183ac465a6bf8094358f0e5fc56380ce16193
 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 rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 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
@@ -39,6 +43,6 @@ DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2a
 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.2.1.ebuild 1075 BLAKE2B e6a76c66202678c8d652a35220a9f71b6cdd95648535ccaf5dd270ee8885157aecf02d8d7ca9430adecc040a81c4aa83bb13c92cb98268858dfc743bb285d33f SHA512 393aa066d0508bdfe7c979198f269946e9f2ad506c85061131fac6b102317d6a4a6147e105d7795c8977712bd8e3a1b307746fb85d20a0a9ccf257d1f88a83a0
 EBUILD nitrocli-0.2.2.ebuild 1536 BLAKE2B f435c1a84cb4ec0e0cfb8ff8e467fd1995f6939180cb4a9161c1f0b73ac01949d67480d11c96830e5171fec0b920f9c1ea1eed1fda2e5aee4e92be90f0e51754 SHA512 3c36f03822e07998c679dafbb7a62ea33ea72db38480e8645713fde4dbb8dc74c69abe5121a6f3a0b31b79491b6b80e26a251000a37cf61c0a5acb98fb7eb6d7
+EBUILD nitrocli-0.2.3.ebuild 1408 BLAKE2B d6113a8177db6595c3771bcf3f0f3759e6c3ce3e4997d7031d4adde9498ffc6fb2524925fa88ba79a3a9e915aac34b8597333a6338867f257c858f2f20e2fce8 SHA512 522a14916286f8b94caec21daacaafd46d3936273157704db57b9a56094232ba4d0c186ccb368adeea1bafb525e18c3c004c31f82e59aa012b31978572826ccb
 MISC metadata.xml 683 BLAKE2B a973761f8df97168483a0adc13bf44f088f13fb9c472986cffed08d53f69cdbc27a4bc195babcd86796853968c8face6c00004e060086b2ba4d09c52ce978815 SHA512 3f4615ba5af13e358c1c3a4b28c3dbec77c0b99af4692c0b2feedb4f21a1e5f8f76cb7fbd2cdaa5a8c899d340094b8029a6967dd68d591586bef551f8eb61b1f
diff --git a/app-crypt/nitrocli/nitrocli-0.2.1.ebuild b/app-crypt/nitrocli/nitrocli-0.2.3.ebuild
index 79fae8b75f55..e5ac6ddbfe68 100644
--- a/app-crypt/nitrocli/nitrocli-0.2.1.ebuild
+++ b/app-crypt/nitrocli/nitrocli-0.2.3.ebuild
@@ -4,27 +4,35 @@
 EAPI=7
 
 CRATES="
+aho-corasick-0.6.9
 argparse-0.2.2
+base32-0.4.0
 bitflags-1.0.4
 cc-1.0.28
+cfg-if-0.1.6
 cloudabi-0.0.3
 fuchsia-zircon-0.3.3
 fuchsia-zircon-sys-0.3.3
-libc-0.2.45
-nitrocli-0.2.1
-nitrokey-0.2.3
-nitrokey-sys-3.4.1
-rand-0.6.1
-rand_chacha-0.1.0
+lazy_static-1.2.0
+libc-0.2.47
+memchr-2.1.2
+nitrocli-0.2.3
+nitrokey-0.3.4
+nitrokey-sys-3.4.3
+nitrokey-test-0.1.1
+proc-macro2-0.4.24
+quote-0.6.10
 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
-rustc_version-0.2.3
-rustc_version-0.2.3
-semver-0.9.0
-semver-parser-0.7.0
+rand_os-0.1.1
+rdrand-0.4.0
+regex-1.1.0
+regex-syntax-0.6.4
+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
@@ -33,13 +41,13 @@ winapi-x86_64-pc-windows-gnu-0.4.0
 inherit cargo
 
 DESCRIPTION="A command line application for interacting with Nitrokey devices"
-HOMEPAGE="https://github.com/d-e-s-o/nitrocli"
+HOMEPAGE="https://github.com/d-e-s-o/nitrocli/tree/master/nitrocli"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
+IUSE=""
 
 BDEPEND="
 	>=dev-lang/rust-1.31.0
@@ -53,11 +61,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_src_install --path=.
 
 	einstalldocs
-	doman "${S}/doc/nitrocli.1"
+	doman "doc/nitrocli.1"
 }
diff --git a/app-crypt/pgpdump/Manifest b/app-crypt/pgpdump/Manifest
index e77204791e51..aab7feb8d5b3 100644
--- a/app-crypt/pgpdump/Manifest
+++ b/app-crypt/pgpdump/Manifest
@@ -5,5 +5,5 @@ DIST pgpdump-0.32.tar.gz 65444 BLAKE2B baa7d9077799f6295adf2927933f1ccb466dd7afe
 DIST pgpdump-0.33.tar.gz 65730 BLAKE2B 9941f55a070c219b1b6096939f1a8d775d85c8de60154f2ca93709b489605c8c3937bb4e250390fc71d152bf23c5a22f37226a64ff57036268cf49d793c215bd SHA512 976e2c185c9d72302c9c020dde1d2872b01fd9c2195be0d43441a03c3c6a4a70636f8ac2b35e3fde30e45ecc7fc1c23d7c92dcbd90fc503bbcdef73e3483e9c7
 EBUILD pgpdump-0.30.ebuild 552 BLAKE2B 7d1941dff7af58734a07664c8cb2ea84187ec8faaadee8a83118a5ecb1b552941858fcf1c6cbb5df83730ea481af2d37ab3189fa751030457874498bcd705cf2 SHA512 4d06ab2adcead278d58d1a9366919e83d57b32b98c89a2eee4bd667c8853f3ff7289be99c225179781cfb4d0e92823d7f2af41f5eb93f9ef1e3183efccfcf279
 EBUILD pgpdump-0.32.ebuild 528 BLAKE2B 77bc198cde30232d9d4b37928449b704857778f1b54dfc2bd4c23733afc05f19c7229f6a431ce0ac761e71a69d772575c316bc4ca8fbb49d298db85f96b1375b SHA512 f99dfcc371d372dc6cfa9613c4f40336dfaeacd08851f0302bed6d5f91814dc35e31d4a3ce0cf273c3e4a8781cb02aff907d31861f863a0c5f5d9e2dfa5126a9
-EBUILD pgpdump-0.33.ebuild 523 BLAKE2B fe7710582822ece84c4a828479bf47a76658833b62999c5175f76c84de7f475fd46c3c6e99696108590b5cad1da56bfb6b8e1413fa13db8b8659fa41632b9f4d SHA512 1c1398255e2a763749bb8fcfe2194aa3c15282eb8ca13e75c324c9a34f87a1b79ada228bec5f6417ba82eb7b6a61da4880930a378737ade2c0f335c46272b521
+EBUILD pgpdump-0.33.ebuild 521 BLAKE2B cf940a9ba6411da14309a0a511a402373f68a8ef9b7b0b1325eb363442995865b44f27ac39b2605cc69711e3b0819e2c6f361248318f28617e9f2217890ed226 SHA512 693c7a719913491f7cbe0104e053e6afc1a843808817dec08682a84924d900cdae7be56aaecdcd02b5cdb7935aafbf386bbd59e1e9b7104f5ef41b67579207ee
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/app-crypt/pgpdump/pgpdump-0.33.ebuild b/app-crypt/pgpdump/pgpdump-0.33.ebuild
index 8ff83e09376f..6a23e5364f66 100644
--- a/app-crypt/pgpdump/pgpdump-0.33.ebuild
+++ b/app-crypt/pgpdump/pgpdump-0.33.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.mew.org/~kazu/proj/pgpdump/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ppc sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 DEPEND="sys-libs/zlib
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index 8bb450c277f9..dde5100f8181 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -10,5 +10,5 @@ DIST VeraCrypt_1.23.tar.gz 24941166 BLAKE2B f9760342678f771192434f88a9b6c3bcc348
 EBUILD veracrypt-1.19.ebuild 1988 BLAKE2B 20e3a4725dc5b8d319a11cb44d5865afcdcc6f956ff8c3390ed225f605e01b01537db1af5aa1c82deb7c236b27eea69cbc0c29b2f2f4b770fae4514360c45a2d SHA512 b9829bad13c5ba781d9ec2e8353ed72f30a23459d3e9eaa7384a5718be051f1eeff70c3c097225c8f557c57634d7b14b5db83bb189671630c673568667e67da0
 EBUILD veracrypt-1.21.ebuild 1921 BLAKE2B 1adf1a612afa33dc2cdbed7f0bc971e84e3ec45236ee6d7d7bf317c00a6b03a57eda5b30c85f8aeb4684abbd9879b9dab40b9dc2ceb6cffe36946a74ba1544dd SHA512 1766b6db76015cc6fb6f147a8ba1f75795b7038d402c38129c60cbdb09831dd0aed2241d4ec9d403cffa8dfe38f3481085c64ae653a49362be39c08f462de1dc
 EBUILD veracrypt-1.22.ebuild 2065 BLAKE2B 98dcdbe443fae6ad4a4fa0e6086fe4c171ada85fc69f3fc9bb79d61cb512dc5f8ed6339cff5b2705a35ed7d74449bebf04dba626e63d26fb7530dbf4a9566aeb SHA512 169f927f0745dc1e6d0d6c2c6f9c25f93240b09301cb6f318a28decb4f367b35e035f5eff57d2e9902e4e8bd9a496246e580b3c2d5d57380d1aada9cc1c24ada
-EBUILD veracrypt-1.23.ebuild 2191 BLAKE2B d1c876f5d8865bf1c697d47e47e8f60b139eed54ae3a3c9700b4b596a17c7f3f6c3885790763afefd7db5425b3afec8adc715c867c50852394047f0ab7dfccdb SHA512 e51d9083a5d5f1102b167c74d3e38bf384a7cec58fdfd1905a8690a4c8c538104f19608213901f643ec56660f899c0dfe85776d151432570f6f2d47aee3bf3fe
+EBUILD veracrypt-1.23.ebuild 2190 BLAKE2B a0130f46bda8cb06bab364f9f15214d77270c0b8e7806a81768c29dd511b9473c1783220024ff09007f3831aabb1127181f0815d1f02973e744e67da30870040 SHA512 199b1a0a34a4dc06aa27e77809d74bab09e7eaeeb63cb924504437f96c496b45678bd7c6b5133302ac55a244a3bd586ffc2f88c037db850a62d49bae1891c74b
 MISC metadata.xml 516 BLAKE2B 280399666a147f475b2a8558bb3cb47c69ea4f4ba9894ae7d61757e26262f9f618007d9a07ce41eff5e9de17559b56b173a04f6f0c81618f932249bf2794fd62 SHA512 093ddf9483158c1756586e918dcc171e3bd7ef078ef28613517e4b04017c3cff8d3ad2ca7fa44027395602ad8427314356c742c23d03083240d6446b704d87d7
diff --git a/app-crypt/veracrypt/veracrypt-1.23.ebuild b/app-crypt/veracrypt/veracrypt-1.23.ebuild
index 901f21f7cf59..db93962241d0 100644
--- a/app-crypt/veracrypt/veracrypt-1.23.ebuild
+++ b/app-crypt/veracrypt/veracrypt-1.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz"
 
 LICENSE="Apache-2.0 truecrypt-3.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
 RESTRICT="bindist mirror"
 
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index 5b3ee4217989..0e5e75b8d810 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,9 +1,7 @@
-DIST yubikey-manager-qt-0.4.0.tar.gz 183566 BLAKE2B 2364d0d257ab5c05d0555aba4bb01ee1639a2c3a42b47173ae905945a6265b123985ad7d8fe50b0cfd38a1a0a588f3e1424aa46585ddbf50337ce2456899067e SHA512 12cef9636f06a92fdb3fce7cea5b97af3255b9cdd1b4feb4e184999eb77c17e465db927f56cd0e443a8ce8afc27b7e4be19ed07da7c41259f909ac4e98971de2
-DIST yubikey-manager-qt-0.5.1.tar 655360 BLAKE2B 6b109190750bd9675e32c836831a7e0ea286021303deffc64a351f2a127f5a5ee0190e3ca99abf0407bbb34a1a1c454f453fab464de2726f6cae539d5f865da1 SHA512 a8ceab5fd8d20eca2424d3f9a92ad12066e8fc26a7640df478965e5d9e2896fbc64885b26f599fcb2588f5b64d2f046af373f87e23ef266178ddf877e422ed36
 DIST yubikey-manager-qt-0.5.2.tar.gz 337194 BLAKE2B d6020116b9082671c039b521bbeebe7c1f0be022e233abbf8d6d788ea94e69e5f88aa3d6ec26a7b2edffa698327bb049e83ce54db2e0ba2ed1ad1dd536ab0961 SHA512 29265a10ae1dfe14dfdf4f1ba225516bf3bcbeb0115ca81696a4c5c506e957d6a99b0bb11a608e3175df99b8c04e8ae9250d5d42aab2b44b633d18fd2fc4c227
 DIST yubikey-manager-qt-1.0.0.tar.gz 8038084 BLAKE2B 9e1082be62dab2d43bfad3050dd38dbcd10e5b8761bf567ba4f3e1b4627a25709cfa29ac7a23560fff76e0a75b4668932a407268c8d90d791c381ad485fea029 SHA512 2cf5f70b2734a7c0346649f5419dbee39bef9bb80bb498631d4879abc48d422d70468713a48945e284f2bdef20f3bb570a0ac5a4daab6c1ff195d86e39168843
-EBUILD yubikey-manager-qt-0.4.0-r2.ebuild 1211 BLAKE2B 50e1f5f13343fd19b9b871f3c15a62bdbdeebddc9721d9aa7ac81de7c3312811d7cec0985e1063fdfa9d13b542cb03e0eace12c01d40c248df04c940fb2cb2d0 SHA512 d0511a033597c2e901736aa73b6b840fec03adabdda384a026ad4047be0d5ad0a3373ea2519b62e91efb0d864129d5d14a571a351ffc03477b899349985da64c
-EBUILD yubikey-manager-qt-0.5.1.ebuild 1445 BLAKE2B b11dd07d657c4e61f284d733ddcc71a3a2a0860a39b0a8d6ae9f3895cda38922dacb3816cd4464c91664f456e8edaf2b06175a07b1c8ad0d68cc2a616f00c881 SHA512 6beafa82aa84056534d0a99dac7438da46f7d9fd3328b220c39fed6da7da6c24239c8d2e68c48a994d6b691d4fc7ea832fae953243b6138df078ae16e0d226d2
+DIST yubikey-manager-qt-1.1.0.tar.gz 10893455 BLAKE2B d83f76b83f35380377beb0e5c5b4a605049211685ff3ec44f60c909f8bc8f60dcd0868ad666bebce13e7c0459f604dd5d77cb1bd01035fe8584c019aacca39e8 SHA512 b54f1e6908b190ccb9273b906ace9ce2e1d189b794ba9b0ae00dbda4808b3f376b37c5f010ae06eaa63515af9b48698499f87780c59394f8b80f35d64d599c59
 EBUILD yubikey-manager-qt-0.5.2.ebuild 1410 BLAKE2B 7da065e45b89bc70d7e3a577f9312bd6a955ad071fbc066c7401773fa9defe49aed871c3e4db7b6931309eff67a5a470014459a09c78568c159a582b9ae85d6c SHA512 d18d8da49e4080a2f84ac3ea1c800002d40eae7a584f35a430f3571a65b1e792b4e0f9275065dd392332d94998cd59c50183bf25bcfa310c3340adbb584c2376
-EBUILD yubikey-manager-qt-1.0.0-r2.ebuild 1426 BLAKE2B 9efa68f825fc6632b77803d50f5c620d53acf7e7362909571d89ad5a16bcfccd7dfaa68e77c032cd0145eaed2e2ab33cde4eb53baeca4808597d1349f0d21098 SHA512 54d6f4ae81cc13e844d48470a93e267b40158f85a8c6e6d621d7551e718d87cb83db1391ffd0ef1fcd1995f02a7cfb90617b2dec491c77771ebff55470f251f9
+EBUILD yubikey-manager-qt-1.0.0-r3.ebuild 1478 BLAKE2B d2b6273e43c6e0361700f0eacd838ab4c46b8d7db99d368787d06b7bf43dd07841d33fcc27b4a19b07990b89d7c74c7647ac64e596110f9c33fe18fc463b75e5 SHA512 c16c40c10d98c491214dfe46678b08488041a3a26d8e155edc4749a8c66d36d4e3f84bbe693e858c10eee676c6b98c0789520de75e306d0827d1a0ca61adab4a
+EBUILD yubikey-manager-qt-1.1.0.ebuild 1369 BLAKE2B fe38abf93e1d1b2ff89714bc7d207631ed547332ff1d9d19ea748d4d91cfbf09066355491c19115a11e536823fdcc05b53e1815f755af6845262d5497f1560cc SHA512 8c921e8773daa11054c69427d4a52660c5925cc02051d611afdd460d77585be06c0b366935297d38e997b87887fc70b26f53ab61ce8d6de215926ac1393b9aca
 MISC metadata.xml 371 BLAKE2B 1081e69aeb641c9d7de472bed98dfb336bc37e5374becbec4603316176419dcdb337f29b355b3395b778d250a99e32b181b84b42d4b7c10dedce7c47a6a187f6 SHA512 ed480648e967bfa3d95f71a5131963290e4265c487a345b69e34ad23c4ab18d82b08cd1e4a12f389533cc9690163fed90c05d471375fadd074c99a235105e837
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.4.0-r2.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.4.0-r2.ebuild
deleted file mode 100644
index dbd42b543c6d..000000000000
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.4.0-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit eutils qmake-utils python-single-r1 vcs-snapshot
-
-DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
-SRC_URI="https://github.com/Yubico/yubikey-manager-qt/archive/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=app-crypt/yubikey-manager-0.5.0[${PYTHON_USEDEP}]
-	dev-python/pyotherside[${PYTHON_USEDEP}]
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtdeclarative:5
-	dev-qt/qtquickcontrols:5[widgets]
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	rm -rf vendor ykman-gui/vendor || die
-	sed -i -e "s/ykman-cli//" ${PN}.pro || die
-	sed -e "/qtsingleapplication.pri/d" \
-		-e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
-		-i ykman-gui/ykman-gui.pro || die
-	echo "${PV}" > VERSION || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-	domenu resources/ykman-gui.desktop
-	doicon -s 128 resources/icons/ykman.png
-}
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r2.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r3.ebuild
index 08961842de99..c2fe40e47628 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r2.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ KEYWORDS="~amd64"
 
 DEPEND="
 	>=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
+	<app-crypt/yubikey-manager-2.0.0[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/pyotherside[${PYTHON_USEDEP}]
 	dev-qt/qtsingleapplication[qt5(+),X]
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.1.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.0.ebuild
index b9627b57544b..54eda43c3b07 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.1.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.0.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
@@ -9,33 +9,35 @@ inherit eutils qmake-utils python-single-r1
 
 DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
 HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
-# >yubikey-manager-qt-0.5.1 should have the tarball issue fixed: https://github.com/Yubico/yubikey-manager-qt/issues/49
-SRC_URI="https://github.com/Yubico/yubikey-manager-qt/releases/download/${P}/${P}.tar.gz -> ${P}.tar"
+SRC_URI="https://github.com/Yubico/${PN}/archive/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
 DEPEND="
-	>=app-crypt/yubikey-manager-0.7.0[${PYTHON_USEDEP}]
-	<app-crypt/yubikey-manager-0.8
+	>=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
+	<app-crypt/yubikey-manager-3.0.0[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/pyotherside[${PYTHON_USEDEP}]
-	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtcore:5
 	dev-qt/qtdeclarative:5
-	dev-qt/qtsvg:5
+	dev-qt/qtgraphicaleffects:5
+	dev-qt/qtgui:5
 	dev-qt/qtquickcontrols:5[widgets]
+	dev-qt/qtquickcontrols2:5[widgets]
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}/${PN}-${P}"
 
 src_prepare() {
 	default
 
 	sed -i -e "s/ykman-cli//" ${PN}.pro || die
-	sed -e "/qtsingleapplication.pri/d" \
-		-e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
+	sed -e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
 		-i ykman-gui/ykman-gui.pro || die
 }
 
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index 8dfb991f349d..c290d0335a28 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,19 +1,9 @@
 AUX yubikey-manager-0.7.0-fix-tests.patch 599 BLAKE2B 1c1bf0c540a413a6aa380d89cff2e62675a1783971b44d09d1fd006aec248ebeb63dae0ec2ab1d7128f3ed4cd159e7efd80e274689bfc9592bee1288c2b6ea49 SHA512 5c97d10946f54d47373f8aa4d5ea0680eb00203c22427a63fd9ff4a401aa8316326148b72c10442672406dc2099a767aba41d83bef240d7f67561504acf55f10
-DIST yubikey-manager-0.3.3.tar.gz 51223 BLAKE2B 41bf4e6edfb597420ebc438315c2482bf82d608e578d6adb60e1213e7445add91e7edafc246eb1041fcaefe43b22408fe39e6bfbb5f1eb2e1a6d83ffe68b2c71 SHA512 ced7acb848747399d4b9f0214044dd40c38b332c2f8557485d61f2f0cb857a9f47d12df59ea6a7bded1076b5d539bc171d1dbc9fd8899699c0cb3cb65b0800d7
-DIST yubikey-manager-0.4.5.tar.gz 55315 BLAKE2B 231706a14ba9d65474c8bd92cc57fec3f056da1e84b2303b370a7d9e29d3570283099ec30ed803ce53e6388afabee7bae4674ca34e8dc60d30e0443d4686e204 SHA512 232ce7557aaab3c8a27dfa2ceaab0491ac1f97d4332b25e7f77c968da48c9303627defd0246b1e97c7ed766e6a667ac996ac0430cfeb4e7310a0cfc4a633d1b2
-DIST yubikey-manager-0.4.6.tar.gz 55065 BLAKE2B a0e8d85252836a6d99e68f637f42397266187372b0fd0723ea6d330a01e42a2b79d9fc5f283d7fab2378fe847aaf0cb307f16694ce59f41aabd7fcc668be01fe SHA512 fd52cb346e95b3184fd8e4bbb8e227c75780d7fcf5057712c6def866ea951700f8cdd1286ff857e32754d539dfc7093d809fc585191b05c57f5f983d5b288e7e
-DIST yubikey-manager-0.5.0.tar.gz 59672 BLAKE2B e5dbd32ba644e7b20f03c1511a4ff608c0e6dc93c115edd50077a9a41699411a5fd0eff3d62af1fb13545d977037510f696cbd27150e21308624bfc8613f8bcb SHA512 3a503ced29a557c5adafdd1bc6025a405962cabab7388c96e8f5582165bd33111adeb3b77c7c928cbac905fb085d53ddaefbb12169b54e62b7337c1989636a8a
-DIST yubikey-manager-0.6.0.tar.gz 77823 BLAKE2B 37d9a7e72135ba859521f209896c47423f3573b2f14a56956d145334124f7bf5a4259401a9e89e3f19b2e01a476b96a984e801a28a256815a7773baa44e71773 SHA512 fb49887f4646fe63874be9cb3510ef0d1f9b931ac5fb78f3cc82fb93ada94b36aa06fd91e2ee9d4ea868abedfc206dbedd02fa0c4385d5557d33e07e8099e761
-DIST yubikey-manager-0.7.0.tar.gz 83385 BLAKE2B cd0c440f8ce81549e52dd8e546d82678c19d95d2257c878b48d69719031317943bcca4ee713c03ca8f3fa1de4363df629b09b005955a1217adb2dc5ce89400aa SHA512 0fec23dafd2502a1508648fc96f1dcc873eaf3ad089f87b1afd94b35391513ad3a799985fcbc201c2fb4a3a3e473d24483c04a6862117d211c4cb6b294f74be0
 DIST yubikey-manager-0.7.1-test-files.tar.xz 9756 BLAKE2B 5a2e2a2a58d04c8f9954c1d13d0892b4f7392785d6e83e6948e720606318860b93e70862cee0ee7f987c14c3fa49bb7ff20cdf2a5bfc09c1f08681346428c003 SHA512 7543a9e9cfbe7f9ec02c98397f5cbd77cb307d79985a4b060176ee26605767e74d8b18d4c036ff90aed9a0232bb1382908c75e876a911c2ceb35a12666699b94
 DIST yubikey-manager-0.7.1.tar.gz 71834 BLAKE2B 45b0366531c8a158b3d8ebcfa8b76d608c14dba02224d4e4962c3757446829e3dff5f5e0d0ceda67caab7c67ad0510e037770c58a50552c2c6971136cb75c806 SHA512 3e9105f1c033f9314b90cf209eb52f7879fa1ea69e9ae6dac8de0b24d7d2ff6e45b6dd530917535fa645d6eea461f5b4f23bb8deb103ffc27d1f3483cfa681c7
 DIST yubikey-manager-1.0.0.tar.gz 90653 BLAKE2B 5d8522181ad460521995d3cae63976e06a444816a24efdc83b526d50262c902c8cc76b29d43f6f07725ee714666c853b690f1dd6fe98c9409f0cc1e722ada6f5 SHA512 9fd1926bf4e2c1278a42136a05db3e5fe0b7cb3d740f601fd0a420ab851badb61c2dd165157ac5b1f47e934f771b9d0b3cca4e07d1772d0f743556d482f77c11
-EBUILD yubikey-manager-0.3.3.ebuild 736 BLAKE2B 4d8cbfd4942f9dbca49240ed76c701d2bcca2e23aa3ffdb0f5346206938ee21fa003a197161e909a14c5d08b54956ecd5aefb659f363e7ff86d1e4994f23c685 SHA512 16b96e49659f6a5a4b9b3e90a61896de9d6cbcf991e2d9a44df81c48be8f7936f5de7aec380538cbc8ed034b54617928b456b53a2c322631dda476c6e6fe2d8f
-EBUILD yubikey-manager-0.4.5.ebuild 858 BLAKE2B 4218bcdb0c21ac2624282e8d174b74080b74cc0c62d0804e836dfe6d08dec99866af2d500c27837181e7574d0abecc4c97a8f565867ecf3adbae5ef2a1bfa3aa SHA512 25ace32bacc3ea4dafcc330222cd21b327e859ce138a4a2be4f07a322860dbf503ff00f9b32cd282ff8a97ade6aac59b4b9230ec23cf78b583bec490a614ed79
-EBUILD yubikey-manager-0.4.6.ebuild 858 BLAKE2B 4218bcdb0c21ac2624282e8d174b74080b74cc0c62d0804e836dfe6d08dec99866af2d500c27837181e7574d0abecc4c97a8f565867ecf3adbae5ef2a1bfa3aa SHA512 25ace32bacc3ea4dafcc330222cd21b327e859ce138a4a2be4f07a322860dbf503ff00f9b32cd282ff8a97ade6aac59b4b9230ec23cf78b583bec490a614ed79
-EBUILD yubikey-manager-0.5.0.ebuild 858 BLAKE2B 4218bcdb0c21ac2624282e8d174b74080b74cc0c62d0804e836dfe6d08dec99866af2d500c27837181e7574d0abecc4c97a8f565867ecf3adbae5ef2a1bfa3aa SHA512 25ace32bacc3ea4dafcc330222cd21b327e859ce138a4a2be4f07a322860dbf503ff00f9b32cd282ff8a97ade6aac59b4b9230ec23cf78b583bec490a614ed79
-EBUILD yubikey-manager-0.6.0.ebuild 1206 BLAKE2B 108de94576641f16b0a706d50c6d313ce14f437416bc05fffc3593ae37024d0043f323b13a0f6e31564307652a34ba5c057f8932d79c6a2fefea7035e68dc225 SHA512 6e5d43facf6e57595d118bab7402d75504073a39a21c06475add9cb50682fc45518d8179ee90fec4c6bb2bc6cf326cd03448071da81f7be6688d76625d418c3a
-EBUILD yubikey-manager-0.7.0.ebuild 1434 BLAKE2B 0109266dcac3d0a2e3f99f10858c5a9637f23d97d9a909e49a8f8b984511a14f9a1d06b8f6d1b2f8b414fef96ce73aae982016f575a69e8074eadbaf8d7921a2 SHA512 5fb2ea58c782336d6730ab5295fc008c8b87d3ac72fb43b10c0c54a0885755b00bd641160d1491686b4cca5a7293af0fd74a17ba8cc60afe9fae39da16abdb0c
+DIST yubikey-manager-2.0.0.tar.gz 102078 BLAKE2B a2b8f90dabefb1014881cbe709222bf5cb48c9f409b415a8a2b27d7101c2da6189d0ebfe21a2701d10798c48c44e546659f9424ba6bf9257f7311abb0fc90b9b SHA512 42bebb88ba78bcce00a228109d0b4c815b3242ddbe43fd26c1209ba8666eb033ab77d5acd39a157e8310ce327de8d38bf88cfa0ffaed6273236b220c39e72e3b
 EBUILD yubikey-manager-0.7.1.ebuild 1579 BLAKE2B 65991c1ec1c6acc26baac225043924eb7dd5fdcad0e99d8ba26931ef9da0318dd47ca9a5f602c75c3fb35eedfc0a275695231b5a03e191c9c30a323ef89bf95a SHA512 d24bd03dc385339b96e36fc8056e4044233b784ad73a9464ae2eb797d5ac48bef907e3c27a63125c34c41b8578f8a98c03f9b3cc18db263c3ad656724f532ba3
 EBUILD yubikey-manager-1.0.0-r1.ebuild 1529 BLAKE2B c6e82a3279aa4ea3a179df00c95f53d41626ff825b9c0e43da9670fd724ac8e3156ef54056b2b70c951dd73e0d8b4bc5594cedea16270e034a6cbd92233cfc8c SHA512 ccae1748ac051677ff46517a88e18affaadda2508dd05c261a0a0377d7f75cbdaaa5b114c70a74e5195ce8c9624cdb820c3f883dcd1be74f8046472614ba453c
+EBUILD yubikey-manager-2.0.0.ebuild 1677 BLAKE2B 282c378e36d1c379284ec5948c26b367fd81dd58cb0eb0910a711ae5a0ade12a8b621b1652aaed7d47f3f47622a6a8097133ff665ac01869f0e4947611986796 SHA512 272734ca97f87a56c350e0f040b72640726942602b78f5e85161b2b718a19e150ea8ed7d6a62f6406fc8597cf9853daef9c8f1dd815fa3c0ea2dbb3000d3ada6
 MISC metadata.xml 466 BLAKE2B 258688bf55e0d7d5d13a45996c2177d2154626a75ffd0c5b39cbc5c3f83979a00ec1d9a993870c00785d0e1d02cdeb1dadfa38f39d91b5992c5b495f644c6253 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b
diff --git a/app-crypt/yubikey-manager/yubikey-manager-0.3.3.ebuild b/app-crypt/yubikey-manager/yubikey-manager-0.3.3.ebuild
deleted file mode 100644
index eb81ef9c289d..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-0.3.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-inherit distutils-r1
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	app-crypt/libu2f-host
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pyscard[${PYTHON_USEDEP}]
-	dev-python/pyusb[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
-	sys-auth/ykpers
-"
diff --git a/app-crypt/yubikey-manager/yubikey-manager-0.4.5.ebuild b/app-crypt/yubikey-manager/yubikey-manager-0.4.5.ebuild
deleted file mode 100644
index d5ad29c57862..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-0.4.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-inherit distutils-r1
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="test" # Testing requires RSA keys which are not present in the tarball
-
-RDEPEND="
-	app-crypt/libu2f-host
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pyscard[${PYTHON_USEDEP}]
-	dev-python/pyusb[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
-	sys-auth/ykpers
-"
diff --git a/app-crypt/yubikey-manager/yubikey-manager-0.4.6.ebuild b/app-crypt/yubikey-manager/yubikey-manager-0.4.6.ebuild
deleted file mode 100644
index d5ad29c57862..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-0.4.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-inherit distutils-r1
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="test" # Testing requires RSA keys which are not present in the tarball
-
-RDEPEND="
-	app-crypt/libu2f-host
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pyscard[${PYTHON_USEDEP}]
-	dev-python/pyusb[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
-	sys-auth/ykpers
-"
diff --git a/app-crypt/yubikey-manager/yubikey-manager-0.5.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-0.5.0.ebuild
deleted file mode 100644
index d5ad29c57862..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-0.5.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-inherit distutils-r1
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="test" # Testing requires RSA keys which are not present in the tarball
-
-RDEPEND="
-	app-crypt/libu2f-host
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pyscard[${PYTHON_USEDEP}]
-	dev-python/pyusb[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
-	sys-auth/ykpers
-"
diff --git a/app-crypt/yubikey-manager/yubikey-manager-0.6.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-0.6.0.ebuild
deleted file mode 100644
index 3379be37dba5..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-0.6.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	app-crypt/libu2f-host
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pyscard[${PYTHON_USEDEP}]
-	dev-python/pyusb[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
-	sys-auth/ykpers
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOC_CONTENTS
-
-	distutils-r1_python_install_all
-
-	DOC_CONTENTS="
-		The 'openpgp' command may require the package 'app-crypt/ccid'
-		to be installed on the system. Furthermore, make sure that pcscd
-		daemon is running and has correct access permissions to USB
-		devices.
-	"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-0.7.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-2.0.0.ebuild
index 7b8bda82e71a..7fa00f1c34db 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-0.7.0.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-2.0.0.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
@@ -8,7 +8,11 @@ inherit readme.gentoo-r1 distutils-r1
 
 DESCRIPTION="Python library and command line tool for configuring a YubiKey"
 HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+SRC_URI="https://github.com/Yubico/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}" # <- need this only for github-based SRC_URI
+# Here's the alternative SRC_URI, though tarball contents may differ
+# See: https://github.com/Yubico/yubikey-manager/issues/217
+# SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -16,29 +20,25 @@ KEYWORDS="~amd64"
 IUSE="test"
 
 RDEPEND="
-	dev-python/fido2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pyscard[${PYTHON_USEDEP}]
-	dev-python/pyusb[${PYTHON_USEDEP}]
 	dev-python/click[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
-	sys-auth/ykpers
+	dev-python/fido2[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	dev-python/pyusb[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sys-auth/ykpers-1.19.0
 "
 DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2_7')
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.0-fix-tests.patch
-)
-
 python_test() {
-	touch "${S}"/test/__init__.py || die
 	esetup.py test
 }
 
@@ -53,8 +53,9 @@ python_install_all() {
 		daemon is running and has correct access permissions to USB
 		devices.
 	"
-
 	readme.gentoo_create_doc
+
+	doman "${S}"/man/ykman.1
 }
 
 pkg_postinst() {
author	V3n3RiX <venerix@redcorelinux.org>	2019-02-10 15:40:27 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-02-10 15:40:27 +0000
commit	6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (patch)
tree	cee0a97398040001220ece3cd48c3d568bcddb4a /app-crypt
parent	1db00cc6e94b90c08090bb5b8c406622946c4ae5 (diff)