mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-15 00:46:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

eclass/virtualx: Sync with Gentoo

Browse Source 
It's from Gentoo commit bee4e0ad3c31520f2a9566536ff780197e252a57.
This commit is contained in:
Flatcar Buildbot 2024-10-21 07:07:35 +00:00
parent 2046dcbd97
commit eb2772c6bf
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sdk_container/src/third_party/portage-stable/eclass/virtualx.eclass vendored
View File

@ -6,17 +6,13 @@
# x11@gentoo.org # x11@gentoo.org
# @AUTHOR: # @AUTHOR:
# Original author: Martin Schlemmer <azarah@gentoo.org> # Original author: Martin Schlemmer <azarah@gentoo.org>
# @SUPPORTED_EAPIS: 6 7 8 # @SUPPORTED_EAPIS: 7 8
# @BLURB: This eclass can be used for packages that need a working X environment to build. # @BLURB: This eclass can be used for packages that need a working X environment to build.
if [[ -z ${_VIRTUALX_ECLASS} ]]; then if [[ -z ${_VIRTUALX_ECLASS} ]]; then
_VIRTUALX_ECLASS=1 _VIRTUALX_ECLASS=1
case ${EAPI} in case ${EAPI} in
6)
ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!"
ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI."
;;
7|8) ;; 7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac esac
@ -36,15 +32,15 @@ esac
# @OUTPUT_VARIABLE # @OUTPUT_VARIABLE
# @DESCRIPTION: # @DESCRIPTION:
# Standard dependencies string that is automatically added to BDEPEND # Standard dependencies string that is automatically added to BDEPEND
# (in EAPI-6: DEPEND) unless VIRTUALX_REQUIRED is set to "manual". # unless VIRTUALX_REQUIRED is set to "manual".
# DEPRECATED: Pre-EAPI-8 you can specify the variable BEFORE inherit # DEPRECATED: Pre-EAPI-8 you can specify the variable BEFORE inherit
# to add more dependencies. # to add more dependencies.
[[ ${EAPI} != [67] ]] && VIRTUALX_DEPEND="" [[ ${EAPI} != 7 ]] && VIRTUALX_DEPEND=""
VIRTUALX_DEPEND+=" VIRTUALX_DEPEND+="
x11-base/xorg-server[xvfb] x11-base/xorg-server[xvfb]
x11-apps/xhost x11-apps/xhost
" "
[[ ${EAPI} != [67] ]] && readonly VIRTUALX_DEPEND [[ ${EAPI} != 7 ]] && readonly VIRTUALX_DEPEND
[[ ${VIRTUALX_COMMAND} ]] && die "VIRTUALX_COMMAND has been removed and is a no-op" [[ ${VIRTUALX_COMMAND} ]] && die "VIRTUALX_COMMAND has been removed and is a no-op"
@ -62,8 +58,6 @@ case ${VIRTUALX_REQUIRED} in
;; ;;
esac esac
[[ ${EAPI} == 6 ]] && DEPEND="${BDEPEND}"
# @FUNCTION: virtx # @FUNCTION: virtx
# @USAGE: <command> [command arguments] # @USAGE: <command> [command arguments]