gentoo resync : 08.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-08 09:04:53 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-08 09:04:53 +0100
commit: 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch)
tree: 2878053f3e7faed19a1f82c733d3bd29df69991e /app-crypt
parent: 2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff)
43 files changed, 301 insertions, 778 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index edc7a6c365d0..1945b29020e5 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 367a18a18d61..f871c2d2d6bf 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
 DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979
 DIST certbot-0.34.2.tar.gz 1347778 BLAKE2B 57195e3a7a3481c4c1fa184035b73b8b5e06a33f37b317d895381ec6c4b57852a475a3b76593b8fee9922f731512ed0d0423afa26b5c04138d24781df9da42f0 SHA512 63923b1d433f4c714318e848335e696e2412c574cc16f4fb1631caeebdce5a7f599985cf450e96dceb87a958c8f09a003e1d2f24eac1bdc183c7a5c43bb362de
-EBUILD acme-0.32.0.ebuild 1263 BLAKE2B 5486282dd90bee28ca65a9170546ed0d09de38880f7945dcef1009cb7c20b991e5d22e7efe89eae07a13013b24e627624c0da907604359e10c75cda5607478f0 SHA512 6517cd06f5430885b072407d11971850cec39c3bca45545006fb58c970f121aaafb725e6a77371bb08151b05a803fd274b45cb9c2e10e48c02e29e5bf9634d3a
+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 1719 BLAKE2B 5c80b37136ee7a8ada33074a902bcb58e3142e19076dbeec1ba2559d0e0943993bc6877e96f5a34dfde243e02c7512eb552d0b2b28c2b83ff2c2bda48421e803 SHA512 1936ca1386df956735403ca55061250c218ca072d4d9d7753c6eb9ecabb5cd959ae7cdbdebe8577c16259c796e97187cc1b1b5c6e04b6d5c3c50afe9c60930a9
+EBUILD acme-0.34.2.ebuild 1717 BLAKE2B d79a119ee31160c29560401a6a9699f3a2a59995b237e0a559b8c9116cca8f8ef1536b43edb4508fc401df8ce17b5dd91a2a46193660b7478e65831e22b34004 SHA512 66fae749e643082bed24c9dbae62b38dc4f40dc5571da4cf848ea3cca0adda42c89228e9e537df793cfabc5e981b4059c6ae9ddec5d38df986f270862efdf7b2
+EBUILD acme-0.35.0.ebuild 1723 BLAKE2B a5abd27f54ec47307fa0ced1cc3ae85c9747195848709ca395ae4a64f962ea2c0787b82eabf39ca5598bbc67abf51a05e473d390c8ca367989e6f871498a1653 SHA512 9a2ab0cdcfbc81bf6fb9e32de5449264579257f5ac185f80e4f83607bbc99730996cb16d4276005fa5cfe3b31df2a0db310ebf3fa25b6c631675d408a040dcb2
 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.34.2.ebuild b/app-crypt/acme/acme-0.34.2.ebuild
index b972b974afbe..f70241eefc65 100644
--- a/app-crypt/acme/acme-0.34.2.ebuild
+++ b/app-crypt/acme/acme-0.34.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-0.32.0.ebuild b/app-crypt/acme/acme-0.35.0.ebuild
index b0ddd1ccb5cd..3acd37f75f8e 100644
--- a/app-crypt/acme/acme-0.32.0.ebuild
+++ b/app-crypt/acme/acme-0.35.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -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
 
@@ -21,10 +21,11 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="test"
+IUSE="doc test"
 
 RDEPEND="
-	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
+	>=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}]
@@ -35,14 +36,33 @@ RDEPEND="
 	>=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/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 45060da43c3f..80c1b829db2f 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
 DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979
 DIST certbot-0.34.2.tar.gz 1347778 BLAKE2B 57195e3a7a3481c4c1fa184035b73b8b5e06a33f37b317d895381ec6c4b57852a475a3b76593b8fee9922f731512ed0d0423afa26b5c04138d24781df9da42f0 SHA512 63923b1d433f4c714318e848335e696e2412c574cc16f4fb1631caeebdce5a7f599985cf450e96dceb87a958c8f09a003e1d2f24eac1bdc183c7a5c43bb362de
-EBUILD certbot-apache-0.32.0.ebuild 1074 BLAKE2B 4a0867a89a9a3f9cce6771b3c7e1b44f1e644b03ad3f5318fb0d1c4411f1b8b18c8cb6f902558effbbc10f2bf31961119d97af1ddaf51c7b962eea545b0486d5 SHA512 a281f2cfe0b59ceaa3caa5e0aa06deef85d6dd3b07d83e3b8d6078822d203a6fd5658eb61fa72b71f0dcf99d98bdaceda2472f09678b2fb2165dd6f4f20a4c9a
+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 1076 BLAKE2B 04c24a70b59c93892bad5c8f2e51da4484f47357da5481c382bc8026be40ae903e403f3fca9013115cf1dbb9bdce20c783f9d0ce3cd870f62e38aed97c9fecdc SHA512 19d250829fbb9a15000f426332489cd443945cdbebfa1c383d7c64fb26fc0d4657de11b5b553c73787f158f6607cdcb6a2892411aea8aa3c9376c12e63a91ebd
+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-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.34.2.ebuild b/app-crypt/certbot-apache/certbot-apache-0.34.2.ebuild
index 0384278e8878..4486089fd553 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.34.2.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.34.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-apache/certbot-apache-0.32.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.35.0.ebuild
index 042b6c7ce4d1..3a00f63544a8 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.32.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.35.0.ebuild
@@ -1,8 +1,8 @@
 # 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})
+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"
@@ -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
 
@@ -23,8 +23,8 @@ 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}]
+RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.34.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 9721c6835858..be51f08a5214 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
 DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979
 DIST certbot-0.34.2.tar.gz 1347778 BLAKE2B 57195e3a7a3481c4c1fa184035b73b8b5e06a33f37b317d895381ec6c4b57852a475a3b76593b8fee9922f731512ed0d0423afa26b5c04138d24781df9da42f0 SHA512 63923b1d433f4c714318e848335e696e2412c574cc16f4fb1631caeebdce5a7f599985cf450e96dceb87a958c8f09a003e1d2f24eac1bdc183c7a5c43bb362de
-EBUILD certbot-nginx-0.32.0.ebuild 1008 BLAKE2B 3e321c0b16817a2d1a0751863d12a3401a76cdef9cb40d9d45b472a7dbfebf9a0bb8e665b89139c41c4415a1c08e059a8f1262ab01973966c89e210d0b147ab7 SHA512 0ab8809448cbe9a2e1e318e4cf9ad03680e2bdaff92a0c53c52a4519bd15bd3c2f7647c910cc08cd627fade6b62ee021ce0816efc35d9c98df05d65f3ed817d8
+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 1010 BLAKE2B 144ca363c1580f8855d181e5011ac9181379627eb6704b6f38961672ce76d1691925becfdc7f9b203b88faa4a655a680017da3ebfcf94ead2f798fbf5a710226 SHA512 3424be73e7f33dd43066acbdf96eba3d17f510b3c6289371f710663c56971b925a631b533c807625b477f2d6079694db92aca74eda18f05575f4d4ab148edef5
+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-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.34.2.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.34.2.ebuild
index df664e759af5..d77b28c56204 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.34.2.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.34.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.32.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.35.0.ebuild
index 3fae58de4255..3eea110a0e53 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.32.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.35.0.ebuild
@@ -1,8 +1,8 @@
 # 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})
+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"
@@ -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
 
@@ -25,8 +25,8 @@ IUSE=""
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
-	>=app-crypt/certbot-0.22.0[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.26.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.34.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 9301fc1dc059..fa297e5e2b0e 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
 DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979
 DIST certbot-0.34.2.tar.gz 1347778 BLAKE2B 57195e3a7a3481c4c1fa184035b73b8b5e06a33f37b317d895381ec6c4b57852a475a3b76593b8fee9922f731512ed0d0423afa26b5c04138d24781df9da42f0 SHA512 63923b1d433f4c714318e848335e696e2412c574cc16f4fb1631caeebdce5a7f599985cf450e96dceb87a958c8f09a003e1d2f24eac1bdc183c7a5c43bb362de
-EBUILD certbot-0.32.0.ebuild 1266 BLAKE2B 6cb82789b271eb23a993a091b7626e8dcf0e05e63c84e6f99c7ff0c9b4d7f0a00234593744119f7104183ff77757e1a4650325830309cc4f2c2b50fe9abf0573 SHA512 76e99c0a99ae6b2c9fa0e042b8ea9953a8e31d0e338cf1f54ee5af20e8cbb4924c89fdb86cd7f23909ce96763f32dc59f4086c5761c4c45267d49908f4965f83
+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 1360 BLAKE2B b30e0c90eb19eed434cff29529847f7fa71b8b00c1d1db2ea06a619682b1a2de2e775c70d54bc999ce5cbeaa9ad902b097db6cbd2565397394e16d53e98a8456 SHA512 8f5a02f9594274a4c1360457e62b200acd54d0f2e2a05f7a577b4e44e30cc454d19e6e6e09c9811c7242a0b64580bf9538082a3623552fdebef277a61001365c
+EBUILD certbot-0.34.2.ebuild 1358 BLAKE2B dd1f1d87864da2747a2ab9f043bc18a2a783827febfa1ed7d8a6ba2b2b3b51e6a11820840745f49dcf34dbbff1ceefa5de517e66ab698529a628e9f5e2ba3575 SHA512 fa59ee71d7f9b058667f705c18acd49b845988c316cf27e2881383f61d7f784193bfaa83c28472543a7115043c9778ae333a882bf77f7b64f82a8d6ed1708275
+EBUILD certbot-0.35.0.ebuild 1364 BLAKE2B fc049f9649de92130c0cc56eadfffc37953e5adb238cb2b06ab4eee90f2da4410f31d4c2a850549df74b3c471b718310b9b70135687bc4fb1240343850426e39 SHA512 d320f137873e85b0749f4f972ee1cff33935c21a475cdcb7953c758f384d1b67c16d2d181abb401666ba1d5fac976802b5dc525009e431c724277d7d5bc39d29
 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.34.2.ebuild b/app-crypt/certbot/certbot-0.34.2.ebuild
index 261fd8251037..813dc8744aa7 100644
--- a/app-crypt/certbot/certbot-0.34.2.ebuild
+++ b/app-crypt/certbot/certbot-0.34.2.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 inherit distutils-r1
diff --git a/app-crypt/certbot/certbot-0.32.0.ebuild b/app-crypt/certbot/certbot-0.35.0.ebuild
index 63ee8096fb6e..d1e115014c9a 100644
--- a/app-crypt/certbot/certbot-0.32.0.ebuild
+++ b/app-crypt/certbot/certbot-0.35.0.ebuild
@@ -1,15 +1,15 @@
 # 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})
+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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 inherit distutils-r1
@@ -42,5 +42,7 @@ DEPEND="
 	)"
 
 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/glep63-check/Manifest b/app-crypt/glep63-check/Manifest
