gentoo resync : 18.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
commit: fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree: 326613a08f25851c388715e205576a2e7d25dc4f /app-crypt
parent: b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)
60 files changed, 434 insertions, 1517 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 2f4b2d0ab427..4e62b867f6ee 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index b4845f3e506d..c490b2d76cce 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,6 +1,6 @@
-DIST certbot-0.35.0.tar.gz 1333065 BLAKE2B 8bd4fd735e68f24ee7c0533b18b63e2924eab9dcef78250f5d7094fbb04f78acca1c11cefae48e25da637a01a7dcd004f22926923b63a39206b63133193793a1 SHA512 ca94858aca5c6849dd6667d1e96389d80a7882de9a4deeda28d244ac105c1524dddb100dc899e4fabdef908607956617e26640b8e573b04a0625e19413c23bee
 DIST certbot-0.36.0.tar.gz 1322339 BLAKE2B 69fbf68b5dd95d6d3ac6c868d583da8c66dfcd01e3471c511d0d9d95de08ac096479733e9fca12ca99abf43484835fa7184dcccb1c11a41ee7948174364f2894 SHA512 f7fa8c6200a76b4fc4830865bf11fbba8bd73ea55e1236680181073952505c83b4650b43ccfc8e9b96caf47b85c43e47acf8db6d92134f7c279ebd954ab0ac92
-EBUILD acme-0.35.0.ebuild 1721 BLAKE2B 26118df6502f483bbeb7e0a213ebd5f4ba759712acbc3d99acb5d5452364707d14dbb443bcaed7f118cac84c2e3276b8cc8df5fa9b40fe06ed700ca11277d1db SHA512 4501fe5c2ce4a63b86e4a3898a8db9e5d488e1e00f32b58af36e79a86f35ba399001c630eb3113d764740c62cdc66e212ab8594dc961009c7d0e11bf675e44d3
-EBUILD acme-0.36.0.ebuild 1723 BLAKE2B a5abd27f54ec47307fa0ced1cc3ae85c9747195848709ca395ae4a64f962ea2c0787b82eabf39ca5598bbc67abf51a05e473d390c8ca367989e6f871498a1653 SHA512 9a2ab0cdcfbc81bf6fb9e32de5449264579257f5ac185f80e4f83607bbc99730996cb16d4276005fa5cfe3b31df2a0db310ebf3fa25b6c631675d408a040dcb2
+DIST certbot-0.37.0.tar.gz 1327246 BLAKE2B 917360ab6d9dedd6e5ea2c558822c228ff34617f97341b7d176e69f7589a3aa3012f1d9abdb33b72960c68a80b29987d1a7b1121eadd7d93adec5829b316f326 SHA512 3f2df5f591ba241719fe2e5e90c2b87e2d932d991d943eefbe00b9d76f7fb056d3b6026879511f591473c698b798e78645879f018a78e503b8a06280b036cb35
+EBUILD acme-0.36.0.ebuild 1721 BLAKE2B 26118df6502f483bbeb7e0a213ebd5f4ba759712acbc3d99acb5d5452364707d14dbb443bcaed7f118cac84c2e3276b8cc8df5fa9b40fe06ed700ca11277d1db SHA512 4501fe5c2ce4a63b86e4a3898a8db9e5d488e1e00f32b58af36e79a86f35ba399001c630eb3113d764740c62cdc66e212ab8594dc961009c7d0e11bf675e44d3
+EBUILD acme-0.37.0.ebuild 1723 BLAKE2B a5abd27f54ec47307fa0ced1cc3ae85c9747195848709ca395ae4a64f962ea2c0787b82eabf39ca5598bbc67abf51a05e473d390c8ca367989e6f871498a1653 SHA512 9a2ab0cdcfbc81bf6fb9e32de5449264579257f5ac185f80e4f83607bbc99730996cb16d4276005fa5cfe3b31df2a0db310ebf3fa25b6c631675d408a040dcb2
 EBUILD acme-9999.ebuild 1723 BLAKE2B a5abd27f54ec47307fa0ced1cc3ae85c9747195848709ca395ae4a64f962ea2c0787b82eabf39ca5598bbc67abf51a05e473d390c8ca367989e6f871498a1653 SHA512 9a2ab0cdcfbc81bf6fb9e32de5449264579257f5ac185f80e4f83607bbc99730996cb16d4276005fa5cfe3b31df2a0db310ebf3fa25b6c631675d408a040dcb2
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-0.36.0.ebuild b/app-crypt/acme/acme-0.36.0.ebuild
index 3acd37f75f8e..9a9b63c8fa3c 100644
--- a/app-crypt/acme/acme-0.36.0.ebuild
+++ b/app-crypt/acme/acme-0.36.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-0.35.0.ebuild b/app-crypt/acme/acme-0.37.0.ebuild
index 9a9b63c8fa3c..3acd37f75f8e 100644
--- a/app-crypt/acme/acme-0.35.0.ebuild
+++ b/app-crypt/acme/acme-0.37.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 3c3eeb332861..41522893f7c1 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,6 +1,6 @@
-DIST certbot-0.35.0.tar.gz 1333065 BLAKE2B 8bd4fd735e68f24ee7c0533b18b63e2924eab9dcef78250f5d7094fbb04f78acca1c11cefae48e25da637a01a7dcd004f22926923b63a39206b63133193793a1 SHA512 ca94858aca5c6849dd6667d1e96389d80a7882de9a4deeda28d244ac105c1524dddb100dc899e4fabdef908607956617e26640b8e573b04a0625e19413c23bee
 DIST certbot-0.36.0.tar.gz 1322339 BLAKE2B 69fbf68b5dd95d6d3ac6c868d583da8c66dfcd01e3471c511d0d9d95de08ac096479733e9fca12ca99abf43484835fa7184dcccb1c11a41ee7948174364f2894 SHA512 f7fa8c6200a76b4fc4830865bf11fbba8bd73ea55e1236680181073952505c83b4650b43ccfc8e9b96caf47b85c43e47acf8db6d92134f7c279ebd954ab0ac92
-EBUILD certbot-apache-0.35.0.ebuild 1078 BLAKE2B f6202405b2f3d32dc26c85adc764f6e42b439f913636e779b7f176f5f4b4eaa50ec89227db22f244560f0ac8a47e45f8e73a459dfce93f9f2ae13e1b3adce372 SHA512 272fe8be7e2edb704150dd844fb499e116ea26c836a182f326e3d4706cd8d72565f5d33ad7a7e4841fee669df631f16028656f9390962a727b513c279d4c76fb
-EBUILD certbot-apache-0.36.0.ebuild 1080 BLAKE2B d619b7b78385f52863109318365b53a5787e5c2c64bbd26cbbd735f81971b6703fd8c0367bae1d55d44f9f6782157ade26aa19d5643f078b1146d0c0f67576d7 SHA512 b158899197ccc0e9c145f90f92fa4f48ca71c2781fece4185ae1dbd01f943dd75ab3a05ef58f83558c3da7108364af094eed6d008945f9c011b80357d2d8b741
+DIST certbot-0.37.0.tar.gz 1327246 BLAKE2B 917360ab6d9dedd6e5ea2c558822c228ff34617f97341b7d176e69f7589a3aa3012f1d9abdb33b72960c68a80b29987d1a7b1121eadd7d93adec5829b316f326 SHA512 3f2df5f591ba241719fe2e5e90c2b87e2d932d991d943eefbe00b9d76f7fb056d3b6026879511f591473c698b798e78645879f018a78e503b8a06280b036cb35
+EBUILD certbot-apache-0.36.0.ebuild 1078 BLAKE2B 343724712d023a476aadeec34ee957e3f9b0e4014731534fba8969c1f1994690d729f2546f52b94241974b74baa8bce4ae26a395f5ab3b32eb55d8dc942c5b63 SHA512 882e967cdf08915c31091b2cccbf2344c15050a95c3624e33d6e3cfd41baefa1c202c43e7e0e8c800cfc2eb298f3b7fa2bf06ee2d83f915ed88e5d578f096af6
+EBUILD certbot-apache-0.37.0.ebuild 1080 BLAKE2B d619b7b78385f52863109318365b53a5787e5c2c64bbd26cbbd735f81971b6703fd8c0367bae1d55d44f9f6782157ade26aa19d5643f078b1146d0c0f67576d7 SHA512 b158899197ccc0e9c145f90f92fa4f48ca71c2781fece4185ae1dbd01f943dd75ab3a05ef58f83558c3da7108364af094eed6d008945f9c011b80357d2d8b741
 EBUILD certbot-apache-9999.ebuild 1080 BLAKE2B d619b7b78385f52863109318365b53a5787e5c2c64bbd26cbbd735f81971b6703fd8c0367bae1d55d44f9f6782157ade26aa19d5643f078b1146d0c0f67576d7 SHA512 b158899197ccc0e9c145f90f92fa4f48ca71c2781fece4185ae1dbd01f943dd75ab3a05ef58f83558c3da7108364af094eed6d008945f9c011b80357d2d8b741
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.36.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.36.0.ebuild
index 5ac928afccf9..af3177274026 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.36.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.36.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-apache/certbot-apache-0.35.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.37.0.ebuild
index c2457408e80e..5ac928afccf9 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.35.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.37.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE="test"
 
 RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-0.34.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.36.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 196b1da2b4a5..de570e251bc9 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,6 +1,6 @@
-DIST certbot-0.35.0.tar.gz 1333065 BLAKE2B 8bd4fd735e68f24ee7c0533b18b63e2924eab9dcef78250f5d7094fbb04f78acca1c11cefae48e25da637a01a7dcd004f22926923b63a39206b63133193793a1 SHA512 ca94858aca5c6849dd6667d1e96389d80a7882de9a4deeda28d244ac105c1524dddb100dc899e4fabdef908607956617e26640b8e573b04a0625e19413c23bee
 DIST certbot-0.36.0.tar.gz 1322339 BLAKE2B 69fbf68b5dd95d6d3ac6c868d583da8c66dfcd01e3471c511d0d9d95de08ac096479733e9fca12ca99abf43484835fa7184dcccb1c11a41ee7948174364f2894 SHA512 f7fa8c6200a76b4fc4830865bf11fbba8bd73ea55e1236680181073952505c83b4650b43ccfc8e9b96caf47b85c43e47acf8db6d92134f7c279ebd954ab0ac92
-EBUILD certbot-nginx-0.35.0.ebuild 1012 BLAKE2B a51b087a4d449a43ebe99b1fe15968664a591e20d9aef664c35ec2ff2241017a37ccb1c8fdabb4a4fde9b820ed2a231ef3d4a059657d8b37d08caa5210d0ceb6 SHA512 55f3b3726e531bc885ce88003f438650bc42c9ccc8f09f811ef573538fa435d0b55d9d58b68de97ca084cc0bdd1f8e3c7c39784bf1a3ad9ab7999fe5b182f790
-EBUILD certbot-nginx-0.36.0.ebuild 1014 BLAKE2B c424ab9e7f11ad23e128e0a9876359ebdea32746a810380e17acd108bec3920b3ed8b48992446b0a1a4bf704f8dd07e20006fcdb7ca26338bdee85b0ac1676b2 SHA512 ebeb6165a82c28105a65032c47ef92999df3aae3aa75bb9374405f58918743f983802ac8b62945eb2c93b3183a7065f36bdebd1d50ebbb94ef4a7ebca9ea1e63
+DIST certbot-0.37.0.tar.gz 1327246 BLAKE2B 917360ab6d9dedd6e5ea2c558822c228ff34617f97341b7d176e69f7589a3aa3012f1d9abdb33b72960c68a80b29987d1a7b1121eadd7d93adec5829b316f326 SHA512 3f2df5f591ba241719fe2e5e90c2b87e2d932d991d943eefbe00b9d76f7fb056d3b6026879511f591473c698b798e78645879f018a78e503b8a06280b036cb35
+EBUILD certbot-nginx-0.36.0.ebuild 1012 BLAKE2B 8864a6365c3f686de1965966f66b96adf3b23cef9020f52e5b207e70b25c54e966cab2175904143a353788d1cddd875b9d4bdf53f2b0e599283a6dad1e4bfafa SHA512 44b9b9b2786e8d3aef042961130897d6d18b20d0975e65ae8f4e765ba52dbc3fe9045cf4c8dfe52a807e2932794862593e94c35e1e5c6e18b377bad3727c5756
+EBUILD certbot-nginx-0.37.0.ebuild 1014 BLAKE2B c424ab9e7f11ad23e128e0a9876359ebdea32746a810380e17acd108bec3920b3ed8b48992446b0a1a4bf704f8dd07e20006fcdb7ca26338bdee85b0ac1676b2 SHA512 ebeb6165a82c28105a65032c47ef92999df3aae3aa75bb9374405f58918743f983802ac8b62945eb2c93b3183a7065f36bdebd1d50ebbb94ef4a7ebca9ea1e63
 EBUILD certbot-nginx-9999.ebuild 1014 BLAKE2B c424ab9e7f11ad23e128e0a9876359ebdea32746a810380e17acd108bec3920b3ed8b48992446b0a1a4bf704f8dd07e20006fcdb7ca26338bdee85b0ac1676b2 SHA512 ebeb6165a82c28105a65032c47ef92999df3aae3aa75bb9374405f58918743f983802ac8b62945eb2c93b3183a7065f36bdebd1d50ebbb94ef4a7ebca9ea1e63
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.36.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.36.0.ebuild
index c4f2df8684e9..73497ec2cbd3 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.36.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.36.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.35.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.37.0.ebuild
index 4f434ea7fe48..c4f2df8684e9 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.35.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.37.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
@@ -26,7 +26,7 @@ IUSE=""
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
 	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-0.34.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.35.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index ed32a2e8a172..be0e4a9565df 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,6 +1,6 @@
-DIST certbot-0.35.0.tar.gz 1333065 BLAKE2B 8bd4fd735e68f24ee7c0533b18b63e2924eab9dcef78250f5d7094fbb04f78acca1c11cefae48e25da637a01a7dcd004f22926923b63a39206b63133193793a1 SHA512 ca94858aca5c6849dd6667d1e96389d80a7882de9a4deeda28d244ac105c1524dddb100dc899e4fabdef908607956617e26640b8e573b04a0625e19413c23bee
 DIST certbot-0.36.0.tar.gz 1322339 BLAKE2B 69fbf68b5dd95d6d3ac6c868d583da8c66dfcd01e3471c511d0d9d95de08ac096479733e9fca12ca99abf43484835fa7184dcccb1c11a41ee7948174364f2894 SHA512 f7fa8c6200a76b4fc4830865bf11fbba8bd73ea55e1236680181073952505c83b4650b43ccfc8e9b96caf47b85c43e47acf8db6d92134f7c279ebd954ab0ac92
