Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/wxpython/, dev-python/wxpython/files/
Date: Thu, 02 Mar 2017 17:03:27
Message-Id: 1488474176.52f94d9ce36171160f4a869cc096b221b06baf16.leio@gentoo
1 commit: 52f94d9ce36171160f4a869cc096b221b06baf16
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 2 17:00:06 2017 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 2 17:02:56 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52f94d9c
7
8 dev-python/wxpython: dev-python/wxpython: remove old development cycle slot 2.9
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-python/wxpython/Manifest | 3 -
13 .../files/wxpython-2.9-wxversion-demo.patch | 10 -
14 .../files/wxpython-2.9-wxversion-scripts.patch | 221 ---------------------
15 .../files/wxpython-2.9.4.1-wxversion-scripts.patch | 211 --------------------
16 dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild | 167 ----------------
17 5 files changed, 612 deletions(-)
18
19 diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
20 index 1381f3bed3e..65b69ca2e91 100644
21 --- a/dev-python/wxpython/Manifest
22 +++ b/dev-python/wxpython/Manifest
23 @@ -1,13 +1,10 @@
24 DIST wxPython-demo-2.8.12.1.tar.bz2 3906851 SHA256 252282193a80590b9eab436bef322701b21d35ad03b4b6ebb4824241ff947b5a SHA512 aab71cf4e4fb6632afd4607cbe5cdef6785c4ed3f1c7f67d6cef5487d1caee2f7652bfd974ba95a6a03e8d7809c94e291aca00c2fdf74ea29e118e1e30c947d5 WHIRLPOOL e9eb0803350e3dac8c5f2228a3f4d54a26ae4c4307c924729bbdff712747419fdfaa155d83ef1bea7dcb849dbacf9f48c323bf7997ed1df85f182ba3878d1324
25 -DIST wxPython-demo-2.9.4.0.tar.bz2 3992754 SHA256 c1a57ef7c71ea1a332df98b80cfa7ba178ef6dcd24a31393dff905a145ba8b7b SHA512 dac61d9bb09deffd54c89c1a09803968a4c4b2951a00ebb4d618a2a1b48775c62e3ddf2c642e9005d7362fdeab44c07bc2a38bc96dc94a5c891982847d0c19fe WHIRLPOOL 2093d3d0f81c15b7ca1a346fae29429952d299f8e33d5c2e356846bd98df890b731fe4ef0311ec32b7a913a4038aa8881396d9878dde98322136ccb5244a867b
26 DIST wxPython-demo-3.0.0.0.tar.bz2 3991989 SHA256 426aaf20c7b01f5e9fbd7bd41455441bb126585f5544a848a5fa060e07f7b443 SHA512 4fe8a87faacac99c54c4fcbdb707c9790b49f485186e1741cc1ba05e955e474ca4ea31ff704a57e73b32b4fad310ef490066743d1c6ad4339191cde2daec255d WHIRLPOOL c6a2b12111572164474083f66dd0e2eff12e4faea5ce880767bfba3de493e8d56e6747c659ff1a3d533d0f6bcde1d5c9daabb9bccb2148278cdce074f5ddcbae
27 DIST wxPython-demo-3.0.1.1.tar.bz2 3991248 SHA256 bb264db3369c7228f0356f1ad64f6a9ca3000b167bc1ce3fee94d3d2fa20d069 SHA512 b75ca80b5a247f5c97691c4c77c36d64ebe82d94803cd8d687b2110e9de290067c7da893797ae13d0a9f42a4da83170b630dcdeb9460657355c43005dfeac89a WHIRLPOOL 3db15c676252f4f96b585271d0ef005b84cbb4538f01db53e18c587b33fdfc5b57da40d9ba2f2c467063de79c81ed6440982fe5e21547a21fbe2d7d4e252f69c
28 DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 SHA256 8bf195138744898b4b6fbe11f52f7ee2f6319c2e3adf832917769b2e2d4994f3 SHA512 361ecaa7dfe5bae0757e04215c564370eaf8e5260ead45007f9d70439c15701725c3cbcd76691a5191258bef24fd200ebd61347a3fd920d888137bfc98a16702 WHIRLPOOL a944790a4c7b38dc8d8d28c7def50f765cd5566118d801cb576a0ab9d8370a803f8feedbf3211d0352dd838c92d9d4f092eaf6d78354a1974f2345304dd7b2e1
29 DIST wxPython-docs-2.8.12.1.tar.bz2 2331363 SHA256 1dfae3a74b91e2003856eed51698c51094f1a4e6688633ae61af7a22fa8a0ddb SHA512 88591ef4f61bcbac29050d7dfecc230f7338cc006e7c3abc072b15da478e4fd994ab73ee5d072cb8b84f9de62ce182f1774354b0a7a4502ea639e59fdf965358 WHIRLPOOL 97bc66c8f781b5092e2274edc0b9bac35c21c91a66e4c0da75d543dc471f25d02334b28a5afe4ad0681b7a018a93f08b6ef5d3c6afd127ccfc24da208252cd89
30 DIST wxPython-newdocs-2.8.9.2.tar.bz2 1503913 SHA256 890b6b7ca37ba7aaa27f9716ea9992ac75ed8150e83939506e3c47f86e7f37a8 SHA512 e114b2b44a7fd3ac292ca9735fb2e075459211384bc98d62ff2ba49e45111825101e74abd4af2ab0e5e52ede7b831641367c11a5c80e79f2da6ada3442463bfc WHIRLPOOL 91ccbe19e8311f0404fb0096efff68750fa0c3b505d05c9278e0488e138788dc399ff2345e13c712126475957a1c1fcc53556d70cd9c835524207be5758a6e2b
31 DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 WHIRLPOOL 94f91d359f755a0f805588303e8507b2f1404a7f4af73777f85366265df9f76ca89ac29bff491cffd752b707645952a4f7f2bb12fa7e30f3e7d3728147a9c99d
32 -DIST wxPython-src-2.9.4.0.tar.bz2 50827671 SHA256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be SHA512 100dd4474bc2508e9a80aed6f08d295e2697926e29c5789e1f6aa7c303921e1c5de2574c3eddde568804da8fc670d0214ef225d46f34a3006d0a947423d01fbf WHIRLPOOL feff68600a40a8f02492e91049ecdd1a1865ee6db8024112aa3a85a7eff616f26653c418a8ffde77121e2bf7d2c7090c5b91896f9a2de8eb980573af2ca65507
33 -DIST wxPython-src-2.9.4.1.patch 3768 SHA256 075e3a7b1cf69dd2bb20010717505d2508c74bc81658540f3e6d8c4fbf0a6b85 SHA512 4a5254a5bb9c246b75095e3cc0b849073e3cc71ff15ab7fb1db6ecfe71359800b9e1a5493bc39ce5b1f338cdc1d142ce84641611d458a8da4315f3c8a6aef3ba WHIRLPOOL 9bec06da4824fe56c172f4f417966681d1ffbf173dcb54f1579e9a484377bc76c45b4f2389911bbb17eff2476cfca786d68d9524856b21accc64b4dffafb1811
34 DIST wxPython-src-3.0.0.0.tar.bz2 57831792 SHA256 af88695e820dd914e8375dc91ecb736f6fb605979bb38460ace61bbea494dc11 SHA512 9328f46817e0c1670a6be5d10347c8a7110c42a5332c5c35eb11ed0412d8dddeb15727d98606bb6c699af961cee171c41b82b1f24f3de25463259106660f7387 WHIRLPOOL 7865997e22db366a41bae8a5d5c47e4f46b20d17871377243abced3a6550c46588ea1d5a426d826ccf011c62898f87d6a55a14ac9b4153af4e0795d5f180a647
35 DIST wxPython-src-3.0.1.1.tar.bz2 58139645 SHA256 d51463fe760e2fc00271678700c216809f9db32a6081a1808bd4b7c884dc0a32 SHA512 71f75c1e36c9ac27c15d768f69662b18ff1c66ad111ef6ef8579dfdb5296d7c37ffce9f60000afeac289cd6288980037d3a7eb3ea8d6d25e619d8692cf41b914 WHIRLPOOL bb03b78048b368b1c2f5a8b8689aecf412953ff789b2a8d2ef4826112fdc6bff8ed881255d05859ac07f915dd1070f6147d6bfdd97b0ab4b0939c024df3b855a
36 DIST wxPython-src-3.0.2.0.tar.bz2 58304944 SHA256 d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61 SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4 WHIRLPOOL 89cdef12c9ef96044adba0340d47b699e685eaec581a4e7d68f3b95a0890715e29b1f5362027df0f3f8b5b1587e8fe404a7fa88049ece9677dd8316fbdf2e41d
37
38 diff --git a/dev-python/wxpython/files/wxpython-2.9-wxversion-demo.patch b/dev-python/wxpython/files/wxpython-2.9-wxversion-demo.patch
39 deleted file mode 100644
40 index c928ae27d85..00000000000
41 --- a/dev-python/wxpython/files/wxpython-2.9-wxversion-demo.patch
42 +++ /dev/null
43 @@ -1,10 +0,0 @@
44 ---- demo/demo.org
45 -+++ demo/demo.py
46 -@@ -1,4 +1,7 @@
47 - #!/usr/bin/env python
48 -
49 -+import wxversion
50 -+wxversion.select("2.9")
51 -+
52 - import Main
53 - Main.main()
54
55 diff --git a/dev-python/wxpython/files/wxpython-2.9-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-2.9-wxversion-scripts.patch
56 deleted file mode 100644
57 index d037cc95dec..00000000000
58 --- a/dev-python/wxpython/files/wxpython-2.9-wxversion-scripts.patch
59 +++ /dev/null
60 @@ -1,221 +0,0 @@
61 ---- a/distrib/PyAlaMode.desktop
62 -+++ b/distrib/PyAlaMode.desktop
63 -@@ -1,8 +1,8 @@
64 - [Desktop Entry]
65 --Name=PyAlaMode
66 -+Name=PyAlaMode (2.9)
67 - Comment=GUI Python Shell with Filling and editor windows
68 --Exec=pyalamode
69 --Icon=PyCrust.png
70 -+Exec=pyalamode-2.9
71 -+Icon=/usr/share/pixmaps/PyCrust-2.9.png
72 - Terminal=false
73 - Type=Application
74 - Categories=Application;Development;
75 ---- a/distrib/PyCrust.desktop
76 -+++ b/distrib/PyCrust.desktop
77 -@@ -1,8 +1,8 @@
78 - [Desktop Entry]
79 --Name=PyCrust
80 -+Name=PyCrust (2.9)
81 - Comment=GUI Python Shell with Filling
82 --Exec=pycrust
83 --Icon=PyCrust.png
84 -+Exec=pycrust-2.9
85 -+Icon=/usr/share/pixmaps/PyCrust-2.9.png
86 - Terminal=false
87 - Type=Application
88 - Categories=Application;Development;
89 ---- a/distrib/PyShell.desktop
90 -+++ b/distrib/PyShell.desktop
91 -@@ -1,8 +1,8 @@
92 - [Desktop Entry]
93 --Name=PyShell
94 -+Name=PyShell (2.9)
95 - Comment=GUI Python Shell
96 --Exec=pyshell
97 --Icon=PyCrust.png
98 -+Exec=pyshell-2.9
99 -+Icon=/usr/share/pixmaps/PyCrust-2.9.png
100 - Terminal=false
101 - Type=Application
102 - Categories=Application;Development;
103 ---- a/distrib/PySlices.desktop
104 -+++ b/distrib/PySlices.desktop
105 -@@ -1,8 +1,8 @@
106 - [Desktop Entry]
107 --Name=PySlices
108 -+Name=PySlices (2.9)
109 - Comment=GUI Python Shell with Filling
110 --Exec=pyslices
111 --Icon=PySlices.png
112 -+Exec=pyslices-2.9
113 -+Icon=/usr/share/pixmaps/PySlices-2.9.png
114 - Terminal=false
115 - Type=Application
116 - Categories=Application;Development;
117 ---- a/distrib/PySlicesShell.desktop
118 -+++ b/distrib/PySlicesShell.desktop
119 -@@ -1,9 +1,9 @@
120 -
121 - [Desktop Entry]
122 --Name=PySlicesShell
123 -+Name=PySlicesShell (2.9)
124 - Comment=GUI Python Shell
125 --Exec=pysliceshell
126 --Icon=PySlices.png
127 -+Exec=pysliceshell-2.9
128 -+Icon=/usr/share/pixmaps/PySlices-2.9.png
129 - Terminal=false
130 - Type=Application
131 - Categories=Application;Development;
132 ---- a/distrib/XRCed.desktop
133 -+++ b/distrib/XRCed.desktop
134 -@@ -1,8 +1,8 @@
135 - [Desktop Entry]
136 --Name=XRCed
137 -+Name=XRCed (2.9)
138 - Comment=wxPython XRC resource editor
139 --Exec=xrced
140 --Icon=XRCed.png
141 -+Exec=xrced-2.9
142 -+Icon=/usr/share/pixmaps/XRCed-2.9.png
143 - Terminal=false
144 - Type=Application
145 - Categories=Application;Development;
146 ---- a/scripts/editra
147 -+++ b/scripts/editra
148 -@@ -1,4 +1,6 @@
149 - #!/usr/bin/env python
150 -+import wxversion
151 -+wxversion.select("2.9")
152 -
153 - from wx.tools.Editra.launcher import main
154 - main()
155 ---- a/scripts/genaxmodule
156 -+++ b/scripts/genaxmodule
157 -@@ -1,4 +1,6 @@
158 - #!/usr/bin/env python
159 -+import wxversion
160 -+wxversion.select("2.9")
161 -
162 - from wx.tools.genaxmodule import main
163 - main()
164 ---- a/scripts/helpviewer
165 -+++ b/scripts/helpviewer
166 -@@ -1,4 +1,6 @@
167 - #!/usr/bin/env python
168 -+import wxversion
169 -+wxversion.select("2.9")
170 -
171 - from wx.tools.helpviewer import main
172 - main()
173 ---- a/scripts/img2png
174 -+++ b/scripts/img2png
175 -@@ -1,4 +1,6 @@
176 - #!/usr/bin/env python
177 -+import wxversion
178 -+wxversion.select("2.9")
179 -
180 - from wx.tools.img2png import main
181 - main()
182 ---- a/scripts/img2py
183 -+++ b/scripts/img2py
184 -@@ -1,4 +1,6 @@
185 - #!/usr/bin/env python
186 -+import wxversion
187 -+wxversion.select("2.9")
188 -
189 - from wx.tools.img2py import main
190 - main()
191 ---- a/scripts/img2xpm
192 -+++ b/scripts/img2xpm
193 -@@ -1,4 +1,6 @@
194 - #!/usr/bin/env python
195 -+import wxversion
196 -+wxversion.select("2.9")
197 -
198 - from wx.tools.img2xpm import main
199 - main()
200 ---- a/scripts/pyalacarte
201 -+++ b/scripts/pyalacarte
202 -@@ -1,4 +1,6 @@
203 - #!/usr/bin/env python
204 -+import wxversion
205 -+wxversion.select("2.9")
206 -
207 - from wx.py.PyAlaCarte import main
208 - main()
209 ---- a/scripts/pyalamode
210 -+++ b/scripts/pyalamode
211 -@@ -1,4 +1,6 @@
212 - #!/usr/bin/env python
213 -+import wxversion
214 -+wxversion.select("2.9")
215 -
216 - from wx.py.PyAlaMode import main
217 - main()
218 ---- a/scripts/pycrust
219 -+++ b/scripts/pycrust
220 -@@ -1,4 +1,6 @@
221 - #!/usr/bin/env python
222 -+import wxversion
223 -+wxversion.select("2.9")
224 -
225 - from wx.py.PyCrust import main
226 - main()
227 ---- a/scripts/pyshell
228 -+++ b/scripts/pyshell
229 -@@ -1,4 +1,6 @@
230 - #!/usr/bin/env python
231 -+import wxversion
232 -+wxversion.select("2.9")
233 -
234 - from wx.py.PyShell import main
235 - main()
236 ---- a/scripts/pyslices
237 -+++ b/scripts/pyslices
238 -@@ -1,4 +1,6 @@
239 - #!/usr/bin/env python
240 -+import wxversion
241 -+wxversion.select("2.9")
242 -
243 - from wx.py.PySlices import main
244 - main()
245 ---- a/scripts/pysliceshell
246 -+++ b/scripts/pysliceshell
247 -@@ -1,4 +1,6 @@
248 - #!/usr/bin/env python
249 -+import wxversion
250 -+wxversion.select("2.9")
251 -
252 - from wx.py.PySlicesShell import main
253 - main()
254 ---- a/scripts/pywrap
255 -+++ b/scripts/pywrap
256 -@@ -1,4 +1,6 @@
257 - #!/usr/bin/env python
258 -+import wxversion
259 -+wxversion.select("2.9")
260 -
261 - from wx.py.PyWrap import main
262 - main()
263 ---- a/scripts/pywxrc
264 -+++ b/scripts/pywxrc
265 -@@ -1,5 +1,7 @@
266 - #!/usr/bin/env python
267 -
268 -+import wxversion
269 -+wxversion.select("2.9")
270 - from wx.tools.pywxrc import main
271 - main()
272 -
273 ---- a/scripts/xrced
274 -+++ b/scripts/xrced
275 -@@ -1,4 +1,6 @@
276 - #!/usr/bin/env python
277 -+import wxversion
278 -+wxversion.select("2.9")
279 -
280 - from wx.tools.XRCed.xrced import main
281 - main()
282
283 diff --git a/dev-python/wxpython/files/wxpython-2.9.4.1-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-2.9.4.1-wxversion-scripts.patch
284 deleted file mode 100644
285 index 7067af9eee7..00000000000
286 --- a/dev-python/wxpython/files/wxpython-2.9.4.1-wxversion-scripts.patch
287 +++ /dev/null
288 @@ -1,211 +0,0 @@
289 ---- a/distrib/PyAlaMode.desktop
290 -+++ b/distrib/PyAlaMode.desktop
291 -@@ -1,8 +1,8 @@
292 - [Desktop Entry]
293 --Name=PyAlaMode
294 -+Name=PyAlaMode (2.9)
295 - Comment=GUI Python Shell with Filling and editor windows
296 --Exec=pyalamode
297 --Icon=PyCrust
298 -+Exec=pyalamode-2.9
299 -+Icon=PyCrust-2.9
300 - Terminal=false
301 - Type=Application
302 - Categories=Development;
303 ---- a/distrib/PyCrust.desktop
304 -+++ b/distrib/PyCrust.desktop
305 -@@ -1,8 +1,8 @@
306 - [Desktop Entry]
307 --Name=PyCrust
308 -+Name=PyCrust (2.9)
309 - Comment=GUI Python Shell with Filling
310 --Exec=pycrust
311 --Icon=PyCrust
312 -+Exec=pycrust-2.9
313 -+Icon=PyCrust-2.9
314 - Terminal=false
315 - Type=Application
316 - Categories=Development;
317 ---- a/distrib/PyShell.desktop
318 -+++ b/distrib/PyShell.desktop
319 -@@ -1,8 +1,8 @@
320 - [Desktop Entry]
321 --Name=PyShell
322 -+Name=PyShell (2.9)
323 - Comment=GUI Python Shell
324 --Exec=pyshell
325 --Icon=PyCrust
326 -+Exec=pyshell-2.9
327 -+Icon=PyCrust-2.9
328 - Terminal=false
329 - Type=Application
330 - Categories=Development;
331 ---- a/distrib/PySlices.desktop
332 -+++ b/distrib/PySlices.desktop
333 -@@ -1,8 +1,8 @@
334 - [Desktop Entry]
335 --Name=PySlices
336 -+Name=PySlices (2.9)
337 - Comment=GUI Python Shell with Filling
338 --Exec=pyslices
339 --Icon=PySlices
340 -+Exec=pyslices-2.9
341 -+Icon=PySlices-2.9
342 - Terminal=false
343 - Type=Application
344 - Categories=Development;
345 ---- a/distrib/PySlicesShell.desktop
346 -+++ b/distrib/PySlicesShell.desktop
347 -@@ -1,9 +1,8 @@
348 --
349 - [Desktop Entry]
350 --Name=PySlicesShell
351 -+Name=PySlicesShell (2.9)
352 - Comment=GUI Python Shell
353 --Exec=pysliceshell
354 --Icon=PySlices
355 -+Exec=pysliceshell-2.9
356 -+Icon=PySlices-2.9
357 - Terminal=false
358 - Type=Application
359 - Categories=Development;
360 ---- a/distrib/XRCed.desktop
361 -+++ b/distrib/XRCed.desktop
362 -@@ -1,8 +1,8 @@
363 - [Desktop Entry]
364 --Name=XRCed
365 -+Name=XRCed (2.9)
366 - Comment=wxPython XRC resource editor
367 --Exec=xrced
368 --Icon=XRCed
369 -+Exec=xrced-2.9
370 -+Icon=XRCed-2.9
371 - Terminal=false
372 - Type=Application
373 - Categories=Development;
374 ---- a/scripts/genaxmodule
375 -+++ b/scripts/genaxmodule
376 -@@ -1,4 +1,6 @@
377 - #!/usr/bin/env python
378 -+import wxversion
379 -+wxversion.select("2.9")
380 -
381 - from wx.tools.genaxmodule import main
382 - main()
383 ---- a/scripts/helpviewer
384 -+++ b/scripts/helpviewer
385 -@@ -1,4 +1,6 @@
386 - #!/usr/bin/env python
387 -+import wxversion
388 -+wxversion.select("2.9")
389 -
390 - from wx.tools.helpviewer import main
391 - main()
392 ---- a/scripts/img2png
393 -+++ b/scripts/img2png
394 -@@ -1,4 +1,6 @@
395 - #!/usr/bin/env python
396 -+import wxversion
397 -+wxversion.select("2.9")
398 -
399 - from wx.tools.img2png import main
400 - main()
401 ---- a/scripts/img2py
402 -+++ b/scripts/img2py
403 -@@ -1,4 +1,6 @@
404 - #!/usr/bin/env python
405 -+import wxversion
406 -+wxversion.select("2.9")
407 -
408 - from wx.tools.img2py import main
409 - main()
410 ---- a/scripts/img2xpm
411 -+++ b/scripts/img2xpm
412 -@@ -1,4 +1,6 @@
413 - #!/usr/bin/env python
414 -+import wxversion
415 -+wxversion.select("2.9")
416 -
417 - from wx.tools.img2xpm import main
418 - main()
419 ---- a/scripts/pyalacarte
420 -+++ b/scripts/pyalacarte
421 -@@ -1,4 +1,6 @@
422 - #!/usr/bin/env python
423 -+import wxversion
424 -+wxversion.select("2.9")
425 -
426 - from wx.py.PyAlaCarte import main
427 - main()
428 ---- a/scripts/pyalamode
429 -+++ b/scripts/pyalamode
430 -@@ -1,4 +1,6 @@
431 - #!/usr/bin/env python
432 -+import wxversion
433 -+wxversion.select("2.9")
434 -
435 - from wx.py.PyAlaMode import main
436 - main()
437 ---- a/scripts/pycrust
438 -+++ b/scripts/pycrust
439 -@@ -1,4 +1,6 @@
440 - #!/usr/bin/env python
441 -+import wxversion
442 -+wxversion.select("2.9")
443 -
444 - from wx.py.PyCrust import main
445 - main()
446 ---- a/scripts/pyshell
447 -+++ b/scripts/pyshell
448 -@@ -1,4 +1,6 @@
449 - #!/usr/bin/env python
450 -+import wxversion
451 -+wxversion.select("2.9")
452 -
453 - from wx.py.PyShell import main
454 - main()
455 ---- a/scripts/pyslices
456 -+++ b/scripts/pyslices
457 -@@ -1,4 +1,6 @@
458 - #!/usr/bin/env python
459 -+import wxversion
460 -+wxversion.select("2.9")
461 -
462 - from wx.py.PySlices import main
463 - main()
464 ---- a/scripts/pysliceshell
465 -+++ b/scripts/pysliceshell
466 -@@ -1,4 +1,6 @@
467 - #!/usr/bin/env python
468 -+import wxversion
469 -+wxversion.select("2.9")
470 -
471 - from wx.py.PySlicesShell import main
472 - main()
473 ---- a/scripts/pywrap
474 -+++ b/scripts/pywrap
475 -@@ -1,4 +1,6 @@
476 - #!/usr/bin/env python
477 -+import wxversion
478 -+wxversion.select("2.9")
479 -
480 - from wx.py.PyWrap import main
481 - main()
482 ---- a/scripts/pywxrc
483 -+++ b/scripts/pywxrc
484 -@@ -1,4 +1,6 @@
485 - #!/usr/bin/env python
486 -+import wxversion
487 -+wxversion.select("2.9")
488 -
489 - from wx.tools.pywxrc import main
490 - main()
491 ---- a/scripts/xrced
492 -+++ b/scripts/xrced
493 -@@ -1,4 +1,6 @@
494 - #!/usr/bin/env python
495 -+import wxversion
496 -+wxversion.select("2.9")
497 -
498 - from wx.tools.XRCed.xrced import main
499 - main()
500
501 diff --git a/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild b/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild
502 deleted file mode 100644
503 index eee6e611086..00000000000
504 --- a/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild
505 +++ /dev/null
506 @@ -1,167 +0,0 @@
507 -# Copyright 1999-2015 Gentoo Foundation
508 -# Distributed under the terms of the GNU General Public License v2
509 -
510 -EAPI=5
511 -
512 -PYTHON_COMPAT=( python2_7 )
513 -WX_GTK_VER="2.9"
514 -
515 -inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets
516 -
517 -MY_PN="wxPython-src"
518 -
519 -DESCRIPTION="A blending of the wxWindows C++ class library with Python"
520 -HOMEPAGE="http://www.wxpython.org/"
521 -SRC_URI="
522 - mirror://sourceforge/wxpython/${MY_PN}-2.9.4.0.tar.bz2
523 - examples? ( mirror://sourceforge/wxpython/wxPython-demo-2.9.4.0.tar.bz2 )
524 - mirror://sourceforge/wxpython/${MY_PN}-2.9.4.1.patch"
525 -
526 -LICENSE="wxWinLL-3"
527 -SLOT="2.9"
528 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
529 -IUSE="cairo examples opengl"
530 -
531 -RDEPEND="
532 - dev-lang/python-exec:2[${PYTHON_USEDEP}]
533 - >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X]
534 - dev-libs/glib:2
535 - dev-python/setuptools[${PYTHON_USEDEP}]
536 - media-libs/libpng:0=
537 - media-libs/tiff:0
538 - virtual/jpeg
539 - x11-libs/gtk+:2
540 - x11-libs/pango[X]
541 - cairo? ( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] )
542 - opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )"
543 -
544 -DEPEND="${RDEPEND}
545 - virtual/pkgconfig"
546 -
547 -S="${WORKDIR}/${MY_PN}-2.9.4.0/wxPython"
548 -DOC_S="${WORKDIR}/wxPython-2.9.4.0"
549 -
550 -# The hacky build system seems to be broken with out-of-source builds,
551 -# and installs 'wx' package globally.
552 -DISTUTILS_IN_SOURCE_BUILD=1
553 -
554 -python_prepare_all() {
555 - sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
556 -
557 - cd .. || die
558 - epatch "${DISTDIR}"/${MY_PN}-${PV}.patch
559 -
560 - if use examples; then
561 - cd "${DOC_S}"
562 - epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch
563 - fi
564 -
565 - cd "${S}" || die
566 - local PATCHES=(
567 - "${FILESDIR}"/${P}-wxversion-scripts.patch
568 - # drop editra - we have it as a separate package now
569 - "${FILESDIR}"/${PN}-2.8.11-drop-editra.patch
570 - "${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch
571 - # fix handling egg_info command
572 - "${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch
573 - )
574 -
575 - distutils-r1_python_prepare_all
576 -}
577 -
578 -src_configure() {
579 - append-flags -fno-strict-aliasing
580 - need-wxwidgets unicode
581 -
582 - mydistutilsargs=(
583 - WX_CONFIG="${WX_CONFIG}"
584 - WXPORT=gtk2
585 - UNICODE=1
586 - BUILD_GLCANVAS=$(usex opengl 1 0)
587 - )
588 -}
589 -
590 -python_compile() {
591 - # We need to have separate libdirs due to hackery, bug #455332.
592 - distutils-r1_python_compile \
593 - build --build-purelib "${BUILD_DIR}"/lib.common
594 -}
595 -
596 -python_install() {
597 - distutils-r1_python_install \
598 - build --build-purelib "${BUILD_DIR}"/lib.common
599 -
600 - # adjust the filenames for wxPython slots.
601 - local file
602 - for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do
603 - mv "${file}" "${file}-${SLOT}" || die
604 - done
605 - cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die
606 - for file in *; do
607 - mv "${file}" "${file}-${SLOT}" || die
608 -
609 - # wrappers are common to all impls, so a parallel run may
610 - # move it for us. ln+rm is more failure-proof.
611 - ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die
612 - rm -f "${ED}usr/bin/${file}"
613 - done
614 -}
615 -
616 -python_install_all() {
617 - dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
618 -
619 - for x in {Py{AlaMode,Crust,Shell},XRCed}; do
620 - newmenu distrib/${x}.desktop ${x}-${SLOT}.desktop
621 - done
622 - newicon wx/py/PyCrust_32.png PyCrust-${SLOT}.png
623 - newicon wx/py/PySlices_32.png PySlices-${SLOT}.png
624 - newicon wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png
625 -
626 - if use examples; then
627 - docinto demo
628 - dodoc -r "${DOC_S}"/demo/.
629 - docinto samples
630 - dodoc -r "${DOC_S}"/samples/.
631 -
632 - [[ -e ${docdir}/samples/embedded/embedded ]] \
633 - && rm -f "${docdir}"/samples/embedded/embedded
634 -
635 - docompress -x /usr/share/doc/${PF}/{demo,samples}
636 - fi
637 - distutils-r1_python_install_all
638 -}
639 -
640 -pkg_postinst() {
641 - fdo-mime_desktop_database_update
642 -
643 - create_symlinks() {
644 - alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
645 - alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
646 - }
647 - python_foreach_impl create_symlinks
648 -
649 - echo
650 - elog "Gentoo uses the Multi-version method for SLOT'ing."
651 - elog "Developers, see this site for instructions on using"
652 - elog "2.8 or 2.9 with your apps:"
653 - elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
654 - if use examples; then
655 - echo
656 - elog "The demo.py app which contains demo modules with"
657 - elog "documentation and source code has been installed at"
658 - elog "/usr/share/doc/${PF}/demo/demo.py"
659 - echo
660 - elog "More example apps and modules can be found in"
661 - elog "/usr/share/doc/${PF}/samples/"
662 - fi
663 -}
664 -
665 -pkg_postrm() {
666 - fdo-mime_desktop_database_update
667 -
668 - update_symlinks() {
669 - alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
670 - alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
671 - }
672 - python_foreach_impl update_symlinks
673 -}