[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/ - gentoo-commits

From:	Zac Medico <zmedico@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/
Date:	Wed, 01 Apr 2020 22:38:07
Message-Id:	`1585780676.02b9f53756f6df679be89ce624ed06844b41b5ee.zmedico@gentoo`

1

commit:     02b9f53756f6df679be89ce624ed06844b41b5ee

2

Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>

3

AuthorDate: Wed Apr  1 22:35:35 2020 +0000

4

Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>

5

CommitDate: Wed Apr  1 22:37:56 2020 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02b9f537

7

8

sys-apps/portage: Remove obsolete python_gen_cond_dep

9

10

Fixes: 0a2c520e735f ("sys-apps/portage: Drop py2")

11

Reported-by: Matt Turner <mattst88 <AT> gentoo.org>

12

Package-Manager: Portage-2.3.96, Repoman-2.3.22

13

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

14

15

 sys-apps/portage/portage-2.3.69.ebuild    | 4 +---

16

 sys-apps/portage/portage-2.3.79.ebuild    | 4 +---

17

 sys-apps/portage/portage-2.3.89-r1.ebuild | 4 +---

18

 sys-apps/portage/portage-2.3.94.ebuild    | 4 +---

19

 sys-apps/portage/portage-2.3.95.ebuild    | 4 +---

20

 sys-apps/portage/portage-2.3.96-r1.ebuild | 4 +---

21

 sys-apps/portage/portage-9999.ebuild      | 4 +---

22

 7 files changed, 7 insertions(+), 21 deletions(-)

23

24

diff --git a/sys-apps/portage/portage-2.3.69.ebuild b/sys-apps/portage/portage-2.3.69.ebuild

25

index 49902cf1a58..63e4b6aac18 100644

26

--- a/sys-apps/portage/portage-2.3.69.ebuild

27

+++ b/sys-apps/portage/portage-2.3.69.ebuild

28

@@ -39,7 +39,7 @@ RDEPEND="

29

 		app-shells/bash:0[readline]

30

 		>=app-admin/eselect-1.2

31

 		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \

32

-			python{2_7,3_5} pypy)

33

+			python3_5)

34

 		rsync-verify? (

35

 			>=app-portage/gemato-14[${PYTHON_USEDEP}]

36

 			>=app-crypt/openpgp-keys-gentoo-release-20180706

37

@@ -55,8 +55,6 @@ RDEPEND="

38

 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )

39

 	xattr? ( kernel_linux? (

40

 		>=sys-apps/install-xattr-0.3

41

-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \

42

-			python2_7 pypy)

43

) )

44

 	!<app-admin/logrotate-3.8.0

45

 	!<app-portage/repoman-2.3.10"

46

47

diff --git a/sys-apps/portage/portage-2.3.79.ebuild b/sys-apps/portage/portage-2.3.79.ebuild

48

index 9a5f7d08584..b0a1b2c9a46 100644

49

--- a/sys-apps/portage/portage-2.3.79.ebuild

50

+++ b/sys-apps/portage/portage-2.3.79.ebuild

51

@@ -39,7 +39,7 @@ RDEPEND="

52

 		app-shells/bash:0[readline]

53

 		>=app-admin/eselect-1.2

54

 		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \

55

-			python{2_7,3_5} pypy)

56

+			python3_5)

57

 		rsync-verify? (

58

 			>=app-portage/gemato-14[${PYTHON_USEDEP}]

59

 			>=app-crypt/openpgp-keys-gentoo-release-20180706

60

@@ -55,8 +55,6 @@ RDEPEND="

61

 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )

62

 	xattr? ( kernel_linux? (

63

 		>=sys-apps/install-xattr-0.3

64

-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \

65

-			python2_7 pypy)

66

) )

67

 	!<app-admin/logrotate-3.8.0

68

 	!<app-portage/gentoolkit-0.4.6

69

70

diff --git a/sys-apps/portage/portage-2.3.89-r1.ebuild b/sys-apps/portage/portage-2.3.89-r1.ebuild

71

index 4aaaed7db0e..aa0ae262ab8 100644

72

--- a/sys-apps/portage/portage-2.3.89-r1.ebuild

73

+++ b/sys-apps/portage/portage-2.3.89-r1.ebuild

74

@@ -43,7 +43,7 @@ RDEPEND="

75

 		app-shells/bash:0[readline]

76

 		>=app-admin/eselect-1.2

77

 		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \

78

-			python{2_7,3_5} pypy)

79

+			python3_5)

