gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /app-crypt
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
102 files changed, 961 insertions, 399 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index b490673c0970..081b60bafee1 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme-sh/Manifest b/app-crypt/acme-sh/Manifest
index 3058950e50c5..a4341a52844f 100644
--- a/app-crypt/acme-sh/Manifest
+++ b/app-crypt/acme-sh/Manifest
@@ -1,6 +1,8 @@
 AUX 99acme-sh 62 BLAKE2B b9542b99b2e720e0930139f7dd56efc63e596156dca1649624f6f4c27a7d57555bb13deb3b5714aa06477e9ca79996b5f891c8a91ea808d853cc7e5d5655b0a0 SHA512 b7fc9402e3bea3ca846bdb82d6f21d1b7023bb2ace8d5ffd146959cd12e3270243fd22e3a7dde9b6cefae8f2cbca369b35d2da4ea9f1e60a2f61ae81612d8bc5
 AUX acme.sh 63 BLAKE2B 50c3284c0172ff0a0dc57fcfbaba57a6518d7c043b5d052f2710b28229b9b13313e7ca7c8b644ea273eb2f4991246631e70e6184fb5489005be12b77b8efa229 SHA512 7ec0764c86db5c68c42189a8af708e769189df201fdf017bd0d8d9e322ab71c2f422be382d170a1f4b876a1e5a6629eb55df0c564abfebab665e27e58660ff6e
 DIST acme.sh-2.7.9.tar.gz 110323 BLAKE2B 244afad17ddf17fa95a11d5af7943a153ed37e67ef304511787767a5d769f9cd22fb66875d637f2d536cce8942e4feee0c442af8349a32a91940b1fbbc2e879c SHA512 24374783ca52835b400b84316ffab5e9066805362f02082f8ef409e21ca590d837b3dd11401633947f9fcc98dc977b0e8b6076d5deecd02b38478f257500a052
+DIST acme.sh-2.8.0.tar.gz 127638 BLAKE2B b5ef10c40da4b77c7f1f3175b7cac0cc19bff135959416a97b3e8443cf13bb92d9e0b86837fd3834351412a19f25e92a4ffa146815c146f2e91cd94bcbc655a8 SHA512 99f86866f7bd1426e9a8b31dd09206685ad4aa01a3d723d366681aae4ea2087f9437496e0b3da947766931493c9d94305da1906eadc7005373327342ca94ce23
 EBUILD acme-sh-2.7.9.ebuild 1044 BLAKE2B f64a6b2dd8e6f71dafbd4179d7fb2841c282e7dabe857c4d23948e832508ef44a3169e42844804fbbe121ab8dec4e05524dd48cf672de9b41c134bd5816060db SHA512 942ab62d93e3209d2e104b8e851fda138ca88788e477994bc1ca90dbccd1bc550cadb5f5163542ea65226e3e57088004a198d838097f9d757acccb98b4c19575
-EBUILD acme-sh-9999.ebuild 968 BLAKE2B 8145bf971f9d990d0c861870132c2a34d196819682f4378ad5edef0d3cbfb96200824990db9b3c1ed57a5736381260220ccaff07b04a58f734807a56d109b2ec SHA512 6c24d8e509392cf9b1c25b56d4be8cff9b478e0f4eb9c4f57b49deb7fce8c1726b750c86e87fe9ceaf79f11bf12417f2f7abfd4042dcc44843e21229e49e3a11
+EBUILD acme-sh-2.8.0.ebuild 1041 BLAKE2B 64edc40dea7933044c8aa67932641089eafefe8bd595759fd0e357113631a738c0dde657198c73771307a189e1a2dbe731beb85901abbcc6548a681a99d76e62 SHA512 98a3f2221395ff77e9b8592ecf4361b71cf6807a4e789fd7f7dd4ef31944aef3db11e587c649201438d925df6c86c04b399e50e930d1a3c450f0bc4a9c277470
+EBUILD acme-sh-9999.ebuild 965 BLAKE2B bd273468f5c1689fdb2fa75743502f232a0d9080a712bb5f951dc30a14dddcc0fdadd2a59e71b2a664a59565620d3345acbb9fe48e4c0ae756bccde0a18ed80e SHA512 77c0ee3b1214fb29e93714b91d0b1f6533c7ea1094ed2a72cf4268b41f890d71e2d422c98b57ffcb5f2b8759edb6c085bcdb4edebe6c55737881eff3f54e12e6
 MISC metadata.xml 597 BLAKE2B abf8574531170e1bf807d45682c5a394e3ef11880b23a297b3a440ab1b3eaf2c283d5afac51ef7fb8726203b6303f626e5883f4a258897794a3848e4ade5980d SHA512 f45386c5ef271f698ce540ae61b9dad4ae6d7c624d13310daa2adc353a6145f4abdf19f7a0fc5120ca661668673efa6536297e25a374b65ec06dd8b41a7ebbb6
