| 1 |
commit: 3120a986989f93ba6a8e5f81efdaeec50c56f16e |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 18 08:43:40 2019 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 18 08:48:52 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3120a986 |
| 7 |
|
| 8 |
ssl-cert.eclass: improve EAPI 7 support |
| 9 |
|
| 10 |
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/ssl-cert.eclass | 17 ++++++++++++++--- |
| 13 |
1 file changed, 14 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass |
| 16 |
index 01783b75848..0e7294f6229 100644 |
| 17 |
--- a/eclass/ssl-cert.eclass |
| 18 |
+++ b/eclass/ssl-cert.eclass |
| 19 |
@@ -5,7 +5,7 @@ |
| 20 |
# @MAINTAINER: |
| 21 |
# @AUTHOR: |
| 22 |
# Max Kalika <max@g.o> |
| 23 |
-# @SUPPORTED_EAPIS: 1 2 3 4 5 6 |
| 24 |
+# @SUPPORTED_EAPIS: 1 2 3 4 5 6 7 |
| 25 |
# @BLURB: Eclass for SSL certificates |
| 26 |
# @DESCRIPTION: |
| 27 |
# This eclass implements a standard installation procedure for installing |
| 28 |
@@ -42,11 +42,22 @@ esac |
| 29 |
|
| 30 |
if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then |
| 31 |
if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then |
| 32 |
- DEPEND="${SSL_CERT_USE}? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )" |
| 33 |
+ SSL_DEPEND="${SSL_CERT_USE}? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )" |
| 34 |
IUSE="${SSL_CERT_USE}" |
| 35 |
else |
| 36 |
- DEPEND="|| ( dev-libs/openssl:0 dev-libs/libressl:0 )" |
| 37 |
+ SSL_DEPEND="|| ( dev-libs/openssl:0 dev-libs/libressl:0 )" |
| 38 |
fi |
| 39 |
+ |
| 40 |
+ case "${EAPI}" in |
| 41 |
+ 1|2|3|4|5|6) |
| 42 |
+ DEPEND="${SSL_DEPEND}" |
| 43 |
+ ;; |
| 44 |
+ *) |
| 45 |
+ BDEPEND="${SSL_DEPEND}" |
| 46 |
+ ;; |
| 47 |
+ esac |
| 48 |
+ |
| 49 |
+ unset SSL_DEPEND |
| 50 |
fi |
| 51 |
|
| 52 |
# @FUNCTION: gen_cnf |
Archives