[gentoo-commits] repo/gentoo:master commit in: app-crypt/certbot-nginx/

[Sam James]

commit:     c81ec24be475a4a950db2f783b8edf845b53ed4b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May  2 23:17:06 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May  2 23:17:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c81ec24b

app-crypt/certbot-nginx: fix pyopenssl dep

This leads to confusing portage output because blockers shouldn't be used
unless there's a file collision. Just >=dep on the latest stable pyopenssl
instead to keep it simple.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{certbot-nginx-2.5.0.ebuild => certbot-nginx-2.5.0-r1.ebuild}    | 5 +++--
 app-crypt/certbot-nginx/certbot-nginx-9999.ebuild                    | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app-crypt/certbot-nginx/certbot-nginx-2.5.0.ebuild 
b/app-crypt/certbot-nginx/certbot-nginx-2.5.0-r1.ebuild
similarity index 86%
rename from app-crypt/certbot-nginx/certbot-nginx-2.5.0.ebuild
rename to app-crypt/certbot-nginx/certbot-nginx-2.5.0-r1.ebuild
index 8f87e5994fac..681a2d89b66e 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-2.5.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-2.5.0-r1.ebuild
@@ -40,11 +40,12 @@ BDEPEND="
        test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
+# The requirement is really 17.5.0 but easier to require latest stable >= 
23.1.1
+# to avoid broken 23.1.0.
 RDEPEND="
        >=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
        >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-       >=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
-       !~dev-python/pyopenssl-23.1.0[${PYTHON_USEDEP}]
+       >=dev-python/pyopenssl-23.1.1[${PYTHON_USEDEP}]
        >=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
 "
 

diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild 
b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index 8f87e5994fac..681a2d89b66e 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -40,11 +40,12 @@ BDEPEND="
        test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
+# The requirement is really 17.5.0 but easier to require latest stable >= 
23.1.1
+# to avoid broken 23.1.0.
 RDEPEND="
        >=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
        >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-       >=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
-       !~dev-python/pyopenssl-23.1.0[${PYTHON_USEDEP}]
+       >=dev-python/pyopenssl-23.1.1[${PYTHON_USEDEP}]
        >=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
 "