diff --git a/app-crypt/acme-sh/acme-sh-2.8.0.ebuild b/app-crypt/acme-sh/acme-sh-2.8.0.ebuild
new file mode 100644
index 000000000000..27d064cd38cc
--- /dev/null
+++ b/app-crypt/acme-sh/acme-sh-2.8.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="An ACME Shell script"
+HOMEPAGE="https://github.com/Neilpang/acme.sh"
+SRC_URI="https://github.com/Neilpang/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="net-misc/curl
+	|| ( dev-libs/libressl dev-libs/openssl:0 )
+	|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
+	|| ( net-misc/socat www-servers/apache:2 www-servers/nginx )
+	virtual/cron"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	einstalldocs
+	newdoc dnsapi/README.md README-dnsapi.md
+	newdoc deploy/README.md README-deploy.md
+
+	keepdir /etc/acme-sh
+	doenvd "${FILESDIR}"/99acme-sh
+	insinto /etc/bash/bashrc.d
+	doins "${FILESDIR}"/acme.sh
+
+	exeinto /usr/share/acme.sh
+	doexe acme.sh
+	insinto /usr/share/acme.sh/dnsapi
+	doins -r dnsapi/*.sh
+	insinto /usr/share/acme.sh/deploy
+	doins -r deploy/*.sh
+
+	dosym ../share/acme.sh/acme.sh usr/bin/acme.sh
+}
diff --git a/app-crypt/acme-sh/acme-sh-9999.ebuild b/app-crypt/acme-sh/acme-sh-9999.ebuild
index 23935922162c..aa72ab18cd53 100644
--- a/app-crypt/acme-sh/acme-sh-9999.ebuild
+++ b/app-crypt/acme-sh/acme-sh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,8 +18,8 @@ IUSE=""
 
 RDEPEND="net-misc/curl
 	|| ( dev-libs/libressl dev-libs/openssl:0 )
-	|| ( net-analyzer/netcat6 net-analyzer/openbsd-netcat )
-	|| ( net-misc/socat www-servers/apache:2 www-servers/nginx:0 )
+	|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
+	|| ( net-misc/socat www-servers/apache:2 www-servers/nginx )
 	virtual/cron"
 
 src_install() {
diff --git a/app-crypt/acme-tiny/Manifest b/app-crypt/acme-tiny/Manifest
index 333d488f2d71..1c2f2d4c9e2c 100644
--- a/app-crypt/acme-tiny/Manifest
+++ b/app-crypt/acme-tiny/Manifest
@@ -1,6 +1,6 @@
 DIST acme-tiny-4.0.3.tar.gz 12662 BLAKE2B 6a17d0597731a5c8c1b260fa47396cb5bf8a223f44c8e498532b6e90a2ded35c5fcae058a8682e59ab060c1eeb27e09c8db8588e1d72cfd75b65f867d3e94f9a SHA512 bd37d4f878f2851c8e88acb78699b855cfd306928e2d70ef1d35dc9883d44dae3c7622e2114b1d5c4e0c5865b61ad3958a776467ab45eaedb0cf612530ca5dc7
 DIST acme-tiny-4.0.4.tar.gz 12667 BLAKE2B 6177d639a2d65080f84ca93400405c01ef18cb3c8d18ef5e7e57af1eede9d6f1e105ca7f6f89014e79c5cb1d865d3c81f590abdb37e8caa6b9699ea20064f698 SHA512 e66befe8262b3396e5e55ea01fc47c668c527868832d2ccdc2786156ec52e698fd20cb6fa4fe861d97947d64f4b6c751be9c79bf546eaac34978c53b9e6f85e4
-EBUILD acme-tiny-4.0.3.ebuild 1140 BLAKE2B cb18452f2f0c95e4b44e66cc78ffb0ede2f91c08b3a672bb3d58185c655c3e7f4e2e8f51c2e7a0e98baf2c5b4ebaf4872e978877fd54c84ec033d342f14e41b1 SHA512 8c1e7e5596061aea3fdf3a7ee875ba9d6ce9cd87d9f70c8f7b5d38b0bf6d83a58284ae21355d0f956743bad5c3408cc9f4ade13547969ba2067e174482f59f1a
-EBUILD acme-tiny-4.0.4.ebuild 1131 BLAKE2B 4e2268608893a99591ecaa04ded0a574c8576d5256b825d6824916530b20420fc94cfbad74dc29690f0b833ef69f31b78ab0206021e0e502062313f8b26642bb SHA512 cf3c565119e91ee2609ea3d5c1368a82b9888f72cf017770aa70166d75e17f00459b0ce06052fed3cc41174096b87df7bb77c3d2a174bedbbe58abdb6e8c44ea
-EBUILD acme-tiny-9999.ebuild 1130 BLAKE2B 3b42c017f4f5b36ee9a08eadd072900d7ca17e9d08c6a416bef23b01dfbad2635f23c3a1c479a88295d43c77ff7501875b5c053e2f95c935ab1da97ce24390de SHA512 c06d08483d92882d6a471f56522983cdb1316bbbd62c27f9b777053a2f8afd57e53eb1c96481f018cbc68c365244f375ff142a5d8c18695c37182dbe42cfa0cd
+EBUILD acme-tiny-4.0.3.ebuild 1133 BLAKE2B 55cc688ae27fae88bf34852ec824350d749ca9c84ae25d796aa4557a9497c6e276f5fdad2d0c245572b279940416c54b8cfb7afce1a04a007c1a5425da452d8d SHA512 06696e621482759d87705c9f4dbc67d52358519fae9888f1071e9dd01318c9feaf9495d3ac46bf785975123e611e3975c5a88a8dbf5509cfad3b408b1ffd604f
+EBUILD acme-tiny-4.0.4.ebuild 1127 BLAKE2B 013dbc3d5dcd022ddcb3774ecef36ea7abd63f8ecb884a55f81b1054d7505bc47d06125eb95702e1a4b5d6ea7d9e26d118b8d056779e216b5dd9bb594c4f2f1a SHA512 077859e16631500d5df54b8c7423a7712accd3f291c2605ea767eb91cd266125bc86afba0ca2e9408c4d32c674b0c346e17c50b9cbec360ed5452fabec5c0556
+EBUILD acme-tiny-9999.ebuild 1123 BLAKE2B ffe8d2cca51dda0738c721fe9bacbae92e4400fcaaca7a0baf18711554ffd1a48c705b4f2eb3aeafb917ebb35d1082459aeda0772e4da7421bcff142cab6f0d0 SHA512 9d01a60ec56e9bdc99ae4cc895c570d7dfce13252db7d95df4dfeddc35b0bcbae27c0b021786bf5c60486608d67e91afffb86fa7e359b097d7d0a4b2d6340b36
 MISC metadata.xml 537 BLAKE2B 4a0d07d4bc178878c177385619bca1c65b90cd41ce91084f5a5d5652735e2d714b86404049aeec4a6b79358d565ff8d9b8ed7fef87c6713c7afe388c41bd1b9d SHA512 d223702ebf46114ad3b12e03f5bbb9b56741cf67f3c3f7c0421f5c7e8bd66f26aeb3dda7f93730f9166e11d29240b4c0471e83043290b8da15e1fe7e5204e4c1
diff --git a/app-crypt/acme-tiny/acme-tiny-4.0.3.ebuild b/app-crypt/acme-tiny/acme-tiny-4.0.3.ebuild
index b9815c348094..d9ed230cc73a 100644
--- a/app-crypt/acme-tiny/acme-tiny-4.0.3.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-4.0.3.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
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1 eapi7-ver
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild b/app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild
index bf5937baf838..b1c663ba8ba2 100644
--- a/app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/app-crypt/acme-tiny/acme-tiny-9999.ebuild b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
index 184d1bfb35b9..861a02def9ed 100644
--- a/app-crypt/acme-tiny/acme-tiny-9999.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-9999.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=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 453323b80b19..5172e4b5098a 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,7 @@
-DIST certbot-0.31.0.tar.gz 1267960 BLAKE2B 4097a3d278d86589e7273c3f5c4f809f0a5777319856a2aea27233ee99eadf2e7c075c5400970be6a2f11032e54457c9705ef45b85e9d158bc04c7761e59a23a SHA512 9202800649691e9b2d6b4c898b975d11ef3aba8f34903c93a11eafa5300f64c939547cfbbe34ac664de293d2540b143f14d3117969e4a6dfc55d624cfae44fea
 DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
-DIST certbot-0.33.0.tar.gz 1303989 BLAKE2B 7417e72592e15fd7969aed4c60a799caaeedfe66af3b2e60f364677bbf7ba5dde6e597e89a07036b61e63975b402e3de81fb116ee4861061357160284fcc7821 SHA512 4a653e5e7b62d938a46421df509063a3aedf978b73cf3b44088408bf3c48b70c70fe595c449fe9df54e5724c2d5c03357be434b305f5378eaa8261f811678133
-EBUILD acme-0.31.0.ebuild 1267 BLAKE2B e078066c1470516142932c097afab73641b9c5e6cb7b8df411dbd40d898fd743a4cfe0032b793882c59ce3487f609eff0cf5fc588b5f09d36caeb63c2564be3c SHA512 6af21d683a48f864f1c12f4892152ea0c0f22dc44dc39cefa05cbb973ab39cb4f8f9ebde6e6ff0e6a77cca6aa1dcf5840e28e29b6812ea9e71116295a336a972
-EBUILD acme-0.32.0.ebuild 1269 BLAKE2B ef7aeb0f5927edfd7b83e225ece400a71739b08fdbcc84ccb39261b29a77cf598e54abac55016965d698c686ab5631769a6192f35dd073f98ab1e3436a4d436f SHA512 59920c0d93120f4d01b174d8a868b214d735d96e36bf90b704feaaa44b00dd882e8a86dfc27561bd80326f3e399fb5cba0dc9b411a297bda1d8fb602843a1788
-EBUILD acme-0.33.0.ebuild 1269 BLAKE2B ef7aeb0f5927edfd7b83e225ece400a71739b08fdbcc84ccb39261b29a77cf598e54abac55016965d698c686ab5631769a6192f35dd073f98ab1e3436a4d436f SHA512 59920c0d93120f4d01b174d8a868b214d735d96e36bf90b704feaaa44b00dd882e8a86dfc27561bd80326f3e399fb5cba0dc9b411a297bda1d8fb602843a1788
-EBUILD acme-9999.ebuild 1269 BLAKE2B ef7aeb0f5927edfd7b83e225ece400a71739b08fdbcc84ccb39261b29a77cf598e54abac55016965d698c686ab5631769a6192f35dd073f98ab1e3436a4d436f SHA512 59920c0d93120f4d01b174d8a868b214d735d96e36bf90b704feaaa44b00dd882e8a86dfc27561bd80326f3e399fb5cba0dc9b411a297bda1d8fb602843a1788
-MISC metadata.xml 342 BLAKE2B 770c32b421519cd6bdf7e09a71a1ee679a7fdf18e03587f75097a766c51dc878000184759e3c69f0c19afe060dd5578ff91e481644086e138dbb728619895130 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb
+DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979
+EBUILD acme-0.32.0.ebuild 1263 BLAKE2B 5486282dd90bee28ca65a9170546ed0d09de38880f7945dcef1009cb7c20b991e5d22e7efe89eae07a13013b24e627624c0da907604359e10c75cda5607478f0 SHA512 6517cd06f5430885b072407d11971850cec39c3bca45545006fb58c970f121aaafb725e6a77371bb08151b05a803fd274b45cb9c2e10e48c02e29e5bf9634d3a
+EBUILD acme-0.33.1-r1.ebuild 1718 BLAKE2B d463fec2156cf80bf480424865fb96f516f78f5fa4959178eaba7bf7c286e722c61c9bce4b8e6405f7d09cb7a628ff7f9a9d287e492f78b2d0339fb2be85ad19 SHA512 785ea278cccfa8e014043c44efe5ff15d58a7380f02686e3a424f9031abb3b7e0368bf077f21c10d3208ff3c6e85d1b412b6512766de29171f15a5019f1383f7
+EBUILD acme-0.33.1.ebuild 1265 BLAKE2B 891e3ade67d911d5b99049887f8e441652fc686006896b39880050f8aa032e17954d21176db0505c784e79c9883633810d749d6bbce48e6f67859517ebef6f7f SHA512 581d0f1f268a2a32ff136ebad3bc17b376ec081eeac58ecb4eec19f1409a23b68c48fc3cb28e00cce3405fc5f5d011106e1b943535f87fdb86a3935413ee6aff
+EBUILD acme-9999.ebuild 1718 BLAKE2B d463fec2156cf80bf480424865fb96f516f78f5fa4959178eaba7bf7c286e722c61c9bce4b8e6405f7d09cb7a628ff7f9a9d287e492f78b2d0339fb2be85ad19 SHA512 785ea278cccfa8e014043c44efe5ff15d58a7380f02686e3a424f9031abb3b7e0368bf077f21c10d3208ff3c6e85d1b412b6512766de29171f15a5019f1383f7
+MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-0.32.0.ebuild b/app-crypt/acme/acme-0.32.0.ebuild
index 8a9d37f4aec6..b0ddd1ccb5cd 100644
--- a/app-crypt/acme/acme-0.32.0.ebuild
+++ b/app-crypt/acme/acme-0.32.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_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 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
 
diff --git a/app-crypt/acme/acme-0.31.0.ebuild b/app-crypt/acme/acme-0.33.1-r1.ebuild
index d4ea2b9f2e65..bfa507fa149c 100644
--- a/app-crypt/acme/acme-0.31.0.ebuild
+++ b/app-crypt/acme/acme-0.33.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 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,11 +21,12 @@ 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/josepy-1.0.0[${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}]
 	dev-python/pyrfc3339[${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/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/tox[${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.33.0.ebuild b/app-crypt/acme/acme-0.33.1.ebuild
index 8a9d37f4aec6..9df5e0dbdae0 100644
--- a/app-crypt/acme/acme-0.33.0.ebuild
+++ b/app-crypt/acme/acme-0.33.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 8a9d37f4aec6..bfa507fa149c 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -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/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/tox[${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/metadata.xml b/app-crypt/acme/metadata.xml
index d18839cc8dac..d0f0d1620b50 100644
--- a/app-crypt/acme/metadata.xml
+++ b/app-crypt/acme/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="pypi">acme</remote-id>
 		<remote-id type="github">letsencrypt/letsencrypt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/acmebot/Manifest b/app-crypt/acmebot/Manifest
new file mode 100644
index 000000000000..681acef924b9
--- /dev/null
+++ b/app-crypt/acmebot/Manifest
@@ -0,0 +1,4 @@
+DIST acmebot-2.3.0.tar.gz 64841 BLAKE2B 92bfb9a58722b9955fe908e2fcb1a3ee593bf87e3fdf3dc9564bcbe291b13c553ad426673c337a59344287da64c4ee5cffc734f8dfb60447f96d6234814f0167 SHA512 3951cc7138eb0b83bd802a2e0a221fa985209ba276028606d887b7d2eff84c35db034f4a3d8a6836b3ac149c6dbfa27b1ea47e864f549f8d88b758b40407c4f4
+EBUILD acmebot-2.3.0.ebuild 1213 BLAKE2B ef6a6adea38df262c8099e2996dacc04ebadcc32526a5ff4b1b1cad85f447d528e7426be36d21dfd572c4615f5c28d368cf8617edcac5a4b007ce965ec605df6 SHA512 b555957d102f6707f573fb2eed0865c7b2729fed86265a9427648ba51ff715873f0de7b138b679d052d1eba1e36119e44a425c61417df438f847ce8bffc4acad
+EBUILD acmebot-9999.ebuild 1213 BLAKE2B ef6a6adea38df262c8099e2996dacc04ebadcc32526a5ff4b1b1cad85f447d528e7426be36d21dfd572c4615f5c28d368cf8617edcac5a4b007ce965ec605df6 SHA512 b555957d102f6707f573fb2eed0865c7b2729fed86265a9427648ba51ff715873f0de7b138b679d052d1eba1e36119e44a425c61417df438f847ce8bffc4acad
+MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-crypt/acmebot/acmebot-2.3.0.ebuild b/app-crypt/acmebot/acmebot-2.3.0.ebuild
new file mode 100644
index 000000000000..80bd249ecd73
--- /dev/null
+++ b/app-crypt/acmebot/acmebot-2.3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python3_{5,6})
+EGIT_REPO_URI="https://github.com/plinss/${PN}.git"
+[[ $PV == 9999 ]] && _scm=git-r3
+
+inherit ${_scm} python-r1
+
+DESCRIPTION="Certificate manager bot using ACME protocol"
+HOMEPAGE="https://github.com/plinss/acmebot"
+if [[ $PV != 9999 ]]; then
+	SRC_URI="https://github.com/plinss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ $PV != 9999 ]] && KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="
+	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pydns-3.1.0:3[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
+	>=dev-python/asn1crypto-0.24.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.25.1[${PYTHON_USEDEP}]
+	"
+RDEPEND="${CDEPEND}"
+DEPEND=""
+
+src_install() {
+	dobin acmebot
+	python_replicate_script "${ED}"/usr/bin/acmebot
+	insinto /etc/logrotate.d
+	doins logrotate.d/acmebot
+	insinto /etc/acmebot
+	doins acmebot.example.json
+	dodoc README.rst
+}
diff --git a/app-crypt/acmebot/acmebot-9999.ebuild b/app-crypt/acmebot/acmebot-9999.ebuild
new file mode 100644
index 000000000000..80bd249ecd73
--- /dev/null
+++ b/app-crypt/acmebot/acmebot-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python3_{5,6})
+EGIT_REPO_URI="https://github.com/plinss/${PN}.git"
+[[ $PV == 9999 ]] && _scm=git-r3
+
+inherit ${_scm} python-r1
+
+DESCRIPTION="Certificate manager bot using ACME protocol"
+HOMEPAGE="https://github.com/plinss/acmebot"
+if [[ $PV != 9999 ]]; then
+	SRC_URI="https://github.com/plinss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ $PV != 9999 ]] && KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="
+	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pydns-3.1.0:3[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
+	>=dev-python/asn1crypto-0.24.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.25.1[${PYTHON_USEDEP}]
+	"
+RDEPEND="${CDEPEND}"
+DEPEND=""
+
+src_install() {
+	dobin acmebot
+	python_replicate_script "${ED}"/usr/bin/acmebot
+	insinto /etc/logrotate.d
+	doins logrotate.d/acmebot
+	insinto /etc/acmebot
+	doins acmebot.example.json
+	dodoc README.rst
+}
diff --git a/app-crypt/keynote/metadata.xml b/app-crypt/acmebot/metadata.xml
index 6f49eba8f496..79d462e85571 100644
--- a/app-crypt/keynote/metadata.xml
+++ b/app-crypt/acmebot/metadata.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+<maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index 03fa724e4ef5..ab8c74590dcb 100644
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@@ -1,4 +1,4 @@
 DIST argon2-20171227.tar.gz 1503745 BLAKE2B 70171ce1b446974e18e6f7077f436c6b78f29fd3eb075314014219280fd984e51b00137d901175da5fcb8a8472df0cbb16ff0333a2f2f098e52d3e0ea496e2cc SHA512 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
-EBUILD argon2-20171227-r1.ebuild 1209 BLAKE2B d4817c6a5b21a1aba841d8a590ce5583212741a6a374d1b6667b17eb15e89964b6540b2ef01ae08e014b69edae22416b91e24d8723198c20fba8d3070ed51f95 SHA512 bdcaaaf5d45ca6cf397dcf2f870e58bbcae2f319737de185dea594a8659d9841e875bb22c18c832b208a787c47febc3d697e445824a54f4a32fbb90f1a90fb44
+EBUILD argon2-20171227-r1.ebuild 1205 BLAKE2B 7547ae58c7e6bd749241648d99c70c4a0ba5c489828af0a645c03ae6123fca92d637967c43c0f7938546ef31c825cb996de0278eb2fb8ed9448772418d5a71ed SHA512 e3084ef11bcfeaf59ff0a8b3c4c06038fe94a15d56203577c274a1752aab682cb72b535a034f8abf541054cc069e07dc0ef8a392872b325761923ad581fe270e
 EBUILD argon2-20171227.ebuild 932 BLAKE2B d4d35467d79c15fe30fdd120261f0452ff20e2433cfb59734d98dfca35bd587114bd49cb7e6186100ba57dd14b12371703eb7465298a8ee585286838e207f8c6 SHA512 88b54c07cc75e2011ebeb5c43636deafbc248d013b52e97a876aad02a1019477087d9c2652dcf21d4939f871c84a2255e826e5126cae1be8e9111e6b3055c498
 MISC metadata.xml 660 BLAKE2B 1843f019c2cf7e8438209df6d90a20a9bcc88f5346aa02c953a28d84d712983fe3880b39b4b1766819bb88c670245447c37dc0c1da3b02b3f800a3d9706c4287 SHA512 76c1048a35a75b60d9e5fd56da50ba4bfe9537457e2021c226671d72e0456d2533f05361cad607cc86b8e01fd00a137a4cbc26a6d70c122918fe4e0f2ae3bee5
diff --git a/app-crypt/argon2/argon2-20171227-r1.ebuild b/app-crypt/argon2/argon2-20171227-r1.ebuild
index c7176327af16..d0976a328a2e 100644
--- a/app-crypt/argon2/argon2-20171227-r1.ebuild
+++ b/app-crypt/argon2/argon2-20171227-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="|| ( Apache-2.0 CC0-1.0 )"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd"
 IUSE="static-libs"
 
 S="${WORKDIR}/phc-winner-${P}"
diff --git a/app-crypt/bcwipe/Manifest b/app-crypt/bcwipe/Manifest
index abf3d4072e7b..8aa7e51da045 100644
--- a/app-crypt/bcwipe/Manifest
+++ b/app-crypt/bcwipe/Manifest
@@ -1,6 +1,5 @@
 AUX bcwipe-1.9.7-fix_warnings.patch 415 BLAKE2B ae41040cbc9343e06eaee372b8bdb656eaac711faa2cc437ac59043c9dd58950234ff67637d5e8b0faba4c9a18bba270f53255fd87590ed7ee753d47b3818630 SHA512 504487c91ba3ed47f5d32ff5c4084bfcc10999d5ab42018d233ca160f55631daf466015e8aa81f644b834c00529a984ec026a05f28d7401162bc786a8bdcd5ad
 AUX bcwipe-1.9.8-fix-flags.patch 603 BLAKE2B 094af104ff114c4fce3907215ab06db51af2fad2f000f9bfc391dd056432a2c6c5a988561d7c462f6fc99411fc26c9445f81a250db29899f76ee1c0672b9e602 SHA512 9141f81dd722bfe59466bab3d547869aca9178d27912edc61f9ab95044d0e57151870400a1550fe59e0f3c252878b6971486d0b38e2fb24da3241b0dca00ca87
-DIST BCWipe-1.9-13.tar.gz 141092 BLAKE2B 0d7e8f5841b388bb9e200ae533f8706d951e017923a69314173d44fcbec2ac2f3ab8c0c97de9054e12f1560f075e5af0e32ddac855df8f9bc28fb1bb637edbc6 SHA512 801b6d3c55d82915da14b3136c9ddba7fc947b40c07ba135c410e1e2703f74735d32ebb043d44325f615005631930ce48b4075885f1a928cf8f4a2d4c67ca5cc
-DIST BCWipe.doc.tgz 21218 BLAKE2B 02ce8b5c767ed9d45615fa26b5c0172c5431209cbd7ca94bfed4345206b401db50e02a163eef14359a01d16cc4a1b26b121081611cc7854833e7cbd917ae947c SHA512 5aa402669ded46b6dc680293f18aea4ab20a7d6b7d9d7bf8e63003e557b953e8f8019431ea69d96d2236121e754bc456b3700a0895f4fff0573d2e9bac2e2ee3
-EBUILD bcwipe-1.9.13.ebuild 972 BLAKE2B a72c34677465a8c565d0f2455372fbead0a0458e9082df7307b0ab74014afec5d6933a7c74dcb991d0bb421b088986b0dce5e4c3961772f2248f5b221d1804af SHA512 5ca70a61123de7cf74d5e34dc48c98d753759b64022dad5cd40aa37b5c8b812f0947807db5ab03188deaf80d4e36ffeac5a43b1403b364137f86ed151d3d8956
+DIST BCWipe-1.9-13.tar.gz 147634 BLAKE2B b6fd6e166c5a97d5b453f4f263384b5b76b273b8e98651d993b83d97c1a97d8adf1fda9acc9d2dcae5ef46bf7c15d517b81384959f62ee938d94546411f05d0b SHA512 3044423b291a6802bb1cab75b9d2b2b74ebe01a1318fad0360c9d6fe8f5afc6e446112fd323f02d56275f6595eb6afb7ad09c02fdc25e74d217a5a687a663275
+EBUILD bcwipe-1.9.13.ebuild 800 BLAKE2B f4f43e93f1bfb9f7f5c7a6773f7871901ac4428f5c8ecf2e7bf331260bfdd2c168cec8e1cc0d7cf500d45049395042d5d7f53b14bf4612236ad61f517f0095e4 SHA512 82f3d22c5492cf10aa8f5d20226cf5c05bfb4e606898232890c2fbfe48aef9025af1035139d1298f6ff825e3620c7e854a94d5fe562b6e1365c8459af5ef1c7f
 MISC metadata.xml 240 BLAKE2B 019d24354f525c2754c3fa8a9dfc0a35fbdf5ea285db4cbc20535f6123679544c06acae8c5ced17ae7c299318b6a0b9115b645188fccd5945ff47b6bf9cd1f1d SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d
diff --git a/app-crypt/bcwipe/bcwipe-1.9.13.ebuild b/app-crypt/bcwipe/bcwipe-1.9.13.ebuild
index 2b76c45f52b2..76d29704349e 100644
--- a/app-crypt/bcwipe/bcwipe-1.9.13.ebuild
+++ b/app-crypt/bcwipe/bcwipe-1.9.13.ebuild
@@ -7,13 +7,12 @@ MY_PV="$(ver_rs 2- -)"
 
 DESCRIPTION="Secure file removal utility"
 HOMEPAGE="https://www.jetico.com/"
-SRC_URI="https://www.jetico.com/linux/BCWipe-${MY_PV}.tar.gz
-	doc? ( https://www.jetico.com/linux/BCWipe.doc.tgz )"
+SRC_URI="https://www.jetico.com/linux/BCWipe-${MY_PV}.tar.gz"
 
 LICENSE="bestcrypt"
 SLOT="0"
-IUSE="doc"
 KEYWORDS="amd64 ~arm ppc x86"
+RESTRICT="mirror bindist"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.9.7-fix_warnings.patch"
@@ -28,14 +27,7 @@ src_test() {
 	[[ -f testfile ]] && die "test file still exists. bcwipe should have deleted it"
 }
 
-src_install() {
-	default
-
-	use doc && dodoc -r ../bcwipe-help
-}
-
 pkg_postinst() {
 	ewarn "The BestCrypt drivers are not free - Please purchace a license from "
 	ewarn "http://www.jetico.com/"
-	ewarn "full details /usr/share/doc/${PF}/bcwipe-help/wu_licen.htm"
 }
diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
index b2f235b77dc6..7b3746ebf57e 100644
--- a/app-crypt/bestcrypt/Manifest
+++ b/app-crypt/bestcrypt/Manifest
@@ -1,5 +1,5 @@
 AUX bcrypt3 3197 BLAKE2B 5e9d721a5b4213fcc0e5eb4325c009685dee5bd8dd61f8b47ee1ca29e52faa12b3c6f3c9ab1bc283d7944f4f4178dc831a95348971bde439a7ae77f213df20dc SHA512 370c28c7289d86a0fbf639c85cb755fef10780f86daa4c5ce6071f32d7e36dea8e21f496e09e145c8c091042a70f3666df068611258a16a05d217d5ed355290b
 AUX bestcrypt-2.0.14-build.patch 16326 BLAKE2B 233e2f896feb159807de1be4e07fad6e97889198709010c5256b93044f1a13559b0a64e59d712c3ddd632f90ea34cf6631c257eac48409c7e0323e5e14a7ad63 SHA512 3ff5d6b69844562f16c1024bb7b409fdcd6f9889e6ea5b58a4ba5f43d04174fa5c60bd73f20eddf2687fea18a01ce06672880602b4b2604e6f014344a3da2911
 DIST BestCrypt-2.0.14.tar.gz 2211286 BLAKE2B 1ff777a72528ec22ca168492c335ec54be924b653323670619049cc9dfbcd144c28702bf857517c5189c937f3712e749c47ef14006a8883c63419b866b8f48f9 SHA512 1e542f00886413f1519ca5667bb297cce25a46fb5ec90a7e1a61934df3cd34e0d680f32e0b111727865459ef7d89d2761b379b4a557ada6d7ee3e47e32bf762c
-EBUILD bestcrypt-2.0.14.ebuild 1877 BLAKE2B caf7fe954625a0c9988e28ef26e776b9a259f1ae0bd615b7eaaa8002a6dfe25d687f0221af4e7a20253370a3caaa3cfb5f32ab5b6775388a8966220a3844f567 SHA512 abe67ad0fc1e22ab49a7e87aa5caca094a6bf932c228de3e550a724c2185f2fecd372da6a28a26e313c77693727f0136299bbc6f3b765145382b5cdd2eba81c3
+EBUILD bestcrypt-2.0.14.ebuild 1903 BLAKE2B cdff8c1095edfa9c228efa1ca54a8207c40b506b88b69ddc7493190d68b102c5fef02298834f3ec4dce95a1d1d480827457afb78397b43d76fdb044f9e60e9a2 SHA512 2bb8fbe1f726b8e369f72fce8f82f88e598bf2ad975d3f89c4e2aac5fdb1edc5506ad8765c3f7fa608efd53b7d08c307d20d3f1d0730440fb6717a1622cce9f3
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild b/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild
index d78350c9d4c1..afaa12d6d91d 100644
--- a/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild
+++ b/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild
@@ -13,6 +13,7 @@ SRC_URI="https://www.jetico.com/linux/${MY_PN}-${PV}.tar.gz"
 LICENSE="bestcrypt"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror bindist"
 
 DEPEND="virtual/linux-sources
 	app-shells/bash"
diff --git a/app-crypt/ccrypt/Manifest b/app-crypt/ccrypt/Manifest
index b0933e631037..c30660405d21 100644
--- a/app-crypt/ccrypt/Manifest
+++ b/app-crypt/ccrypt/Manifest
@@ -1,5 +1,5 @@
 DIST ccrypt-1.10.tar.gz 669491 BLAKE2B 61aabe48fd3e368c4915697acc4a63837cb97246e31c2268385e419fc6912a1d0bf3f3773c78266bde0d648bb10f739628a55560e0eedbd397c5826b5019b602 SHA512 b0130998f9830f63e8181340b3138260ab3c2014174e74fbcca77299dc9e0f807471fbfb7cc403dec7d0809f136e8afcb4c9bfd4ee5e43a1b3cc7185e14c3188
 DIST ccrypt-1.11.tar.gz 834575 BLAKE2B 6b3441f6b1c58ed63db43ddc999ee64e67afc3ce02222de2a41562bc066aad0f076e75ab496d94e7f3f1a9554b1382c083f3af04074904c1110f610cb5ac19b3 SHA512 75c2b93e855d36e717d3b7cabee7ce43ce372a21c8291beb43f24fd69e11114bb0e19e6dd03ec5d901e7e60eac9351afab65c346b7304b16054b91d392050313
 EBUILD ccrypt-1.10.ebuild 358 BLAKE2B fc4735bb7aa9d73e3be45d96e95f1bf7008399d7ca2131210f35866c666860f0ca688b6119fb2ad3daa31eb2280fcc3698d519e95224889efeece5e280121b7c SHA512 ae6c14e585992e53f2087783d8479ea7ecb2d905276c157814cdb5378e8d0c7b911c1da0dc238ae40dd600478602b10627d48272b67fcfef2325db0a293117a2
-EBUILD ccrypt-1.11.ebuild 361 BLAKE2B 201490ae6c3f90b2bb51838291abb67d4a9df956af06129c5b0e29a25a7657458e291ed12605faec10468202e0760b053000cf6c6ec49c07a12353c8e016e069 SHA512 92cc8780108f51e8e3f77f33531cee7a648598d2301c45049b858f01f816c83abcf18dde7e6df9633bd8e87e4a3d35fdee83b0763a4c00dbfe0abd0a4a54c19c
+EBUILD ccrypt-1.11.ebuild 359 BLAKE2B fbd87987bd7c66061bc84b560e0e61b40d97ad2abf95958e2810b014318f82c7f553fecd1f51ada81488367c16d7fb0e4a02db7cf93976b6e653d13da31b8b45 SHA512 62d7e7edf2b73e778e19f01fcddb58e97c26da292d44c6e4bcc886947b5bb18ad5a639259e9020499d465934c378283db681309f398d98eac0ad2bb370167999
 MISC metadata.xml 316 BLAKE2B b3ea9516824d2d6abce5b52bff59ef3935be62158f4b5f35c4946ac46ad6cbce01637f82979c0c7bc0d881b385dbef860b4ee1aaa28cba9121d388640ced2f11 SHA512 fd88aee15282c7205e31caa296006cb6e6d887843b5757676c00d7a0ed054046d9285c9d01ddf120131463eb03cef1ad7e9835a01f4fd71d9483bae2ecde296b
diff --git a/app-crypt/ccrypt/ccrypt-1.11.ebuild b/app-crypt/ccrypt/ccrypt-1.11.ebuild
index 140cb93941e6..f8727b8cf0c8 100644
--- a/app-crypt/ccrypt/ccrypt-1.11.ebuild
+++ b/app-crypt/ccrypt/ccrypt-1.11.ebuild
@@ -8,4 +8,4 @@ HOMEPAGE="https://sourceforge.net/projects/ccrypt/"
 SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 2541fd9c3418..957473dfb989 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-0.31.0.tar.gz 1267960 BLAKE2B 4097a3d278d86589e7273c3f5c4f809f0a5777319856a2aea27233ee99eadf2e7c075c5400970be6a2f11032e54457c9705ef45b85e9d158bc04c7761e59a23a SHA512 9202800649691e9b2d6b4c898b975d11ef3aba8f34903c93a11eafa5300f64c939547cfbbe34ac664de293d2540b143f14d3117969e4a6dfc55d624cfae44fea
 DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
-DIST certbot-0.33.0.tar.gz 1303989 BLAKE2B 7417e72592e15fd7969aed4c60a799caaeedfe66af3b2e60f364677bbf7ba5dde6e597e89a07036b61e63975b402e3de81fb116ee4861061357160284fcc7821 SHA512 4a653e5e7b62d938a46421df509063a3aedf978b73cf3b44088408bf3c48b70c70fe595c449fe9df54e5724c2d5c03357be434b305f5378eaa8261f811678133
-EBUILD certbot-apache-0.31.0.ebuild 1078 BLAKE2B 88db3076d6c2b3e9cb6a19c40ecfb4ed2f42e9f534040bfce18e785adeae93d963ffdf1f1a38ba2fe54e9bb749a8b8c1960af1e5319f884cb85a6e3ef19337d6 SHA512 d9bc1e40c1a77bc8f27725aea41fab71aa870cf4aef1e93f187ba2502bcb89304011e581052235838ad7282b03c6cff4f6f0d1264435d7f8ca53c9a3307ffa65
-EBUILD certbot-apache-0.32.0.ebuild 1080 BLAKE2B e7d4c037fae078bc6538768d507ac109af6c2d676187ed90aebc76ae1900532ae3fc7675ee3d4ba62d0dfefcc573eb3bc92bfdc33e0eede11fb7c0e066dace35 SHA512 672863267ac83c966c208c9ecf6fc83c704ea034092c30169064453fbe92cd3c73cfd2d6d6ace3f52c8d14d46f50e0b8e70b24ad282529f5f99acfe3b2f3bf94
-EBUILD certbot-apache-0.33.0.ebuild 1080 BLAKE2B e7d4c037fae078bc6538768d507ac109af6c2d676187ed90aebc76ae1900532ae3fc7675ee3d4ba62d0dfefcc573eb3bc92bfdc33e0eede11fb7c0e066dace35 SHA512 672863267ac83c966c208c9ecf6fc83c704ea034092c30169064453fbe92cd3c73cfd2d6d6ace3f52c8d14d46f50e0b8e70b24ad282529f5f99acfe3b2f3bf94
-EBUILD certbot-apache-9999.ebuild 1083 BLAKE2B 0e03488f0c19b669c4412fa608b32a3c7b77093163f73779268eb0b1e45fdce664a998b7e6bab882e41ea9cbee1ba8f1caf3f0589b84695f0002712b8976c774 SHA512 0b25f93cb6c50b80edc1b65302d97f70d16f73ef46ede9d25314970eb7f02a8a87e318ecfc30e42819e6be8264e3a772d640b991eafed261aee4f68800ae1460
+DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979
+EBUILD certbot-apache-0.32.0.ebuild 1074 BLAKE2B 4a0867a89a9a3f9cce6771b3c7e1b44f1e644b03ad3f5318fb0d1c4411f1b8b18c8cb6f902558effbbc10f2bf31961119d97af1ddaf51c7b962eea545b0486d5 SHA512 a281f2cfe0b59ceaa3caa5e0aa06deef85d6dd3b07d83e3b8d6078822d203a6fd5658eb61fa72b71f0dcf99d98bdaceda2472f09678b2fb2165dd6f4f20a4c9a
+EBUILD certbot-apache-0.33.1.ebuild 1076 BLAKE2B e9a71456c200b4ca7540f773d9e265d1da64c5ab3be89111db21ed590a8f399695cb7469c14f2e87c9d5b43cd68493bdc35a0f6542cb0b8ecb7803a8067a443f SHA512 99b21439a995b8f12e369d51f5d48f7585176824fbe7b5c6f130ccc272e516d613ccda18c10b87fdc75b88e22e2e7099165ff6a6a9fd998b228e77b23cfe438f
+EBUILD certbot-apache-9999.ebuild 1076 BLAKE2B e9a71456c200b4ca7540f773d9e265d1da64c5ab3be89111db21ed590a8f399695cb7469c14f2e87c9d5b43cd68493bdc35a0f6542cb0b8ecb7803a8067a443f SHA512 99b21439a995b8f12e369d51f5d48f7585176824fbe7b5c6f130ccc272e516d613ccda18c10b87fdc75b88e22e2e7099165ff6a6a9fd998b228e77b23cfe438f
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.31.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.31.0.ebuild
deleted file mode 100644
index 8bf039bdf51a..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-0.31.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=app-crypt/certbot-0.26.0[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests || die
-}
diff --git a/app-crypt/certbot-apache/certbot-apache-0.32.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.32.0.ebuild
index b6c158fb2f52..042b6c7ce4d1 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.32.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.32.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_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 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
 
diff --git a/app-crypt/certbot-apache/certbot-apache-0.33.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.33.1.ebuild
index b6c158fb2f52..e1c9148322fd 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.33.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.33.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index 455c806f9fba..e1c9148322fd 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 7b3468c5a0b8..3fa95259f8c9 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-0.31.0.tar.gz 1267960 BLAKE2B 4097a3d278d86589e7273c3f5c4f809f0a5777319856a2aea27233ee99eadf2e7c075c5400970be6a2f11032e54457c9705ef45b85e9d158bc04c7761e59a23a SHA512 9202800649691e9b2d6b4c898b975d11ef3aba8f34903c93a11eafa5300f64c939547cfbbe34ac664de293d2540b143f14d3117969e4a6dfc55d624cfae44fea
 DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
-DIST certbot-0.33.0.tar.gz 1303989 BLAKE2B 7417e72592e15fd7969aed4c60a799caaeedfe66af3b2e60f364677bbf7ba5dde6e597e89a07036b61e63975b402e3de81fb116ee4861061357160284fcc7821 SHA512 4a653e5e7b62d938a46421df509063a3aedf978b73cf3b44088408bf3c48b70c70fe595c449fe9df54e5724c2d5c03357be434b305f5378eaa8261f811678133
-EBUILD certbot-nginx-0.31.0.ebuild 1012 BLAKE2B e6611cbbb8f7eb76ee4d81f78389afc3a2698ef0909ff67d91d77bc3e92a68e728434b3a237c6791991ca82e014506bd83016e6a5da163792a32581d68967bbf SHA512 cd52ce383de026c14c54f24b30ad044074c16c26760ea8f22d8e56f5f4afae3e1f0368cad36cadb8839b3e062daa6bc2744393b6cf9b8402292c3c66bdeb7a71
-EBUILD certbot-nginx-0.32.0.ebuild 1014 BLAKE2B e49941f79f8c7b2e55480aa96f72c52d9f2e79e7e8d62055c35589a31022d60b40e10fa47b55058f17b92d74f23ae4245dcb1f08062c39e85a7b326529708307 SHA512 ae848d635d1479aa216d908724d478ff7cbaffe67724c287e7de5c0de81b96281b09acaf5d8267ea446ba31b3d36beb3c2c52d2675a95f4ed8255a153da49dca
-EBUILD certbot-nginx-0.33.0.ebuild 1014 BLAKE2B 812615de77db1a7164166ae12e825619037de165fbd8f31d0e5d6d2ce7cbbde4602184dd1eef4bb9415477e66392642739ce29812d4af969c34df59f3c8bd9a7 SHA512 f6ce76bb957f1f73838c0f313de3580d7f36ec4889c50de9c13797a7c1f7b637c6111dc911c12f663e79999a1c80e8d1a84c260dd4e6455017727ff89521d72f
-EBUILD certbot-nginx-9999.ebuild 1014 BLAKE2B 812615de77db1a7164166ae12e825619037de165fbd8f31d0e5d6d2ce7cbbde4602184dd1eef4bb9415477e66392642739ce29812d4af969c34df59f3c8bd9a7 SHA512 f6ce76bb957f1f73838c0f313de3580d7f36ec4889c50de9c13797a7c1f7b637c6111dc911c12f663e79999a1c80e8d1a84c260dd4e6455017727ff89521d72f
+DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979
+EBUILD certbot-nginx-0.32.0.ebuild 1008 BLAKE2B 3e321c0b16817a2d1a0751863d12a3401a76cdef9cb40d9d45b472a7dbfebf9a0bb8e665b89139c41c4415a1c08e059a8f1262ab01973966c89e210d0b147ab7 SHA512 0ab8809448cbe9a2e1e318e4cf9ad03680e2bdaff92a0c53c52a4519bd15bd3c2f7647c910cc08cd627fade6b62ee021ce0816efc35d9c98df05d65f3ed817d8
+EBUILD certbot-nginx-0.33.1.ebuild 1010 BLAKE2B 5c93c97356d2627d4e5154e9d4de40c3d6e88b2932b03552bc3e0f7dad663ab9dba6e0e7529096201661b68de6f3593e1f1ec44c940e30815ebf8750dacd22cc SHA512 99db9199e02f03e88ed82657cd5b34d0aa77544b81577229ed29e33a5eca41ffd33aad1c1df9601c1c9123b4ad11b1b573264fee7f5f466782fc796845d9511a
+EBUILD certbot-nginx-9999.ebuild 1010 BLAKE2B 5c93c97356d2627d4e5154e9d4de40c3d6e88b2932b03552bc3e0f7dad663ab9dba6e0e7529096201661b68de6f3593e1f1ec44c940e30815ebf8750dacd22cc SHA512 99db9199e02f03e88ed82657cd5b34d0aa77544b81577229ed29e33a5eca41ffd33aad1c1df9601c1c9123b4ad11b1b573264fee7f5f466782fc796845d9511a
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.31.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.31.0.ebuild
deleted file mode 100644
index ec0e921c2c8f..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-0.31.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=app-crypt/certbot-0.22.0[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.26.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.32.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.32.0.ebuild
index b84d186a8cd7..3fae58de4255 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.32.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.32.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_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 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
 
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.33.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.33.1.ebuild
index 9adf3132423f..2c79cef87799 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.33.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.33.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index 9adf3132423f..2c79cef87799 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 7e76f61ac9c3..f0e85b0bbb1e 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-0.31.0.tar.gz 1267960 BLAKE2B 4097a3d278d86589e7273c3f5c4f809f0a5777319856a2aea27233ee99eadf2e7c075c5400970be6a2f11032e54457c9705ef45b85e9d158bc04c7761e59a23a SHA512 9202800649691e9b2d6b4c898b975d11ef3aba8f34903c93a11eafa5300f64c939547cfbbe34ac664de293d2540b143f14d3117969e4a6dfc55d624cfae44fea
 DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
-DIST certbot-0.33.0.tar.gz 1303989 BLAKE2B 7417e72592e15fd7969aed4c60a799caaeedfe66af3b2e60f364677bbf7ba5dde6e597e89a07036b61e63975b402e3de81fb116ee4861061357160284fcc7821 SHA512 4a653e5e7b62d938a46421df509063a3aedf978b73cf3b44088408bf3c48b70c70fe595c449fe9df54e5724c2d5c03357be434b305f5378eaa8261f811678133
-EBUILD certbot-0.31.0.ebuild 1264 BLAKE2B 68db0d81c00ee276a4d3ae4d0e2b3405a19bda044b054356a18cd356f36faa0bf9f536e9bdbdd7f02e0ef0408c732b691e0ce4defa6b9768ba262e53fbe5d919 SHA512 0a3d80a71e0fe990caf0d836dad9f2eeb55f61dd0e491e412555ace2de9b697f8721cca77da6e4cddc9e1fb8e45f516d7b1df550043e39cb092c3dd4750fe1d7
-EBUILD certbot-0.32.0.ebuild 1272 BLAKE2B 00bea629a7a28ee6f810fbca1412538b15d8c02732a348082d7b6d68b883dd913cf03a9e1ae2c25c9a7e99f0a7a8cdada547616b28fad5c38d87beda534c869c SHA512 ef2b4ea47566c43f3e32d016e2c6aa84fd4617e7843ff633c308fec01f7e67521f048bdaa2116b6afd6ef009a2b6904f8b361b9b0ce85ee688692ac871966d7c
-EBUILD certbot-0.33.0.ebuild 1364 BLAKE2B e8192526ac6ec0ed89bf066bd19bf77b747230fac923f8795d911dfaf66d0d7eec44b9022715d679e866cf46168e871c02a29ea1d3eac149cb92269545e7bdd9 SHA512 caec4a56c13da61ca7c1e3612bc5d0d0f145efcaae0b5fc9844ec84666864ae6b9a770789c2eecb0d350b59c28df53ff6a8418a91bf26850775580b93d780448
-EBUILD certbot-9999.ebuild 1364 BLAKE2B e8192526ac6ec0ed89bf066bd19bf77b747230fac923f8795d911dfaf66d0d7eec44b9022715d679e866cf46168e871c02a29ea1d3eac149cb92269545e7bdd9 SHA512 caec4a56c13da61ca7c1e3612bc5d0d0f145efcaae0b5fc9844ec84666864ae6b9a770789c2eecb0d350b59c28df53ff6a8418a91bf26850775580b93d780448
+DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979
+EBUILD certbot-0.32.0.ebuild 1266 BLAKE2B 6cb82789b271eb23a993a091b7626e8dcf0e05e63c84e6f99c7ff0c9b4d7f0a00234593744119f7104183ff77757e1a4650325830309cc4f2c2b50fe9abf0573 SHA512 76e99c0a99ae6b2c9fa0e042b8ea9953a8e31d0e338cf1f54ee5af20e8cbb4924c89fdb86cd7f23909ce96763f32dc59f4086c5761c4c45267d49908f4965f83
+EBUILD certbot-0.33.1.ebuild 1360 BLAKE2B b30e0c90eb19eed434cff29529847f7fa71b8b00c1d1db2ea06a619682b1a2de2e775c70d54bc999ce5cbeaa9ad902b097db6cbd2565397394e16d53e98a8456 SHA512 8f5a02f9594274a4c1360457e62b200acd54d0f2e2a05f7a577b4e44e30cc454d19e6e6e09c9811c7242a0b64580bf9538082a3623552fdebef277a61001365c
+EBUILD certbot-9999.ebuild 1360 BLAKE2B b30e0c90eb19eed434cff29529847f7fa71b8b00c1d1db2ea06a619682b1a2de2e775c70d54bc999ce5cbeaa9ad902b097db6cbd2565397394e16d53e98a8456 SHA512 8f5a02f9594274a4c1360457e62b200acd54d0f2e2a05f7a577b4e44e30cc454d19e6e6e09c9811c7242a0b64580bf9538082a3623552fdebef277a61001365c
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.31.0.ebuild b/app-crypt/certbot/certbot-0.31.0.ebuild
deleted file mode 100644
index 9fe3a6058249..000000000000
--- a/app-crypt/certbot/certbot-0.31.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
-	dev-python/josepy[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	pytest -vv ${PN} || die
-}
diff --git a/app-crypt/certbot/certbot-0.32.0.ebuild b/app-crypt/certbot/certbot-0.32.0.ebuild
index 1c019d37388a..63ee8096fb6e 100644
--- a/app-crypt/certbot/certbot-0.32.0.ebuild
+++ b/app-crypt/certbot/certbot-0.32.0.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_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"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 inherit distutils-r1
diff --git a/app-crypt/certbot/certbot-0.33.0.ebuild b/app-crypt/certbot/certbot-0.33.1.ebuild
index 48d3f1039d4c..261fd8251037 100644
--- a/app-crypt/certbot/certbot-0.33.0.ebuild
+++ b/app-crypt/certbot/certbot-0.33.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index 48d3f1039d4c..261fd8251037 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/cfssl/Manifest b/app-crypt/cfssl/Manifest
index 65ce28d81d04..639d410b936c 100644
--- a/app-crypt/cfssl/Manifest
+++ b/app-crypt/cfssl/Manifest
@@ -1,3 +1,5 @@
 DIST cfssl-1.3.2.tar.gz 6867118 BLAKE2B 775b3419ecf878d9add13faf03a3e1d4cca7b30d965f1ca55c8faa5abf679188a1ea1f80c1416f19c85bc551395628a31da8669ca647e1c1e7a1a313d68f4c7b SHA512 aba27a282c8ca8e95769996aea7e5300b0c3f8fea7ae26484d19a7e1a0330f0b3a0649407062f1a10e8c93136693954e3b24c92456f69db3abee509f982ba554
+DIST cfssl-1.3.3.tar.gz 5005924 BLAKE2B 81e7ec1f27a6597d69f16254a5ded672b9b3ac0bc8dee0f5bb00939e86147b1ed0389d38ea406fe671f3de052ac2e88fe320ffbf6065a83c2d9627ac3c497740 SHA512 39b42f3f8c22e254fa8ed4079308ecad1b0f77cdb56e57099e434389866e58863687307d6cf0f5ec8e4664ad4743ee8728f47a6a1375f3f74f8206a709f0ffc3
 EBUILD cfssl-1.3.2.ebuild 750 BLAKE2B 68a9cb8b12c8f5accdd88c17dfbb061ba9213e5ba3e975ccc3b40bc69d6a16e8b4092462f45c84863e576a3586dca0d2d256b03a0fce8a4dc679f933a0645a76 SHA512 aefe6c912d5b40145a01bcdc273abacc1a93e5c76b12f26b0a04db13e6fccb9041939469fd98ed507adc5ca4ca84ecdf8833422643f87777331ddf27ca9448fe
-MISC metadata.xml 326 BLAKE2B 519dd19dc05c50ee2b35580a1ca47b6be4438fcd5737775b098f2bf7cebd7ec3ff88a3d5c9c27a256cedaaddac4b6eeb20f1dfb442d651a7ec31453c309c7c52 SHA512 11be8680812e220202583bd324d756909056b58b9fdc74c769bd1beacc97292c9dc0d7a396bc6018c77d050081654726dfc659b43efc957175d2e2fc57039ffa
+EBUILD cfssl-1.3.3.ebuild 751 BLAKE2B 8d4ed51cb89139b96f1dc089843dc667e1e9209f95c7cc387815da16abebf224c123c68dc38ea81f57ee26d6bbdf3ea223401b3efe1067b26ce2ebe2443c3e05 SHA512 4dcf38025a8c280e310a92e97560cba2b3bac9a4ac4e8e15010e14d63023ebb407470976425d7b7342a9236195925afbb72a6ac736bb51ff646f508475f43b04
+MISC metadata.xml 329 BLAKE2B 5188aa700150b22b0d2972d57ee0db2d1a2239017edbf9547961126b7158060c74aaafd1ffedfa25f76402766a4403d41f3875a8bd2c43d84150177879e35186 SHA512 b56f2d72ad1a5ef0c2531cc1d3524bf13f7089d099bbd774d1774aca5dfb7f8c074b945203ccb80672c154f98d8728cf9d8671e7df9b328c01c2e79cb9ba8be5
diff --git a/app-crypt/cfssl/cfssl-1.3.3.ebuild b/app-crypt/cfssl/cfssl-1.3.3.ebuild
new file mode 100644
index 000000000000..64942d2fca9b
--- /dev/null
+++ b/app-crypt/cfssl/cfssl-1.3.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/cloudflare/${PN}"
+inherit golang-build golang-vcs-snapshot
+
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Cloudflare's PKI and TLS toolkit"
+HOMEPAGE="https://github.com/cloudflare/cfssl"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="hardened"
+
+RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src || die
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${S}" go install -v github.com/cloudflare/cfssl/cmd/... || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/*
+	pushd src/${EGO_PN} || die
+	dodoc CHANGELOG README.md
+	popd || die
+}
diff --git a/app-crypt/cfssl/metadata.xml b/app-crypt/cfssl/metadata.xml
index c1d955e20a40..cc044347cf55 100644
--- a/app-crypt/cfssl/metadata.xml
+++ b/app-crypt/cfssl/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">cloudflare/cfssl</remote-id>
diff --git a/app-crypt/gkeys/Manifest b/app-crypt/gkeys/Manifest
index e6c4e2442a7f..6204d3163cc9 100644
--- a/app-crypt/gkeys/Manifest
+++ b/app-crypt/gkeys/Manifest
@@ -1,4 +1,4 @@
 DIST gkeys-0.2.tar.bz2 47726 BLAKE2B f85fcad78251ce8e4b49d452332af869140611161256663310c3a050f7a3c5313f6e37836d90c5a40b1abb043ff7412cea3b5decd3f1c6db24ff5811dd1b9709 SHA512 0c594b5f451329e5e85998bb96243812e0c6e7ef7fa4db0f276a870148adffcf41acc31631fb28c44c473690f154e130ddcb10b986d4546ca19e2cc8cda95036
-EBUILD gkeys-0.2.ebuild 1695 BLAKE2B bc828662f5fe44bc4be7023400046a46795136f3f2887aeea46c3119aa81ac5c6db69788d852b425162cb578955c28db1b69c37dce7c1729b39715e2b81e4963 SHA512 5d5f50b3b660fa70a73df0c31c290280d7995bc6474a0cfaa48fba0778e4f5b00a29bcae8af3a267e04b08e0e93cf500e940a6ad3b64179a3f4415fe392f6496
-EBUILD gkeys-9999.ebuild 1616 BLAKE2B 2cc22c233eea764f86fccea3ded59745a50010ddf22fd1210f0ea8bf0b30b43f1ceb2b3b2b16ed5db890f35fffa8acd97fb5ee06177c11fbb77cdae9502e255d SHA512 b564c3d2806de902f6e4b5308dc9b45d05c1718cb9db7bf3e344bbef5ed5300cbedb342f5b064e58db1c835ce832cfee86d58754a2c900c616958e3d9bfa792a
+EBUILD gkeys-0.2.ebuild 1688 BLAKE2B b8ca501373ddd298bdab8b1f99b39acf2ab6e70445c20074fdf157fe1f2537471f6487d44d6462374a0af4f30b3e6ea95a5ff046b43acbecf3b58689ef675a52 SHA512 8cde0bbb4e0cb00493c8d1d84a86507be02f2c4843fa1ff34f02b5b9c9367ff2bf069f07a2c63a16915665f81ff57162ca9c3bdc320f040df938877dfc6abf18
+EBUILD gkeys-9999.ebuild 1609 BLAKE2B b50da830bc2fa02b179ef168442b5861c93227cca8ee2a538bebca6d4bf9754e3aa9f49d3937163214ecb96a69497abb8cdcf1d4fdbc399d37fa2ac2e3f6457f SHA512 9d5cc7592bb733c2af73d813a59f2f94095d16464a3e84644afcd4bf0368552234542dde3ad28baf217c2a557f6d2afe993b15c904318805ed999b0ba52979b6
 MISC metadata.xml 257 BLAKE2B cf62bcaddae6a9a234fa866aa93f3f8435bc640ded3947993321f8a85e622a2cc0d3df0290bec76b227a4286544314e6a31dc37026482541b4922d6dc11d174a SHA512 62e56bca988936416042bb794e7c8dad9930a46c1f81f51c60a22f3f43e2d0babaacdbef430a6f8ecc8ea7d949effa6136b6d066dabb0a80fde55c36ea3c080c
diff --git a/app-crypt/gkeys/gkeys-0.2.ebuild b/app-crypt/gkeys/gkeys-0.2.ebuild
index 82fd2a17cd93..33249e7a67a3 100644
--- a/app-crypt/gkeys/gkeys-0.2.ebuild
+++ b/app-crypt/gkeys/gkeys-0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 inherit distutils-r1
 
diff --git a/app-crypt/gkeys/gkeys-9999.ebuild b/app-crypt/gkeys/gkeys-9999.ebuild
index 7ab5b3f58306..85e85cd637a7 100644
--- a/app-crypt/gkeys/gkeys-9999.ebuild
+++ b/app-crypt/gkeys/gkeys-9999.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="5"
 
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 #EGIT_PROJECT="gentoo-keys.git"
 EGIT_BRANCH="master"
diff --git a/app-crypt/glep63-check/Manifest b/app-crypt/glep63-check/Manifest
index a7ba239f1222..67b0699fc329 100644
--- a/app-crypt/glep63-check/Manifest
+++ b/app-crypt/glep63-check/Manifest
@@ -1,3 +1,3 @@
 DIST glep63-check-6.tar.gz 61318 BLAKE2B 9310a70556deabf90003c154c326480e7a5fb58992bf79201100c21fbbeb17ebfdb560d861586d1c206a8d4ed3e64500a8eca4d99dacd072dce121736cdb2d3e SHA512 f0729683095222f60243923bcb7d9c1b984eb10cb0d8a0da2ec756b40a11c3f4f3de466fa533a66d4f645a2de09137a12a47eda5e80d7d5d562b0926a30b1a72
-EBUILD glep63-check-6.ebuild 663 BLAKE2B 542b4dcfd5756bb0b4afa6cd26d5b58a9eff9eb51c3a937716235111e0670ebb858550faf6ed4aa17bfb6db2383f72c908110ba9db52d55e260a6d32d9ffc2b8 SHA512 07d47d7bc0c08a32f383b3e5b679ee5bbe615f5b94473c60fc45be5a2a0a2bdc89acee0eeab5ecedb23af92d24af95ed0470e149dbd836fbc6ccec9ca5ed55f9
+EBUILD glep63-check-6.ebuild 658 BLAKE2B 3e742acbd0fdde1670de3348739b10f70b0ccee4b50615ddd3b49225847c5c2e2454652ca8748330e3adac7f9079ea7bb272b3160f4b8daa14a4113fd4793265 SHA512 470627606b86e27d4fb20e6f0281dc13db43e193ae4f3c2d71da21d949d91253afdbc5a375fd36f8505bfca210a86d733663c2ac4dd64785da63be75c73542de
 MISC metadata.xml 513 BLAKE2B dc5036a6556ebfefbbfc1ad01f436b9793c5c0c51e7cbda49ee896ff364a30761f92ec63531317b4bd55bb9cc018d6ee62d07776a61ba75d7d1245c3d0c1339a SHA512 44aac823dedeb848696d166e28d151449b59d30a7dd87a0c2c339c044e2704908a1882e3b818ad7007822b5fd2efc52ad81564fad953862851b44480d61642fe
diff --git a/app-crypt/glep63-check/glep63-check-6.ebuild b/app-crypt/glep63-check/glep63-check-6.ebuild
index 5ab0f5494960..4f614942037d 100644
--- a/app-crypt/glep63-check/glep63-check-6.ebuild
+++ b/app-crypt/glep63-check/glep63-check-6.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
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit distutils-r1
 
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index f4583a8e2212..d444aab31237 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,10 +1,13 @@
 AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
+AUX gnupg-2.2.14-quiet-sending.patch 1225 BLAKE2B 3165d5b8242a0bad7913881dfac66433bcea9f5d97a58f43999166ce682671060a934ea1618fd90c7b892b4f3565ae0c3e57ad2f8f7b200a52145452d56ad8bc SHA512 f61f029ac72626e0c7d3bf29d483fd313ba723ae47bd7659b4fa72252ec9b5f329510d37ae92c41dd7dd45a3b99e846ae3d83a7bb37825e95e6d10f29b131853
 DIST gnupg-1.4.21.tar.bz2 3689305 BLAKE2B 0c26c9c3aeae2bf2eafa858bc3bd15cc2702bce12a8a90938565322c34e2eeb8e5432932f5c9344a76aa4528b66051141536c062d9923a79d12a0767421bb017 SHA512 619e0fbc10310c7e55d129027e2945791fe91a0884b1d6f53acb4b2e380d1c6e71d1a516a59876182c5c70a4227d44a74ceda018c343b5291fa9a5d6de77c984
 DIST gnupg-2.2.10.tar.bz2 6659484 BLAKE2B d0270ca40bd70fe113fa4283c307d7d04370beec77ffba0abb7862defdab2d5a82b1508284961e30e7d0aab82bffdf09fe796741603e843a062073f179f0bfc2 SHA512 a4477828f268fa69125cf1822f8a721e67f8f4008bd9817b701989393bd93689aac8fee1f4d34d918911d53afabdcbb1c84d40e8a4489d7a29b5a769d330fddd
 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
 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.ebuild 3705 BLAKE2B 7381ec6d70654c3b7cb2f9a739461c118c89efd33fd46be83a4ee2d079cd96dfd32d380b6532b7c4b3883cd0e1bf9f3a25f0965fdce1203ddcda8221624d9096 SHA512 b819d49143f6a0c77f60559c5ae3c24b122a89034fe8bc6497e65c62895c62d782a86164b054bff8f2fccbaf8649e0e88ef19dbc4bbcac186644131b2d5ab58d
 MISC metadata.xml 1313 BLAKE2B 2bf26407bdea8af215d09d28640b961ee98c86c297595736fbe477c8b9cfaf0f8970982ce22038dabf0d8529e39032a3fec9da0c17a5acca0cf3cb197f31f1c0 SHA512 0500f03936eba67706cea87c1f5b16db280b159fc31780b93e696e8ab20e3dece90f0bd80af5aa9582cab557cc337c65e8e101daa935ba6ca31b7f126328c0ac
diff --git a/app-crypt/gnupg/files/gnupg-2.2.14-quiet-sending.patch b/app-crypt/gnupg/files/gnupg-2.2.14-quiet-sending.patch
new file mode 100644
index 000000000000..1f7a561d3f7a
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.2.14-quiet-sending.patch
@@ -0,0 +1,34 @@
+From d8db73615e68d1c549b3ed50057a49d84a31b334 Mon Sep 17 00:00:00 2001
+From: "Robin H. Johnson" <robbat2@gentoo.org>
+Date: Tue, 9 Apr 2019 10:27:11 -0700
+Subject: [PATCH] g10: support --quiet for --send-key
+
+The --recv-key command supports --quiet, but --send-key does not.
+Add support for it for parity and better scripting.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+---
+ g10/keyserver.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/g10/keyserver.c b/g10/keyserver.c
+index 66900f7a9..e5fc011c0 100644
+--- a/g10/keyserver.c
++++ b/g10/keyserver.c
+@@ -1814,9 +1814,10 @@ keyserver_put (ctrl_t ctrl, strlist_t keyspecs)
+         log_error (_("skipped \"%s\": %s\n"), kspec->d, gpg_strerror (err));
+       else
+         {
+-          log_info (_("sending key %s to %s\n"),
+-                    keystr (keyblock->pkt->pkt.public_key->keyid),
+-                    ksurl?ksurl:"[?]");
++	  if (!opt.quiet)
++            log_info (_("sending key %s to %s\n"),
++                      keystr (keyblock->pkt->pkt.public_key->keyid),
++                      ksurl?ksurl:"[?]");
+ 
+           err = gpg_dirmngr_ks_put (ctrl, data, datalen, keyblock);
+           release_kbnode (keyblock);
+-- 
+2.21.0
+
diff --git a/app-crypt/gnupg/gnupg-2.2.15.ebuild b/app-crypt/gnupg/gnupg-2.2.15.ebuild
new file mode 100644
index 000000000000..a8be7c6d7cf9
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.15.ebuild
@@ -0,0 +1,137 @@
+# 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 ~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 )
+	virtual/mta"
+
+RDEPEND="${DEPEND}
+	app-crypt/pinentry
+	nls? ( virtual/libintl )
+	selinux? ( sec-policy/selinux-gpg )"
+
+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
+
+	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) \
+		--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}
+}
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 4c2e8e1ebef1..e8897f6d3b7a 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,7 +1,7 @@
 DIST gpgme-1.11.1.tar.bz2 1419232 BLAKE2B 93980c24e6d692f35105db23a02db891ef022addd583d5bda8e55ec3552dfebb87c9feebb74fdd59fa353a3b08571e51537f8dcaf63af018beff467a848e97e9 SHA512 42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a
 DIST gpgme-1.12.0.tar.bz2 1658803 BLAKE2B 630646af597074c06a99c1170c4f8170ad0fe4ba643a27a87a61dd8df681ca14f023b07817657bb049eaeaef01df3975bd1fe1b75a026634a62f832c6c311b56 SHA512 c228b3df28377df882be536ada56dc9c73150048a58e591aa4495f89c854af95820152cd60139840f994c249e9c7df50d8b89eb9d6dc4ce02aa80bbfebcdd014
 DIST gpgme-1.13.0.tar.bz2 1820504 BLAKE2B 71fbb034e3c5939d1953554ccbe0e89e2089c53a4c79e90ee51bdf96500bf4be8a5e1633772ab8dadd44616dde7be551ad7d3af0a59d7e1df10a19cd9cf56baa SHA512 47a7a67dcc6d111cddd805d288d42e870948114a6dc09ce0675ad8b3d1580bbc2a683e1e70cb2f416919cf2129c72a9ff30e2e3b9527809d04e863cc1f87267b
-EBUILD gpgme-1.11.1.ebuild 2872 BLAKE2B cb6c595f8424e43cd318f65b213ed768a7d055554b7b4b7af65d7dc84af4d1216f5f777ad3d53541838fefd99e2db38151ede5d79dbfd3becb588599c33f657e SHA512 c7218db05ea51baa786bb7e800eb95ad367c21470505f9ea14bcffe38e61c13ce6c46bbfd80e3a9b70fde757bdf761fc9a01b43fa5c34ff8c69c714df1c961d7
-EBUILD gpgme-1.12.0.ebuild 2883 BLAKE2B 0791a9a3446c3f27f33c15551119bde323f1847af34fc0a66e35fe4781ad00f83b37ababb40ff049d44d15354b4261d61274f7953651cf21ae00c2118bdde39c SHA512 0d56644e2bbc117864a5bfea61c54c0617e92bdb012330d6fa3a5e8d2e9b918aa73264b2c69b193b024a31527723f2ed9a2a2d0399661de11d2b2a2c0b8d55e6
-EBUILD gpgme-1.13.0.ebuild 2883 BLAKE2B d11a5a99a4cb511c235020430aded121a099c34227c500d61a4cb436f4db66c2cb2128a515ea7919378a965aa36d2017e3e788c2c55a88fb27413cf2a2f2cbe0 SHA512 62c7e5ae667cd67e8de0086007299cd5294139ac6272e989b88e6034efc6390aa9b52274e8a7639056725d627c1ae7c5cf92ad18f5972d09dc4b03cc58ebad21
+EBUILD gpgme-1.11.1.ebuild 2870 BLAKE2B acc3b608c7d4b3cbd9fb332a5a3d3cd73472bda235206a1ea48cc5df9dce9142a00370261da5ec0d6b8c952acc5735f65e54da8513b94b59c4bcbf65955a9739 SHA512 214bae0fd2eb2476217bb3b0603e1e66ded5631e4729548f80cb17f8fba6f903ead28b27647ca4f2929902470fbe71ff712683da2284c1d3a8b2b2758a52f932
+EBUILD gpgme-1.12.0.ebuild 2881 BLAKE2B fd0fca35dc3da4da150245ec2fb17defa71535cc0e3faec5e5accfa9f623a8c156743e9c4c064e13918d173f2d4f6e16224ebe62cdb4f0f2ce5f5fee463adcce SHA512 22d8e5ef92093e5fb7c006c7f17ee2a660f8f0ffa33f02b189ad691e8b99317d6aeba419667f3a26b28ca8aedd881c71861758cd6557b8ab0a34e03678e07159
+EBUILD gpgme-1.13.0.ebuild 2874 BLAKE2B 533589f4ffbab0a41e28d40484923b3efd18931bf3af5a93062cd532b014ce1de1698b05b3a16293c7c99fd957414722aa97f555cd6cc38676a3ad25d862391e SHA512 2612721dd075c8f834d684f327ec5fa37841ec44b4aaf4f3a72ff077fe5abc28dd1a5c1d00c3b42f2e26f4e9b810c292c84bd894f4142f5735111322e92e03fd
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/app-crypt/gpgme/gpgme-1.11.1.ebuild b/app-crypt/gpgme/gpgme-1.11.1.ebuild
index 3da3c77fb124..e8510ed6bc6d 100644
--- a/app-crypt/gpgme/gpgme-1.11.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.11.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
diff --git a/app-crypt/gpgme/gpgme-1.12.0.ebuild b/app-crypt/gpgme/gpgme-1.12.0.ebuild
index 9de3eaff88aa..ea40cac30514 100644
--- a/app-crypt/gpgme/gpgme-1.12.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.12.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
diff --git a/app-crypt/gpgme/gpgme-1.13.0.ebuild b/app-crypt/gpgme/gpgme-1.13.0.ebuild
index cf832f721a89..21e7f0af7aeb 100644
--- a/app-crypt/gpgme/gpgme-1.13.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
@@ -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 ~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 a11039787848..373fcd65c83d 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -10,5 +10,5 @@ AUX heimdal_disable-check-iprop.patch 577 BLAKE2B 1bb2be5bfd172988a00fc71c0429a0
 AUX heimdal_tinfo.patch 711 BLAKE2B 730ef4b1ba79d80c7257d1bd04783584cf616b2e51d6028fe3160dfdc113b6243c7af8c116ff969de439ebb79bab9091f8e5d6e9037c2b48541e6cbc83ba1026 SHA512 b4c63c9e945b914009569e62fd53229032ffaecde11dc4d02a89d5ba65f2c28020d43af8f2c26d87e2b383ba6dd3c3f4c4b69529471bc1928b45a9b5c437958d
 AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16bdf6f554c585572ed9d3835bed976c8953fc92d0f42270c6a0767e943ec5efa5b79f6f4cf89 SHA512 4dad6837344e30c6988355551b5b82bce748dad7aa7648204ba7852540ad3a546b5344926789d60e78d57ff20dff87b680b790dc8d86c8dec1008feb0d809e38
 DIST heimdal-7.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84581b9c3bc8d42c328e5f878ce24c5596c5a1e3fbca786a71be04984068efbb817f7336135056d1feae38895758f SHA512 6d1ad77e795df786680b5e68e2bfefee27bd0207eab507295d7af7053135de9c9ebb517d2c0235bc3a7d50945e18044515f0d76c0899b6b74aa839f1f3e5b131
-EBUILD heimdal-7.5.0.ebuild 4336 BLAKE2B 1700c9d750256878731b4235bf1c406fbd0d284fb380e86ed4f548de49f51d21a38c780053c66278cf50c8046d5ca0bd7c5266c59218ab2376d9a1bf0a030f4b SHA512 d74f45da083bab07c7b475a1b1fe31b33a9a07886ef86a90e1aab937c8d21006201ff25a5e5414e6c02aba9a94989bc52887979bc477839b94fec3744454cde5
+EBUILD heimdal-7.5.0.ebuild 4334 BLAKE2B 33303601d32d3b2c6f54a3681012f854b6addc55b09c65e6d0cea74e8ac91c12de09624e37f3d4f9933c54dbe8de3cf7f258bb99d33d26a25a0c280288777b44 SHA512 6d40e8a30e74b95c918e7ee5bf10b3d017178bd4775bba707ff2dfc02d208c121426b66ebdbb50df09a96f4caa5c55b35f2e8d53cad9eac4f8ebf46b0f6de266
 MISC metadata.xml 638 BLAKE2B f886a9862a4143b2c9f2a2e5af79c6ce72d23e883a2285f16ad22e61c8acc301f8a838b2fea65f42168edfda9a8652a420c01dc34482123d0ec6ccc6ef0a5ce9 SHA512 1fb671028d7d798c9a6e0be09e77b94a2d7f25598f6d9238f1b7897c9fcd68bed1d3fe84e84d98c1f276979cf782fedb13f1ea44ad876c4658ce1f142aecdf5f
diff --git a/app-crypt/heimdal/heimdal-7.5.0.ebuild b/app-crypt/heimdal/heimdal-7.5.0.ebuild
index 17a6aa13e74d..c9aeb159650f 100644
--- a/app-crypt/heimdal/heimdal-7.5.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.5.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_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 VIRTUALX_REQUIRED="manual"
 
 inherit autotools db-use multilib multilib-minimal python-any-r1 virtualx flag-o-matic
diff --git a/app-crypt/keynote/Manifest b/app-crypt/keynote/Manifest
deleted file mode 100644
index 5f8be27d60e9..000000000000
--- a/app-crypt/keynote/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX keynote-2.3-parallel-build.patch 477 BLAKE2B 16474affd6754a65baf18b7e4bd866c3cd41ed15d8e2f16385f6f60162471364045894e4cde04dbc4fb4fccf3bce2b956ceccc30bdb30d8a078974157ce7cc12 SHA512 1c1934150dd9137d410755e2c6a85f17f3b84e60f24abac070ae240c6b6581b3123f35b927edc2bf17296a0d797409cd1865d7d72b58f15488b66ad26c6bf996
-AUX keynote-2.3-qa.patch 1112 BLAKE2B 70392cfc6c9686ac93d5c81de187ee3f483b23d5446a1f6497cbd7cc6396eadedd75fd321ac126171d66ed7b77fef2c9534e3046bb64d6c3f5cccf1ee20b7f35 SHA512 ec681de7b3f4372a07c0b8a693e4d83d12cdd28fcd605044a2afd8dc9645eb09815efa1d1c74232deb96bb88c394a05ba803e61be912c3a4369f07d62e0eb4a2
-DIST keynote-2.3.tar.gz 141930 BLAKE2B 9cbf18214ca8d39a09be149370b104989470d8040ea307b263451d0d0c74f4658f4620ac16d8f2a5310edca78555e6b8077d67c96941722cd0bc8afa923a2452 SHA512 c4f2f70718cf6092a9af82d6f6e1d8e24d03be9a938e2bde830b24794cd20610b8f647c552d46e37e840f1a1a432dc797b65548c4d39cdbaa65ec2d11f6cfefe
-EBUILD keynote-2.3-r3.ebuild 959 BLAKE2B cc898503df600633b5f69cba59f75ff86e584c99ac26876d7550932ebc8165ef787b60701d4a93cec328ec5715fb71e632fe8b49ccb0cf6147a76ef309b55331 SHA512 b581c7d90e4e8b5db0028f435ecc1810f3fd180260ee2892fee537598dcc4458ef8e745a1570224859605e27e7d850098251702e0b68804733ffa431ebdbcce4
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/keynote/files/keynote-2.3-parallel-build.patch b/app-crypt/keynote/files/keynote-2.3-parallel-build.patch
deleted file mode 100644
index cf4b4926f79d..000000000000
--- a/app-crypt/keynote/files/keynote-2.3-parallel-build.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- keynote-2.3.orig/Makefile.in	2010-02-04 09:51:35.757096194 +0100
-+++ keynote-2.3/Makefile.in	2010-02-04 09:52:17.441137132 +0100
-@@ -86,9 +86,11 @@
- 
- k.tab.c: keynote.y header.h keynote.h assertion.h config.h
- 	$(YACC) $(YACCFLAGS) keynote.y
-+k.tab.h: k.tab.c
- 
- z.tab.c: keynote-ver.y keynote.h header.h config.h
- 	$(YACC) $(YACCFLAGS2) keynote-ver.y
-+z.tab.h: z.tab.c
- 
- lex.kn.c: keynote.l k.tab.h header.h keynote.h assertion.h config.h
- 	$(LEX) $(LEXFLAGS) keynote.l
diff --git a/app-crypt/keynote/files/keynote-2.3-qa.patch b/app-crypt/keynote/files/keynote-2.3-qa.patch
deleted file mode 100644
index f6b1ff28cdb8..000000000000
--- a/app-crypt/keynote/files/keynote-2.3-qa.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Respect CFLAGS, LDFLAGS, and AR.
-
-The better way to fix AR would be to patch configure.in,
-but it is sufficiently old to fail with current autotools.
---- Makefile.in
-+++ Makefile.in
-@@ -27,7 +27,6 @@
- YACC = @YACC@
- SSLEAY = @SSLEAY@
- RM = @RM@
--AR = @AR@
- NROFF = @NROFF@
- TAR = @TAR@
- TRUE = @TRUE@
-@@ -41,10 +40,10 @@
- YACCFLAGS = -d -p kn -b k
- LEXFLAGS2 = -Pkv -s -i
- LEXFLAGS = -Cr -Pkn -s -i
--CFLAGS = -O2 -Wall # -g
- RMFLAGS2 = -rf
- RMFLAGS = -f
- NROFFFLAGS = -mandoc
-+LDFLAGS = @LDFLAGS@
- 
- SSLCONF = testsuite/openssl.cnf
- SSLCERT = testsuite/test.cert.pem
-@@ -83,7 +82,7 @@
- 	$(RANLIB) $(TARGET)
- 
- $(TARGET2): $(TARGET) $(OBJS2)
--	$(CC) $(CFLAGS) -o $(TARGET2) $(OBJS2) $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET2) $(OBJS2) $(LIBS)
- 
- k.tab.c: keynote.y header.h keynote.h assertion.h config.h
- 	$(YACC) $(YACCFLAGS) keynote.y
-@@ -131,7 +130,7 @@
- 	-keyout $(SSLKEY)
- 
- test-sample: all $(OBJS3)
--	$(CC) $(CFLAGS) -o $(TARGET3) $(OBJS3) $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET3) $(OBJS3) $(LIBS)
- 
- test-sig: all $(SSLCERT) $(SSLKEY)
- 	$(SED) -e 's/--.*//' < $(SSLCERT) > $(SSLCERT).1
diff --git a/app-crypt/keynote/keynote-2.3-r3.ebuild b/app-crypt/keynote/keynote-2.3-r3.ebuild
deleted file mode 100644
index b4351b69e09b..000000000000
--- a/app-crypt/keynote/keynote-2.3-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="The KeyNote Trust-Management System"
-HOMEPAGE="http://www1.cs.columbia.edu/~angelos/keynote.html"
-SRC_URI="http://www1.cs.columbia.edu/~angelos/Code/${P}.tar.gz"
-
-LICENSE="keynote"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libressl ssl"
-
-RDEPEND="ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	virtual/yacc"
-
-pkg_setup() {
-	tc-export AR CC RANLIB
-	# bug #448904
-	export ac_cv_path_AR="$(type -p $(tc-getAR))"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-qa.patch
-	epatch "${FILESDIR}"/${P}-parallel-build.patch
-}
-
-src_compile() {
-	if use ssl; then
-		emake
-	else
-		emake nocrypto
-	fi
-}
-
-src_install() {
-	dobin keynote
-
-	dolib.a libkeynote.a
-
-	insinto /usr/include
-	doins keynote.h
-
-	doman man/keynote.[1345]
-	dodoc README HOWTO.add.crypto TODO
-}
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index b244d0bb0c42..2aadc139b8d6 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,7 +1,7 @@
 DIST libsecret-0.18.6.tar.xz 487836 BLAKE2B d38a41743142d33e634d77bbf55ccab044def9658b3f50bd3f8cec9be6372ad1a56dcc4de58126cba1246c16da2863c003bf14ea6c8a90d8667658cf492f4b9a SHA512 4997519762f1470cfc0a4b3a791362d030af3c9b6ce6f58f8f8073b3a8adeea9b8caacedc884163997081dc39f395f9172330dbb41fed45d6c43ac5809de48e3
 DIST libsecret-0.18.7.tar.xz 508392 BLAKE2B 9774df97c2abb362940c3b373e381afb82ee6af3866cdc18ad52159e824dd9097739d4900eb2dffe117e5b28e2057d0db0cadc3b02e063112309b63fd4d1b870 SHA512 a8890ec52dcfba585fd665ee89e81f4a1d6a04b67bcf4f3422f27973a4ef6fc1281bf54e92160d39dd696ae08a633bab5fe25c1124baf32eb5b414e98ddfa084
 DIST libsecret-0.18.8.tar.xz 509432 BLAKE2B 3e3995d2c44367e31f3914087494764acfe82fb597b524c4982b4fca4e16612509c675f545191ee3cdae59698614395bef54ad82ae88a7e4e19898ba0be7828f SHA512 9e2ec8d458af6ed078bf3c6d956599f73f2cc7720332c424e9aede1f77f3d969c5122cf7b70899bc07ad96a3a628bf79bc5fffa88274d1ef2bcaaca6719f90d4