-EBUILD certbot-0.35.0.ebuild 1362 BLAKE2B d215d662ab3473887174293b851fba1665994db257c7bb76a80a5bca35fafa4069f65e141e7671ec4bd3037a8288fac0a55bad048df02d53e2eb933278b41465 SHA512 18717cf683386bf8b58bb401a26f4fe279da6ccbc176257df29fa21c7776ad443931c8dd109cdc3832333062d18ac842a5f3db6bfd2bb7a3829f512d55269603
-EBUILD certbot-0.36.0.ebuild 1366 BLAKE2B 81a7df13ee1e1abcb0dfff63995fb752a5e0a3d6bebebf45ea11f476715ed96e5417fd667dd5f4faf0ad446649ad03e4c45be33b035cfecbe023aa2a1044e1d2 SHA512 2bac9490ac0be45fd39696c5befc5f63436a6d8f6238fba0ba1ec07a1a892f3887f49ed23499df4e07bd712666bd579d9d035358bbd70465a7ff2fb4231dea0d
+DIST certbot-0.37.0.tar.gz 1327246 BLAKE2B 917360ab6d9dedd6e5ea2c558822c228ff34617f97341b7d176e69f7589a3aa3012f1d9abdb33b72960c68a80b29987d1a7b1121eadd7d93adec5829b316f326 SHA512 3f2df5f591ba241719fe2e5e90c2b87e2d932d991d943eefbe00b9d76f7fb056d3b6026879511f591473c698b798e78645879f018a78e503b8a06280b036cb35
+EBUILD certbot-0.36.0.ebuild 1364 BLAKE2B ab2063ceac5ae1024f2b8ac83c01825fa230f8f34aa1d75f56543e699493b8db8b6baad88c465530c649d80cafec64037333c97c18ebf5ef69012178ee33e1ff SHA512 2cf17f2e0506c4e34db9aa2174fd222d3d74f3bd40f35d2e3ee9c40f8e51e610f850d89535eaf1c24be07ad9619e1671fa46eaa3da88feb43273eaf97b814b16
+EBUILD certbot-0.37.0.ebuild 1366 BLAKE2B 81a7df13ee1e1abcb0dfff63995fb752a5e0a3d6bebebf45ea11f476715ed96e5417fd667dd5f4faf0ad446649ad03e4c45be33b035cfecbe023aa2a1044e1d2 SHA512 2bac9490ac0be45fd39696c5befc5f63436a6d8f6238fba0ba1ec07a1a892f3887f49ed23499df4e07bd712666bd579d9d035358bbd70465a7ff2fb4231dea0d
 EBUILD certbot-9999.ebuild 1366 BLAKE2B 81a7df13ee1e1abcb0dfff63995fb752a5e0a3d6bebebf45ea11f476715ed96e5417fd667dd5f4faf0ad446649ad03e4c45be33b035cfecbe023aa2a1044e1d2 SHA512 2bac9490ac0be45fd39696c5befc5f63436a6d8f6238fba0ba1ec07a1a892f3887f49ed23499df4e07bd712666bd579d9d035358bbd70465a7ff2fb4231dea0d
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.36.0.ebuild b/app-crypt/certbot/certbot-0.36.0.ebuild
index c55679793511..4ed99381a016 100644
--- a/app-crypt/certbot/certbot-0.36.0.ebuild
+++ b/app-crypt/certbot/certbot-0.36.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 inherit distutils-r1
diff --git a/app-crypt/certbot/certbot-0.35.0.ebuild b/app-crypt/certbot/certbot-0.37.0.ebuild
index 13fbbb720700..c55679793511 100644
--- a/app-crypt/certbot/certbot-0.35.0.ebuild
+++ b/app-crypt/certbot/certbot-0.37.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 inherit distutils-r1
@@ -27,7 +27,7 @@ RDEPEND="
 	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
 	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index d618940b1dd5..68b7601afed7 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -1,10 +1,9 @@
 AUX 1.7.0-Make.rules.patch 296 BLAKE2B ca12dbe2f0bb60cffcbe2646a99f421e1f7f9d3b9eab0c96481cbbcfe064efc81afb25e8819746051e3f47b325eb97d213b7ebf95df60a195a5d16d68332f42d SHA512 a8d6245b09e80e2c9082589e62c2687234ee7838d19255e07aadfd05ddffdb1817e38eac434e71d5f0e19b7f9a88a51126349ae4aa324a634769050dbf433f0d
 AUX efitools-1.8.1-libressl-compatibility.patch 495 BLAKE2B 8c4aa46f422012b36601cac7d797a7e0de7ca3bc59d5799f1a63b6f6a8ac0a2edf87b50ecc4bc9eba21778ceab3e4fab23280dde92b2ce6e8294268a2886f720 SHA512 27a5331f00fc3d8f18187120940b6e46c6267c0478663378a28c5beb80a761422162e002836a4f0db096a6386cbb2e2c5e328e9355638aab82b9556c992b9e0f
-AUX efitools-1.9.2-libressl-compatibility.patch 495 BLAKE2B 8c4aa46f422012b36601cac7d797a7e0de7ca3bc59d5799f1a63b6f6a8ac0a2edf87b50ecc4bc9eba21778ceab3e4fab23280dde92b2ce6e8294268a2886f720 SHA512 27a5331f00fc3d8f18187120940b6e46c6267c0478663378a28c5beb80a761422162e002836a4f0db096a6386cbb2e2c5e328e9355638aab82b9556c992b9e0f
 DIST efitools-1.7.0.tar.bz2 96042 BLAKE2B b0042df906282d878b1400c359c1eece24588f5df7ab753b62f5f0b95e97467cfaa17e04a2ef40a7ec85155c4d13bd438dd94471e0ec98ab23030dd54e7d4214 SHA512 1e839c5565b0a113569cf47bf98d656875f9a127b481287a553e8b1276969021e1a39a730b9ede3852e15d1ac045db7ec64767f5ac71a24567236c0938697ccb
 DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0 SHA512 114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a
 DIST efitools-1.9.2.tar.gz 116037 BLAKE2B b3540932eb112e362fd0eed47090360603807dcaec8c6a10058618f8252eeb5dcbbd703d313cb6fadae62c1312815080cf2c77fc86f9dfc9f9afca24ad97f584 SHA512 77e0ad7e865814ed388ff6daabe0f4b49ba51672bf2cbb98b7905e209cbd28f9ede2f73213ce45af8a978c1e67dba24ec88a1188661317cc22317b47e575cde8
 EBUILD efitools-1.7.0.ebuild 787 BLAKE2B 9c2daade67b20bb4fb7b38413ff174695a40889e509c0828f68fc8d1eb1a0d0c7ed2cdc32d05608cff53317c4ca4db3133ec041cb86ffdac2b1d1287c00c3043 SHA512 66b40139afd0f071db68891152a25c9d6993be948e100817b26eb3fa547d09580bd4e9bfff8916c58a7f2bd38bfe4221edd1452d58a59e251629f5689f88740e
 EBUILD efitools-1.8.1.ebuild 1349 BLAKE2B ffc55485773daf9bfab8069f8c6b1cce41daef3bcd6d5df82868aeec8e0c8fc83f69b2b4cf9565b66f8e03ada9042637902d54516772ff850d79c17423c595b4 SHA512 e686d262e3973b1fe727d960d3b97bb284b1d3795644a2dccb89204b377db0e30d2b435174ed5d622f00da2256994a4c997fe92fdc2954dfe1964d25a1ab0ef5
-EBUILD efitools-1.9.2.ebuild 1346 BLAKE2B 15af826971a8805c6c106e501a3cc8272225e6a845423a5650561893edbf8ca7ccc9508133b4cdd74b017e038de661338e1b38764196395f908aa6462b31289e SHA512 c57ea1a4632e51e08c5504a82309d09c024af21807f04c9cda4676e27e6b1537848ddf604c1fd624b7cfcc4bd13bdfa083fc4b81ebc55d336f23213647cb7d05
+EBUILD efitools-1.9.2.ebuild 1352 BLAKE2B 11335277bff81f0a7cbca7626b0951c835e781afdef9db2ac56e8163f16b67afbbe4db692bde9defbc2d442ab30f30207acf4d9d69f3bf2c10e3a1b96474b626 SHA512 336c0495a76a0ddae566708b637aaa69708ad3d86d90ba111cb1e59e3a53edaa33232bea59f1e4e99cf6ecd9448dc40cf2ed63d0a02e3aa18aeb0ae1387a7dba
 MISC metadata.xml 217 BLAKE2B 42ce05c77b1d33a62b5cd9e26a0dbc801edf537bd1482da9f3680a430e3714cd9adea45649fd6bec858e3de1863d0c855451ae8fe1e4b8aa2c6b2ae9a8e343a3 SHA512 b9ca3681462c901c78bdc3ee840596fb6f5151d6b555abd1b74c570fa83e9b5b964cc0988538c892bbf70d2963add9d39af56a6fe353ca7641a6f3aede49be82
diff --git a/app-crypt/efitools/efitools-1.9.2.ebuild b/app-crypt/efitools/efitools-1.9.2.ebuild
index d7fc14afab88..542f32ac0915 100644
--- a/app-crypt/efitools/efitools-1.9.2.ebuild
+++ b/app-crypt/efitools/efitools-1.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snaps
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="libressl static"
 
 LIB_DEPEND="!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/1.7.0-Make.rules.patch"
