gentoo resync 31.01.2019

26 files changed, 111 insertions, 143 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index d6de858ef013..f254a0306edd 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 2e6fc2927f86..b8eea31bd456 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.28.0.tar.gz 1253582 BLAKE2B f97a195afacd279b1dfc2d62ea45ae43dfd2d160f148200dd0756eda1c75561a6b1326a346f84c666c8409d339bc4341106ed4cfc684a7d868b6e1e10707ef78 SHA512 07c9bbad52acebc60e48d79619e4f12818d67c3b0f41ffa4fcd02098fb9da245e4006418f54c51c2e4bb9aaa01a21f7a083c9eb092f533e6676ed75ae8667a54
 DIST certbot-0.29.1.tar.gz 1265252 BLAKE2B dcb63862f427851655ae8282a3d479adc4aa2f553f510f3769d59748728505cb052291f728f1a01ad4efffa25d9aee6be881a9a7178fb0c025725780150ade45 SHA512 c9b976bec51c83412816726b709b79af0b464efa02f67c4ce7e754a2e6fa11e6811ca5db66616bd7b9e7920d6613665d3e58998c891bdb1452a5159a91971c56
 DIST certbot-0.30.0.tar.gz 1266974 BLAKE2B f6c0c6864297ba0f6fc3232e0655d79e0b045923c22015d34f706e392ef83ca95c19b36d47120500bf4a0561a277aced13f7fb49d7bdcdc8359113c617dca37c SHA512 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
-EBUILD acme-0.28.0.ebuild 1263 BLAKE2B e735418ba3c1a93fb9c4303991fc90e77dcd41bd092c2f95c59043682e33af1fceef60ffab3635d2b02f47fe47ae9a9c7f9b2e25ded5a0825a3ed0d4dc9fcb01 SHA512 0f96754b57b8b0af5d3c0708ab5be361a2b2b3cab5002c2d27bce20e1d45433b0c56823d3f79eedbc2476887dfd2125ce44385bec0583c255cfcb7f299154e45
+DIST certbot-0.30.1.tar.gz 1267198 BLAKE2B dc1ce89f376d8cd0ca02dbec50cb39e8c7fc5e140c342b8b80e1226ddffa0a3cf798683679d7815cc9da24ce0371e19f5288619ba69941226f6170f8ec9948fc SHA512 31b790ed6911a9e632327d0833209c679535403d71a9977c8b785cc7585c67a4e18971b33f407598da4c7c67e073b0c2164203df34ec69bf3a0feb6bb326fbce
 EBUILD acme-0.29.1.ebuild 1263 BLAKE2B 1ba41c5fde55e0926d7b98a6ea8991fc7dcaf9285cda1cf9191ba78c6a423ab46954173e31d768e215d43df9066c8b9c2177bb71a11d81e4f21ccd58035a8fea SHA512 420bbef6273fd518680b7a292b7a28d69dc68c2979f94c415b5ee2eba8b5213967048ab1e03d619bbcab6e0b9d079aa4f8e153e737ce26704701330642c471d0
 EBUILD acme-0.30.0.ebuild 1265 BLAKE2B 393a9517fb9eafff45a66ccccb2d2d3d86ea94e412b86530c5882ee79056635efcf8696db972942981e9fa47af51b19d339500c0e7251ed71bcb84449adc7df7 SHA512 67d7e6f1e2850828fa523438a0a292ec36e7f403651fa4f865820982783d8310a6e7a6caaf22bc4a6c35bc005c6d5563c752fe19aa9672ec463b296a2279bcb1
-EBUILD acme-9999.ebuild 1268 BLAKE2B 67c4ba32f3d774554c6e10fc7e0e9a5044149b602e07c739f04db8ef14cfc2e9037ea2e2f14e48cbe6e0e0a987f8bbaf3f5096f918ac78c0b791194d48adfe4a SHA512 a65c13409ba08c7a97e4a856c6e2017f73b5eeb0a7a4d274c2501a67e265b0d68af7dac04ec0ba363a993a64c9670894eb2f532517ce043f95f7bbc2549363a4
+EBUILD acme-0.30.1.ebuild 1269 BLAKE2B 2a40ff630b70761a98d9a69428863ccaf9b5e944082079841fe29efa08e5b5dd0a8f7d8fad38d2e078497a99682471201bd87e9f0170cba1eba0c57ef2700a50 SHA512 7e52abd6d65d2bc76ae9d495f2eb6b3d380452a47757fe9294c04d4e121873e13c75ff7f950c905c08e03904e01dc9ac921736e6121940753dbebc06d6043a69
+EBUILD acme-9999.ebuild 1269 BLAKE2B 2a40ff630b70761a98d9a69428863ccaf9b5e944082079841fe29efa08e5b5dd0a8f7d8fad38d2e078497a99682471201bd87e9f0170cba1eba0c57ef2700a50 SHA512 7e52abd6d65d2bc76ae9d495f2eb6b3d380452a47757fe9294c04d4e121873e13c75ff7f950c905c08e03904e01dc9ac921736e6121940753dbebc06d6043a69
 MISC metadata.xml 342 BLAKE2B 770c32b421519cd6bdf7e09a71a1ee679a7fdf18e03587f75097a766c51dc878000184759e3c69f0c19afe060dd5578ff91e481644086e138dbb728619895130 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb
diff --git a/app-crypt/acme/acme-0.28.0.ebuild b/app-crypt/acme/acme-0.30.1.ebuild
index 4c81e8bdcdbf..cc94bdaee734 100644
--- a/app-crypt/acme/acme-0.28.0.ebuild
+++ b/app-crypt/acme/acme-0.30.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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
 
@@ -24,10 +24,10 @@ SLOT="0"
 IUSE="test"
 
 RDEPEND="
-	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
 	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index cc2960bf38c0..cc94bdaee734 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.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