-EBUILD libsecret-0.18.6-r1.ebuild 2660 BLAKE2B 4840e5cfcc512aeef800d324f77d9d083d690963042903c0bdd6513a146b565106057b9ab9969b5ea905118e36cd06c9d12d025865ef190ab15c94383cc81ab5 SHA512 160be3b6686b700fe5d69251f1560cf6f15ecb5ebd9f0a1298952501294e60938584fc8ab62c0f36da32db4809710827c59f41782f5d756b65ec25aaab4cd997
-EBUILD libsecret-0.18.7.ebuild 2649 BLAKE2B 1ae04eccc247529a08f3e52747d8db6f03e11c37f7bf672cf35020ea006cec9b77c83aeacde3540f035a372268ace53c88624178567d7bf75175de6766556929 SHA512 2fc273d7d573c9fc56e78712d94e419dce1a1a9559ca9262c53c2165e7ef28fdd10a084baf9c561046c647c55cd656b1a81f70ede2de1f914ad544fc961789e0
-EBUILD libsecret-0.18.8.ebuild 2650 BLAKE2B 97beb88872d5542269e7d60a8a61437e30bb846c2f7727b95dff1f31534d488be32eed23abd8c0ad7e246bd2fe10f205c1a964206805da7170d3ff69fbb80673 SHA512 a4fb021ac449583a63295aeccbf6062df0b6f2b3fac90e9f6b98f3e94c1a4175d3b1612ba577209e38a3b7d5994fc122f67a1578134c5d85e910ed68ed1d29e7
+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 2648 BLAKE2B bc315ec0daa20944e26053155563b980dcb6d7d96c6395891a7120a3f3e6a64041b0d7a4491ba6b75a374969f1c8f78754c302d2373f88e91841142b6cbdd44a SHA512 1df74d77c39c241cc962928a459902bc5db56123d8535fe9d7d1620126a8575d2f94c4c7506bef31186bf5cd03533e33603022b7ed8056d706f82949e136803c
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild b/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
index b982e64260f3..d54507f4b6b2 100644
--- a/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 VALA_USE_DEPEND=vapigen
 
 inherit gnome2 multilib-minimal python-any-r1 vala virtualx
