[gentoo-commits] repo/gentoo:master commit in: dev-python/pypy/ - gentoo-commits

From:	"Michał Górny" <mgorny@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-python/pypy/
Date:	Sun, 15 Oct 2017 10:09:08
Message-Id:	`1508062056.1e3348be2d7d8920097bf61e9d815e1afc064bcc.mgorny@gentoo`

1

commit:     1e3348be2d7d8920097bf61e9d815e1afc064bcc

2

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

3

AuthorDate: Sun Oct 15 10:03:54 2017 +0000

4

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

5

CommitDate: Sun Oct 15 10:07:36 2017 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e3348be

7

8

dev-python/pypy: Fix cross-phase function calls

9

10

Closes: https://bugs.gentoo.org/596624

11

12

 dev-python/pypy/pypy-5.8.0.ebuild | 42 ++++++++++++++++++++-------------------

13

 dev-python/pypy/pypy-5.9.0.ebuild | 42 ++++++++++++++++++++-------------------

14

 dev-python/pypy/pypy-9999.ebuild  | 42 ++++++++++++++++++++-------------------

15

 3 files changed, 66 insertions(+), 60 deletions(-)

16

17

diff --git a/dev-python/pypy/pypy-5.8.0.ebuild b/dev-python/pypy/pypy-5.8.0.ebuild

18

index 8317a80f148..ff7d02e64a2 100644

19

--- a/dev-python/pypy/pypy-5.8.0.ebuild

20

+++ b/dev-python/pypy/pypy-5.8.0.ebuild

21

@@ -43,33 +43,35 @@ DEPEND="${RDEPEND}

22

23

 S="${WORKDIR}/${MY_P}-src"

24

25

