1 |
tetromino 15/07/26 04:24:08 |
2 |
|
3 |
Modified: webkit-gtk-2.8.3.ebuild webkit-gtk-2.6.6.ebuild |
4 |
ChangeLog webkit-gtk-2.4.9.ebuild |
5 |
webkit-gtk-2.4.9-r200.ebuild |
6 |
webkit-gtk-2.4.8-r200.ebuild |
7 |
webkit-gtk-2.6.5.ebuild webkit-gtk-2.4.8.ebuild |
8 |
Log: |
9 |
Don't check for c++11 support in pkg_pretend when installing binpkg (bug #555374, thanks to Michał Górny). Check for disk space in pkg_setup under the same conditions as in pkg_pretend (this logic was accidentally dropped in the 2.6.x bump). |
10 |
|
11 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D) |
12 |
|
13 |
Revision Changes Path |
14 |
1.2 net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild |
15 |
|
16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild?rev=1.2&view=markup |
17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild?rev=1.2&content-type=text/plain |
18 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild?r1=1.1&r2=1.2 |
19 |
|
20 |
Index: webkit-gtk-2.8.3.ebuild |
21 |
=================================================================== |
22 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild,v |
23 |
retrieving revision 1.1 |
24 |
retrieving revision 1.2 |
25 |
diff -u -r1.1 -r1.2 |
26 |
--- webkit-gtk-2.8.3.ebuild 9 Jun 2015 14:34:30 -0000 1.1 |
27 |
+++ webkit-gtk-2.8.3.ebuild 26 Jul 2015 04:24:08 -0000 1.2 |
28 |
@@ -1,6 +1,6 @@ |
29 |
# Copyright 1999-2015 Gentoo Foundation |
30 |
# Distributed under the terms of the GNU General Public License v2 |
31 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild,v 1.1 2015/06/09 14:34:30 eva Exp $ |
32 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild,v 1.2 2015/07/26 04:24:08 tetromino Exp $ |
33 |
|
34 |
EAPI="5" |
35 |
GCONF_DEBUG="no" |
36 |
@@ -115,13 +115,13 @@ |
37 |
check-reqs_pkg_pretend |
38 |
fi |
39 |
|
40 |
- if ! test-flag-CXX -std=c++11; then |
41 |
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then |
42 |
die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags" |
43 |
fi |
44 |
} |
45 |
|
46 |
pkg_setup() { |
47 |
- if [[ ${MERGE_TYPE} != "binary" ]] ; then |
48 |
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then |
49 |
check-reqs_pkg_setup |
50 |
fi |
51 |
|
52 |
|
53 |
|
54 |
|
55 |
1.5 net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild |
56 |
|
57 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild?rev=1.5&view=markup |
58 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild?rev=1.5&content-type=text/plain |
59 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild?r1=1.4&r2=1.5 |
60 |
|
61 |
Index: webkit-gtk-2.6.6.ebuild |
62 |
=================================================================== |
63 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild,v |
64 |
retrieving revision 1.4 |
65 |
retrieving revision 1.5 |
66 |
diff -u -r1.4 -r1.5 |
67 |
--- webkit-gtk-2.6.6.ebuild 26 Jun 2015 09:23:38 -0000 1.4 |
68 |
+++ webkit-gtk-2.6.6.ebuild 26 Jul 2015 04:24:08 -0000 1.5 |
69 |
@@ -1,6 +1,6 @@ |
70 |
# Copyright 1999-2015 Gentoo Foundation |
71 |
# Distributed under the terms of the GNU General Public License v2 |
72 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild,v 1.4 2015/06/26 09:23:38 ago Exp $ |
73 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild,v 1.5 2015/07/26 04:24:08 tetromino Exp $ |
74 |
|
75 |
EAPI="5" |
76 |
GCONF_DEBUG="no" |
77 |
@@ -114,13 +114,13 @@ |
78 |
check-reqs_pkg_pretend |
79 |
fi |
80 |
|
81 |
- if ! test-flag-CXX -std=c++11; then |
82 |
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then |
83 |
die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags" |
84 |
fi |
85 |
} |
86 |
|
87 |
pkg_setup() { |
88 |
- if [[ ${MERGE_TYPE} != "binary" ]] ; then |
89 |
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then |
90 |
check-reqs_pkg_setup |
91 |
fi |
92 |
|
93 |
|
94 |
|
95 |
|
96 |
1.323 net-libs/webkit-gtk/ChangeLog |
97 |
|
98 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.323&view=markup |
99 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.323&content-type=text/plain |
100 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?r1=1.322&r2=1.323 |
101 |
|
102 |
Index: ChangeLog |
103 |
=================================================================== |
104 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v |
105 |
retrieving revision 1.322 |
106 |
retrieving revision 1.323 |
107 |
diff -u -r1.322 -r1.323 |
108 |
--- ChangeLog 26 Jun 2015 09:23:38 -0000 1.322 |
109 |
+++ ChangeLog 26 Jul 2015 04:24:08 -0000 1.323 |
110 |
@@ -1,6 +1,15 @@ |
111 |
# ChangeLog for net-libs/webkit-gtk |
112 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
113 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.322 2015/06/26 09:23:38 ago Exp $ |
114 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.323 2015/07/26 04:24:08 tetromino Exp $ |
115 |
+ |
116 |
+ 26 Jul 2015; Alexandre Rostovtsev <tetromino@g.o> |
117 |
+ webkit-gtk-2.4.8.ebuild, webkit-gtk-2.4.8-r200.ebuild, |
118 |
+ webkit-gtk-2.4.9.ebuild, webkit-gtk-2.4.9-r200.ebuild, |
119 |
+ webkit-gtk-2.6.5.ebuild, webkit-gtk-2.6.6.ebuild, webkit-gtk-2.8.3.ebuild: |
120 |
+ Don't check for c++11 support in pkg_pretend when installing binpkg (bug |
121 |
+ #555374, thanks to Michał Górny). Check for disk space in pkg_setup under |
122 |
+ the same conditions as in pkg_pretend (this logic was accidentally dropped in |
123 |
+ the 2.6.x bump). |
124 |
|
125 |
26 Jun 2015; Agostino Sarubbo <ago@g.o> webkit-gtk-2.4.9-r200.ebuild, |
126 |
webkit-gtk-2.4.9.ebuild, webkit-gtk-2.6.6.ebuild: |
127 |
|
128 |
|
129 |
|
130 |
1.6 net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild |
131 |
|
132 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild?rev=1.6&view=markup |
133 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild?rev=1.6&content-type=text/plain |
134 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild?r1=1.5&r2=1.6 |
135 |
|
136 |
Index: webkit-gtk-2.4.9.ebuild |
137 |
=================================================================== |
138 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild,v |
139 |
retrieving revision 1.5 |
140 |
retrieving revision 1.6 |
141 |
diff -u -r1.5 -r1.6 |
142 |
--- webkit-gtk-2.4.9.ebuild 26 Jun 2015 09:23:38 -0000 1.5 |
143 |
+++ webkit-gtk-2.4.9.ebuild 26 Jul 2015 04:24:08 -0000 1.6 |
144 |
@@ -1,6 +1,6 @@ |
145 |
# Copyright 1999-2015 Gentoo Foundation |
146 |
# Distributed under the terms of the GNU General Public License v2 |
147 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild,v 1.5 2015/06/26 09:23:38 ago Exp $ |
148 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild,v 1.6 2015/07/26 04:24:08 tetromino Exp $ |
149 |
|
150 |
EAPI="5" |
151 |
GCONF_DEBUG="no" |
152 |
@@ -113,7 +113,7 @@ |
153 |
check-reqs_pkg_pretend |
154 |
fi |
155 |
|
156 |
- if ! test-flag-CXX -std=c++11; then |
157 |
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then |
158 |
die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags" |
159 |
fi |
160 |
} |
161 |
|
162 |
|
163 |
|
164 |
1.6 net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild |
165 |
|
166 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild?rev=1.6&view=markup |
167 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild?rev=1.6&content-type=text/plain |
168 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild?r1=1.5&r2=1.6 |
169 |
|
170 |
Index: webkit-gtk-2.4.9-r200.ebuild |
171 |
=================================================================== |
172 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild,v |
173 |
retrieving revision 1.5 |
174 |
retrieving revision 1.6 |
175 |
diff -u -r1.5 -r1.6 |
176 |
--- webkit-gtk-2.4.9-r200.ebuild 26 Jun 2015 09:23:38 -0000 1.5 |
177 |
+++ webkit-gtk-2.4.9-r200.ebuild 26 Jul 2015 04:24:08 -0000 1.6 |
178 |
@@ -1,6 +1,6 @@ |
179 |
# Copyright 1999-2015 Gentoo Foundation |
180 |
# Distributed under the terms of the GNU General Public License v2 |
181 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild,v 1.5 2015/06/26 09:23:38 ago Exp $ |
182 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild,v 1.6 2015/07/26 04:24:08 tetromino Exp $ |
183 |
|
184 |
EAPI="5" |
185 |
GCONF_DEBUG="no" |
186 |
@@ -104,7 +104,7 @@ |
187 |
check-reqs_pkg_pretend |
188 |
fi |
189 |
|
190 |
- if ! test-flag-CXX -std=c++11; then |
191 |
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then |
192 |
die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags" |
193 |
fi |
194 |
} |
195 |
|
196 |
|
197 |
|
198 |
1.8 net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild |
199 |
|
200 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild?rev=1.8&view=markup |
201 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild?rev=1.8&content-type=text/plain |
202 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild?r1=1.7&r2=1.8 |
203 |
|
204 |
Index: webkit-gtk-2.4.8-r200.ebuild |
205 |
=================================================================== |
206 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild,v |
207 |
retrieving revision 1.7 |
208 |
retrieving revision 1.8 |
209 |
diff -u -r1.7 -r1.8 |
210 |
--- webkit-gtk-2.4.8-r200.ebuild 8 Apr 2015 18:04:58 -0000 1.7 |
211 |
+++ webkit-gtk-2.4.8-r200.ebuild 26 Jul 2015 04:24:08 -0000 1.8 |
212 |
@@ -1,6 +1,6 @@ |
213 |
# Copyright 1999-2015 Gentoo Foundation |
214 |
# Distributed under the terms of the GNU General Public License v2 |
215 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild,v 1.7 2015/04/08 18:04:58 mgorny Exp $ |
216 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild,v 1.8 2015/07/26 04:24:08 tetromino Exp $ |
217 |
|
218 |
EAPI="5" |
219 |
GCONF_DEBUG="no" |
220 |
@@ -103,7 +103,7 @@ |
221 |
check-reqs_pkg_pretend |
222 |
fi |
223 |
|
224 |
- if ! test-flag-CXX -std=c++11; then |
225 |
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then |
226 |
die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags" |
227 |
fi |
228 |
} |
229 |
|
230 |
|
231 |
|
232 |
1.4 net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild |
233 |
|
234 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild?rev=1.4&view=markup |
235 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild?rev=1.4&content-type=text/plain |
236 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild?r1=1.3&r2=1.4 |
237 |
|
238 |
Index: webkit-gtk-2.6.5.ebuild |
239 |
=================================================================== |
240 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild,v |
241 |
retrieving revision 1.3 |
242 |
retrieving revision 1.4 |
243 |
diff -u -r1.3 -r1.4 |
244 |
--- webkit-gtk-2.6.5.ebuild 15 Mar 2015 13:31:15 -0000 1.3 |
245 |
+++ webkit-gtk-2.6.5.ebuild 26 Jul 2015 04:24:08 -0000 1.4 |
246 |
@@ -1,6 +1,6 @@ |
247 |
# Copyright 1999-2015 Gentoo Foundation |
248 |
# Distributed under the terms of the GNU General Public License v2 |
249 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild,v 1.3 2015/03/15 13:31:15 pacho Exp $ |
250 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild,v 1.4 2015/07/26 04:24:08 tetromino Exp $ |
251 |
|
252 |
EAPI="5" |
253 |
GCONF_DEBUG="no" |
254 |
@@ -111,13 +111,13 @@ |
255 |
check-reqs_pkg_pretend |
256 |
fi |
257 |
|
258 |
- if ! test-flag-CXX -std=c++11; then |
259 |
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then |
260 |
die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags" |
261 |
fi |
262 |
} |
263 |
|
264 |
pkg_setup() { |
265 |
- if [[ ${MERGE_TYPE} != "binary" ]] ; then |
266 |
+ if [[[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then |
267 |
check-reqs_pkg_setup |
268 |
fi |
269 |
|
270 |
|
271 |
|
272 |
|
273 |
1.8 net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild |
274 |
|
275 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild?rev=1.8&view=markup |
276 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild?rev=1.8&content-type=text/plain |
277 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild?r1=1.7&r2=1.8 |
278 |
|
279 |
Index: webkit-gtk-2.4.8.ebuild |
280 |
=================================================================== |
281 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild,v |
282 |
retrieving revision 1.7 |
283 |
retrieving revision 1.8 |
284 |
diff -u -r1.7 -r1.8 |
285 |
--- webkit-gtk-2.4.8.ebuild 8 Apr 2015 18:04:58 -0000 1.7 |
286 |
+++ webkit-gtk-2.4.8.ebuild 26 Jul 2015 04:24:08 -0000 1.8 |
287 |
@@ -1,6 +1,6 @@ |
288 |
# Copyright 1999-2015 Gentoo Foundation |
289 |
# Distributed under the terms of the GNU General Public License v2 |
290 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild,v 1.7 2015/04/08 18:04:58 mgorny Exp $ |
291 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild,v 1.8 2015/07/26 04:24:08 tetromino Exp $ |
292 |
|
293 |
EAPI="5" |
294 |
GCONF_DEBUG="no" |
295 |
@@ -109,7 +109,7 @@ |
296 |
check-reqs_pkg_pretend |
297 |
fi |
298 |
|
299 |
- if ! test-flag-CXX -std=c++11; then |
300 |
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then |
301 |
die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags" |
302 |
fi |
303 |
} |