-	"${FILESDIR}/${P}-libressl-compatibility.patch"
+	"${FILESDIR}/${PN}-1.8.1-libressl-compatibility.patch"
 )
 
 src_prepare() {
diff --git a/app-crypt/efitools/files/efitools-1.9.2-libressl-compatibility.patch b/app-crypt/efitools/files/efitools-1.9.2-libressl-compatibility.patch
deleted file mode 100644
index 876baae16f81..000000000000
--- a/app-crypt/efitools/files/efitools-1.9.2-libressl-compatibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cert-to-efi-hash-list.c	2018-04-21 20:59:24.814748503 +0200
-+++ b/cert-to-efi-hash-list.c	2018-04-21 20:59:51.868581307 +0200
-@@ -135,7 +135,7 @@
-         X509 *cert = PEM_read_bio_X509(cert_bio, NULL, NULL, NULL);
- 	unsigned char *cert_buf = NULL;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	int cert_len = i2d_X509_CINF(cert->cert_info, &cert_buf);
- #else
- 	int cert_len = i2d_re_X509_tbs(cert, &cert_buf);
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 11f019c5c5a4..d5342a938fb6 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,6 +1,7 @@
+AUX eid-sign-test-4.4.19.patch 8320 BLAKE2B c2295a64a5353f79ea44703b7256f667b5c6dc21eb74b0cfb6945572d0323d751ca8104ae981ae83759267081b6a16509cde3e8f5ad35b1a6613855461880c18 SHA512 01efa77441982a631e717a1bf720155bd38144cbe9e5b9cc192bdfa7ea3966b787e31a25a7e3c7d560fec30b19edeb662f6ab1db2d68b0a5b996af3c91342ec4
 DIST eid-mw-4.4.1.tar.gz 7708697 BLAKE2B 7bdbaa37af1cdd5a8abd1519939f663c7c871cea49850932d97c391465de362885b061c024285ab2690473a4bb1ba57a70fdc12a720246b2a610ac9525f6395e SHA512 9de54858ac052eeff101070dd11c5cf60ab1d29b8dc8d946680745acf9aa6ba1044ca5451eca6066b5b467fbc32a2a23bbe7e8551ca7559e6003a4097a304cfc
-DIST eid-mw-4.4.11.tar.gz 7975630 BLAKE2B e7b052736cba98c53e97e9de15ea8e54f508c28471a7a936c5d28539648f5d3454983d9c9a21cf5959a070849865de5ca58d5d29ad64eb08209afd40959c56ae SHA512 35273492abc0efa7146848c82770bcd5e4ce1b7c9971ce45686b4d3244332456011db6df05154ad6a204854fd13ac3dce8f7b8cd6112a2e60a7b8434f3c4a196
+DIST eid-mw-4.4.19.tar.gz 7941144 BLAKE2B c02f975081eacf7803839461ae91e3c6a24c3e2fc60064a981cc71f629925679b0df997e8acbe2da2f1e58dcc665b8633e3c9bf28b07be90ac8cdd0448e80848 SHA512 21530111461302123be662dd60f3fbd56ffd8a0537cac88c99d5a6bcd9163a27bc34e05beaf7502dd5ada247ca324d21590a866907b5a7a02ce3d8d78fcac634
 EBUILD eid-mw-4.4.1.ebuild 2106 BLAKE2B 07d74477ca6ff373abf1168f520dd33179984691ab192fedff4d9370a68addc4990dc7172be8b1e6d8813da8089c534ed8c577daedd0aa7d2bfae6011f8e0f2d SHA512 a86805eed173ea10bb088d2374f134d9841257c2a51d5ffb51c0316811e62794243129965bb1ed46bc45419826e6ae1c4781cc8a9addf62e98f5411bf4cdde3e
-EBUILD eid-mw-4.4.11.ebuild 2151 BLAKE2B 3350790665454d681dc7513c33a8f3d1a74caebd5bd2f1683b02a32b4bbee85c64c5457ff50a4f14819ec421832fd0a372df7c60f313bc20a6d67229246e6b9e SHA512 b7c555ef7eb1ef96bc4a8df040648548698408fcf81f72c3fa5d37641287080101593d49f628de9ae9f8ddb42ebd45f55c40ec8c73aecf3b7ba8f954027d5cc2
+EBUILD eid-mw-4.4.19.ebuild 2433 BLAKE2B 07aa37e8d8d8abd22d8d46c1efbdd908e8cd76452b2d7fa50765d22326ddffcd140c02614db5469547fd81e8efe6f3fca4df681148a8d09a799f7ffb46db221d SHA512 b809f8d26a9357e848b5e59e10dd2aa9a07fdf2b410f1fc4ad4f4c8f232c996977c37ac68151434f44037bfe4230b67507dca8fae39ad219fb4f565d044cfd75
 EBUILD eid-mw-9999.ebuild 1832 BLAKE2B c6c9b0de69514b1d036e8e3566e8ecbcfdd6426bcc55bdbcfce15de389dca83d65a0cf50d3e9eb5b35fca7114e02e13cf3bfd3139e46298874ea5b872248b007 SHA512 1c4383bb1764fe4f8dbeabad9be447d682e2ee08e8174a7d7aa4a978c1243048cfcae54dc0d7b45e6acaa415b52cde1199aee6f94f5b9ef1f790f632dfbc28ee
 MISC metadata.xml 1445 BLAKE2B f402be7a768b67e34a736cdfaafc0df9f29301ba2d4b50f4ff27b9b08085826a67e452bb239893ef79d10eebb8981488cc71ca7f7015152783ad939e64df6d85 SHA512 b3934c2c2be9adc2f4d4d8ab654b8b21056bcbf29a67751ead9c8f1be4339a651a6d315c6ee1c182c3e8a32ad630c73f0990bd4fce4d34afa948055f0447ea98
diff --git a/app-crypt/eid-mw/eid-mw-4.4.11.ebuild b/app-crypt/eid-mw/eid-mw-4.4.19.ebuild
index e496d37797e7..98c8bfee6ce3 100644
--- a/app-crypt/eid-mw/eid-mw-4.4.11.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.4.19.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
+EAPI=7
 
-inherit autotools gnome2-utils
+inherit autotools desktop gnome2-utils xdg-utils
 
 DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
 HOMEPAGE="https://eid.belgium.be"
@@ -56,6 +56,14 @@ src_prepare() {
 		-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
 		plugins_tools/aboutmw/gtk/about-main.c || die
 
+	# Fix libdir for pkcs11_manifestdir
+	sed -i \
+		-e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
+		cardcomm/pkcs11/src/Makefile.am || die
+
+	# See bug #691308
+	eapply "${FILESDIR}/eid-sign-test-${PV}.patch"
+
 	eautoreconf
 }
 
@@ -81,13 +89,15 @@ src_install() {
 pkg_postinst(){
 	if use gtk; then
 		gnome2_schemas_update
-		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_icon_cache_update
 	fi
 }
 
 pkg_postrm(){
 	if use gtk; then
 		gnome2_schemas_update
-		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_icon_cache_update
 	fi
 }
diff --git a/app-crypt/eid-mw/files/eid-sign-test-4.4.19.patch b/app-crypt/eid-mw/files/eid-sign-test-4.4.19.patch
new file mode 100644
index 000000000000..cf59f99a8ea7
--- /dev/null
+++ b/app-crypt/eid-mw/files/eid-sign-test-4.4.19.patch
@@ -0,0 +1,272 @@
+--- eid-mw-4.4.19/tests/unit/sign.c	2019-07-11 16:08:46.000000000 +0200
++++ eid-mw-git/tests/unit/sign.c	2019-08-04 17:40:08.683942928 +0200
+@@ -19,10 +19,13 @@
+ **************************************************************************** */
+ #ifdef WIN32
+ #include <win32.h>
++#pragma pack(push, cryptoki, 1)
++#include "pkcs11.h"
++#pragma pack(pop, cryptoki)
+ #else
+ #include <unix.h>
+-#endif
+ #include <pkcs11.h>
++#endif
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+@@ -33,66 +36,88 @@
+ #include <config.h>
+ #endif
+ 
++#include <stdbool.h>
++
+ #if HAVE_OPENSSL
+-#include <openssl/rsa.h>
++#include <openssl/opensslv.h>
++#include <openssl/evp.h>
+ #include <openssl/engine.h>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+-static int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) {
+-	if(!r || !n || !e) {
+-		return 0;
+-	}
+-	r->n = n;
+-	r->e = e;
+-	r->d = d;
+-	return 1;
+-}
+-#endif
+-
+-CK_BYTE digest_sha256[] = {
+-                0x2c, 0x26, 0xb4, 0x6b,
+-                0x68, 0xff, 0xc6, 0x8f,
+-                0xf9, 0x9b, 0x45, 0x3c,
+-                0x1d, 0x30, 0x41, 0x34,
+-                0x13, 0x42, 0x2d, 0x70,
+-		0x64, 0x83, 0xbf, 0xa0,
+-		0xf9, 0x8a, 0x5e, 0x88,
+-		0x62, 0x66, 0xe7, 0xae
+-};
+-
+-int verify_sig(unsigned char* sig, CK_ULONG siglen, CK_BYTE_PTR modulus, CK_ULONG modlen, CK_BYTE_PTR exponent, CK_ULONG explen) {
+-	RSA* rsa = RSA_new();
+-	unsigned char* s = malloc(siglen);
+-	int ret;
+-
+-	RSA_set0_key(rsa, BN_bin2bn(modulus, (int) modlen, NULL), BN_bin2bn(exponent, (int) explen, NULL), NULL);
+-
+-	int v = RSA_verify(NID_sha256, digest_sha256, sizeof(digest_sha256), sig, siglen, rsa);
+-
+-	printf("Signature verification returned: %d\n", v);
+-	if(!v) {
+-		unsigned long e = ERR_get_error();
+-		printf("error %ld: %s\n", e, ERR_error_string(e, NULL));
+-		ret = TEST_RV_FAIL;
+-	} else {
+-		ret = TEST_RV_OK;
++// These were copied from eid-test-ca:derencode.c
++int verify_sig(const unsigned char *sig_in, CK_ULONG siglen, const unsigned char *certificate, size_t certlen, bool is_rsa) {
++#if OPENSSL_VERSION_NUMBER > 0x10100000L
++	X509 *cert = NULL;
++	EVP_PKEY *pkey = NULL;
++	EVP_MD_CTX *mdctx;
++	EVP_PKEY_CTX *pctx;
++	const EVP_MD *md = EVP_get_digestbyname("sha256");
++	unsigned char *sig = (unsigned char*)sig_in;
++
++	if(d2i_X509(&cert, &certificate, certlen) == NULL) {
++		fprintf(stderr, "E: could not parse X509 certificate\n");
++		return TEST_RV_FAIL;
++	}
++	pkey = X509_get0_pubkey(cert);
++	if(pkey == NULL) {
++		fprintf(stderr, "E: could not find public key in certificate\n");
++		return TEST_RV_FAIL;
++	}
++	mdctx = EVP_MD_CTX_new();
++	if(EVP_DigestVerifyInit(mdctx, &pctx, md, NULL, pkey) != 1) {
++		fprintf(stderr, "E: initialization for signature validation failed!\n");
++		return TEST_RV_FAIL;
++	}
++	if(EVP_DigestVerifyUpdate(mdctx, (const unsigned char*)"foo", 3) != 1) {
++		fprintf(stderr, "E: hashing for signature failed!\n");
++		return TEST_RV_FAIL;
+ 	}
+ 
+-	free(s);
+-	RSA_free(rsa);
+-
+-	return ret;
++	ECDSA_SIG* ec_sig;
++	if(!is_rsa) {
++		BIGNUM *r;
++		BIGNUM *s;
++		ec_sig = ECDSA_SIG_new();
++		if((r = BN_bin2bn(sig, siglen / 2, NULL)) == NULL) {
++			fprintf(stderr, "E: could not convert R part of ECDSA signature!\n");
++			return TEST_RV_FAIL;
++		}
++		if((s = BN_bin2bn(sig + (siglen / 2), siglen / 2, NULL)) == NULL) {
++			fprintf(stderr, "E: could not convert S part of ECDSA signature!\n");
++			return TEST_RV_FAIL;
++		}
++		if(ECDSA_SIG_set0(ec_sig, r, s) == 0) {
++			fprintf(stderr, "E: could not set ECDSA_SIG structure!\n");
++			return TEST_RV_FAIL;
++		}
++		siglen = i2d_ECDSA_SIG(ec_sig, NULL);
++		unsigned char *dersig = sig = malloc(siglen);
++		siglen = i2d_ECDSA_SIG(ec_sig, &dersig);
++	}
++	if(EVP_DigestVerifyFinal(mdctx, sig, siglen) != 1) {
++		fprintf(stderr, "E: signature fails validation!\n");
++		return TEST_RV_FAIL;
++	}
++	if(!is_rsa) {
++		free(sig);
++	}
++	printf("signature verified\n");
++	return TEST_RV_OK;
++#else
++	printf("OpenSSL too old for verification\n");
++#endif
+ }
+-
+ #endif
+ 
+-int test_key(char* label, CK_SESSION_HANDLE session, CK_SLOT_ID slot EIDT_UNUSED) {
++int test_key(char* label, CK_SESSION_HANDLE session, CK_SLOT_ID slot) {
+ 	CK_ATTRIBUTE attr[2];
+ 	CK_MECHANISM mech;
++	CK_MECHANISM_TYPE_PTR mechlist;
+ 	CK_BYTE data[] = { 'f', 'o', 'o' };
+ 	CK_BYTE_PTR sig, mod, exp;
+ 	CK_ULONG sig_len, type, count;
+-	CK_OBJECT_HANDLE privatekey, publickey;
++	CK_OBJECT_HANDLE privatekey, publickey, certificate;
++	bool is_rsa = false;
++	int i;
+ 
+ 	attr[0].type = CKA_CLASS;
+ 	attr[0].pValue = &type;
+@@ -113,7 +138,22 @@
+ 		return TEST_RV_SKIP;
+ 	}
+ 
+-	mech.mechanism = CKM_SHA256_RSA_PKCS;
++	check_rv(C_GetMechanismList(slot, NULL_PTR, &count));
++	mechlist = malloc(sizeof(CK_MECHANISM_TYPE) * count);
++#undef CHECK_RV_DEALLOCATE
++#define CHECK_RV_DEALLOCATE free(mechlist)
++
++	check_rv(C_GetMechanismList(slot, mechlist, &count));
++
++	for(i=0; i<count; i++) {
++		if(mechlist[i] == CKM_SHA256_RSA_PKCS) {
++			mech.mechanism = mechlist[i];
++			i=count;
++			is_rsa = true;
++			break;
++		}
++	}
++
+ 	check_rv(C_SignInit(session, &mech, privatekey));
+ 
+ 	check_rv(C_Sign(session, data, sizeof(data), NULL, &sig_len));
+@@ -124,42 +164,68 @@
+ 
+ 	hex_dump((char*)sig, sig_len);
+ 
+-	type = CKO_PUBLIC_KEY;
+-	check_rv(C_FindObjectsInit(session, attr, 2));
+-	check_rv(C_FindObjects(session, &publickey, 1, &count));
+-	verbose_assert(count == 1);
+-	check_rv(C_FindObjectsFinal(session));
++	if(is_rsa) {
++		type = CKO_PUBLIC_KEY;
++		check_rv(C_FindObjectsInit(session, attr, 2));
++		check_rv(C_FindObjects(session, &publickey, 1, &count));
++		verbose_assert(count == 1);
++		check_rv(C_FindObjectsFinal(session));
+ 
+-	attr[0].type = CKA_MODULUS;
+-	attr[0].pValue = NULL_PTR;
+-	attr[0].ulValueLen = 0;
++		attr[0].type = CKA_MODULUS;
++		attr[0].pValue = NULL_PTR;
++		attr[0].ulValueLen = 0;
+ 
+-	attr[1].type = CKA_PUBLIC_EXPONENT;
+-	attr[1].pValue = NULL_PTR;
+-	attr[1].ulValueLen = 0;
++		attr[1].type = CKA_PUBLIC_EXPONENT;
++		attr[1].pValue = NULL_PTR;
++		attr[1].ulValueLen = 0;
+ 
+-	check_rv(C_GetAttributeValue(session, publickey, attr, 2));
++		check_rv(C_GetAttributeValue(session, publickey, attr, 2));
+ 
+-	verbose_assert(attr[0].ulValueLen == sig_len);
++		verbose_assert(attr[0].ulValueLen == sig_len);
+ 
+-	mod = malloc(attr[0].ulValueLen);
+-	mod[0] = 0xde; mod[1] = 0xad; mod[2] = 0xbe; mod[3] = 0xef;
+-	exp = malloc(attr[1].ulValueLen);
+-	exp[0] = 0xde; exp[1] = 0xad; exp[2] = 0xbe; exp[3] = 0xef;
++		mod = malloc(attr[0].ulValueLen);
++		mod[0] = 0xde; mod[1] = 0xad; mod[2] = 0xbe; mod[3] = 0xef;
++		exp = malloc(attr[1].ulValueLen);
++		exp[0] = 0xde; exp[1] = 0xad; exp[2] = 0xbe; exp[3] = 0xef;
+ 
+-	attr[0].pValue = mod;
+-	attr[1].pValue = exp;
++		attr[0].pValue = mod;
++		attr[1].pValue = exp;
+ 
+-	check_rv(C_GetAttributeValue(session, publickey, attr, 2));
++		check_rv(C_GetAttributeValue(session, publickey, attr, 2));
+ 
+-	printf("Received key modulus with length %lu:\n", attr[0].ulValueLen);
+-	hex_dump((char*)mod, attr[0].ulValueLen);
++		printf("Received key modulus with length %lu:\n", attr[0].ulValueLen);
++		hex_dump((char*)mod, attr[0].ulValueLen);
+ 
+-	printf("Received public exponent of key with length %lu:\n", attr[1].ulValueLen);
+-	hex_dump((char*)exp, attr[1].ulValueLen);
++		printf("Received public exponent of key with length %lu:\n", attr[1].ulValueLen);
++		hex_dump((char*)exp, attr[1].ulValueLen);
++	}
+ 
+-#if HAVE_OPENSSL
+-	return verify_sig(sig, sig_len, mod, attr[0].ulValueLen, exp, attr[1].ulValueLen);
++#if HAVE_OPENSSL && OPENSSL_VERSION_NUMBER > 0x10100000L
++	unsigned char cert[4096];
++	attr[0].type = CKA_CLASS;
++	attr[0].pValue = &type;
++	type = CKO_CERTIFICATE;
++	attr[0].ulValueLen = sizeof(CK_ULONG);
++
++	attr[1].type = CKA_LABEL;
++	attr[1].pValue = label;
++	attr[1].ulValueLen = strlen(label);
++
++	check_rv(C_FindObjectsInit(session, attr, 2));
++	check_rv(C_FindObjects(session, &certificate, 1, &count));
++	verbose_assert(count == 1);
++	check_rv(C_FindObjectsFinal(session));
++
++	attr[0].type = CKA_VALUE;
++	attr[0].pValue = cert;
++	attr[0].ulValueLen = sizeof(cert);
++
++	check_rv(C_GetAttributeValue(session, certificate, attr, 1));
++
++	printf("Received certificate with length %lu:\n", attr[0].ulValueLen);
++	hex_dump((char*)cert, attr[0].ulValueLen);
++
++	return verify_sig(sig, sig_len, cert, attr[0].ulValueLen, is_rsa);
+ #else
+ 	return TEST_RV_OK;
+ #endif
diff --git a/app-crypt/gifshuffle/Manifest b/app-crypt/gifshuffle/Manifest
index 425de24a3105..bed852ef56a4 100644
--- a/app-crypt/gifshuffle/Manifest
+++ b/app-crypt/gifshuffle/Manifest
@@ -1,3 +1,3 @@
-DIST gifshuffle.tar.gz 21509 BLAKE2B a07490c2f6a29782d7d25219eefbf49393ccb06b1fbb260927dce741450934990673cc86168285ec9d0bc2ef258a64d98d623f143b464b48c9955b13a808822d SHA512 0a0521f924c508c80c11309203e64cbd948945ddd557f01008a39987602320be780c1710dfcaa8ec9886fff4e9745465f2f242919ede4cedb2af9f73e5cc54be
-EBUILD gifshuffle-2.0-r1.ebuild 607 BLAKE2B 32b69f77ef8f1fe46ba7c42c694c7bd246a3055de550493b4ab63a263acce8af6d34bdb71d835444088c30fd9c98949dd49b3b22b1068a542c545f4e6eccccce SHA512 c177eb84a8386c33163d9d47b1952c86b1a9963dd4c8c347d2fc4df24408fd26254270331df80873a0f5af145fc6012e75feddeec0d98d21d3068a86424938da
+DIST gifshuffle-2.0.tar.gz 21509 BLAKE2B a07490c2f6a29782d7d25219eefbf49393ccb06b1fbb260927dce741450934990673cc86168285ec9d0bc2ef258a64d98d623f143b464b48c9955b13a808822d SHA512 0a0521f924c508c80c11309203e64cbd948945ddd557f01008a39987602320be780c1710dfcaa8ec9886fff4e9745465f2f242919ede4cedb2af9f73e5cc54be
+EBUILD gifshuffle-2.0-r1.ebuild 619 BLAKE2B f1d674630abb76d3432be5f8c80cb71ae9fef3319ea1bbbeb2c7ba8a63f50bc7e0c1d32dd0f7fdba8de9c41fc554b8d2a24a9aa4eb73f9e22c9c877d8e0d453e SHA512 4a6f9cda8dca0cd053b70f663db20d8be78bf5f1c0de4221849d73d26e081985177786050ef20ad2a982a57adb269f3b3a4b8550893fe8991a6d63fdea4f891a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/gifshuffle/gifshuffle-2.0-r1.ebuild b/app-crypt/gifshuffle/gifshuffle-2.0-r1.ebuild
index c2a8cfb2d9de..dc85560e9fd5 100644
--- a/app-crypt/gifshuffle/gifshuffle-2.0-r1.ebuild
+++ b/app-crypt/gifshuffle/gifshuffle-2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="GIF colourmap steganography"
 HOMEPAGE="http://www.darkside.com.au/gifshuffle/"
-SRC_URI="http://www.darkside.com.au/gifshuffle/${PN}.tar.gz"
+SRC_URI="http://www.darkside.com.au/gifshuffle/${PN}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index de5e7661c3f4..5d9bcc9974cb 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,19 +1,5 @@
 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
-DIST gnupg-2.2.16.tar.bz2 6699113 BLAKE2B 7738c5d9d5789dc56b4429e2b62403859365b53c834b0c53a6387fb77f1242ec4b0195205394f01e64fac6c7ce1235738421ea04bc6fb843c3fea1c10a243217 SHA512 0e0040905cc4d1d9d29e184cfeda520b43990e4ec459212537c0ce6092de987157e05b1d1a3022398d9b3cbaeea0f58a7e686745f96933e5ac26be4229162247
 DIST gnupg-2.2.17.tar.bz2 6717554 BLAKE2B ad052a0d1e970fe7748563a0ffa105d427e3d9299237f15ce93aa47b676cc1fbf0691cf2112dd5b55ba5fc9d2a6988f999415dd5026d44c5cb4bfef9f99189cd SHA512 a3cd094addac62b4b4ec1683005a2bec761ea2aacf6daf904316b1819f4f6a41f256a8d9452cf28cad71b3e68228465baa27ae0eb1fa734fa91542ef0f159c5d
-EBUILD gnupg-1.4.21.ebuild 3345 BLAKE2B 611a2e3c8d3a47337a17891ce9df00d0aca121f827169ea1aec9cb8c44b3f38858e1c8d39d08985f71790127bbbe64b16f0293b368d8dc627700fc1cc31983d7 SHA512 14a708c00e98c76fa6ef1f2d878f84f63d8e110f85b35b9c40b6da80525af685df09ea83eb1dd1fce1fe3016b9e12a46c02c91f11ea78496c12301acbf04d257
-EBUILD gnupg-2.2.10.ebuild 3320 BLAKE2B 1309b03e28bd2d5af1f2caeedb145a0f3c0c87db1b78ee014d3938d1bafdf3d469885df8d3bd622f9cebc81ef706925d0a77e68a265bbaee93902cb0ea094f51 SHA512 26211aacc1393429fe7459b58e1aa735e4cc1c278d7fcc774547fd9ada7adeaf35d297c65ca51ca927f6d304ffe8c78d874762c8649fc01e9dd259b2b2f52cda
-EBUILD gnupg-2.2.12.ebuild 3663 BLAKE2B ebc41be08f922215079e5f6975972a75355d068099edcb885a0b04ce0cd72010502ced08cab2890b3f65b71820d9b45e76695a865079add2bab15090bffa03bc SHA512 7294ee0c840da055910a7f3430ad164a9f93d8ade7624ecbeb3ff88b9818e422eee6259d58b9d201601b834b654b3eeaa169dc3d8e16113af1e9b4a9a3f46092
-EBUILD gnupg-2.2.14.ebuild 3663 BLAKE2B 58a51005ce97906d7a8c051d88ecd0ec3ecdc627e146c424c446bba93a7b37ad93b6248be631d97c750c5b4e03f675d8f2c7355d306fcf219a03d19b71886bb5 SHA512 73ffb70a72e2936233596ef8dee2429abff9d97fb128b3c5e94fef862948ca65e964a95538e0722b7773fb0f08c7f27ad9eaabbc6ad7c140c826e9d16ba657ac
-EBUILD gnupg-2.2.15-r1.ebuild 4510 BLAKE2B ace05abf02aa56cbceb46fd205398ca110b785c38889fea575a32dc4e21bff0933112ccf6c59acd5bc1cb700e33349d67ab2af900cd7098f6874e2bef5b9c4da SHA512 8289b2921ed18514a81d80b7c685e691de2c1c0aff6159a354f2e0e86a0d5b788099b98ed7b8770a5fe5372207cd9779b42d638a25e954f629a537f8a6f4e2c6
-EBUILD gnupg-2.2.15.ebuild 3700 BLAKE2B b2502a5e584a7c611b1635c33e3aaa1187a7a2ff84d2337c392fae922d7c4f50d24bafd022b9c27bd942306306f18e9905ca19a5218c8fecd2c7573c85f1418d SHA512 b54de720e1885a6010c00fc8f3e1c30acb1540eb6c9796e0f7165db18ecbc002d48c149f0270634bc1bb060791cfc2a3fe0e6020cbd80bf00a8f77197a50386e
-EBUILD gnupg-2.2.16-r1.ebuild 4559 BLAKE2B 0296c31e7c20dc25a49de6f6cb23c393cccfa1dab610eead32fca98b09e37c1ab84d9bd00ca2c613b1444649f949cc725e4d9c99f83b809257bcd38f882df9dd SHA512 6b5b67d717a6a6c23bb2cf6dad7c746aa7d4a20bad767a3e7916fb2bda76710e3c3ebf33d6eb4e4dad8bcb58b054d6c3c7bcc0b586a180243f1a288af0f08f80
-EBUILD gnupg-2.2.16.ebuild 4510 BLAKE2B ace05abf02aa56cbceb46fd205398ca110b785c38889fea575a32dc4e21bff0933112ccf6c59acd5bc1cb700e33349d67ab2af900cd7098f6874e2bef5b9c4da SHA512 8289b2921ed18514a81d80b7c685e691de2c1c0aff6159a354f2e0e86a0d5b788099b98ed7b8770a5fe5372207cd9779b42d638a25e954f629a537f8a6f4e2c6
 EBUILD gnupg-2.2.17.ebuild 4548 BLAKE2B 143d02639279e1d16c544e660aa17f1b28ae157d0ea8224e55002c89c1c7b607f4eb3dba2a81f479f985e2a4672436ae7dff77903474d2fb62c9232879ae277e SHA512 67352dd85c666ee2256ec9a324a9d385fdb4afa7d746e93002445c9cc199e2670077ca4244529bf97d70fa14d8b133f81cea3e569af07beb97fe6d1b97434e43
-MISC metadata.xml 1313 BLAKE2B 2bf26407bdea8af215d09d28640b961ee98c86c297595736fbe477c8b9cfaf0f8970982ce22038dabf0d8529e39032a3fec9da0c17a5acca0cf3cb197f31f1c0 SHA512 0500f03936eba67706cea87c1f5b16db280b159fc31780b93e696e8ab20e3dece90f0bd80af5aa9582cab557cc337c65e8e101daa935ba6ca31b7f126328c0ac
+MISC metadata.xml 1233 BLAKE2B 2b48171b444fefb4a7754f7d46495320a22c67e6a7d647522a9b1750950a105a490b5bba4cbec8f37ecad5f11595fcde78a84dfc72464440f8a6d49e91298298 SHA512 687efa743fc072665d521213e5d27f953dda450b5acdbcf194c00c3aa793c1f2610f5f75f0cae7f50292bb379f3cdd9da0e8480ee5fc8b8ad8bbffa6b90087e9
diff --git a/app-crypt/gnupg/gnupg-1.4.21.ebuild b/app-crypt/gnupg/gnupg-1.4.21.ebuild
deleted file mode 100644
index d8cb5bc50c6c..000000000000
--- a/app-crypt/gnupg/gnupg-1.4.21.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-ECCVER="0.2.0"
-ECCVER_GNUPG="1.4.9"
-ECC_PATCH="${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff"
-MY_P=${P/_/}
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="bzip2 curl ldap mta nls readline selinux smartcard static usb zlib"
-
-COMMON_DEPEND="
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	curl? ( net-misc/curl )
-	mta? ( virtual/mta )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( =virtual/libusb-0* )
-	usb? ( =virtual/libusb-0* )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND} )
-	selinux? ( sec-policy/selinux-gpg )
-	nls? ( virtual/libintl )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# bug#469388
-	sed -i -e 's/--batch --dearmor/--homedir . --batch --dearmor/' checks/Makefile.in
-
-	# Fix PIC definitions
-	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c \
-		|| die "sed PIC failed"
-	sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S || \
-		die "sed PIC failed"
-}
-
-src_configure() {
-	# Certain sparc32 machines seem to have trouble building correctly with
-	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
-	# fix until the gcc problem can be tracked down.
-	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
-		filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
-	fi
-
-	# 'USE=static' support was requested in #29299
-	use static && append-ldflags -static
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable ldap) \
-		$(use_enable mta mailto) \
-		--enable-hkp \
-		--enable-finger \
-		$(use_with !zlib included-zlib) \
-		$(use_with curl libcurl /usr) \
-		$(use_enable nls) \
-		$(use_enable bzip2) \
-		$(use_enable smartcard card-support) \
-		$(use_enable selinux selinux-support) \
-		--without-capabilities \
-		$(use_with readline) \
-		$(use_with usb libusb /usr) \
-		--enable-static-rnd=linux \
-		--libexecdir="${EPREFIX}/usr/libexec" \
-		--enable-noexecstack \
-		CC_FOR_BUILD=$(tc-getBUILD_CC) \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	# keep the documentation in /usr/share/doc/...
-	rm -rf "${ED}usr/share/gnupg/FAQ" "${ED}usr/share/gnupg/faq.html" || die
-
-	dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
-		TODO VERSION doc/{FAQ,HACKING,DETAILS,OpenPGP}
-
-	exeinto /usr/libexec/gnupg
-	doexe tools/make-dns-cert
-}
-
-pkg_postinst() {
-	ewarn "If you are using a non-Linux system, or a kernel older than 2.6.9,"
-	ewarn "you MUST make the gpg binary setuid."
-	echo
-#	if use !bindist && use ecc; then
-#		ewarn
-#		ewarn "The elliptical curves patch is experimental"
-#		ewarn "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
-#	fi
-	elog
-	elog "See https://wiki.gentoo.org/wiki/GnuPG for documentation on gnupg"
-	elog
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate the right viewer"
-}
diff --git a/app-crypt/gnupg/gnupg-2.2.10.ebuild b/app-crypt/gnupg/gnupg-2.2.10.ebuild
deleted file mode 100644
index b494196acc5a..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.10.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-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 wks-server"
-
-COMMON_DEPEND_LIBS="
-	>=dev-libs/npth-1.2
-	>=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.7.3
-	>=dev-libs/libgpg-error-1.28
-	>=dev-libs/libksba-1.3.4
-	>=net-misc/curl-7.10
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:0 ) )
-	tofu? ( >=dev-db/sqlite-3.7 )
-	virtual/mta
-	"
-COMMON_DEPEND_BINS="app-crypt/pinentry
-	!app-crypt/dirmngr"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	selinux? ( sec-policy/selinux-gpg )
-	nls? ( virtual/libintl )"
-
-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"
-)
-
-src_configure() {
-	local myconf=()
-
-	if use smartcard; then
-		myconf+=(
-			--enable-scdaemon
-			$(use_enable usb ccid-driver)
-		)
-		if use prefix && use usb ; then
-			# bug #649598
-			append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
-		fi
-	else
-		myconf+=( --disable-scdaemon )
-	fi
-
-	if use elibc_SunOS || use elibc_AIX; then
-		myconf+=( --disable-symcryptrun )
-	else
-		myconf+=( --enable-symcryptrun )
-	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 ssl gnutls) \
-		$(use_enable nls) \
-		$(use_enable tofu) \
-		$(use_enable wks-server wks-tools) \
-		$(use_with ldap) \
-		$(use_with readline) \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-large-secmem \
-		--enable-all-tests \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-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/gnupg/gnupg-2.2.12.ebuild b/app-crypt/gnupg/gnupg-2.2.12.ebuild
deleted file mode 100644
index 9e198106fa36..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.12.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2018 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:0 ) )
-	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"
-)
-
-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/gnupg/gnupg-2.2.14.ebuild b/app-crypt/gnupg/gnupg-2.2.14.ebuild
deleted file mode 100644
index fa2bd5fd28ae..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.14.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# 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"
-)
-
-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/gnupg/gnupg-2.2.15-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.15-r1.ebuild
deleted file mode 100644
index 2b55c80c4d04..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.15-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
-
-# Existence of executables is checked during configuration.
-DEPEND="!app-crypt/dirmngr
-	>=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.7.3
-	>=dev-libs/libgpg-error-1.28
-	>=dev-libs/libksba-1.3.4
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-	tofu? ( >=dev-db/sqlite-3.7 )"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-	"${FILESDIR}/${PN}-2.2.14-quiet-sending.patch"
-)
-
-src_configure() {
-	local myconf=()
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
-	fi
-
-	if use elibc_SunOS || use elibc_AIX; then
-		myconf+=( --disable-symcryptrun )
-	else
-		myconf+=( --enable-symcryptrun )
-	fi
-
-	#bug 663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	[[ ${CC} == *clang ]] && \
-		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
-	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-	# by wks-client & wks-server; and if it's autodetected but not not exist at
-	# build time, then then 'gpg-wks-client --send' functionality will not
-	# work. This has an unwanted side-effect in stage3 builds: there was a
-	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-	# the build where the install guide previously make the user chose the
-	# logger & mta early in the install.
-
-	econf \
-		"${myconf[@]}" \
-		$(use_enable bzip2) \
-		$(use_enable nls) \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable ssl gnutls) \
-		$(use_enable tofu) \
-		$(use_enable usb ccid-driver) \
-		$(use_enable wks-server wks-tools) \
-		$(use_with ldap) \
-		$(use_with readline) \
-		--with-mailprog=/usr/libexec/sendmail \
-		--disable-ntbtls \
-		--enable-all-tests \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-large-secmem \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
-		KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
-		LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
-		LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
-		NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
-		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	#Bug: 638574
-	use tofu && export TESTFLAGS=--parallel
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
-
-pkg_postinst() {
-	elog "See https://wiki.gentoo.org/wiki/GnuPG for documentation on gnupg"
-	elog
-	elog "If you wish to use 'gpg-wks-client --send', you must install an MTA!"
-}
diff --git a/app-crypt/gnupg/gnupg-2.2.15.ebuild b/app-crypt/gnupg/gnupg-2.2.15.ebuild
deleted file mode 100644
index 6c10a02472a3..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.15.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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/gnupg/gnupg-2.2.16-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.16-r1.ebuild
deleted file mode 100644
index f559e78030f9..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.16-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
-
-# Existence of executables is checked during configuration.
-DEPEND="!app-crypt/dirmngr
-	>=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.7.3
-	>=dev-libs/libgpg-error-1.28
-	>=dev-libs/libksba-1.3.4
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-	tofu? ( >=dev-db/sqlite-3.7 )"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-	"${FILESDIR}/${PN}-2.2.14-quiet-sending.patch"
-)
-
-src_configure() {
-	local myconf=()
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
-	fi
-
-	if use elibc_SunOS || use elibc_AIX; then
-		myconf+=( --disable-symcryptrun )
-	else
-		myconf+=( --enable-symcryptrun )
-	fi
-
-	#bug 663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	[[ ${CC} == *clang ]] && \
-		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
-	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-	# by wks-client & wks-server; and if it's autodetected but not not exist at
-	# build time, then then 'gpg-wks-client --send' functionality will not
-	# work. This has an unwanted side-effect in stage3 builds: there was a
-	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-	# the build where the install guide previously make the user chose the
-	# logger & mta early in the install.
-
-	econf \
-		"${myconf[@]}" \
-		$(use_enable bzip2) \
-		$(use_enable nls) \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable ssl gnutls) \
-		$(use_enable tofu) \
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver') \
-		$(use_enable wks-server wks-tools) \
-		$(use_with ldap) \
-		$(use_with readline) \
-		--with-mailprog=/usr/libexec/sendmail \
-		--disable-ntbtls \
-		--enable-all-tests \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-large-secmem \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
-		KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
-		LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
-		LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
-		NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
-		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	#Bug: 638574
-	use tofu && export TESTFLAGS=--parallel
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
-
-pkg_postinst() {
-	elog "See https://wiki.gentoo.org/wiki/GnuPG for documentation on gnupg"
-	elog
-	elog "If you wish to use 'gpg-wks-client --send', you must install an MTA!"
-}
diff --git a/app-crypt/gnupg/gnupg-2.2.16.ebuild b/app-crypt/gnupg/gnupg-2.2.16.ebuild
deleted file mode 100644
index 2b55c80c4d04..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.16.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
-
-# Existence of executables is checked during configuration.
-DEPEND="!app-crypt/dirmngr
-	>=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.7.3
-	>=dev-libs/libgpg-error-1.28
-	>=dev-libs/libksba-1.3.4
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-	tofu? ( >=dev-db/sqlite-3.7 )"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-	"${FILESDIR}/${PN}-2.2.14-quiet-sending.patch"
-)
-
-src_configure() {
-	local myconf=()
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
-	fi
-
-	if use elibc_SunOS || use elibc_AIX; then
-		myconf+=( --disable-symcryptrun )
-	else
-		myconf+=( --enable-symcryptrun )
-	fi
-
-	#bug 663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	[[ ${CC} == *clang ]] && \
-		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
-	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-	# by wks-client & wks-server; and if it's autodetected but not not exist at
-	# build time, then then 'gpg-wks-client --send' functionality will not
-	# work. This has an unwanted side-effect in stage3 builds: there was a
-	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-	# the build where the install guide previously make the user chose the
-	# logger & mta early in the install.
-
-	econf \
-		"${myconf[@]}" \
-		$(use_enable bzip2) \
-		$(use_enable nls) \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable ssl gnutls) \
-		$(use_enable tofu) \
-		$(use_enable usb ccid-driver) \
-		$(use_enable wks-server wks-tools) \
-		$(use_with ldap) \
-		$(use_with readline) \
-		--with-mailprog=/usr/libexec/sendmail \
-		--disable-ntbtls \
-		--enable-all-tests \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-large-secmem \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
-		KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
-		LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
-		LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
-		NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
-		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	#Bug: 638574
-	use tofu && export TESTFLAGS=--parallel
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
-
-pkg_postinst() {
-	elog "See https://wiki.gentoo.org/wiki/GnuPG for documentation on gnupg"
-	elog
-	elog "If you wish to use 'gpg-wks-client --send', you must install an MTA!"
-}
diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
index 710e79addfa5..8f54fc7a736d 100644
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -25,9 +25,6 @@
 		<flag name="user-socket">
 		try a socket directory which is not removed by init manager at session end
 		</flag>
