gentoo resync : 10.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-10 13:21:36 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-10 13:21:36 +0000
commit: 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch)
tree: 5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /app-crypt
parent: bd4aeefe33e63f613512604e47bfca7b2187697d (diff)
34 files changed, 240 insertions, 712 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 021d0849d01a..2b4827f44111 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 4a9401166316..282942a77c34 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-0.38.0.tar.gz 1328474 BLAKE2B 6ea7c6b5d1840ec9d42509859d0f36f3ac3c4e588149e54fd74f8799a414b43c4d182b47e051a96436c9cdac135999d7e2a25424be680a819d50de64bb85b198 SHA512 832ac36c5b13e9764c9aab40856af7b909b630f34b1fe1e42dbf847357b28b2a130df480f1cb543dad0db781a843a79a310eba7b1097370e267d01431c21ee29
 DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
+DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
 EBUILD acme-0.38.0.ebuild 1721 BLAKE2B 3b07ade5ac66c854fafa0f17fac36db968f4e39decc60be4bd2849de87d84c2e9bf0aa2fb5f7eb0d7b55d36b5c6f12b136a95e5601880f986fe430fe08c328ae SHA512 095dd2b679f056c77694c7b0e673b0aaeab779c7e012bc07ca0709a0043f9c4b1ee72ae94f3d9d2994c341803f6f603ebfdc5387ba73ecec8d2317c01a5cf1a5
 EBUILD acme-0.39.0.ebuild 1721 BLAKE2B 3b07ade5ac66c854fafa0f17fac36db968f4e39decc60be4bd2849de87d84c2e9bf0aa2fb5f7eb0d7b55d36b5c6f12b136a95e5601880f986fe430fe08c328ae SHA512 095dd2b679f056c77694c7b0e673b0aaeab779c7e012bc07ca0709a0043f9c4b1ee72ae94f3d9d2994c341803f6f603ebfdc5387ba73ecec8d2317c01a5cf1a5