diff --git a/app-crypt/libsecret/libsecret-0.18.7.ebuild b/app-crypt/libsecret/libsecret-0.18.7.ebuild
index c56261e9fbf6..a54021526b73 100644
--- a/app-crypt/libsecret/libsecret-0.18.7.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 VALA_USE_DEPEND=vapigen
 
 inherit gnome2 multilib-minimal python-any-r1 vala virtualx
diff --git a/app-crypt/libsecret/libsecret-0.18.8.ebuild b/app-crypt/libsecret/libsecret-0.18.8.ebuild
index 18bfb758ce25..91a9cc02a573 100644
--- a/app-crypt/libsecret/libsecret-0.18.8.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 VALA_USE_DEPEND=vapigen
 
 inherit gnome2 multilib-minimal python-any-r1 vala virtualx
diff --git a/app-crypt/manuale/Manifest b/app-crypt/manuale/Manifest
index 2e6b0153a82b..aa20b29eef73 100644
--- a/app-crypt/manuale/Manifest
+++ b/app-crypt/manuale/Manifest
@@ -1,3 +1,3 @@
 DIST manuale-1.1.0.tar.gz 14015 BLAKE2B 1c3eb18e591032c1633e73da46bd91653627c127ccd9d0006d776ccc12d95faaf53b8942a47fcedcb37ef998ad6975efee7a20658f6e366fa51f0b6ddd635f31 SHA512 b78d6468fba14738f0b33cb11817a61692bab2b18a3331b2696c6e1c070a202903be6d6f642da7dd35560b15ee5fe24afecebe51395bdacae59f04cc582b6b44