index a88dcc5d375a..2c343428e210 100644
--- a/app-crypt/glep63-check/Manifest
+++ b/app-crypt/glep63-check/Manifest
@@ -3,5 +3,5 @@ DIST glep63-check-8.tar.gz 67982 BLAKE2B b6f785e7f589521f719c4bbf6452bd74c1926c2
 DIST glep63-check-9.tar.gz 73445 BLAKE2B cd229065da9a4663491a891787d2a9e719cd9d61ea5974393199ca418413e7e1c6b73a3146577b26029ceb3302f430ed1051c9d050278b098b18407e95c1cac3 SHA512 86c49ffe2b8dde3735b85ff4808862c460b1e832fa9c3fca4fc2ea776d314c29ed2442adef2e1dbca1cec81b6ea29bbb417b123306602dfaa611b5153dddb7ac
 EBUILD glep63-check-7.ebuild 658 BLAKE2B 3e742acbd0fdde1670de3348739b10f70b0ccee4b50615ddd3b49225847c5c2e2454652ca8748330e3adac7f9079ea7bb272b3160f4b8daa14a4113fd4793265 SHA512 470627606b86e27d4fb20e6f0281dc13db43e193ae4f3c2d71da21d949d91253afdbc5a375fd36f8505bfca210a86d733663c2ac4dd64785da63be75c73542de
 EBUILD glep63-check-8.ebuild 660 BLAKE2B cae7887511523f495f88aa4f4a2a3178c6b9437aaa51e14ae42a3611de67f64844a0fce2f2c102d53ebbb646a154a7119d929d4e6e5916659e771f62cee835d0 SHA512 481b395c429eedc70bb83e2bbe30298201a8d7981bbf6798ab7f8360597f2b4c42204748732caf3f73ca9e2d362d82a7564a207c406dfb9aa05a2af1bd5a9328
-EBUILD glep63-check-9.ebuild 660 BLAKE2B cae7887511523f495f88aa4f4a2a3178c6b9437aaa51e14ae42a3611de67f64844a0fce2f2c102d53ebbb646a154a7119d929d4e6e5916659e771f62cee835d0 SHA512 481b395c429eedc70bb83e2bbe30298201a8d7981bbf6798ab7f8360597f2b4c42204748732caf3f73ca9e2d362d82a7564a207c406dfb9aa05a2af1bd5a9328
+EBUILD glep63-check-9.ebuild 658 BLAKE2B 3e742acbd0fdde1670de3348739b10f70b0ccee4b50615ddd3b49225847c5c2e2454652ca8748330e3adac7f9079ea7bb272b3160f4b8daa14a4113fd4793265 SHA512 470627606b86e27d4fb20e6f0281dc13db43e193ae4f3c2d71da21d949d91253afdbc5a375fd36f8505bfca210a86d733663c2ac4dd64785da63be75c73542de
 MISC metadata.xml 537 BLAKE2B cc05c3872c522fdcc2355da9d451f9ad102d23e2e5de657f447ce5c9441a4379fb5f6560cd22a8be325f322e901b65917b11630fc0229bd0e952c6f8b6b64bf0 SHA512 493bcb28f9144c49050445de98b54e19730e46cc24df02b15859f4114f4fa8775431aac9d8fcb4f50639609680656b108f6c4ca47f67b38680f926cf9610ccd9
diff --git a/app-crypt/glep63-check/glep63-check-9.ebuild b/app-crypt/glep63-check/glep63-check-9.ebuild
index 13996cabd8a0..4f614942037d 100644
--- a/app-crypt/glep63-check/glep63-check-9.ebuild
+++ b/app-crypt/glep63-check/glep63-check-9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mgorny/glep63-check/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index b93710b0bb8a..bd795d86bc93 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -5,10 +5,12 @@ DIST gnupg-2.2.10.tar.bz2 6659484 BLAKE2B d0270ca40bd70fe113fa4283c307d7d04370be
 DIST gnupg-2.2.12.tar.bz2 6682303 BLAKE2B 8470ab8bf386d3524ce57ef1a1f6ac74d8cf2d7c35062b95c668b37586603c8e0817e410f4a0a807256e42896c11116897b7118b29e471184b2fa871ad4ba048 SHA512 30de9757bb60a5cb6bf0dc2c8da5f4742c54affec3fcd0bcbf66f28f2812149afec5db70dcb6ba592101de4bdc479d1ba0b47c53c8b8d4765ddff32fa51c26c8
 DIST gnupg-2.2.14.tar.bz2 6707735 BLAKE2B feedb1c776e8d43e43905e8a8c1487bd88e8effc59e94baf308cb29a5feea5d9c666c78b50147d65a259dc89af241c2a2bf07a72c417617e5238e0fdbbc2b17f SHA512 9d5216dee085efe6de300579d8fb773a5a55df639d5a435708611a974df522dd60dc995fbfcaad98065475dbeb731bbba19ecc3273e78b9b45fccff640dde69b
 DIST gnupg-2.2.15.tar.bz2 6705912 BLAKE2B 145bd174cb74c6a1180de76a6d46b40d2434ced61bb9aa3eaddeb0079cd05634529c9b062e475d3ca9d35b3af3b62b39a79ef0efbb476cb9ebb9e2099ad13ae0 SHA512 7c6f0092d384fd71fc7a1c905ce23ae98df42ce131ee09fc190c275f9c8d0912be344b0782244cccb5b3938322ef3cfff8ed1ec7e949e761478b8c5110dde36a
+DIST gnupg-2.2.16.tar.bz2 6699113 BLAKE2B 7738c5d9d5789dc56b4429e2b62403859365b53c834b0c53a6387fb77f1242ec4b0195205394f01e64fac6c7ce1235738421ea04bc6fb843c3fea1c10a243217 SHA512 0e0040905cc4d1d9d29e184cfeda520b43990e4ec459212537c0ce6092de987157e05b1d1a3022398d9b3cbaeea0f58a7e686745f96933e5ac26be4229162247
 EBUILD gnupg-1.4.21.ebuild 3345 BLAKE2B 611a2e3c8d3a47337a17891ce9df00d0aca121f827169ea1aec9cb8c44b3f38858e1c8d39d08985f71790127bbbe64b16f0293b368d8dc627700fc1cc31983d7 SHA512 14a708c00e98c76fa6ef1f2d878f84f63d8e110f85b35b9c40b6da80525af685df09ea83eb1dd1fce1fe3016b9e12a46c02c91f11ea78496c12301acbf04d257
 EBUILD gnupg-2.2.10.ebuild 3320 BLAKE2B 1309b03e28bd2d5af1f2caeedb145a0f3c0c87db1b78ee014d3938d1bafdf3d469885df8d3bd622f9cebc81ef706925d0a77e68a265bbaee93902cb0ea094f51 SHA512 26211aacc1393429fe7459b58e1aa735e4cc1c278d7fcc774547fd9ada7adeaf35d297c65ca51ca927f6d304ffe8c78d874762c8649fc01e9dd259b2b2f52cda
 EBUILD gnupg-2.2.12.ebuild 3663 BLAKE2B ebc41be08f922215079e5f6975972a75355d068099edcb885a0b04ce0cd72010502ced08cab2890b3f65b71820d9b45e76695a865079add2bab15090bffa03bc SHA512 7294ee0c840da055910a7f3430ad164a9f93d8ade7624ecbeb3ff88b9818e422eee6259d58b9d201601b834b654b3eeaa169dc3d8e16113af1e9b4a9a3f46092
 EBUILD gnupg-2.2.14.ebuild 3663 BLAKE2B 58a51005ce97906d7a8c051d88ecd0ec3ecdc627e146c424c446bba93a7b37ad93b6248be631d97c750c5b4e03f675d8f2c7355d306fcf219a03d19b71886bb5 SHA512 73ffb70a72e2936233596ef8dee2429abff9d97fb128b3c5e94fef862948ca65e964a95538e0722b7773fb0f08c7f27ad9eaabbc6ad7c140c826e9d16ba657ac
 EBUILD gnupg-2.2.15-r1.ebuild 4510 BLAKE2B ace05abf02aa56cbceb46fd205398ca110b785c38889fea575a32dc4e21bff0933112ccf6c59acd5bc1cb700e33349d67ab2af900cd7098f6874e2bef5b9c4da SHA512 8289b2921ed18514a81d80b7c685e691de2c1c0aff6159a354f2e0e86a0d5b788099b98ed7b8770a5fe5372207cd9779b42d638a25e954f629a537f8a6f4e2c6
 EBUILD gnupg-2.2.15.ebuild 3701 BLAKE2B 0ee776c3eaff7d3583159ec4714ccdb8fb3484fb20d8e61c4fcfe95486fc892c57ac080d1680b05f9fd3fd97c334f50a6026e8a74d80ba0f7c3bec6c13810da2 SHA512 3bffcd8049007bee7d89a506df583f9228c12ef037edd1211c3fcfb629a6557c793959f44d8d33e16350309020cb29af4204accb88e4f80bd2a59573c7eb82de
