gentoo resync : 17.01.2010

11 files changed, 207 insertions, 8 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 274d2bb3f235..685d2a7a02eb 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index f34bdd23a0d3..41a3bd9d236a 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,10 @@
 DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
 DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
 DIST certbot-1.0.0.tar.gz 1336032 BLAKE2B ca26cfd3d9f802b09eaf387225f24fbb01385f81dfa661dfb5acbd97982a6fc773c56abf6b3f99db7f2b0cdc8c5a7175d264714592858b38217e444d4e1d2b4b SHA512 649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912
+DIST certbot-1.1.0.tar.gz 1346768 BLAKE2B 5c86edec3102ce0eb822465458ec86cbc98eb5e76c3c582d8a72ecab91e709f16e7a1576c684bc04bfd0c70918f34e84e0b3b264f949a1fb9bf9503fa9d6b179 SHA512 905b21a8a50b4df4eb92b464d10dec094ba4e7f5eaf3ad3dae1704a794952df6b51873ca919246a9b6698fd652a7c264efc742617ba0a25757ab99397759c343
 EBUILD acme-0.39.0.ebuild 1744 BLAKE2B 734b126626b41f7ba046178e124f9c44c78780b46cdcd0c9b0f4ad26234786bd8a9ee671db44389da7f5974bf62a485becadf4a70b29f8f93df3eedf16acf274 SHA512 31e18e93384147859a65562ab0dca57e7c2e8a646194932b316cd28e8c3a81f43d628340448720846b823230807f43e6dceec6f237cbcb4482585e4ac706fbbc
 EBUILD acme-0.40.1.ebuild 1744 BLAKE2B 734b126626b41f7ba046178e124f9c44c78780b46cdcd0c9b0f4ad26234786bd8a9ee671db44389da7f5974bf62a485becadf4a70b29f8f93df3eedf16acf274 SHA512 31e18e93384147859a65562ab0dca57e7c2e8a646194932b316cd28e8c3a81f43d628340448720846b823230807f43e6dceec6f237cbcb4482585e4ac706fbbc
 EBUILD acme-1.0.0.ebuild 1744 BLAKE2B 734b126626b41f7ba046178e124f9c44c78780b46cdcd0c9b0f4ad26234786bd8a9ee671db44389da7f5974bf62a485becadf4a70b29f8f93df3eedf16acf274 SHA512 31e18e93384147859a65562ab0dca57e7c2e8a646194932b316cd28e8c3a81f43d628340448720846b823230807f43e6dceec6f237cbcb4482585e4ac706fbbc
