gentoo resync : 30.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-30 17:36:28 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-30 17:36:28 +0100
commit: 7014a5a3ea0feffab9701fdd6b64cc7667a985af (patch)
tree: f2cbbaa8bb9209cd15208721103228336149b799 /app-crypt
parent: 7a86906b67693cc65671d3e1476835d3a7e13092 (diff)
25 files changed, 151 insertions, 214 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index f78caef77a95..61c6144e831d 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index f871c2d2d6bf..9d2efe4e5c9a 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979
 DIST certbot-0.34.2.tar.gz 1347778 BLAKE2B 57195e3a7a3481c4c1fa184035b73b8b5e06a33f37b317d895381ec6c4b57852a475a3b76593b8fee9922f731512ed0d0423afa26b5c04138d24781df9da42f0 SHA512 63923b1d433f4c714318e848335e696e2412c574cc16f4fb1631caeebdce5a7f599985cf450e96dceb87a958c8f09a003e1d2f24eac1bdc183c7a5c43bb362de
 DIST certbot-0.35.0.tar.gz 1333065 BLAKE2B 8bd4fd735e68f24ee7c0533b18b63e2924eab9dcef78250f5d7094fbb04f78acca1c11cefae48e25da637a01a7dcd004f22926923b63a39206b63133193793a1 SHA512 ca94858aca5c6849dd6667d1e96389d80a7882de9a4deeda28d244ac105c1524dddb100dc899e4fabdef908607956617e26640b8e573b04a0625e19413c23bee
-EBUILD acme-0.33.1-r1.ebuild 1681 BLAKE2B 020b1e9b09cc794ebd39ecffeaa904e260b375dd1bd853e62c926d6065501da6cec10977fcf45b7addc660e85b838012e1a5bacfa4f7015ab62496672a0138b3 SHA512 5330cefe084d1b20801bc34b7c8ef30f9f4891f9f3407b28ed84a307b7afe574a2df7bea29fbf208c09520b5075b1c8195e48cd6ba3051387dca8b0bf86d84da
 EBUILD acme-0.34.2.ebuild 1717 BLAKE2B d79a119ee31160c29560401a6a9699f3a2a59995b237e0a559b8c9116cca8f8ef1536b43edb4508fc401df8ce17b5dd91a2a46193660b7478e65831e22b34004 SHA512 66fae749e643082bed24c9dbae62b38dc4f40dc5571da4cf848ea3cca0adda42c89228e9e537df793cfabc5e981b4059c6ae9ddec5d38df986f270862efdf7b2
-EBUILD acme-0.35.0.ebuild 1723 BLAKE2B a5abd27f54ec47307fa0ced1cc3ae85c9747195848709ca395ae4a64f962ea2c0787b82eabf39ca5598bbc67abf51a05e473d390c8ca367989e6f871498a1653 SHA512 9a2ab0cdcfbc81bf6fb9e32de5449264579257f5ac185f80e4f83607bbc99730996cb16d4276005fa5cfe3b31df2a0db310ebf3fa25b6c631675d408a040dcb2
+EBUILD acme-0.35.0.ebuild 1721 BLAKE2B 26118df6502f483bbeb7e0a213ebd5f4ba759712acbc3d99acb5d5452364707d14dbb443bcaed7f118cac84c2e3276b8cc8df5fa9b40fe06ed700ca11277d1db SHA512 4501fe5c2ce4a63b86e4a3898a8db9e5d488e1e00f32b58af36e79a86f35ba399001c630eb3113d764740c62cdc66e212ab8594dc961009c7d0e11bf675e44d3
 EBUILD acme-9999.ebuild 1723 BLAKE2B a5abd27f54ec47307fa0ced1cc3ae85c9747195848709ca395ae4a64f962ea2c0787b82eabf39ca5598bbc67abf51a05e473d390c8ca367989e6f871498a1653 SHA512 9a2ab0cdcfbc81bf6fb9e32de5449264579257f5ac185f80e4f83607bbc99730996cb16d4276005fa5cfe3b31df2a0db310ebf3fa25b6c631675d408a040dcb2
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-0.33.1-r1.ebuild b/app-crypt/acme/acme-0.33.1-r1.ebuild
deleted file mode 100644
index 52953d1abca7..000000000000
--- a/app-crypt/acme/acme-0.33.1-r1.ebuild
+++ /dev/null
@@ -1,67 +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_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="doc 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/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-0.35.0.ebuild b/app-crypt/acme/acme-0.35.0.ebuild
index 3acd37f75f8e..9a9b63c8fa3c 100644
--- a/app-crypt/acme/acme-0.35.0.ebuild
+++ b/app-crypt/acme/acme-0.35.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 80c1b829db2f..596cbc5f1f36 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979
 DIST certbot-0.34.2.tar.gz 1347778 BLAKE2B 57195e3a7a3481c4c1fa184035b73b8b5e06a33f37b317d895381ec6c4b57852a475a3b76593b8fee9922f731512ed0d0423afa26b5c04138d24781df9da42f0 SHA512 63923b1d433f4c714318e848335e696e2412c574cc16f4fb1631caeebdce5a7f599985cf450e96dceb87a958c8f09a003e1d2f24eac1bdc183c7a5c43bb362de
 DIST certbot-0.35.0.tar.gz 1333065 BLAKE2B 8bd4fd735e68f24ee7c0533b18b63e2924eab9dcef78250f5d7094fbb04f78acca1c11cefae48e25da637a01a7dcd004f22926923b63a39206b63133193793a1 SHA512 ca94858aca5c6849dd6667d1e96389d80a7882de9a4deeda28d244ac105c1524dddb100dc899e4fabdef908607956617e26640b8e573b04a0625e19413c23bee