@@ -24,10 +24,10 @@ SLOT="0"
 IUSE="test"
 
 RDEPEND="
-	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
 	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index dbfef7ea99c5..ff8478eb6788 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.28.0.tar.gz 1253582 BLAKE2B f97a195afacd279b1dfc2d62ea45ae43dfd2d160f148200dd0756eda1c75561a6b1326a346f84c666c8409d339bc4341106ed4cfc684a7d868b6e1e10707ef78 SHA512 07c9bbad52acebc60e48d79619e4f12818d67c3b0f41ffa4fcd02098fb9da245e4006418f54c51c2e4bb9aaa01a21f7a083c9eb092f533e6676ed75ae8667a54
 DIST certbot-0.29.1.tar.gz 1265252 BLAKE2B dcb63862f427851655ae8282a3d479adc4aa2f553f510f3769d59748728505cb052291f728f1a01ad4efffa25d9aee6be881a9a7178fb0c025725780150ade45 SHA512 c9b976bec51c83412816726b709b79af0b464efa02f67c4ce7e754a2e6fa11e6811ca5db66616bd7b9e7920d6613665d3e58998c891bdb1452a5159a91971c56
 DIST certbot-0.30.0.tar.gz 1266974 BLAKE2B f6c0c6864297ba0f6fc3232e0655d79e0b045923c22015d34f706e392ef83ca95c19b36d47120500bf4a0561a277aced13f7fb49d7bdcdc8359113c617dca37c SHA512 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
-EBUILD certbot-apache-0.28.0.ebuild 1078 BLAKE2B 27a1ca945009e85e65762e69b69c76edb574f64b53856e8ed285560d1585a62f25a6e0198905c5ad69115f40be0c37ec4bdf8687761ea0e936650334dd8a5001 SHA512 c29a7fcad1f9696d3c2d6a1a1e24d55d23849d726f8deb6858712e197527df72503f29cea7bac82171902609cd95b488870a80998ff984fb97454d0e619dd96a
+DIST certbot-0.30.1.tar.gz 1267198 BLAKE2B dc1ce89f376d8cd0ca02dbec50cb39e8c7fc5e140c342b8b80e1226ddffa0a3cf798683679d7815cc9da24ce0371e19f5288619ba69941226f6170f8ec9948fc SHA512 31b790ed6911a9e632327d0833209c679535403d71a9977c8b785cc7585c67a4e18971b33f407598da4c7c67e073b0c2164203df34ec69bf3a0feb6bb326fbce
 EBUILD certbot-apache-0.29.1.ebuild 1078 BLAKE2B 88db3076d6c2b3e9cb6a19c40ecfb4ed2f42e9f534040bfce18e785adeae93d963ffdf1f1a38ba2fe54e9bb749a8b8c1960af1e5319f884cb85a6e3ef19337d6 SHA512 d9bc1e40c1a77bc8f27725aea41fab71aa870cf4aef1e93f187ba2502bcb89304011e581052235838ad7282b03c6cff4f6f0d1264435d7f8ca53c9a3307ffa65
 EBUILD certbot-apache-0.30.0.ebuild 1080 BLAKE2B e7d4c037fae078bc6538768d507ac109af6c2d676187ed90aebc76ae1900532ae3fc7675ee3d4ba62d0dfefcc573eb3bc92bfdc33e0eede11fb7c0e066dace35 SHA512 672863267ac83c966c208c9ecf6fc83c704ea034092c30169064453fbe92cd3c73cfd2d6d6ace3f52c8d14d46f50e0b8e70b24ad282529f5f99acfe3b2f3bf94
+EBUILD certbot-apache-0.30.1.ebuild 1080 BLAKE2B e7d4c037fae078bc6538768d507ac109af6c2d676187ed90aebc76ae1900532ae3fc7675ee3d4ba62d0dfefcc573eb3bc92bfdc33e0eede11fb7c0e066dace35 SHA512 672863267ac83c966c208c9ecf6fc83c704ea034092c30169064453fbe92cd3c73cfd2d6d6ace3f52c8d14d46f50e0b8e70b24ad282529f5f99acfe3b2f3bf94
 EBUILD certbot-apache-9999.ebuild 1083 BLAKE2B 0e03488f0c19b669c4412fa608b32a3c7b77093163f73779268eb0b1e45fdce664a998b7e6bab882e41ea9cbee1ba8f1caf3f0589b84695f0002712b8976c774 SHA512 0b25f93cb6c50b80edc1b65302d97f70d16f73ef46ede9d25314970eb7f02a8a87e318ecfc30e42819e6be8264e3a772d640b991eafed261aee4f68800ae1460
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.28.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.30.1.ebuild
index 2ae0df4119f9..b6c158fb2f52 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.28.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.30.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 8969de9d7d70..6b746174a536 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.28.0.tar.gz 1253582 BLAKE2B f97a195afacd279b1dfc2d62ea45ae43dfd2d160f148200dd0756eda1c75561a6b1326a346f84c666c8409d339bc4341106ed4cfc684a7d868b6e1e10707ef78 SHA512 07c9bbad52acebc60e48d79619e4f12818d67c3b0f41ffa4fcd02098fb9da245e4006418f54c51c2e4bb9aaa01a21f7a083c9eb092f533e6676ed75ae8667a54
 DIST certbot-0.29.1.tar.gz 1265252 BLAKE2B dcb63862f427851655ae8282a3d479adc4aa2f553f510f3769d59748728505cb052291f728f1a01ad4efffa25d9aee6be881a9a7178fb0c025725780150ade45 SHA512 c9b976bec51c83412816726b709b79af0b464efa02f67c4ce7e754a2e6fa11e6811ca5db66616bd7b9e7920d6613665d3e58998c891bdb1452a5159a91971c56
 DIST certbot-0.30.0.tar.gz 1266974 BLAKE2B f6c0c6864297ba0f6fc3232e0655d79e0b045923c22015d34f706e392ef83ca95c19b36d47120500bf4a0561a277aced13f7fb49d7bdcdc8359113c617dca37c SHA512 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