-EBUILD manuale-1.1.0.ebuild 584 BLAKE2B 9dd597b5fc97f96a6c65536d7deb20bdc72f85e9c542d7d9c0845d7f04d8b597eb2ef9345d5dab2dda2c28d1f1b3fac04c2c6181ef8c2dec0d1dbde787b576df SHA512 5f0fa3fe24306081cf81c4a49ca947f37ef391a5abe88bf494726e8390b38b9cf1c96fe58f4140ccab0ccb4449e9650f308163f162a7ae69878b6bfe781ba842
+EBUILD manuale-1.1.0.ebuild 577 BLAKE2B 18265718962f5ba77b280d5dc2c5b405b783cede330b606aaff0ed125a43e50743373143961346bb2b3d325ff6dd6f8a991da95b8e925759e2a5163517b0b02f SHA512 fbc8f92d2a49f1a9cbdc87420f13bca9b428f5a4b3563a55bac1e252866577991f52f829f4857f4becd668fe2608f54d581aa65e74e86ad63c5da14c58ef7579
 MISC metadata.xml 245 BLAKE2B 971a9685a9931969cce9ae3f586e5a1b1be60f3d494139c8f09b19e68552286c04f70e4321473e9d62e20136e322f0ce5c8265a986f27ab4c3b02dc2584a8e05 SHA512 959004edbb7652a51b20d5c16dcdc270389d9ea656a795928323ca071ba51cb34d25b4bedfdc0cabe9e95301986aec7b8f3972bf1a50df4253b6364da932b232
