From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8755E15ACFD for ; Tue, 2 May 2023 23:21:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE99FE08F2; Tue, 2 May 2023 23:21:20 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ABD55E08F2 for ; Tue, 2 May 2023 23:21:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 958B03416BA for ; Tue, 2 May 2023 23:21:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F2A04A50 for ; Tue, 2 May 2023 23:21:17 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1683069465.c81ec24be475a4a950db2f783b8edf845b53ed4b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/certbot-nginx/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/certbot-nginx/certbot-nginx-2.5.0-r1.ebuild app-crypt/certbot-nginx/certbot-nginx-2.5.0.ebuild app-crypt/certbot-nginx/certbot-nginx-9999.ebuild X-VCS-Directories: app-crypt/certbot-nginx/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c81ec24be475a4a950db2f783b8edf845b53ed4b X-VCS-Branch: master Date: Tue, 2 May 2023 23:21:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 077f2053-e4d8-4d88-8922-4009c2dc2fef X-Archives-Hash: f176b2c08c2e673c2e8445db7105a394 commit: c81ec24be475a4a950db2f783b8edf845b53ed4b Author: Sam James gentoo org> AuthorDate: Tue May 2 23:17:06 2023 +0000 Commit: Sam James gentoo 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 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}] "