-EBUILD certbot-nginx-0.28.0.ebuild 1012 BLAKE2B 3ce93c595046b07cdad135f1f32d63ef4fd651113c5fffe1308840d030065f568279fe20d709f39bbeaa7f6f9adf8699334f3296a88a42a447a22e399a9a9635 SHA512 48eefc48703ce39e925915ed0011ec3601f945ff675ea5fa09d09ba213bda5496337e4c4209c75c0b173ab0075737f564437ca3feff753f27350790f74237aa1
+DIST certbot-0.30.1.tar.gz 1267198 BLAKE2B dc1ce89f376d8cd0ca02dbec50cb39e8c7fc5e140c342b8b80e1226ddffa0a3cf798683679d7815cc9da24ce0371e19f5288619ba69941226f6170f8ec9948fc SHA512 31b790ed6911a9e632327d0833209c679535403d71a9977c8b785cc7585c67a4e18971b33f407598da4c7c67e073b0c2164203df34ec69bf3a0feb6bb326fbce
 EBUILD certbot-nginx-0.29.1.ebuild 1012 BLAKE2B e6611cbbb8f7eb76ee4d81f78389afc3a2698ef0909ff67d91d77bc3e92a68e728434b3a237c6791991ca82e014506bd83016e6a5da163792a32581d68967bbf SHA512 cd52ce383de026c14c54f24b30ad044074c16c26760ea8f22d8e56f5f4afae3e1f0368cad36cadb8839b3e062daa6bc2744393b6cf9b8402292c3c66bdeb7a71
 EBUILD certbot-nginx-0.30.0.ebuild 1014 BLAKE2B e49941f79f8c7b2e55480aa96f72c52d9f2e79e7e8d62055c35589a31022d60b40e10fa47b55058f17b92d74f23ae4245dcb1f08062c39e85a7b326529708307 SHA512 ae848d635d1479aa216d908724d478ff7cbaffe67724c287e7de5c0de81b96281b09acaf5d8267ea446ba31b3d36beb3c2c52d2675a95f4ed8255a153da49dca
+EBUILD certbot-nginx-0.30.1.ebuild 1014 BLAKE2B e49941f79f8c7b2e55480aa96f72c52d9f2e79e7e8d62055c35589a31022d60b40e10fa47b55058f17b92d74f23ae4245dcb1f08062c39e85a7b326529708307 SHA512 ae848d635d1479aa216d908724d478ff7cbaffe67724c287e7de5c0de81b96281b09acaf5d8267ea446ba31b3d36beb3c2c52d2675a95f4ed8255a153da49dca
 EBUILD certbot-nginx-9999.ebuild 1014 BLAKE2B 4b719b8703b3639e58ee36c5c0d03d6e5890a5b5c9848b1dc13eae93fb2bd542f8de9f3ddc1bb683d88481f851ee2594987868d519cc59fc8a4cfb8022aed212 SHA512 5beee8a666a3dd36a13b83e65616b6a0f3b11dd90d98a360447807e5b7e02b4a0029f4221dd0eee842a9106255c1d61958373b0c2a50a1d72cf707cd2ccd0e1d
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.28.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.30.1.ebuild
index 6b6c1d3784c8..b84d186a8cd7 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.28.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.30.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 56a26bb60552..84f5dde73394 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.28.0.tar.gz 1253582 BLAKE2B f97a195afacd279b1dfc2d62ea45ae43dfd2d160f148200dd0756eda1c75561a6b1326a346f84c666c8409d339bc4341106ed4cfc684a7d868b6e1e10707ef78 SHA512 07c9bbad52acebc60e48d79619e4f12818d67c3b0f41ffa4fcd02098fb9da245e4006418f54c51c2e4bb9aaa01a21f7a083c9eb092f533e6676ed75ae8667a54
 DIST certbot-0.29.1.tar.gz 1265252 BLAKE2B dcb63862f427851655ae8282a3d479adc4aa2f553f510f3769d59748728505cb052291f728f1a01ad4efffa25d9aee6be881a9a7178fb0c025725780150ade45 SHA512 c9b976bec51c83412816726b709b79af0b464efa02f67c4ce7e754a2e6fa11e6811ca5db66616bd7b9e7920d6613665d3e58998c891bdb1452a5159a91971c56
 DIST certbot-0.30.0.tar.gz 1266974 BLAKE2B f6c0c6864297ba0f6fc3232e0655d79e0b045923c22015d34f706e392ef83ca95c19b36d47120500bf4a0561a277aced13f7fb49d7bdcdc8359113c617dca37c SHA512 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
-EBUILD certbot-0.28.0.ebuild 1262 BLAKE2B 10b0b4238f94daebe0f2beb7c51fd5a0e164745411f0ba139f41b60389370e5cadbb14e6863c9d200ff71bc460911b83588d87c428850c8e78d17b505125b7bd SHA512 978d9e2aa68a6c0d19812dab857bb5dce04c9aad45ad247a0e24a403799e8d348acfd2879061868016b3ef6b3ddd34b43bd7baf00c52c357783e3b121468f86f
+DIST certbot-0.30.1.tar.gz 1267198 BLAKE2B dc1ce89f376d8cd0ca02dbec50cb39e8c7fc5e140c342b8b80e1226ddffa0a3cf798683679d7815cc9da24ce0371e19f5288619ba69941226f6170f8ec9948fc SHA512 31b790ed6911a9e632327d0833209c679535403d71a9977c8b785cc7585c67a4e18971b33f407598da4c7c67e073b0c2164203df34ec69bf3a0feb6bb326fbce
 EBUILD certbot-0.29.1.ebuild 1262 BLAKE2B d2fd392ad43dcf2319140eac1bbedb551814cc20ede0d21a6817cecae422acbf22001de635089d3097219976bb963824645252365e72bba5c070372c2991f793 SHA512 f117d8a3441fb390f7908eb608df300f9e24301a87dede456d7d78f8bdc27bc1fe78c6c7c40937427661544a80a23c11d6d98c83eb8ceacb3fd9e9894140c580
