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 88E18158010 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 95162E0867; Thu, 16 Feb 2023 15:57:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 784DAE0867 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 54391340FF7 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 D69CC8B1 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: <1676563021.8a3a99c48d28c8243e2d785a15b84b525c36d2e3.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/certbot-apache/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/certbot-apache/Manifest app-crypt/certbot-apache/certbot-apache-2.1.1.ebuild app-crypt/certbot-apache/certbot-apache-2.2.0.ebuild app-crypt/certbot-apache/certbot-apache-2.3.0.ebuild app-crypt/certbot-apache/certbot-apache-9999.ebuild X-VCS-Directories: app-crypt/certbot-apache/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: 8a3a99c48d28c8243e2d785a15b84b525c36d2e3 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: db884ae3-517a-4df2-9423-bde0bf0e6cc0 X-Archives-Hash: bc25997a0e72f2e95f61821b2b9690cd commit: 8a3a99c48d28c8243e2d785a15b84b525c36d2e3 Author: Thibaud CANALE thican net> AuthorDate: Sun Nov 6 15:27:32 2022 +0000 Commit: Matthew Thode gentoo org> CommitDate: Thu Feb 16 15:57:01 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a3a99c4 app-crypt/certbot-apache: brings multiple reworks (bug 881043) Bug: https://bugs.gentoo.org/881043 The purpose of this rework is to use parent package archive as common base for all the modules. Warnings: some modifications might require some reviews, tests were done but maybe not thoroughly enough. Reworks: - replaces deprecated DISTUTILS_USE_SETUPTOOLS by DISTUTILS_USE_PEP517, with "setuptools" (DistutilsNonPEP517Build); - integrates parent mechanism for base source; - stores archive with ".gh" in its extension (PythonGHDistfileSuffix) also use parent’s file; - uses plaintext URL for SRC_URI; - common "S" path definition for live ebuild. 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-apache/Manifest | 3 ++ .../certbot-apache/certbot-apache-2.1.1.ebuild | 50 ++++++++++++++++++++++ .../certbot-apache/certbot-apache-2.2.0.ebuild | 50 ++++++++++++++++++++++ .../certbot-apache/certbot-apache-2.3.0.ebuild | 50 ++++++++++++++++++++++ .../certbot-apache/certbot-apache-9999.ebuild | 43 +++++++++++++------ 5 files changed, 183 insertions(+), 13 deletions(-) diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest index 8b294416c8f0..5228001a982b 100644 --- a/app-crypt/certbot-apache/Manifest +++ b/app-crypt/certbot-apache/Manifest @@ -1 +1,4 @@ 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.3.0.gh.tar.gz 1335613 BLAKE2B af8ff393f92755e8e312f7596fe99abefa35c42cef6fa6688f7f3dd4a310205385fec81366df30d8edfe28d8abd3db447c9e1a3770fe31c3d45c69f04a038660 SHA512 5f52d9b0dd390fc696389a94ff897d803ee062feca50bb66972e197dcd79b0096b337cece2798557c3878903577171fd9afe1f18a4a2131ad7e6a62d0d945ebb diff --git a/app-crypt/certbot-apache/certbot-apache-2.1.1.ebuild b/app-crypt/certbot-apache/certbot-apache-2.1.1.ebuild new file mode 100644 index 000000000000..4d1707d36f00 --- /dev/null +++ b/app-crypt/certbot-apache/certbot-apache-2.1.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 + +PARENT_PN="${PN%-apache}" +PARENT_P="${PARENT_PN}-${PV}" + +if [[ "${PV}" == *9999 ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/certbot/certbot.git" + EGIT_SUBMODULES=() + EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}" +else + SRC_URI=" + https://github.com/certbot/certbot/archive/v${PV}.tar.gz + -> ${PARENT_P}.gh.tar.gz + " + # Only for amd64, arm64 and x86 because of dev-python/python-augeas + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +DESCRIPTION="Apache plugin for Certbot (Let’s Encrypt client)" +HOMEPAGE=" + https://github.com/certbot/certbot + https://letsencrypt.org/ +" + +LICENSE="Apache-2.0" +SLOT="0" + +S="${WORKDIR}/${PARENT_P}/${PN}" + +BDEPEND=" + test? ( dev-python/pytest[${PYTHON_USEDEP}] ) +" + +RDEPEND=" + >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] + >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}] + dev-python/python-augeas[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest diff --git a/app-crypt/certbot-apache/certbot-apache-2.2.0.ebuild b/app-crypt/certbot-apache/certbot-apache-2.2.0.ebuild new file mode 100644 index 000000000000..4d1707d36f00 --- /dev/null +++ b/app-crypt/certbot-apache/certbot-apache-2.2.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 + +PARENT_PN="${PN%-apache}" +PARENT_P="${PARENT_PN}-${PV}" + +if [[ "${PV}" == *9999 ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/certbot/certbot.git" + EGIT_SUBMODULES=() + EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}" +else + SRC_URI=" + https://github.com/certbot/certbot/archive/v${PV}.tar.gz + -> ${PARENT_P}.gh.tar.gz + " + # Only for amd64, arm64 and x86 because of dev-python/python-augeas + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +DESCRIPTION="Apache plugin for Certbot (Let’s Encrypt client)" +HOMEPAGE=" + https://github.com/certbot/certbot + https://letsencrypt.org/ +" + +LICENSE="Apache-2.0" +SLOT="0" + +S="${WORKDIR}/${PARENT_P}/${PN}" + +BDEPEND=" + test? ( dev-python/pytest[${PYTHON_USEDEP}] ) +" + +RDEPEND=" + >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] + >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}] + dev-python/python-augeas[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest diff --git a/app-crypt/certbot-apache/certbot-apache-2.3.0.ebuild b/app-crypt/certbot-apache/certbot-apache-2.3.0.ebuild new file mode 100644 index 000000000000..4d1707d36f00 --- /dev/null +++ b/app-crypt/certbot-apache/certbot-apache-2.3.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 + +PARENT_PN="${PN%-apache}" +PARENT_P="${PARENT_PN}-${PV}" + +if [[ "${PV}" == *9999 ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/certbot/certbot.git" + EGIT_SUBMODULES=() + EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}" +else + SRC_URI=" + https://github.com/certbot/certbot/archive/v${PV}.tar.gz + -> ${PARENT_P}.gh.tar.gz + " + # Only for amd64, arm64 and x86 because of dev-python/python-augeas + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +DESCRIPTION="Apache plugin for Certbot (Let’s Encrypt client)" +HOMEPAGE=" + https://github.com/certbot/certbot + https://letsencrypt.org/ +" + +LICENSE="Apache-2.0" +SLOT="0" + +S="${WORKDIR}/${PARENT_P}/${PN}" + +BDEPEND=" + test? ( dev-python/pytest[${PYTHON_USEDEP}] ) +" + +RDEPEND=" + >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] + >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}] + dev-python/python-augeas[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild index dc57dfbcdc28..4d1707d36f00 100644 --- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild +++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild @@ -4,30 +4,47 @@ 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 + +PARENT_PN="${PN%-apache}" +PARENT_P="${PARENT_PN}-${PV}" + +if [[ "${PV}" == *9999 ]]; then inherit git-r3 - S=${WORKDIR}/${P}/${PN} + + EGIT_REPO_URI="https://github.com/certbot/certbot.git" + EGIT_SUBMODULES=() + EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}" else - SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz" + SRC_URI=" + https://github.com/certbot/certbot/archive/v${PV}.tar.gz + -> ${PARENT_P}.gh.tar.gz + " + # Only for amd64, arm64 and x86 because of dev-python/python-augeas 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/" +DESCRIPTION="Apache plugin for Certbot (Let’s Encrypt client)" +HOMEPAGE=" + https://github.com/certbot/certbot + https://letsencrypt.org/ +" LICENSE="Apache-2.0" SLOT="0" -RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}] +S="${WORKDIR}/${PARENT_P}/${PN}" + +BDEPEND=" + test? ( dev-python/pytest[${PYTHON_USEDEP}] ) +" + +RDEPEND=" + >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}] dev-python/python-augeas[${PYTHON_USEDEP}] - dev-python/zope-component[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}]" +" distutils_enable_tests pytest