gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-10 06:57:08 -08:00
Code Issues Projects Releases Wiki Activity

vala.eclass: drop EAPI 6 support

Browse Source 
Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
David Seifert
2023-01-02 23:01:35 +01:00
parent 7cb32b7541
commit d5ad5c1f37
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eclass/vala.eclass
+7 -11
View File
@@ -1,4 +1,4 @@
# Copyright 1999-2022 Gentoo Authors
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: vala.eclass
@@ -6,7 +6,7 @@
# gnome@gentoo.org
# @AUTHOR:
# Alexandre Rostovtsev <tetromino@gentoo.org>
# @SUPPORTED_EAPIS: 6 7 8
# @SUPPORTED_EAPIS: 7 8
# @BLURB: Sets up the environment for using a specific version of vala.
# @DESCRIPTION:
# This eclass sets up commonly used environment variables for using a specific
@@ -15,7 +15,7 @@
# executables, pkgconfig files, etc., which Gentoo does not provide.
case ${EAPI} in
6|7) inherit eutils multilib ;;
7) inherit eutils multilib ;;
8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
@@ -99,13 +99,11 @@ vala_depend() {
# VALA_MAX_API_VERSION, VALA_MIN_API_VERSION, and VALA_USE_DEPEND.
vala_best_api_version() {
local u v
local hv_opt="-b"
[[ ${EAPI} == 6 ]] && hv_opt=""
u=$(_vala_use_depend)
for v in $(vala_api_versions); do
has_version ${hv_opt} "dev-lang/vala:${v}${u}" && echo "${v}" && return
has_version -b "dev-lang/vala:${v}${u}" && echo "${v}" && return
done
}
@@ -121,8 +119,6 @@ vala_best_api_version() {
# version is not available.
vala_setup() {
local p d valafoo version ignore_use
local hv_opt="-b"
[[ ${EAPI} == 6 ]] && hv_opt=""
while [[ $1 ]]; do
case $1 in
@@ -141,7 +137,7 @@ vala_setup() {
fi
if [[ ${version} ]]; then
has_version ${hv_opt} "dev-lang/vala:${version}" || die "No installed vala:${version}"
has_version -b "dev-lang/vala:${version}" || die "No installed vala:${version}"
else
version=$(vala_best_api_version)
[[ ${version} ]] || die "No installed vala in $(vala_depend)"
@@ -178,8 +174,8 @@ vala_setup() {
# @FUNCTION: vala_src_prepare
# @DESCRIPTION:
# For backwards compatibility in EAPIs 6 and 7. Calls vala_setup.
if [[ ${EAPI} == [67] ]]; then
# For backwards compatibility in EAPI 7. Calls vala_setup.
if [[ ${EAPI} == 7 ]]; then
vala_src_prepare() { vala_setup "$@"; }
fi