-EBUILD certbot-0.30.0.ebuild 1264 BLAKE2B e4bd0cd95b5c26602e0b81ac96ff16fec065274b9be1991bd3422088ce49cc3574d7739bc9a701bc9025738d28f037419eb099f97bf96168b1e5d5774931231a SHA512 8b40d7de6b2140aad5d207b86327b16d70502bc0137c5035c2926c65d3a7bb205ca00b8143fa10d4d98457290f57a76600c7345740551874833afb9eb9db666b
-EBUILD certbot-9999.ebuild 1264 BLAKE2B 52ed04c95b7c55e6693acf9dd4699dc781d62d34344f5700b20b64d89ef26fd13c5dab56686e3c136068b86f6ff28804d96f146cd5e067455386b4c4fb86f3a4 SHA512 01de2ba9f1bef37e6d7383aff36af69fa5aa614862909b8a97f9d00708e5e1b4026499ffb04ba5052a363f35a260c7f177e2f221e9f7b5b173cdb011558dcb1c
+EBUILD certbot-0.30.0.ebuild 1264 BLAKE2B 87d7d0de1448b779c4e44b28ff1dda3fa2441b0779b1a00a2d3efe6db1b9489b595cb3f4c31989e2cdcb3c0cd9c1ad47058e6530365107dbc3d2b85f108e803f SHA512 687528fcff2f41b4923edae2f5ce30daf04fe5671f359a2b8e33fcfb840560bbab7514a61417b56b2e5171a251a8e5acc5a19cf2fd1e3adf5c356079897f0c6d
+EBUILD certbot-0.30.1-r1.ebuild 1264 BLAKE2B 87d7d0de1448b779c4e44b28ff1dda3fa2441b0779b1a00a2d3efe6db1b9489b595cb3f4c31989e2cdcb3c0cd9c1ad47058e6530365107dbc3d2b85f108e803f SHA512 687528fcff2f41b4923edae2f5ce30daf04fe5671f359a2b8e33fcfb840560bbab7514a61417b56b2e5171a251a8e5acc5a19cf2fd1e3adf5c356079897f0c6d
+EBUILD certbot-9999.ebuild 1264 BLAKE2B 87d7d0de1448b779c4e44b28ff1dda3fa2441b0779b1a00a2d3efe6db1b9489b595cb3f4c31989e2cdcb3c0cd9c1ad47058e6530365107dbc3d2b85f108e803f SHA512 687528fcff2f41b4923edae2f5ce30daf04fe5671f359a2b8e33fcfb840560bbab7514a61417b56b2e5171a251a8e5acc5a19cf2fd1e3adf5c356079897f0c6d
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.30.0.ebuild b/app-crypt/certbot/certbot-0.30.0.ebuild
index f5ff7c45897b..7dcb4fadad64 100644
--- a/app-crypt/certbot/certbot-0.30.0.ebuild
+++ b/app-crypt/certbot/certbot-0.30.0.ebuild
@@ -24,7 +24,7 @@ IUSE="test"
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	${CDEPEND}
-	>=app-crypt/acme-0.26.0[${PYTHON_USEDEP}]
+	>=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}]
diff --git a/app-crypt/certbot/certbot-0.28.0.ebuild b/app-crypt/certbot/certbot-0.30.1-r1.ebuild
index 23369bbd4ef0..7dcb4fadad64 100644
--- a/app-crypt/certbot/certbot-0.28.0.ebuild
+++ b/app-crypt/certbot/certbot-0.30.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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
@@ -24,7 +24,7 @@ IUSE="test"
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	${CDEPEND}
-	>=app-crypt/acme-0.26.0[${PYTHON_USEDEP}]
+	>=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}]
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index f029016bfb6a..7dcb4fadad64 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ IUSE="test"
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	${CDEPEND}
-	>=app-crypt/acme-0.26.0[${PYTHON_USEDEP}]
+	>=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}]
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 43d4b1c06d2e..99e9b5f74101 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -3,5 +3,5 @@ DIST gcr-3.28.0.tar.xz 1329044 BLAKE2B b35bca9b62605c4e0c3d71604ea5e6b7cdd97bb32
 DIST gcr-3.28.1.tar.xz 1334896 BLAKE2B e7035dd0ac5ef9e9b0898e3e4512768ec7cb548cf0ec4ace5a4f0f9a63d3015f8a041bc6f0a0c990c1666eb92c047eab4c19338a8ccf2d8aa9b11830dbd9d5c5 SHA512 ae36c39584d6bc2ba9d86de8bc71eac21fb3251b966ab1eddf467d01ed5789ba6e6597c83ea2ed9403e632893e7c7cb6c17e04878d726b72528af9199bebb3da
 EBUILD gcr-3.20.0.ebuild 1851 BLAKE2B 532e60ee150d6886ea24abda75d29b90acc66f7e055e5941a8c53293dc5491e3850729bc68b8a9f7d5658e0a2b5dd97dc3c0e1a75418fdbf132e0c6b4dbbde29 SHA512 f0c952bff3d6f66c8d75a0671cd886ac0611bd60f7b8a3b29dc71798d545baee9f2e2842ac76a87e34acb05fb200a472fc3bf58d4c0201e5fbaf60bb96efcbbe
 EBUILD gcr-3.28.0.ebuild 1893 BLAKE2B 0a79b21a6797ec4b833b2892632a6597b98db2a6d003abcb98e49cf6c27fa82c7d428ec6c2f63dbcad00a16d4aad52032b8539088bd784e9da8012645d693528 SHA512 cd974cf395b549c1b80a727c9d240fceb75783232fbfc864c9a823be43ffa38339ca40d32473ab29e44b2c1f60859dd5df8bba1d0f51057ebff097e180a08747