-		<flag name="mta">
-		Build mta support using <pkg>virtual/mta</pkg>.
-		</flag>
 		<flag name="tofu">
 		Enable support for Trust on First use trust model; requires <pkg>dev-db/sqlite</pkg>.
 		</flag>
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index a07cfd2f3040..2cbc98c2b6d3 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -16,6 +16,6 @@ DIST heimdal-7.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84
 DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
 DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
 EBUILD heimdal-7.5.0.ebuild 4334 BLAKE2B 33303601d32d3b2c6f54a3681012f854b6addc55b09c65e6d0cea74e8ac91c12de09624e37f3d4f9933c54dbe8de3cf7f258bb99d33d26a25a0c280288777b44 SHA512 6d40e8a30e74b95c918e7ee5bf10b3d017178bd4775bba707ff2dfc02d208c121426b66ebdbb50df09a96f4caa5c55b35f2e8d53cad9eac4f8ebf46b0f6de266
-EBUILD heimdal-7.6.0.ebuild 4544 BLAKE2B 075588a581df502f47515cf1652bf7570fc39388f73bf8ab3768050b478b1a71821eedfc05a17a178c5f69095dd5ce8316243e2f588ac9777908f8f5c52c6b09 SHA512 796c5e38057bba437fe2cc70b71de0346261005ce71cd7d18bf6bb0d6cb99e0d6775b64aa249ebdb2073fa1fca49021a50bcf0aacdff9cf4de9c7bc660425370
+EBUILD heimdal-7.6.0.ebuild 4543 BLAKE2B 8f16fd002b689035cbad48626673b43336346054611cf636745cbabe51b20dd67e86c9ba3054681ca23cba8d1838481ab86aeb93199be7d9b98e9d105576b352 SHA512 99756373dfb610def06431c4de594e829c399e92f24274f389043281bd2fdab48dd9624addbad48bcbcf438f59cc23285daf21c73be59b1d923a675283ae5153
 EBUILD heimdal-7.7.0-r1.ebuild 4536 BLAKE2B 758d3177cccbfa83ad69239536b207a218fcbfd0c85f6a943ece3722534b4bdd34d6d0a95de4c04d95f3273198463424117999acbf38f8b7248b62afd8cead59 SHA512 8fde4dc3b338d67c998eafe5122138b49d5d188acdceff1c7455fc02ecd6806794592d9e0b97ca6587b0bfe96e4f7e63996c6d1c9c0e843d17729fe0da84ff0e
 MISC metadata.xml 722 BLAKE2B 9ec2bb074bf4932b0bb2f949eb3c33c8ed8b82305d6641a6954084120c658005cecc2cac57ad85a1df520f5bfd115deef57f80d874ba850d857a813b5a87c139 SHA512 5f3c28c222eb668e3c1d3b7fe24ae3622c82f94b6008a4c3458aa76afac9508d6e7f150de0f06e4845a5b0653ea04112fe0c2b421f199b5feb9ef771ab0b0b28
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
index 9e6de52ac1f2..f7a31275a72d 100644
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd"
 IUSE="afs +berkdb caps gdbm hdb-ldap ipv6 libressl +lmdb otp selinux ssl static-libs test X"
 
 CDEPEND="