+EBUILD acme-1.1.0.ebuild 1750 BLAKE2B 93dd49e3c1329e7377544581c53aaf2a949a6d8f3f9d09a121e50c52fe618714b6173cb82b3a7179591bcff12051389e35705bac79bd1e6eacf45e3a67bcb59c SHA512 80cdd3fc105bd094a3c78066b4913112871a150e4797db5469450cbb709c17a63c1b39c0b2932d819c9f47242872801fba31b16b7b0072a1f15de8a42939a849
 EBUILD acme-9999.ebuild 1750 BLAKE2B 93dd49e3c1329e7377544581c53aaf2a949a6d8f3f9d09a121e50c52fe618714b6173cb82b3a7179591bcff12051389e35705bac79bd1e6eacf45e3a67bcb59c SHA512 80cdd3fc105bd094a3c78066b4913112871a150e4797db5469450cbb709c17a63c1b39c0b2932d819c9f47242872801fba31b16b7b0072a1f15de8a42939a849
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-1.1.0.ebuild b/app-crypt/acme/acme-1.1.0.ebuild
new file mode 100644
index 000000000000..da68660fa26a
--- /dev/null
+++ b/app-crypt/acme/acme-1.1.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+	if use doc ; then
+		cd docs || die
+		sphinx-build -b html -d _build/doctrees   . _build/html
+	fi
+}
+
+python_test() {
+	nosetests -w ${PN} || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index fdc7eb71346a..30ec8c0ea7ac 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
 DIST certbot-1.0.0.tar.gz 1336032 BLAKE2B ca26cfd3d9f802b09eaf387225f24fbb01385f81dfa661dfb5acbd97982a6fc773c56abf6b3f99db7f2b0cdc8c5a7175d264714592858b38217e444d4e1d2b4b SHA512 649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912
+DIST certbot-1.1.0.tar.gz 1346768 BLAKE2B 5c86edec3102ce0eb822465458ec86cbc98eb5e76c3c582d8a72ecab91e709f16e7a1576c684bc04bfd0c70918f34e84e0b3b264f949a1fb9bf9503fa9d6b179 SHA512 905b21a8a50b4df4eb92b464d10dec094ba4e7f5eaf3ad3dae1704a794952df6b51873ca919246a9b6698fd652a7c264efc742617ba0a25757ab99397759c343
 EBUILD certbot-apache-0.40.1.ebuild 1101 BLAKE2B 66cdbe3b5e7206e4d7fadddf3b753040ad16528fe56bdc1a6c834c1be7e45bb1c1b195575ef9c9e8067e10cb871ba899a7fa440cf787ba62f9c9730d30b25218 SHA512 aca7ee1371497e50be16734735a50003ecb36749c73e242d1c7c127b49576260d095286ae7cb9220a4a670c8cca86debf6b93724a15316f18892b5b07aaa3968
 EBUILD certbot-apache-1.0.0.ebuild 1101 BLAKE2B 66cdbe3b5e7206e4d7fadddf3b753040ad16528fe56bdc1a6c834c1be7e45bb1c1b195575ef9c9e8067e10cb871ba899a7fa440cf787ba62f9c9730d30b25218 SHA512 aca7ee1371497e50be16734735a50003ecb36749c73e242d1c7c127b49576260d095286ae7cb9220a4a670c8cca86debf6b93724a15316f18892b5b07aaa3968
+EBUILD certbot-apache-1.1.0.ebuild 1102 BLAKE2B 1551f97612e57eb681e2f240dcae60d1887b253836d34eaeb61c25bbdb3699dde8ad9343e09995d7716567f1a81b438f5a597046a3a4aedfa203624b3ff85030 SHA512 d366870c966c749dd720c4f882c14b6d41056bb17ee243be2ee5b9b92f76bcbec6bf6247c96738679e994658c147e191dcb714ec4467a21cefd725303203fa30
 EBUILD certbot-apache-9999.ebuild 1103 BLAKE2B 84acaedaf61419da63f51b28aa28d987a93da73f69bfb1be06aff403abbc7f1f08cd31a71d08ca2b563f3872b13b1220024ef93085fdb3c9ea00f21b07a21ebe SHA512 e07bafd8f6f4a3308c1fecd01f1a62dfc761c27b26f34b022fe4a447e476b3cf16dfbe7afbb6de9c701d44a1df4d3f95cb5b4bb122c41ef8c9662b52690b31d1
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-1.1.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.1.0.ebuild
new file mode 100644
index 000000000000..d7739ed00d89
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-1.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-1.0.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests || die
+}
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 23e9c28d7383..4213f884dfbe 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
 DIST certbot-1.0.0.tar.gz 1336032 BLAKE2B ca26cfd3d9f802b09eaf387225f24fbb01385f81dfa661dfb5acbd97982a6fc773c56abf6b3f99db7f2b0cdc8c5a7175d264714592858b38217e444d4e1d2b4b SHA512 649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912
+DIST certbot-1.1.0.tar.gz 1346768 BLAKE2B 5c86edec3102ce0eb822465458ec86cbc98eb5e76c3c582d8a72ecab91e709f16e7a1576c684bc04bfd0c70918f34e84e0b3b264f949a1fb9bf9503fa9d6b179 SHA512 905b21a8a50b4df4eb92b464d10dec094ba4e7f5eaf3ad3dae1704a794952df6b51873ca919246a9b6698fd652a7c264efc742617ba0a25757ab99397759c343
 EBUILD certbot-nginx-0.40.1.ebuild 1008 BLAKE2B 4d895d074f5435d98110b07da9d257d1d7c90d2c587d7da4c6c096c7672c1766bb7edf8be9d629f603f3bfc2db42c1f45e77cb74b9b73397a3fcc26e490ab954 SHA512 67dc280acb81a1033e01b36e8894cd50f9df9dca3c64e1412107b30ef4be0c68aac564911ec6eb835680f071eb2365ddf04ad52b424cf396667b959a1f9e22f6
 EBUILD certbot-nginx-1.0.0.ebuild 1006 BLAKE2B 6cf500750450e99fbbc69f6f3cafa45ced1dc78ed608d8260dd9509b40ac97a4e0d8ca0e24def32704417d633504eb9b68c402ce02a6db59f876de0d4cd2f32c SHA512 ce348dc452de4cded12eb633d75f647702ab2d72c241b574428c91cc6b3c04939245e089d17e023c588fc1ac2f3e0380359740a5abbdd895f1e28be0a8198862