-EBUILD certbot-apache-0.33.1.ebuild 1074 BLAKE2B 4a0867a89a9a3f9cce6771b3c7e1b44f1e644b03ad3f5318fb0d1c4411f1b8b18c8cb6f902558effbbc10f2bf31961119d97af1ddaf51c7b962eea545b0486d5 SHA512 a281f2cfe0b59ceaa3caa5e0aa06deef85d6dd3b07d83e3b8d6078822d203a6fd5658eb61fa72b71f0dcf99d98bdaceda2472f09678b2fb2165dd6f4f20a4c9a
 EBUILD certbot-apache-0.34.2.ebuild 1074 BLAKE2B c5cdddb672beda71b886588f9df403a9dfa0ae92f1d5f2b67746f4b0e33faa7cb52f38da0fe290464972275cdbc99dea098d586142ea713d04c3d26617d0f455 SHA512 bdb9dfefaa8555e19f2cb3cbee2e9d8a3c62f29c64cc44fd62896a7ff241fd8f13b6e5b107defc091457068b9b7f5396f0a813a23bf922f790b0b654ffc1dbf9
-EBUILD certbot-apache-0.35.0.ebuild 1080 BLAKE2B 441715a50c110b85b886389f1f94822669ca4167b4a068c2b5b0a8b984f37e4e45168e330e5dafc3e0414e3192354b6d7a1de0897e084a11ab5b05509d89bdec SHA512 afedc9ecd49619d81e8151da98d6676a8684ceaf1b72eb7c428e9534ab86c0e04eb01b4b779613bcad9e89900485e10dd2784fc65f7ab5d94af5722d944ee2f6
+EBUILD certbot-apache-0.35.0.ebuild 1078 BLAKE2B f6202405b2f3d32dc26c85adc764f6e42b439f913636e779b7f176f5f4b4eaa50ec89227db22f244560f0ac8a47e45f8e73a459dfce93f9f2ae13e1b3adce372 SHA512 272fe8be7e2edb704150dd844fb499e116ea26c836a182f326e3d4706cd8d72565f5d33ad7a7e4841fee669df631f16028656f9390962a727b513c279d4c76fb
 EBUILD certbot-apache-9999.ebuild 1080 BLAKE2B 441715a50c110b85b886389f1f94822669ca4167b4a068c2b5b0a8b984f37e4e45168e330e5dafc3e0414e3192354b6d7a1de0897e084a11ab5b05509d89bdec SHA512 afedc9ecd49619d81e8151da98d6676a8684ceaf1b72eb7c428e9534ab86c0e04eb01b4b779613bcad9e89900485e10dd2784fc65f7ab5d94af5722d944ee2f6
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.33.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.33.1.ebuild
deleted file mode 100644
index 042b6c7ce4d1..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-0.33.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_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.35.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.35.0.ebuild
index 3a00f63544a8..c2457408e80e 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.35.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.35.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index be51f08a5214..dcba1c963f95 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979
 DIST certbot-0.34.2.tar.gz 1347778 BLAKE2B 57195e3a7a3481c4c1fa184035b73b8b5e06a33f37b317d895381ec6c4b57852a475a3b76593b8fee9922f731512ed0d0423afa26b5c04138d24781df9da42f0 SHA512 63923b1d433f4c714318e848335e696e2412c574cc16f4fb1631caeebdce5a7f599985cf450e96dceb87a958c8f09a003e1d2f24eac1bdc183c7a5c43bb362de
 DIST certbot-0.35.0.tar.gz 1333065 BLAKE2B 8bd4fd735e68f24ee7c0533b18b63e2924eab9dcef78250f5d7094fbb04f78acca1c11cefae48e25da637a01a7dcd004f22926923b63a39206b63133193793a1 SHA512 ca94858aca5c6849dd6667d1e96389d80a7882de9a4deeda28d244ac105c1524dddb100dc899e4fabdef908607956617e26640b8e573b04a0625e19413c23bee
-EBUILD certbot-nginx-0.33.1.ebuild 1008 BLAKE2B 59d075f34cbe0a2c0714014493ed9aa3d5fef243de2002af6c6281f5867599f2d1936cfe893095628986793a4d0f59c397a6b27c4909dc91027d1063e4b6816e SHA512 7884dbb738ff661c5654d44e657edd8d516391e5186e5f6d712b316208f467c8e602964d6dacb3ca49932f36eeaf3b9755d79db85078cc0af07e221551adee2d
 EBUILD certbot-nginx-0.34.2.ebuild 1008 BLAKE2B fcbf557f46b9d95f8343fab692cd39c367eb032d7246f1743982f508300b1cd2197ce771913cd4ce3e7b76e41ca28188ce381f22f1b1210a93c6ae01ef079f7d SHA512 d34a4b26bd89db4e06b1505bebc66b8364ef0928fbbdf310f32b4f782cb523e7397e37156ea21c2342ebed460e0d890c0807f09a9e2e9297f2717b771a8c58ef
