summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2023-01-02 23:01:35 +0100
committerDavid Seifert <soap@gentoo.org>2023-01-02 23:01:35 +0100
commitd5ad5c1f37db9f97bbc19df22edf84da6d311653 (patch)
tree7092b44c547433774e3d78d17fa01d1c5b6c1d91 /eclass
parentsys-cluster/galera: drop versions (diff)
downloadgentoo-d5ad5c1f37db9f97bbc19df22edf84da6d311653.tar.gz
gentoo-d5ad5c1f37db9f97bbc19df22edf84da6d311653.tar.bz2
gentoo-d5ad5c1f37db9f97bbc19df22edf84da6d311653.zip
vala.eclass: drop EAPI 6 support
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/vala.eclass18
1 files changed, 7 insertions, 11 deletions
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index acdf958191eb..224071970422 100644
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -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