+EBUILD certbot-nginx-1.1.0.ebuild 1008 BLAKE2B 931887bf14479cb91c2963642a1302fb07f032a9aa57f97953f485db16a176511bc7b0cea39f319d9e1da0db2fa5e771406b524350813c6d7108c7f91c8ef038 SHA512 bb58e74009c0051fabd22f2d5384de642fdfcfdf259eff6fe91b33d58506c19fd24c8abc72bf602ac02a4403f879740e400de5ff732f8e34b967a2bc874d021a
 EBUILD certbot-nginx-9999.ebuild 1008 BLAKE2B 931887bf14479cb91c2963642a1302fb07f032a9aa57f97953f485db16a176511bc7b0cea39f319d9e1da0db2fa5e771406b524350813c6d7108c7f91c8ef038 SHA512 bb58e74009c0051fabd22f2d5384de642fdfcfdf259eff6fe91b33d58506c19fd24c8abc72bf602ac02a4403f879740e400de5ff732f8e34b967a2bc874d021a
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.1.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.1.0.ebuild
new file mode 100644
index 000000000000..b7c737e19b3c
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=app-crypt/acme-1.0.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-1.0.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index fed5e018bf9e..814d3df6a92b 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,10 @@
 DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
 DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
 DIST certbot-1.0.0.tar.gz 1336032 BLAKE2B ca26cfd3d9f802b09eaf387225f24fbb01385f81dfa661dfb5acbd97982a6fc773c56abf6b3f99db7f2b0cdc8c5a7175d264714592858b38217e444d4e1d2b4b SHA512 649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912
+DIST certbot-1.1.0.tar.gz 1346768 BLAKE2B 5c86edec3102ce0eb822465458ec86cbc98eb5e76c3c582d8a72ecab91e709f16e7a1576c684bc04bfd0c70918f34e84e0b3b264f949a1fb9bf9503fa9d6b179 SHA512 905b21a8a50b4df4eb92b464d10dec094ba4e7f5eaf3ad3dae1704a794952df6b51873ca919246a9b6698fd652a7c264efc742617ba0a25757ab99397759c343
 EBUILD certbot-0.39.0.ebuild 1432 BLAKE2B 67d86895ea48efc41c4027ed1ded1a9df8ec9d47465737c72755848b8cf256f00e7f9f9c48d6031f462f375cad7e3458531731befed92b2428e413097f0ee30d SHA512 bb2dea6370c5736b2ec1ae45f063d9e934ef796a5a57d0e0d389183391254e536135d32c8d01d63884ca49677ed3075326cb30504156f0d4447d10dba59d6663
 EBUILD certbot-0.40.1.ebuild 1432 BLAKE2B 0fbe7131796c2adb6d6ba5e598cdd9099029b90aedc643f9cb02707bcd3e77d68346317370b511fcc08fd7257339cbfd6e112a16ae2dfb6faef4555aa317fcca SHA512 b75782ac4f4281f22cf52525891ea0b256a3c97e7f082c5c897c4bca713076b53370be98f82f382e4beb96f1acf1041911a328e35a8f623202ee6c44a2c6495b
 EBUILD certbot-1.0.0-r1.ebuild 1459 BLAKE2B 4922cdb95f523e70d51e8f2ea52a50f29e5293caaf8b024d0d56bc02047565acfc5cd3584e602a38192c5a96e41e5bd8d436f8e0b9cc6d34bb3ae80df5d0c9b8 SHA512 a4f0003e86bc27fdb734b0551762d915f1662da62ebcf4af69bdbbaa256fc4d37f7206161bd73b8fdbba1a354cc32c387977fe573708c98e0726fc03458f7cc3