80

 		rsync-verify? (

81

 			>=app-portage/gemato-14[${PYTHON_USEDEP}]

82

 			>=app-crypt/openpgp-keys-gentoo-release-20180706

83

@@ -59,8 +59,6 @@ RDEPEND="

84

 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )

85

 	xattr? ( kernel_linux? (

86

 		>=sys-apps/install-xattr-0.3

87

-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \

88

-			python2_7 pypy)

89

) )

90

 	!<app-admin/logrotate-3.8.0

91

 	!<app-portage/gentoolkit-0.4.6

92

93

diff --git a/sys-apps/portage/portage-2.3.94.ebuild b/sys-apps/portage/portage-2.3.94.ebuild

94

index aa35e924a82..b157506f61e 100644

95

--- a/sys-apps/portage/portage-2.3.94.ebuild

96

+++ b/sys-apps/portage/portage-2.3.94.ebuild

97

@@ -43,7 +43,7 @@ RDEPEND="

98

 		app-shells/bash:0[readline]

99

 		>=app-admin/eselect-1.2

100

 		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \

101

-			python{2_7,3_5} pypy)

102

+			python3_5)

103

 		rsync-verify? (

104

 			>=app-portage/gemato-14[${PYTHON_USEDEP}]

105

 			>=app-crypt/openpgp-keys-gentoo-release-20180706

106

@@ -59,8 +59,6 @@ RDEPEND="

107

 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )

108

 	xattr? ( kernel_linux? (

109

 		>=sys-apps/install-xattr-0.3

110

-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \

111

-			python2_7 pypy)

112

) )

113

 	!<app-admin/logrotate-3.8.0

114

 	!<app-portage/gentoolkit-0.4.6

115

116

diff --git a/sys-apps/portage/portage-2.3.95.ebuild b/sys-apps/portage/portage-2.3.95.ebuild

117

index aa35e924a82..b157506f61e 100644

118

--- a/sys-apps/portage/portage-2.3.95.ebuild

119

+++ b/sys-apps/portage/portage-2.3.95.ebuild

120

@@ -43,7 +43,7 @@ RDEPEND="

121

 		app-shells/bash:0[readline]

122

 		>=app-admin/eselect-1.2

123

 		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \

124

-			python{2_7,3_5} pypy)

125

+			python3_5)

126

 		rsync-verify? (

127

 			>=app-portage/gemato-14[${PYTHON_USEDEP}]

128

 			>=app-crypt/openpgp-keys-gentoo-release-20180706

129

@@ -59,8 +59,6 @@ RDEPEND="

130

 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )

131

 	xattr? ( kernel_linux? (

132

 		>=sys-apps/install-xattr-0.3

133

-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \

134

-			python2_7 pypy)

135

) )

136

 	!<app-admin/logrotate-3.8.0

137

 	!<app-portage/gentoolkit-0.4.6

138

139

diff --git a/sys-apps/portage/portage-2.3.96-r1.ebuild b/sys-apps/portage/portage-2.3.96-r1.ebuild

140

index 9267d9bd83e..4e0264ebf1e 100644

141

--- a/sys-apps/portage/portage-2.3.96-r1.ebuild

142

+++ b/sys-apps/portage/portage-2.3.96-r1.ebuild

143

@@ -43,7 +43,7 @@ RDEPEND="

144

 		app-shells/bash:0[readline]

145

 		>=app-admin/eselect-1.2

146

 		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \

147

-			python{2_7,3_5} pypy)

148

+			python3_5)

149

 		rsync-verify? (

150

 			>=app-portage/gemato-14[${PYTHON_USEDEP}]

151

 			>=app-crypt/openpgp-keys-gentoo-release-20180706

152

@@ -59,8 +59,6 @@ RDEPEND="

153

 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )

154

 	xattr? ( kernel_linux? (

155

 		>=sys-apps/install-xattr-0.3

156

-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \

157

-			python2_7 pypy)

158

) )

159

 	!<app-admin/logrotate-3.8.0

160

 	!<app-portage/gentoolkit-0.4.6

161

162

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild

163

index 1ee606fe3c2..cf5c6e3b5fd 100644

164

--- a/sys-apps/portage/portage-9999.ebuild

165

+++ b/sys-apps/portage/portage-9999.ebuild

166

@@ -44,7 +44,7 @@ RDEPEND="

167

 		app-shells/bash:0[readline]

168

 		>=app-admin/eselect-1.2

169

 		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \

170

-			python{2_7,3_5} pypy)

171

+			python3_5)

172

 		rsync-verify? (

173

 			>=app-portage/gemato-14[${PYTHON_USEDEP}]

174

 			>=app-crypt/openpgp-keys-gentoo-release-20180706

175

@@ -60,8 +60,6 @@ RDEPEND="

176

 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )

177

 	xattr? ( kernel_linux? (

178

 		>=sys-apps/install-xattr-0.3

179

-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \

180

-			python2_7 pypy)

181

) )

182

 	!<app-admin/logrotate-3.8.0"

183

 PDEPEND="

1	commit: 02b9f53756f6df679be89ce624ed06844b41b5ee
2	Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3	AuthorDate: Wed Apr 1 22:35:35 2020 +0000
4	Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5	CommitDate: Wed Apr 1 22:37:56 2020 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02b9f537
7
8	sys-apps/portage: Remove obsolete python_gen_cond_dep
9
10	Fixes: 0a2c520e735f ("sys-apps/portage: Drop py2")
11	Reported-by: Matt Turner <mattst88 <AT> gentoo.org>
12	Package-Manager: Portage-2.3.96, Repoman-2.3.22
13	Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
14
15	sys-apps/portage/portage-2.3.69.ebuild \| 4 +---
16	sys-apps/portage/portage-2.3.79.ebuild \| 4 +---
17	sys-apps/portage/portage-2.3.89-r1.ebuild \| 4 +---
18	sys-apps/portage/portage-2.3.94.ebuild \| 4 +---
19	sys-apps/portage/portage-2.3.95.ebuild \| 4 +---
20	sys-apps/portage/portage-2.3.96-r1.ebuild \| 4 +---
21	sys-apps/portage/portage-9999.ebuild \| 4 +---
22	7 files changed, 7 insertions(+), 21 deletions(-)
23
24	diff --git a/sys-apps/portage/portage-2.3.69.ebuild b/sys-apps/portage/portage-2.3.69.ebuild
25	index 49902cf1a58..63e4b6aac18 100644
26	--- a/sys-apps/portage/portage-2.3.69.ebuild
27	+++ b/sys-apps/portage/portage-2.3.69.ebuild
28	@@ -39,7 +39,7 @@ RDEPEND="
29	app-shells/bash:0[readline]
30	>=app-admin/eselect-1.2
31	$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
32	- python{2_7,3_5} pypy)
33	+ python3_5)
34	rsync-verify? (
35	>=app-portage/gemato-14[${PYTHON_USEDEP}]
36	>=app-crypt/openpgp-keys-gentoo-release-20180706
37	@@ -55,8 +55,6 @@ RDEPEND="
38	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
39	xattr? ( kernel_linux? (
40	>=sys-apps/install-xattr-0.3
41	- $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
42	- python2_7 pypy)
43	) )
44	!<app-admin/logrotate-3.8.0
45	!<app-portage/repoman-2.3.10"
46
47	diff --git a/sys-apps/portage/portage-2.3.79.ebuild b/sys-apps/portage/portage-2.3.79.ebuild
48	index 9a5f7d08584..b0a1b2c9a46 100644
49	--- a/sys-apps/portage/portage-2.3.79.ebuild
50	+++ b/sys-apps/portage/portage-2.3.79.ebuild
51	@@ -39,7 +39,7 @@ RDEPEND="
52	app-shells/bash:0[readline]
53	>=app-admin/eselect-1.2
54	$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
55	- python{2_7,3_5} pypy)
56	+ python3_5)
57	rsync-verify? (
58	>=app-portage/gemato-14[${PYTHON_USEDEP}]
59	>=app-crypt/openpgp-keys-gentoo-release-20180706
60	@@ -55,8 +55,6 @@ RDEPEND="
61	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
62	xattr? ( kernel_linux? (
63	>=sys-apps/install-xattr-0.3
64	- $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
65	- python2_7 pypy)
66	) )
67	!<app-admin/logrotate-3.8.0
68	!<app-portage/gentoolkit-0.4.6
69
70	diff --git a/sys-apps/portage/portage-2.3.89-r1.ebuild b/sys-apps/portage/portage-2.3.89-r1.ebuild
71	index 4aaaed7db0e..aa0ae262ab8 100644
72	--- a/sys-apps/portage/portage-2.3.89-r1.ebuild
73	+++ b/sys-apps/portage/portage-2.3.89-r1.ebuild
74	@@ -43,7 +43,7 @@ RDEPEND="
75	app-shells/bash:0[readline]
76	>=app-admin/eselect-1.2
77	$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
78	- python{2_7,3_5} pypy)
79	+ python3_5)
80	rsync-verify? (
81	>=app-portage/gemato-14[${PYTHON_USEDEP}]
82	>=app-crypt/openpgp-keys-gentoo-release-20180706
83	@@ -59,8 +59,6 @@ RDEPEND="
84	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
85	xattr? ( kernel_linux? (
86	>=sys-apps/install-xattr-0.3
87	- $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
88	- python2_7 pypy)
89	) )
90	!<app-admin/logrotate-3.8.0
91	!<app-portage/gentoolkit-0.4.6
92
93	diff --git a/sys-apps/portage/portage-2.3.94.ebuild b/sys-apps/portage/portage-2.3.94.ebuild
94	index aa35e924a82..b157506f61e 100644
95	--- a/sys-apps/portage/portage-2.3.94.ebuild
96	+++ b/sys-apps/portage/portage-2.3.94.ebuild
97	@@ -43,7 +43,7 @@ RDEPEND="
98	app-shells/bash:0[readline]
99	>=app-admin/eselect-1.2
100	$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
101	- python{2_7,3_5} pypy)
102	+ python3_5)
103	rsync-verify? (
104	>=app-portage/gemato-14[${PYTHON_USEDEP}]
105	>=app-crypt/openpgp-keys-gentoo-release-20180706
106	@@ -59,8 +59,6 @@ RDEPEND="
107	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
108	xattr? ( kernel_linux? (
109	>=sys-apps/install-xattr-0.3
110	- $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
111	- python2_7 pypy)
112	) )
113	!<app-admin/logrotate-3.8.0
114	!<app-portage/gentoolkit-0.4.6
115
116	diff --git a/sys-apps/portage/portage-2.3.95.ebuild b/sys-apps/portage/portage-2.3.95.ebuild
117	index aa35e924a82..b157506f61e 100644
118	--- a/sys-apps/portage/portage-2.3.95.ebuild
119	+++ b/sys-apps/portage/portage-2.3.95.ebuild
120	@@ -43,7 +43,7 @@ RDEPEND="
121	app-shells/bash:0[readline]
122	>=app-admin/eselect-1.2
123	$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
124	- python{2_7,3_5} pypy)
125	+ python3_5)
126	rsync-verify? (
127	>=app-portage/gemato-14[${PYTHON_USEDEP}]
128	>=app-crypt/openpgp-keys-gentoo-release-20180706
129	@@ -59,8 +59,6 @@ RDEPEND="
130	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
131	xattr? ( kernel_linux? (
132	>=sys-apps/install-xattr-0.3
133	- $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
134	- python2_7 pypy)
135	) )
136	!<app-admin/logrotate-3.8.0
137	!<app-portage/gentoolkit-0.4.6
138
139	diff --git a/sys-apps/portage/portage-2.3.96-r1.ebuild b/sys-apps/portage/portage-2.3.96-r1.ebuild
140	index 9267d9bd83e..4e0264ebf1e 100644
141	--- a/sys-apps/portage/portage-2.3.96-r1.ebuild
142	+++ b/sys-apps/portage/portage-2.3.96-r1.ebuild
143	@@ -43,7 +43,7 @@ RDEPEND="
144	app-shells/bash:0[readline]
145	>=app-admin/eselect-1.2
146	$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
147	- python{2_7,3_5} pypy)
148	+ python3_5)
149	rsync-verify? (
150	>=app-portage/gemato-14[${PYTHON_USEDEP}]
151	>=app-crypt/openpgp-keys-gentoo-release-20180706
152	@@ -59,8 +59,6 @@ RDEPEND="
153	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
154	xattr? ( kernel_linux? (
155	>=sys-apps/install-xattr-0.3
156	- $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
157	- python2_7 pypy)
158	) )
159	!<app-admin/logrotate-3.8.0
160	!<app-portage/gentoolkit-0.4.6
161
162	diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
163	index 1ee606fe3c2..cf5c6e3b5fd 100644
164	--- a/sys-apps/portage/portage-9999.ebuild
165	+++ b/sys-apps/portage/portage-9999.ebuild
166	@@ -44,7 +44,7 @@ RDEPEND="
167	app-shells/bash:0[readline]
168	>=app-admin/eselect-1.2
169	$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
170	- python{2_7,3_5} pypy)
171	+ python3_5)
172	rsync-verify? (
173	>=app-portage/gemato-14[${PYTHON_USEDEP}]
174	>=app-crypt/openpgp-keys-gentoo-release-20180706
175	@@ -60,8 +60,6 @@ RDEPEND="
176	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
177	xattr? ( kernel_linux? (
178	>=sys-apps/install-xattr-0.3
179	- $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
180	- python2_7 pypy)
181	) )
182	!<app-admin/logrotate-3.8.0"
183	PDEPEND="

Gentoo Archives: gentoo-commits