[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gentoo-dev
Subject:    Re: [gentoo-dev] [PATCH] ssl-cert.eclass: Drop support for EAPI 6
From:       David Seifert <soap () gentoo ! org>
Date:       2023-12-29 10:19:44
Message-ID: 2de80ba38c4d84e24ba05e7bb1e3b05ceddaa2e3.camel () gentoo ! org
[Download RAW message or body]

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.

[prev in list] [next in list] [prev in thread] [next in thread]