+EBUILD certbot-1.1.0.ebuild 1459 BLAKE2B 8786bdd75cf34ba205d6df9eaab74946dc3253bb1aa087183181e440f9a79dee26ce35c9a61fbe6ffc8581d08fe30c33a376a3189cab8e8146326574ed5b37cf SHA512 49c5da10cc52f8ffa40f71ef4bd33ebade098dd9692e99ed669a9a49e1c5602bd171d3ab3a5a48b5e37e1ba79967d14a55aad30c56fe1da6d50c664a5719cabb
 EBUILD certbot-9999.ebuild 1459 BLAKE2B 8786bdd75cf34ba205d6df9eaab74946dc3253bb1aa087183181e440f9a79dee26ce35c9a61fbe6ffc8581d08fe30c33a376a3189cab8e8146326574ed5b37cf SHA512 49c5da10cc52f8ffa40f71ef4bd33ebade098dd9692e99ed669a9a49e1c5602bd171d3ab3a5a48b5e37e1ba79967d14a55aad30c56fe1da6d50c664a5719cabb
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-1.1.0.ebuild b/app-crypt/certbot/certbot-1.1.0.ebuild
new file mode 100644
index 000000000000..e3c2f890315a
--- /dev/null
+++ b/app-crypt/certbot/certbot-1.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+S=${WORKDIR}/${P}/${PN}
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=app-crypt/acme-0.40.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	# acme is not installed, removing it here is fine, the dir just confuses tests
+	rm -R ../acme
+	pytest -vv ${PN} || die
+}
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
index f0d4a075d58b..55fe0bb8a1c1 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -1,12 +1,12 @@
-DIST keybase-3.0.0.tar.gz 47018995 BLAKE2B 73aaa00a94af707dc7e0713c4e0a5b2d7d7ae8a6ebd6fecae6bfdaf7c011b0d6cbea472940f718316aff45da4c4eccde73c15df6a77229bd09be704ebb949ca1 SHA512 40ddbd6fc5201bbca087490022b021e6abc201dc428327e8974953d0e5cd403324cebf1ace29a22126eee0d1e36f84e85d443a236a7271ccdd79605abfe6fa72
 DIST keybase-4.4.2.tar.gz 57819398 BLAKE2B 0852aa850ad4d66457a123e97449ae24081b695b2a6a70aa0b7ad928d59aa163b9a199e806090586579cc87ee77ebd5dcb18fb137b57aec7d61007be1cba51b5 SHA512 5eccfde7cfa35277fae71c4527c0d93bcedd0657311a9c055e50330a97a24e8c339aa3778e6e926f1230542c898e6a27c4fad18c4e2486c084c6b8d58eb2e125
 DIST keybase-4.5.0.tar.gz 60207510 BLAKE2B 11acd22139fa33988a13cce3db62c7000aedb9d157de37d589a450910628a9325edd38a5dab150b7b053112e3f40930c0e569be6c990cff559bdc64dd0d34376 SHA512 5299d7eab28d487299200a97beb894a2254a2d6a525053b9acac8bd2088e581097bdb8515c9d37ed54ce3f27996e0dacd5ef943acef3c976646c85f00003bf52
 DIST keybase-4.7.0.tar.gz 63827539 BLAKE2B 237a638b9b4e6dad9a0b0e0146d355f94ea87c459e64edca4253dd8f2eba4ba959a0d1e4ebd768b6572d0ab9c4f05abed539a3d8a778b23ae840a202e3fc6144 SHA512 4dc49b102f7d18345c960081a0a8cfa4d36f19159ec09ab468eb3c86e0ec2c259e9c4b2b769ea57c555c79f3cfb457c7896ca05bf185c9c5725f9458377e4048
 DIST keybase-4.7.2.tar.gz 63834062 BLAKE2B e4d2977982d60e191e51ea54b64d52930524a71d1159da15fac8280a4be866d51804a928b2db60fee211a9ba499a6af63a7ae2698d7879ed2eaa3704cd7f49ab SHA512 4d43e2ab222b8c82fc97c15c52c718323ea19ffb2be35d19b5f631960d452f8cfe2ac48bd87e13f8e03587a7ed32ded233774a3230bafced7adb6c6f2818c891