diff --git a/app-crypt/manuale/manuale-1.1.0.ebuild b/app-crypt/manuale/manuale-1.1.0.ebuild
index 974307de8f43..6f8bd4555229 100644
--- a/app-crypt/manuale/manuale-1.1.0.ebuild
+++ b/app-crypt/manuale/manuale-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/app-crypt/md5deep/Manifest b/app-crypt/md5deep/Manifest
index aa60bd5af8b0..e798d5e6e3ff 100644
--- a/app-crypt/md5deep/Manifest
+++ b/app-crypt/md5deep/Manifest
@@ -1,5 +1,3 @@
-DIST md5deep-4.3.tar.gz 1416180 BLAKE2B 0b0d4814b8a9734555a8b68b363f8a3423c5a97cc21409c166c9f611168e97d41005f981c9493a8bf573661869bef0300028616a414cd130d0ccc5a5dc8ea923 SHA512 fe1240e6ae039b18d35a9de0cf15fb77eaac9d5505b6b550eb32858bf6d603f8186de06114d40325d5071640f46cec70795e9c192fa7b6ca9022a12c212a9b14
 DIST md5deep-4.4.tar.gz 4534687 BLAKE2B a2fc72e6e032945b6e3820d23a9d19b40438c00b7af870d00bed08f753decc5ac4e18c00dea447aa227f8706949f75712aa05d14f87ee76f62223b1fad0f7f1a SHA512 c37ec85ed04d4452f9038f43434c02e064cf9e17c4eaa233867dba0236443922a14ccb8ec76c68820087751c2ca3db014d3f17dd8fcd2c2bde84d620aae50de1
-EBUILD md5deep-4.3.ebuild 480 BLAKE2B 39183d9b63c81e0bd5d8084272579da2a9710c1457c978a0dfba06a05fc5c29b4dae4bc064436b53d92c58ac887278d195b322c6418bed30762f106e8a1e9b22 SHA512 0200309a8e3acf89df5ae5ff5cccea3cf379d17341a4ff46b4df95d0111ef4e6a4e025d6162c31283a3a9ed1e3ad09ef9e7b5c3e0093bbff136f213972d9f238
-EBUILD md5deep-4.4.ebuild 612 BLAKE2B dd44ee2e7fa6f1d3a50165d410d2f7b86fbd5c6db65622abafbe3c9112a34ed0c7c25fec6fb4ac4203c5a5c69aae4c36a5848099897a7a468a3c03e4460f6bee SHA512 5363cd5cb2f36ae17439c102e7a3e135542b6d4c4af7c463667602b6ce815b05e6c089fbacf482a1c49880bdf31eb0d030a3a917841191396dc25c38059487d1
+EBUILD md5deep-4.4.ebuild 613 BLAKE2B 3973c367b74d5cdb5d6c9c3eddbc43e6a91da04d57cbaf3d005fec9e86edd0c4f424632f629dd0b8acb51e93bd1e59b4186d8f193443fd1dae56c4db6a709d89 SHA512 533089889193cdb74ffcab2912da13fa3f7edc1905a372f7c742af047709cb5017217388ccbab058fdc695e4875e61e81b1d8574904e670b3bc79fbf07d72e5c
 MISC metadata.xml 396 BLAKE2B a1a6c4916e6e59e84cb6b095d8c0eda9584ad727014e934ad792bab88a3f6323fd1c31b6dbf84a10440daa9ec8afc494e31045bb20ec6a92d5705cf739fc61fa SHA512 2d4907761039f21088a1644f5da3b764ab55d37513195f0b04c8110a80f638f62f1322ecaf58bb3c506f69449b56e8f430130dcb3906738f0893a5cf83ae4e30
diff --git a/app-crypt/md5deep/md5deep-4.3.ebuild b/app-crypt/md5deep/md5deep-4.3.ebuild
deleted file mode 100644
index cb91e22b8213..000000000000
--- a/app-crypt/md5deep/md5deep-4.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Expanded md5sum program with recursive and comparison options"
-HOMEPAGE="http://md5deep.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-RESTRICT="test"
-
-DOCS="AUTHORS ChangeLog FILEFORMAT NEWS README TODO"
diff --git a/app-crypt/md5deep/md5deep-4.4.ebuild b/app-crypt/md5deep/md5deep-4.4.ebuild
index 48242e1000c5..a7637a6fdfde 100644
--- a/app-crypt/md5deep/md5deep-4.4.ebuild
+++ b/app-crypt/md5deep/md5deep-4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jessek/hashdeep/archive/release-${PV}.tar.gz
 
 LICENSE="public-domain GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 S=${WORKDIR}/hashdeep-release-${PV}
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 9a783977fddb..36a5b7649283 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,6 +1,7 @@
 AUX CVE-2018-5729-5730.patch 11896 BLAKE2B 324bbd80acf4a2520909fc26f90f67cec06148ee0effecc43fbadd6c6445b57ee17eae57864c92a5ce0cdc3dbfb0540758910133195fd2078d334bc6e209a452 SHA512 b59ba6cb5d40cca6c8f539c028ba24c2fa6bd1750133545e912f519b91043d426cecf782209c373598fd895c6294e44fc2bc27af34c033ff367bdfb2cb4f91c4
 AUX kpropd.xinetd 194 BLAKE2B cfc40af2e75b0ce5a71e0dfdcfe076d13d996b25d2cb50d4282bc88d7b33b317a202d57df0bb4a2b47113f0d38cb508614e122e4a3bb7dfd2397e2daa3178396 SHA512 c9bbd13f2fadfd2a925bfae834ba61f227cd4386b4c4466b5227d93c792f4549778ef4d6e08353372df99804459277c71f61b41ec71f3afcc600d73c5705f72f
 AUX mit-krb5-1.12_warn_cflags.patch 448 BLAKE2B cd9793866173b394bab3497d19653ca3296924cc49aaf540499b149254265af1d995b4d7493b76185ce35d123e70827cb5fcb221efc6499b86a346cfad7478ab SHA512 42364d9cd8c0a6fd28ae661eeac4d0dd3f2001fe290bf9731ee99c2c786a6488805fc93057d59e201e2cef1e5280af4c170187aa5603f4cf542906abc0fccc2b
+AUX mit-krb5-1.16.3-libressl.patch 3831 BLAKE2B 1f386529069a08e100154640387354644e6e2e64475980af7c1a5be67c8880160f8532cdf4c4d677199a67b7131c495a02370edff08b5ac291d3f0a5adc369ab SHA512 655ce5f28688d06e57bf808f5363ae1bf3276a9c4aad7c08629a459f24efe07b462e8b56f9aaafe3e9cbe54e1846e3d97bd7857e420a7e7268f3a7c89d212383
 AUX mit-krb5-config_LDFLAGS.patch 466 BLAKE2B 2dd4f1cfc20bea229d08201d66e3de71472dccfa45dee9b260c51578187e706b864c0b4ff81c0c5a09fd29401c2abdbe334441ca075208299b02d5e1d49aff94 SHA512 9a1ca9b33e7708346eda78d199fdc51f0d7bd08d3d65ea15a19955a6155ab71b8ee0c8989859d6dff293a141f197ea19394a91b3b641181140a289b743e0f0e7
 AUX mit-krb5-libressl-version-check.patch 1123 BLAKE2B ca8bad504949c8dcbffe5f9906a38287a2483ffef8b0326cf361f7a07c44787aa0972a24a832aa4da9a1450fa41035bf216c55e1aafb8a890cc8d88f1e210e88 SHA512 cec03ab3577fd8f96f34e51e9380622b09ac5964687b2e8e45e066d16846a9add71c3fd44f6de305ee5c5be5a27a07e4758b6752afdd8a70149b3f191be609f8
 AUX mit-krb5kadmind.confd 76 BLAKE2B ca69357a77ddaf67e2f9c104b17d49af5da9891b13bd855f8b04d54bfb6ccf07ae8c5cb694f65a47646675c844c8f8c7224e8487081df678c73c554498259516 SHA512 dbf968800959f0463899031e823f003e9ece90132f452ebf03df08caf0e6a6e6ca2cfdee91491d269cfa24bef19e72dd33c7d818a4bb13ef85edfb6f0e8299f3
@@ -21,5 +22,5 @@ DIST krb5-1.16.tar.gz 9474479 BLAKE2B 0c5caa0a0d2308a447d47ab94d7b8dc92a67ad78b3
 EBUILD mit-krb5-1.16-r2.ebuild 4212 BLAKE2B eac567c47b44a75e06ea412da95ecfb5e65278132cca0757cc83804b71a61a55c6e6c226c2033eac323d237bcb804f674b033403c95caadd7fc35a8d6b5a57a7 SHA512 8c0d1dfb71cd9d5c08bbad176b1ed1b232f31da0e6dc09c1f239f6c90f55879774ef0b9b41b9a4ad5ab67896d1dbb2138bb13087152cb348bd52ea639de78a98
 EBUILD mit-krb5-1.16.1.ebuild 4172 BLAKE2B 4b120ec5bb2d750c6d76c1f6fda2cd21aedbfe771eb234e4d7b392868b6e9d9bcef4b6897df456d8ae30b9cc96a8b83636028d854cb2646172c4f0c27ecc0087 SHA512 af0736e57376a42e44e4a2d97587386590c5a3c5de56485b6db2016494b2bc392ba4bf573462576de5a909fd963da8095d349eaa5866f3ec3ffd427224650eb3
 EBUILD mit-krb5-1.16.2.ebuild 4294 BLAKE2B 4e36bfd702bf28bf73d81265a4d410ce53631c012b9090b6296f1ccb0b923b598ba7bf378451a3490d7018b0681fc9a882805707feb165975ef9ee072536cc89 SHA512 f026e3e3f59e6d4747a3bc3e71292092668f388b61a6d53db437b6fc79311f11c95f6d70e21c36911733900556015a4ebbfa01fc7bcca073561359ce72e9659f
-EBUILD mit-krb5-1.16.3.ebuild 4298 BLAKE2B 1c34349a18af2a0172b64011bd45f5421f3f39b9c36817a10e99be32b212c337446ef55ae4544e8baad32e706d74942e59d9022aa20153aeb98d2cd27df0fdd8 SHA512 5e0534a45cc859ef7226c75817949f9c3b0d0cc336930ceeb2482016db022769e83015b7f9201879986fb3c6ae2fae1f64b45eca22802003fe39d567608b7794
+EBUILD mit-krb5-1.16.3.ebuild 4287 BLAKE2B adfa76bf62c6c9ebd4d854307e77ded4dc6a061e54249332f3ea0ea16863063a18bb142ee02a4fc253ad6a0dc199242796b8b085b324800a12712a98753fc6c4 SHA512 0858f94f587c452c23952f533418ff134723c76061dd244e7ed800ca5d7d16bda1ab3c24494e989c1c6c2f11176c4dda3715d48b54862b643080d05d8d4481cb
 MISC metadata.xml 828 BLAKE2B f317440eac9d164e0640cb059dee0c3bdcfeaeb2d0e346d962f09b7152224efc10084611768663b84c67fdf73c9d89481370fe0b70ffe14aa10a360f60bd00f6 SHA512 c0f45699280d49b91eab24de6cbb28900170c3c4526b8c6ef0f6a996d3e53abd49911ce4f6ce7b28c69d37e86cc9e5b830977b9640809734e7fccf078886685c
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.16.3-libressl.patch b/app-crypt/mit-krb5/files/mit-krb5-1.16.3-libressl.patch
new file mode 100644
index 000000000000..7a655fb9a1d8
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.16.3-libressl.patch
@@ -0,0 +1,101 @@
+From 58263cbf3106f4c9c9a2252794093014a2f9c01f Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <stefan.strogin@gmail.com>
+Date: Thu, 25 Apr 2019 03:48:10 +0300
+Subject: [PATCH] Fix build for LibreSSL 2.9.x
+
+asn1_mac.h is removed from LibreSSL 2.9.0, but static_ASN1_*() methods
+are not defined. Define them.
+
+Upstream-Status: Pending
+[Needs to be amended if
+https://github.com/libressl-portable/openbsd/pull/109 is accepted]
+Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
+---
+ .../preauth/pkinit/pkinit_crypto_openssl.c    | 13 ++++++++----
+ .../preauth/pkinit/pkinit_crypto_openssl.h    | 20 ++++++++++++++++++-
+ 2 files changed, 28 insertions(+), 5 deletions(-)
+
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+index 2064eb7bd..81d5d3cf2 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
++++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+@@ -188,14 +188,16 @@ pkinit_pkcs11_code_to_text(int err);
+     (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+-/* 1.1 standardizes constructor and destructor names, renaming
+- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
++/* 1.1 (and LibreSSL 2.7) standardizes constructor and destructor names,
++ * renaming EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
+ 
++#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL
+ #define EVP_MD_CTX_new EVP_MD_CTX_create
+ #define EVP_MD_CTX_free EVP_MD_CTX_destroy
+ #define ASN1_STRING_get0_data ASN1_STRING_data
++#endif
+ 
+ /* 1.1 makes many handle types opaque and adds accessors.  Add compatibility
+  * versions of the new accessors we use for pre-1.1. */
+@@ -203,6 +205,7 @@ pkinit_pkcs11_code_to_text(int err);
+ #define OBJ_get0_data(o) ((o)->data)
+ #define OBJ_length(o) ((o)->length)
+ 
++#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL
+ #define DH_set0_pqg compat_dh_set0_pqg
+ static int compat_dh_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
+ {
+@@ -235,6 +238,7 @@ static void compat_dh_get0_key(const DH *dh, const BIGNUM **pub,
+     if (priv != NULL)
+         *priv = dh->priv_key;
+ }
++#endif /* LIBRESSL_VERSION_NUMBER */
+ 
+ /* Return true if the cert c includes a key usage which doesn't include u.
+  * Define using direct member access for pre-1.1. */
+@@ -3040,7 +3044,8 @@ cleanup:
+     return retval;
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || \
++  LIBRESSL_VERSION_NUMBER >= 0x2090000fL
+ 
+ /*
+  * We need to decode DomainParameters from RFC 3279 section 2.3.3.  We would
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
+index 7411348fa..ac91408c4 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
++++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
+@@ -46,7 +46,25 @@
+ #include <openssl/asn1.h>
+ #include <openssl/pem.h>
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || \
++  LIBRESSL_VERSION_NUMBER >= 0x2090000fL
++
++#ifndef static_ASN1_SEQUENCE_END_name
++#define static_ASN1_ITEM_start(itname) \
++	static const ASN1_ITEM itname##_it = {
++#define static_ASN1_SEQUENCE_END_name(stname, tname) \
++	;\
++	static_ASN1_ITEM_start(tname) \
++		ASN1_ITYPE_SEQUENCE,\
++		V_ASN1_SEQUENCE,\
++		tname##_seq_tt,\
++		sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
++		NULL,\
++		sizeof(stname),\
++		#stname \
++	ASN1_ITEM_end(tname)
++#endif /* !defined(static_ASN1_SEQUENCE_END_name) */
++
+ #include <openssl/asn1t.h>
+ #else
+ #include <openssl/asn1_mac.h>
+-- 
+2.21.0
+
diff --git a/app-crypt/mit-krb5/mit-krb5-1.16.3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16.3.ebuild
index 4aeaa219ada8..9d8b99116396 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.16.3.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.16.3.ebuild
@@ -63,7 +63,7 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
 	eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
 	eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
-	eapply "${FILESDIR}/${PN}-libressl-version-check.patch"
+	eapply -p2 "${FILESDIR}/${P}-libressl.patch"
 
 	# Make sure we always use the system copies.
 	rm -rf util/{et,ss,verto}
diff --git a/app-crypt/openpgp-keys-gentoo-release/Manifest b/app-crypt/openpgp-keys-gentoo-release/Manifest
index 732b8f35a47e..9c6711280878 100644
--- a/app-crypt/openpgp-keys-gentoo-release/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-release/Manifest
@@ -1,4 +1,6 @@
 DIST gentoo-release-test-sigs-20190224.tar.gz 3235 BLAKE2B 924c69a62d5321716f536144f0607bd3ec4a65d76be492adc729864fd9bef82df0086541ae13034a83152ea0c8dc3cbd168be6cff111a3484128a22cbc8ef1d4 SHA512 f8cc2e84bedbdf14ace6abe4aacf8f0c9810c77ff6ae0fac301829d9d4d5cf0c128a76516c773ac993879215bcdb0aab097e1e7e747d8e1a7c4cfc815bd4d3e6
 DIST gentoo-release.asc.20190224.gz 42534 BLAKE2B 9b8bc98dbd66fdf44eb1b0b5a8e83bd4d08d85a3f9a95b293ae3e900de291567f36d59cb8dfb412e3f71db453184e2eefa453cf3e340d5b3091c55919fccebc7 SHA512 4f46c303faa134fc17903859527a9fa81d1015f4f2d2908509437ee2d07a992eb181c5a05544b333c310eda8ee2c1861cb07e978d92ef3f02955ade36110da67
+DIST gentoo-release.asc.20190427.gz 59649 BLAKE2B 138c6bad0ec688c515888433256c95cea7d8ec1e76587e0e89d3c11078eb1b85931ba9f6630f60dc8bc168b8303204ebe05b9bad7abe946a74730123b1c36d89 SHA512 1491fb2bcf9c6a29adf8ff08cbf8cd40517ee3de7adc048be29a2300f460e78594548c3e47bd18da68585248c560d868815ded5584ed18929e4072c4933484f0
 EBUILD openpgp-keys-gentoo-release-20190224.ebuild 1145 BLAKE2B 955d52e47d997f46ce2d1a098912173ca822cd892cf7b8aa03c61f3d718d3893a7a81faec33181d7aab30a909127615847a86a6f215cfe3f8d7d90c50930aa55 SHA512 805441a7fcb7375173085747769f85bfa108d8cb29fc93b0907cfe274c893ffc93294c233c94bc428bed4f82f8b0e046daca9732ebb4f4faca7628d7f106edd7
+EBUILD openpgp-keys-gentoo-release-20190427.ebuild 1145 BLAKE2B 955d52e47d997f46ce2d1a098912173ca822cd892cf7b8aa03c61f3d718d3893a7a81faec33181d7aab30a909127615847a86a6f215cfe3f8d7d90c50930aa55 SHA512 805441a7fcb7375173085747769f85bfa108d8cb29fc93b0907cfe274c893ffc93294c233c94bc428bed4f82f8b0e046daca9732ebb4f4faca7628d7f106edd7
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190427.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190427.ebuild
new file mode 100644
index 000000000000..d6cd99646fb7
--- /dev/null
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190427.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
+HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz
+	test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-20190224.tar.gz )"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( app-crypt/gnupg )"
+
+S=${WORKDIR}
+
+src_test() {
+	local old_umask=$(umask)
+	umask 077
+
+	local -x GNUPGHOME=${T}/.gnupg
+	mkdir "${GNUPGHOME}" || die
+	einfo "Importing keys ..."
+	gpg --import "gentoo-release.asc.${PV}" || die "Key import failed"
+
+	local f
+	for f in gentoo-release-test-sigs*/*.asc; do
+		einfo "Testing ${f##*/} ..."
+		gpg -q --trust-model always --verify "${f}" || die "Verification failed on ${f}"
+	done
+
+	umask "${old_umask}"
+}
+
+src_install() {
+	insinto /usr/share/openpgp-keys
+	newins "gentoo-release.asc.${PV}" gentoo-release.asc
+}
diff --git a/app-crypt/princeprocessor/Manifest b/app-crypt/princeprocessor/Manifest
new file mode 100644
index 000000000000..1f1277fc542e
--- /dev/null
+++ b/app-crypt/princeprocessor/Manifest
@@ -0,0 +1,3 @@
+DIST princeprocessor-0.22.tar.gz 38829 BLAKE2B 396a3b12bd390dca80f8d054e8e0c04c70d0bc1cb4f957d53f9f7f4a8aaa87edc1499cde20e01dfa288ba8212403e87e2c6180f1cee3da4825938d08cb2da1df SHA512 8b73867b3f8a83601cde9d6d17e917d0ba468873eda8c47e3c4de7a0511fe35bedb44c68897df9fcc48b1737c1f2c026117e9398f5ff4202611a001fe33990df
+EBUILD princeprocessor-0.22.ebuild 678 BLAKE2B 3b2ab98149708f2e50c0eb9bb890429d4066f9705c57e8e637590603c2531bafea6b74ddab845215eb1c7fa81d536ae48748384be741debce3388b68185440ca SHA512 08777a7c55c7599280f783ae0fd22d4b8d912571ee5001c5e8e2527208dd1a3bbdd881f79ecf232ef4a324651901f146917bcf532c614a667a8fb6b4840c550c
+MISC metadata.xml 335 BLAKE2B e69056b841f119cc4dacf6390d8008a89ca59b715a85fc6b16a65ee01ba52aa87b1035bbcbb4e345358b20805b07dd61555229b0fbc47eeea5b5e0f5e49966bb SHA512 a2cf00a24dfc489539a22eb44418ce8b758ed5b3934ad0cd75fd05a9e081eefa19588d536468a0dd3047f8ec52792186107f755b6136000ba70108d2dceebbe7
diff --git a/app-crypt/princeprocessor/metadata.xml b/app-crypt/princeprocessor/metadata.xml
new file mode 100644
index 000000000000..83b9308ac052
--- /dev/null
+++ b/app-crypt/princeprocessor/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hashcat/princeprocessor</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/princeprocessor/princeprocessor-0.22.ebuild b/app-crypt/princeprocessor/princeprocessor-0.22.ebuild
new file mode 100644
index 000000000000..cc8b1da7755e
--- /dev/null
+++ b/app-crypt/princeprocessor/princeprocessor-0.22.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Standalone password candidate generator using the PRINCE algorithm"
+HOMEPAGE="https://github.com/hashcat/princeprocessor"
+SRC_URI="https://github.com/hashcat/princeprocessor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+	sed -i "s#-O2 -s#${CFLAGS} ${LDFLAGS}#" Makefile
+	default
+}
+
+src_install() {
+	newbin pp64.bin princeprocessor
+	#install rules after hashcat is fixed
+	#insinto /usr/share/hashcat
+	#doins ../rules/*.rules
+}
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index c334d40dd72f..7f9befe23b26 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -2,7 +2,9 @@ AUX qca-2.1.3-c++11.patch 3555 BLAKE2B 68b9e4a9e13543b2f98c564f19deef32090be25bb
 AUX qca-2.1.3-deps.patch 1040 BLAKE2B 4bf0179bf2383328dd97f365c433ee40a87e465b8c0b5396d4cfde07f27a4aedfa2d229900e630606fc43e5a5a35042ffce999f59401c34439e656b0b6f1bf0e SHA512 e20a3a06fef8415287d8837ea5fa2acf3ef60f8a1da6aec7c994987f63336e52ac2460fa76694b82b59f30aa1d59cd22decac246423adbef8ae1658a7f7db78f
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
 DIST qca-2.1.3.tar.xz 686340 BLAKE2B 60ebf9add907632ed17426ee53c6c35a9aed279a4492012f1c174608cbe9579d366feb7ff7bff551d2e9e4ef2f271e8f340fcb4c9e1f67f209657d388567d44f SHA512 0aec277e0695da2e45298f0a9006213829fe4c449a79969e472947db54f45000ba6e22361b782465bdc03f269b7301d318c843f5a83db459a118e58a03f3116a