-EBUILD acme-9999.ebuild 1723 BLAKE2B 2fe38f3a6255c3540a5e5527316cd27dcbd15abc265e3464bcced30b35189422b967713fbf3b5170af7ca27b415c703eae0510685e5bb4231beee8af2320cef2 SHA512 582412c0ff094447f58d1bd973d2c678e29fe64c2cf38496360080790c9c3c57c6142ed73079b98f08c324f7be8a446be3c2fd1e24d306db2ed838241f84ae4e
+EBUILD acme-0.40.1.ebuild 1750 BLAKE2B ccf351cdc02809191fd1b2f9bec0ab79e5e710b685a7e2c8ad9555096b109b27c8db327681b4c3bee8e11dc48c627b194d56eb292f0fbe530834ddf932714f8a SHA512 b3eb0461905002ecc5cb7c53a1c43a01fe5c121200749a02a6c783bc9d91f77e65e7dcaf8a299663e3c0820578c57d98830a3cfeef309168f6941e63bc9b0702
+EBUILD acme-9999.ebuild 1750 BLAKE2B ccf351cdc02809191fd1b2f9bec0ab79e5e710b685a7e2c8ad9555096b109b27c8db327681b4c3bee8e11dc48c627b194d56eb292f0fbe530834ddf932714f8a SHA512 b3eb0461905002ecc5cb7c53a1c43a01fe5c121200749a02a6c783bc9d91f77e65e7dcaf8a299663e3c0820578c57d98830a3cfeef309168f6941e63bc9b0702
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-0.40.1.ebuild b/app-crypt/acme/acme-0.40.1.ebuild
new file mode 100644
index 000000000000..acacc42fc78b
--- /dev/null
+++ b/app-crypt/acme/acme-0.40.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+
+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="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mock[${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}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+	if use doc ; then
+		cd docs || die
+		sphinx-build -b html -d _build/doctrees   . _build/html
+	fi
+}
+
+python_test() {
+	nosetests -w ${PN} || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 3efe8a99669b..acacc42fc78b 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -22,6 +22,7 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index aac0a0708c25..d5ff1bcc8971 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-0.38.0.tar.gz 1328474 BLAKE2B 6ea7c6b5d1840ec9d42509859d0f36f3ac3c4e588149e54fd74f8799a414b43c4d182b47e051a96436c9cdac135999d7e2a25424be680a819d50de64bb85b198 SHA512 832ac36c5b13e9764c9aab40856af7b909b630f34b1fe1e42dbf847357b28b2a130df480f1cb543dad0db781a843a79a310eba7b1097370e267d01431c21ee29
 DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
+DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
 EBUILD certbot-apache-0.38.0.ebuild 1078 BLAKE2B 343724712d023a476aadeec34ee957e3f9b0e4014731534fba8969c1f1994690d729f2546f52b94241974b74baa8bce4ae26a395f5ab3b32eb55d8dc942c5b63 SHA512 882e967cdf08915c31091b2cccbf2344c15050a95c3624e33d6e3cfd41baefa1c202c43e7e0e8c800cfc2eb298f3b7fa2bf06ee2d83f915ed88e5d578f096af6
 EBUILD certbot-apache-0.39.0.ebuild 1078 BLAKE2B 116199201215bc8abda5091dd5e44c1277b6d765df2739949b612a2c37b82a2718c0053f8b474bd11571213f95de2e3269ca57213b805cd84702635342bf6c55 SHA512 368acc54017803b685a8d4bb2378004b9a6c05b0bfe6167f193d9cdc859dd8512a785e62e8b547350e9d8f5eb413df023aaa31573ec05aec7bc7bde16cb5a856
-EBUILD certbot-apache-9999.ebuild 1080 BLAKE2B 0c44f528c6481c0682f7bf3de0df8657b6cc00c2cdec83ab2d29ed8796f2adfa5353ab0b6191b61552bbf3a2c142e211b6ddac932e31b41ba39ac485877de00c SHA512 73a9dd1cedf2d150d37dd81797143ec9a96da411e6d15280779dbd7df4565e3d7623aa905b40e6779fd0a71aff7578357696dfa6184c108b74bcd1b48479aab2
+EBUILD certbot-apache-0.40.1.ebuild 1107 BLAKE2B a39d85dca0cbb41c08809eb5e46eb40fb467f03826fb1aaa95bf215df68b47253205726827847af7c5e2b301aee114fc0531327921b57d7e240962e74579634a SHA512 75feff35df4c64a6cede42fb6f398f81bf441e9549674ea2cfb278b0d9d3006e4c4f7a350a322961eb1d17a19d4c9bc31064b39a7e51a070496e0a5b8a80886f
+EBUILD certbot-apache-9999.ebuild 1107 BLAKE2B a39d85dca0cbb41c08809eb5e46eb40fb467f03826fb1aaa95bf215df68b47253205726827847af7c5e2b301aee114fc0531327921b57d7e240962e74579634a SHA512 75feff35df4c64a6cede42fb6f398f81bf441e9549674ea2cfb278b0d9d3006e4c4f7a350a322961eb1d17a19d4c9bc31064b39a7e51a070496e0a5b8a80886f
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.40.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.40.1.ebuild
new file mode 100644
index 000000000000..b14f7a5ac825
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.40.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+
+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"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.39.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-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index a90d0aa26db2..b14f7a5ac825 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -22,6 +22,7 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
 	>=app-crypt/certbot-0.39.0[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 49e0a29d86c3..279460e65581 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-0.38.0.tar.gz 1328474 BLAKE2B 6ea7c6b5d1840ec9d42509859d0f36f3ac3c4e588149e54fd74f8799a414b43c4d182b47e051a96436c9cdac135999d7e2a25424be680a819d50de64bb85b198 SHA512 832ac36c5b13e9764c9aab40856af7b909b630f34b1fe1e42dbf847357b28b2a130df480f1cb543dad0db781a843a79a310eba7b1097370e267d01431c21ee29
 DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
+DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
 EBUILD certbot-nginx-0.38.0.ebuild 1012 BLAKE2B 8864a6365c3f686de1965966f66b96adf3b23cef9020f52e5b207e70b25c54e966cab2175904143a353788d1cddd875b9d4bdf53f2b0e599283a6dad1e4bfafa SHA512 44b9b9b2786e8d3aef042961130897d6d18b20d0975e65ae8f4e765ba52dbc3fe9045cf4c8dfe52a807e2932794862593e94c35e1e5c6e18b377bad3727c5756
 EBUILD certbot-nginx-0.39.0.ebuild 1012 BLAKE2B 8864a6365c3f686de1965966f66b96adf3b23cef9020f52e5b207e70b25c54e966cab2175904143a353788d1cddd875b9d4bdf53f2b0e599283a6dad1e4bfafa SHA512 44b9b9b2786e8d3aef042961130897d6d18b20d0975e65ae8f4e765ba52dbc3fe9045cf4c8dfe52a807e2932794862593e94c35e1e5c6e18b377bad3727c5756
+EBUILD certbot-nginx-0.40.1.ebuild 1014 BLAKE2B c424ab9e7f11ad23e128e0a9876359ebdea32746a810380e17acd108bec3920b3ed8b48992446b0a1a4bf704f8dd07e20006fcdb7ca26338bdee85b0ac1676b2 SHA512 ebeb6165a82c28105a65032c47ef92999df3aae3aa75bb9374405f58918743f983802ac8b62945eb2c93b3183a7065f36bdebd1d50ebbb94ef4a7ebca9ea1e63
 EBUILD certbot-nginx-9999.ebuild 1014 BLAKE2B c424ab9e7f11ad23e128e0a9876359ebdea32746a810380e17acd108bec3920b3ed8b48992446b0a1a4bf704f8dd07e20006fcdb7ca26338bdee85b0ac1676b2 SHA512 ebeb6165a82c28105a65032c47ef92999df3aae3aa75bb9374405f58918743f983802ac8b62945eb2c93b3183a7065f36bdebd1d50ebbb94ef4a7ebca9ea1e63
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.40.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.40.1.ebuild
new file mode 100644
index 000000000000..c4f2df8684e9
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.40.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+
+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/acme-0.29.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.35.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/Manifest b/app-crypt/certbot/Manifest
index eb9819a250d4..501d9b82049e 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-0.38.0.tar.gz 1328474 BLAKE2B 6ea7c6b5d1840ec9d42509859d0f36f3ac3c4e588149e54fd74f8799a414b43c4d182b47e051a96436c9cdac135999d7e2a25424be680a819d50de64bb85b198 SHA512 832ac36c5b13e9764c9aab40856af7b909b630f34b1fe1e42dbf847357b28b2a130df480f1cb543dad0db781a843a79a310eba7b1097370e267d01431c21ee29
 DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
+DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
 EBUILD certbot-0.38.0.ebuild 1409 BLAKE2B 898f091d39092bbc439535beb4ca5779b63ebe66a1e6490e941b5efb5a2185718d870c24f4365a76f91eab363ce9687028df95acfd2d2d5f0b3e4c7da456ff69 SHA512 9e8f33e0b9c8fc8ca32ce08a52e623aa6a9346eadf81b421a187d51235dd11f2b9d5e1564609371fe937020110c4c2a6ba82eda8cff287d39f99acf34012cc90
 EBUILD certbot-0.39.0.ebuild 1409 BLAKE2B 898f091d39092bbc439535beb4ca5779b63ebe66a1e6490e941b5efb5a2185718d870c24f4365a76f91eab363ce9687028df95acfd2d2d5f0b3e4c7da456ff69 SHA512 9e8f33e0b9c8fc8ca32ce08a52e623aa6a9346eadf81b421a187d51235dd11f2b9d5e1564609371fe937020110c4c2a6ba82eda8cff287d39f99acf34012cc90
-EBUILD certbot-9999.ebuild 1411 BLAKE2B 11eb25aedac65f87fa9de601afa3e6d74791ea657e5b766f6345f0d128555f3899b22cc5dcac09b1dbdf1bf4eb213139522bf16ea750eec6f157ff3725c15901 SHA512 60bf2b405388dcf6d1bbb752b02428da55350d32c2963ebf1002364e13877c4d7a529917b9b47a6cbc2f27ab528e45c96b797011d673032518a5e2c1a67e2530
+EBUILD certbot-0.40.1.ebuild 1438 BLAKE2B a1d6c6e1c9e43263c06bb16c2b1095253a63e25863337963452790b8809f2f488f0caece08df387b01f9fba531e2051bf265c1df7e83e169fd6cea6c1adb5fcd SHA512 a910e3f910b6b42a4995d2e0f69f446844e58a22b8d75b5a12585595e98976b9958d061197b5c139c43d1d9f083aebe057190e50b43a9cdf2e9bedb40d435286
+EBUILD certbot-9999.ebuild 1438 BLAKE2B 01ed1780277605210ddaedc7692a0b14a3dce68bd8e93939c9359e5e025fb22cc32512d7557dcb5d95b5a030f91319c51321c88d5fe6c64056f8a2f434eedbbe SHA512 1c76cd41494efae54731bc5fbc77edcb589f30127afef11bd6f8d625648f57b5df251e4a5b06adebb82c0502c431c8b150ac036c66312d6276db13590731991f
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.40.1.ebuild b/app-crypt/certbot/certbot-0.40.1.ebuild
new file mode 100644
index 000000000000..e59b628d2009
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.40.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+
+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"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=app-crypt/acme-0.40.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${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() {
+	# acme is not installed, removing it here is fine, the dir just confuses tests
+	rm -R acme
+	pytest -vv ${PN} || die
+}
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index 0e7b7afdc975..39028621e8f0 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -20,6 +20,7 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/app-crypt/ekeyd/Manifest b/app-crypt/ekeyd/Manifest
index 5c6b80cb12d4..55f06acda7af 100644
--- a/app-crypt/ekeyd/Manifest
+++ b/app-crypt/ekeyd/Manifest
@@ -12,9 +12,6 @@ AUX ekeyd-1.1.5-remove-werror.patch 1205 BLAKE2B c10ae2dc785a3bcb98a47af002d3f96
 AUX ekeyd-1.1.5-udev-rule.patch 2325 BLAKE2B 5617dd160c6f3617bb93dc97755f22c535ebcaa190cbca0abb456168ebb1579ce7b1db961167230540e03b56f92008a12e846c54200d5354711c64bc7e9c0e6d SHA512 05023ef85c454a9092cecf7f3826430caeda1e66ba5759ffe1e6f4c42f4da32048862dba6c6e19ab32febadc3a9f65cf5e1b8f0562a71fc854134b60df28a80c
 AUX ekeyd.init.2 699 BLAKE2B 4ce17a42ffc60b49232cc0bb5a19d36fecc55071df699a7ad7da6a49de352a599b8f0f11fc05fa4159d8975245e7b6181e96303182870519a7f57070a6b54da4 SHA512 3c1fe923e6f08d83d02b9559fa5b817e9abdbc97a50815ab01c7c17e3e953f54701eb1110340dc164bb67ef67905041054cd4fc98c11ea5932a539f4330c8b71
 AUX ekeyd.service 157 BLAKE2B d7976301d7eb0d9be05de574f3b25c13ed3767629dff7024e7621a2d29686045cfd7664e2127a87b92d32e719b470a2795159e45c310bfdcfffa75897341213f SHA512 1082a1dc58b820882015c4f09d5154691d9d8810bfe953049a6853ea5025ec7cff2377ee931ec8ceef295241083c162e582a75fd0b134f7e8789f6d470285445
-DIST ekeyd-1.1.4.tar.gz 100911 BLAKE2B 7b0c6ed31f73ed559ed0a34325680618d700d069b873e7ebc92dc8d8082c9d03e5ea2d7ddfc2b31e927914a0d2cd130faed97ce07eea4af3005f1499b1fd2d1c SHA512 40632722827e07ebc643fa32af9910b28053873329772681dba2b029ad0b3c63d1d6bba3fdd0549b84e23779d2e2ae0323a53e1fdf93eb963570bab2227b63e6
 DIST ekeyd_1.1.5.orig.tar.gz 101366 BLAKE2B 7edd6d291f7553864c9aa96ee3d9533e33b6c94989b2c6b1a56eda42f61afe1633af5e7c3c8f5f57920ac0577f8567d1b09238eae35138ab2023600f01096466 SHA512 c30620d5e54a49929be72ed04448a4f08eb9658dbf7534586c49a3b43bdd5fc95a0659e09cc04b012c339ca20a1e914fa5a4b4d970171c46b64235f284516b9a
-EBUILD ekeyd-1.1.4-r2.ebuild 5604 BLAKE2B d3d63f22f9ca5606c1648365461581a294dd6775a2cd1fbcc26bd16ad5f809152afa6164ca24ea35c328f919bcff27dce867b4c9a5dc65751219a11e920f157b SHA512 67f60f6aef075cbe8c8be460f953c66191b0e4e4c88c5b5ed98b2fce9d3cb79290eda3e79668a9b0bc3a02fffab47a4b62fbd9a4ff6c9bb8e0925917f3c12d9b
 EBUILD ekeyd-1.1.5-r1.ebuild 4877 BLAKE2B f7b49794d5c43cb8997e2074aa8ece5cf75a24baf6d2b49cf8626e2a96487b9689c887008f43cd9b3a577c8f07533b244abebd406da397baaa38242201fabea1 SHA512 5280b08daee08ee697de152a8db129c180e1d633096431a9511a03c9bfdd552411cf00e088daeef675c70621a30fac069de79ae89d63bd9f071ba134fb4dad55
-EBUILD ekeyd-1.1.5.ebuild 4865 BLAKE2B 794a77bc8907afd614d7fa23a22b76c70e193b09c47b8706a63143ae63810dd7bc6fafed6e87ca03ab63f87daf289afce6f84220dde0ce796df9363c203c878b SHA512 dd6e8b2913eb2628c70aa3d22687982fbbfad2c084a5407f693429c7bacb7c55f5d20f2ffb35df13fcd2f644b1a648c1985b2ec71bdca8c659f2fc5bda6dbce2
 MISC metadata.xml 859 BLAKE2B f300afe133b92ef4d4dd1a6f7bffebdb9ff1b152fd08484d56b327c1eaaaa2a2c5c2bf98a8f98851bd427a1143c1d84537aed47ea6048fb10bd0695ee817a202 SHA512 0b7ac8a9894b69bcf0d16bcae83146ef00c05f1a1ecb41244a03cbb5ee8d64328647eceddcac36a5900e87dd07af81c79c7e62e94f70e67244b2c8dac73f57da
diff --git a/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild b/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild
deleted file mode 100644
index 70403d447d8e..000000000000
--- a/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib linux-info toolchain-funcs udev
-
-DESCRIPTION="Entropy Key userspace daemon"
-HOMEPAGE="http://www.entropykey.co.uk/"
-SRC_URI="http://www.entropykey.co.uk/res/download/${P}.tar.gz"
-
-LICENSE="MIT GPL-2" # GPL-2 (only) for init script
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="usb kernel_linux munin minimal"
-REQUIRED_USE="minimal? ( !munin !usb )"
-
-EKEYD_RDEPEND="dev-lang/lua
-		usb? ( virtual/libusb:0 )"
-EKEYD_DEPEND="${EKEYD_RDEPEND}"
-EKEYD_RDEPEND="${EKEYD_RDEPEND}
-	dev-lua/luasocket
-	kernel_linux? ( virtual/udev )
-	usb? ( !kernel_linux? ( sys-apps/usbutils ) )
-	munin? ( net-analyzer/munin )"
-
-RDEPEND="!minimal? ( ${EKEYD_RDEPEND} )
-	!app-crypt/ekey-egd-linux
-	sys-apps/openrc"
-DEPEND="!minimal? ( ${EKEYD_DEPEND} )"
-
-CONFIG_CHECK="~USB_ACM"
-
-pkg_setup() {
-	if ! use minimal && use kernel_linux && ! use usb && linux_config_exists; then
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_compile() {
-	local osname
-
-	# Override automatic detection: upstream provides this with uname,
-	# we don't like using uname.
-	case ${CHOST} in
-		*-linux-*)
-			osname=linux;;
-		*-freebsd*)
-			osname=freebsd;;
-		*-kfrebsd-gnu)
-			osname=gnukfreebsd;;
-		*-openbsd*)
-			osname=openbsd;;
-		*)
-			die "Unsupported operating system!"
-			;;
-	esac
-
-	# We don't slot LUA so we don't really need to have the variables
-	# set at all.
-	emake -C host \
-		CC="$(tc-getCC)" \
-		LUA_V= LUA_INC= \
-		OSNAME=${osname} \
-		OPT="${CFLAGS}" \
-		BUILD_ULUSBD=$(use usb && echo yes || echo no) \
-		$(use minimal && echo egd-linux)
-}
-
-src_install() {
-	exeinto /usr/libexec
-	newexe host/egd-linux   ekey-egd-linux
-	newman host/egd-linux.8 ekey-egd-linux.8
-
-	newconfd "${FILESDIR}"/ekey-egd-linux.conf.2 ekey-egd-linux
-	newinitd "${FILESDIR}"/ekey-egd-linux.init.2 ekey-egd-linux
-
-	dodoc doc/* AUTHORS ChangeLog THANKS
-
-	use minimal && return
-	# from here on, install everything that is not part of the minimal
-	# support.
-
-	emake -C host \
-		DESTDIR="${D}" \
-		MANZCMD=cat MANZEXT= \
-		install-ekeyd $(use usb && echo install-ekey-ulusbd)
-
-	# We move the daemons around to avoid polluting the available
-	# commands.
-	dodir /usr/libexec
-	mv "${D}"/usr/sbin/ekey*d "${D}"/usr/libexec
-
-	newinitd "${FILESDIR}"/${PN}.init.2 ${PN}
-
-	if use usb && ! use kernel_linux; then
-		newinitd "${FILESDIR}"/ekey-ulusbd.init.2 ekey-ulusbd
-		newconfd "${FILESDIR}"/ekey-ulusbd.conf.2 ekey-ulusbd
-	fi
-
-	if use kernel_linux; then
-		local rules=udev/fedora15/60-entropykey.rules
-		use usb && rules=udev/fedora15/60-entropykey-uds.rules
-
-		udev_newrules ${rules} 70-${PN}.rules
-
-		exeinto "$(get_udevdir)"
-		doexe udev/entropykey.sh
-	fi
-
-	if use munin; then
-		exeinto /usr/libexec/munin/plugins
-		doexe munin/ekeyd_stat_
-
-		insinto /etc/munin/plugin-conf.d
-		newins munin/plugin-conf.d_ekeyd ekeyd
-	fi
-}
-
-pkg_postinst() {
-	elog "${CATEGORY}/${PN} now install also the EGD client service ekey-egd-linux."
-	elog "To use this service, you need enable EGDTCPSocket for the ekeyd service"
-	elog "managing the key(s)."
-	elog ""
-	elog "The daemon will send more entropy to the kernel once the available pool"
-	elog "falls below the value set in the kernel.random.write_wakeup_threshold"
-	elog "sysctl entry."
-	elog ""
-	ewarn "Since version 1.1.4-r1, ekey-egd-linux will *not* set the watermark for"
-	ewarn "you, instead you'll have to configure the sysctl in /etc/sysctl.conf"
-
-	use minimal && return
-	# from here on, document everything that is not part of the minimal
-	# support.
-
-	elog ""
-	elog "To make use of your EntropyKey, make sure to execute ekey-rekey"
-	elog "the first time, and then start the ekeyd service."
-	elog ""
-	elog "By default ekeyd will feed the entropy directly to the kernel's pool;"
-	elog "if your system has jumps in load average, you might prefer using the"
-	elog "EGD compatibility mode, by enabling EGDTCPSocket for ekeyd and then"
-	elog "starting the ekey-egd-linux service."
-	elog ""
-	elog "The same applies if you intend to provide entropy for multiple hosts"
-	elog "over the network. If you want to have the ekey-egd-linux service on"
-	elog "other hosts, you can enable the 'minimal' USE flag."
-	elog ""
-	elog "The service supports multiplexing if you wish to use multiple"
-	elog "keys, just symlink /etc/init.d/ekeyd → /etc/init.d/ekeyd.identifier"
-	elog "and it'll be looking for /etc/entropykey/identifier.conf"
-	elog ""
-
-	if use usb; then
-		if use kernel_linux; then
-			elog "You're going to use the userland USB daemon, the udev rules"
-			elog "will be used accordingly. If you want to use the CDC driver"
-			elog "please disable the usb USE flag."
-		else
-			elog "You're going to use the userland USB daemon, since your OS"
-			elog "does not support udev, you should start the ekey-ulusbd"
-			elog "service before ekeyd."
-		fi
-
-		ewarn "The userland USB daemon has multiple known issues. If you can,"
-		ewarn "please consider disabling the 'usb' USE flag and instead use the"
-		ewarn "CDC-ACM access method."
-	else
-		if use kernel_linux; then
-			elog "Some versions of Linux have a faulty CDC ACM driver that stops"
-			elog "EntropyKey from working properly; please check the compatibility"
-			elog "table at http://www.entropykey.co.uk/download/"
-		else
-			elog "Make sure your operating system supports the CDC ACM driver"
-			elog "or otherwise you won't be able to use the EntropyKey."
-		fi
-		elog ""
-		elog "If you're unsure about the working state of the CDC ACM driver"
-		elog "enable the usb USE flag and use the userland USB daemon"
-	fi
-}
diff --git a/app-crypt/ekeyd/ekeyd-1.1.5.ebuild b/app-crypt/ekeyd/ekeyd-1.1.5.ebuild
deleted file mode 100644
index f03ac2d0a62f..000000000000
--- a/app-crypt/ekeyd/ekeyd-1.1.5.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib linux-info toolchain-funcs udev systemd
-
-DESCRIPTION="Entropy Key userspace daemon"
-HOMEPAGE="http://www.entropykey.co.uk/"
-SRC_URI="mirror://ubuntu/pool/universe/e/ekeyd/ekeyd_${PV}.orig.tar.gz"
-
-LICENSE="MIT GPL-2" # GPL-2 (only) for init script
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kernel_linux munin minimal"
-REQUIRED_USE="minimal? ( !munin )"
-
-EKEYD_RDEPEND="dev-lang/lua"
-EKEYD_DEPEND="${EKEYD_RDEPEND}"
-EKEYD_RDEPEND="${EKEYD_RDEPEND}
-	dev-lua/luasocket
-	kernel_linux? ( virtual/udev )
-	munin? ( net-analyzer/munin )"
-
-RDEPEND="!minimal? ( ${EKEYD_RDEPEND} )
-	!app-crypt/ekey-egd-linux
-	sys-apps/openrc"
-DEPEND="!minimal? ( ${EKEYD_DEPEND} )"
-
-CONFIG_CHECK="~USB_ACM"
-
-pkg_setup() {
-	if ! use minimal && use kernel_linux && ! use usb && linux_config_exists; then
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-const_char_usage.patch";
-	epatch "${FILESDIR}/${P}-enoent.patch";
-	epatch "${FILESDIR}/${P}-path-fixes.patch";
-	epatch "${FILESDIR}/${P}-udev-rule.patch";
-	epatch "${FILESDIR}/${P}-remove-werror.patch";
-	epatch "${FILESDIR}/${P}-misc.patch";
-}
-
-src_compile() {
-	local osname
-
-	# Override automatic detection: upstream provides this with uname,
-	# we don't like using uname.
-	case ${CHOST} in
-		*-linux-*)
-			osname=linux;;
-		*-freebsd*)
-			osname=freebsd;;
-		*-kfrebsd-gnu)
-			osname=gnukfreebsd;;
-		*-openbsd*)
-			osname=openbsd;;
-		*)
-			die "Unsupported operating system!"
-			;;
-	esac
-
-	# We don't slot LUA so we don't really need to have the variables
-	# set at all.
-	emake -C host \
-		CC="$(tc-getCC)" \
-		LUA_V= LUA_INC= \
-		OSNAME=${osname} \
-		OPT="${CFLAGS}" \
-		BUILD_ULUSBD=no \
-		$(use minimal && echo egd-linux)
-}
-
-src_install() {
-	exeinto /usr/libexec
-	newexe host/egd-linux   ekey-egd-linux
-	newman host/egd-linux.8 ekey-egd-linux.8
-
-	newconfd "${FILESDIR}"/ekey-egd-linux.conf.2 ekey-egd-linux
-	newinitd "${FILESDIR}"/ekey-egd-linux.init.2 ekey-egd-linux
-
-	dodoc doc/* AUTHORS ChangeLog THANKS
-
-	use minimal && return
-	# from here on, install everything that is not part of the minimal
-	# support.
-
-	emake -C host \
-		DESTDIR="${D}" \
-		MANZCMD=cat MANZEXT= \
-		install-ekeyd
-
-	# We move the daemons around to avoid polluting the available
-	# commands.
-	dodir /usr/libexec
-	mv "${D}"/usr/sbin/ekey*d "${D}"/usr/libexec
-
-	systemd_dounit "${FILESDIR}/ekeyd.service"
-
-	newinitd "${FILESDIR}"/${PN}.init.2 ${PN}
-
-	if use kernel_linux; then
-		local rules="${FILESDIR}/90-ekeyd.rules"
-		udev_newrules ${rules} 90-${PN}.rules
-	fi
-
-	if use munin; then
-		exeinto /usr/libexec/munin/plugins
-		doexe munin/ekeyd_stat_
-
-		insinto /etc/munin/plugin-conf.d
-		newins munin/plugin-conf.d_ekeyd ekeyd
-	fi
-}
-
-pkg_postinst() {
-	elog "${CATEGORY}/${PN} now install also the EGD client service ekey-egd-linux."
-	elog "To use this service, you need enable EGDTCPSocket for the ekeyd service"
-	elog "managing the key(s)."
-	elog ""
-	elog "The daemon will send more entropy to the kernel once the available pool"
-	elog "falls below the value set in the kernel.random.write_wakeup_threshold"
-	elog "sysctl entry."
-	elog ""
-	ewarn "Since version 1.1.4-r1, ekey-egd-linux will *not* set the watermark for"
-	ewarn "you, instead you'll have to configure the sysctl in /etc/sysctl.conf"
-
-	use minimal && return
-	# from here on, document everything that is not part of the minimal
-	# support.
-
-	elog ""
-	elog "To make use of your EntropyKey, make sure to execute ekey-rekey"
-	elog "the first time, and then start the ekeyd service."
-	elog ""
-	elog "By default ekeyd will feed the entropy directly to the kernel's pool;"
-	elog "if your system has jumps in load average, you might prefer using the"
-	elog "EGD compatibility mode, by enabling EGDTCPSocket for ekeyd and then"
-	elog "starting the ekey-egd-linux service."
-	elog ""
-	elog "The same applies if you intend to provide entropy for multiple hosts"
-	elog "over the network. If you want to have the ekey-egd-linux service on"
-	elog "other hosts, you can enable the 'minimal' USE flag."
-	elog ""
-	elog "The service supports multiplexing if you wish to use multiple"
-	elog "keys, just symlink /etc/init.d/ekeyd → /etc/init.d/ekeyd.identifier"
-	elog "and it'll be looking for /etc/entropykey/identifier.conf"
-	elog ""
-
-		if use kernel_linux; then
-			elog "Some versions of Linux have a faulty CDC ACM driver that stops"
-			elog "EntropyKey from working properly; please check the compatibility"
-			elog "table at http://www.entropykey.co.uk/download/"
-		else
-			elog "Make sure your operating system supports the CDC ACM driver"
-			elog "or otherwise you won't be able to use the EntropyKey."
-		fi
-		elog ""
-		elog "If you're unsure about the working state of the CDC ACM driver"
-		elog "enable the usb USE flag and use the userland USB daemon"
-}
diff --git a/app-crypt/elettra/Manifest b/app-crypt/elettra/Manifest
index 4dd54a679a46..cbc1d6345189 100644
--- a/app-crypt/elettra/Manifest
+++ b/app-crypt/elettra/Manifest
@@ -1,3 +1,3 @@
 DIST elettra-src-1.0.tar.gz 16102 BLAKE2B 7499bbb043f59f483f8496b94fe09076bc338125b18f64b859c008a64ec811a80d1accbe8ddf8bd505d1eac4ce971f7c0cd00e6ec37c9c2d3d861913c9aafeeb SHA512 341a83436d9c163391eabbc06600b29e8ee837bb805f2f9ea922ffa8d8dcb9ec53e50ae475e13e2810ac69419b86072cd7e6c44d13c80e43ee67071e6864d5b3
-EBUILD elettra-1.0.ebuild 770 BLAKE2B d0bd1bbfd4e14e5f000bb05bc7aa03763b890444ff425e35596e6d18a784b9064ff80003f3107cc08ec8a6fd5ea544b9b7ab919be1f499787807d45c86ba6f7e SHA512 368d2db52e4f601177d02465e3c921a61b0a0cb96d910d4b0b39f6c648d2cfa400715c50c15e62f47df70f09079743d721f37fc15ca29fbdf5be04a4b36dac06
+EBUILD elettra-1.0.ebuild 721 BLAKE2B 3c2ab2df09350b99ed6f1d6dc0d872dc1fc79ea9676e28803e958215c34e39ea5c61023532e43a33262d70fbeb4020e53ac6b61d5872fdd34310b32db158b7ad SHA512 6fe614e106760a46cf562d56c326d0c327359ab85cddfd4a3922635fcda7b893c07eab5d403855d07c07f6baffa9370fab7188b7ed94ff6b52454c0cdfb98015
 MISC metadata.xml 215 BLAKE2B 416b347b470da55cc38463c877ac944c5530bf47ca6a73b56dff8f174db2572d6e5b2e87fa838e0acffd4d81d850b353f59fa0008b934d896b926fb79bf5e015 SHA512 49695b6fe6c6840d991013455f167da37a67fa9fd326f2241778caeab2b7ab38bbb36b2f383ca6736c465b65cce7338ebb90468ceb30bdf5b5989449bb2d2ebd
diff --git a/app-crypt/elettra/elettra-1.0.ebuild b/app-crypt/elettra/elettra-1.0.ebuild
index 4e47c0f1db08..c15d05715817 100644
--- a/app-crypt/elettra/elettra-1.0.ebuild
+++ b/app-crypt/elettra/elettra-1.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit toolchain-funcs
 
 MY_P="${PN}-src-${PV}"
 
 DESCRIPTION="Plausible deniable file cryptography"
-HOMEPAGE="http://www.winstonsmith.info/julia/elettra/"
-SRC_URI="http://www.winstonsmith.info/julia/elettra/${MY_P}.tar.gz"
+HOMEPAGE="https://www.winstonsmith.info/julia/elettra/"
+SRC_URI="https://www.winstonsmith.info/julia/elettra/${MY_P}.tar.gz"
 
 LICENSE="WTFPL-2"
 SLOT="0"
@@ -17,8 +17,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="sys-libs/zlib
-		 app-crypt/mhash
-		 dev-libs/libmcrypt"
+	app-crypt/mhash
+	dev-libs/libmcrypt"
 
 DEPEND="${RDEPEND}"
 
@@ -31,6 +31,6 @@ src_compile() {
 }
 
 src_install() {
-	dobin elettra || die "dobin failed"
-	dodoc README || die "dodoc failed"
+	dobin elettra
+	dodoc README
 }
diff --git a/app-crypt/gpg-ringmgr/Manifest b/app-crypt/gpg-ringmgr/Manifest
index 9de3f46c4eb6..f3d2295ea2cd 100644
--- a/app-crypt/gpg-ringmgr/Manifest
+++ b/app-crypt/gpg-ringmgr/Manifest
@@ -1,3 +1,3 @@
-DIST gpg-ringmgr 9378 BLAKE2B 673b1f6719dda0019c599a8ebc1d38e748c7749f07c8145f48dfff81515574080eec0b208868f89aa9f32b225d6efa4205e60a6298bda8151eb4a7d6cfb86df0 SHA512 f6aedf0db58c15163f6f08b37a5fef43a80655f5602d8ee856764177a33e2f5eb4c0b8a09e9f3ee5b36544039051909d48397be5793243eba5002526652dd194
-EBUILD gpg-ringmgr-1.12.ebuild 636 BLAKE2B 95300527ab365e60ce28263027d77daac0535196575ea462750877acf67020e5545d3fc0c40de24623fe9ba745c0e955792287c3e4babbf7b15724cbddd36f31 SHA512 7c0a3e52bc422df3ac62102086a2989a17aff94857e8871f34db7d367ff220101aa34072de71425ca5dd9701531cedc041203114b6c2bf8d10c50a91f5c931f0
+DIST gpg-ringmgr-1.12 9378 BLAKE2B 673b1f6719dda0019c599a8ebc1d38e748c7749f07c8145f48dfff81515574080eec0b208868f89aa9f32b225d6efa4205e60a6298bda8151eb4a7d6cfb86df0 SHA512 f6aedf0db58c15163f6f08b37a5fef43a80655f5602d8ee856764177a33e2f5eb4c0b8a09e9f3ee5b36544039051909d48397be5793243eba5002526652dd194
+EBUILD gpg-ringmgr-1.12-r1.ebuild 624 BLAKE2B 25fe2112ad9b822fd9ff27dae59c26171f916b5169b619d5e7005dbb04e8f5b605b7513cc7fcdd3c48872cbfc821fb17fa6ba107a36debb603e02ba97c863674 SHA512 0d922bd657deb018d8b24aa24283cab8fe42c15780bb5d34fb6db589b5beb5eee41a404afbbca10bda08d401a65aa3bee15b1b5cb635a83b95a78dc9ce19c79d
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12.ebuild b/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12-r1.ebuild
index 738ef069dda0..d8ce17dff6b8 100644
--- a/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12.ebuild
+++ b/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="GPG Keyring Manager to handle large GPG keyrings more easily"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${PN}"
+SRC_URI="mirror://gentoo/${PN} -> ${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -15,18 +15,19 @@ IUSE=""
 DEPEND="dev-lang/perl
 	>=app-crypt/gnupg-1.2.1"
 
+S=${WORKDIR}
+
 src_unpack() {
-	mkdir ${P}
-	cp "${DISTDIR}"/${PN} "${S}" || die
+	cp "${DISTDIR}"/${P} ${PN} || die
 }
 
 src_compile() {
-	pod2man "${S}"/${PN} >"${S}/"${PN}.1
-	pod2html "${S}"/${PN} >"${S}"/${PN}.html
+	pod2man ${PN} > ${PN}.1 || die
+	pod2html ${PN} > ${PN}.html || die
 }
 
 src_install() {
-	dobin ${PN} || die
+	dobin ${PN}
 	doman ${PN}.1
-	dohtml ${PN}.html
+	dodoc ${PN}.html
 }
diff --git a/app-crypt/jacksum/Manifest b/app-crypt/jacksum/Manifest
index 52eb53bdd44f..10bdb57ce002 100644
--- a/app-crypt/jacksum/Manifest
+++ b/app-crypt/jacksum/Manifest
@@ -1,3 +1,3 @@
 DIST jacksum-1.7.0.zip 446595 BLAKE2B 8460efbd43563b19030abbd991e2dd88e3388d39f7ef1bf8decf8a4094973df266ee62e47a42e0653c16c04f94b61445a258dde404aa7255841b1d2da88c7761 SHA512 dc3f96e39fed4f2ca3a7b41bd8a6685cf96673293ff12f3858707a2d61144d74fb89db0218ed1a04164173e2d7fa6d1b973b68ca4c138213ca7f03e03628f21b
-EBUILD jacksum-1.7.0.ebuild 736 BLAKE2B 9e92fcb0bc03fab6bbce1c66c7c61e14ef70cc4e0f9d026cf2f1d0a00aa4d26bdd8e0c7f0ab4787e54e5bef661810cdd762bd7001b9af549dcf85bcdcc4b4e9f SHA512 fc02d6de044377ebb1bf0e6e3fae87d45f253045789dd9d0050a19d8b58a47c9ee475d8fa1033c02e66345f9ae8b60413cb545de28d9ddbf21498defeab34177
+EBUILD jacksum-1.7.0.ebuild 693 BLAKE2B 2b913462218327d49616079dbe174ce7c3d1b9674254535d2ee6ded10b8f28f966c5ed65e7dddf95e7b9bb8f7ac56c7df02ccd2100b71582fe438ddcd4072415 SHA512 4ce4e9faeab5cffbc6ca08b3b698724fe3a61a89eff07e43edcb73cc1dd0b8c77ed8d3274b37f4f958795c1526b93cbe772a9af9bfdaad921871944166f6fa03
 MISC metadata.xml 313 BLAKE2B d6ff5aa7f2435cd1c20c266ccec13ed6f1a3a20ec7a491053acdce6eb699bdf564a47cb8d2db7d1c41f7887cc5546de8a0603b69571087320481bb5844647509 SHA512 e2c52edb5560223fc1abe958eca1d02e7a42c143c324c898479d6354f03898a38549831d25968ddf48d480c4aedd7430560cc22555dc7582acf07d87481dd06e
diff --git a/app-crypt/jacksum/jacksum-1.7.0.ebuild b/app-crypt/jacksum/jacksum-1.7.0.ebuild
index 1a8ef9ae2ccc..610d2521b079 100644
--- a/app-crypt/jacksum/jacksum-1.7.0.ebuild
+++ b/app-crypt/jacksum/jacksum-1.7.0.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Java utility for computing and verifying checksums: CRC*, MD*, etc."
 HOMEPAGE="http://www.jonelo.de/java/jacksum/"
 SRC_URI="mirror://sourceforge/jacksum/${P}.zip"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
+
 DEPEND=">=virtual/jdk-1.3.1
 	dev-java/ant-core
 	app-arch/unzip"
@@ -20,10 +22,9 @@ RDEPEND=">=virtual/jre-1.3.1"
 S="${WORKDIR}"
 
 src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	unzip -qq source/${PN}-src.zip || die "failed to unpack source"
-	rm *.jar
+	default
+	unpack ./source/${PN}-src.zip
+	rm *.jar || die
 }
 
 src_install() {
diff --git a/app-crypt/jitterentropy/Manifest b/app-crypt/jitterentropy/Manifest
index c17564ab060a..35a58ba9e900 100644
--- a/app-crypt/jitterentropy/Manifest
+++ b/app-crypt/jitterentropy/Manifest
@@ -1,3 +1,3 @@
 DIST jitterentropy-2.1.2.tar.gz 24112 BLAKE2B 9328fcc6ac09b79765d53248e4d6d01be47348c6f22f660175de888a884ea9e65253cc2e6fd3620a96f69dd0051b97ea3c46462a24c8e0c94d2bba19afab059e SHA512 b1ba2fe22c6b7d5bca64bb1611f2da3f53f1979e515a16141ccf330e3ca27a6944f0e45f0db57f4e3963a30ea4b34920ce9173f9c4f3ea82b820dc739cbd95f4
-EBUILD jitterentropy-2.1.2.ebuild 1013 BLAKE2B 5102747d559e8f8097eba0af787a7ecede94114c6280fb8152ce911780a9c49df1383b07031a5734c6965556f2caf5a0456ae0ff4e0974d7dcaa95971dc42db2 SHA512 e13df0307689abd8e92508cfb737669267084c4ab874086688f68432c8525f204a63d48aa20136b29b950c7ecc8d307bd92c2412c99a2a11abcb94846e912236
+EBUILD jitterentropy-2.1.2.ebuild 1012 BLAKE2B b7614024865b2a103ba420a7eaee28c261e81ed3db50cb82c6b9c8263404aa3ffff4c4a50db34817f1187338b3499c328bca261ec90d8e834e2bd8d5ffa6c2e7 SHA512 69fbf1d285e5dd7a0e5200991f6e41859ff35516fb8f7240c5fc78756573325e158caf942d98d4b60f5dcb94dbe44c3d590e3e3b14e8b92cd071f8dc09e23acf
 MISC metadata.xml 666 BLAKE2B 88598964271ee05c8427e8547d25dd50eb50bec1dafcaef064328dbca5140b9221b1d1823a1dc54289b73501556579fb39a85c49a6c25d6447a677e8db0f6252 SHA512 d6baaef1aa2e0958492872e7b0ba2c6c86dfa7e281268b6cb230c2cc2c8132df04e664e0449d24885357a1a791bb354253778e0e5f2436fa612b6e0c509729e0
diff --git a/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild b/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
index 0048f74e8321..281998201e21 100644
--- a/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
+++ b/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/smuellerDD/jitterentropy-library/archive/v${PV}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv x86"
 IUSE="static-libs"
 
 S="${WORKDIR}/${PN}-library-${PV}"
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
index ab80407e9500..92018e4c3ab6 100644
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@@ -1,6 +1,6 @@
 DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b
 DIST libb2-0.98.tar.gz 275076 BLAKE2B 7c0aa473a58a5ceb6e913487cc6f0078e6cab661bd26cb1f5611473b430213521a23adbde227da6d7561b4d581369e268308ae6b2a10da5399c0d2d6ab288b26 SHA512 be400d16ab00b3006ec7412dcbf580427600f4997cee19c0448d849ff8bbbb58bbb7be3d49e4052cb1b6791b6bed9c9cc48b51da3ec77b2fdf3d197ccf0c8073
 EBUILD libb2-0.98.1-r1.ebuild 1744 BLAKE2B b2256260ca7312c87184a92e9b495fb7a7f4fed6353756f3c995c108f71b1abcb9dc304174760a8b624a743c3c39d9e4b275dc50c1daf3bfddfd18d100b0f2cc SHA512 73a90667e0786c443cccc566d43964ad78bfd10cd019f8d3544d2a3842721a58c225d509fedde0b34888da7031e04aabaac5f6311fe3f67ffa6034db646c4f01
-EBUILD libb2-0.98.1-r2.ebuild 1821 BLAKE2B bb078217affdae520fb4b1e57553d5fd65f7642939222193707f3b2501190721d932c86b3e83fa33540d5530c17381dd7ff493b18926670e36fd0abfbaea1012 SHA512 b96a72ee43d840105d72b6582e1c9f9ff71595b783a9011e2860320a224eddb2f283e410fc64f03db3dc1971f850b3d3c87c0c73fa9abec5dc80e28f325f5b15
+EBUILD libb2-0.98.1-r2.ebuild 1816 BLAKE2B 06cde1fe73772227b6697175aa75b60865a5a70dcb5e12c4c84a56efe977b56be1680ee5f6c3c936be393893785085625e1cf7b032a5c8048d0fb30cb2d45b2a SHA512 32314c62552f92ede4ccc4badc646c5038fbb0854a5c7c36890c1761c5546e088d16f705bc143b101123759b668ce39aaf20eb6143885e4a9fc95ee859d49480
 EBUILD libb2-0.98.ebuild 1015 BLAKE2B 8f6fc70a953aea90fa5dbecd894dd5b1335fe9bf737547f8c2c42ab46cc8b718f0bf1ad941b54820b36ce62829a3d2d4d0de1d6e8c34c90c839d4019781a0765 SHA512 7d1a55ff33988e20ab4588f17dc0a1d982c02ea785e1d9535ff740b923129c5491282191e77d6a8dddcb500bce22626face82b40354fcb4da207a2bdcbbdab2b
 MISC metadata.xml 688 BLAKE2B dafb52bda4cb5c27bbbb4cba85c178ce11e9511f0dedfed4ff3afe40789a28e4a8c9c275a1be7e86568419c29011c1a4ae5c67f7b778ece3c750d8a919d5d930 SHA512 a98e96312724a3af5d104e4adbb9f60cac16124c9beac2622045985c1b0c2276ff1d56561d59cfb5a24b57d29577312c7e73bdfe73bbe735c1c320b699065b11
diff --git a/app-crypt/libb2/libb2-0.98.1-r2.ebuild b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
index 5473f617de93..3b919c6717c6 100644
--- a/app-crypt/libb2/libb2-0.98.1-r2.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs native-cflags openmp"
 
 DEPEND="
diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest
index f512678b6e37..89baa0950eda 100644
--- a/app-crypt/nitrocli/Manifest
+++ b/app-crypt/nitrocli/Manifest
@@ -1,48 +1,33 @@
-AUX nitrocli_-_fix-rust-1.35-build.patch 1766 BLAKE2B 5516cf19c40fcd8fa51e804e59d038ab00f0bc67e3db0ea8d8889e1cf2ffb523435ada7eea687bdde23ebd968cae02be20dc94ff39df968261614fb9400b7c48 SHA512 5ce260720bd15b8c5eec026b13faffbcc527e9d994ff4fa46da7636af264b73929e74ed440707aadcea60de35f0c7ab75c3a5a9c3274b316b8d488a31119330a
 DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
 DIST argparse-0.2.2.crate 19440 BLAKE2B 7b15b2072ff52149bc08c5d02a266f2eef78a3aa8844e49154cf2ae1a9cb960ddc2a96a065b4aa44637aca8216211f2965291364d9f06ff6f68524a1f15dfed9 SHA512 97691566d3adc6f6be1c00cdca48424fd3576c372d1c995e7e31658bd20e17ef13553f7de21968ba189fd812928aeb93ef0fa89fe2fd258f45a0a8e095783706
 DIST base32-0.4.0.crate 7791 BLAKE2B 6e457d08f6fe17159b0231b62774d2c366c623b07c7b37196edb8f33b886cdf7affece70afae6dd0b64fc4d2be10d3a01f2f0b81ed12d5c5e1cf50d39c80e68b SHA512 4c999f2fcded06d803471d08b8d9e42512a85f81974388afb3d5b450c86e5ea60e7b1fdaccc49b1e0346663827408f847e897523955edcaf397f20fe97038345
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
-DIST cc-1.0.28.crate 42422 BLAKE2B 632455257fdfe0be6efddc6aee1a32a8a450c49f3a49b7dd13f770cda69334acb0d11e69a4bd4b94c09133ab4319a529c29de993b960276f7506511e4c0fda9a SHA512 2d1e8e34dd8d60aafb0337a86516b152f7f5b04ed5313079fcce66460b5d9c753afbf5e5ba13ada56bbaa7f5ffa1678eb3c2e27b9d58cdcec9f1a5374e6a32ab
 DIST cc-1.0.37.crate 44499 BLAKE2B d12551225fc4e20691a09fecc8a2a487090ce10ad7fe64b385cf54b74a124cf737aa31966f82d9a68e1a932dccb4ec495eb32cdb4dc808c985384fd0fa4b6950 SHA512 85cf4679d16df14a815563c459227ae85206eb79826099fcbd5f602fdfdc052f36237916a842d65d9a5ab57c559c18e645bb219422d85aa3690c11c0a8dcc92c
 DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
-DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
-DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
-DIST libc-0.2.47.crate 351491 BLAKE2B 10ff90405b911c40478793cadc9a1962e14eb4d7b4ff758554a225bb87340989bbd6089441eaa2638db93782de7d0faba20f77a7e3569a52cec40ba55eb56c06 SHA512 f0eddcbe456b1ee2da22963585ff689ad44f0f8d70af33d9bec41a1ec5a1b3dee26fbeaa29786792cd44d020fc56461b44bbb2da962662377552fa562b2694f6
 DIST libc-0.2.57.crate 408902 BLAKE2B 5c84f490037b5e108400f710da79f5471d5f76c384641bbcb721aee21da84e6a2b523487dbf5984b746d070d23c449968ed546e0bfcdfa961dfd57bfb2f3dce6 SHA512 8f210c0e28d647cd2911ad2b7d2450b6e8ea3d628c0cc68000109a7bfdd64fa31706ed7e9bda0f71b920b38a3580fce3d53fe49e9cc53b6ab9e3aeb2eae0cb8e
-DIST memchr-2.1.2.crate 19520 BLAKE2B 4a8409fa4e019ab5cdbfc2787eeebacbbcfd21415d1ea6a3796ef18434ddfad0f63f6df3027eea5d286e08eda892e21cae66e3f25ffee9d6a2a3327b841e5377 SHA512 ba3bad3b911fdd767b6c770209e93dfc367c6228117a5d85bfa95d70ec66df9842f3cf788ac560d1255415dba49028187542000b9a71fbe79ec51a386afda38f
 DIST memchr-2.1.3.crate 20069 BLAKE2B 6afd95538abae42fdb22b82964b64657555734f2505e12c650f844b91d60a3f6f61277065e15289b6e6b7ef8ae5345674ce7465ce2320822e13734949ddcd49c SHA512 95fca57233f023191da0c0abf4835c63ca38404b05c2021e1fcb910068c29321e0b89660088e1be432ed8aea2c4d53f14587e08dba0b258892f2e608606b3b57
-DIST nitrocli-0.2.3.crate 60731 BLAKE2B 52e8a13179ef0391698b87e0172b4beae902c7586b48718538e55f2497a1d31dd645224041a81c8311512a905cd574f34f817b66b2b2f469c1a278437a6cba93 SHA512 e3467dedecc27dbe8b818c63bce9e29d22bf65af03ff53c4f85f1c3730f4b55a359dfe210875efdc8bee7e05147e066ca963d9a5ff1b68b5fc258c8a7d4d82e0
 DIST nitrocli-0.2.4.crate 63798 BLAKE2B 64a4998f9b232993692f85ca3890ecdd20e1027dee61b6f31f06be459a02f11a3cff2c035aa462ee5ea1d680f9e201e25cffdd4ca8d54de80c13d78d9a877fa4 SHA512 cf10287591d55378956118a213e4f9752087be37c67d4c89f7660f51c98dbbf3a877afaf11af7625d3776bdf2c7944b25637873af70119d514f2be93131f9733
 DIST nitrokey-0.3.4.crate 27462 BLAKE2B 07412e0d3d98a0fcaa54be3d494b107a0a4d999da41dc39f8710a5eb845911d175ca15918e212a1025a34e3ddfff89b5ca4a138d66effd47b639afcb19572ca4 SHA512 abb43ca94b7d4ba55cfabce56b712c99bc4e50671149ae2001de77c2cfae25f17465130729a4a856005a692b846c67b54b2992e41b708e8ad94a8c3af0843e20
 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 proc-macro2-0.4.26.crate 33854 BLAKE2B 833db134470a8f12342248c514b08463836ea22eec90162ba96364686e593e3048fe16de669316d88ed5f44b27f948613cf98f4952d49f6b5f37f2da51584c2d SHA512 e35ce0e0a05559417475abc402ef88e6214d7f27ee6cff35577077c5334ec7c6dd5d1d8099f25617391cd4fd2f54838a16ae74039ea6f99ea1d2f0ef58dec010
-DIST quote-0.6.10.crate 15795 BLAKE2B f81cf2cc13efb42bcf90f4c9cce832d94b2138428d133516d579a0eed157bacda9f5b29cd1c604a89261390ec011fe4825c31788486db007efd97fbb3de261f6 SHA512 92250a3664fe872175ee8c8aa7c4fec121ffe6fcec11a957646fab1297e9e946be03924ce1d7897125cdc0d4883400ac05774ed55a32f943a129fa8d48a1a162
 DIST quote-0.6.11.crate 17283 BLAKE2B 04fa278094e505b806324d572154755d2696a6248ec6afb3aa5ea97ec2556e5b845cec3da1089ca321681591c0ca417caee1d51d7a2b57fc411c3f8270a0aea2 SHA512 5fd4936542eec530bbd33b1ee600746ed5c003eaf31c8aebf910fc1372d5ab91cfb10fbfe2a990a49e5eed88747f99d52cd430b34e0a5cce688094e55eeef4cd
-DIST rand_core-0.3.0.crate 20581 BLAKE2B fe46ab0ef5fe8f5f5695906336683350abd7aca246a537e2e4bc9fcf10686d39aaac259584f17c022200ec1139e01e817f71caf33933ad3f353baa10e6cd11ab SHA512 a476510ef936571e3351f42e0f1c615530732b7c66f41975fef10dc6b8f4d8536a6d8166bb90d6da2bb997108ee3e87f4d80884264b239680e6ffd3494dcb748
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
 DIST rand_core-0.4.0.crate 20326 BLAKE2B ff85118d2b5c793e3da37bd4d75032e2d73a87bbba0b4c0c07057c47c67b7e919e5c4458b4c929e3b55f53cd3ae6579be5d434369d307e962c00fb3272862937 SHA512 f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845
-DIST rand_os-0.1.1.crate 18553 BLAKE2B 5b74bbce5ee3f20f7c92204c4b60f9450b3a19518356c70737c8dad9873da775c90b8786bc75f0fa166388f6bfc585240c56445a39603704df5e99a4c505e17a SHA512 a7ccc054fd4a60e868520af3fc15e6eb22e62411975923e4d968a4825a48cbf87238338cbf1336792d996da5cc2183ac465a6bf8094358f0e5fc56380ce16193
 DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
 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 regex-syntax-0.6.5.crate 272475 BLAKE2B b2ff299b4b87ab91c925a10faa8a09507272600a12558cade5b18ce615844223384e8420f2025dbd642bf80acb5f608a6c0f5ca59a4c391d4f417fdea15058b0 SHA512 37f2c69b425335a28b8945fcd58a3a39a9adde5588fdcd4b460da0fbd137e0727a7835d71b4e87ff29185c153379402891847d93047e40a578f778a62b324f5d
-DIST syn-0.15.23.crate 145369 BLAKE2B f66939982ee09090f2baf1cc4522615e6975d4350c7c65b3b0a3568cd3b3aef04231f6c23b818333107af784780366cafe7d726f03f346ed227c1db6cca522c1 SHA512 d447ec08199d36e289ea303ee8e871e13e002a4d67c396187ef56eb16b69cf21d64becd24fd8d2f7a1c826685f7b6df747903e7eb8cc5c334ee0528998597128
 DIST syn-0.15.26.crate 145493 BLAKE2B ede140e0184464e765413aa4875a07ab9329de60eba6aa46253d2880032b84a56348060396ffec8a5d81a2aa22c6a6eca73c425778ead21c1c55ffb657cf3718 SHA512 947d70dff83ffd33fda806597d54e572555b54c1600e357df919165fdc7141c6f9762b37f25f9b850e8a7775c33b6df3fc93f3eff12b36b059e696ad90619baa
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
 DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
-DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD nitrocli-0.2.3-r1.ebuild 1500 BLAKE2B d87f8fadc7af892145f84191279938cec8d4c39b56a8c2bb2c9bd33e9107f97cf29dfa7cd3b61d541c42b5661ea8e4469a61d6892eb63ad06da0dc2ae710a94f SHA512 e6eacfb0442e915ccb3d164ceb0229fc94b8fdf04d82a3a41ff6f29273cfd0348e1a06db4561ef121d6e4fb79df5ef95ba79f95aa4c563dd8458dc14a9ea868f
-EBUILD nitrocli-0.2.4.ebuild 1382 BLAKE2B 3757d9ddfeb7b0be189d95f2ab63be087996dcde5009524db2d7bd66d7bafdaca71dbd6495d5a855411f966d080ae4908a77d9489b24bd5bca567127fc596d7d SHA512 3a566cf66fdbb387adb6027215d6b3d52c2833620ae4a318647c243ffa0446d9c780112790f2be5b2178a91f6901c1c1781b0a2c79ac32389f9f4bbd10497702
+EBUILD nitrocli-0.2.4.ebuild 1404 BLAKE2B c55db4237e6da0c17bc4038e3c2c15f7c86a060aa8112015285b6b10559432e49b377caf496b6c0cca99affff63660de91f5a488111895a51f601732de475c08 SHA512 715f67f86d29ac16d78d3ad90423f46cf04cab040fabb6449f9d0669898e836cbfe22923fc44eb15d741a1cf7d54698963f458d5064b9663c909a0d9ab8e640c
 MISC metadata.xml 683 BLAKE2B a973761f8df97168483a0adc13bf44f088f13fb9c472986cffed08d53f69cdbc27a4bc195babcd86796853968c8face6c00004e060086b2ba4d09c52ce978815 SHA512 3f4615ba5af13e358c1c3a4b28c3dbec77c0b99af4692c0b2feedb4f21a1e5f8f76cb7fbd2cdaa5a8c899d340094b8029a6967dd68d591586bef551f8eb61b1f
diff --git a/app-crypt/nitrocli/files/nitrocli_-_fix-rust-1.35-build.patch b/app-crypt/nitrocli/files/nitrocli_-_fix-rust-1.35-build.patch
deleted file mode 100644
index d5da3b1f48de..000000000000
--- a/app-crypt/nitrocli/files/nitrocli_-_fix-rust-1.35-build.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 5383aa73b339e6a53ff027ee6012a3428f67466a Mon Sep 17 00:00:00 2001
-From: Daniel Mueller <deso@posteo.net>
-Date: Fri, 24 May 2019 17:39:14 -0700
-Subject: [PATCH] Allow for unused doc comments on macros
-
-With Rust 1.35 we get compile errors due to doc comments that are added
-to macro invocations but not actually included in the expanded output.
-The rustc wrongly assumes that we want to document the resulting code
-and not just provide details about the invocation itself.
-This change explicitly allows for those cases. Alternatively we could
-have "downgraded" the doc comments to normal comments or removed them
-altogether. There is little difference between those alternatives.
----
- nitrocli/src/args.rs     | 2 ++
- nitrocli/src/pinentry.rs | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/nitrocli/src/args.rs b/nitrocli/src/args.rs
-index 7f0bfc..7e4f83 100644
---- a/nitrocli/src/args.rs
-+++ b/nitrocli/src/args.rs
-@@ -101,6 +101,7 @@ impl<'io> Stdio for ExecCtx<'io> {
- }
- 
- /// The available Nitrokey models.
-+#[allow(unused_doc_comments)]
- Enum! {DeviceModel, [
-   Pro => "pro",
-   Storage => "storage"
-@@ -116,6 +117,7 @@ impl From<DeviceModel> for nitrokey::Model {
- }
- 
- /// A top-level command for nitrocli.
-+#[allow(unused_doc_comments)]
- Enum! {Command, [
-   Config => ("config", config),
-   Lock => ("lock", lock),
-diff --git a/nitrocli/src/pinentry.rs b/nitrocli/src/pinentry.rs
-index 837032..8bab65 100644
---- a/nitrocli/src/pinentry.rs
-+++ b/nitrocli/src/pinentry.rs
-@@ -30,6 +30,7 @@ type CowStr = borrow::Cow<'static, str>;
- ///
- /// The available PIN types correspond to the PIN types used by the Nitrokey devices:  user and
- /// admin.
-+#[allow(unused_doc_comments)]
- Enum! {PinType, [
-   Admin => "admin",
-   User => "user"
--- 
-2.21.0
-
diff --git a/app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild b/app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild
deleted file mode 100644
index fb74af29209c..000000000000
--- a/app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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
-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_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
-"
-
-inherit cargo
-
-DESCRIPTION="A command line application for interacting with Nitrokey devices"
-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 ~x86"
-IUSE=""
-
-BDEPEND="
-	>=virtual/rust-1.31.0
-"
-DEPEND="
-	dev-libs/hidapi
-"
-# We require gnupg for /usr/bin/gpg-connect-agent.
-RDEPEND="
-	${DEPEND}
-	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_prepare() {
-	eapply -p2 "${FILESDIR}/${PN}_-_fix-rust-1.35-build.patch"
-	default
-}
-
-src_install() {
-	cargo_src_install --path=.
-
-	einstalldocs
-	doman "doc/nitrocli.1"
-}
diff --git a/app-crypt/nitrocli/nitrocli-0.2.4.ebuild b/app-crypt/nitrocli/nitrocli-0.2.4.ebuild
index 9ee7ee1a7e43..74bf7e9cd067 100644
--- a/app-crypt/nitrocli/nitrocli-0.2.4.ebuild
+++ b/app-crypt/nitrocli/nitrocli-0.2.4.ebuild
@@ -43,7 +43,7 @@ DESCRIPTION="A command line application for interacting with Nitrokey devices"
 HOMEPAGE="https://github.com/d-e-s-o/nitrocli/tree/master/nitrocli"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 
-LICENSE="GPL-3+"
+LICENSE="Apache-2.0 GPL-3+ LGPL-3 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index d4ba30f942e9..8ff0528c587e 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -1,7 +1,3 @@
-AUX veracrypt-1.19-execstack-fix.patch 1682 BLAKE2B ce050f900ac6504242941322b910c74c79128d132a372b89070cf6939b5b55c6853617a8c2e49019d4cc4bc1eb872b0753c9287b3e500613bef63f74ef5ba48e SHA512 df7e64a7badfdf97447991cba7c7f87c291c89735b1ffc72b2cc882da05b2df2e2c31ee9aef4415c4d0316bc6e0a9c6c10e01406c00bd0f032931e55cd6465bc
-AUX veracrypt-1.19-makefile-archdetect.patch 743 BLAKE2B 3eda2de96eb095cf51a806d7a8b06a79edeb03425ad6106a6ec72de0d76da8988dd953e58b4b5b321ee64d3d810ff8d312efddaabea0c8083b858430525a7ae0 SHA512 aa805312c5e3782452ac936a3772a0877e866e1116f2da56747b72a6f585538fd1e45a7c7531c426ff0245b5b3ac4964065e1196874aea4c11e91ac59bd6fffd
-AUX veracrypt-1.19-remove-packaging-from-makefile.patch 2098 BLAKE2B 7588a0de42a5e561dea67c04b0056bd483ffdac0e407a640440d0b7d2723a66368c1eeebaf10c95e31a0114acd013e4d24d138a4aebc876fae51b2da0c9bcffe SHA512 e6485ce39ca009cfabe5656b3ed81cd72ca0207d9b1c310738be60705e3c94f2364cacf393b7f1d0d3e79a1ee58794dfda1d01aaa03778597c149a9dfc5634dc
-AUX veracrypt-1.22-sysmacros-fix.patch 1190 BLAKE2B 33130133b9bf3708eed0d2fa304850e216db9918c326be1aa78d06fa6ace1566fb03928731b096948a5dd9ee47accd10698496f6b1f1626acf2c6eceeefad9df SHA512 fbb1d411755669849fc343c8dd729cb804ec70f0ff1736faf864850e496628b6697dc3e4a821f31e31462e833391c30ff7c8883d014cb5b4ff3b853c6769fc15
 AUX veracrypt-1.24-no-gui-fix.patch 1004 BLAKE2B 5a6d5a8537e284e5f8f3b18a271ed18f0719dff20fbe180c64289cf6841cb987db5132760d16329b0fe2a0d80be41647d7e5438d27b2b4991fb09940a955ae3b SHA512 6955a7c267bb4949e4873d436eeafb1009404dcd7eb6ebc5b7795a45aaf78f840eed44bad533d38775eaa416879f334c392dc2f42b3749da17fd4422b451d54b
 AUX veracrypt.init 387 BLAKE2B 7f16dee40bceed81ca092a3be6a2cd71f24f5cc8b4e4b143bd6ddde046e1ecce0cd674f52e7adb406893ef57c5b73462157832ff279114a2079c0ff84839e0dc SHA512 986b52c454abd9a64a6e8eb93247983c48d9524c396f253bc16f68894fed0abe87614343ce9c9127f8fb180f12912b21f57063f8f3b43bdca5344c130eb6c72d
 DIST VeraCrypt_1.23.tar.gz 24941166 BLAKE2B f9760342678f771192434f88a9b6c3bcc348ef312197232346731f51e972c230a4627f92fd655f7a3c7582b1f728274b7f170f885cceadce6ad53c9b404cd8d6 SHA512 433e717403560fc4f9081f528168f346ed7f14f9621b78a176c6801f14caba3d57e3228b940fb746637de29893f278ade650cf5eca63490bc236987a9db4d48d
diff --git a/app-crypt/veracrypt/files/veracrypt-1.19-execstack-fix.patch b/app-crypt/veracrypt/files/veracrypt-1.19-execstack-fix.patch
deleted file mode 100644
index 9b1e634bd4cc..000000000000
--- a/app-crypt/veracrypt/files/veracrypt-1.19-execstack-fix.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- src/Crypto/Aes_hw_cpu.asm.old
-+++ src/Crypto/Aes_hw_cpu.asm
-@@ -328,3 +328,12 @@
-
-
- %endif	; __BITS__ != 16
-+	%ifidn __OUTPUT_FORMAT__,elf
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
-+	%ifidn __OUTPUT_FORMAT__,elf32
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
-+	%ifidn __OUTPUT_FORMAT__,elf64
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
---- src/Crypto/AesSmall_x86.asm.old
-+++ src/Crypto/AesSmall_x86.asm
-@@ -1442,3 +1442,12 @@
-     db  v8(0xe1),v8(0x69),v8(0x14),v8(0x63),v8(0x55),v8(0x21),v8(0x0c),v8(0x7d)
-
- %endif
-+	%ifidn __OUTPUT_FORMAT__,elf
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
-+	%ifidn __OUTPUT_FORMAT__,elf32
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
-+	%ifidn __OUTPUT_FORMAT__,elf64
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
---- src/Crypto/Aes_x64.asm.old
-+++ src/Crypto/Aes_x64.asm
-@@ -905,3 +905,12 @@
- %endif
-
- %endif
-+	%ifidn __OUTPUT_FORMAT__,elf
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
-+	%ifidn __OUTPUT_FORMAT__,elf32
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
-+	%ifidn __OUTPUT_FORMAT__,elf64
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
---- src/Crypto/Aes_x86.asm.old
-+++ src/Crypto/Aes_x86.asm
-@@ -644,3 +644,12 @@
-     do_exit
-
- %endif
-+	%ifidn __OUTPUT_FORMAT__,elf
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
-+	%ifidn __OUTPUT_FORMAT__,elf32
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
-+	%ifidn __OUTPUT_FORMAT__,elf64
-+	section .note.GNU-stack noalloc noexec nowrite progbits
-+	%endif
diff --git a/app-crypt/veracrypt/files/veracrypt-1.19-makefile-archdetect.patch b/app-crypt/veracrypt/files/veracrypt-1.19-makefile-archdetect.patch
deleted file mode 100644
index 41fc6d521c66..000000000000
--- a/app-crypt/veracrypt/files/veracrypt-1.19-makefile-archdetect.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 181857089b11045c701e9195275a408430beb580 Mon Sep 17 00:00:00 2001
-From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
-Date: Sat, 5 Nov 2016 23:39:46 +0100
-Subject: [PATCH] Linux: Always use "uname -m" to determine processor type.
- This fixes Slackware build issue.
-
----
- src/Makefile | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 7bfc5ad..00e6e5b 100644
---- src/Makefile
-+++ src/Makefile
-@@ -131,10 +131,7 @@ export PLATFORM_UNSUPPORTED := 0
- export CPU_ARCH ?= unknown
- export SIMD_SUPPORTED := 0
- 
--ARCH = $(shell uname -p)
--ifeq "$(ARCH)" "unknown"
--	ARCH = $(shell uname -m)
--endif
-+ARCH = $(shell uname -m)
- 
- ifneq (,$(filter i386 i486 i586 i686 x86,$(ARCH)))
- 	CPU_ARCH = x86
diff --git a/app-crypt/veracrypt/files/veracrypt-1.19-remove-packaging-from-makefile.patch b/app-crypt/veracrypt/files/veracrypt-1.19-remove-packaging-from-makefile.patch
deleted file mode 100644
index 5aad4b9fb74d..000000000000
--- a/app-crypt/veracrypt/files/veracrypt-1.19-remove-packaging-from-makefile.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- src/Main/Main.make.orig
-+++ src/Main/Main.make
-@@ -190,49 +190,6 @@
- 	rm -fr "$(PWD)/Setup/MacOSX/VeraCrypt_dmg"
- endif
-
--
--
--ifeq "$(PLATFORM)" "Linux"
--ifeq "$(TC_BUILD_CONFIG)" "Release"
--	mkdir -p $(PWD)/Setup/Linux/usr/bin
--	mkdir -p $(PWD)/Setup/Linux/usr/share/$(APPNAME)/doc
--	cp $(PWD)/Main/$(APPNAME) $(PWD)/Setup/Linux/usr/bin/$(APPNAME)
--	cp $(PWD)/Setup/Linux/$(APPNAME)-uninstall.sh $(PWD)/Setup/Linux/usr/bin/$(APPNAME)-uninstall.sh
--	chmod +x $(PWD)/Setup/Linux/usr/bin/$(APPNAME)-uninstall.sh
--	cp $(PWD)/License.txt $(PWD)/Setup/Linux/usr/share/$(APPNAME)/doc/License.txt
--	cp "$(PWD)/Release/Setup Files/VeraCrypt User Guide.pdf" "$(PWD)/Setup/Linux/usr/share/$(APPNAME)/doc/VeraCrypt User Guide.pdf"
--
--ifndef TC_NO_GUI
--	mkdir -p $(PWD)/Setup/Linux/usr/share/applications
--	mkdir -p $(PWD)/Setup/Linux/usr/share/pixmaps
--	cp $(PWD)/Resources/Icons/VeraCrypt-256x256.xpm $(PWD)/Setup/Linux/usr/share/pixmaps/$(APPNAME).xpm
--	cp $(PWD)/Setup/Linux/$(APPNAME).desktop $(PWD)/Setup/Linux/usr/share/applications/$(APPNAME).desktop
--endif
--
--
--	tar cfz $(PWD)/Setup/Linux/$(PACKAGE_NAME) --directory $(PWD)/Setup/Linux usr
--
--	@rm -fr $(INTERNAL_INSTALLER_NAME)
--	@echo "#!/bin/sh" > $(INTERNAL_INSTALLER_NAME)
--	@echo "VERSION=$(TC_VERSION)" >> $(INTERNAL_INSTALLER_NAME)
--	@echo "PACKAGE_TYPE=tar" >> $(INTERNAL_INSTALLER_NAME)
--	@echo "PACKAGE_NAME=$(PACKAGE_NAME)" >> $(INTERNAL_INSTALLER_NAME)
--	@echo "PACKAGE_START=1107" >> $(INTERNAL_INSTALLER_NAME)
--	@echo "INSTALLER_TYPE=$(INSTALLER_TYPE)" >> $(INTERNAL_INSTALLER_NAME)
--
--	@cat $(PWD)/Setup/Linux/veracrypt_install_template.sh >> $(INTERNAL_INSTALLER_NAME)
--	@cat $(PWD)/Setup/Linux/$(PACKAGE_NAME) >> $(INTERNAL_INSTALLER_NAME)
--	chmod +x $(INTERNAL_INSTALLER_NAME)
--
--	rm -fr $(PWD)/Setup/Linux/packaging
--	mkdir -p $(PWD)/Setup/Linux/packaging
--	cp $(INTERNAL_INSTALLER_NAME) $(PWD)/Setup/Linux/packaging/.
--	makeself $(PWD)/Setup/Linux/packaging $(PWD)/Setup/Linux/$(INSTALLER_NAME) "VeraCrypt $(TC_VERSION) Installer" ./$(INTERNAL_INSTALLER_NAME)
--
--endif
--
--endif
--
- $(OBJS): $(PCH)
-
- Resources.o: $(RESOURCES)
diff --git a/app-crypt/veracrypt/files/veracrypt-1.22-sysmacros-fix.patch b/app-crypt/veracrypt/files/veracrypt-1.22-sysmacros-fix.patch
deleted file mode 100644
index 702e8f702ecd..000000000000
--- a/app-crypt/veracrypt/files/veracrypt-1.22-sysmacros-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0a50becec3a3cca71e575dfec35d69ab295c85cc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
-Date: Tue, 3 Apr 2018 23:06:20 -0400
-Subject: [PATCH] Platform/Unix: include <sys/sysmacros.h> for major/minor
- macros
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Starting with glibc 2.26, macros "major" and "minor" are only
-available from <sys/sysmacros.h> [0]. The build fails with the
-following without including this header:
-
-Unix/FilesystemPath.cpp:84:49: error: ‘major’ was not declared in this scope
-Unix/FilesystemPath.cpp:84:113: error: ‘minor’ was not declared in this scope
-
-[0] https://sourceware.org/ml/libc-alpha/2017-02/msg00079.html
----
- src/Platform/Unix/FilesystemPath.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Platform/Unix/FilesystemPath.cpp b/src/Platform/Unix/FilesystemPath.cpp
-index d6c9cd2..7c28af4 100644
---- a/Platform/Unix/FilesystemPath.cpp
-+++ b/Platform/Unix/FilesystemPath.cpp
-@@ -15,6 +15,7 @@
- #include "Platform/StringConverter.h"
- #include <stdio.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- 
- namespace VeraCrypt
- {
--- 
-2.16.3
-
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-10 13:21:36 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-10 13:21:36 +0000
commit	77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch)
tree	5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /app-crypt
parent	bd4aeefe33e63f613512604e47bfca7b2187697d (diff)