-EBUILD certbot-nginx-0.35.0.ebuild 1014 BLAKE2B 82e082a1043f8eb283be0379a6a2d30510c2d1e02555cda56653a7b918caf0ce05f68206705f2ebe1638e144ead2e210af63ab761ece3ab5c8eea25bc09832b8 SHA512 a1f6ab23a4408d38d567d13a452aa6f2615c8ad6d1892c1dda8c7ce06485912c4ad563865ce4d212d40ec3c317781500156de1d70e730775e7b71dcc12972b99
+EBUILD certbot-nginx-0.35.0.ebuild 1012 BLAKE2B a51b087a4d449a43ebe99b1fe15968664a591e20d9aef664c35ec2ff2241017a37ccb1c8fdabb4a4fde9b820ed2a231ef3d4a059657d8b37d08caa5210d0ceb6 SHA512 55f3b3726e531bc885ce88003f438650bc42c9ccc8f09f811ef573538fa435d0b55d9d58b68de97ca084cc0bdd1f8e3c7c39784bf1a3ad9ab7999fe5b182f790
 EBUILD certbot-nginx-9999.ebuild 1014 BLAKE2B 82e082a1043f8eb283be0379a6a2d30510c2d1e02555cda56653a7b918caf0ce05f68206705f2ebe1638e144ead2e210af63ab761ece3ab5c8eea25bc09832b8 SHA512 a1f6ab23a4408d38d567d13a452aa6f2615c8ad6d1892c1dda8c7ce06485912c4ad563865ce4d212d40ec3c317781500156de1d70e730775e7b71dcc12972b99
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.33.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.33.1.ebuild
deleted file mode 100644
index 721047150f81..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-0.33.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_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/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-0.33.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.35.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.35.0.ebuild
index 3eea110a0e53..4f434ea7fe48 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.35.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.35.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index fa297e5e2b0e..785de5fdf5da 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979
 DIST certbot-0.34.2.tar.gz 1347778 BLAKE2B 57195e3a7a3481c4c1fa184035b73b8b5e06a33f37b317d895381ec6c4b57852a475a3b76593b8fee9922f731512ed0d0423afa26b5c04138d24781df9da42f0 SHA512 63923b1d433f4c714318e848335e696e2412c574cc16f4fb1631caeebdce5a7f599985cf450e96dceb87a958c8f09a003e1d2f24eac1bdc183c7a5c43bb362de
 DIST certbot-0.35.0.tar.gz 1333065 BLAKE2B 8bd4fd735e68f24ee7c0533b18b63e2924eab9dcef78250f5d7094fbb04f78acca1c11cefae48e25da637a01a7dcd004f22926923b63a39206b63133193793a1 SHA512 ca94858aca5c6849dd6667d1e96389d80a7882de9a4deeda28d244ac105c1524dddb100dc899e4fabdef908607956617e26640b8e573b04a0625e19413c23bee
-EBUILD certbot-0.33.1.ebuild 1358 BLAKE2B dd1f1d87864da2747a2ab9f043bc18a2a783827febfa1ed7d8a6ba2b2b3b51e6a11820840745f49dcf34dbbff1ceefa5de517e66ab698529a628e9f5e2ba3575 SHA512 fa59ee71d7f9b058667f705c18acd49b845988c316cf27e2881383f61d7f784193bfaa83c28472543a7115043c9778ae333a882bf77f7b64f82a8d6ed1708275
 EBUILD certbot-0.34.2.ebuild 1358 BLAKE2B dd1f1d87864da2747a2ab9f043bc18a2a783827febfa1ed7d8a6ba2b2b3b51e6a11820840745f49dcf34dbbff1ceefa5de517e66ab698529a628e9f5e2ba3575 SHA512 fa59ee71d7f9b058667f705c18acd49b845988c316cf27e2881383f61d7f784193bfaa83c28472543a7115043c9778ae333a882bf77f7b64f82a8d6ed1708275