-EBUILD keybase-3.0.0.ebuild 1306 BLAKE2B c6607f27d1433f6405e605cb66efcfd8198bc6c5de194748c2620609d11c22541128a96d16eb561a57015f586cc2219e0cd3070dd62b71c75f0dc71495433513 SHA512 54a92ee6235461d3c8ef8293d8334a9b89c94fffc71373cf95d25c47be6e8cf977f642b54e86a21a8e809f5cebd00afb6d7651baa080185b460f2680f18d414d
+DIST keybase-5.1.1.tar.gz 65387553 BLAKE2B 8207fb1113a8585d562c19a9d886083b9bec57091f83dee52d4fbc735020be1dd9fc3194c29f4a736ee04fb1550cd03f3d9c4ef6b112aa1b6399e1200e3771ac SHA512 8a1bab428b3c41e7cdb45f5ea68a6c86067c9324c07ea71704bde8a5b5ae478a8468cb8d8638a41b7067b2ab5dc825d2aa28c4e7be4f33e3e3a41c942d852e09
 EBUILD keybase-4.4.2.ebuild 1280 BLAKE2B 7fbd0a92a0fab91a0095112eb2036c01b1f932ee3d79aa05b1dfa37190d428f9ebd18c278d6d1b7fa1e498ab5fa6d11f31c3aa0113e7b14a800df65903c38b2e SHA512 da8172a038a2dc7f93ba6e48baf783d6ebe236e4ec20ea189a4f2758d5eed1cac9151a7c826aaa184fea7e095c76ec1704fc9cff5c61b6beb5e7e6e088a01cd1
 EBUILD keybase-4.5.0.ebuild 1316 BLAKE2B 48a2935ad0328de10bccdbbcaa51defbbd844f2ae4e8b96e9de258c18308e78ba7ff3ee81057ee6060f927d81ca7bc76e2488fb324871e5524da6206607a51e9 SHA512 bb531b75c9be611e5d7bfe6e247e8af391dee2bccc0c172feaa3ddd2cccc5c1ac0f39521bcd19e270c66b51cbeedb2e6e9a55387b63529b11b6a1fe220adc1d6
 EBUILD keybase-4.7.0.ebuild 1316 BLAKE2B 48a2935ad0328de10bccdbbcaa51defbbd844f2ae4e8b96e9de258c18308e78ba7ff3ee81057ee6060f927d81ca7bc76e2488fb324871e5524da6206607a51e9 SHA512 bb531b75c9be611e5d7bfe6e247e8af391dee2bccc0c172feaa3ddd2cccc5c1ac0f39521bcd19e270c66b51cbeedb2e6e9a55387b63529b11b6a1fe220adc1d6
 EBUILD keybase-4.7.2.ebuild 1316 BLAKE2B 48a2935ad0328de10bccdbbcaa51defbbd844f2ae4e8b96e9de258c18308e78ba7ff3ee81057ee6060f927d81ca7bc76e2488fb324871e5524da6206607a51e9 SHA512 bb531b75c9be611e5d7bfe6e247e8af391dee2bccc0c172feaa3ddd2cccc5c1ac0f39521bcd19e270c66b51cbeedb2e6e9a55387b63529b11b6a1fe220adc1d6
+EBUILD keybase-5.1.1.ebuild 1316 BLAKE2B 70df211571ae153e9789c0945523e598a353e228559ef2927bfe02d4c1e7282b38b3f4801303bf5743db8ad815b803594d3311fc6931bf60bc725a4c3cce4437 SHA512 ae57c6565bb515286ff48ebc8cd8ed8e6d435bf12439e8ff7b5415e3faf4aaeb894a0acde2fa13a2b3fad400e97a1721914080cc898156492de5dff3ed9afdbf
 EBUILD keybase-9999.ebuild 1276 BLAKE2B a38e94b63e54ace5927b6d7c58fe6586c374b73c0836898db0d073ffea4dbe3cacc0538fd048883ae86c34cffe53d9d1ea3a1acd211d7cd80d88b5f630d4ab48 SHA512 044e15f79885d5987bee77c8332537d155b9e6a876032bcbfc8670c073b26828afed653073a003e9c17a256f2e9823ba776fda0689274e81b13c9614f302bd72
 MISC metadata.xml 465 BLAKE2B a1dcb592edbf2e5a45bd985adea8fa09504f75b17f689f38c415dff3efd0a4c67b3476c8c7568dc2b8351117281c94da4235cb1b9144d1636f04ae3b2055164e SHA512 68da266d0856035ec7f0b2ac5f8746ad6c7afa023ccf2d592be43fbf45f12f1443afdceb075ab57efeeceb97dfcc0a3997ed7177e12ae6291467e97c17e10810
diff --git a/app-crypt/keybase/keybase-3.0.0.ebuild b/app-crypt/keybase/keybase-5.1.1.ebuild
index f2abdbb420ff..243bc44f883b 100644
--- a/app-crypt/keybase/keybase-3.0.0.ebuild
+++ b/app-crypt/keybase/keybase-5.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,15 +9,13 @@ DESCRIPTION="Client for keybase.io"
 HOMEPAGE="https://keybase.io/"
 SRC_URI="https://github.com/keybase/client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="
-	~app-crypt/kbfs-2.11.0"
-RDEPEND="
-	app-crypt/gnupg"
+DEPEND=""
+RDEPEND="app-crypt/gnupg"
 
 src_unpack() {
 	unpack "${P}.tar.gz"