-EBUILD gcr-3.28.1.ebuild 1898 BLAKE2B 47fb703bf73521ae6793f28683f3f4308bc1f3097f19e236197a90929d49561bfca5533cdecd8945d3bc80100e90967879e8f866112626b7f4bf7299aba2f6c5 SHA512 3dfd706c254795d9e6ed3911d125d6950032c7ff6ab090b717089b4605975dbb5dca5947fa70bbee5a2864c35cbd9d9894b82049d4b714faca553023d7050790
+EBUILD gcr-3.28.1.ebuild 1900 BLAKE2B f5e119e17247567b57eb2e9b3bb0bf0fb9a0124f4225aa436ed31002a312a89660617ccd5599ee11de19ff30d24a3411e69f10c3b6811461983b95435d5c65f6 SHA512 ea0175fb3452ed095125cecabcb77c2645365ae21a6abcefae74575b970af7fa977616327fa0e9e6fb579a64ce9a703e135d84d3c4ccb55766a8c86962959f2b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/gcr-3.28.1.ebuild b/app-crypt/gcr/gcr-3.28.1.ebuild
index 58b6d1814b0a..74a0d4fdb650 100644
--- a/app-crypt/gcr/gcr-3.28.1.ebuild
+++ b/app-crypt/gcr/gcr-3.28.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit gnome2 python-any-r1 vala virtualx
 
 DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="https://git.gnome.org/browse/gcr"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0/1" # subslot = suffix of libgcr-3
diff --git a/app-crypt/openssl-tpm-engine/Manifest b/app-crypt/openssl-tpm-engine/Manifest
deleted file mode 100644
index 9361d775212e..000000000000
--- a/app-crypt/openssl-tpm-engine/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX openssl-tpm-engine-0.4.2-build.patch 317 BLAKE2B e9467e78d4db86a19df11acf51ea479ea0bc41be9b11aa5d0f120fbda203c27efb15227ce5b2624f04a8933b4618b6f53068b61bb380039a67b8d89718fa6188 SHA512 ef62d70d83cd3251731686e6132cb287b02c1416f59bd1c4ca678f6702d61f505a8b10af387041ce569ea07e270e97983cbb7e00124b8ad4d7eaa1cf01d800a8
-DIST openssl_tpm_engine-0.4.2.tar.gz 528196 BLAKE2B a034c25df32db53775144ffcad74f421176e5abfee346dad3159e8d7a1fdc465421a549a71a5c2a5dc7b414e578fb8eb6b3522e4956a274f5c31635f5a52dcf5 SHA512 376f2aa87ab10d4a77bcc363865238a19e6dfcd548eb1f0780ee223d57d90ebfe7046308757836b76e7f33f4c30f98c0d82126b5e0e0534ec57087384e584f95
-EBUILD openssl-tpm-engine-0.4.2.ebuild 790 BLAKE2B 42e1f23e5838297a9e40068b4df4910622e4c79efe2a3645ad232f00a1da6cc4cc2834bb5411b32fbdb42c9105c0fc4c8ea1b303c2ecbe49e66076474ce3df41 SHA512 4f783c9188fdb340592098e68f595fecd220a44b855d8596bbc65ccd2e5f6ce9c3c8371cf20c1f05ba07acad0ada924a1cfae65f663772ada175604dd114dfd3
-MISC metadata.xml 318 BLAKE2B ed3850eec8c06dbecc55990dcf55c17afb0a4e0e4c3292008e96685c507efbc42797715b988d459fb9b42dfd69c7cb9092e62256b49c537ac74154bf09e4f5a6 SHA512 628ef47a6ad964f7b3ebd288e3ad423192970a060bfae6e95625056d6b1a49c1d36d3f8001ba066a356a9d63203fd4b40d0ee5c213f8735e0e8d736297e6a721
diff --git a/app-crypt/openssl-tpm-engine/files/openssl-tpm-engine-0.4.2-build.patch b/app-crypt/openssl-tpm-engine/files/openssl-tpm-engine-0.4.2-build.patch
deleted file mode 100644
index ed32ced1b3e5..000000000000
--- a/app-crypt/openssl-tpm-engine/files/openssl-tpm-engine-0.4.2-build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 6695656..4932fae 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -10,4 +10,4 @@ libtpm_la_LIBADD=-lcrypto -lc -ltspi
- libtpm_la_SOURCES=e_tpm.c e_tpm.h e_tpm_err.c
- 
- create_tpm_key_SOURCES=create_tpm_key.c
--create_tpm_key_LDADD=-ltspi
-+create_tpm_key_LDADD=-lcrypto -ltspi
diff --git a/app-crypt/openssl-tpm-engine/metadata.xml b/app-crypt/openssl-tpm-engine/metadata.xml
deleted file mode 100644
index 7b14326dd1a6..000000000000
--- a/app-crypt/openssl-tpm-engine/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">trousers</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.2.ebuild b/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.2.ebuild
deleted file mode 100644
index b82881e034e4..000000000000
--- a/app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${P/-tpm-/_tpm_}"
-
-DESCRIPTION="This provides a OpenSSL engine that uses private keys stored in TPM hardware"
-HOMEPAGE="http://trousers.sourceforge.net"
-SRC_URI="mirror://sourceforge/trousers/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=app-crypt/trousers-0.2.8"
-DEPEND="${RDEPEND}"
-
-DOCS=(
-	openssl.cnf.sample
-)
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/osslsigncode/Manifest b/app-crypt/osslsigncode/Manifest
index 81bb6e587a15..88f39470e60f 100644
--- a/app-crypt/osslsigncode/Manifest
+++ b/app-crypt/osslsigncode/Manifest
@@ -1,7 +1,5 @@
-DIST osslsigncode-1.4.tar.gz 96512 BLAKE2B 8325153d16b7ad5d0701daf3d5d446bef498aaf45b88a78d5472d86c0899a73bff2350c224f9f3e35475d5dd72792fe24328f4710d25984ae23c5f83c6fef967 SHA512 89f82b5cbab5952b7bb0b1a3ea230db0c38d171924e5150e9cd157158e52d312cc10093ac719265d03a097f995bd3a438fe874c50263659859c625482ef0239f
 DIST osslsigncode-1.7.1.tar.gz 127631 BLAKE2B f0ced06a33968f03558e189fc9ed2340dba2cdfe823422c760d62476446646f198aed1a95f99734f80e7ec71d23cd286a23e68953f7e432a9a6ff048c76cae63 SHA512 cc5a7e0c5baa2a98db93f1d2cc9d86e732e2a8a55fc20bf8e6aa67e2120af37c6be857dfe4b8eb8c82fd40604dbb3c845190b59c7e6b4147f06b710a256b877f
 DIST osslsigncode-2.0.tar.gz 57951 BLAKE2B 67057c07bb667a546e3a8abc49e8a20a0ef42ae77edacd2e88486a4357e8e8e789307e1c2abd2e13d18401621ba5607bb42af46ed8451546a26bb6855a07e652 SHA512 aec7b101afd96925fbd70ac67a6752997f0dab3987151c0658e5f011d8a6be6f53518d7a4aba6dff696c722a1e669100143a87d07c3f59364cd62693e9f3e4e5