-EBUILD certbot-0.35.0.ebuild 1364 BLAKE2B fc049f9649de92130c0cc56eadfffc37953e5adb238cb2b06ab4eee90f2da4410f31d4c2a850549df74b3c471b718310b9b70135687bc4fb1240343850426e39 SHA512 d320f137873e85b0749f4f972ee1cff33935c21a475cdcb7953c758f384d1b67c16d2d181abb401666ba1d5fac976802b5dc525009e431c724277d7d5bc39d29
+EBUILD certbot-0.35.0.ebuild 1362 BLAKE2B d215d662ab3473887174293b851fba1665994db257c7bb76a80a5bca35fafa4069f65e141e7671ec4bd3037a8288fac0a55bad048df02d53e2eb933278b41465 SHA512 18717cf683386bf8b58bb401a26f4fe279da6ccbc176257df29fa21c7776ad443931c8dd109cdc3832333062d18ac842a5f3db6bfd2bb7a3829f512d55269603
 EBUILD certbot-9999.ebuild 1364 BLAKE2B fc049f9649de92130c0cc56eadfffc37953e5adb238cb2b06ab4eee90f2da4410f31d4c2a850549df74b3c471b718310b9b70135687bc4fb1240343850426e39 SHA512 d320f137873e85b0749f4f972ee1cff33935c21a475cdcb7953c758f384d1b67c16d2d181abb401666ba1d5fac976802b5dc525009e431c724277d7d5bc39d29
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.33.1.ebuild b/app-crypt/certbot/certbot-0.33.1.ebuild
deleted file mode 100644
index 813dc8744aa7..000000000000
--- a/app-crypt/certbot/certbot-0.33.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_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-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-0.35.0.ebuild b/app-crypt/certbot/certbot-0.35.0.ebuild
index d1e115014c9a..13fbbb720700 100644
--- a/app-crypt/certbot/certbot-0.35.0.ebuild
+++ b/app-crypt/certbot/certbot-0.35.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 inherit distutils-r1
diff --git a/app-crypt/dehydrated/Manifest b/app-crypt/dehydrated/Manifest
index 87c3f1d02cc6..d895105d1984 100644
--- a/app-crypt/dehydrated/Manifest
+++ b/app-crypt/dehydrated/Manifest
@@ -3,8 +3,10 @@ AUX cron 71 BLAKE2B 88ec5a0d8618bc9e058d4cb3fedb0f74a530828bf63dd58a267386bd3ed2
 DIST dehydrated-0.4.0.tar.gz 74005 BLAKE2B ad55b7c53be0bc0c08ff372171638e9739a6213062b45c36e6ca5bce205b35d097bcffb6d1db6cd9c01f46a6ea31143cd2713bffb5e19f91041969e96a3cc337 SHA512 3c8c0f2fab57a432b69451f8372c02666dd953985679d12a2af9f6b917335b5b10a1196699106e317660039178ce1139a4d5455d4825a152b6911596fba16738
 DIST dehydrated-0.6.1.tar.gz 76693 BLAKE2B 5ecca2942aedc024e87e7b5aac05d836adbbc8bb1dfb38bfcd396a63e9d3e8637d625e279c4e5a47514c0b4f27006226dad7257a620da49c426c256e5267a33d SHA512 c3ef92da4e0e12100d267422eb2667607842f6fb0fe10cbc4d10aee9b5137d292db2348eca34b1f492e21c6c325dcbb595a9ab4de634e4d4a43346be1e2ce0ad
 DIST dehydrated-0.6.2.tar.gz 77819 BLAKE2B 5a1cc097b42d5c4d9513b5a13c86f0b101b3442fb6cfbe54563357095619764724a2158e050a8e8b13a60a9effe83a5339ec647ef5a93622c8d63f1fcdb72be8 SHA512 97cce8f4936482d6b3a7d4227d8735b1c91f3b6cb7c728669a4a5139605932a88171c7e5d715d269782f260454d06ee95a0f6cd2735521e22c4f69bdc3e38f86
+DIST dehydrated-0.6.5.tar.gz 82274 BLAKE2B 3c8138bafdaab9c60db1463860d6c16dd0fb8e686f368e55a4fa010d004f350d03cdd161dde38361411506959f896a25ef802b76432c0fcd89a69d75fe1be9c9 SHA512 da8ff3ecb7ddeb25356469fa272aef4e7c3705049caf88d09656dbc4baf29e0efa135e6f154c78cec82da17a27a78f2145ee3b7bd71521a080e10550d09b8a53
 EBUILD dehydrated-0.4.0-r3.ebuild 1554 BLAKE2B 3fbd4b2d0eda6858f085d2644709897faefbfab26855e37682b7f45a4d262bf80c8a72f8d757df94179f72b7b9a94e7b163cdfcde7d8a72f5e5cf655e05b2e4d SHA512 619e37279c8f7070d2e74f15033d7b6d098479b1837d73cdc9789b6a810160643b2561f268a63acc712abad365ee645150c76bd8c6f5c35e75d734dd3ec280c4
 EBUILD dehydrated-0.6.1.ebuild 1569 BLAKE2B 543ed28a4ff57bc5306f939e4ce0131af9434a437b867fee4e28ca4b0fec39478a370d97d0e3eec02b169c72e405170ad9d89a8f733a7a6f7936d9a49ae7b4a9 SHA512 9d5f30868d67e3e8bc8968142e5f27cb39aa5ff71897c993c15af598d5caf33329ae85947befda40a956ad7c10f78853d3269cc54f908885466cea47680eabec
 EBUILD dehydrated-0.6.2-r1.ebuild 1636 BLAKE2B c7305b457f7d65393e788669acc21d6cce4a87122990e0207301af0bf4d22990c31bb5be8bba517a0b1b5b0601bf4a036107b542771578c0941d402e869ee6c8 SHA512 4f98b4832cf47b15edb2c650d13687ef5bbd20c59e3e433c3be097cd4541ff83237b71df3aec78c0ffdae588224362c17befc85ce08e02595091179aa13a53e4
 EBUILD dehydrated-0.6.2.ebuild 1569 BLAKE2B 543ed28a4ff57bc5306f939e4ce0131af9434a437b867fee4e28ca4b0fec39478a370d97d0e3eec02b169c72e405170ad9d89a8f733a7a6f7936d9a49ae7b4a9 SHA512 9d5f30868d67e3e8bc8968142e5f27cb39aa5ff71897c993c15af598d5caf33329ae85947befda40a956ad7c10f78853d3269cc54f908885466cea47680eabec
+EBUILD dehydrated-0.6.5.ebuild 1641 BLAKE2B 10b7e552846873b8052f89354f2d6ef2b5996dafbc03f254100f5b914cb25725ddc1f3788d57d0f912629a9fec00eea638b12fafab92f5fc8dc158972970c430 SHA512 a767ffd2b984393178caaa0449ed1da6fbb31217c74c7a8fe6c681208fb90a95766ba892b1945fdad35fd7b8d9e5584894f56a681e9ba52a36a62ba184a89fa5
 MISC metadata.xml 531 BLAKE2B dcd597fde3bafe2970275a99609546b1a2ef764729cd410a62389a29f8ce95e269f2155970503e041c937a28026c3d70763c86f492c4a8a3478026125eb5eecc SHA512 fe42f3b7b8ca0d2f18d389348599f468eaa80928a05fa7151bae23f5dd73d260fca6ebd3a701eed450b639438e44ca038aef420732e92ab9ddc672c0022bfbdd
