gentoo resync : 04.05.2019

4 files changed, 45 insertions, 5 deletions

diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 957473dfb989..81ade8cbe23f 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-0.32.0.tar.gz 1284873 BLAKE2B c3fa538de87b67680a7bc7465d77ab2947606aec4def3717b5d942c83254ff758d751e137bfe33cb6f9362a11a9bad7fba0337927b638f3af7ddf304d408c447 SHA512 fa61e975d2ce09efa3570118f220cd9f9d2fc8d5ab408feb4c4e50bfa795cb28be6c7a78497fb10bc91e577e908126988197ae5d016be4823c5c4ddb68cbf5a4
 DIST certbot-0.33.1.tar.gz 1304071 BLAKE2B 400c12ce254780fc0f336bbcff7917ba1ef4c6a0a708fb9607b79f8e966720a77adea9e56dc110c9424978d18eff15bd372141a0fc79edfb9f8fcc41f5f09f2b SHA512 055030e1ab1d3eb57b980c44732c8ec623d99de2d797a2b825bd2b816fce5b4c4d63d09178eb0a79fb83d991d63f00a149cc043067a2ae42a0ddcaa4fd329979
+DIST certbot-0.34.0.tar.gz 1346939 BLAKE2B db0d7bc716206ff9bebcf953b72e29f46e335209d70e518eeb11d944bab26e2fbe15c6bbe448861cbd71c744dfc22aa8cb54b96dfc5d15d497af8a91cfbc6e45 SHA512 24d4a58bcc220451532b1b7d1ddaa90ef773935ff65c2b06e121f044b5575d159555a757660abebd72ff4134a257394dbc99c981729d846d565c75f692317a30
 EBUILD certbot-apache-0.32.0.ebuild 1074 BLAKE2B 4a0867a89a9a3f9cce6771b3c7e1b44f1e644b03ad3f5318fb0d1c4411f1b8b18c8cb6f902558effbbc10f2bf31961119d97af1ddaf51c7b962eea545b0486d5 SHA512 a281f2cfe0b59ceaa3caa5e0aa06deef85d6dd3b07d83e3b8d6078822d203a6fd5658eb61fa72b71f0dcf99d98bdaceda2472f09678b2fb2165dd6f4f20a4c9a
-EBUILD certbot-apache-0.33.1.ebuild 1076 BLAKE2B e9a71456c200b4ca7540f773d9e265d1da64c5ab3be89111db21ed590a8f399695cb7469c14f2e87c9d5b43cd68493bdc35a0f6542cb0b8ecb7803a8067a443f SHA512 99b21439a995b8f12e369d51f5d48f7585176824fbe7b5c6f130ccc272e516d613ccda18c10b87fdc75b88e22e2e7099165ff6a6a9fd998b228e77b23cfe438f
-EBUILD certbot-apache-9999.ebuild 1076 BLAKE2B e9a71456c200b4ca7540f773d9e265d1da64c5ab3be89111db21ed590a8f399695cb7469c14f2e87c9d5b43cd68493bdc35a0f6542cb0b8ecb7803a8067a443f SHA512 99b21439a995b8f12e369d51f5d48f7585176824fbe7b5c6f130ccc272e516d613ccda18c10b87fdc75b88e22e2e7099165ff6a6a9fd998b228e77b23cfe438f
+EBUILD certbot-apache-0.33.1.ebuild 1074 BLAKE2B 4a0867a89a9a3f9cce6771b3c7e1b44f1e644b03ad3f5318fb0d1c4411f1b8b18c8cb6f902558effbbc10f2bf31961119d97af1ddaf51c7b962eea545b0486d5 SHA512 a281f2cfe0b59ceaa3caa5e0aa06deef85d6dd3b07d83e3b8d6078822d203a6fd5658eb61fa72b71f0dcf99d98bdaceda2472f09678b2fb2165dd6f4f20a4c9a
+EBUILD certbot-apache-0.34.0.ebuild 1076 BLAKE2B 04c24a70b59c93892bad5c8f2e51da4484f47357da5481c382bc8026be40ae903e403f3fca9013115cf1dbb9bdce20c783f9d0ce3cd870f62e38aed97c9fecdc SHA512 19d250829fbb9a15000f426332489cd443945cdbebfa1c383d7c64fb26fc0d4657de11b5b553c73787f158f6607cdcb6a2892411aea8aa3c9376c12e63a91ebd
+EBUILD certbot-apache-9999.ebuild 1076 BLAKE2B 04c24a70b59c93892bad5c8f2e51da4484f47357da5481c382bc8026be40ae903e403f3fca9013115cf1dbb9bdce20c783f9d0ce3cd870f62e38aed97c9fecdc SHA512 19d250829fbb9a15000f426332489cd443945cdbebfa1c383d7c64fb26fc0d4657de11b5b553c73787f158f6607cdcb6a2892411aea8aa3c9376c12e63a91ebd
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.33.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.33.1.ebuild
index e1c9148322fd..042b6c7ce4d1 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.33.1.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.33.1.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.34.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.34.0.ebuild
new file mode 100644
index 000000000000..0384278e8878
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.34.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.34.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests || die
+}
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index e1c9148322fd..0384278e8878 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -23,8 +23,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"
 
-RDEPEND=">=app-crypt/certbot-0.26.0[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
+RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.34.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]