From d58e66fb6099252d90e7a0798a2766a9d1b555f9 Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Tue, 27 Dec 2022 17:30:05 +0100
Subject: python-any-r1.eclass: drop EAPI 6 support

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/python-any-r1.eclass | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'eclass/python-any-r1.eclass')

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index 558f725f74b7..bec15f7ca0b6 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Author: Michał Górny <mgorny@gentoo.org>
 # Based on work of: Krzysztof Pawlik <nelchael@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @PROVIDES: python-utils-r1
 # @BLURB: An eclass for packages having build-time dependency on Python.
 # @DESCRIPTION:
@@ -38,13 +38,13 @@
 # For more information, please see the Python Guide:
 # https://projects.gentoo.org/python/guide/
 
-case "${EAPI:-0}" in
-	[0-5]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;;
-	[6-8]) ;;
-	*)     die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
+case ${EAPI} in
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ ! ${_PYTHON_ANY_R1} ]]; then
+if [[ ! ${_PYTHON_ANY_R1_ECLASS} ]]; then
+_PYTHON_ANY_R1_ECLASS=1
 
 if [[ ${_PYTHON_R1} ]]; then
 	die 'python-any-r1.eclass can not be used with python-r1.eclass.'
@@ -54,10 +54,6 @@ fi
 
 inherit python-utils-r1
 
-fi
-
-EXPORT_FUNCTIONS pkg_setup
-
 # @ECLASS_VARIABLE: PYTHON_COMPAT
 # @REQUIRED
 # @DESCRIPTION:
@@ -205,8 +201,6 @@ _python_any_set_globals() {
 _python_any_set_globals
 unset -f _python_any_set_globals
 
-if [[ ! ${_PYTHON_ANY_R1} ]]; then
-
 # @FUNCTION: python_gen_any_dep
 # @USAGE: <dependency-block>
 # @DESCRIPTION:
@@ -348,5 +342,6 @@ python-any-r1_pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && python_setup
 }
 
-_PYTHON_ANY_R1=1
 fi
+
+EXPORT_FUNCTIONS pkg_setup
-- 
cgit v1.2.3