From 4ef02eb40128dbc99a22ebf10bd663cab7e03215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Fri, 7 Aug 2020 22:31:40 +0200 Subject: [PATCH] eclass/ssl-cert: Sync from Gentoo --- .../portage-stable/eclass/ssl-cert.eclass | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/ssl-cert.eclass b/sdk_container/src/third_party/portage-stable/eclass/ssl-cert.eclass index b5b4250ef2..0e7294f622 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/ssl-cert.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/ssl-cert.eclass @@ -5,7 +5,7 @@ # @MAINTAINER: # @AUTHOR: # Max Kalika -# @SUPPORTED_EAPIS: 1 2 3 4 5 6 +# @SUPPORTED_EAPIS: 1 2 3 4 5 6 7 # @BLURB: Eclass for SSL certificates # @DESCRIPTION: # This eclass implements a standard installation procedure for installing @@ -18,7 +18,7 @@ case "${EAPI:-0}" in 0) die "${ECLASS}.eclass: EAPI=0 is not supported. Please upgrade to EAPI >= 1." ;; - 1|2|3|4|5|6) + 1|2|3|4|5|6|7) ;; *) die "${ECLASS}.eclass: EAPI=${EAPI} is not supported yet." @@ -42,11 +42,22 @@ esac if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then - DEPEND="${SSL_CERT_USE}? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )" + SSL_DEPEND="${SSL_CERT_USE}? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )" IUSE="${SSL_CERT_USE}" else - DEPEND="|| ( dev-libs/openssl:0 dev-libs/libressl:0 )" + SSL_DEPEND="|| ( dev-libs/openssl:0 dev-libs/libressl:0 )" fi + + case "${EAPI}" in + 1|2|3|4|5|6) + DEPEND="${SSL_DEPEND}" + ;; + *) + BDEPEND="${SSL_DEPEND}" + ;; + esac + + unset SSL_DEPEND fi # @FUNCTION: gen_cnf