-DIST qca-2.2.0_pre20180606.tar.xz 700756 BLAKE2B 0204854a664f211e9289cd4609938fd21e62de5bec5d7f5a99843a12483c960b6f8cc7392dc84bcf0676220411106bf7f23c5059d4f7031791fe9a3259d21d2c SHA512 78f9f8ebc726e95768034c580d5ac30933f7c06e026b7daad04f11477dc623e4267895e409f7830c5149e620876dcc524278ef569956d03820b0864d629c4df8
+DIST qca-2.2.0.tar.xz 691264 BLAKE2B 3b9196372c8a8f2e50a86a8a581a549d52a324cbfa919945683222d605747f7127af469a1de0310e24e823243ab4cd884a763b7baac94048e739f49d2a31dcbf SHA512 2a3f73bbd73ae8f74b2b4ec143bc010b7efaba267fc3349fc681623f29a288f69e5c457597f4964f88172a98e0a7eba6d2555675704d5d7026df794b8f772e69
+DIST qca-2.2.1.tar.xz 691676 BLAKE2B d5bcc0d6e791811e1efcdbf2e09916fe40ad682b0e59b2993c73a5bd79e09fc28facdec81259a982bee05223c8dfce78b9a6b729ca4e566c0901a13b91575379 SHA512 3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
 EBUILD qca-2.1.3-r2.ebuild 2180 BLAKE2B a74a2d7378bad48e8ad20c30ae91416b79e6f79393566e499a7821cf6fc904f6966c36751b285da4320da5a541fefadaf35df6df192ec4338dfc363323e20469 SHA512 ebca007f517945d9f26ca4fba9536418371013764c95f668774da8f23c1dce722ae1954e2e5505ea5b87446576ac757e2248f829ca515db7249c97d28e0d83b1
-EBUILD qca-2.2.0_pre20180606.ebuild 1976 BLAKE2B c5b041cf1e46a13e73cbbbfa3bf9ee5d96b34f2470350e5962fae6dbfa2d7c30a0c4ea9076d166be9c7009e13e1d1403d28d884d5ef2cd88a46b62167f23fcd6 SHA512 af861f7dd5d5ddfca835f7918c5c76c38bd1466db97df689e969bd3fb480f3ffe0fd431cdf6222f2249c4f35ff705148c719e970903bf20f0d1c40f21b4d9391
+EBUILD qca-2.2.0.ebuild 1966 BLAKE2B 53110260956c2d6dd55e52c5f5b28326bc95c4efb9a8a4584e87bf771a4c51fbf6881684e22afcd92078418ea7979f71754f86d379ca4845a2ac66e0d75cad88 SHA512 36d459adfc0d649e4e941566ad1a49e48f9dbb16bc83885c090ad64307999316d6e1abf4302a246e8e2db1a285562185dbe00ff95a08cfc570d42153718c4a14
+EBUILD qca-2.2.1.ebuild 1967 BLAKE2B a41078f18a95acc876566fda3d9a3018b5f1d8befc9cff5c6e1054f42a653cfd39f079430afb11e119d672c51048de2bb981b758585aeb78dbec21cd9122775b SHA512 ad17644227fb282cbcebb15510a070d283e5eb7e783f3bd7acf2611a7d7006ab7925d0e25017872f442259f22d97f5b0792cac28d818a83035a2732ba6dbdd37
 MISC metadata.xml 842 BLAKE2B 1732f7a0efeba7de6c54bfb817a69f9be88eab8bb37a75f5ee685ba7893ad9be13a10ea8b2a404954846e1ea73dc617d0a89ac3b1f69a83928275b9e8d5fc7ab SHA512 900de0e8b914d1970b3e4fcfbdbeea48c1e56ab596e6c959e4dce29a0fd0cb0b6969ab6899784a80b6c233a656f3a4501513d8af6b4acc8519a5ecf1c9a1a622
diff --git a/app-crypt/qca/qca-2.2.0.ebuild b/app-crypt/qca/qca-2.2.0.ebuild
new file mode 100644
index 000000000000..8454bdb8253a
--- /dev/null
+++ b/app-crypt/qca/qca-2.2.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils qmake-utils
+
+DESCRIPTION="Qt Cryptographic Architecture (QCA)"
+HOMEPAGE="https://userbase.kde.org/QCA"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	botan? ( dev-libs/botan:= )
+	gcrypt? ( dev-libs/libgcrypt:= )
+	gpg? ( app-crypt/gnupg )
+	nss? ( dev-libs/nss )
+	pkcs11? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+		dev-libs/pkcs11-helper
+	)
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-qt/qtnetwork:5
+		dev-qt/qttest:5
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )
+
+qca_plugin_use() {
+	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(qt5_get_mkspecsdir)/features"
+		-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(qt5_get_plugindir)"
+		$(qca_plugin_use botan)
+		$(qca_plugin_use gcrypt)
+		$(qca_plugin_use gpg gnupg)
+		$(qca_plugin_use logger)
+		$(qca_plugin_use nss)
+		$(qca_plugin_use pkcs11)
+		$(qca_plugin_use sasl cyrus-sasl)
+		$(qca_plugin_use softstore)
+		$(qca_plugin_use ssl ossl)
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc; then
+		pushd "${BUILD_DIR}" >/dev/null || die
+		doxygen Doxyfile || die
+		dodoc -r apidocs/html
+		popd >/dev/null || die
+	fi
+
+	if use examples; then
+		dodoc -r "${S}"/examples
+	fi
+}
diff --git a/app-crypt/qca/qca-2.2.0_pre20180606.ebuild b/app-crypt/qca/qca-2.2.1.ebuild
index a1d8e8ee44dc..d42db14e774d 100644
--- a/app-crypt/qca/qca-2.2.0_pre20180606.ebuild
+++ b/app-crypt/qca/qca-2.2.1.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils qmake-utils
 
 DESCRIPTION="Qt Cryptographic Architecture (QCA)"
 HOMEPAGE="https://userbase.kde.org/QCA"
-SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
diff --git a/app-crypt/scdrand/Manifest b/app-crypt/scdrand/Manifest
new file mode 100644
index 000000000000..02216e9cac8c
--- /dev/null
+++ b/app-crypt/scdrand/Manifest
@@ -0,0 +1,3 @@
+DIST scdtools-0.3.4.tar.gz 254227 BLAKE2B d2959d1be860b4809f4b20b5b3e2b06534bb49220b6818b4ac9c8e73751c31dfa4a6c0200cc6bbb33d4a627f0d55b1c3cefda3def6a78bde925a0c58d9c0429a SHA512 ff25f6360c9bd73e63cefd8fe37103dc1ef2528d87ddf7c1006e913c921e78569ff6f12096d1407bfabf626e73376f13e25f606f8c45cba79803689176801b73
+EBUILD scdrand-0.3.4.ebuild 725 BLAKE2B 4e17b08da3816d491153209c6bdec8eac2f3e81acc63134972b534fad2db20abd610a9bbb196de2a0407f35a34aff5edc5ac47bcf265be8ff245a9b2638c204e SHA512 297cc015cf40cceba7fea13b837b715698d9aaf61f9efb97efdd6ddaa0d5b82df2026686850620a99f42b35fa923897f26e7ddcbdd59a2ba499d22acc8e9d728
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-crypt/scdrand/metadata.xml b/app-crypt/scdrand/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/app-crypt/scdrand/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/scdrand/scdrand-0.3.4.ebuild b/app-crypt/scdrand/scdrand-0.3.4.ebuild
new file mode 100644
index 000000000000..a440b78d2180
--- /dev/null
+++ b/app-crypt/scdrand/scdrand-0.3.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=scdtools-${PV}
+DESCRIPTION="Feed kernel entropy pool from smartcard's TRNG"
+HOMEPAGE="https://incenp.org/dvlpt/scdtools.html"
+SRC_URI="https://incenp.org/files/softs/scdtools/$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libgcrypt:=
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:="
+RDEPEND="${DEPEND}
+	app-crypt/gnupg"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	emake -C lib
+	emake -C src scdrand
+}
+
+src_test() { :; }
+
+src_install() {
+	emake DESTDIR="${D}" -C man man_MANS="scdrand.1" install
+	emake DESTDIR="${D}" -C src bin_PROGRAMS="scdrand" install
+}
diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest
index 549d4ad99f88..7ccf9545b0ac 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 923 BLAKE2B 5b41073761b2f723dad67298cf38adffc6f26dc421bf754b7dc7e389f11413aa2237bd513fc5ad92e830d990776ce98c09be92be9ad85900bc76da4114040970 SHA512 a75a9b80eb674812cf64cfc4ec2d69bf3aac8b6393b3e91132e10372940128cdf32777c131550f448ab3123a7fc2c32d8dad7a5f9411094190dc3444b029be66
+EBUILD shash-0.2.6-r3.ebuild 914 BLAKE2B 7b44db079a04180feeda13b6a52753b44a902475dbcf121187d6b048cc024d0b706c7a55b1705319a377a2ee73d6ccbc424a3bc58eb22ccc6ea365d3b488d21f SHA512 f8f926aaec26a8338bd096ebdc1e6e19b6d641961b02d45535be4d714a46969396cb6406246a96e21ed7a80f17ae4e589677726f009adb6e17c5e30e487774d8
 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 44336b6724d6..ffbd2746044e 100644
--- a/app-crypt/shash/shash-0.2.6-r3.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~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 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/signing-party/Manifest b/app-crypt/signing-party/Manifest
index 983b5e9bebe2..bfb0f735b124 100644
--- a/app-crypt/signing-party/Manifest
+++ b/app-crypt/signing-party/Manifest
@@ -1,3 +1,5 @@
 DIST signing-party_2.7.orig.tar.gz 201320 BLAKE2B 4fe5781b610dc8acd5166fc7ce7daa1b856f6617952d5eb226cae0c8c6fcaa196b88ffe313b2d71b8f11423a81e84f2124d9adea86edbfb0d22808473d1c36fe SHA512 d1599ca0cb2dd554b4688bc8c77f4a1dd907d00539bb11abe147300dd2184f8548ebe9fdf793e83e2956a220b1c4bf9e19bd543b77f724b0c8ea4794ac945985
-EBUILD signing-party-2.7.ebuild 2968 BLAKE2B df347287636b0bfa29282094950cf6e5f0d95b205bac4882183a66608c5a92591479fda6fa2a9d5cc62c3127049f56f4bde99f5c105320e0d196624ad389ab81 SHA512 0762ee598cfeddbbb39a41d7b718bc1e3b03f2d5f6a347453b95ae15ea39736e9fd45ac217e05d10c8382037112a11ac7d7026a663b35797c26093a4ff06f67b
+DIST signing-party_2.9.orig.tar.gz 222606 BLAKE2B 5c7fd8fdb4945f3155d5dc146716ae402c72ec3cc728feb5b3d009878d88313ed26dbf4461820346bd3340ec84d9a439dfd52950452ad796bf1fbc98a342ff6a SHA512 31a0f15f679c0339753bafbac645609e9e16f3da2c5105c33e87e0f258453b3101f188398a7c1509fe5c005339289ac5465ccb18631a526d231c714f9ed61d96
+EBUILD signing-party-2.7.ebuild 2990 BLAKE2B 8abcd322db7149bf2eed60b099bd6cea5281d446148c61c75f59350fa8e718f637609aa91eaec4e5ae0a12d9edbb024bdb9820bf32b02f9cbe5b7e2de70029bf SHA512 31e56b7b2ce039a565b0010acf284a6aef90f479de63912bdcce72b4b2c27c896cfeed50c9e7096ed7ae3a2b9483953a1909e5a03c8f841adb4e7ace377a667c
+EBUILD signing-party-2.9.ebuild 2737 BLAKE2B 7d860f0f2fee0d4a6cdb3315a9d199612e242b5be946523d88215c9f348d13ea5baf0eadd6e1d5416aa479d800033c577c2dba9c2223332680e208c90e245082 SHA512 8b9635f04247682265ad0d7e728b150a65c80f75617393aad7af00466616acb8dab0075a5ae6a4f37a49b375d7a9537e9a6650041f42571916b34cb633785de5
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/signing-party/signing-party-2.7.ebuild b/app-crypt/signing-party/signing-party-2.7.ebuild
index 80217c2b8abd..4e555984e3e7 100644
--- a/app-crypt/signing-party/signing-party-2.7.ebuild
+++ b/app-crypt/signing-party/signing-party-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs autotools
 
 DESCRIPTION="A collection of several tools related to OpenPGP"
-HOMEPAGE="http://pgp-tools.alioth.debian.org/"
+HOMEPAGE="https://salsa.debian.org/signing-party-team/signing-party"
 SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-crypt/signing-party/signing-party-2.9.ebuild b/app-crypt/signing-party/signing-party-2.9.ebuild
