1 |
Signed-off-by: Michał Górny <mgorny@g.o> |
2 |
--- |
3 |
eclass/python-r1.eclass | 63 ++++++++++++++++++----------------------- |
4 |
1 file changed, 28 insertions(+), 35 deletions(-) |
5 |
|
6 |
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass |
7 |
index 1eb68270a0b3..00555e19d605 100644 |
8 |
--- a/eclass/python-r1.eclass |
9 |
+++ b/eclass/python-r1.eclass |
10 |
@@ -304,11 +304,10 @@ _python_validate_useflags() { |
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 |
# and deprecated python_gen_usedep. |
26 |
@@ -342,11 +341,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 |
# When all implementations are requested, please use ${PYTHON_USEDEP} |
41 |
# instead. Please also remember to set an appropriate REQUIRED_USE |
42 |
@@ -380,11 +378,10 @@ python_gen_usedep() { |
43 |
# are both in PYTHON_COMPAT and match any of the patterns passed |
44 |
# as parameters to the function. |
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 |
# Example: |
57 |
# @CODE |
58 |
@@ -418,11 +415,10 @@ python_gen_useflags() { |
59 |
# of Python implementations which are both in PYTHON_COMPAT and match |
60 |
# any of the patterns passed as the remaining parameters. |
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 |
# In order to enforce USE constraints on the packages, verbatim |
73 |
# '${PYTHON_USEDEP}' (quoted!) may be placed in the dependency |
74 |
@@ -477,11 +473,10 @@ python_gen_cond_dep() { |
75 |
# patterns are passed, the output dependencies will be generated only |
76 |
# for the implementations matching them. |
77 |
# |
78 |
-# The patterns can be either fnmatch-style patterns (matched via bash |
79 |
-# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate |
80 |
-# appropriately all enabled Python 2/3 implementations (alike |
81 |
-# python_is_python3). Remember to escape or quote the fnmatch patterns |
82 |
-# to prevent accidental shell filename expansion. |
83 |
+# The patterns are fnmatch-style patterns (matched via bash |
84 |
+# == operator against PYTHON_COMPAT values). Remember to escape |
85 |
+# or quote the fnmatch patterns to prevent accidental shell filename |
86 |
+# expansion. |
87 |
# |
88 |
# Use this function when you need to request different USE flags |
89 |
# on the Python interpreter depending on package's USE flags. If you |
90 |
@@ -534,11 +529,10 @@ python_gen_impl_dep() { |
91 |
# |
92 |
# Optionally, patterns may be specified to restrict the dependency to |
93 |
# a subset of Python implementations supported by the ebuild. |
94 |
-# The patterns can be either fnmatch-style patterns (matched via bash |
95 |
-# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate |
96 |
-# appropriately all enabled Python 2/3 implementations (alike |
97 |
-# python_is_python3). Remember to escape or quote the fnmatch patterns |
98 |
-# to prevent accidental shell filename expansion. |
99 |
+# The patterns are fnmatch-style patterns (matched via bash |
100 |
+# == operator against PYTHON_COMPAT values). Remember to escape |
101 |
+# or quote the fnmatch patterns to prevent accidental shell filename |
102 |
+# expansion. |
103 |
# |
104 |
# This should be used along with an appropriate python_check_deps() |
105 |
# that checks which of the any-of blocks were matched, and python_setup |
106 |
@@ -725,11 +719,10 @@ python_foreach_impl() { |
107 |
# The python_check_deps() function in the any-of mode needs to be |
108 |
# accompanied by appropriate any-of dependencies. |
109 |
# |
110 |
-# The patterns can be either fnmatch-style patterns (matched via bash |
111 |
-# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate |
112 |
-# appropriately all enabled Python 2/3 implementations (alike |
113 |
-# python_is_python3). Remember to escape or quote the fnmatch patterns |
114 |
-# to prevent accidental shell filename expansion. |
115 |
+# The patterns are fnmatch-style patterns (matched via bash |
116 |
+# == operator against PYTHON_COMPAT values). Remember to escape |
117 |
+# or quote the fnmatch patterns to prevent accidental shell filename |
118 |
+# expansion. |
119 |
# |
120 |
# This function needs to be used when Python is being called outside |
121 |
# of python_foreach_impl calls (e.g. for shared processes like doc |
122 |
-- |
123 |
2.32.0 |