summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-08-04 10:40:59 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-08-09 07:48:41 +0200
commiteb56ba2f793185159543830767b677c365003a18 (patch)
treec4394d1726179668457b61c49da6f09e42756dc8 /eclass/virtualx.eclass
parentvirtualx.eclass: Support EAPI-8 (diff)
downloadgentoo-eb56ba2f793185159543830767b677c365003a18.tar.gz
gentoo-eb56ba2f793185159543830767b677c365003a18.tar.bz2
gentoo-eb56ba2f793185159543830767b677c365003a18.zip
virtualx.eclass: Make VIRTUALX_DEPEND readonly in EAPI-8
Any additional dependencies shall be defined inside ebuilds instead. Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'eclass/virtualx.eclass')
-rw-r--r--eclass/virtualx.eclass12
1 files changed, 8 insertions, 4 deletions
diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index 155d611e66ed..dfdfc01529d1 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -29,14 +29,18 @@ _VIRTUALX_ECLASS=1
: ${VIRTUALX_REQUIRED:=test}
# @ECLASS-VARIABLE: VIRTUALX_DEPEND
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
-# Dep string available for use outside of eclass, in case a more
-# complicated dep is needed.
-# You can specify the variable BEFORE inherit to add more dependencies.
-VIRTUALX_DEPEND="${VIRTUALX_DEPEND}
+# Standard dependencies string that is automatically added to BDEPEND
+# (in EAPI-6: DEPEND) unless VIRTUALX_REQUIRED is set to "manual".
+# DEPRECATED: Pre-EAPI-8 you can specify the variable BEFORE inherit
+# to add more dependencies.
+[[ ${EAPI} != [67] ]] && VIRTUALX_DEPEND=""
+VIRTUALX_DEPEND+="
x11-base/xorg-server[xvfb]
x11-apps/xhost
"
+[[ ${EAPI} != [67] ]] && readonly VIRTUALX_DEPEND
# @ECLASS-VARIABLE: VIRTUALX_COMMAND
# @DESCRIPTION: