[gentoo-dev] [PATCH 16/41] mozcoreconf-v6.eclass: drop EAPI 6, 7 support

[David Seifert]

Signed-off-by: David Seifert <soap@g.o>
---
 eclass/mozcoreconf-v6.eclass | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/eclass/mozcoreconf-v6.eclass b/eclass/mozcoreconf-v6.eclass
index 45069777340..ecf1c1f6720 100644
--- a/eclass/mozcoreconf-v6.eclass
+++ b/eclass/mozcoreconf-v6.eclass
@@ -1,10 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-#
+
 # @ECLASS: mozcoreconf-v6.eclass
 # @MAINTAINER:
 # Mozilla team <mozilla@g.o>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 8
 # @BLURB: core options and configuration functions for mozilla
 # @DESCRIPTION:
 #
@@ -15,7 +15,13 @@
 # This is an eclass-generated variable that defines the rpath that the mozilla
 # product will be installed in.  Read-only
 
-if [[ ! ${_MOZCORECONF} ]]; then
+case ${EAPI} in
+	8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
+if [[ ! ${_MOZCORECONF_V6_ECLASS} ]]; then
+_MOZCORECONF_V6_ECLASS=1
 
 inherit toolchain-funcs flag-o-matic python-any-r1
 
@@ -23,18 +29,6 @@ BDEPEND="virtual/pkgconfig
 	dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)]
 	${PYTHON_DEPS}"
 
-case "${EAPI:-0}" in
-	6)
-		inherit multilib versionator
-		DEPEND+=" ${BDEPEND}"
-		;;
-	7|8)
-		;;
-	*)
-		die "EAPI ${EAPI} is not supported, contact eclass maintainers"
-		;;
-esac
-
 IUSE="${IUSE} custom-cflags custom-optimization"
 
 # @FUNCTION: mozconfig_annotate
@@ -275,5 +269,4 @@ mozconfig_final() {
 	echo
 }
 
-_MOZCORECONF=1
 fi
-- 
2.39.0