[gentoo-commits] repo/gentoo:master commit in: eclass/

[Virgil Dupras]

commit:     3f226a4bdb139729e4c877a0c8f91cf4750e799d
Author:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 26 18:54:36 2018 +0000
Commit:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Tue Jul 31 14:44:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f226a4b

virtualx.eclass: support EAPI 7

The only adjustment made here is setting BDEPEND instead of DEPEND when
under EAPI 7.

 eclass/virtualx.eclass | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index 38e629eef4f..cd0447a518c 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -14,7 +14,7 @@ case "${EAPI:-0}" in
        0|1|2|3)
                die "virtualx.eclass: EAPI ${EAPI} is too old."
                ;;
-       4|5|6)
+       4|5|6|7)
                ;;
        *)
                die "virtualx.eclass: EAPI ${EAPI} is not supported yet."
@@ -53,7 +53,11 @@ case ${VIRTUALX_REQUIRED} in
        manual)
                ;;
        always)
-               DEPEND="${VIRTUALX_DEPEND}"
+               if [[ ${EAPI:-0} != [0123456] ]]; then
+                       BDEPEND="${VIRTUALX_DEPEND}"
+               else
+                       DEPEND="${VIRTUALX_DEPEND}"
+               fi
                RDEPEND=""
                ;;
        optional|tests)
@@ -77,7 +81,11 @@ case ${VIRTUALX_REQUIRED} in
                IUSE="${VIRTUALX_USE}"
                ;;
        *)
-               DEPEND="${VIRTUALX_REQUIRED}? ( ${VIRTUALX_DEPEND} )"
+               if [[ ${EAPI:-0} != [0123456] ]]; then
+                       BDEPEND="${VIRTUALX_REQUIRED}? ( ${VIRTUALX_DEPEND} )"
+               else
+                       DEPEND="${VIRTUALX_REQUIRED}? ( ${VIRTUALX_DEPEND} )"
+               fi
                RDEPEND=""
                IUSE="${VIRTUALX_REQUIRED}"
                ;;