Gentoo Archives: gentoo-commits

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