new file mode 100644
index 000000000000..5f53d40d3deb
--- /dev/null
+++ b/app-crypt/signing-party/signing-party-2.9.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs autotools
+
+DESCRIPTION="A collection of several tools related to OpenPGP"
+HOMEPAGE="https://salsa.debian.org/signing-party-team/signing-party"
+SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="dev-lang/perl
+	app-crypt/libmd"
+RDEPEND="${DEPEND}
+	>=app-crypt/gnupg-1.3.92
+	dev-perl/GnuPG-Interface
+	dev-perl/Text-Template
+	dev-perl/MIME-tools
+	net-mail/qprint
+	>=dev-perl/MailTools-1.62
+	dev-perl/Net-IDN-Encode
+	virtual/mailx
+	virtual/mta
+	|| (
+		dev-perl/libintl-perl
+		dev-perl/Text-Iconv
+		app-text/recode
+	)"
+
+src_prepare() {
+	default
+
+	# app-crypt/keylookup
+	rm -r keylookup || die
+	sed -i -e 's#keylookup/keylookup##' Makefile || die
+
+	# media-gfx/springgraph
+	rm -r springgraph || die
+
+	find . -name Makefile | xargs sed -i -e 's/CFLAGS:=/CFLAGS=/' -e 's/CPPFLAGS:=/CPPFLAGS=/' -e 's/LDFLAGS:=/LDFLAGS=/'
+
+	sed -i -e 's/autoreconf/true/g' keyanalyze/Makefile || die
+	pushd keyanalyze/pgpring
+	eautoreconf
+	popd
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CPPFLAGS="${CPPFLAGS}" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		STRIP=true
+}
+
+src_install() {
+	einstalldocs
+
+	# Check Makefile when a new tool is introduced to this package.
+	# caff
+	dobin caff/caff caff/pgp-clean caff/pgp-fixkey
+	docinto caff
+	dodoc caff/{README*,THANKS,TODO,caffrc.sample}
+	# gpgdir
+	dobin gpgdir/gpgdir
+	docinto gpgdir
+	dodoc gpgdir/{VERSION,LICENSE,README,INSTALL,CREDITS,ChangeLog*}
+	# gpg-key2ps
+	dobin gpg-key2ps/gpg-key2ps
+	docinto gpg-key2ps
+	dodoc gpg-key2ps/README
+	# gpglist
+	dobin gpglist/gpglist
+	# gpg-mailkeys
+	dobin gpg-mailkeys/gpg-mailkeys
+	docinto gpg-mailkeys
+	dodoc gpg-mailkeys/{example.gpg-mailkeysrc,README}
+	# gpgparticipants
+	dobin gpgparticipants/gpgparticipants
+	# gpgwrap
+	dobin gpgwrap/bin/gpgwrap
+	docinto gpgwrap
+	dodoc gpgwrap/{LICENSE,NEWS,README}
+	doman gpgwrap/doc/gpgwrap.1
+	# gpgsigs
+	dobin gpgsigs/gpgsigs
+	insinto /usr/share/signing-party
+	# keyanalyze
+	# TODO: some of the scripts are intended for webpages, and not really
+	# packaging, so they are NOT installed yet.
+	newbin keyanalyze/pgpring/pgpring pgpring-keyanalyze
+	dobin keyanalyze/{keyanalyze,process_keys}
+	docinto keyanalyze
+	dodoc keyanalyze/{README,Changelog}
+	# See app-crypt/keylookup instead
+	#dobin keylookup/keylookup
+	#docinto keylookup
+	#dodoc keylookup/NEWS
+	# sig2dot
+	dobin sig2dot/sig2dot
+	dodoc sig2dot/README.sig2dot
+	# See media-gfx/springgraph instead
+	#dobin springgraph/springgraph
+	#dodoc springgraph/README.springgraph
+	# all other manpages, and the root doc
+	doman */*.1
+	dodoc README
+}
diff --git a/app-crypt/ssss/Manifest b/app-crypt/ssss/Manifest
index eface075ab79..4f166df118ae 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 757 BLAKE2B 54c1a67582ef0ab340dab68767d1196d3c97c584ccfedf313afb0b9efeae95a09d0a0f855f1fcfcd70bb5c2fdb8c14310ab7127799d97449708db936ac38d6e7 SHA512 9c862dbe07aee602cb8613622a6af6c2b0e777e46b85b6dd215013a47a15dd7a799587241d12005206c933982d9bcf92462cf26f5695889473502a9eef792d8a
+EBUILD ssss-0.5.ebuild 756 BLAKE2B 8aa8fe9974a7666852d3fe750a6b57afea9d0f3b3706437fcd60ec21898ccb8f58f1e2dfee51030760da1cc2478d60cf5162b5d51dd53e2966f561aec91cccd2 SHA512 e36f2aa2b51298ec2b45fc3457e6f9093aa11027eb78a3d13bd335b72690bef7db5a5658d4e607aa98cdbc4b121c52db4892d6fc8be85ff702929afddcc1246c
 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 55fa43d76cb2..949dc6fadceb 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"
 
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index af9f0bc0373f..aabdabaf4a72 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -2,8 +2,8 @@ DIST yubikey-manager-qt-0.5.2.tar.gz 337194 BLAKE2B d6020116b9082671c039b521bbee
 DIST yubikey-manager-qt-1.0.0.tar.gz 8038084 BLAKE2B 9e1082be62dab2d43bfad3050dd38dbcd10e5b8761bf567ba4f3e1b4627a25709cfa29ac7a23560fff76e0a75b4668932a407268c8d90d791c381ad485fea029 SHA512 2cf5f70b2734a7c0346649f5419dbee39bef9bb80bb498631d4879abc48d422d70468713a48945e284f2bdef20f3bb570a0ac5a4daab6c1ff195d86e39168843
 DIST yubikey-manager-qt-1.1.0.tar.gz 10893455 BLAKE2B d83f76b83f35380377beb0e5c5b4a605049211685ff3ec44f60c909f8bc8f60dcd0868ad666bebce13e7c0459f604dd5d77cb1bd01035fe8584c019aacca39e8 SHA512 b54f1e6908b190ccb9273b906ace9ce2e1d189b794ba9b0ae00dbda4808b3f376b37c5f010ae06eaa63515af9b48698499f87780c59394f8b80f35d64d599c59
 DIST yubikey-manager-qt-1.1.1.tar.gz 10893572 BLAKE2B 22c37332601986495da8c70d9867dc04ad565ea06b38e219ed465586d741ddcb177ada9d5f74c04b46ddd2a5b7c445f05c3055ba1fd61e0696226541dbfb2bce SHA512 e1460abf024f045bffff2cf17a1b8fde2eb508b99957198d8de251315684c9fd591a93b3ad8063da2509ab7f054dce40a4267c1cc97c9dcc734ee18215070fe8
-EBUILD yubikey-manager-qt-0.5.2.ebuild 1410 BLAKE2B 7da065e45b89bc70d7e3a577f9312bd6a955ad071fbc066c7401773fa9defe49aed871c3e4db7b6931309eff67a5a470014459a09c78568c159a582b9ae85d6c SHA512 d18d8da49e4080a2f84ac3ea1c800002d40eae7a584f35a430f3571a65b1e792b4e0f9275065dd392332d94998cd59c50183bf25bcfa310c3340adbb584c2376
-EBUILD yubikey-manager-qt-1.0.0-r3.ebuild 1478 BLAKE2B d2b6273e43c6e0361700f0eacd838ab4c46b8d7db99d368787d06b7bf43dd07841d33fcc27b4a19b07990b89d7c74c7647ac64e596110f9c33fe18fc463b75e5 SHA512 c16c40c10d98c491214dfe46678b08488041a3a26d8e155edc4749a8c66d36d4e3f84bbe693e858c10eee676c6b98c0789520de75e306d0827d1a0ca61adab4a
-EBUILD yubikey-manager-qt-1.1.0.ebuild 1369 BLAKE2B fe38abf93e1d1b2ff89714bc7d207631ed547332ff1d9d19ea748d4d91cfbf09066355491c19115a11e536823fdcc05b53e1815f755af6845262d5497f1560cc SHA512 8c921e8773daa11054c69427d4a52660c5925cc02051d611afdd460d77585be06c0b366935297d38e997b87887fc70b26f53ab61ce8d6de215926ac1393b9aca
-EBUILD yubikey-manager-qt-1.1.1.ebuild 1369 BLAKE2B c9d6766c3358bac0210ab56eaede7fbd6a3594482bbd0a78e725a4aed1a303dca8f78902b24517fcbdafc38c9776912ecb0959226bf2572b84b38bf8747cd9f8 SHA512 922bfa42ba63138d4048607c83e4cade444bf266502b22e0179a4438c0861454241680e1cc1026ebdbe10b20896a1c9ecaba4a9ba9fda687067e3523ed8d6553
+EBUILD yubikey-manager-qt-0.5.2.ebuild 1405 BLAKE2B 825ca31f82c7bb2eab94f261861b4e7505345fc2e45760b7cf83d89ca3eaeb511ffe103ac97fe0a2d27de62e17f2e6c3554e9bb5a62bbb1feb998f6b16c1381c SHA512 c5e52fb6ccbbee3134268f5c66b6fedef60fcd566f7f1876f75a5fb4299ba102f9ede4cfcbabde6c5904d5ac9ee14c058b2a886a3f1890f1ecc7f8966de7ffa0
+EBUILD yubikey-manager-qt-1.0.0-r3.ebuild 1476 BLAKE2B 2a1632a85ab7e4740c8f6e3e53a7600349799c4e64b0783d5820618ba002b15c37cb0c346a1d0fd71f21bdf5010942f41b4bfa9472c4d2719e122c5cf13b4814 SHA512 15a3194054cd23c67d1dbd0007a29590b6b679cf357991a30304b6fbc9d33f7dffa572767dfe7049323316b9243f4a32a6dcde04283497889cb34b0e90666306
+EBUILD yubikey-manager-qt-1.1.0.ebuild 1367 BLAKE2B 245db63afd23a6281eb21658870af734b11015594a98f14b54a2246253ec4a0227e5cbe2494b504ecd218ff7bdf9f17242c37942a61362ed2f7ba0edf6816ef7 SHA512 f83671edc4d9fbceb7c10be94864c1f0fc87d12202f88be8c47e78a50f5a56c2f48df65c91c4bc8dc56c5d9267a297f9ba030d0d6cebcb84f42037245ce62ab0
+EBUILD yubikey-manager-qt-1.1.1.ebuild 1367 BLAKE2B d72e899dd74cfd132b0bbce7b600a649993bc9baa31afbf2f3a28760b6f201ee8dd26227397a0bca81f2db9d256bb7bce6e8af5ac5c590e670f835b12ff00150 SHA512 1bef77007ed0c00cb412db9d5e68c454a9f64e45f95f18a34e99a6969cea454f093cdfd6d0675ac753e3913a95d93ba61dc479d7b60d3ce9a8fc3a833f6742a6
 MISC metadata.xml 371 BLAKE2B 1081e69aeb641c9d7de472bed98dfb336bc37e5374becbec4603316176419dcdb337f29b355b3395b778d250a99e32b181b84b42d4b7c10dedce7c47a6a187f6 SHA512 ed480648e967bfa3d95f71a5131963290e4265c487a345b69e34ad23c4ab18d82b08cd1e4a12f389533cc9690163fed90c05d471375fadd074c99a235105e837
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.2.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.2.ebuild
index 5ef5ff7b2493..d420feb341cc 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.2.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.2.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
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit eutils qmake-utils python-single-r1
 
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r3.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r3.ebuild
index c2fe40e47628..3f3125b92317 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r3.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit eutils qmake-utils python-single-r1
 
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.0.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.0.ebuild
index 54eda43c3b07..7c469b8c89a9 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.0.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit eutils qmake-utils python-single-r1
 
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.1.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.1.ebuild
index e8a772f902e7..7d4eb939e34c 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.1.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit eutils qmake-utils python-single-r1
 
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index eeea081a5e6b..a50ed28d4b15 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -4,8 +4,8 @@ DIST yubikey-manager-0.7.1.tar.gz 71834 BLAKE2B 45b0366531c8a158b3d8ebcfa8b76d60
 DIST yubikey-manager-1.0.0.tar.gz 90653 BLAKE2B 5d8522181ad460521995d3cae63976e06a444816a24efdc83b526d50262c902c8cc76b29d43f6f07725ee714666c853b690f1dd6fe98c9409f0cc1e722ada6f5 SHA512 9fd1926bf4e2c1278a42136a05db3e5fe0b7cb3d740f601fd0a420ab851badb61c2dd165157ac5b1f47e934f771b9d0b3cca4e07d1772d0f743556d482f77c11
 DIST yubikey-manager-2.0.0.tar.gz 102078 BLAKE2B a2b8f90dabefb1014881cbe709222bf5cb48c9f409b415a8a2b27d7101c2da6189d0ebfe21a2701d10798c48c44e546659f9424ba6bf9257f7311abb0fc90b9b SHA512 42bebb88ba78bcce00a228109d0b4c815b3242ddbe43fd26c1209ba8666eb033ab77d5acd39a157e8310ce327de8d38bf88cfa0ffaed6273236b220c39e72e3b
 DIST yubikey-manager-2.1.0.tar.gz 132797 BLAKE2B 39a170901dd10443f7cd639d1f525b12074ed042f606c083fe5b1bf04f463f608c4968c1e7f06dd057ff519a2a4bf712d36643e7db164ef92a3152ea5fb7ae15 SHA512 05cc1a106ffd2b40bc0a1286fa2f9c19f022bc7db04b85c9aaab3c67cad92a0c8ee4ba70f9b62ffa7f02ce67525a7d5f03bf9160b9bbe38909232cf75eb39373
-EBUILD yubikey-manager-0.7.1.ebuild 1579 BLAKE2B 65991c1ec1c6acc26baac225043924eb7dd5fdcad0e99d8ba26931ef9da0318dd47ca9a5f602c75c3fb35eedfc0a275695231b5a03e191c9c30a323ef89bf95a SHA512 d24bd03dc385339b96e36fc8056e4044233b784ad73a9464ae2eb797d5ac48bef907e3c27a63125c34c41b8578f8a98c03f9b3cc18db263c3ad656724f532ba3
-EBUILD yubikey-manager-1.0.0-r1.ebuild 1529 BLAKE2B c6e82a3279aa4ea3a179df00c95f53d41626ff825b9c0e43da9670fd724ac8e3156ef54056b2b70c951dd73e0d8b4bc5594cedea16270e034a6cbd92233cfc8c SHA512 ccae1748ac051677ff46517a88e18affaadda2508dd05c261a0a0377d7f75cbdaaa5b114c70a74e5195ce8c9624cdb820c3f883dcd1be74f8046472614ba453c
-EBUILD yubikey-manager-2.0.0.ebuild 1680 BLAKE2B b5611488508853e8e52055270968136d6ec06e533cb9999da0648d0c65fe78a82ea26bf3705ac24b0d1d57d700d0d28794b1538fed0ebbf4436be4c2da9038ba SHA512 582b5c234bb9e801ec1f10d819c2897b3edb11b708d211d367ad1218e76e882c7170bfec9e6099bf1401bebcc6c8cc86e3b3e15135790dee9e89071707b89038
-EBUILD yubikey-manager-2.1.0.ebuild 1535 BLAKE2B 40f154c5ce3e87b7c21febf1f2bd12842695b97466f027cb53468cada65b3160db48e6f9760d920d07024ce3fab86b5088f113fd78754b02537b4040670fbec7 SHA512 9405cd372bb47d080bc152532ef6e7b5f9acd5e87287c1cfdb201a292920b648691acf1ddf712d1e948df7a2a138f09f263484d573574ab3a4e083d05914c034
+EBUILD yubikey-manager-0.7.1.ebuild 1574 BLAKE2B 3795fb4b15e9755e8c300631f8925302e6d2424e0fa41db5b0fac47dc5c6026ece423ce16d5ee4fed84be36f333ee0c6bf83116c2d304537ed8b0115c9842d77 SHA512 325b0e4278dcb1b9d12cf9d8b4a7b821a76e817706f1bbc96414edeaeca1d848022feef633881f145b276037302017f312f47fb82f499f403ba98f515656c3a3
+EBUILD yubikey-manager-1.0.0-r1.ebuild 1527 BLAKE2B a196e407ab7ecb5e8962b74d6f57c954afb4a8bc914097cff9377bd8eea682a415712718f2eb85e185631a2d04e3454869e4877effdecb5ead72f38401a00686 SHA512 462628ac751272d98b61da9c4aeef2f0c3ff0ef9fe094852dba92c3e6c364f42de68ea2789d31cf017c097198d0ce4b6132bc2d33de284fcae97828bfe020819
+EBUILD yubikey-manager-2.0.0.ebuild 1678 BLAKE2B 519239065e438c2a3f0e97a716ee495cbf770d73b12dda8bfd90df1d943236e1c5b0a20c767ced6e5a0c7c771af829e1dc849a0b57bf86a74f79e1e6613ca89f SHA512 61582c69457763de6fe944e901cc9c9d97324b626f69dae985ac623c6d1e7ea7f7d9034f482748c4ad363745daa29d52d7639067ce4409ee8ff0c0a0a596e589
+EBUILD yubikey-manager-2.1.0.ebuild 1533 BLAKE2B 93c2a2dcb1e14699c11a36c771914b0915e4f41e887d2acbaa9c7372a762e0940528da47014a261e938acd2475f599c49841b0efd4e77b0327f6bd6cfb54b69e SHA512 d3233a47e12e149b97184538cb3797db980100378bf2eb2d23a852660c47f3757d6cc36deab88f82fad991df0b076d4e6f6c1800adf98810d8f8f7c90cbbb57f
 MISC metadata.xml 466 BLAKE2B 258688bf55e0d7d5d13a45996c2177d2154626a75ffd0c5b39cbc5c3f83979a00ec1d9a993870c00785d0e1d02cdeb1dadfa38f39d91b5992c5b495f644c6253 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b
diff --git a/app-crypt/yubikey-manager/yubikey-manager-0.7.1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-0.7.1.ebuild
index d1c0a714a0a5..92ae4418160e 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-0.7.1.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-0.7.1.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
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 inherit readme.gentoo-r1 distutils-r1
 
 DESCRIPTION="Python library and command line tool for configuring a YubiKey"
diff --git a/app-crypt/yubikey-manager/yubikey-manager-1.0.0-r1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-1.0.0-r1.ebuild
index a92231ecbaeb..13566d6483a4 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-1.0.0-r1.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-1.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 inherit readme.gentoo-r1 distutils-r1
 
 DESCRIPTION="Python library and command line tool for configuring a YubiKey"
diff --git a/app-crypt/yubikey-manager/yubikey-manager-2.0.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-2.0.0.ebuild
index 48998431ea98..bdb00c048da5 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-2.0.0.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 inherit readme.gentoo-r1 distutils-r1
 
 DESCRIPTION="Python library and command line tool for configuring a YubiKey"
diff --git a/app-crypt/yubikey-manager/yubikey-manager-2.1.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-2.1.0.ebuild
index 30b5eadeab70..1fe93622d5c9 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-2.1.0.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 inherit readme.gentoo-r1 distutils-r1
 
 DESCRIPTION="Python library and command line tool for configuring a YubiKey"
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /app-crypt
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)