-pkg_pretend() {

26

-	if [[ ${MERGE_TYPE} != binary ]]; then

27

-		if use low-memory; then

28

-			if ! python_is_installed pypy; then

29

-				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"

30

-				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"

31

-				eerror

32

-				eerror "  $ emerge -1v dev-python/pypy-bin"

33

-				eerror

34

-				eerror "before attempting to build dev-python/pypy[low-memory]."

35

-				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"

36

-			fi

37

-

38

-			CHECKREQS_MEMORY="1750M"

39

-			use amd64 && CHECKREQS_MEMORY="3500M"

40

-		else

41

-			CHECKREQS_MEMORY="3G"

42

-			use amd64 && CHECKREQS_MEMORY="6G"

43

+check_env() {

44

+	if use low-memory; then

45

+		if ! python_is_installed pypy; then

46

+			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"

47

+			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"

48

+			eerror

49

+			eerror "  $ emerge -1v dev-python/pypy-bin"

50

+			eerror

51

+			eerror "before attempting to build dev-python/pypy[low-memory]."

52

+			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"

53

fi

54

55

-		check-reqs_pkg_pretend

56

+		CHECKREQS_MEMORY="1750M"

57

+		use amd64 && CHECKREQS_MEMORY="3500M"

58

+	else

59

+		CHECKREQS_MEMORY="3G"

60

+		use amd64 && CHECKREQS_MEMORY="6G"

61

fi

62

+

63

+	check-reqs_pkg_pretend

64

+}

65

+

66

+pkg_pretend() {

67

+	[[ ${MERGE_TYPE} != binary ]] && check_env

68

}

69

70

 pkg_setup() {

71

 	if [[ ${MERGE_TYPE} != binary ]]; then

72

-		pkg_pretend

73

+		check_env

74

75

 		if python_is_installed pypy; then

76

 			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then

77

78

diff --git a/dev-python/pypy/pypy-5.9.0.ebuild b/dev-python/pypy/pypy-5.9.0.ebuild

79

index 0ac7919c6ef..3eff562c4ad 100644

80

--- a/dev-python/pypy/pypy-5.9.0.ebuild

81

+++ b/dev-python/pypy/pypy-5.9.0.ebuild

82

@@ -43,33 +43,35 @@ DEPEND="${RDEPEND}

83

84

 S="${WORKDIR}/${MY_P}-src"

85

86

-pkg_pretend() {

87

-	if [[ ${MERGE_TYPE} != binary ]]; then

88

-		if use low-memory; then

89

-			if ! python_is_installed pypy; then

90

-				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"

91

-				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"

92

-				eerror

93

-				eerror "  $ emerge -1v dev-python/pypy-bin"

94

-				eerror

95

-				eerror "before attempting to build dev-python/pypy[low-memory]."

96

-				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"

97

-			fi

98

-

99

-			CHECKREQS_MEMORY="1750M"

100

-			use amd64 && CHECKREQS_MEMORY="3500M"

101

-		else

102

-			CHECKREQS_MEMORY="3G"

103

-			use amd64 && CHECKREQS_MEMORY="6G"

104

+check_env() {

105

+	if use low-memory; then

106

+		if ! python_is_installed pypy; then

107

+			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"

108

+			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"

109

+			eerror

110

+			eerror "  $ emerge -1v dev-python/pypy-bin"

111

+			eerror

112

+			eerror "before attempting to build dev-python/pypy[low-memory]."

113

+			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"

114

fi

115

116

-		check-reqs_pkg_pretend

117

+		CHECKREQS_MEMORY="1750M"

118

+		use amd64 && CHECKREQS_MEMORY="3500M"

119

+	else

120

+		CHECKREQS_MEMORY="3G"

121

+		use amd64 && CHECKREQS_MEMORY="6G"

122

fi

123

+

124

+	check-reqs_pkg_pretend

125

+}

126

+

127

+pkg_pretend() {

128

+	[[ ${MERGE_TYPE} != binary ]] && check_env

129

}

130

131

 pkg_setup() {

132

 	if [[ ${MERGE_TYPE} != binary ]]; then

133

-		pkg_pretend

134

+		check_env

135

136

 		if python_is_installed pypy; then

137

 			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then

138

139

diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild

140

index f028a5b6e80..62d8a0f73b8 100644

141

--- a/dev-python/pypy/pypy-9999.ebuild

142

+++ b/dev-python/pypy/pypy-9999.ebuild

143

@@ -44,33 +44,35 @@ DEPEND="${RDEPEND}

144

145

 S="${WORKDIR}/${MY_P}-src"

146

147

-pkg_pretend() {

148

-	if [[ ${MERGE_TYPE} != binary ]]; then

149

-		if use low-memory; then

150

-			if ! python_is_installed pypy; then

151

-				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"

152

-				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"

153

-				eerror

154

-				eerror "  $ emerge -1v dev-python/pypy-bin"

155

-				eerror

156

-				eerror "before attempting to build dev-python/pypy[low-memory]."

157

-				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"

158

-			fi

159

-

160

-			CHECKREQS_MEMORY="1750M"

161

-			use amd64 && CHECKREQS_MEMORY="3500M"

162

-		else

163

-			CHECKREQS_MEMORY="3G"

164

-			use amd64 && CHECKREQS_MEMORY="6G"

165

+check_env() {

166

+	if use low-memory; then

167

+		if ! python_is_installed pypy; then

168

+			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"

169

+			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"

170

+			eerror

171

+			eerror "  $ emerge -1v dev-python/pypy-bin"

172

+			eerror

173

+			eerror "before attempting to build dev-python/pypy[low-memory]."

174

+			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"

175

fi

176

177

-		check-reqs_pkg_pretend

178

+		CHECKREQS_MEMORY="1750M"

179

+		use amd64 && CHECKREQS_MEMORY="3500M"

180

+	else

181

+		CHECKREQS_MEMORY="3G"

182

+		use amd64 && CHECKREQS_MEMORY="6G"

183

fi

184

+

185

+	check-reqs_pkg_pretend

186

+}

187

+

188

+pkg_pretend() {

189

+	[[ ${MERGE_TYPE} != binary ]] && check_env

190

}

191

192

 pkg_setup() {

193

 	if [[ ${MERGE_TYPE} != binary ]]; then

194

-		pkg_pretend

195

+		check_env

196

197

 		if python_is_installed pypy; then

198

 			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then

1	commit: 1e3348be2d7d8920097bf61e9d815e1afc064bcc
2	Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3	AuthorDate: Sun Oct 15 10:03:54 2017 +0000
4	Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5	CommitDate: Sun Oct 15 10:07:36 2017 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e3348be
7
8	dev-python/pypy: Fix cross-phase function calls
9
10	Closes: https://bugs.gentoo.org/596624
11
12	dev-python/pypy/pypy-5.8.0.ebuild \| 42 ++++++++++++++++++++-------------------
13	dev-python/pypy/pypy-5.9.0.ebuild \| 42 ++++++++++++++++++++-------------------
14	dev-python/pypy/pypy-9999.ebuild \| 42 ++++++++++++++++++++-------------------
15	3 files changed, 66 insertions(+), 60 deletions(-)
16
17	diff --git a/dev-python/pypy/pypy-5.8.0.ebuild b/dev-python/pypy/pypy-5.8.0.ebuild
18	index 8317a80f148..ff7d02e64a2 100644
19	--- a/dev-python/pypy/pypy-5.8.0.ebuild
20	+++ b/dev-python/pypy/pypy-5.8.0.ebuild
21	@@ -43,33 +43,35 @@ DEPEND="${RDEPEND}
22
23	S="${WORKDIR}/${MY_P}-src"
24
25	-pkg_pretend() {
26	- if [[ ${MERGE_TYPE} != binary ]]; then
27	- if use low-memory; then
28	- if ! python_is_installed pypy; then
29	- eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
30	- eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
31	- eerror
32	- eerror " $ emerge -1v dev-python/pypy-bin"
33	- eerror
34	- eerror "before attempting to build dev-python/pypy[low-memory]."
35	- die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
36	- fi
37	-
38	- CHECKREQS_MEMORY="1750M"
39	- use amd64 && CHECKREQS_MEMORY="3500M"
40	- else
41	- CHECKREQS_MEMORY="3G"
42	- use amd64 && CHECKREQS_MEMORY="6G"
43	+check_env() {
44	+ if use low-memory; then
45	+ if ! python_is_installed pypy; then
46	+ eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
47	+ eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
48	+ eerror
49	+ eerror " $ emerge -1v dev-python/pypy-bin"
50	+ eerror
51	+ eerror "before attempting to build dev-python/pypy[low-memory]."
52	+ die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
53	fi
54
55	- check-reqs_pkg_pretend
56	+ CHECKREQS_MEMORY="1750M"
57	+ use amd64 && CHECKREQS_MEMORY="3500M"
58	+ else
59	+ CHECKREQS_MEMORY="3G"
60	+ use amd64 && CHECKREQS_MEMORY="6G"
61	fi
62	+
63	+ check-reqs_pkg_pretend
64	+}
65	+
66	+pkg_pretend() {
67	+ [[ ${MERGE_TYPE} != binary ]] && check_env
68	}
69
70	pkg_setup() {
71	if [[ ${MERGE_TYPE} != binary ]]; then
72	- pkg_pretend
73	+ check_env
74
75	if python_is_installed pypy; then
76	if [[ ! ${EPYTHON} \|\| ${EPYTHON} == pypy ]] \|\| use low-memory; then
77
78	diff --git a/dev-python/pypy/pypy-5.9.0.ebuild b/dev-python/pypy/pypy-5.9.0.ebuild
79	index 0ac7919c6ef..3eff562c4ad 100644
80	--- a/dev-python/pypy/pypy-5.9.0.ebuild
81	+++ b/dev-python/pypy/pypy-5.9.0.ebuild
82	@@ -43,33 +43,35 @@ DEPEND="${RDEPEND}
83
84	S="${WORKDIR}/${MY_P}-src"
85
86	-pkg_pretend() {
87	- if [[ ${MERGE_TYPE} != binary ]]; then
88	- if use low-memory; then
89	- if ! python_is_installed pypy; then
90	- eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
91	- eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
92	- eerror
93	- eerror " $ emerge -1v dev-python/pypy-bin"
94	- eerror
95	- eerror "before attempting to build dev-python/pypy[low-memory]."
96	- die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
97	- fi
98	-
99	- CHECKREQS_MEMORY="1750M"
100	- use amd64 && CHECKREQS_MEMORY="3500M"
101	- else
102	- CHECKREQS_MEMORY="3G"
103	- use amd64 && CHECKREQS_MEMORY="6G"
104	+check_env() {
105	+ if use low-memory; then
106	+ if ! python_is_installed pypy; then
107	+ eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
108	+ eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
109	+ eerror
110	+ eerror " $ emerge -1v dev-python/pypy-bin"
111	+ eerror
112	+ eerror "before attempting to build dev-python/pypy[low-memory]."
113	+ die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
114	fi
115
116	- check-reqs_pkg_pretend
117	+ CHECKREQS_MEMORY="1750M"
118	+ use amd64 && CHECKREQS_MEMORY="3500M"
119	+ else
120	+ CHECKREQS_MEMORY="3G"
121	+ use amd64 && CHECKREQS_MEMORY="6G"
122	fi
123	+
124	+ check-reqs_pkg_pretend
125	+}
126	+
127	+pkg_pretend() {
128	+ [[ ${MERGE_TYPE} != binary ]] && check_env
129	}
130
131	pkg_setup() {
132	if [[ ${MERGE_TYPE} != binary ]]; then
133	- pkg_pretend
134	+ check_env
135
136	if python_is_installed pypy; then
137	if [[ ! ${EPYTHON} \|\| ${EPYTHON} == pypy ]] \|\| use low-memory; then
138
139	diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
140	index f028a5b6e80..62d8a0f73b8 100644
141	--- a/dev-python/pypy/pypy-9999.ebuild
142	+++ b/dev-python/pypy/pypy-9999.ebuild
143	@@ -44,33 +44,35 @@ DEPEND="${RDEPEND}
144
145	S="${WORKDIR}/${MY_P}-src"
146
147	-pkg_pretend() {
148	- if [[ ${MERGE_TYPE} != binary ]]; then
149	- if use low-memory; then
150	- if ! python_is_installed pypy; then
151	- eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
152	- eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
153	- eerror
154	- eerror " $ emerge -1v dev-python/pypy-bin"
155	- eerror
156	- eerror "before attempting to build dev-python/pypy[low-memory]."
157	- die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
158	- fi
159	-
160	- CHECKREQS_MEMORY="1750M"
161	- use amd64 && CHECKREQS_MEMORY="3500M"
162	- else
163	- CHECKREQS_MEMORY="3G"
164	- use amd64 && CHECKREQS_MEMORY="6G"
165	+check_env() {
166	+ if use low-memory; then
167	+ if ! python_is_installed pypy; then
168	+ eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
169	+ eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
170	+ eerror
171	+ eerror " $ emerge -1v dev-python/pypy-bin"
172	+ eerror
173	+ eerror "before attempting to build dev-python/pypy[low-memory]."
174	+ die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
175	fi
176
177	- check-reqs_pkg_pretend
178	+ CHECKREQS_MEMORY="1750M"
179	+ use amd64 && CHECKREQS_MEMORY="3500M"
180	+ else
181	+ CHECKREQS_MEMORY="3G"
182	+ use amd64 && CHECKREQS_MEMORY="6G"
183	fi
184	+
185	+ check-reqs_pkg_pretend
186	+}
187	+
188	+pkg_pretend() {
189	+ [[ ${MERGE_TYPE} != binary ]] && check_env
190	}
191
192	pkg_setup() {
193	if [[ ${MERGE_TYPE} != binary ]]; then
194	- pkg_pretend
195	+ check_env
196
197	if python_is_installed pypy; then
198	if [[ ! ${EPYTHON} \|\| ${EPYTHON} == pypy ]] \|\| use low-memory; then

Gentoo Archives: gentoo-commits