diff --git a/app-crypt/jitterentropy/Manifest b/app-crypt/jitterentropy/Manifest
index c1ded234f9ce..f569dfae2321 100644
--- a/app-crypt/jitterentropy/Manifest
+++ b/app-crypt/jitterentropy/Manifest
@@ -1,3 +1,3 @@
 DIST jitterentropy-2.1.2.tar.gz 24112 BLAKE2B 9328fcc6ac09b79765d53248e4d6d01be47348c6f22f660175de888a884ea9e65253cc2e6fd3620a96f69dd0051b97ea3c46462a24c8e0c94d2bba19afab059e SHA512 b1ba2fe22c6b7d5bca64bb1611f2da3f53f1979e515a16141ccf330e3ca27a6944f0e45f0db57f4e3963a30ea4b34920ce9173f9c4f3ea82b820dc739cbd95f4
-EBUILD jitterentropy-2.1.2.ebuild 960 BLAKE2B a923f83e46c9d6e5b93edd1756a4fff995de18a9fa75e6685cca2632b7d2171e25cc0e10766f2c916bf00589b9c79b306714268d70bb9bb4a52af49b28c58500 SHA512 fe416e73c28054218b59b6e29c17967d6eddf9232262d3aa9f505ccaba425f0167185b093b457d51f22d83e41293522466b160500263ef86c6b25144e3c51127
+EBUILD jitterentropy-2.1.2.ebuild 1015 BLAKE2B 95fb1eb89c1e4e89c27ec58b46f590676340c8fad5b4ab99dfa618b0321a6ccc17ab9e831c3b6c90667517f2ff3cb0ffe57fb95c56bf2bdb5525f368c0d44faf SHA512 03a31a2c5f1b773b0539ce563471693f5e841a978a8d568b918f27c04b2966e8882b23224b4d54831a39932248d680c2d81a5d0775cd19dce1445811d107adc0
 MISC metadata.xml 666 BLAKE2B 88598964271ee05c8427e8547d25dd50eb50bec1dafcaef064328dbca5140b9221b1d1823a1dc54289b73501556579fb39a85c49a6c25d6447a677e8db0f6252 SHA512 d6baaef1aa2e0958492872e7b0ba2c6c86dfa7e281268b6cb230c2cc2c8132df04e664e0449d24885357a1a791bb354253778e0e5f2436fa612b6e0c509729e0
diff --git a/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild b/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
index d33b497f97d7..7ca20b89744d 100644
--- a/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
+++ b/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/smuellerDD/jitterentropy-library/archive/v${PV}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
 IUSE="static-libs"
 
 S="${WORKDIR}/${PN}-library-${PV}"
diff --git a/app-crypt/libnitrokey/Manifest b/app-crypt/libnitrokey/Manifest
index 3283b6863bd9..927f5c1b10d9 100644
--- a/app-crypt/libnitrokey/Manifest
+++ b/app-crypt/libnitrokey/Manifest
@@ -1,4 +1,5 @@
+AUX libnitrokey-3.5-tests-version-gitless.patch 789 BLAKE2B 9e184e9e51837796b65c15e4cae6979991f94721af3ab7f79566fb5b1af777960d400dee10325799e3b7448946f6c73f9b509be41a1b0925b2cc6d7e85dc90c6 SHA512 aa4a253822a25d906ae09f74c9c52683c517528386b24734ff75977b6d28a11382cce6cdeb66cf0ff981225a8c61c76e32e7df96880fd9ad9f53f63ca0ad6f9a
 DIST libnitrokey-3.5.tar.gz 94356 BLAKE2B 9e53213f309e903d26e0e8e01ab213d6bc42c5b8d720e4b19f27adb607f20ad0c6e1707bf7b55c525efbd6a4fbf7b9c87983decf6b05dab7d03701ae0ea8277f SHA512 d2a95071e92d839c8cde4ac1435158bb469c25662f2988a4e824dbc0dfe83af841e6d04589293deddd77746dbec17b30c50fab69af58cc727ed5e0f2dbd0b5e7
-EBUILD libnitrokey-3.5.ebuild 1053 BLAKE2B 13357a8bcb750ebaf5abfa3275ec1dcb7c296688b0ccaf09c8b3caf3fe841911985c915fcc3efa0c1e8e187baf9917d2bf8b7c38e95a34faeb718f24889305f4 SHA512 9f51e075f5849f1085f0d0bbd6e31abef85a5b2e56ff176b126e5ae39fb56a5fdb47ae058ab191cc5e12dfa4c8a148f7fed236afc6df6ed4b566f0ab6871c41f
+EBUILD libnitrokey-3.5.ebuild 1116 BLAKE2B 2bbc6ddbf18443bdec8056c1bf5e647e9ea7a29189cb216c5b7f7b41cad77154feada3d5c8308398bb1f78796c406453fb0153b34eb1b84890d91b91b6b40334 SHA512 e980520dd1ac1489916204ca70af7fecbce989d39aaf8b06d9655349b20847600bea5d70f5f367014b9ac90b6fe35b6ebcfb3d7fde34f1c6ed08f4241cb0c4ea
 EBUILD libnitrokey-9999.ebuild 1048 BLAKE2B 4a94192b8ca59009b7f06224e332acbcec2d40238c1cdbc0b8ea6c3e3dbfd3dcfdd0d5eaf7004ec1c5faac66392aa1c256a8c798625aa6b152ea39a97b687d49 SHA512 ad2ba4576a581cc5b59bdbb4f36147ed6adee78e3f72aabd8963d89247f8ad30b939247d42ec89614fd308b0413b93df4c2a8e4082a6e7ff31b986d2cd2d1838
 MISC metadata.xml 397 BLAKE2B ec7996ade24566ed79175f047e18c18a7c51e3946c65c4b3cd986d3fe6372ed2a79ca13b6e2d0a21b5e907a2f8e27e7061ad9ce893ffbd93ead06c8814f4d00c SHA512 457d69deef3f3bcca1ac0b0a15d20ca03bf012523a03c311c5be065ad50a43ef5d7e0d7fb949a6a63f3198c35313d83e0e7a8ef882c1095234f93a2dd8be416e
diff --git a/app-crypt/libnitrokey/files/libnitrokey-3.5-tests-version-gitless.patch b/app-crypt/libnitrokey/files/libnitrokey-3.5-tests-version-gitless.patch
new file mode 100644
index 000000000000..99fc5af03787
--- /dev/null
+++ b/app-crypt/libnitrokey/files/libnitrokey-3.5-tests-version-gitless.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -129,7 +129,14 @@
+ 	ERROR_QUIET
+ )
+ ENDIF()
+-IF((NOT ${ADD_GIT_INFO}) OR (${PROJECT_VERSION_GIT_RETURN_CODE}))
++# the version.h generation logic is tricky in a number of ways:
++# 1. git describe on a release tarball will always fail with
++#    a non-zero return code, usually 128
++# 2. If git is not installed, PROJECT_VERSION_GIT_RETURN_CODE
++#    will contain the string 'No such file or directory'
++# Hence fallback to PROJECT_VERSION when the return code is NOT 0.
++IF((NOT ${ADD_GIT_INFO}) OR (NOT ${PROJECT_VERSION_GIT_RETURN_CODE} STREQUAL "0"))
++	MESSAGE(STATUS "Setting fallback Git library version")
+ 	SET(PROJECT_VERSION_GIT "v${PROJECT_VERSION}")
+ ENDIF()
+ MESSAGE(STATUS "Setting Git library version to: " ${PROJECT_VERSION_GIT} )
diff --git a/app-crypt/libnitrokey/libnitrokey-3.5.ebuild b/app-crypt/libnitrokey/libnitrokey-3.5.ebuild
index 35712a337225..6a74fb21ae15 100644
--- a/app-crypt/libnitrokey/libnitrokey-3.5.ebuild
+++ b/app-crypt/libnitrokey/libnitrokey-3.5.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3"
@@ -32,6 +32,8 @@ DEPEND="
 	test? ( >=dev-cpp/catch-2.5.0:0 )"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${PN}-3.5-tests-version-gitless.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_UDEVRULESDIR="$(get_udevdir)"/rules.d
diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
index 55355b5964e3..599933e68b7c 100644
--- a/app-crypt/monkeysphere/Manifest
+++ b/app-crypt/monkeysphere/Manifest
@@ -19,7 +19,7 @@ DIST monkeysphere_0.42.orig.tar.gz 110415 BLAKE2B 281ce2841b9f088f632aa6f487dc6b
 EBUILD monkeysphere-0.36-r1.ebuild 1187 BLAKE2B 6b0f8b0e240a372e13b1aaf0dd4f7fdbfd08093d2e8f9e0a3dc71e7590643eb814978573a9098a134f402470162459832040252bcb19657a958e7ede5caada87 SHA512 380cd2eb925360506c6a3237d642131c9a6e257e219d19d5b6902034b056f6984296f9f1621d81c012f75456658eb57487fa609a0748df7aa11397fc0d5b89bc
 EBUILD monkeysphere-0.36-r2.ebuild 1781 BLAKE2B 76df9b0b9204bdc2b9250b00e30660ac613c34efa3a2bff2f7a01aa05bf838455c8fd0dda653594619e0255b42ddf7ebcd8f5d3dc3ee65e949948d7249424395 SHA512 f6da7b96ffce5bc0e6eb4fa83df65f47b12882b65fe44f3c8e45b2d38387cc82de9185262ad6fe93a9cddb61929ea3651c7a30979a572dc9ac5a1d24550255f8
 EBUILD monkeysphere-0.37.ebuild 1459 BLAKE2B e9196602c64910a1cc816993c36fce60926354958403c78753cd9eaf5b737ecc6194639614387fa8bd65c4cfb398d0eb548583a95f2b20649f8d7ec575e7355a SHA512 5181dc7b06a7a5910bafe37438c152f54d4c0f6949cc6fc8a8e203324d16c345e18475c7a854709c722ff3d4d72c66b121a653c6f86d3a33a24ad16b0097f0c3
-EBUILD monkeysphere-0.38.ebuild 1635 BLAKE2B 7382941a153716cdafcb925258a75e52cc334cd2ec467f4a1908a03388c92dcc13b05a144d259f727acc93bb5b02133e15e7b91af8d7f1606c2c98de08bea371 SHA512 6dd69c21f73158cc68e4df4c4ba9a3e15387d20effadf8bb3566955acd8b62d9c5e59c8b47d98d3470dc5cfaa9e28e343ac8cec43aed5642b1568352150c3041
+EBUILD monkeysphere-0.38.ebuild 1612 BLAKE2B 4591fa6e98486ebf67ebfad50f20e272086422221448933652a687b6c857d35c5f50d8698188d07454d422357cfe5cbbe1c67fb27fccbc501ec9161579884f41 SHA512 f24a5d308d28b4435c5e02b55f113ba4d5ca8c75d458c65573663c1dd97b03ac43a08d9cf5ff8ea198e00a27653f129276f89f70421da7de26e709aba5f3e5ea
 EBUILD monkeysphere-0.39.ebuild 1441 BLAKE2B 588283fd2a272a963781f0ee4a6a1e24b157642a987bd4a54d40e82a3d5cca3d3cb8d408250a369916041abe16ae722824ad863ba4cb374144a0388cd4b841a6 SHA512 1eac7528acd605c46e1b0c869afc43e6e603b4f191650568b5ca9c478f22efdd0b41c31d09daf341309d8a31cdac8f2bc1ac29408f48315709a9923589f46b1a
 EBUILD monkeysphere-0.41.ebuild 1372 BLAKE2B a290eb661701e8e2e930a25c584d54fc9c31b9373e0d181ffaa03074d04b8c39c7540c9e2a5bb4fc4558354103d34d9ebcdee29a5d941b32a7be673f2efb7f9f SHA512 5f044379bf2b0577bd322685eed5951c6271e8b55ee8338ccc517fc239f743ee43160c32b8293e8a8c345ef395fea7845e1cb4ddc33a705f75c5ef25f227b91f
 EBUILD monkeysphere-0.42.ebuild 1371 BLAKE2B a2c27a481725a6167955da764046e66e10f03897c448b2852dac1006b3471a32ffef480bb610e2c9c5f9c1269bd9390c6ec50cf85883a97346b17aae9833a759 SHA512 6cec984b7674b6a7b38cc65ac9e46d796292c9a17535b726c699836acee7f1694a3cb2f01dc8217263eaf0df1ed95eb82913962756f7bbf95a83f74e41dc9d4f
diff --git a/app-crypt/monkeysphere/monkeysphere-0.38.ebuild b/app-crypt/monkeysphere/monkeysphere-0.38.ebuild
index 2d718ae60cdc..a919d40924de 100644
--- a/app-crypt/monkeysphere/monkeysphere-0.38.ebuild
+++ b/app-crypt/monkeysphere/monkeysphere-0.38.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -39,11 +39,12 @@ pkg_setup()
 
 src_prepare()
 {
-	epatch "${FILESDIR}/${P}-asprintf.patch" \
-           "${FILESDIR}/${P}-revert-executable-patch.patch"\
-           "${FILESDIR}/${P}-syssharedir-whitespace.patch"\
-		   "${FILESDIR}/${PN}-0.37_default_shell.patch"\
-	       "${FILESDIR}/${PN}-0.37_hd_od.patch"
+	epatch \
+		"${FILESDIR}/${P}-asprintf.patch" \
+		"${FILESDIR}/${P}-revert-executable-patch.patch" \
+		"${FILESDIR}/${P}-syssharedir-whitespace.patch" \
+		"${FILESDIR}/${PN}-0.37_default_shell.patch" \
+		"${FILESDIR}/${PN}-0.37_hd_od.patch"
 
 	sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
 }
diff --git a/app-crypt/nitrokey-app/Manifest b/app-crypt/nitrokey-app/Manifest
index f1c22edf8593..685b928f683e 100644
--- a/app-crypt/nitrokey-app/Manifest
+++ b/app-crypt/nitrokey-app/Manifest
@@ -1,4 +1,4 @@
 DIST nitrokey-app-1.4.tar.gz 1205541 BLAKE2B 3e2e3ed85aff85168f9669cd16df026cc2108c601998222f6f6411b19bc4f027541e2c9368f50d383c21bdf2f38d19c69559616d89f5736d4634973d686f2310 SHA512 e0a29bd312b5f8bd1a5bd09ac118b9191a9261341e31f59d355e119fce488c23978af804113f96a93d1b5301ad17e53c2cfaefc9f5ec3b37fdd1ba304325f8a9
-EBUILD nitrokey-app-1.4.ebuild 887 BLAKE2B ece31154f4f3cc252f43d0385faa210d83a0347059cadb2eaa6672b3a459e2b4a37e644bfd1e2622dccf8773738fa9fb45cda2d63d88268caacb4db4fe31bd3d SHA512 4351c0ae579ea0425822ae4f71649c202e6710cc0f20a0fa2acf3d0580d9532bebeca12f1b9d6d5762899822095c39deacb5d0c035aee7178a44fdfb4a8b4c97
+EBUILD nitrokey-app-1.4.ebuild 885 BLAKE2B 2656ab9dccda2be74c6f1a729ef097c66acf86fef65045283458db562353b158af060d65613767f874d54a3294554761453c1d5b8535fca442132fe5c982b0c8 SHA512 58139a711e7a61225a0c441b32b4d7544147134eae1d6bbb81dc5f68963cb29387ef572c7ac924461d94475e76b2996ab14d84052b98408870aec8be7b6f09d6
 EBUILD nitrokey-app-9999.ebuild 882 BLAKE2B 5ff121ed98b96662913b726f400b20e888a8fae24b3519a46d48061baed9d0d4199aef2cdcec8c590dc8ddd901df7958173d0712b95dae834b4963116edc7aa6 SHA512 a27c004d08d0e352af55943bf21bc182fbb3239ff381df5b7a4246e9d699fbf8a34cef154d2708b166637fc77222b5aab37db78f715a2f362459b4acdcea5e17
 MISC metadata.xml 399 BLAKE2B 622fa027d3ed6c95ea87e6c533289af1b66229f76bc163b490a8c5a819373c85d21ab22505c9a159a7598fdc17b1bfc7d01ff6217d3d8f8e64ef38f2d68d710e SHA512 fa204891e67b5c6f1ac7082fe49f52ae287f6aed77dd1fd8972770c7a5ddb7f2af71f543a3888c9f572dfb04197f98486a75ecba5960506274c634782af110ab
diff --git a/app-crypt/nitrokey-app/nitrokey-app-1.4.ebuild b/app-crypt/nitrokey-app/nitrokey-app-1.4.ebuild
index 06752d05d286..1bf3389596c7 100644
--- a/app-crypt/nitrokey-app/nitrokey-app-1.4.ebuild
+++ b/app-crypt/nitrokey-app/nitrokey-app-1.4.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 9dbe603a9b2d..0ffb3ce17b2c 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -3,9 +3,7 @@ AUX freebsd-triplet.patch 800 BLAKE2B 43f1f7e1fa43313e2f323a3e5031a463185c2388a3
 AUX rhash-1.3.6-no_echon.patch 1224 BLAKE2B 949b6aa839667a6fef3c3a668b6cadc451986ba837807b3d7a56b80f50c8248d734745f886d40d341a99fefaf439f95bdeb0382ee15ea9e4f8561f98703fba2d SHA512 3771077c64c28b1fcf310d7a449d3e1eb951d1669b2ad3ddffe76d98ac5821ea8af40013984c65f28c7fce3434b7173a74a77120847f557cab2dedefac0c8b58
 AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836f8a431d950392dafb46be646048a0ab4dc4a31ac20b6676fa8627b39bbb30a990861cf8d3cfc742f8 SHA512 7a4c2bf019cbcde021bb79572abdbc9b42f995ada5bb9798fed127d79c44ed9d4b9544c1413952604b1dd45ed307acdacba6675419f6331d75ecf34c15b8f5ca
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
-DIST rhash-1.3.7-src.tar.gz 362981 BLAKE2B bc248e0dcdf2337e46292f1bcdff0ce027705679ab937c8aa13139226bc09f3815ba23d8383f624dfba255c54378473f6b0b28a710611cdc83150055b8d649d0 SHA512 182f474b0f0a39f9e0adb7e34fcc5ddca6f00e75d7cf6b846da33af166257b2ed38be70aa71e6732c4e6cbdd156712790b8bc5340933b65f3ce57269835d1585
 DIST rhash-1.3.8-src.tar.gz 393544 BLAKE2B c326b3fa6dbc5ea2cce40105dc319456fdcc58140a05e8002bf1d92be921d8bbd27bf670370ba7cf2ff2001ff70ddbeb8efc9712869a7b215c5f51a5e493b5c9 SHA512 9dba4fa4dd49d323f2e440c5b93eac1ef62eb4046ec4ef611f0978c12c1739002f1ac1f1ec5e61bd359dc89e9ed612db71be91a795184ac5d5433280d27fa4c1
