commit: 9d7833fd1183835c4bb39bfa208e9a21b464ae82 Author: Eray Aslan <eras <AT> gentoo <DOT> org> AuthorDate: Wed Sep 15 06:23:43 2021 +0000 Commit: Eray Aslan <eras <AT> gentoo <DOT> org> CommitDate: Thu Sep 16 06:33:18 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d7833fd
ssl-cert.eclass: add EAPI 8 support - drop support for EAPI < 6 - add guard Signed-off-by: Eray Aslan <eras <AT> gentoo.org> eclass/ssl-cert.eclass | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass index 36945be3cd6..9d01fd10f50 100644 --- a/eclass/ssl-cert.eclass +++ b/eclass/ssl-cert.eclass @@ -6,7 +6,7 @@ # [email protected] # @AUTHOR: # Max Kalika <[email protected]> -# @SUPPORTED_EAPIS: 1 2 3 4 5 6 7 +# @SUPPORTED_EAPIS: 6 7 8 # @BLURB: Eclass for SSL certificates # @DESCRIPTION: # This eclass implements a standard installation procedure for installing @@ -14,18 +14,14 @@ # @EXAMPLE: # "install_cert /foo/bar" installs ${ROOT}/foo/bar.{key,csr,crt,pem} -# Guard against unsupported EAPIs. We need EAPI >= 1 for slot dependencies. -case "${EAPI:-0}" in - 0) - die "${ECLASS}.eclass: EAPI=0 is not supported. Please upgrade to EAPI >= 1." - ;; - 1|2|3|4|5|6|7) - ;; - *) - die "${ECLASS}.eclass: EAPI=${EAPI} is not supported yet." - ;; +case "${EAPI}" in + 6|7|8) ;; + *) die "EAPI=${EAPI:-0} is not supported" ;; esac +if [[ ! ${_SSL_CERT_ECLASS} ]]; then +_SSL_CERT_ECLASS=1 + # @ECLASS-VARIABLE: SSL_CERT_MANDATORY # @PRE_INHERIT # @DESCRIPTION: @@ -53,7 +49,7 @@ if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then fi case "${EAPI}" in - 1|2|3|4|5|6) + 6) DEPEND="${SSL_DEPEND}" ;; *) @@ -283,3 +279,5 @@ install_cert() { ewarn "Some requested certificates were not generated" fi } + +fi
