Gentoo Archives: gentoo-commits

From: Virgil Dupras <vdupras@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Tue, 31 Jul 2018 15:03:27
Message-Id: 1533048248.3f226a4bdb139729e4c877a0c8f91cf4750e799d.vdupras@gentoo
1 commit: 3f226a4bdb139729e4c877a0c8f91cf4750e799d
2 Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 26 18:54:36 2018 +0000
4 Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 31 14:44:08 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f226a4b
7
8 virtualx.eclass: support EAPI 7
9
10 The only adjustment made here is setting BDEPEND instead of DEPEND when
11 under EAPI 7.
12
13 eclass/virtualx.eclass | 14 +++++++++++---
14 1 file changed, 11 insertions(+), 3 deletions(-)
15
16 diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
17 index 38e629eef4f..cd0447a518c 100644
18 --- a/eclass/virtualx.eclass
19 +++ b/eclass/virtualx.eclass
20 @@ -14,7 +14,7 @@ case "${EAPI:-0}" in
21 0|1|2|3)
22 die "virtualx.eclass: EAPI ${EAPI} is too old."
23 ;;
24 - 4|5|6)
25 + 4|5|6|7)
26 ;;
27 *)
28 die "virtualx.eclass: EAPI ${EAPI} is not supported yet."
29 @@ -53,7 +53,11 @@ case ${VIRTUALX_REQUIRED} in
30 manual)
31 ;;
32 always)
33 - DEPEND="${VIRTUALX_DEPEND}"
34 + if [[ ${EAPI:-0} != [0123456] ]]; then
35 + BDEPEND="${VIRTUALX_DEPEND}"
36 + else
37 + DEPEND="${VIRTUALX_DEPEND}"
38 + fi
39 RDEPEND=""
40 ;;
41 optional|tests)
42 @@ -77,7 +81,11 @@ case ${VIRTUALX_REQUIRED} in
43 IUSE="${VIRTUALX_USE}"
44 ;;
45 *)
46 - DEPEND="${VIRTUALX_REQUIRED}? ( ${VIRTUALX_DEPEND} )"
47 + if [[ ${EAPI:-0} != [0123456] ]]; then
48 + BDEPEND="${VIRTUALX_REQUIRED}? ( ${VIRTUALX_DEPEND} )"
49 + else
50 + DEPEND="${VIRTUALX_REQUIRED}? ( ${VIRTUALX_DEPEND} )"
51 + fi
52 RDEPEND=""
53 IUSE="${VIRTUALX_REQUIRED}"
54 ;;