From 007b0aae027279095b8605c214b535e59df8f6eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 May 2023 05:24:29 +0100 Subject: gentoo auto-resync : 03:05:2023 - 05:24:28 --- app-crypt/certbot-nginx/Manifest | 4 +- .../certbot-nginx/certbot-nginx-2.5.0-r1.ebuild | 52 ++++++++++++++++++++++ app-crypt/certbot-nginx/certbot-nginx-2.5.0.ebuild | 51 --------------------- app-crypt/certbot-nginx/certbot-nginx-9999.ebuild | 5 ++- 4 files changed, 57 insertions(+), 55 deletions(-) create mode 100644 app-crypt/certbot-nginx/certbot-nginx-2.5.0-r1.ebuild delete mode 100644 app-crypt/certbot-nginx/certbot-nginx-2.5.0.ebuild (limited to 'app-crypt/certbot-nginx') diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest index 0dd007e84d3d..2e3f4200cc29 100644 --- a/app-crypt/certbot-nginx/Manifest +++ b/app-crypt/certbot-nginx/Manifest @@ -1,6 +1,6 @@ DIST certbot-2.4.0.gh.tar.gz 1333159 BLAKE2B 534c7d090cc8a2b77b2dd8bd8c407409260c18e7741223a327bb240dac9685b1ca152d4a20bb0ec46d8717f89bd3de6f494019c57afe22a74db69641a3ed209e SHA512 c307c97154935a3a01b468d6e91505caba6073b4c01071c87382bdc08c892094d95d75b047047d3221b7d8018a61ce974c0f4defbfdee00b136af920fd579108 DIST certbot-2.5.0.gh.tar.gz 1333903 BLAKE2B 2d30764616d2253fe320ad94182e64cc3e1ce75bd90322fcf7c303a52e32420a57cf84a3acf3f8f4825e058d6fe1e59438b728dacdf9032c4d8797312903825e SHA512 92313e352409d543f260fedee3f376c4750d9428cd39fde3518b162091667173ba6d582b4e91477f7122cf198f24119ecf34b2dce12734afbfc0ebedc395a49e EBUILD certbot-nginx-2.4.0.ebuild 1077 BLAKE2B 22426848b8b3955a3677cc8e48cc306f9bfa3eb99d81eb716405a7b46388a8e9690bab0c74effd84172d8655984faabba243c81e6a6f5beff301215601ac202b SHA512 3b22d32fb112ad6b968f2ab781765d1cb3c188b4e10369af6a630c843810ced7abf32fb834db3852fbc19b69e8d358bce6fee9632672748a5800f99aaa851f4c -EBUILD certbot-nginx-2.5.0.ebuild 1128 BLAKE2B 9eec9cb9b5e983706df0d88de13bf7dc6dd95d769bee60961174774498c430a2b33d5876ecb18fdecf72453d4e5031cbf1e1ccbfed342eb4acd9da2251b990cc SHA512 8778319d27591058ecb5251631f0988426c498388b41705a1ea08d52bbdb14ca333706091a4786d17f4ea460bf5477ad4caaabdc3a8207974a6253ae2af3a5c9 -EBUILD certbot-nginx-9999.ebuild 1128 BLAKE2B 9eec9cb9b5e983706df0d88de13bf7dc6dd95d769bee60961174774498c430a2b33d5876ecb18fdecf72453d4e5031cbf1e1ccbfed342eb4acd9da2251b990cc SHA512 8778319d27591058ecb5251631f0988426c498388b41705a1ea08d52bbdb14ca333706091a4786d17f4ea460bf5477ad4caaabdc3a8207974a6253ae2af3a5c9 +EBUILD certbot-nginx-2.5.0-r1.ebuild 1186 BLAKE2B 65530ebcce256a39830ef523a31cfc8ee371b7e0331a618d65d8351fa3bc2819bfe5b8941f5a2a10664ddfb66d40fb9e16e9250ed00323ebaf0996893c44a966 SHA512 89c10ba181f1f83e04ad06e05db20dea7bec7b1943fd69d07f5bce8a9544f798272f458c381ca357c7e7e22c62cd2dec6c6972c68938895263bec0041e2cd792 +EBUILD certbot-nginx-9999.ebuild 1186 BLAKE2B 65530ebcce256a39830ef523a31cfc8ee371b7e0331a618d65d8351fa3bc2819bfe5b8941f5a2a10664ddfb66d40fb9e16e9250ed00323ebaf0996893c44a966 SHA512 89c10ba181f1f83e04ad06e05db20dea7bec7b1943fd69d07f5bce8a9544f798272f458c381ca357c7e7e22c62cd2dec6c6972c68938895263bec0041e2cd792 MISC metadata.xml 335 BLAKE2B 048854ec6bc919f9bf9b0bc74e7c291841cbfea0e571f43437937c5dd78cc65f9df53463adcf313441e01323491709b462bd9bc364876eb1508a83b3426b6b78 SHA512 25ac45574a568e362c419dfbeade4a977afa2885e7b32fb4c3d4c765450b09aa98cf419df1a39ab194518ad6f2b582e162d4dd4eec14f278635d63bf66352523 diff --git a/app-crypt/certbot-nginx/certbot-nginx-2.5.0-r1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-2.5.0-r1.ebuild new file mode 100644 index 000000000000..681a2d89b66e --- /dev/null +++ b/app-crypt/certbot-nginx/certbot-nginx-2.5.0-r1.ebuild @@ -0,0 +1,52 @@ +# 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%-nginx}" +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 + " + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Nginx 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}] ) +" + +# 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-23.1.1[${PYTHON_USEDEP}] + >=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest diff --git a/app-crypt/certbot-nginx/certbot-nginx-2.5.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-2.5.0.ebuild deleted file mode 100644 index 8f87e5994fac..000000000000 --- a/app-crypt/certbot-nginx/certbot-nginx-2.5.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# 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%-nginx}" -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 - " - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="Nginx 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/pyopenssl-17.5.0[${PYTHON_USEDEP}] - !~dev-python/pyopenssl-23.1.0[${PYTHON_USEDEP}] - >=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest 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}] " -- cgit v1.2.3