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 141F115800F for ; Thu, 16 Feb 2023 15:57:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2EA8EE085A; Thu, 16 Feb 2023 15:57:09 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10FF5E085A for ; Thu, 16 Feb 2023 15:57:09 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 463BC340FF6 for ; Thu, 16 Feb 2023 15:57:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C39728AA for ; Thu, 16 Feb 2023 15:57:06 +0000 (UTC) From: "Matthew Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" Message-ID: <1676563020.51f64a7f8199962ad741caecf4668785dd7debbd.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/certbot/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/certbot/Manifest app-crypt/certbot/certbot-2.1.1.ebuild app-crypt/certbot/certbot-2.2.0-r2.ebuild app-crypt/certbot/certbot-2.3.0.ebuild app-crypt/certbot/certbot-9999.ebuild X-VCS-Directories: app-crypt/certbot/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: 51f64a7f8199962ad741caecf4668785dd7debbd X-VCS-Branch: master Date: Thu, 16 Feb 2023 15:57:06 +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: 66eae890-162e-4f15-b2cc-441ff0de38fc X-Archives-Hash: 9f4bffd56171b21acfd5a7f233c8f52f commit: 51f64a7f8199962ad741caecf4668785dd7debbd Author: Thibaud CANALE thican net> AuthorDate: Sun Nov 6 13:12:31 2022 +0000 Commit: Matthew Thode gentoo org> CommitDate: Thu Feb 16 15:57:00 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51f64a7f app-crypt/certbot: brings multiple reworks (bug 881043) Bug: https://bugs.gentoo.org/881043 The purpose of this commit is to provide a common base for this package and its bindings. For example, we should keep only one and single archive name to avoid duplication, saving storage and download time. Warnings: some modifications might require some reviews, tests were done but maybe not thorough. Reworks: - replaces deprecated DISTUTILS_USE_SETUPTOOLS by DISTUTILS_USE_PEP517, with "setuptools" (DistutilsNonPEP517Build); - stores archive with ".gh" in its extension (PythonGHDistfileSuffix); - uses plaintext URL for SRC_URI. Also removes zope since 2.0.0 version, see upstream commit 9d736d5c9c939ef5a47b001ef9cb3ea97122c1c4: https://github.com/certbot/certbot/commit/9d736d5c9c939ef5a47b001ef9cb3ea97122c1c4 Signed-off-by: Thibaud CANALE thican.net> Signed-off-by: Matthew Thode gentoo.org> app-crypt/certbot/Manifest | 3 ++ .../{certbot-9999.ebuild => certbot-2.1.1.ebuild} | 44 +++++++++++++++------- ...certbot-9999.ebuild => certbot-2.2.0-r2.ebuild} | 43 +++++++++++++++------ .../{certbot-9999.ebuild => certbot-2.3.0.ebuild} | 43 +++++++++++++++------ app-crypt/certbot/certbot-9999.ebuild | 43 +++++++++++++++------ 5 files changed, 127 insertions(+), 49 deletions(-) diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest index 00735bab2de6..2055bf01eeba 100644 --- a/app-crypt/certbot/Manifest +++ b/app-crypt/certbot/Manifest @@ -1,2 +1,5 @@ DIST certbot-2.1.0.tar.gz 1327451 BLAKE2B c4694622648427146574aa7c056d5d76dc3c4f6b8487a506d1c4996239f979d89ca26980b2ffbaab975458d0691acaa07a46a75098b6146e6e3c51e6eaa64be0 SHA512 83c3a6abeffb135cebd0d0f4561f3814039962e3b895aaf7bef6570641fccda2da04f1a6110c5e90d6ed3346402cbb3ff543b0a096e8e18f6345edd22da643cc +DIST certbot-2.1.1.gh.tar.gz 1327548 BLAKE2B 21ce7d88bc101147be237201d472f43ea71adafe37789b0a46d7d87b0bc0f1270044386507bc516beb658633cbaebcade06e0f7f6f833848e10660a6b0a09279 SHA512 9bd5d3259954fbf09287a74532ad73a6271ed07bac0e3593edc08662d562e8939982a92daca3eb5d6e6516ab530e15e0594124465e6f6608b004594418e34042 +DIST certbot-2.2.0.gh.tar.gz 1331053 BLAKE2B 4a3e6d8b0b3b7f8537bd6b24234bad7657842ee64865bcef2701e572501640b7a2d49cf4dc62db25cda1039be2d20fb77ac6415cdcb4756fce0f96b5cb7410c6 SHA512 242bfa8e5b60c28b49457403b41421ef782b9f98f325cc423b58283fef410b33691c3ce126188b191c80fcd488fe5d51acfc5ca575c8e7c5b6b08198844bffb7 DIST certbot-2.2.0.tar.gz 1331053 BLAKE2B 4a3e6d8b0b3b7f8537bd6b24234bad7657842ee64865bcef2701e572501640b7a2d49cf4dc62db25cda1039be2d20fb77ac6415cdcb4756fce0f96b5cb7410c6 SHA512 242bfa8e5b60c28b49457403b41421ef782b9f98f325cc423b58283fef410b33691c3ce126188b191c80fcd488fe5d51acfc5ca575c8e7c5b6b08198844bffb7 +DIST certbot-2.3.0.gh.tar.gz 1335613 BLAKE2B af8ff393f92755e8e312f7596fe99abefa35c42cef6fa6688f7f3dd4a310205385fec81366df30d8edfe28d8abd3db447c9e1a3770fe31c3d45c69f04a038660 SHA512 5f52d9b0dd390fc696389a94ff897d803ee062feca50bb66972e197dcd79b0096b337cece2798557c3878903577171fd9afe1f18a4a2131ad7e6a62d0d945ebb diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-2.1.1.ebuild similarity index 53% copy from app-crypt/certbot/certbot-9999.ebuild copy to app-crypt/certbot/certbot-2.1.1.ebuild index 729204440566..4155b78a684e 100644 --- a/app-crypt/certbot/certbot-9999.ebuild +++ b/app-crypt/certbot/certbot-2.1.1.ebuild @@ -4,28 +4,46 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +DISTUTILS_USE_PEP517=setuptools -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://github.com/certbot/certbot.git" +inherit distutils-r1 + +if [[ "${PV}" == *9999 ]]; then inherit git-r3 + + EGIT_REPO_URI="https://github.com/certbot/certbot.git" + EGIT_SUBMODULES=() + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI=" + https://github.com/certbot/certbot/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz + " KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~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/" +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="selinux" -# See certbot/setup.py for acme >= dep +S="${WORKDIR}/${P}/${PN}" + +BDEPEND=" + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-cov[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] + ) +" + RDEPEND=" >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] >=dev-python/ConfigArgParse-0.9.3[${PYTHON_USEDEP}] @@ -36,8 +54,8 @@ RDEPEND=" >=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}] dev-python/pyrfc3339[${PYTHON_USEDEP}] >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] - dev-python/zope-component[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}] - selinux? ( sec-policy/selinux-certbot )" + selinux? ( sec-policy/selinux-certbot ) +" +distutils_enable_sphinx docs dev-python/sphinx-rtd-theme distutils_enable_tests pytest diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-2.2.0-r2.ebuild similarity index 54% copy from app-crypt/certbot/certbot-9999.ebuild copy to app-crypt/certbot/certbot-2.2.0-r2.ebuild index 729204440566..a8c222abcae4 100644 --- a/app-crypt/certbot/certbot-9999.ebuild +++ b/app-crypt/certbot/certbot-2.2.0-r2.ebuild @@ -4,27 +4,46 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +DISTUTILS_USE_PEP517=setuptools -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://github.com/certbot/certbot.git" +inherit distutils-r1 + +if [[ "${PV}" == *9999 ]]; then inherit git-r3 + + EGIT_REPO_URI="https://github.com/certbot/certbot.git" + EGIT_SUBMODULES=() + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI=" + https://github.com/certbot/certbot/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz + " KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~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/" +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="selinux" +S="${WORKDIR}/${P}/${PN}" + +BDEPEND=" + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-cov[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] + ) +" + # See certbot/setup.py for acme >= dep RDEPEND=" >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] @@ -36,8 +55,8 @@ RDEPEND=" >=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}] dev-python/pyrfc3339[${PYTHON_USEDEP}] >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] - dev-python/zope-component[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}] - selinux? ( sec-policy/selinux-certbot )" + selinux? ( sec-policy/selinux-certbot ) +" +distutils_enable_sphinx docs dev-python/sphinx-rtd-theme distutils_enable_tests pytest diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-2.3.0.ebuild similarity index 54% copy from app-crypt/certbot/certbot-9999.ebuild copy to app-crypt/certbot/certbot-2.3.0.ebuild index 729204440566..a8c222abcae4 100644 --- a/app-crypt/certbot/certbot-9999.ebuild +++ b/app-crypt/certbot/certbot-2.3.0.ebuild @@ -4,27 +4,46 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +DISTUTILS_USE_PEP517=setuptools -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://github.com/certbot/certbot.git" +inherit distutils-r1 + +if [[ "${PV}" == *9999 ]]; then inherit git-r3 + + EGIT_REPO_URI="https://github.com/certbot/certbot.git" + EGIT_SUBMODULES=() + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI=" + https://github.com/certbot/certbot/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz + " KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~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/" +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="selinux" +S="${WORKDIR}/${P}/${PN}" + +BDEPEND=" + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-cov[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] + ) +" + # See certbot/setup.py for acme >= dep RDEPEND=" >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] @@ -36,8 +55,8 @@ RDEPEND=" >=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}] dev-python/pyrfc3339[${PYTHON_USEDEP}] >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] - dev-python/zope-component[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}] - selinux? ( sec-policy/selinux-certbot )" + selinux? ( sec-policy/selinux-certbot ) +" +distutils_enable_sphinx docs dev-python/sphinx-rtd-theme distutils_enable_tests pytest diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild index 729204440566..a8c222abcae4 100644 --- a/app-crypt/certbot/certbot-9999.ebuild +++ b/app-crypt/certbot/certbot-9999.ebuild @@ -4,27 +4,46 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +DISTUTILS_USE_PEP517=setuptools -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://github.com/certbot/certbot.git" +inherit distutils-r1 + +if [[ "${PV}" == *9999 ]]; then inherit git-r3 + + EGIT_REPO_URI="https://github.com/certbot/certbot.git" + EGIT_SUBMODULES=() + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI=" + https://github.com/certbot/certbot/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz + " KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~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/" +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="selinux" +S="${WORKDIR}/${P}/${PN}" + +BDEPEND=" + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-cov[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] + ) +" + # See certbot/setup.py for acme >= dep RDEPEND=" >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] @@ -36,8 +55,8 @@ RDEPEND=" >=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}] dev-python/pyrfc3339[${PYTHON_USEDEP}] >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] - dev-python/zope-component[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}] - selinux? ( sec-policy/selinux-certbot )" + selinux? ( sec-policy/selinux-certbot ) +" +distutils_enable_sphinx docs dev-python/sphinx-rtd-theme distutils_enable_tests pytest