-EBUILD osslsigncode-1.4.ebuild 569 BLAKE2B a65ef8297b8e864a0e6e9d429370dad60af3bace297e23ee651e26156fba8eef12d0f532f1720c0c5160d050f0f5e34915973372181e1723a32f7e7705ddbc18 SHA512 633f36d45f39c15a4534a36d7a3ddb946feaa72b5108fa7337473e96f3d8ea3580cb5d93d91fe3fb4c45f4e3db9bb8873c2f5bce152aa0e8ed0df8287f158d58
 EBUILD osslsigncode-1.7.1.ebuild 566 BLAKE2B b1c16506dc3f8bc5365de9f1012ad43e3f7d24c612b2f165b6a446531e240344a83d92485534e2e164f0c1f0bc4db1e5b339642e206dcce08bf9f9598a7e24e5 SHA512 00925defbd2447e2c4177624d39bcaf203f5600d73eaf6e15fc111119b6ae2a704bf53e7d020b88598ef7709d866b08affbdcac730430de9986440123e5dd1c5
 EBUILD osslsigncode-2.0.ebuild 661 BLAKE2B 6f1a7d79ad04c62a74675e0f0d8d96a7cc315d00d39c6bbc431433b51066016e2830794184a1e9ff6b5862024f382edab3233f2e7ce16158559c077d5410a6d6 SHA512 dc9e8de629017762d7599223597b583200a521a16739edff3d0137e237fa96c829eebc84e129656844ed74169d0c1dbf7e30b0fed828cb864585c24fe3d76a15
 MISC metadata.xml 249 BLAKE2B e2269cf35520934d37b0cace5aaa64dc71ba9917bb90ef01e3ddb5e0208ffd0e2c650008fe88df51ebf6c5c304dbf7670608712f4229cacf62f9c7a747fb8f00 SHA512 9d2ea5145e05b199a7c1cff11164a7eaa9179fec4149b5a0c6f17c5c689d041d68243f4e1cc550617f9649f72ca77d7cadf3d488d1c6cab31bdbdb3fdc26aa9a
diff --git a/app-crypt/osslsigncode/osslsigncode-1.4.ebuild b/app-crypt/osslsigncode/osslsigncode-1.4.ebuild
deleted file mode 100644
index 43d60cc9620a..000000000000
--- a/app-crypt/osslsigncode/osslsigncode-1.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Platform-independent tool for Authenticode signing of EXE/CAB files"
-HOMEPAGE="https://sourceforge.net/projects/osslsigncode"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl libressl"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	curl? ( net-misc/curl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf $(use_with curl)
-}
diff --git a/app-crypt/paperkey/Manifest b/app-crypt/paperkey/Manifest
index 133788f980cd..8d9cdc43ce89 100644
--- a/app-crypt/paperkey/Manifest
+++ b/app-crypt/paperkey/Manifest
@@ -1,7 +1,5 @@
-DIST paperkey-1.4.tar.gz 259446 BLAKE2B bdc011cfefb7fb6b6359bd1506825d4a65b0110ad302671aced6551bfd54fe4588d4adcb35159e9b29c0f056a1d7e0bc932ac1223b325ff4f04397c1a1d0b797 SHA512 d0e87760bfd66c39c407f59f94cdd3dfd8f399a51b854a2485f923f4f1faa95a40a68ffd018b9141b923c1db346993600e5e3644314e4f8c94585d47f1367e9c
 DIST paperkey-1.5.tar.gz 266722 BLAKE2B 8b838b70690a080ca3e579780af890021f218e86dc73099e2adc457c169d2268795e34779d839b63cfe4fec549f44df058d49a853f9c02a878c2163a5e03b393 SHA512 3abe6be913748c08dd2a8fad1e0624dd77a14972abdc76722507ec454aa31cd24fe9ae9f85e256300e568fbc84da6369fbf07f93ae8520f71c46edae4f0f6fe6
 DIST paperkey-1.6.tar.gz 271424 BLAKE2B 625a26bbae93122acf553036e902421ec630f6f92507b1f6dd231e970fc8d94a9d7017018bb783f934a37577de3e0c4f1fa68ca359c3de06f1a87590c188d266 SHA512 a07fc22bf56cd9524ecba61d1bf00102e6e97842e219682771187a2a2327c9daa885d457417bb2ea960f5ebd66bd711fa1d86687fda159647ff47980dee21b01
