From 61f10f985e19dfe20a4d9552902625edd5b6eabb Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 21 Jun 2021 17:32:00 +0100
Subject: gentoo resync : 21.06.2021

---
 eclass/vala.eclass | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'eclass/vala.eclass')

diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index 4bf15eae2684..59b5f671c5d4 100644
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -6,7 +6,7 @@
 # gnome@gentoo.org
 # @AUTHOR:
 # Alexandre Rostovtsev <tetromino@gentoo.org>
-# @SUPPORTED_EAPIS: 1 2 3 4 5 6 7
+# @SUPPORTED_EAPIS: 6 7
 # @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
@@ -16,14 +16,16 @@
 #
 # This eclass provides one phase function: src_prepare.
 
-inherit eutils multilib
-
-case "${EAPI:-0}" in
-	0)	die "EAPI=0 is not supported" ;;
-	1)	;;
-	*)	EXPORT_FUNCTIONS src_prepare ;;
+case ${EAPI:-0} in
+	[67]) inherit eutils multilib ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
+EXPORT_FUNCTIONS src_prepare
+
+if [[ -z ${_VALA_ECLASS} ]] ; then
+_VALA_ECLASS=1
+
 # @ECLASS-VARIABLE: VALA_MIN_API_VERSION
 # @DESCRIPTION:
 # Minimum vala API version (e.g. 0.36).
@@ -61,6 +63,9 @@ vala_api_versions() {
 	done
 }
 
+# @FUNCTION: _vala_use_depend
+# @INTERNAL
+# @DESCRIPTION:
 # Outputs VALA_USE_DEPEND as a a USE-dependency string
 _vala_use_depend() {
 	local u="" vala_use
@@ -170,3 +175,5 @@ vala_src_prepare() {
 	: ${PKG_CONFIG_PATH:="${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig"}
 	export PKG_CONFIG_PATH="${T}/pkgconfig:${PKG_CONFIG_PATH}"
 }
+
+fi
-- 
cgit v1.2.3