-EBUILD rhash-1.3.6-r1.ebuild 1917 BLAKE2B 4276bd7da9604398f8e150a6cc8585fba3b7b90011e4dd60ff2f133996ffdb80b9e85659239669fc1faeb0e5856dec1b6cae1966d1d21952b947740d4dc5b656 SHA512 efad5669c2917a07bc709d433bbda42d4d8ab7b1a88740a495f9329c79b48dde44c60f2dec5b0dbf04ca6797f7ad9423c82b73700797dd8a613dddcad1d0c64c
-EBUILD rhash-1.3.7.ebuild 1900 BLAKE2B fc04872b62b571d6faa946477e169e417a82870980f711fa6030d5a91d227d3e8ad56718478cbc2af7b37552871b676e0d42d7ae543c12fa2c82c17bf1745bb6 SHA512 1e28644c0f3c8d884621b3d7f5e8e09e56510482956809eb22b16a22ed83f02ab4ad0efd35522173e715f6b98e39ae1f913bf35daf38a755f1fdcdfc5cdac114
-EBUILD rhash-1.3.8.ebuild 2067 BLAKE2B 6f29ab95cbbd41f0e3913507c6f9489630eb865fc7ebe0f92d961fbac1774df0599ae0ac4bacdfdde9d4f7fbaf430fd4ee1fc91c73e5990840e7d4a7d4c004b7 SHA512 d9811a50cf097e5f5c20e64205d87d01194870959d31d35bbb1260e3b72ef4268a707fd8c180bcd1ca32be58a5754331ef8852f7849fd538d67652921bd661c9
+EBUILD rhash-1.3.6-r1.ebuild 1926 BLAKE2B 5a9a9fa8e24519374328f25a5e15b3836ed4d57ec606ac80bde3172f2bb5a72c19911ed9c8bc97c967f3f336f7d9a2088da6c8fec3b64c1a388b291ae3e7fa26 SHA512 40ce7b82258b0326ce6cc23e655df1b80e45f07864e6f9dae645558e138b34c9d8dd58249862b4b9319f7b7af4db7c176deb8fe131cc3afd4e0d6f2e95da90bf
+EBUILD rhash-1.3.8.ebuild 2083 BLAKE2B 82f3841373fa0b705ff6c2441db0fc7ad489f8ba7ef8c9673e56577f6bd447e84dfa0647705e007892165b10e684ca0efb7a3251ed85281dc8e027b050eeb7a2 SHA512 1113891609320030be0a1437d8beb22b9628abeddd3499147efca30840d9db4b8f84417abc961056a6ea27a698cba196cfa3aa020a8666eda933b3220ca9819f
 MISC metadata.xml 753 BLAKE2B 09d65c4222a77b9cdab0e82e8b3a38a63762c9e691285f712e09e99ecf28937d70436ac0dc56a890ea1f6ca9981c7f02383ce92a0da6a0c5ca11af2b3598e77e SHA512 d9a8480839af7651eb09b1210b2b0f736d01018cd1863eb17f24f0f51024c234f6f5036745f2034e89bcbd85f396b194184fc987adba43d9d0bebfa0b65d635a
diff --git a/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
index bc4994b4b6ee..688fbb852228 100644
--- a/app-crypt/rhash/rhash-1.3.6-r1.ebuild
+++ b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="Console utility and library for computing and verifying file hash sums"
-HOMEPAGE="http://rhash.anz.ru/"
+HOMEPAGE="http://rhash.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
diff --git a/app-crypt/rhash/rhash-1.3.7.ebuild b/app-crypt/rhash/rhash-1.3.7.ebuild
deleted file mode 100644
index e179038547c0..000000000000
--- a/app-crypt/rhash/rhash-1.3.7.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Console utility and library for computing and verifying file hash sums"
-HOMEPAGE="http://rhash.anz.ru/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="debug nls libressl ssl static-libs"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-)"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/RHash-${PV}"
-
-src_prepare() {
-	default
-	# fix Solaris detection, upstream:
-	# https://github.com/rhash/RHash/pull/81
-	sed -i -e 's/sunos)/solaris2.*)/' configure || die
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	set -- \
-		./configure \
-		--target="${CHOST}" \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--sysconfdir="${EPREFIX}"/etc \
-		--disable-openssl-runtime \
-		--disable-static \
-		--enable-lib-shared \
-		$(use_enable debug) \
-		$(use_enable nls gettext) \
-		$(use_enable ssl openssl) \
-		$(use_enable static-libs lib-static)
-
-	echo "${@}"
-	"${@}" || die "configure failed"
-}
-
-# We would add compile-gmo to the build targets but install-gmo always
-# recompiles unconditionally. :(
-
-multilib_src_install() {
-	# -j1 needed due to race condition.
-	emake DESTDIR="${D}" -j1 \
-		  install{,-lib-headers,-pkg-config} \
-		  $(use nls && echo install-gmo) \
-		  $(use kernel_Winnt || echo install-lib-so-link)
-}
-
-multilib_src_test() {
-	emake test
-}
diff --git a/app-crypt/rhash/rhash-1.3.8.ebuild b/app-crypt/rhash/rhash-1.3.8.ebuild
index 39687089db10..37f7ea0d0ddb 100644
--- a/app-crypt/rhash/rhash-1.3.8.ebuild
+++ b/app-crypt/rhash/rhash-1.3.8.ebuild
@@ -6,12 +6,12 @@ EAPI=7
 inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="Console utility and library for computing and verifying file hash sums"
-HOMEPAGE="http://rhash.anz.ru/"
+HOMEPAGE="http://rhash.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug nls libressl ssl static-libs"
 
 RDEPEND="
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index c05e4df54f09..a55cb500b7a2 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,3 +1,3 @@
 DIST seahorse-3.30.1.1.tar.xz 1428904 BLAKE2B 54760362fc452b2ff3f7a0d72b25540568703cb91cd46321fb8cd60c9b51f84c3f48575ae9f6c72080cbe0b29e8a38f5e6afdb6c3120b2783a8a04688bd219c9 SHA512 971b8bea484f456d2942f1d1b407ca5b11c1d431f2ee524e58348a421a235dd9d2fa463e73487c6137bde116b34a5d1c0291b479d8562d4ce03766081e0dc469
-EBUILD seahorse-3.30.1.1.ebuild 1543 BLAKE2B 0ee21bca201471aa05695dded47978b49f47ef22c3cb6aff6fff9d1e3203949ded7475c7ccaff709037ed1ee977d8c5c076ed4ce0682252f94c58a54a1324ccb SHA512 0c4dd017edc2193706fef790329f84dbf452e89aa1a5e28fbe4df239da59986dda44e50f3510a914aa749f68cf4198aa524125da24f6d0e74e2bc18612d1c9c4
+EBUILD seahorse-3.30.1.1.ebuild 1550 BLAKE2B 9a1ef0deb85546412d0558581b52b6279e56ea2535169467698edc3b8334a26e31eb5afe98667a8d3afd484b3259b2b08425ded9aebaa34f76a059ccaeb3bb9f SHA512 90b3ced3c3be7d03baa6060ae8d04204ff9462e8a22bba0fc11781425b915b97a736efb304767b9dad6c30dab34261225e98187298b323b87bcaabaacd23bbf4
 MISC metadata.xml 742 BLAKE2B 11cc6cebe3f395ccd9f2570a419e812951287d7a9af2bd88720a66c7349305c108c451b67a33f9a6da0c82d7b0731ca74980dd7515db3d167993008633973a6f SHA512 cf7cceeaedb1fdb503def974d945a7a5d38a95105dda77f7e917abcec8ce823b461bf3cd1ab5f1a458de859e48a4d58abde71a5a4599685772936eb3525ae3af
diff --git a/app-crypt/seahorse/seahorse-3.30.1.1.ebuild b/app-crypt/seahorse/seahorse-3.30.1.1.ebuild
index 93445eac432d..3533fb8d228f 100644
--- a/app-crypt/seahorse/seahorse-3.30.1.1.ebuild
+++ b/app-crypt/seahorse/seahorse-3.30.1.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="ldap zeroconf"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/app-crypt/virtualsmartcard/Manifest b/app-crypt/virtualsmartcard/Manifest
new file mode 100644
index 000000000000..964e6a82afc7
--- /dev/null
+++ b/app-crypt/virtualsmartcard/Manifest
@@ -0,0 +1,3 @@
+DIST virtualsmartcard-0.7.tar.gz 553122 BLAKE2B 5f7ceab19587808f2cabee87f200825d81043724cfb51ddc4ea2b86ec4df1dfae3e7e77b769b9f1e691e125ee2c7bbd6d83da79f1c5215308174f58f6b006cf0 SHA512 c6f357c26dbfa2859694f53b07bc621bf0fce0115a06db9c181dc9ea127eb32191b9c98472b27cca73bc747a5cc85d56ec19b06aa50b91d13a939308a46cac74
+EBUILD virtualsmartcard-0.7.ebuild 909 BLAKE2B 65ec004b98b672ec0568f4f615457434a1ffea013d054e98102a144c76d8a7c144ca890986098f0378486f2c5f426930fd67a1304c53d1b13b4c2727dbc6f867 SHA512 95b36fc0de69b40aae1cbd8d54277a1b846efb8233f862bb32244ff11b914c267deadefc58fa226dd289e08121eef24bbcc8eeaefcaad70b0a4d21a733613117
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-crypt/virtualsmartcard/metadata.xml b/app-crypt/virtualsmartcard/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/app-crypt/virtualsmartcard/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/virtualsmartcard/virtualsmartcard-0.7.ebuild b/app-crypt/virtualsmartcard/virtualsmartcard-0.7.ebuild
new file mode 100644
index 000000000000..a65cd802bc81
--- /dev/null
+++ b/app-crypt/virtualsmartcard/virtualsmartcard-0.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="Smart card emulator, can be used with Remote Smart Card Reader"
+HOMEPAGE="https://frankmorgner.github.io/vsmartcard/"
+SRC_URI="https://github.com/frankmorgner/vsmartcard/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	media-gfx/qrencode:=
+	sys-apps/pcsc-lite"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-apps/help2man
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		# workaround buggy prefix logic
+		--enable-serialconfdir=$($(tc-getPKG_CONFIG) libpcsclite \
+			--variable=serialconfdir)
+		--enable-serialdropdir=$($(tc-getPKG_CONFIG) libpcsclite \
+			--variable=usbdropdir)/serial
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index c7834bbc0f83..9324a071d00c 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,9 +1,5 @@
-DIST yubikey-manager-qt-0.5.2.tar.gz 337194 BLAKE2B d6020116b9082671c039b521bbeebe7c1f0be022e233abbf8d6d788ea94e69e5f88aa3d6ec26a7b2edffa698327bb049e83ce54db2e0ba2ed1ad1dd536ab0961 SHA512 29265a10ae1dfe14dfdf4f1ba225516bf3bcbeb0115ca81696a4c5c506e957d6a99b0bb11a608e3175df99b8c04e8ae9250d5d42aab2b44b633d18fd2fc4c227
-DIST yubikey-manager-qt-1.0.0.tar.gz 8038084 BLAKE2B 9e1082be62dab2d43bfad3050dd38dbcd10e5b8761bf567ba4f3e1b4627a25709cfa29ac7a23560fff76e0a75b4668932a407268c8d90d791c381ad485fea029 SHA512 2cf5f70b2734a7c0346649f5419dbee39bef9bb80bb498631d4879abc48d422d70468713a48945e284f2bdef20f3bb570a0ac5a4daab6c1ff195d86e39168843
-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 1455 BLAKE2B e3c3b884e379b83dd58c843138de076399546121eddf495a624699e609b6ae69ff2169194d9238f3a7040ff53066942fdfd229ce676cf649ecb0de424e8d3470 SHA512 40d013c77453b3a2c3b11124ff98c4c81e7dcce973cef2fd15092576c91c8396e2156ef275673037d1c6c2a8f77c17b1241d95c125278ef4546789b004581759
-EBUILD yubikey-manager-qt-1.0.0-r3.ebuild 1526 BLAKE2B 12ac24fae46efd537fd9992bc4ca4b76040bcaf6b73a7c6849881f868981ee8721cf6497e04f843dddd6c71663e8991fa295ce0faeffff4c4c3788b329b97bba SHA512 b4e7c4a57ced148167ae5b72464627f98f25366705faad34b91c21398d0d8a0b43134b2651368a8dfd395c6987401910e8f12cbc6e756ad8d8121a7450599d97
-EBUILD yubikey-manager-qt-1.1.0.ebuild 1417 BLAKE2B e61a9ce2da02eb298b068cca39ac11fc6fe4cd3683352abc548ade78d4cccf61fbfe266e759182d869d32eac77cf3d0374873f8acac759da1603d1ed687fe036 SHA512 2f33429b5e54af52548778dfc884a87c32e7cfd83b71d964849977d83a9c1c51ebc49774b060880e9e7a8225dc86d2e6461ae46631907193d4c081810be72b22
+DIST yubikey-manager-qt-1.1.2.tar.gz 11175714 BLAKE2B ee30d8d44a8fdec60cd462db7d67689d4206afa778904cbfe3df97b4bca25342cbb9cea5570211842d7feb8194043fcc9507f9c3d47ca7b588ba3d6250344536 SHA512 0e0bc304689170ba73ea41373c3a6a534678b04b638316480d48b7e7a7d415f8a97e2130983a5ff6e696cf271486953c8155589a6eb9ecf5bd33bb0c98fe70a6
 EBUILD yubikey-manager-qt-1.1.1-r1.ebuild 1417 BLAKE2B 2e34d6d0166b06dff567cd097ec2392fa99823f839dc4c1abd6dccf69db2ab13abb4e1d110b64e8c76d04fa22cecfe61e308737e66f97a74f707589aa88064e8 SHA512 68b6d44285d4d72b47a000ce078a76a3ba02113e2cd99aa29dfd9d405368df38458250900000d7900f5c122c62e843a9d62e2223652e358e9f111604aca97aca