-EBUILD paperkey-1.4.ebuild 342 BLAKE2B f0d8636fc7b87828cf0b9c1c4e01ec5043f4cb7c53a6fcdb269e209cfd26e2c4e2f13d3053d89cbe093391d925219b46db3e91b5395501ac5b975caa71f4732e SHA512 841f89c09c1af3c4e7a05a356bb3f90d04037ab17cd176d2b14f0827f7a26db630b66f3e559dbbc23563d04ad30019181651a4837bf9a72d7e9703f8892e9839
 EBUILD paperkey-1.5.ebuild 350 BLAKE2B 8476d7e01275eb1beb1ff2833c9d497ab229256e62e6778df478ad29eba3a54110257d22aac315b0f4bdbc3bfb4fa20f5384ef00a4898a7705775c1d110a4809 SHA512 215a9f17c548b6254d37a6f9d9faaa335916d37bd13ec262dcac2d663e66b4de8730b34c70bd1eb6108149afde67ded43571fe2e8e9c5b8950b4ba2c342b03a8
 EBUILD paperkey-1.6.ebuild 337 BLAKE2B 3f58078909d1f643b1920527e2680daf1cbc87a01e9c3bb4ba52dc20039e1d1bc13a734a467a83c697420f94eb3a812369ae4d2a75fc1858f458e31fdf5bfc30 SHA512 8e579362c86ef0b53c7c824ca1fa33916243580ccbdf4676e96fbf56433fc95c8d9a872c054bdb1ebbbe000c9c17a9a3355679486277b21e6324194ba2925b77
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/paperkey/paperkey-1.4.ebuild b/app-crypt/paperkey/paperkey-1.4.ebuild
deleted file mode 100644
index c9c2b53e63cb..000000000000
--- a/app-crypt/paperkey/paperkey-1.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP key archiver"
-HOMEPAGE="http://www.jabberwocky.com/software/paperkey/"
-SRC_URI="http://www.jabberwocky.com/software/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DOCS="README"
diff --git a/app-crypt/pgpdump/Manifest b/app-crypt/pgpdump/Manifest
index dadfe6583cec..e77204791e51 100644
--- a/app-crypt/pgpdump/Manifest
+++ b/app-crypt/pgpdump/Manifest
@@ -5,5 +5,5 @@ DIST pgpdump-0.32.tar.gz 65444 BLAKE2B baa7d9077799f6295adf2927933f1ccb466dd7afe
 DIST pgpdump-0.33.tar.gz 65730 BLAKE2B 9941f55a070c219b1b6096939f1a8d775d85c8de60154f2ca93709b489605c8c3937bb4e250390fc71d152bf23c5a22f37226a64ff57036268cf49d793c215bd SHA512 976e2c185c9d72302c9c020dde1d2872b01fd9c2195be0d43441a03c3c6a4a70636f8ac2b35e3fde30e45ecc7fc1c23d7c92dcbd90fc503bbcdef73e3483e9c7
 EBUILD pgpdump-0.30.ebuild 552 BLAKE2B 7d1941dff7af58734a07664c8cb2ea84187ec8faaadee8a83118a5ecb1b552941858fcf1c6cbb5df83730ea481af2d37ab3189fa751030457874498bcd705cf2 SHA512 4d06ab2adcead278d58d1a9366919e83d57b32b98c89a2eee4bd667c8853f3ff7289be99c225179781cfb4d0e92823d7f2af41f5eb93f9ef1e3183efccfcf279
 EBUILD pgpdump-0.32.ebuild 528 BLAKE2B 77bc198cde30232d9d4b37928449b704857778f1b54dfc2bd4c23733afc05f19c7229f6a431ce0ac761e71a69d772575c316bc4ca8fbb49d298db85f96b1375b SHA512 f99dfcc371d372dc6cfa9613c4f40336dfaeacd08851f0302bed6d5f91814dc35e31d4a3ce0cf273c3e4a8781cb02aff907d31861f863a0c5f5d9e2dfa5126a9
-EBUILD pgpdump-0.33.ebuild 528 BLAKE2B 50a12fcf48bbb498debe29c1ee57ba15d83fe7eb0d9d6488efb49a0da5d949e03696ef97d5bc3c320c34a7ab5504f65663b6772ef58f72970defd0cb0362aff1 SHA512 bbc1474b856606b888002043d231d2a1fb082c13020d2ab58a5064baca69f770e31a3a358fd049b62a12dfbbcf68073ee7014a39d51467b06a50bf29a8692183
+EBUILD pgpdump-0.33.ebuild 523 BLAKE2B fe7710582822ece84c4a828479bf47a76658833b62999c5175f76c84de7f475fd46c3c6e99696108590b5cad1da56bfb6b8e1413fa13db8b8659fa41632b9f4d SHA512 1c1398255e2a763749bb8fcfe2194aa3c15282eb8ca13e75c324c9a34f87a1b79ada228bec5f6417ba82eb7b6a61da4880930a378737ade2c0f335c46272b521
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/app-crypt/pgpdump/pgpdump-0.33.ebuild b/app-crypt/pgpdump/pgpdump-0.33.ebuild
index 38fcf5506fc8..8ff83e09376f 100644
--- a/app-crypt/pgpdump/pgpdump-0.33.ebuild
+++ b/app-crypt/pgpdump/pgpdump-0.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://www.mew.org/~kazu/proj/pgpdump/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc sparc ~x86"
 IUSE=""
 
 DEPEND="sys-libs/zlib
