[gentoo-commits] repo/gentoo:master commit in: eclass/ - 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:	`1624484657.12f4d4b8f7fb10bff447a54ca22e843ea44a39c2.mgorny@gentoo`

1

commit:     12f4d4b8f7fb10bff447a54ca22e843ea44a39c2

2

Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>

3

AuthorDate: Sun Jun 20 08:21:41 2021 +0000

4

Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>

5

CommitDate: Wed Jun 23 21:44:17 2021 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12f4d4b8

7

8

python-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-r1.eclass | 63 ++++++++++++++++++++++---------------------------

13

 1 file changed, 28 insertions(+), 35 deletions(-)

14

15

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass

16

index 1eb68270a0b..00555e19d60 100644

17

--- a/eclass/python-r1.eclass

18

+++ b/eclass/python-r1.eclass

19

@@ -304,11 +304,10 @@ _python_validate_useflags() {

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

 # and deprecated python_gen_usedep.

35

@@ -342,11 +341,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

 # When all implementations are requested, please use ${PYTHON_USEDEP}

50

 # instead. Please also remember to set an appropriate REQUIRED_USE

51

@@ -380,11 +378,10 @@ python_gen_usedep() {

52

 # are both in PYTHON_COMPAT and match any of the patterns passed

53

 # as parameters to the function.

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

 # Example:

66

 # @CODE

67

@@ -418,11 +415,10 @@ python_gen_useflags() {

68

 # of Python implementations which are both in PYTHON_COMPAT and match

69

 # any of the patterns passed as the remaining parameters.

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

 # In order to enforce USE constraints on the packages, verbatim

82

 # '${PYTHON_USEDEP}' (quoted!) may be placed in the dependency

83

@@ -477,11 +473,10 @@ python_gen_cond_dep() {

84

 # patterns are passed, the output dependencies will be generated only

85

 # for the implementations matching them.

86

#

87

-# The patterns can be either fnmatch-style patterns (matched via bash

88

-# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate

89

-# appropriately all enabled Python 2/3 implementations (alike

90

-# python_is_python3). Remember to escape or quote the fnmatch patterns

91

-# to prevent accidental shell filename expansion.

92

+# The patterns are fnmatch-style patterns (matched via bash

93

+# == operator against PYTHON_COMPAT values).  Remember to escape

94

+# or quote the fnmatch patterns to prevent accidental shell filename

95

+# expansion.

96

#

97

 # Use this function when you need to request different USE flags

98

 # on the Python interpreter depending on package's USE flags. If you

99

@@ -534,11 +529,10 @@ python_gen_impl_dep() {

100

#

101

 # Optionally, patterns may be specified to restrict the dependency to

102

 # a subset of Python implementations supported by the ebuild.

103

-# The patterns can be either fnmatch-style patterns (matched via bash

104

-# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate

105

-# appropriately all enabled Python 2/3 implementations (alike

106

-# python_is_python3). Remember to escape or quote the fnmatch patterns

107

-# to prevent accidental shell filename expansion.

108

+# The patterns are fnmatch-style patterns (matched via bash

109

+# == operator against PYTHON_COMPAT values).  Remember to escape

110

+# or quote the fnmatch patterns to prevent accidental shell filename

111

+# expansion.

112

#

113

 # This should be used along with an appropriate python_check_deps()

114

 # that checks which of the any-of blocks were matched, and python_setup

115

@@ -725,11 +719,10 @@ python_foreach_impl() {

116

 # The python_check_deps() function in the any-of mode needs to be

117

 # accompanied by appropriate any-of dependencies.

118

#

119

-# The patterns can be either fnmatch-style patterns (matched via bash

120

-# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate

121

-# appropriately all enabled Python 2/3 implementations (alike

122

-# python_is_python3). Remember to escape or quote the fnmatch patterns

123

-# to prevent accidental shell filename expansion.

124

+# The patterns are fnmatch-style patterns (matched via bash

125

+# == operator against PYTHON_COMPAT values).  Remember to escape

126

+# or quote the fnmatch patterns to prevent accidental shell filename

127

+# expansion.

128

#

129

 # This function needs to be used when Python is being called outside

130

 # of python_foreach_impl calls (e.g. for shared processes like doc

1	commit: 12f4d4b8f7fb10bff447a54ca22e843ea44a39c2
2	Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3	AuthorDate: Sun Jun 20 08:21:41 2021 +0000
4	Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5	CommitDate: Wed Jun 23 21:44:17 2021 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12f4d4b8
7
8	python-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-r1.eclass \| 63 ++++++++++++++++++++++---------------------------
13	1 file changed, 28 insertions(+), 35 deletions(-)
14
15	diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
16	index 1eb68270a0b..00555e19d60 100644
17	--- a/eclass/python-r1.eclass
18	+++ b/eclass/python-r1.eclass
19	@@ -304,11 +304,10 @@ _python_validate_useflags() {
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	# and deprecated python_gen_usedep.
35	@@ -342,11 +341,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	# When all implementations are requested, please use ${PYTHON_USEDEP}
50	# instead. Please also remember to set an appropriate REQUIRED_USE
51	@@ -380,11 +378,10 @@ python_gen_usedep() {
52	# are both in PYTHON_COMPAT and match any of the patterns passed
53	# as parameters to the function.
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	# Example:
66	# @CODE
67	@@ -418,11 +415,10 @@ python_gen_useflags() {
68	# of Python implementations which are both in PYTHON_COMPAT and match
69	# any of the patterns passed as the remaining parameters.
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	# In order to enforce USE constraints on the packages, verbatim
82	# '${PYTHON_USEDEP}' (quoted!) may be placed in the dependency
83	@@ -477,11 +473,10 @@ python_gen_cond_dep() {
84	# patterns are passed, the output dependencies will be generated only
85	# for the implementations matching them.
86	#
87	-# The patterns can be either fnmatch-style patterns (matched via bash
88	-# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate
89	-# appropriately all enabled Python 2/3 implementations (alike
90	-# python_is_python3). Remember to escape or quote the fnmatch patterns
91	-# to prevent accidental shell filename expansion.
92	+# The patterns are fnmatch-style patterns (matched via bash
93	+# == operator against PYTHON_COMPAT values). Remember to escape
94	+# or quote the fnmatch patterns to prevent accidental shell filename
95	+# expansion.
96	#
97	# Use this function when you need to request different USE flags
98	# on the Python interpreter depending on package's USE flags. If you
99	@@ -534,11 +529,10 @@ python_gen_impl_dep() {
100	#
101	# Optionally, patterns may be specified to restrict the dependency to
102	# a subset of Python implementations supported by the ebuild.
103	-# The patterns can be either fnmatch-style patterns (matched via bash
104	-# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate
105	-# appropriately all enabled Python 2/3 implementations (alike
106	-# python_is_python3). Remember to escape or quote the fnmatch patterns
107	-# to prevent accidental shell filename expansion.
108	+# The patterns are fnmatch-style patterns (matched via bash
109	+# == operator against PYTHON_COMPAT values). Remember to escape
110	+# or quote the fnmatch patterns to prevent accidental shell filename
111	+# expansion.
112	#
113	# This should be used along with an appropriate python_check_deps()
114	# that checks which of the any-of blocks were matched, and python_setup
115	@@ -725,11 +719,10 @@ python_foreach_impl() {
116	# The python_check_deps() function in the any-of mode needs to be
117	# accompanied by appropriate any-of dependencies.
118	#
119	-# The patterns can be either fnmatch-style patterns (matched via bash
120	-# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate
121	-# appropriately all enabled Python 2/3 implementations (alike
122	-# python_is_python3). Remember to escape or quote the fnmatch patterns
123	-# to prevent accidental shell filename expansion.
124	+# The patterns are fnmatch-style patterns (matched via bash
125	+# == operator against PYTHON_COMPAT values). Remember to escape
126	+# or quote the fnmatch patterns to prevent accidental shell filename
127	+# expansion.
128	#
129	# This function needs to be used when Python is being called outside
130	# of python_foreach_impl calls (e.g. for shared processes like doc

Gentoo Archives: gentoo-commits