+EBUILD yubikey-manager-qt-1.1.2.ebuild 1417 BLAKE2B 34b9370be866b7fd7dfb2f9247ffb37146486c5071c8e598666a09ef3a8d0493303bf755998962b0c47734bad921cc1597bc63efef89a9765a0742418860852a SHA512 d18a91af7b9367def839eb2cb4227539c7680965af576a2472c2237b2a91835240ca41b5372a91cddb2468f81fb7dd1258b696c11464bc5206b9cf32ae50af1e
 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
deleted file mode 100644
index e6b61d7f969e..000000000000
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit eutils qmake-utils python-single-r1
-
-DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
-SRC_URI="https://github.com/Yubico/yubikey-manager-qt/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="${PYTHON_DEPS}
-	>=app-crypt/yubikey-manager-0.7.0[${PYTHON_USEDEP}]
-	<app-crypt/yubikey-manager-0.8
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyotherside[${PYTHON_USEDEP}]
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtdeclarative:5
-	dev-qt/qtsvg:5
-	dev-qt/qtquickcontrols:5[widgets]
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/"
-
-src_prepare() {
-	default
-
-	sed -i -e "s/ykman-cli//" ${PN}.pro || die
-	sed -e "/qtsingleapplication.pri/d" \
-		-e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
-		-i ykman-gui/ykman-gui.pro || die
-
-	# See: https://github.com/Yubico/yubikey-manager-qt/issues/54
-	echo "${PV}" > "${S}"/VERSION || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	domenu resources/ykman-gui.desktop
-	doicon -s 128 resources/icons/ykman.png
-	doicon -s scalable resources/icons/ykman.svg
-
-	einstalldocs
-}
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
deleted file mode 100644
index 0c586a4f439c..000000000000
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.0.0-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit eutils qmake-utils python-single-r1
-
-DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
-SRC_URI="https://github.com/Yubico/${PN}/archive/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="${PYTHON_DEPS}
-	>=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
-	<app-crypt/yubikey-manager-2.0.0[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyotherside[${PYTHON_USEDEP}]
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtsvg:5
-	dev-qt/qtquickcontrols2:5[widgets]
-	dev-qt/qtquickcontrols:5[widgets]
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	default
-
-	sed -i -e "s/ykman-cli//" ${PN}.pro || die
-	sed -e "/qtsingleapplication.pri/d" \
-		-e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
-		-i ykman-gui/ykman-gui.pro || die
-
-	# See: https://github.com/Yubico/yubikey-manager-qt/issues/54
-	echo "${PV}" > "${S}"/VERSION || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	domenu resources/ykman-gui.desktop
-	doicon -s 128 resources/icons/ykman.png
-	doicon -s scalable resources/icons/ykman.svg
-
-	einstalldocs
-}
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.2.ebuild
index 78abdfc9c1c8..8efcc2e7e4ec 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.2.ebuild
@@ -9,7 +9,7 @@ inherit eutils qmake-utils python-single-r1
 
 DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
 HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
-SRC_URI="https://github.com/Yubico/${PN}/archive/${P}.tar.gz"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -18,7 +18,7 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 DEPEND="${PYTHON_DEPS}
 	>=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
-	<app-crypt/yubikey-manager-3.0.0[${PYTHON_USEDEP}]
+	<app-crypt/yubikey-manager-4.0.0[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/pyotherside[${PYTHON_USEDEP}]
 	dev-qt/qtcore:5
@@ -32,7 +32,7 @@ DEPEND="${PYTHON_DEPS}
 	dev-qt/qtwidgets:5"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-${P}"
+S="${WORKDIR}/${PN}"
 
 src_prepare() {
 	default
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index a50ed28d4b15..f56a256617f6 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,11 +1,7 @@
-AUX yubikey-manager-0.7.0-fix-tests.patch 599 BLAKE2B 1c1bf0c540a413a6aa380d89cff2e62675a1783971b44d09d1fd006aec248ebeb63dae0ec2ab1d7128f3ed4cd159e7efd80e274689bfc9592bee1288c2b6ea49 SHA512 5c97d10946f54d47373f8aa4d5ea0680eb00203c22427a63fd9ff4a401aa8316326148b72c10442672406dc2099a767aba41d83bef240d7f67561504acf55f10
-DIST yubikey-manager-0.7.1-test-files.tar.xz 9756 BLAKE2B 5a2e2a2a58d04c8f9954c1d13d0892b4f7392785d6e83e6948e720606318860b93e70862cee0ee7f987c14c3fa49bb7ff20cdf2a5bfc09c1f08681346428c003 SHA512 7543a9e9cfbe7f9ec02c98397f5cbd77cb307d79985a4b060176ee26605767e74d8b18d4c036ff90aed9a0232bb1382908c75e876a911c2ceb35a12666699b94
-DIST yubikey-manager-0.7.1.tar.gz 71834 BLAKE2B 45b0366531c8a158b3d8ebcfa8b76d608c14dba02224d4e4962c3757446829e3dff5f5e0d0ceda67caab7c67ad0510e037770c58a50552c2c6971136cb75c806 SHA512 3e9105f1c033f9314b90cf209eb52f7879fa1ea69e9ae6dac8de0b24d7d2ff6e45b6dd530917535fa645d6eea461f5b4f23bb8deb103ffc27d1f3483cfa681c7
-DIST yubikey-manager-1.0.0.tar.gz 90653 BLAKE2B 5d8522181ad460521995d3cae63976e06a444816a24efdc83b526d50262c902c8cc76b29d43f6f07725ee714666c853b690f1dd6fe98c9409f0cc1e722ada6f5 SHA512 9fd1926bf4e2c1278a42136a05db3e5fe0b7cb3d740f601fd0a420ab851badb61c2dd165157ac5b1f47e934f771b9d0b3cca4e07d1772d0f743556d482f77c11
 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 1574 BLAKE2B 3795fb4b15e9755e8c300631f8925302e6d2424e0fa41db5b0fac47dc5c6026ece423ce16d5ee4fed84be36f333ee0c6bf83116c2d304537ed8b0115c9842d77 SHA512 325b0e4278dcb1b9d12cf9d8b4a7b821a76e817706f1bbc96414edeaeca1d848022feef633881f145b276037302017f312f47fb82f499f403ba98f515656c3a3
-EBUILD yubikey-manager-1.0.0-r1.ebuild 1527 BLAKE2B a196e407ab7ecb5e8962b74d6f57c954afb4a8bc914097cff9377bd8eea682a415712718f2eb85e185631a2d04e3454869e4877effdecb5ead72f38401a00686 SHA512 462628ac751272d98b61da9c4aeef2f0c3ff0ef9fe094852dba92c3e6c364f42de68ea2789d31cf017c097198d0ce4b6132bc2d33de284fcae97828bfe020819
+DIST yubikey-manager-2.1.1.tar.gz 101672 BLAKE2B baafce3850c0cbed842508c93ec4ad71e0eebbd0dcc61833b245b6c62f74b7215519cb8b1ec82df3be8c7677ec24447193a0121e0a63e67615453c2c6032fc0a SHA512 2c5990d9421acf93113347e9b9d33af893765ae9c5d9e6c9c4f2db1274b84cd839c15ae74327bdcbe9ec32ebdbcbed95b172b8b13ac00bbeb17eb06b6dd71ccd
+DIST yubikey-manager-3.0.0.tar.gz 138225 BLAKE2B 8506f7cc4d6579c1905d565d5d32a7e745389000ff67786e5b5e6bc54793230321e5f0f4840c625cae0a4d9d2893b75910bebb3207cfc75189d3a4876838a712 SHA512 47ae785356c256f31e118f2df483d3a0d7fb7b5b380fd7cd207334daaa47319855bde41931099f9acb6b310d4ba824540ab5d3008384fd4d6a373da7355b18eb
 EBUILD yubikey-manager-2.0.0.ebuild 1678 BLAKE2B 519239065e438c2a3f0e97a716ee495cbf770d73b12dda8bfd90df1d943236e1c5b0a20c767ced6e5a0c7c771af829e1dc849a0b57bf86a74f79e1e6613ca89f SHA512 61582c69457763de6fe944e901cc9c9d97324b626f69dae985ac623c6d1e7ea7f7d9034f482748c4ad363745daa29d52d7639067ce4409ee8ff0c0a0a596e589
-EBUILD yubikey-manager-2.1.0.ebuild 1533 BLAKE2B 93c2a2dcb1e14699c11a36c771914b0915e4f41e887d2acbaa9c7372a762e0940528da47014a261e938acd2475f599c49841b0efd4e77b0327f6bd6cfb54b69e SHA512 d3233a47e12e149b97184538cb3797db980100378bf2eb2d23a852660c47f3757d6cc36deab88f82fad991df0b076d4e6f6c1800adf98810d8f8f7c90cbbb57f
+EBUILD yubikey-manager-2.1.1.ebuild 1533 BLAKE2B 93c2a2dcb1e14699c11a36c771914b0915e4f41e887d2acbaa9c7372a762e0940528da47014a261e938acd2475f599c49841b0efd4e77b0327f6bd6cfb54b69e SHA512 d3233a47e12e149b97184538cb3797db980100378bf2eb2d23a852660c47f3757d6cc36deab88f82fad991df0b076d4e6f6c1800adf98810d8f8f7c90cbbb57f
+EBUILD yubikey-manager-3.0.0.ebuild 1541 BLAKE2B a8bec0a494151e58e745a7668eaec3f12568789f5dda1c5c70508e289fc1d3549dd5b64fdd370c315f16e97ff235c9237c6bf1bda884cccc621e067940076a66 SHA512 7f12544ea492310409574aa7b4c4429d72c9e8eecec3291923813d515ac744488361d518c712536e12263150a771917e7ce7051e6ba4e29c686e2003f194aa46
 MISC metadata.xml 466 BLAKE2B 258688bf55e0d7d5d13a45996c2177d2154626a75ffd0c5b39cbc5c3f83979a00ec1d9a993870c00785d0e1d02cdeb1dadfa38f39d91b5992c5b495f644c6253 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b
diff --git a/app-crypt/yubikey-manager/files/yubikey-manager-0.7.0-fix-tests.patch b/app-crypt/yubikey-manager/files/yubikey-manager-0.7.0-fix-tests.patch
deleted file mode 100644
index 46074d2241a5..000000000000
--- a/app-crypt/yubikey-manager/files/yubikey-manager-0.7.0-fix-tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git b/test/util.py a/test/util.py
-new file mode 100644
-index 0000000..0551d06
---- /dev/null
-+++ a/test/util.py
-@@ -0,0 +1,18 @@
-+from click.testing import CliRunner
-+from ykman.cli.__main__ import cli
-+import os
-+
-+
-+PKG_DIR = os.path.dirname(os.path.abspath(__file__))
-+
-+
-+def open_file(*relative_path):
-+    return open(os.path.join(PKG_DIR, 'files', *relative_path), 'rb')
-+
-+
-+def ykman_cli(*argv, **kwargs):
-+    runner = CliRunner()
-+    result = runner.invoke(cli, list(argv), obj={}, **kwargs)
-+    if result.exit_code != 0:
-+        raise result.exception
-+    return result.output
diff --git a/app-crypt/yubikey-manager/yubikey-manager-0.7.1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-0.7.1.ebuild
deleted file mode 100644
index 92ae4418160e..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-0.7.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz
-	test? ( https://dev.gentoo.org/~gokturk/distfiles/app-crypt/${PN}/${PN}-0.7.1-test-files.tar.xz )"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	dev-python/fido2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pyscard[${PYTHON_USEDEP}]
-	dev-python/pyusb[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
-	sys-auth/ykpers
-"
-DEPEND="
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2_7')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.0-fix-tests.patch
-)
-
-python_test() {
-	touch "${S}"/test/__init__.py || die
-	cp -r "${WORKDIR}/files" "${S}"/test/ || die
-	esetup.py test
-}
-
-python_install_all() {
-	local DOC_CONTENTS
-
-	distutils-r1_python_install_all
-
-	DOC_CONTENTS="
-		The 'openpgp' command may require the package 'app-crypt/ccid'
-		to be installed on the system. Furthermore, make sure that pcscd
-		daemon is running and has correct access permissions to USB
-		devices.
-	"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-2.1.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-2.1.1.ebuild
index 1fe93622d5c9..1fe93622d5c9 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-2.1.0.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-2.1.1.ebuild
diff --git a/app-crypt/yubikey-manager/yubikey-manager-1.0.0-r1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-3.0.0.ebuild
index 13566d6483a4..cf74d5ba3a68 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-1.0.0-r1.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-3.0.0.ebuild
@@ -8,26 +8,28 @@ inherit readme.gentoo-r1 distutils-r1
 
 DESCRIPTION="Python library and command line tool for configuring a YubiKey"
 HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz
-	test? ( https://dev.gentoo.org/~gokturk/distfiles/app-crypt/${PN}/${PN}-0.7.1-test-files.tar.xz )"
+# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
+# the official source for tarballs, not Github
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
-	dev-python/fido2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pyscard[${PYTHON_USEDEP}]
-	dev-python/pyusb[${PYTHON_USEDEP}]
 	dev-python/click[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	>=dev-python/fido2-0.7.0[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	dev-python/pyusb[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 	>=sys-auth/ykpers-1.19.0
 "
 DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2_7')
@@ -35,8 +37,6 @@ DEPEND="
 "
 
 python_test() {
-	touch "${S}"/test/__init__.py || die
-	cp -r "${WORKDIR}/files" "${S}"/test/ || die
 	esetup.py test
 }
 
@@ -51,8 +51,9 @@ python_install_all() {
 		daemon is running and has correct access permissions to USB
 		devices.
 	"
-
 	readme.gentoo_create_doc
+
+	doman "${S}"/man/ykman.1
 }
 
 pkg_postinst() {
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
commit	fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree	326613a08f25851c388715e205576a2e7d25dc4f /app-crypt
parent	b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)