diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-09-16 23:15:49 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-09-16 23:15:49 +0100 |
| commit | 3b827127cdc24d49f3dbaa82def6c80501d2cd87 (patch) | |
| tree | 4e3f67cb234339d4cb7c29ee99550a3362d5a1ca /eclass | |
| parent | 6e356edde093fb3589ab7a5859685e85c2873ab0 (diff) | |
gentoo auto-resync : 16:09:2022 - 23:15:49
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 37138 -> 37144 bytes | |||
| -rw-r--r-- | eclass/ada.eclass | 24 | ||||
| -rw-r--r-- | eclass/vala.eclass | 6 |
3 files changed, 24 insertions, 6 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 056adb0ae65e..f3a86576f6a8 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/ada.eclass b/eclass/ada.eclass index 0bf3dcfe41cc..346cbc112e8e 100644 --- a/eclass/ada.eclass +++ b/eclass/ada.eclass @@ -1,4 +1,4 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: ada.eclass @@ -58,7 +58,7 @@ EXPORT_FUNCTIONS pkg_setup # @DESCRIPTION: # All supported Ada implementations, most preferred last. _ADA_ALL_IMPLS=( - gnat_2020 gnat_2021 + gnat_2020 gnat_2021 gcc_12_2_0 ) readonly _ADA_ALL_IMPLS @@ -86,6 +86,9 @@ _ada_impl_supported() { gnat_202[01]) return 0 ;; + gcc_12_2_0) + return 0 + ;; *) [[ ${ADA_COMPAT_NO_STRICT} ]] && return 1 die "Invalid implementation in ADA_COMPAT: ${impl}" @@ -181,6 +184,10 @@ ada_export() { impl=${1} shift ;; + gcc_12_2_0) + impl=${1} + shift + ;; *) impl=${EADA} if [[ -z ${impl} ]]; then @@ -201,6 +208,10 @@ ada_export() { gcc_pv=10.3.1 slot=10 ;; + gcc_12_2_0) + gcc_pv=12.2.0 + slot=12 + ;; *) gcc_pv="9.9.9" slot=9.9.9 @@ -246,7 +257,14 @@ ada_export() { debug-print "${FUNCNAME}: GNATCHOP = ${GNATCHOP}" ;; ADA_PKG_DEP) - ADA_PKG_DEP="dev-lang/gnat-gpl:${slot}[ada]" + case "${impl}" in + gnat_202[01]) + ADA_PKG_DEP="dev-lang/gnat-gpl:${slot}[ada]" + ;; + *) + ADA_PKG_DEP="=sys-devel/gcc-${gcc_pv}*[ada]" + ;; + esac # use-dep if [[ ${ADA_REQ_USE} ]]; then diff --git a/eclass/vala.eclass b/eclass/vala.eclass index 4e668d939fac..acdf958191eb 100644 --- a/eclass/vala.eclass +++ b/eclass/vala.eclass @@ -25,8 +25,8 @@ _VALA_ECLASS=1 # @ECLASS_VARIABLE: VALA_MIN_API_VERSION # @DESCRIPTION: -# Minimum vala API version (e.g. 0.50). -VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.50} +# Minimum vala API version (e.g. 0.56). +VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.56} # @ECLASS_VARIABLE: VALA_MAX_API_VERSION # @DESCRIPTION: @@ -49,7 +49,7 @@ vala_api_versions() { local minimal_supported_minor_version minor_version # Dependency atoms are not generated for Vala versions older than 0.${minimal_supported_minor_version}. - minimal_supported_minor_version="50" + minimal_supported_minor_version="56" for ((minor_version = ${VALA_MAX_API_VERSION#*.}; minor_version >= ${VALA_MIN_API_VERSION#*.}; minor_version = minor_version - 2)); do if ((minor_version >= minimal_supported_minor_version)); then |