* [gentoo-dev] [PATCH] ssl-cert.eclass: Drop support for EAPI 6
@ 2023-12-29 8:20 Ulrich Müller
2023-12-29 10:19 ` David Seifert
0 siblings, 1 reply; 4+ messages in thread
From: Ulrich Müller @ 2023-12-29 8:20 UTC (permalink / raw)
To: gentoo-dev; +Cc: Ulrich Müller
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
eclass/ssl-cert.eclass | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
index 0453f0fbf665..48cb10db16e8 100644
--- a/eclass/ssl-cert.eclass
+++ b/eclass/ssl-cert.eclass
@@ -6,7 +6,7 @@
# maintainer-needed@gentoo.org
# @AUTHOR:
# Max Kalika <max@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: Eclass for SSL certificates
# @DESCRIPTION:
# This eclass implements a standard installation procedure for installing
@@ -15,7 +15,7 @@
# "install_cert /foo/bar" installs ${ROOT}/foo/bar.{key,csr,crt,pem}
case ${EAPI} in
- 6|7|8) ;;
+ 7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
@@ -42,22 +42,11 @@ _SSL_CERT_ECLASS=1
if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then
if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then
- SSL_DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl:0 )"
+ BDEPEND="${SSL_CERT_USE}? ( dev-libs/openssl:0 )"
IUSE="${SSL_CERT_USE}"
else
- SSL_DEPEND="dev-libs/openssl:0"
+ BDEPEND="dev-libs/openssl:0"
fi
-
- case "${EAPI}" in
- 6)
- DEPEND="${SSL_DEPEND}"
- ;;
- *)
- BDEPEND="${SSL_DEPEND}"
- ;;
- esac
-
- unset SSL_DEPEND
fi
# @FUNCTION: gen_cnf
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [gentoo-dev] [PATCH] ssl-cert.eclass: Drop support for EAPI 6
2023-12-29 8:20 [gentoo-dev] [PATCH] ssl-cert.eclass: Drop support for EAPI 6 Ulrich Müller
@ 2023-12-29 10:19 ` David Seifert
2023-12-29 12:46 ` [gentoo-dev] [PATCH v2 1/2] " Ulrich Müller
0 siblings, 1 reply; 4+ messages in thread
From: David Seifert @ 2023-12-29 10:19 UTC (permalink / raw)
To: gentoo-dev; +Cc: Ulrich Müller
On Fri, 2023-12-29 at 09:20 +0100, Ulrich Müller wrote:
> Signed-off-by: Ulrich Müller <ulm@gentoo.org>
> ---
> eclass/ssl-cert.eclass | 19 ++++---------------
> 1 file changed, 4 insertions(+), 15 deletions(-)
>
> diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
> index 0453f0fbf665..48cb10db16e8 100644
> --- a/eclass/ssl-cert.eclass
> +++ b/eclass/ssl-cert.eclass
> @@ -6,7 +6,7 @@
> # maintainer-needed@gentoo.org
> # @AUTHOR:
> # Max Kalika <max@gentoo.org>
> -# @SUPPORTED_EAPIS: 6 7 8
> +# @SUPPORTED_EAPIS: 7 8
> # @BLURB: Eclass for SSL certificates
> # @DESCRIPTION:
> # This eclass implements a standard installation procedure for
> installing
> @@ -15,7 +15,7 @@
> # "install_cert /foo/bar" installs ${ROOT}/foo/bar.{key,csr,crt,pem}
>
> case ${EAPI} in
> - 6|7|8) ;;
> + 7|8) ;;
> *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
> esac
>
> @@ -42,22 +42,11 @@ _SSL_CERT_ECLASS=1
>
> if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then
> if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then
> - SSL_DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl:0 )"
> + BDEPEND="${SSL_CERT_USE}? ( dev-libs/openssl:0 )"
> IUSE="${SSL_CERT_USE}"
> else
> - SSL_DEPEND="dev-libs/openssl:0"
> + BDEPEND="dev-libs/openssl:0"
> fi
> -
> - case "${EAPI}" in
> - 6)
> - DEPEND="${SSL_DEPEND}"
> - ;;
> - *)
> - BDEPEND="${SSL_DEPEND}"
> - ;;
> - esac
> -
> - unset SSL_DEPEND
> fi
>
> # @FUNCTION: gen_cnf
Remove the :0 slot dep, since we don't use slots for openssl anymore.
^ permalink raw reply [flat|nested] 4+ messages in thread* [gentoo-dev] [PATCH v2 1/2] ssl-cert.eclass: Drop support for EAPI 6
2023-12-29 10:19 ` David Seifert
@ 2023-12-29 12:46 ` Ulrich Müller
2023-12-29 12:47 ` [gentoo-dev] [PATCH v2 2/2] ssl-cert.eclass: Drop openssl slot dependency Ulrich Müller
0 siblings, 1 reply; 4+ messages in thread
From: Ulrich Müller @ 2023-12-29 12:46 UTC (permalink / raw)
To: gentoo-dev; +Cc: Ulrich Müller
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
eclass/ssl-cert.eclass | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
index 0453f0fbf665..48cb10db16e8 100644
--- a/eclass/ssl-cert.eclass
+++ b/eclass/ssl-cert.eclass
@@ -6,7 +6,7 @@
# maintainer-needed@gentoo.org
# @AUTHOR:
# Max Kalika <max@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: Eclass for SSL certificates
# @DESCRIPTION:
# This eclass implements a standard installation procedure for installing
@@ -15,7 +15,7 @@
# "install_cert /foo/bar" installs ${ROOT}/foo/bar.{key,csr,crt,pem}
case ${EAPI} in
- 6|7|8) ;;
+ 7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
@@ -42,22 +42,11 @@ _SSL_CERT_ECLASS=1
if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then
if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then
- SSL_DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl:0 )"
+ BDEPEND="${SSL_CERT_USE}? ( dev-libs/openssl:0 )"
IUSE="${SSL_CERT_USE}"
else
- SSL_DEPEND="dev-libs/openssl:0"
+ BDEPEND="dev-libs/openssl:0"
fi
-
- case "${EAPI}" in
- 6)
- DEPEND="${SSL_DEPEND}"
- ;;
- *)
- BDEPEND="${SSL_DEPEND}"
- ;;
- esac
-
- unset SSL_DEPEND
fi
# @FUNCTION: gen_cnf
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-dev] [PATCH v2 2/2] ssl-cert.eclass: Drop openssl slot dependency
2023-12-29 12:46 ` [gentoo-dev] [PATCH v2 1/2] " Ulrich Müller
@ 2023-12-29 12:47 ` Ulrich Müller
0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Müller @ 2023-12-29 12:47 UTC (permalink / raw)
To: gentoo-dev; +Cc: Ulrich Müller, David Seifert
Suggested-by: David Seifert <soap@gentoo.org>
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
eclass/ssl-cert.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
index 48cb10db16e8..240f9f12cc91 100644
--- a/eclass/ssl-cert.eclass
+++ b/eclass/ssl-cert.eclass
@@ -42,10 +42,10 @@ _SSL_CERT_ECLASS=1
if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then
if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then
- BDEPEND="${SSL_CERT_USE}? ( dev-libs/openssl:0 )"
+ BDEPEND="${SSL_CERT_USE}? ( dev-libs/openssl )"
IUSE="${SSL_CERT_USE}"
else
- BDEPEND="dev-libs/openssl:0"
+ BDEPEND="dev-libs/openssl"
fi
fi
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-12-29 12:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-29 8:20 [gentoo-dev] [PATCH] ssl-cert.eclass: Drop support for EAPI 6 Ulrich Müller
2023-12-29 10:19 ` David Seifert
2023-12-29 12:46 ` [gentoo-dev] [PATCH v2 1/2] " Ulrich Müller
2023-12-29 12:47 ` [gentoo-dev] [PATCH v2 2/2] ssl-cert.eclass: Drop openssl slot dependency Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox