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 13/28] python-single-r1.eclass: Update doc for -2/-3 arg removal
Date: Sun, 20 Jun 2021 10:00:26
Message-Id: 20210620095552.625633-14-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 00/28] python-r1 suite EAPI 8 support/cleanup by "Michał Górny"
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 eclass/python-single-r1.eclass | 36 +++++++++++++++-------------------
4 1 file changed, 16 insertions(+), 20 deletions(-)
5
6 diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
7 index 07db2d762ded..50ec69fa2ddb 100644
8 --- a/eclass/python-single-r1.eclass
9 +++ b/eclass/python-single-r1.eclass
10 @@ -278,11 +278,10 @@ if [[ ! ${_PYTHON_SINGLE_R1} ]]; then
11 # are both in PYTHON_COMPAT and match any of the patterns passed
12 # as parameters to the function.
13 #
14 -# The patterns can be either fnmatch-style patterns (matched via bash
15 -# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate
16 -# appropriately all enabled Python 2/3 implementations (alike
17 -# python_is_python3). Remember to escape or quote the fnmatch patterns
18 -# to prevent accidental shell filename expansion.
19 +# The patterns are fnmatch-style patterns (matched via bash
20 +# == operator against PYTHON_COMPAT values). Remember to escape
21 +# or quote the fnmatch patterns to prevent accidental shell filename
22 +# expansion.
23 #
24 # This is an internal function used to implement python_gen_cond_dep.
25 _python_gen_usedep() {
26 @@ -312,11 +311,10 @@ _python_gen_usedep() {
27 # are both in PYTHON_COMPAT and match any of the patterns passed
28 # as parameters to the function.
29 #
30 -# The patterns can be either fnmatch-style patterns (matched via bash
31 -# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate
32 -# appropriately all enabled Python 2/3 implementations (alike
33 -# python_is_python3). Remember to escape or quote the fnmatch patterns
34 -# to prevent accidental shell filename expansion.
35 +# The patterns are fnmatch-style patterns (matched via bash
36 +# == operator against PYTHON_COMPAT values). Remember to escape
37 +# or quote the fnmatch patterns to prevent accidental shell filename
38 +# expansion.
39 #
40 # Example:
41 # @CODE
42 @@ -350,11 +348,10 @@ python_gen_useflags() {
43 # of Python implementations which are both in PYTHON_COMPAT and match
44 # any of the patterns passed as the remaining parameters.
45 #
46 -# The patterns can be either fnmatch-style patterns (matched via bash
47 -# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate
48 -# appropriately all enabled Python 2/3 implementations (alike
49 -# python_is_python3). Remember to escape or quote the fnmatch patterns
50 -# to prevent accidental shell filename expansion.
51 +# The patterns are fnmatch-style patterns (matched via bash
52 +# == operator against PYTHON_COMPAT values). Remember to escape
53 +# or quote the fnmatch patterns to prevent accidental shell filename
54 +# expansion.
55 #
56 # In order to enforce USE constraints on the packages, verbatim
57 # '${PYTHON_SINGLE_USEDEP}' and '${PYTHON_USEDEP}' (quoted!) may
58 @@ -413,11 +410,10 @@ python_gen_cond_dep() {
59 # patterns are passed, the output dependencies will be generated only
60 # for the implementations matching them.
61 #
62 -# The patterns can be either fnmatch-style patterns (matched via bash
63 -# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate
64 -# appropriately all enabled Python 2/3 implementations (alike
65 -# python_is_python3). Remember to escape or quote the fnmatch patterns
66 -# to prevent accidental shell filename expansion.
67 +# The patterns are fnmatch-style patterns (matched via bash
68 +# == operator against PYTHON_COMPAT values). Remember to escape
69 +# or quote the fnmatch patterns to prevent accidental shell filename
70 +# expansion.
71 #
72 # Use this function when you need to request different USE flags
73 # on the Python interpreter depending on package's USE flags. If you
74 --
75 2.32.0