diff --git a/app-crypt/dehydrated/dehydrated-0.6.5.ebuild b/app-crypt/dehydrated/dehydrated-0.6.5.ebuild
new file mode 100644
index 000000000000..0e0ffeaaf3b4
--- /dev/null
+++ b/app-crypt/dehydrated/dehydrated-0.6.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit user
+
+DESCRIPTION="a client for signing certificates with an ACME-server"
+HOMEPAGE="https://github.com/lukas2511/dehydrated"
+SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+cron"
+
+DEPEND="cron? ( virtual/cron )"
+RDEPEND="
+	${DEPEND}
+	app-shells/bash
+	net-misc/curl
+"
+
+src_configure() {
+	default
+	sed -i  's,^#CONFIG_D=.*,CONFIG_D="/etc/dehydrated/config.d",' docs/examples/config || die "could not set config (CONFIG_D)"
+}
+
+src_install() {
+	dobin "${PN}"
+	insinto "/etc/${PN}"
+	doins docs/examples/{config,domains.txt,hook.sh}
+	dodoc docs/*.md
+
+	insinto /etc/"${PN}"/config.d
+	doins "${FILESDIR}"/00_gentoo.sh
+
+	if use cron ; then
+		insinto "/etc/cron.d"
+		newins "${FILESDIR}"/cron "${PN}"
+	fi
+
+	dodir /etc/"${PN}"/config.d
+	keepdir /etc/"${PN}"/config.d
+
+	default
+}
+
+pkg_preinst() {
+	enewgroup "${PN}"
+	enewuser "${PN}" -1 -1 /var/lib/"${PN}" "${PN}"
+}
+
+pkg_postinst() {
+	if [[ "${REPLACING_VERSIONS}" =~ (0\.3\.1|0\.4\.0) ]]; then
+		ewarn ""
+		ewarn "The new default BASEDIR is now '/var/lib/dehydrated'"
+		ewarn "Please consider migrating your data with a command like"
+		ewarn ""
+		ewarn "  'mv -v /etc/dehydrated/{accounts,archive,certs,lock} /var/lib/dehydrated'"
+		ewarn ""
+		ewarn "and make sure BASEDIR is set to '/var/lib/dehydrated'"
+		ewarn ""
+	fi
+	einfo "See /etc/dehydrated/config for configuration."
+	use cron && einfo "After finishing setup you should enable the cronjob in /etc/cron.d/dehydrated."
+}
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 270e5aa47a20..b77a52b58720 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -3,5 +3,5 @@ DIST gcr-3.28.0.tar.xz 1329044 BLAKE2B b35bca9b62605c4e0c3d71604ea5e6b7cdd97bb32
 DIST gcr-3.28.1.tar.xz 1334896 BLAKE2B e7035dd0ac5ef9e9b0898e3e4512768ec7cb548cf0ec4ace5a4f0f9a63d3015f8a041bc6f0a0c990c1666eb92c047eab4c19338a8ccf2d8aa9b11830dbd9d5c5 SHA512 ae36c39584d6bc2ba9d86de8bc71eac21fb3251b966ab1eddf467d01ed5789ba6e6597c83ea2ed9403e632893e7c7cb6c17e04878d726b72528af9199bebb3da
 EBUILD gcr-3.20.0.ebuild 1851 BLAKE2B 532e60ee150d6886ea24abda75d29b90acc66f7e055e5941a8c53293dc5491e3850729bc68b8a9f7d5658e0a2b5dd97dc3c0e1a75418fdbf132e0c6b4dbbde29 SHA512 f0c952bff3d6f66c8d75a0671cd886ac0611bd60f7b8a3b29dc71798d545baee9f2e2842ac76a87e34acb05fb200a472fc3bf58d4c0201e5fbaf60bb96efcbbe
 EBUILD gcr-3.28.0.ebuild 1892 BLAKE2B 4dbe4a19c0da7470fe68daa6191e1469fbc192dfd122dc2581340ab54e795289fe8d8ace674d159c851dd0da00fe544587a189c64ad7d50345f4a4b0245b4597 SHA512 c9d40cbf32c1570a9b152a26db32dcf1888945713fdefb3c0bc46add3c5e04d0bf7f4ac62a38e673265380d04b8a7428f511560390c0f756bab44abfaf989fb6
-EBUILD gcr-3.28.1.ebuild 1896 BLAKE2B 46339919b13e57c4114b555e19b55812dc903b97fb39bfaedae4c4d0f71fa4b20c77b72456fb23984ccbd2ae8905e77259cf71bf27eab64978e30b8ed92e1c89 SHA512 950c1b5d393c62cfcd62ab6986916c8003db3f5fdbfd95e2875d3098224017855fe6085cbf3c36f010d8ca5cefb257c35453552e31fc0228d4f3c863303e4441
+EBUILD gcr-3.28.1.ebuild 1895 BLAKE2B 5874bd9a9a434f2d5917eef7c8c99517d6faf64c5e6a05f461f40074f643ef1db7aa138f19e0cb1571b59e673e06103310910de5e2acda8741e8191550198a0e SHA512 72811890019eeced2d3902b6472e944499aa29a666fad9cfd48f80f67f14cdc34921470faf28e1db2eb8aaee50f82a30cdeb7c60d3532375e702727a07bd9309
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/gcr-3.28.1.ebuild b/app-crypt/gcr/gcr-3.28.1.ebuild
index 385a6b0c44fa..1d728a8b4e97 100644
--- a/app-crypt/gcr/gcr-3.28.1.ebuild
+++ b/app-crypt/gcr/gcr-3.28.1.ebuild
@@ -16,7 +16,7 @@ SLOT="0/1" # subslot = suffix of libgcr-3
 IUSE="debug gtk +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=app-crypt/p11-kit-0.19
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 758e2475092c..bd21150932ab 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -3,5 +3,5 @@ DIST libsecret-0.18.7.tar.xz 508392 BLAKE2B 9774df97c2abb362940c3b373e381afb82ee
 DIST libsecret-0.18.8.tar.xz 509432 BLAKE2B 3e3995d2c44367e31f3914087494764acfe82fb597b524c4982b4fca4e16612509c675f545191ee3cdae59698614395bef54ad82ae88a7e4e19898ba0be7828f SHA512 9e2ec8d458af6ed078bf3c6d956599f73f2cc7720332c424e9aede1f77f3d969c5122cf7b70899bc07ad96a3a628bf79bc5fffa88274d1ef2bcaaca6719f90d4
 EBUILD libsecret-0.18.6-r1.ebuild 2658 BLAKE2B c413830dc2598673d5a0f70c83bc3709c6f2749b2ee7da24da880b52b1c69af977632a45c3c654523a9f0c3271b4d5b0bae7c6c9a776e4e7a6bbe603d5acaf40 SHA512 056cfe38971719b9bc6c97ccf330fb0dd98abbb9637a3e6fd362aa89bd348ed024d415a41ac954fddd5dcf98a81284a48c78f428fab2f7fb56cae7fac3c1b7d9
 EBUILD libsecret-0.18.7.ebuild 2647 BLAKE2B d64cfb08b81738a7f0161c3b3204c5a9371bf4f5493760d06dcce5ba087d0d9cd7274475fff43d9cb265706c1721d0ba6a26456faecfe56ae4662dc9b3082675 SHA512 be27d948abff0e425af426600d95c4dbb484e542d0df9e453efcf81e738b3cd492c0c8aa4dfaa9bb2e46357c884598a770a7c8b81440b985086cf052ff68c615
-EBUILD libsecret-0.18.8.ebuild 2643 BLAKE2B da54283dc6262fc8b47d20335f02772a4c2572b54bb161e7c7b7028cefefcc0105affe0df46f0d941dd86688e1525f87fa27c764f5fc80a1f26aa1e317fb1287 SHA512 7c7765af71067e94db2e0fc2e8e1cd0d368b2cbae627eb304dec4f2aa65886a4d1f20b67c24a575a7a998c34e9344e64009e8452bfcd8aa8a7d85f7163942546
+EBUILD libsecret-0.18.8.ebuild 2642 BLAKE2B ebec8550c92f762cc589136212a94cd719d6275499133b049ad306a6b88fd51ee2e4f4666d13e7a5825c625f3997b6f1e966ede3e46404184d4d8662a213398c SHA512 b73cc3f72230bd3a71ca8270cfe8b4f33408512efc6d310bfdc287119ed02860a5df7358d2e56871b993905008cba5438856fd61216e8f622392ed45ceb66558
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.18.8.ebuild b/app-crypt/libsecret/libsecret-0.18.8.ebuild
index 37465993e849..47c9215a9a69 100644
--- a/app-crypt/libsecret/libsecret-0.18.8.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.8.ebuild
@@ -18,7 +18,7 @@ IUSE="+crypt +introspection test +vala"
 REQUIRED_USE="test? ( introspection )
 	vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index dcaee78db4d6..3e57033288ab 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -26,5 +26,5 @@ EBUILD mit-krb5-1.16-r2.ebuild 4212 BLAKE2B eac567c47b44a75e06ea412da95ecfb5e652
 EBUILD mit-krb5-1.16.1.ebuild 4172 BLAKE2B 4b120ec5bb2d750c6d76c1f6fda2cd21aedbfe771eb234e4d7b392868b6e9d9bcef4b6897df456d8ae30b9cc96a8b83636028d854cb2646172c4f0c27ecc0087 SHA512 af0736e57376a42e44e4a2d97587386590c5a3c5de56485b6db2016494b2bc392ba4bf573462576de5a909fd963da8095d349eaa5866f3ec3ffd427224650eb3
 EBUILD mit-krb5-1.16.2.ebuild 4294 BLAKE2B 4e36bfd702bf28bf73d81265a4d410ce53631c012b9090b6296f1ccb0b923b598ba7bf378451a3490d7018b0681fc9a882805707feb165975ef9ee072536cc89 SHA512 f026e3e3f59e6d4747a3bc3e71292092668f388b61a6d53db437b6fc79311f11c95f6d70e21c36911733900556015a4ebbfa01fc7bcca073561359ce72e9659f
 EBUILD mit-krb5-1.16.3.ebuild 4287 BLAKE2B adfa76bf62c6c9ebd4d854307e77ded4dc6a061e54249332f3ea0ea16863063a18bb142ee02a4fc253ad6a0dc199242796b8b085b324800a12712a98753fc6c4 SHA512 0858f94f587c452c23952f533418ff134723c76061dd244e7ed800ca5d7d16bda1ab3c24494e989c1c6c2f11176c4dda3715d48b54862b643080d05d8d4481cb
-EBUILD mit-krb5-1.17.ebuild 4335 BLAKE2B 777ae10f12d89abbfca098b6fc68d3c8284b9ed79d3fb19b3b4b30b5e50e9dcebe219f184681253d5eec20fcf075b1def7528764281dfe0c4b2d107466f76362 SHA512 7d2593bc43c39faf95d490511b95ad15f69dc15a124b061bc8156d8e7a750bec5508c0139a95d67ddd054572aac98313bb02fb5f37722b8f53faa5ce7f6b50e7
+EBUILD mit-krb5-1.17.ebuild 4324 BLAKE2B 12fd7017fa6fa218a3db99d1f5dd100ffbfa6cad3d1d8196d37a339928bb3abe776d9251409a655633398a785050b45fcf19a5e54fd3c49d0a0f204cef6aff12 SHA512 a6cecf60d0f6a674700db9f39d3030838a107ef6b277971ef57ced53f115d2ce221211f61ebed3568db3b62c67719a7a34b7044c5e624c4da346b02073fd5b8c
 MISC metadata.xml 903 BLAKE2B 57a48ed1fb3f046b8a4a6a80ae6223bc923f30ddf350b8ee0f5769c78b28c0bd14c35539d9552bfca02901e054332a4dc22f88c48d4eb4db4d143a7f0b938d74 SHA512 44909c99698b78ad01f72cd1d74ad6807f12154c8675b7fe31f4bd95744d8e7dca53446875c57408a294e5f87fc5aa038e6f869d3ff957cab870cd75f8e45464
diff --git a/app-crypt/mit-krb5/mit-krb5-1.17.ebuild b/app-crypt/mit-krb5/mit-krb5-1.17.ebuild
index f1ff44b3a29b..573c3e330239 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.17.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.17.ebuild
@@ -20,7 +20,7 @@ IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux
 # Test suite requires network access
 RESTRICT="test"
 
-CDEPEND="
+DEPEND="
 	!!app-crypt/heimdal
 	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
 	|| (
@@ -38,7 +38,7 @@ CDEPEND="
 	)
 	xinetd? ( sys-apps/xinetd )
 	"
-DEPEND="${CDEPEND}
+BDEPEND="
 	${PYTHON_DEPS}
 	virtual/yacc
 	cpu_flags_x86_aes? (
@@ -52,7 +52,7 @@ DEPEND="${CDEPEND}
 		dev-util/dejagnu
 		dev-util/cmocka
 	)"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-kerberos )"
 
 S=${WORKDIR}/${MY_P}/src
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 66284dd927f7..6a7aa00f315a 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,3 +1,5 @@
 DIST p11-kit-0.23.12.tar.gz 1257028 BLAKE2B 8add003ad298b7c4548c40f863835e9aae4234a66a4b216149be7c473f2b3b7ffb633b95883d58e5b039c974dd8571e56e23f6dcc77e484672605e6178d75ad2 SHA512 ae43b1f6ba5400cf5ae7b64b8c93aa47e5c7ee927196828600fd88beb6fdf6bcb6a63bc822d356757255638f9fbf10896e0604e32a1332a9a833836fa0468726
+DIST p11-kit-0.23.16.1.tar.gz 1292783 BLAKE2B 60be56656156c86d6f0f3285bd691ed85ec1a992e8a789f0f21f9ada172a8cab0581cc42f89c3079a1bd7b3493f0d38cd952711fda50c2e80bf96e94fcd9ff87 SHA512 7d0bbd793b43dba081054b4d022a8dbd1d477a3bd6aced72a641087023cf020f1d898899a08e737880e6c810f924814c62497c5ecb19f8322cde42667426a9a7
 EBUILD p11-kit-0.23.12.ebuild 1966 BLAKE2B 1206c4507d07eda081785b681500ff330f63a08b58bae8ec18a62b6cf7e6484f5f9647cc8b5cd5c9f08506b68191880e69f531dfa7105777b570861e28f4a264 SHA512 20436bddb6b3e615515dd263fca36fc0be2485b24cd455331fbc1647af9c39b9efc4158751de6580cc5e77d87df6aec760d4ac8410253d0806cdfc85e2999c27
+EBUILD p11-kit-0.23.16.1.ebuild 1977 BLAKE2B a937d8c5e932bea68cbc92a9293b7d5a68ec624d69d9769d1cc1d886391ac4653b3e94c2fa72d86016537bc9c0b4a09f00ba6fc8bff72f6cbf82ea67397fef92 SHA512 92499d081ea6adb01678301510123a2563222b6082ff7857a2e151ff8142f739894b747d79caa7ced9ea7699061c1ac65adc9953e165e528bc5798a87fa03c37
 MISC metadata.xml 454 BLAKE2B 82db424896936d17b167806a47d54674d1d6eebe192ad1f8b4e985b00f74f10aa5f18ea587b866906571a91dcfda83626f6b25ebdbd6a6e02da65b34511b2b0e SHA512 24042c945cc3ab622b74c30eaa08819ebce4af9320b083ceb1f3f4db110fba6539121b4dbf0d245afdc395a9854bec022575861f7ae4e9418018d6bddbd4a888
diff --git a/app-crypt/p11-kit/p11-kit-0.23.16.1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.16.1.ebuild
new file mode 100644
index 000000000000..ec7c6c32971e
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.23.16.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
+HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
+SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asn1 debug +libffi +trust"
+REQUIRED_USE="trust? ( asn1 )"
+
+RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
+	libffi? ( >=virtual/libffi-3.0.0:=[${MULTILIB_USEDEP}] )
+	trust? ( app-misc/ca-certificates )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+	# disable unsafe tests, bug#502088
+	export FAKED_MODE=1
+}
+
+src_prepare() {
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
+		# Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700)
+		# drop to XPG6 to make feature_tests.h happy
+		sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die
+		# paths.h isn't available, oddly enough also not used albeit included
+		sed -i -e '/#include <paths.h>/d' trust/test-trust.c || die
+		# we don't have SUN_LEN here
+		sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
+			p11-kit/server.c || die
+	fi
+	default
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable trust trust-module) \
+		$(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
+		$(use_enable debug) \
+		$(use_with libffi) \
+		$(use_with asn1 libtasn1)
+
+	if multilib_is_native_abi; then
+		# re-use provided documentation
+		ln -s "${S}"/doc/manual/html doc/manual/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest
index 3c6837b09afc..86c3ec4371ce 100644
--- a/app-crypt/shash/Manifest
+++ b/app-crypt/shash/Manifest
@@ -4,5 +4,5 @@ AUX shash-0.2.6-format-security.patch 413 BLAKE2B 4bcb4a803b8a69c7568d89dfbb9006
 AUX shash.bash-completion 856 BLAKE2B 259204c4579326baa2b68d32e87bb8d6bcb4bd25646d851a68efe28927dc4c61e409092581036a777cddcf4941c12ff51e53f97c30b361cde05f4e89b65abda8 SHA512 1d6f57c5d1d75a576bb2536dc9a7518263e2c34da127f0450e1c7900038a8c9e4a379533ff34ddccf0c62cb53284f0fdab41510f71a05a337e39bcab578ed2b8
 DIST shash-0.2.6.tar.gz 105641 BLAKE2B f7421aa9ed7b242e14a585461e96f44e35f1acf38cba358807ec06e6678c82f7f3b070a218de71cccde9f18a1e7e13f8dd4cf66b48e9d6626f16b2e1fc33757d SHA512 340a59bd16b3e5069a076b56f8fe24d2306a6ddd5e6ad564c5e17a992d8e279a7109ba39bd5caa8438a0e85b4f94cb0878228f7aefe38221ff6efa80df64086b
 EBUILD shash-0.2.6-r2.ebuild 895 BLAKE2B c1cc57e9531b91cfe7da1d1d8f3bfab28ca536de1bf6d67e8c158bb21a34344bb1c69c799f858097827107868222af854f97a6c6a4008b859b665db5904ef3cb SHA512 ad6aeeda95e2c205af81816ca05593a163966bc0fff9ffd42aec90237d70d3331645fc711829b49685a219e2f383d36550e56b146c77ac7972308585a955588e
-EBUILD shash-0.2.6-r3.ebuild 919 BLAKE2B 6a41b1740a7a419713d7de678604402e67c75a6f905f6b3d2b97f126e92cbfcae7af9d43237473ffa75ffc689ce17ea2f90d07a1e968f5c8e89c252f0d17840e SHA512 131bfb9a3dc2c9d8c5a6b4b4c36d260299df488c8c6fcad49d0531be23cb18f65a9144043075d2cf4c5548620978da980ba49c05d359f8e1ec52014b11053478
+EBUILD shash-0.2.6-r3.ebuild 961 BLAKE2B a309f141d78d36298df7872948a8a23b4fb9ae739a18fbf6316bbae69d08cc150cef6b3ca054f165ece2431fd47601ed73248bf3aaeb43843aab4adaf4577e20 SHA512 480bbe35c0838adc1bec91958f1f72261469c803d549afab7d877f4fb7b4b5a145f5bd765a4493ad3579c359bec70f7b8f611c83a5ff6c22114acc58ef974ed6
 MISC metadata.xml 389 BLAKE2B 0f19c78e6c95b99b0de3da4896ded3dbfcd482650294efb1a7b0961a6ea884e30241bfe431fe9c85ced61c45cc0e123f52847953b4e4a2bd86e4a14894190d2e SHA512 dfecd29a48ac51dfbb2d4ab6bc71d4538da61541b7ca3beb34edc4d321a97d881044e4f5815d8cb1a4715dc18dc5a9b58520e3d8697b8cbf35a6f795c13c87d6
diff --git a/app-crypt/shash/shash-0.2.6-r3.ebuild b/app-crypt/shash/shash-0.2.6-r3.ebuild
index 74e16b5e4f6f..e603c09cbdce 100644
--- a/app-crypt/shash/shash-0.2.6-r3.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r3.ebuild
@@ -11,10 +11,11 @@ SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
-DEPEND=">=app-crypt/mhash-0.8.18-r1"
+DEPEND=">=app-crypt/mhash-0.8.18-r1
+	static? ( app-crypt/mhash[static-libs(+)] )"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-30 17:36:28 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-30 17:36:28 +0100
commit	7014a5a3ea0feffab9701fdd6b64cc7667a985af (patch)
tree	f2cbbaa8bb9209cd15208721103228336149b799 /app-crypt
parent	7a86906b67693cc65671d3e1476835d3a7e13092 (diff)