Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 2/5] python-r1.eclass: Remove support for EAPIs prior to 6
Date: Thu, 08 Apr 2021 07:43:50
Message-Id: 20210408074311.109594-2-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/5] distutils-r1.eclass: Remove support for EAPIs prior to 6 by "Michał Górny"
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 eclass/python-r1.eclass | 8 +++-----
4 1 file changed, 3 insertions(+), 5 deletions(-)
5
6 diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
7 index f7beb3006499..1eb68270a0b3 100644
8 --- a/eclass/python-r1.eclass
9 +++ b/eclass/python-r1.eclass
10 @@ -7,7 +7,7 @@
11 # @AUTHOR:
12 # Author: Michał Górny <mgorny@g.o>
13 # Based on work of: Krzysztof Pawlik <nelchael@g.o>
14 -# @SUPPORTED_EAPIS: 5 6 7
15 +# @SUPPORTED_EAPIS: 6 7
16 # @BLURB: A common, simple eclass for Python packages.
17 # @DESCRIPTION:
18 # A common eclass providing helper functions to build and install
19 @@ -30,11 +30,10 @@
20 # https://dev.gentoo.org/~mgorny/python-guide/
21
22 case "${EAPI:-0}" in
23 - 0|1|2|3|4)
24 + [0-5])
25 die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
26 ;;
27 - 5|6|7)
28 - # EAPI=5 is required for sane USE_EXPAND dependencies
29 + [6-7])
30 ;;
31 *)
32 die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
33 @@ -49,7 +48,6 @@ elif [[ ${_PYTHON_ANY_R1} ]]; then
34 die 'python-r1.eclass can not be used with python-any-r1.eclass.'
35 fi
36
37 -[[ ${EAPI} == [45] ]] && inherit eutils
38 inherit multibuild python-utils-r1
39
40 fi
41 --
42 2.31.1