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

List:       gentoo-commits
Subject:    [gentoo-commits] repo/gentoo:master commit in: eclass/
From:       "Michael Palimaka" <kensington () gentoo ! org>
Date:       2019-08-18 8:49:04
Message-ID: 1566118132.3120a986989f93ba6a8e5f81efdaeec50c56f16e.kensington () gentoo
[Download RAW message or body]

commit:     3120a986989f93ba6a8e5f81efdaeec50c56f16e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 18 08:43:40 2019 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug 18 08:48:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3120a986

ssl-cert.eclass: improve EAPI 7 support

Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>

 eclass/ssl-cert.eclass | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
index 01783b75848..0e7294f6229 100644
--- a/eclass/ssl-cert.eclass
+++ b/eclass/ssl-cert.eclass
@@ -5,7 +5,7 @@
 # @MAINTAINER:
 # @AUTHOR:
 # Max Kalika <max@gentoo.org>
-# @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
@@ -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

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