diff --git a/app-crypt/tpm-emulator/Manifest b/app-crypt/tpm-emulator/Manifest
index 483d76cf0745..ca6abaec814a 100644
--- a/app-crypt/tpm-emulator/Manifest
+++ b/app-crypt/tpm-emulator/Manifest
@@ -2,5 +2,6 @@ AUX tpm-emulator-0.7.5-build.patch 1150 BLAKE2B ef771dc31982c3b288a61bd0537df254
 AUX tpm-emulator.confd 20 BLAKE2B 13dd9f09a0a4efb9a039bfeababb5f00b8b2c3c1777e60c531e874ef6f3b4d00319d7962bd321f8530289c797ea110f6cde91bc6af338e38be7d96f71f6474cb SHA512 824d35e037f1036d53353bd0e2bf9136cd94d07a71df9ebdf32a513ff53a47b25e38e3b760e58c18909559f1adbea2faae615c25f2cf9f1df03eef8582648bcc
 AUX tpm-emulator.initd 776 BLAKE2B 0daa0247396d1b5f1c9542b28f825899a5cc45bd748b6b7e2328440fd466fd6b461e32487a955816a79827bf350cfb33bd71a6b197a8e67dbf5509750098cb59 SHA512 22d7b163dc6f567c1900a275ae545c4421b2d459ba535a24f48d7ad2609f5df36533849aa781d4dd704961db102eea08c99b79c01d0e3981fb46d2eb4e39d6fe
 DIST tpm-emulator-0.7.5.tar.gz 222341 BLAKE2B c6dc7494800f4c6d1f5e622c6a47fdd5487e0f2cbc34173d9039d6eb5fd7541dd2c1f514efbf220c605424059844e18650b31ee9934eda6626427b915fd6bc53 SHA512 24c16ec36ca92c484d6e8dfa53c8ca00dbc5b58d78d7166041db1e9ae277d763f0fc0a6b0cbd7e62fcf4671f6ad2d8df1213256be0a4200b79b6ee61ab73b2ef
+EBUILD tpm-emulator-0.7.5-r1.ebuild 1714 BLAKE2B 9859186e9745a64ccb8cc65d4a3aec3c6cc16a4481e453cfa2e6611687892734be5d878a62039c3f99d00b515c7391e40bb86c5ed285d6063bb9c1d360cb19f7 SHA512 79d8f027b36b54433aad52c3fe8dbd8bfa3c2a2e16b811b9d3f78571c13e51a769816dcab6f44e75254da5f964e81ede9bc04f3915bfbc7bc72e6ba4402f0561
 EBUILD tpm-emulator-0.7.5.ebuild 1858 BLAKE2B 9f11f93bc01efaaeeca6f200b0705b9093c3b109e4af46502f187f079993ce735a1653d101561ca66b12444a63f67363198a9f890e7af954d2d6fdc47725f64e SHA512 2150882b2cfcd440ba40688683c045c25337c570059d11cc37be4fc88723ae5f617cf2de452355f79fb964e1cc66445271e8cc0bd9e10df8c25a212a5352854a
 MISC metadata.xml 395 BLAKE2B 053fec93e12819e95abadca4f2e9f871589c21ce8a7369092cfb04cb593a4fa687956458dfc2c7249b6951bb3b7c45f6c38fac1448d9e5d250ed8256f92df327 SHA512 dd69f6a31ebaa3971c316d967bd643654d11465bb0de20059ea82a4851691b605c42deb4846614627ae9c8b2b30075e6c44e53f9810999839ceaf2e9ee9aada8
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.7.5-r1.ebuild b/app-crypt/tpm-emulator/tpm-emulator-0.7.5-r1.ebuild
new file mode 100644
index 000000000000..c4ca2397fd2e
--- /dev/null
+++ b/app-crypt/tpm-emulator/tpm-emulator-0.7.5-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MODULES_OPTIONAL_USE="modules"
+inherit user linux-mod cmake-utils udev
+
+MY_P=${P/-/_}
+DESCRIPTION="Emulator driver for tpm"
+HOMEPAGE="https://github.com/PeterHuewe/tpm-emulator"
+SRC_URI="https://github.com/PeterHuewe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="mtm-emulator"
+RDEPEND="dev-libs/gmp:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+pkg_setup() {
+	enewgroup tss
+	enewuser tss -1 -1 /var/lib/tpm tss
+	if use modules; then
+		CONFIG_CHECK="MODULES"
+		MODULE_NAMES="tpmd_dev(extra:tpmd_dev/linux:)"
+		BUILD_TARGETS="all tpmd_dev.rules"
+		BUILD_PARAMS="KERNEL_BUILD=${KERNEL_DIR}"
+		linux-mod_pkg_setup
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMTM_EMULATOR=$(usex mtm-emulator ON OFF)
+		-DBUILD_DEV=OFF
+	)
+	cmake-utils_src_configure
+
+	use modules && ln -s "${BUILD_DIR}/config.h" tpmd_dev/linux
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use modules && linux-mod_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use modules; then
+		linux-mod_src_install
+		udev_newrules "tpmd_dev/linux/tpmd_dev.rules" 60-tpmd_dev.rules
+	fi
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	keepdir /var/log/tpm
+	fowners tss:tss /var/log/tpm
+}
+
+pkg_postinst() {
+	if use modules; then
+		linux-mod_pkg_postinst
+
+		ewarn ""
+		ewarn "The new init.d script does not load the tpmd_dev any more as it is optional."
+		ewarn "If you use the tpmd_dev, please load it explicitly in /etc/conf.d/modules"
+		ewarn ""
+	fi
+
+	einfo "tpmd socket is located at /var/run/tpm/tpmd_socket:0"
+}