+EBUILD gnupg-2.2.16.ebuild 4510 BLAKE2B ace05abf02aa56cbceb46fd205398ca110b785c38889fea575a32dc4e21bff0933112ccf6c59acd5bc1cb700e33349d67ab2af900cd7098f6874e2bef5b9c4da SHA512 8289b2921ed18514a81d80b7c685e691de2c1c0aff6159a354f2e0e86a0d5b788099b98ed7b8770a5fe5372207cd9779b42d638a25e954f629a537f8a6f4e2c6
 MISC metadata.xml 1313 BLAKE2B 2bf26407bdea8af215d09d28640b961ee98c86c297595736fbe477c8b9cfaf0f8970982ce22038dabf0d8529e39032a3fec9da0c17a5acca0cf3cb197f31f1c0 SHA512 0500f03936eba67706cea87c1f5b16db280b159fc31780b93e696e8ab20e3dece90f0bd80af5aa9582cab557cc337c65e8e101daa935ba6ca31b7f126328c0ac
diff --git a/app-crypt/gnupg/gnupg-2.2.16.ebuild b/app-crypt/gnupg/gnupg-2.2.16.ebuild
new file mode 100644
index 000000000000..2b55c80c4d04
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.16.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
+
+# Existence of executables is checked during configuration.
+DEPEND="!app-crypt/dirmngr
+	>=dev-libs/libassuan-2.5.0
+	>=dev-libs/libgcrypt-1.7.3
+	>=dev-libs/libgpg-error-1.28
+	>=dev-libs/libksba-1.3.4
+	>=dev-libs/npth-1.2
+	>=net-misc/curl-7.10
+	bzip2? ( app-arch/bzip2 )
+	ldap? ( net-nds/openldap )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:1 ) )
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+	tofu? ( >=dev-db/sqlite-3.7 )"
+
+RDEPEND="${DEPEND}
+	app-crypt/pinentry
+	nls? ( virtual/libintl )
+	selinux? ( sec-policy/selinux-gpg )
+	wks-server? ( virtual/mta )"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( sys-apps/texinfo )
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+	"${FILESDIR}/${PN}-2.2.14-quiet-sending.patch"
+)
+
+src_configure() {
+	local myconf=()
+
+	if use prefix && use usb; then
+		# bug #649598
+		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
+	fi
+
+	if use elibc_SunOS || use elibc_AIX; then
+		myconf+=( --disable-symcryptrun )
+	else
+		myconf+=( --enable-symcryptrun )
+	fi
+
+	#bug 663142
+	if use user-socket; then
+		myconf+=( --enable-run-gnupg-user-socket )
+	fi
+
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	[[ ${CC} == *clang ]] && \
+		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
+	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
+	# by wks-client & wks-server; and if it's autodetected but not not exist at
+	# build time, then then 'gpg-wks-client --send' functionality will not
+	# work. This has an unwanted side-effect in stage3 builds: there was a
+	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
+	# the build where the install guide previously make the user chose the
+	# logger & mta early in the install.
+
+	econf \
+		"${myconf[@]}" \
+		$(use_enable bzip2) \
+		$(use_enable nls) \
+		$(use_enable smartcard scdaemon) \
+		$(use_enable ssl gnutls) \
+		$(use_enable tofu) \
+		$(use_enable usb ccid-driver) \
+		$(use_enable wks-server wks-tools) \
+		$(use_with ldap) \
+		$(use_with readline) \
+		--with-mailprog=/usr/libexec/sendmail \
+		--disable-ntbtls \
+		--enable-all-tests \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-large-secmem \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
+		KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
+		LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
+		LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
+		NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	#Bug: 638574
+	use tofu && export TESTFLAGS=--parallel
+	default
+}
+
+src_install() {
+	default
+
+	use tools &&
+		dobin \
+			tools/{convert-from-106,gpg-check-pattern} \
+			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/make-dns-cert
+
+	dosym gpg /usr/bin/gpg2
+	dosym gpgv /usr/bin/gpgv2
+	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+
+	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
+
+pkg_postinst() {
+	elog "See https://wiki.gentoo.org/wiki/GnuPG for documentation on gnupg"
+	elog
+	elog "If you wish to use 'gpg-wks-client --send', you must install an MTA!"
+}
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 5c030c058394..449d6cf0db83 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,3 +1,3 @@
 DIST gpgme-1.13.0.tar.bz2 1820504 BLAKE2B 71fbb034e3c5939d1953554ccbe0e89e2089c53a4c79e90ee51bdf96500bf4be8a5e1633772ab8dadd44616dde7be551ad7d3af0a59d7e1df10a19cd9cf56baa SHA512 47a7a67dcc6d111cddd805d288d42e870948114a6dc09ce0675ad8b3d1580bbc2a683e1e70cb2f416919cf2129c72a9ff30e2e3b9527809d04e863cc1f87267b
-EBUILD gpgme-1.13.0.ebuild 2871 BLAKE2B 572cb59de54390a6a6dc18c6838f67caf6797c977da0ae8850f3eabc363c0928c08c21140827c08401103b27f0f0b2c826ff0b8b01a1d2f387df55832aab9cc6 SHA512 a1ca175c8a6d608bc928b7b5f76c195c2ad235a760d3f476be3409bffefa2ec7acf57d4df207ef08fbf50d4e69ac0ccaa2f148efb3caf3374fd38fa5f4f1cf54
+EBUILD gpgme-1.13.0.ebuild 2883 BLAKE2B 52cd1a777cc1154fd1bbf85f91bc4f554af6ca5067e3943ddc5a7040e7c0d0fe2e4cf5fb655975ad465f57bd717c8aa0f5d96fcfbd9e3fb672e23ae63be338cc SHA512 9b5185c026b5f7f315efb7e2fae14c5db73a502a132ee060c43105ea340f9c87be04cd8e84d37510041eb892bc19dbe0f1436322b1c331e5d688b78d213dd18f
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/app-crypt/gpgme/gpgme-1.13.0.ebuild b/app-crypt/gpgme/gpgme-1.13.0.ebuild
index e32be5c756df..c0d2b3ca3ff3 100644
--- a/app-crypt/gpgme/gpgme-1.13.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~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 ~mips ppc ppc64 sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs cxx python qt5"
 
 COMMON_DEPEND=">=app-crypt/gnupg-2
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index c2a226b33803..5b19322c2393 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -15,5 +15,5 @@ AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16b
 DIST heimdal-7.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84581b9c3bc8d42c328e5f878ce24c5596c5a1e3fbca786a71be04984068efbb817f7336135056d1feae38895758f SHA512 6d1ad77e795df786680b5e68e2bfefee27bd0207eab507295d7af7053135de9c9ebb517d2c0235bc3a7d50945e18044515f0d76c0899b6b74aa839f1f3e5b131
 DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
 EBUILD heimdal-7.5.0.ebuild 4334 BLAKE2B 33303601d32d3b2c6f54a3681012f854b6addc55b09c65e6d0cea74e8ac91c12de09624e37f3d4f9933c54dbe8de3cf7f258bb99d33d26a25a0c280288777b44 SHA512 6d40e8a30e74b95c918e7ee5bf10b3d017178bd4775bba707ff2dfc02d208c121426b66ebdbb50df09a96f4caa5c55b35f2e8d53cad9eac4f8ebf46b0f6de266
-EBUILD heimdal-7.6.0.ebuild 4578 BLAKE2B 6e7fd5f20944725b82a4eafdf169c68d2fc7cfb3bfcbf368e82ffc64712584cfe748732049d08087ef03bfec1ee605a664015826aac967b1ded0bec1ba6e0ac9 SHA512 835430b644c0579bb8cd08d79f77aa678466b156af6196abc81a13769cee0c3b4566e7c791107006215ec1b449d5485a7f68e45440b54bc2baa302f178b9bfe0
+EBUILD heimdal-7.6.0.ebuild 4576 BLAKE2B 1a4c611877289ef50e936fb206cf56eb808842378fcbf9a98807cc0997f69695ad6818ab19048e5c35e07d2296449aa474f7bee9a5f34dc50f354d10a545049a SHA512 63877dd267dbf0640a7ef3586200ce4094aa43fd514611f13d2412e93305f88d4cf9279aff0a1e5e0ec5ef0b07c594e9df9b3b11c14dfff4b449508ed5633d00
 MISC metadata.xml 722 BLAKE2B 9ec2bb074bf4932b0bb2f949eb3c33c8ed8b82305d6641a6954084120c658005cecc2cac57ad85a1df520f5bfd115deef57f80d874ba850d857a813b5a87c139 SHA512 5f3c28c222eb668e3c1d3b7fe24ae3622c82f94b6008a4c3458aa76afac9508d6e7f150de0f06e4845a5b0653ea04112fe0c2b421f199b5feb9ef771ab0b0b28
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
index 7ce4e6e49481..c3ee68bd68e4 100644
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd"
 IUSE="afs +berkdb caps gdbm hdb-ldap ipv6 libressl +lmdb otp +pkinit selinux ssl static-libs test X"
 
 CDEPEND="
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index e017c6bbe911..23f3736dd41b 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,11 +1,3 @@
-AUX johntheripper-1.7.3.1-mkdir-sandbox.patch 562 BLAKE2B b682dff0bb3675c5d59a93e927cd47ee0d1ed3d2a31cffd855f2db6924dda70b243bbd6d575d22e8e9aa9588f4b377547feecbaf0db8d6ed25006e269dde8bd9 SHA512 7aac967890dd57a67b6248722cefe9764e6ddfb280cb06f511e3f71e16527689098d39a80c32316f343030e3e5161e0e0003b83f95707b6a89dbf590fa5256a4
-AUX johntheripper-1.7.6-cflags.patch 2927 BLAKE2B e013afb4e669b5185b8020e6d65014809b2df8c9e2cbcb6c8508dddc7012468dc13e050720afe4925453ca0fed068d664184fbf70c94ab750f59895bfb0aab2f SHA512 47d9f074c9a639caf2366c425220f03c4daf882cbac3d86fa2649a5b12de3784713800be0f719a37b0b92c0c4b0a36ded247c351f894514cfa8fe67a0e23c732
-AUX johntheripper-1.7.9-clang.patch 454 BLAKE2B 96a7ffadcb23ba7979e05a796fafb8f22c1189a3f99de4145f0dc5ce95d492cc69b4cefa881ee8fc66573b069b69a408937faa6ecb2b5462390080302157252c SHA512 8fe7579f9ff27e43d1d42287823a8c885b8095600a076cb5807c4fb9f94798e730b817a56f8e3120a762959d06a09e9a4e312656bea4cee858198ae4cff0b5e7
-AUX johntheripper-1.7.9-ppc-compile-fix.patch 444 BLAKE2B 0bbbe937851272ba3a06c7c521c4cf24d092d66816f65eabd9800bb0c968e0a191fa7ccd2ccb2a87c0b540e8910a5f4c8978d7692cfba775b1f64471078ec013 SHA512 4af86bb0c5bfc4d88914f195744a596a71236fa49340b47748974a242fde82266fb6bfb41cb266980a3367b1c1a3797960f057a42c5ece3cdc09229c5a4a1513
-DIST john-1.7.9-jumbo-7.diff.gz 1074044 BLAKE2B beb2b3777bccd68ba510b75575cc12678f38bcebd08a8c6d91a291d14b2a3e404013ade5d68610bc9d4a2e26a6a00db8c8757bd4fbcb64bd20cde28a6abde9f4 SHA512 07a461df199fc776e8f62e969a95762fc1c99b72cdbd4a83d06f05ed236eaac9a918356ec9b8f8d060d1a9b2b8aa5c4021dfe53382761a5a76269ec66a5bd28a
-DIST john-1.7.9.tar.bz2 717505 BLAKE2B ea720451b4544a975d5baca75242f22d8b306ad4101f5774dd80b0855410efae7d7e09d6c43bd6e89aac7346ea686ccc5a1bfedc8c89888a39a49941774759a9 SHA512 121b4aa6fbb62b14db366aed739d7db760c136a4c3a39d8bba32bde269350354b3d18d15ee783f61b17913b0dd6773068cb01b3d3bbad290c309ae1cd027568b
 DIST john-1.8.0.tar.xz 4468704 BLAKE2B 90d6acc03dc8d22ef869320723e4799e64e15b621cde327ad420595889a43242b182079fd306bb7741b766ddc5e1239e3bdd4f4e396a4ab1e86d635cbebf8f60 SHA512 e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543
-EBUILD johntheripper-1.7.9-r11.ebuild 6534 BLAKE2B 008ae23a7c0f34613cdbbde75db6c4b488ce5dca2ef57a7726c55663eef563a7bd7a133424aa359e0c8dca659678a4fa62179f57b5a333316c545a71b99e30b9 SHA512 3b8fa826d67f349c8eafbb96c509def97e21bd1688fe762c211214a4def243c6db02d3afae0b23dcc7dae62a717d25cef302de2b782edc4a1d468424063066f7
-EBUILD johntheripper-1.7.9-r6.ebuild 6038 BLAKE2B b1f1791dd6bb0990b894aa04808f7593be46e44dc10760c2099152dca60fac9903f0af9466b83c17a380e3a2b281c1abc964d677c8d32dd5df734d97dc0cabbd SHA512 212da5ebef507b1a37d2c3a8ef4da5e9dd3072c30dbe86012bb304e364eb02f2a1d131eae50f7d66b5b5aea60e23b4b0c58cc76cbd0fca093194cc26ad645fdb
 EBUILD johntheripper-1.8.0.ebuild 3215 BLAKE2B f9a9b61c415871fc60d49df4f6b14fca0b5253617a973c7c5a6b6b7a99b9569d1b56ee22768e013727775eea1569773ef319302a671d91d1f2bcbaffe459d44d SHA512 c53429f8cbba8ea6e06511f2f389acc1a29ec3b663dbf96b0162ddaf9327078cfd4066175ef41b639f269dfe4ac791c2d40738833defe19f7e00e85e805d1853
-MISC metadata.xml 793 BLAKE2B 8650fe215af0de8946b72ebbd2c2979c437e90634fc48d9d1ac20350b23922a418093301641589a9d524de2908e2c715dc1e0419a2206a34ff20bb7eb0b2a3aa SHA512 29234712e9b5631919aa400e207b36cefa84819cf2609547f5244745d81559d10e79b50e296681b65d14fcf813eea69acbb97fd8f8f487bb4240e4087f4b098e
+MISC metadata.xml 515 BLAKE2B 498289b766df94a5c7e5f770804658821c5c2a3428725c53141c784a5ecf2e9229277175f941c46923009c43df6a16ac8ba27bb8b7e16b852409a558548b6c47 SHA512 f5893e1cb42c3f71c07968a099b2ce67f27aac202fec65860b8f67ae006691821efba255108436c8a5e752674cb76c7d43c8bbbf97b864b1067dfd8d66c5a474
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch
deleted file mode 100644
index 5600f3cc17ec..000000000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp john-1.7.3.1.org/src/path.c john-1.7.3.1/src/path.c
---- john-1.7.3.1.org/src/path.c	2003-10-01 04:26:25.000000000 +0300
-+++ john-1.7.3.1/src/path.c	2007-11-10 15:53:23.000000000 +0200
-@@ -55,7 +55,7 @@ void path_init(char **argv)
- #ifdef JOHN_PRIVATE_HOME
- 	private = path_expand(JOHN_PRIVATE_HOME);
- 	if (mkdir(private, S_IRUSR | S_IWUSR | S_IXUSR)) {
--		if (errno != EEXIST) pexit("mkdir: %s", private);
-+		if (errno != EEXIST && errno != EACCES) pexit("mkdir: %s", private);
- 	} else
- 		fprintf(stderr, "Created directory: %s\n", private);
- #endif
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch b/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch
deleted file mode 100644
index 4b6637a29d8f..000000000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- Makefile	2010-07-18 15:27:51.000000000 -0400
-+++ Makefile.mine	2010-07-18 15:30:09.000000000 -0400
-@@ -629,7 +629,7 @@
- macosx-ppc32-altivec:
- 	$(LN) ppc32alt.h arch.h
- 	$(MAKE) $(PROJ) \
--		CFLAGS="-c -Wall -fomit-frame-pointer" \
-+		CFLAGS="$(CFLAGS) -c -Wall -fomit-frame-pointer" \
- 		OPT_NORMAL="-fast -mcpu=7450" \
- 		OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec"
- 
-@@ -638,7 +638,7 @@
- 	$(LN) ppc32alt.h arch.h
- 	$(MAKE) $(PROJ) \
- 		ASFLAGS="$(ASFLAGS) -arch ppc" \
--		CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
-+		CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
- 		LDFLAGS="$(LDFLAGS) -arch ppc" \
- 		OPT_NORMAL="-fast -mcpu=7450" \
- 		OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec"
-@@ -650,7 +650,7 @@
- 	$(LN) ppc32.h arch.h
- 	$(MAKE) $(PROJ) \
- 		CC=cc \
--		CFLAGS="-c -traditional-cpp" \
-+		CFLAGS="$(CFLAGS) -c -traditional-cpp" \
- 		OPT_NORMAL="-O2" \
- 		OPT_INLINE="-O3"
- 
-@@ -658,7 +658,7 @@
- 	$(LN) ppc32.h arch.h
- 	$(MAKE) $(PROJ) \
- 		ASFLAGS="$(ASFLAGS) -arch ppc" \
--		CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
-+		CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
- 		LDFLAGS="$(LDFLAGS) -arch ppc" \
- 		OPT_NORMAL="-O2" \
- 		OPT_INLINE="-O3 -finline-limit=4000"
-@@ -667,7 +667,7 @@
- macosx-ppc64-altivec:
- 	$(LN) ppc64alt.h arch.h
- 	$(MAKE) $(PROJ) \
--		CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \
-+		CFLAGS="$(CFLAGS) -c -m64 -Wall -fomit-frame-pointer" \
- 		LDFLAGS="$(LDFLAGS) -m64" \
- 		OPT_NORMAL="-fast" \
- 		OPT_INLINE="-fast -finline-limit=4000 -faltivec -maltivec"
-@@ -676,7 +676,7 @@
- 	$(LN) ppc64alt.h arch.h
- 	$(MAKE) $(PROJ) \
- 		ASFLAGS="$(ASFLAGS) -arch ppc" \
--		CFLAGS="-c -arch ppc -m64 -Wall -fomit-frame-pointer" \
-+		CFLAGS="$(CFLAGS) -c -arch ppc -m64 -Wall -fomit-frame-pointer" \
- 		LDFLAGS="$(LDFLAGS) -arch ppc -m64" \
- 		OPT_NORMAL="-fast" \
- 		OPT_INLINE="-fast -finline-limit=4000 -faltivec -maltivec"
-@@ -684,7 +684,7 @@
- macosx-ppc64:
- 	$(LN) ppc64.h arch.h
- 	$(MAKE) $(PROJ) \
--		CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \
-+		CFLAGS="$(CFLAGS) -c -m64 -Wall -fomit-frame-pointer" \
- 		LDFLAGS="$(LDFLAGS) -m64" \
- 		OPT_NORMAL="-fast" \
- 		OPT_INLINE="-fast -finline-limit=4000"
-@@ -693,7 +693,7 @@
- 	$(LN) ppc64.h arch.h
- 	$(MAKE) $(PROJ) \
- 		ASFLAGS="$(ASFLAGS) -arch ppc" \
--		CFLAGS="-c -arch ppc -m64 -Wall -fomit-frame-pointer" \
-+		CFLAGS="$(CFLAGS) -c -arch ppc -m64 -Wall -fomit-frame-pointer" \
- 		LDFLAGS="$(LDFLAGS) -arch ppc -m64" \
- 		OPT_NORMAL="-fast" \
- 		OPT_INLINE="-fast -finline-limit=4000"
-@@ -723,7 +723,7 @@
- 	$(LN) ppc32alt.h arch.h
- 	$(MAKE) $(PROJ) \
- 		ASFLAGS="$(ASFLAGS) -arch ppc" \
--		CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \
-+		CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \
- 		LDFLAGS="$(LDFLAGS) -arch ppc" \
- 		OPT_NORMAL="-fast -mcpu=7450" \
- 		OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec"
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch b/app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch
deleted file mode 100644
index 1b85914ed4ff..000000000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix for building johntheripper with clang.
-
-https://bugs.gentoo.org/show_bug.cgi?id=554392 
-
---- john-1.7.9-jumbo-7/src/rawSHA1_ng_fmt.c
-+++ john-1.7.9-jumbo-7/src/rawSHA1_ng_fmt.c
-@@ -530,7 +530,7 @@
- 
- #if defined(__SSE4_1__)
- 
--# if !defined(__INTEL_COMPILER)
-+# if !defined(__INTEL_COMPILER) && !defined(__clang__)
- // This intrinsic is not always available in GCC, so define it here.
- static inline int _mm_testz_si128 (__m128i __M, __m128i __V)
- {
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.9-ppc-compile-fix.patch b/app-crypt/johntheripper/files/johntheripper-1.7.9-ppc-compile-fix.patch
deleted file mode 100644
index c28ec21a0ae8..000000000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.9-ppc-compile-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ru john-1.7.9.orig/src/gost_plug.c john-1.7.9/src/gost_plug.c
---- john-1.7.9.orig/src/gost_plug.c     2013-01-20 16:15:45.464000001 +0000
-+++ john-1.7.9/src/gost_plug.c  2013-01-20 16:16:06.104000001 +0000
-@@ -531,7 +531,6 @@
- }
- #endif
- 
--#ifndef __GLIBC__
- void rhash_u32_swap_copy(void* to, int index, const void* from, size_t length) {
-	size_t i;
-	unsigned int *pO, *pI;
-@@ -542,4 +541,3 @@
-		*pO++ = bswap_32(*pI++);
- 	}
- }
--#endif
-
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
deleted file mode 100644
index 49d18cec6232..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r11.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cuda eutils flag-o-matic toolchain-funcs pax-utils multilib
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-7"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="https://www.openwall.com/john/"
-
-SRC_URI="https://www.openwall.com/john/g/${MY_P}.tar.bz2
-	!minimal? ( https://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-#Remove AltiVec USE flag. Appears to be an upstream issue.
-IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx libressl mozilla mpi opencl openmp cpu_flags_x86_sse2"
-REQUIRED_USE="openmp? ( !minimal )
-	mpi? ( !minimal )
-	cuda? ( !minimal )
-	opencl? ( !minimal )
-	mozilla? ( !minimal )"
-
-RDEPEND="!app-crypt/johntheripper-jumbo
-	sys-libs/zlib
-	!minimal? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	mpi? ( virtual/mpi )
-	cuda? ( x11-drivers/nvidia-drivers
-		dev-util/nvidia-cuda-toolkit:= )
-	opencl? ( virtual/opencl )
-	mozilla? ( dev-libs/nss dev-libs/nspr )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-has_xop() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
-}
-
-has_avx() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
-}
-
-get_target() {
-	if use alpha; then
-		echo "linux-alpha"
-	elif use amd64; then
-		if has_xop; then
-			echo "linux-x86-64-xop"
-		elif has_avx; then
-			echo "linux-x86-64-avx"
-		else
-			echo "linux-x86-64"
-		fi
-	elif use ppc; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc32"
-		#fi
-	elif use ppc64; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc64"
-		#fi
-		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
-		# as per the Makefile comments
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use x86; then
-		if has_xop; then
-			echo "linux-x86-xop"
-		elif has_avx; then
-			echo "linux-x86-avx"
-		elif use cpu_flags_x86_sse2; then
-			echo "linux-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use ppc-macos; then
-	# force AltiVec, the non-altivec profile contains ancient compiler cruft
-	#	if use altivec; then
-			echo "macosx-ppc32-altivec"
-	#	else
-	#		echo "macosx-ppc32"
-	#	fi
-		# for Tiger this can be macosx-ppc64
-	elif use x86-macos; then
-		if use cpu_flags_x86_sse2; then
-			echo "macosx-x86-sse2"
-		else
-			echo "macosx-x86"
-		fi
-	elif use x86-solaris; then
-		echo "solaris-x86-any"
-	elif use x86-fbsd; then
-		if use cpu_flags_x86_sse2; then
-			echo "freebsd-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "freebsd-x86-mmx"
-		else
-			echo "freebsd-x86-any"
-		fi
-	elif use amd64-fbsd; then
-		echo "freebsd-x86-64"
-	else
-		echo "generic"
-	fi
-}
-
-get_john_objs() {
-	echo -n '${JOHN_COMMON_OBJS} '
-	if use opencl; then
-		echo -n '${OCL_OBJS} '
-	fi
-	if use cuda; then
-		echo -n '${CUDA_OBJS}'
-	fi
-}
-
-pkg_setup() {
-	if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	if ! use minimal; then
-		eapply "${WORKDIR}/${MY_P}-${JUMBO}.diff"
-
-		if use mpi ; then
-			sed -e "s/^#CC = mpicc/CC = mpicc/" \
-				-e "s/^#MPIOBJ =/MPIOBJ =/" \
-				-i src/Makefile || die
-		fi
-
-		# fix typo in jumbo patch
-		sed -i 's:All15:All5:' run/john.conf || die
-		# fix compile on ppc (only needed for jumbo-7)
-		eapply "${FILESDIR}/${P}-ppc-compile-fix.patch"
-	fi
-
-	cd src || die
-	eapply -p0 "${FILESDIR}/${PN}-1.7.6-cflags.patch"
-	eapply -p2 "${FILESDIR}/${PN}-1.7.3.1-mkdir-sandbox.patch"
-	eapply -p2 "${FILESDIR}/${PN}-1.7.9-clang.patch"
-	eapply_user
-
-	if ! use minimal; then
-		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
-			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
-			-i Makefile || die "sed Makefile failed"
-		sed -i 's#/usr/local#/opt#g' Makefile || die
-	fi
-	sed -i 's#JOHN_OBJS = \\#JOHN_COMMON_OBJS = \\#g' Makefile || die
-
-	if use cuda; then
-		cuda_src_prepare
-		sed \
-			-e "/^NVCC_FLAGS/s:-arch sm_10:${NVCCFLAGS}:g" \
-			-i Makefile || die
-	fi
-
-	if use mozilla; then
-		sed -i -e '/HAVE_NSS =/s/^#*//' -e 's/NSS_override//' Makefile || die
-	fi
-}
-
-src_compile() {
-	local OMP
-
-	use custom-cflags || strip-flags
-	cat <<- EOF >> config.gentoo || die
-	#define JOHN_SYSTEMWIDE 1
-	#define JOHN_SYSTEMWIDE_HOME "${EPREFIX}/etc/john"
-	#define JOHN_SYSTEMWIDE_EXEC "${EPREFIX}/usr/libexec/john"
-EOF
-
-	append-flags -fPIC -fPIE
-	gcc-specs-pie && append-ldflags -nopie
-	use openmp && OMP="-fopenmp"
-
-	CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
-	if use mpi; then
-		CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
-	fi
-
-	#this stuff was all stolen from the Makefile, if build breaks, check this first
-	if use opencl; then
-		GPUCFLAGS="${GPUCFLAGS} -DCL_VERSION_1_0"
-		GPULDFLAGS="${GPULDFLAGS} -lOpenCL"
-	fi
-	if use cuda; then
-		GPUCFLAGS="${GPUCFLAGS} -DHAVE_CUDA"
-		GPULDFLAGS="${GPULDFLAGS} -L/opt/cuda/$(get_libdir) -lcudart"
-	fi
-
-	emake -C src/ \
-		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
-		CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP} ${GPUCFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${GPULDFLAGS}" \
-		OPT_NORMAL="" \
-		OMPFLAGS="${OMP}" \
-		JOHN_OBJS="$(get_john_objs)" \
-		$(get_target)
-}
-
-src_test() {
-	if use opencl; then
-		cp src/opencl/*.cl run/
-		cp src/opencl_*.h run/
-	fi
-	pax-mark -mr run/john
-	if use opencl || use cuda; then
-		ewarn "GPU tests fail, skipping all tests..."
-	else
-		make -C src/ check
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -mr "${ED}/usr/sbin/john" || die
-
-	dosym john /usr/sbin/unafs
-	dosym john /usr/sbin/unique
-	dosym john /usr/sbin/unshadow
-
-	# jumbo-patch additions
-	if ! use minimal; then
-		for s in \
-			keychain2john keepass2john pwsafe2john hccap2john \
-			racf2john zip2john rar2john pdf2john ssh2john undrop \
-			; do
-			dosym john /usr/sbin/$s
-		done
-		use mozilla && dosym john /usr/sbin/mozilla2john
-		dosbin run/calc_stat
-		dosbin run/genmkvpwd
-		dosbin run/mkvcalcproba
-		dosbin run/raw2dyna
-		dosbin run/tgtsnarf
-		insinto /etc/john
-		doins run/genincstats.rb run/stats
-		doins run/netscreen.py run/sap2john.pl
-		if use opencl; then
-			doins src/opencl/*.cl
-			doins src/opencl_*.h
-		fi
-	fi
-
-	# config files
-	insinto /etc/john
-	doins run/*.chr run/password.lst
-	doins run/*.conf
-
-	# documentation
-	dodoc doc/*
-}
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
deleted file mode 100644
index 48f23d519a62..000000000000
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r6.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs pax-utils multilib
-
-MY_PN="john"
-MY_P="${MY_PN}-${PV}"
-
-JUMBO="jumbo-7"
-
-DESCRIPTION="fast password cracker"
-HOMEPAGE="https://www.openwall.com/john/"
-
-SRC_URI="https://www.openwall.com/john/g/${MY_P}.tar.bz2
-	!minimal? ( https://www.openwall.com/john/g/${MY_P}-${JUMBO}.diff.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-#Remove AltiVec USE flag. Appears to be an upstream issue.
-IUSE="cuda custom-cflags -minimal cpu_flags_x86_mmx mpi opencl openmp cpu_flags_x86_sse2"
-REQUIRED_USE="openmp? ( !minimal )
-	mpi? ( !minimal )
-	cuda? ( !minimal )
-	opencl? ( !minimal )"
-
-RDEPEND="!app-crypt/johntheripper-jumbo
-	sys-libs/zlib
-	!minimal? ( >=dev-libs/openssl-0.9.7:0 )
-	mpi? ( virtual/mpi )
-	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
-	opencl? ( virtual/opencl )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-has_xop() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1"
-}
-
-has_avx() {
-	echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1"
-}
-
-get_target() {
-	if use alpha; then
-		echo "linux-alpha"
-	elif use amd64; then
-		if has_xop; then
-			echo "linux-x86-64-xop"
-		elif has_avx; then
-			echo "linux-x86-64-avx"
-		else
-			echo "linux-x86-64"
-		fi
-	elif use ppc; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc32"
-		#fi
-	elif use ppc64; then
-		#if use altivec; then
-		#	echo "linux-ppc32-altivec"
-		#else
-			echo "linux-ppc64"
-		#fi
-		# linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types.
-		# as per the Makefile comments
-	elif use sparc; then
-		echo "linux-sparc"
-	elif use x86; then
-		if has_xop; then
-			echo "linux-x86-xop"
-		elif has_avx; then
-			echo "linux-x86-avx"
-		elif use cpu_flags_x86_sse2; then
-			echo "linux-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "linux-x86-mmx"
-		else
-			echo "linux-x86-any"
-		fi
-	elif use ppc-macos; then
-	# force AltiVec, the non-altivec profile contains ancient compiler cruft
-	#	if use altivec; then
-			echo "macosx-ppc32-altivec"
-	#	else
-	#		echo "macosx-ppc32"
-	#	fi
-		# for Tiger this can be macosx-ppc64
-	elif use x86-macos; then
-		if use cpu_flags_x86_sse2; then
-			echo "macosx-x86-sse2"
-		else
-			echo "macosx-x86"
-		fi
-	elif use x86-solaris; then
-		echo "solaris-x86-any"
-	elif use x86-fbsd; then
-		if use cpu_flags_x86_sse2; then
-			echo "freebsd-x86-sse2"
-		elif use cpu_flags_x86_mmx; then
-			echo "freebsd-x86-mmx"
-		else
-			echo "freebsd-x86-any"
-		fi
-	elif use amd64-fbsd; then
-		echo "freebsd-x86-64"
-	else
-		echo "generic"
-	fi
-}
-
-get_john_objs() {
-	echo -n '${JOHN_COMMON_OBJS} '
-	if use opencl; then
-		echo -n '${OCL_OBJS} '
-	fi
-	if use cuda; then
-		echo -n '${CUDA_OBJS}'
-	fi
-}
-
-pkg_setup() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	if ! use minimal; then
-		epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff"
-
-		if use mpi ; then
-			sed -e "s/^#CC = mpicc/CC = mpicc/" \
-				-e "s/^#MPIOBJ =/MPIOBJ =/" \
-				-i src/Makefile || die
-		fi
-
-		# fix typo in jumbo patch
-		sed -i 's:All15:All5:' run/john.conf || die
-		# fix compile on ppc (only needed for jumbo-7)
-		epatch "${FILESDIR}/${P}-ppc-compile-fix.patch"
-	fi
-
-	cd src
-	epatch "${FILESDIR}/${PN}-1.7.6-cflags.patch"
-	epatch "${FILESDIR}/${PN}-1.7.3.1-mkdir-sandbox.patch"
-
-	if ! use minimal; then
-		sed -e "s/LDFLAGS  *=  */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \
-			-e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \
-			-i Makefile || die "sed Makefile failed"
-		sed -i 's#/usr/local#/opt#g' Makefile || die
-	fi
-	sed -i 's#JOHN_OBJS = \\#JOHN_COMMON_OBJS = \\#g' Makefile || die
-}
-
-src_compile() {
-	local OMP
-
-	use custom-cflags || strip-flags
-	echo "#define JOHN_SYSTEMWIDE 1" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
-	echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
-	append-flags -fPIC -fPIE
-	gcc-specs-pie && append-ldflags -nopie
-	use openmp && OMP="-fopenmp"
-
-	CPP="$(tc-getCXX)" CC="$(tc-getCC)" AS="$(tc-getCC)" LD="$(tc-getCC)"
-	if use mpi; then
-		CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
-	fi
-
-	#this stuff was all stolen from the Makefile, if build breaks, check this first
-	if use opencl; then
-		GPUCFLAGS="${GPUCFLAGS} -DCL_VERSION_1_0"
-		GPULDFLAGS="${GPULDFLAGS} -lOpenCL"
-	fi
-	if use cuda; then
-		GPUCFLAGS="${GPUCFLAGS} -DHAVE_CUDA"
-		GPULDFLAGS="${GPULDFLAGS} -L/opt/cuda/$(get_libdir) -lcudart"
-	fi
-
-	emake -C src/ \
-		CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
-		CFLAGS="-c -Wall -include ../config.gentoo ${CFLAGS} ${OMP} ${GPUCFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${GPULDFLAGS}" \
-		OPT_NORMAL="" \
-		OMPFLAGS="${OMP}" \
-		JOHN_OBJS="$(get_john_objs)" \
-		$(get_target)
-}
-
-src_test() {
-	if use opencl; then
-		cp src/opencl/*.cl run/
-		cp src/opencl_*.h run/
-	fi
-	pax-mark -mr run/john
-	if use opencl || use cuda; then
-		ewarn "GPU tests fail, skipping all tests..."
-	else
-		make -C src/ check
-	fi
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -mr "${ED}usr/sbin/john" || die
-
-	dosym john /usr/sbin/unafs
-	dosym john /usr/sbin/unique
-	dosym john /usr/sbin/unshadow
-
-	# jumbo-patch additions
-	if ! use minimal; then
-		for s in \
-			keychain2john keepass2john pwsafe2john hccap2john \
-			racf2john zip2john rar2john pdf2john ssh2john undrop \
-			; do
-			dosym john /usr/sbin/$s
-		done
-		dosbin run/calc_stat
-		dosbin run/genmkvpwd
-		dosbin run/mkvcalcproba
-		dosbin run/raw2dyna
-		dosbin run/tgtsnarf
-		insinto /etc/john
-		doins run/genincstats.rb run/stats
-		doins run/netscreen.py run/sap2john.pl
-		if use opencl; then
-			doins src/opencl/*.cl
-			doins src/opencl_*.h
-		fi
-	fi
-
-	# config files
-	insinto /etc/john
-	doins run/*.chr run/password.lst
-	doins run/*.conf
-
-	# documentation
-	dodoc doc/*
-}
diff --git a/app-crypt/johntheripper/metadata.xml b/app-crypt/johntheripper/metadata.xml
index e03a2537ac54..40069f63efa1 100644
--- a/app-crypt/johntheripper/metadata.xml
+++ b/app-crypt/johntheripper/metadata.xml
@@ -13,9 +13,4 @@
   <upstream>
     <remote-id type="github">magnumripper/JohnTheRipper</remote-id>
   </upstream>
-  <use>
-    <flag name="cuda">Use nvidia cuda toolkit for speeding up cracking on capable devices</flag>
-    <flag name="mozilla"> Support mozilla password cracking</flag>
-    <flag name="opencl">Enable opencl support for speeding up cracking on capable devices</flag>
-  </use>
 </pkgmetadata>
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
index b805e21396f3..445ca1e3a491 100644
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@@ -1,5 +1,5 @@
 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.ebuild 1311 BLAKE2B 3627d6fe7a4ce4bb84af4e2f39e3e06110c8a1677d2972a2a04d44aa6d8ec478009c1d2be6c994b42ad592f1e04151a54c237189f2058069758fb1908e68c9a1 SHA512 dcc298e5edf90c4557ff5eb6a0dd55d6307115a99aa7f498de86b54ee685097c12fd7b61e58077a6b8c38fbe0ce22c8499af4b413e8fc01960424366513c9dff
-EBUILD libb2-0.98.ebuild 983 BLAKE2B ef56ce606348776f1bf24a3e275c95ae40e0569e46dad425c5e47b30b6df4ea512477f41bf117b4e4b0562d4ffbbc2de9ef2d9e4e6b897bc25859ee5f6c63816 SHA512 8e69f8cee42a75680d4aa616127482c36f986cf32f5c2612e0c1af7418b8b62cbd0cb73163ba93190b9359389a13eb31fd75528110391318dc3d14d0d78447a4
+EBUILD libb2-0.98.1-r1.ebuild 1692 BLAKE2B 6c089a1c06d14c51c3c745da19416975d1ade0590fe11642a9d4bc02ec54bb77b7cc7c73319e45d2e7ba917b2cd229f14373d8bbafd09f0e9b46fcfb11261c77 SHA512 0e343e4e348bb19e1256f6d8ee9b2df52a950ad6c81ce606d59b2c2779cf061e876cded2f0b9e7a50c8e9ee927b9e0a17a2886817c62be2a19ca87a35fbe3a49
+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.ebuild b/app-crypt/libb2/libb2-0.98.1-r1.ebuild
index 2664bc570e7a..9224a54ad537 100644
--- a/app-crypt/libb2/libb2-0.98.1.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools ltprune toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp"
 HOMEPAGE="https://github.com/BLAKE2/libb2"
@@ -12,8 +12,8 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="static +native-cflags openmp"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc64 ~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="
 	openmp? (
@@ -35,22 +35,33 @@ src_prepare() {
 	default
 	# fix bashism
 	sed -i -e 's/ == / = /' configure.ac || die
+	# https://github.com/BLAKE2/libb2/pull/28
+	echo 'libb2_la_LDFLAGS = -no-undefined' >> src/Makefile.am || die
 	eautoreconf  # upstream doesn't make releases
 }
 
 src_configure() {
 	econf \
-		$(use_enable static) \
+		$(use_enable static-libs static) \
 		$(use_enable native-cflags native) \
 		$(use_enable openmp)
 }
 
-src_compile() {
+do_make() {
 	# respect our CFLAGS when native-cflags is not in effect
-	emake $(use native-cflags && echo no)CFLAGS="${CFLAGS}"
+	local openmp=$(use openmp && echo -fopenmp)
+	emake $(use native-cflags && echo no)CFLAGS="${CFLAGS} ${openmp}" "$@"
+}
+
+src_compile() {
+	do_make
+}
+
+src_test() {
+	do_make check
 }
 
 src_install() {
 	default
-	prune_libtool_files
+	use static-libs || find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/app-crypt/libb2/libb2-0.98.ebuild b/app-crypt/libb2/libb2-0.98.ebuild
index 3ca37501441b..64ec18c1de9e 100644
--- a/app-crypt/libb2/libb2-0.98.ebuild
+++ b/app-crypt/libb2/libb2-0.98.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools ltprune
+inherit autotools
 
 DESCRIPTION="C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp"
 HOMEPAGE="https://github.com/BLAKE2/libb2"
@@ -40,5 +40,5 @@ src_compile() {
 
 src_install() {
 	default
-	prune_libtool_files
+	use static || find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index 2fda801ce1f1..07b11de153a9 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -2,5 +2,5 @@ DIST libmd-1.0.0.tar.xz 254852 BLAKE2B af0d3c645a18262965e708d678cb30c7ed168af80
 DIST libmd-1.0.1.tar.xz 257372 BLAKE2B e954ab6b1247952abcf6964d8d714c2a47a644e206a455db547a0159a97ebbc323cf1258a24c744cea3106f267f1a319a689fe545b672580f4e134d96cc7cb3d SHA512 6f343101f9ad8f927d862e6bae948d35ba596ecfd375c255fefb86efc621cf6e9de3597770ad66e0a48e8f4ea018df78debb571ea6746a7457d8900fec87069b
 EBUILD libmd-1.0.0-r1.ebuild 614 BLAKE2B 9d33178bd6faa47c60573c9f1b067cb4243074b42b5d7bc644f6cbfd47fd492081b0a7bcb169db21f0fab0edf3d3f8caf5e500a634ac0292a479f9ee9d766730 SHA512 aa0fdde5ba65459296370927e0c179f55a8aa9abb67ee3ee03eb803dd7760b8c695b826f5a876d89e460c0157bf0cf4f8d2fd5b81ed4ca89cce2d97b1c91aa99
 EBUILD libmd-1.0.0.ebuild 386 BLAKE2B 03798470d2403edab2cb52c6dd7f36abf86ae1590642b7a46c5166adac60e272fae28f72f0384a2bf80763f2d814211b0aa4d562a43829a9236b1a47f4637107 SHA512 6a7cdfc8a8a1a271e328d03f60634b94e3901684af86659996b082a3ecdc858c7b8345d66edfcd0667863bb964f61d116ceb5e9850599409d362906692762b74
-EBUILD libmd-1.0.1.ebuild 626 BLAKE2B 10e97b86dc45c3d24b0f563d9db54e3010c7d45275e887256cb7b05edc1434020e78beada1bffbd24c1b59f1268155efea4b87c588899e0966b82d366be7f42b SHA512 075ad4f713b8d7e59edb5f9f126264318e0b1cbf230e71ad8ed54b36f3023ed1fe7e2d4952bfd69c8738970d5ce747781ee20e6adefbfb0afa08cbb0c6944c11
+EBUILD libmd-1.0.1.ebuild 651 BLAKE2B 7bf3c330bc3366bd96d3c1eb151c8d166f2707f0be890bc8065c227f1931f5c7346de39251d635b7e1b8ac311797846dd55e0adb8e35ec1995880221f6f26616 SHA512 d3cda10b7575a4159477cbb4198fe15557931519a6e15a7eed74935ff6f9e6624f2e76f835ade8af899dea1875712736e6b12e45265eda2c7d4d1f6929b8147f
 MISC metadata.xml 217 BLAKE2B db2fea1f008893d22d3d43f938c7b7fc7c035cfe58b04e1652b74e3c6a6f35754cfee5351ab5cfbfe286f03ff558b83167764305186d6a15ff10dfa29639011e SHA512 d1543d516a9e55d1985a460e7b21735cb30b977ba2ee097a43bd220c1bdab573baba004968a2d027d99f1222d3fc06931154e70e47b60a61869da05137af20ce
diff --git a/app-crypt/libmd/libmd-1.0.1.ebuild b/app-crypt/libmd/libmd-1.0.1.ebuild
index a57275e5b43b..b3776d95ea2a 100644
--- a/app-crypt/libmd/libmd-1.0.1.ebuild
+++ b/app-crypt/libmd/libmd-1.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
 
 LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 src_configure() {
@@ -21,6 +21,6 @@ src_install() {
 	default
 
 	if ! use static-libs; then
-		rm "${D}"/usr/$(get_libdir)/libmd.la || die
+		rm "${ED}"/usr/$(get_libdir)/libmd.la || die
 	fi
 }
diff --git a/app-crypt/libu2f-host/Manifest b/app-crypt/libu2f-host/Manifest
index 80bf618ff112..f34bc125a2ab 100644
--- a/app-crypt/libu2f-host/Manifest
+++ b/app-crypt/libu2f-host/Manifest
@@ -1,7 +1,9 @@
 DIST libu2f-host-1.1.1.tar.xz 455652 BLAKE2B f5cc4dd7752d66790b4139e5b8e9262f6622b9608bc8b220640db773ce1e794b58eb3fdf855df4e73417aabf5f8e979218dfd1b068111c66c6d830ef4b7ebb97 SHA512 1f6d26d47cabd44391a780f03d88b6ab9ed996bab26e2605f1942bfff2203aa9a8e90fa80c010ccf2e575dbfca3bd03d3322381343cdf6def3829bbe45db8693
+DIST libu2f-host-1.1.10.tar.xz 471676 BLAKE2B 5066eaaaeda3b8c015afa8946f0af3b1b90a34488d4c71811c0d8f57a3ed2e4c8cb3d82d2df147dcf13ac3c384522d22f25894ac3a2d994a75b288891a67640a SHA512 91c5bf3994f1d3c9bd144f54b14b0404d839c15bef3c318619decdf1bd37214bcff33927af78a9826ff7d0bc9907c912a0e31104ae68d3a727a8436f2a1dbf7a
 DIST libu2f-host-1.1.3.tar.xz 469480 BLAKE2B b2a002fa694972e71aef73191608d079f1c13d98a2f40e06d25a6e50a3175100099adbc5b5067e5f1fe027042f99e198a07282df735ab4ff2eec63a4f5daf59a SHA512 6729dd35beaae1c96283f81794ac6c058ed6446f935a5cee7dc1a3db594201c9f049de6a58ac2e544e1c6ac0c1e9815cce5e2e46a6e45372e419078307a57f55
 DIST libu2f-host-1.1.6.tar.xz 469380 BLAKE2B 7943b6dd61084952edb81ab2c93fd781d832f0ad07dff442c93464ecce57bde8a7b3d4aea5fa6801f39a5cbb272658ba86bf499f485bca35fa5fa314d609ff2f SHA512 499efac0243a7e5fadf6c456cc5530633337c07ab7dda52bd77b541b24ffd0337efe95cce499e73d6c46d312e737c044edcbdb4d41043b1e8721242d6e6ad20a
 EBUILD libu2f-host-1.1.1.ebuild 1298 BLAKE2B 3eb0abee39181c3aea3cf63bbc59655732a0b8ec28bbc7260694e25f545749fcf0d7bd20aff6f7a3575d56d52c7ae8094dc7954ac76c5f9921ebd21a5a376248 SHA512 c5422305f55e948d20c2b954710b97a61a6b3e8ce48dca1950967c2a6c02e6d63b0530ab427fa5c48a90802544b4b13dcee8ccb88c9e1df814549219db1bed1f
+EBUILD libu2f-host-1.1.10.ebuild 997 BLAKE2B 54ff8fc99f532da61d28de3fbd588d8ba841da23e6670c15e0f51b892f4cb30fe31957d0ad05091003b162e5a079fa515a7d6d8c080623742e40528503fb4b2b SHA512 48cf0dd2cb0170be09057921c9a122aa36140294bd6cc2417f97cad7bfeffc60b31cad24196cf3dda11ef14b06bd2a928ed55bfeebdcde7341d6a1f94d5981f6
 EBUILD libu2f-host-1.1.3.ebuild 1171 BLAKE2B 0de12a01fbeec1d1a4c7e728456f2071c68bff6b325917ee1de2bb4b547f72f43788e999d2964e13731473cb14a16b2557c4f3b078eb464ae8af00909d5d621f SHA512 a9815676a32f12476cb05720e3b513a4ea8ea8b57c75d6fc1acb406b0c31772c145713537d09644ae5504df1cfbaac6281875afe31c2f5c8edabcc9266f37f27
 EBUILD libu2f-host-1.1.6.ebuild 1170 BLAKE2B c5d8cbb4986694acc55f0bc3f77cf067abed86f1da0d0e84bfc850be74bd8c22c0b94792316a40e8c05a428045f42946513b2b39e6a2e1ae58e84c3d207896d4 SHA512 7486e0234f2629c5adfea4a2e4ac62a4e8fc16e40e3da05e0b07418fbf9e6cf6d2ed25ff66c13df59bd001a9cec2ccdb373ac638d4091379b9672c677b1efdd3
-MISC metadata.xml 550 BLAKE2B 992fdc0643bed1c1122b544947535745a7209552387c3e6917942eee04cd33bd613f78f5e447099493b56e133d88095d958a8816f1b1ba65d34944ddb3210eea SHA512 9970724fffe49705d8dedc85522cbe3040c4e542fa5a56c2cbc428df2540975e76a84fe8c4819bfaacc085cccdf6e5a996a058c14f561b9ef10c7d705f98bfa0
+MISC metadata.xml 668 BLAKE2B 7720f7dae3f50bb3c6061bb2fdfa973fc5cea8ee314c4d7b95934037430d8083ff8629b3fb4d6233e6617596810112e3a4fec93eb702058ec09cd86d0931183b SHA512 017018b2122b3adf87c7d3a8d70211f337de3b6ac9e8e446f3f2f70db29d33af201c9b2dbe4404e5ac7f36360f96abae24e6501ec60eb256e6ba974c37fc6932
diff --git a/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild b/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild
new file mode 100644
index 000000000000..d78a9d192b5a
--- /dev/null
+++ b/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info udev user
+
+DESCRIPTION="Yubico Universal 2nd Factor (U2F) Host C Library"
+HOMEPAGE="https://developers.yubico.com/libu2f-host/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="kernel_linux static-libs systemd"
+
+DEPEND="dev-libs/hidapi
+	dev-libs/json-c:="
+RDEPEND="${DEPEND}
+	systemd? ( sys-apps/systemd[acl] )"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~HIDRAW"
+
+pkg_setup() {
+	# The U2F device node will be owned by group 'plugdev'
+	# in non-systemd configurations
+	if ! use systemd; then
+		enewgroup plugdev
+	fi
+}
+
+src_install() {
+	default
+	if use kernel_linux; then
+		udev_dorules 70-u2f.rules
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if ! use systemd; then
+		elog "Users must be a member of the 'plugdev' group"
+		elog "to be able to access U2F devices"
+	fi
+}
diff --git a/app-crypt/libu2f-host/metadata.xml b/app-crypt/libu2f-host/metadata.xml
index e15cf03356a6..cd45b1827971 100644
--- a/app-crypt/libu2f-host/metadata.xml
+++ b/app-crypt/libu2f-host/metadata.xml
@@ -5,6 +5,10 @@
     <email>crypto@gentoo.org</email>
     <name>Crypto</name>
   </maintainer>
+  <maintainer type="person">
+    <email>gokturk@gentoo.org</email>
+    <name>Göktürk Yüksek</name>
+  </maintainer>
   <use>
     <flag name="systemd">
       Use user ACLs rather than plugdev group to give user access to the HIDRAW
diff --git a/app-crypt/libu2f-server/Manifest b/app-crypt/libu2f-server/Manifest
index 776ac4524d59..795c702bde69 100644
--- a/app-crypt/libu2f-server/Manifest
+++ b/app-crypt/libu2f-server/Manifest
@@ -1,7 +1,5 @@
 AUX libu2f-server-1.0.1-tests-fix.patch 1486 BLAKE2B 19b37973a2efcbdbca285e59baf7f1d4c03abd4592f9ed988cd02c6bfea892c2ee3db1cf36621f685da1ab5075219e05ff2dc6752dcec30576aac271ec57b0b6 SHA512 3283f95308f72a13ce8575969992c633705eacacf3c01546d1fd8c35c3a5499a1229d8dd34f493075b4f145f2e722fed6568d75c8f37729f6b18d5b9bb553e45
 AUX libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch 1137 BLAKE2B fc1d8287d590acf1385747091195e4401f9c3cba2ad6c0911f2ca549504569250567ef5e1b64124b5545460ba53e7e61354c4393051c275212b40c5a70764dd9 SHA512 cae13f6c9738be740055d0d26a7913f84bee0edf3df06d8a4e3da39dbcd7dd24ca19af638c1f00c3e45d68389e9ae842ab2a92ccd690a04af610646705edd498
-DIST libu2f-server-1.0.1.tar.xz 268648 BLAKE2B 9c6c2e5bafb2a95fcc5c2773de49b4db197ee6283e90cf0e4e62ff3982bdde8a51635cd9771e4dd35d27c71634367197d3b01b9c26d8a3847fccf1daf676f04b SHA512 51020722f49f787c793808b667e91923bde46e9137bfe5065106f83bcdb678e8d11cca12cb605d9622cafc15a9794c9080cf08e2a704293a791ab6f27ac47f47
 DIST libu2f-server-1.1.0.tar.xz 269128 BLAKE2B 084b177a878e8216f2ee5af9eeee11e691edcd12b7ed1b1c57f74bcc45f0418a0d44a9e72423c41b4104aa9f69807a0289172d08d21d168c6be5b36ee8c70bc3 SHA512 ebdb7c8c20727f37f4e31d8f16df7966603374f78478ada723a7b9bec1b0b0622caf6d12a65067ac8651f6088aaad61b2ad6ed51b9d6ef0dc45f031c974d8ff9
-EBUILD libu2f-server-1.0.1.ebuild 1141 BLAKE2B 940d5c772e94a0e77a72b56330a1c013da2588d573edb999a2d0af4cda5c8b62f07ea92eba0b45fb763200f6c7edf7f47bd115cf8bd4972e1681a6b0d9145bcc SHA512 6050266c78936ca416549483ded7beeb8866a23ca7cdebf0b5a973191bf27af0ece5cecf27c784c4abe8d1edbcd073baa7150236531d45dba18036dd20315459
 EBUILD libu2f-server-1.1.0.ebuild 1187 BLAKE2B 27ec974968e6717e3c17d2b89bc616ccf393509e9e247613ab638393d7c1efce5ca3643981c164788b10979b17180c9a87b6c338c0a44ffd58172502e4708fcd SHA512 85d9d2c8170c9566f614247aad94e177ffcea29b7c4e22df52085b5cbf3a65c2f733db20bd6168dc28ec2a0aacc4bb328c296df3d543163a0ce026538f9e08db
 MISC metadata.xml 351 BLAKE2B 9b08643cd9cfab47436281dd57bca31e713980d3cb0b5d20fcd9a915bc5adbcf589ac4df9f03929a8f57e7a11393602afe05d025d10bb04d425bacc1f4765324 SHA512 6a1aeb9117473d5c2ea5de3a3043de7926bb70e2cc00ac8c13b4d3a27b7fd3c7ca6611bc4f4ed9faeb611f228f5a8ffc657e924fdf800133d62a70b48e408f22
diff --git a/app-crypt/libu2f-server/libu2f-server-1.0.1.ebuild b/app-crypt/libu2f-server/libu2f-server-1.0.1.ebuild
deleted file mode 100644
index 823be1308e3d..000000000000
--- a/app-crypt/libu2f-server/libu2f-server-1.0.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="Yubico Universal 2nd Factor (U2F) server C Library"
-HOMEPAGE="https://developers.yubico.com/libu2f-server/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl static-libs test"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-	dev-libs/hidapi[${MULTILIB_USEDEP}]
-	dev-libs/json-c:=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-tests-fix.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	touch man/u2f-server.1 || die # do not rebuild the man page
-}
-
-multilib_src_configure() {
-	myeconfargs=(
-		--disable-h2a # tarball already contains the manpage
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	prune_libtool_files
-}
diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest
index b8228916b076..3c6837b09afc 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 920 BLAKE2B adefcace3aa01326e563d859d24599b5e3d10b1eb56cf1fd0838f813e81616e6f4c41247a6ede453a726cca8b81c71293384f58420625a957b9fe3373a021bbb SHA512 90e3031f3e4177e0af7bec18f5094d6f840351a8c8119a64b3be7df5aec892452b9db02429f1e109bae77c928a609a6541b884b77cffc39ffc5ff501fc2268c2
+EBUILD shash-0.2.6-r3.ebuild 919 BLAKE2B 6a41b1740a7a419713d7de678604402e67c75a6f905f6b3d2b97f126e92cbfcae7af9d43237473ffa75ffc689ce17ea2f90d07a1e968f5c8e89c252f0d17840e SHA512 131bfb9a3dc2c9d8c5a6b4b4c36d260299df488c8c6fcad49d0531be23cb18f65a9144043075d2cf4c5548620978da980ba49c05d359f8e1ec52014b11053478
 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 eaa99cc0729d..74e16b5e4f6f 100644
--- a/app-crypt/shash/shash-0.2.6-r3.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r3.ebuild
@@ -11,7 +11,7 @@ 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"
diff --git a/app-crypt/ssss/Manifest b/app-crypt/ssss/Manifest
index 4f166df118ae..f140e4677a9d 100644
--- a/app-crypt/ssss/Manifest
+++ b/app-crypt/ssss/Manifest
@@ -1,3 +1,3 @@
 DIST ssss-0.5.tar.gz 17435 BLAKE2B 76aae463ce11341f8b0336526f7d19c9921025cabc05bc9e00005b0bdeb676ed5e069226962232f277de2fecb1cd71bafbd4b2fa0c03ef4faf0f66daa24599d1 SHA512 be8df1666ac61d4097b5fd54f2cee3640db8f85ec21411f1b208a35b671c5699bc692079525d8d313d1cf2500da31bfb03771829a9fdccc0bb6d806749526ec9
-EBUILD ssss-0.5.ebuild 756 BLAKE2B 8aa8fe9974a7666852d3fe750a6b57afea9d0f3b3706437fcd60ec21898ccb8f58f1e2dfee51030760da1cc2478d60cf5162b5d51dd53e2966f561aec91cccd2 SHA512 e36f2aa2b51298ec2b45fc3457e6f9093aa11027eb78a3d13bd335b72690bef7db5a5658d4e607aa98cdbc4b121c52db4892d6fc8be85ff702929afddcc1246c
+EBUILD ssss-0.5.ebuild 755 BLAKE2B 99d90a6b0ebd25739c177d3b72a1ae62897674b3397393382b845f890c8b7a50dad81050accb76db95fcc7e1f4ac627e436f3c7835caf500d1858157ba118970 SHA512 4d42d16680eb2bc9a752e9574433f52c910902a66075979b6d9ff4fd27bbeb7ab18b3656ce38659359e27d1ef1d3e9bbfc70dff9abf9a305e1e07f1a60517cd2
 MISC metadata.xml 615 BLAKE2B 268173e83a1880bde7f164f9bc93f499654928a537458334dc3a87ed706e3bf31b514582fdf890d107896a04cfe9936e2a4459201b04448d919bcd277f616a26 SHA512 8ddbb48727f79921b79da2ac26f560a56e5e55c8a335a5dc7469f6a6aed8715034abbe7b869467d3bdeca9dca120b07bfbf8b16aee03cd5a730c67b2fef74f8c
diff --git a/app-crypt/ssss/ssss-0.5.ebuild b/app-crypt/ssss/ssss-0.5.ebuild
index 949dc6fadceb..f9d6d9eb8ced 100644
--- a/app-crypt/ssss/ssss-0.5.ebuild
+++ b/app-crypt/ssss/ssss-0.5.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Shamir's Secret Sharing Scheme"
 HOMEPAGE="http://point-at-infinity.org/ssss/"
 SRC_URI="http://point-at-infinity.org/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="GPL-2"
 SLOT="0"
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-08 09:04:53 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-08 09:04:53 +0100
commit	73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch)
tree	2878053f3e7faed19a1f82c733d3bd29df69991e /app-crypt
parent	2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff)