1 |
commit: 588e187498e47395f5fb24bd6029c684bea17911 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 16 21:22:41 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 16 21:32:32 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=588e1874 |
7 |
|
8 |
dev-python/wxpython: remove last-rited 2.8 SLOT |
9 |
|
10 |
Bug: https://bugs.gentoo.org/661284 |
11 |
Package-Manager: Portage-2.3.46, Repoman-2.3.10 |
12 |
|
13 |
dev-python/wxpython/Manifest | 4 - |
14 |
.../files/wxpython-2.8-cache-writable.patch | 20 --- |
15 |
.../files/wxpython-2.8-wxversion-demo.patch | 10 -- |
16 |
.../files/wxpython-2.8.12-drop-categories.patch | 37 ---- |
17 |
.../files/wxpython-2.8.12-drop-editra.patch | 55 ------ |
18 |
.../files/wxpython-2.8.9-wxversion-scripts.patch | 191 -------------------- |
19 |
dev-python/wxpython/metadata.xml | 1 - |
20 |
dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild | 194 --------------------- |
21 |
8 files changed, 512 deletions(-) |
22 |
|
23 |
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest |
24 |
index dfefe577e68..7c15b2e2009 100644 |
25 |
--- a/dev-python/wxpython/Manifest |
26 |
+++ b/dev-python/wxpython/Manifest |
27 |
@@ -1,6 +1,2 @@ |
28 |
-DIST wxPython-demo-2.8.12.1.tar.bz2 3906851 BLAKE2B 73e6b662b0f8a0ca719cc21bee8a457b7175231547b495d29be0733e48e2ac16e739b6a3a25fd0de643dfbbe5dbde07e36b983746bcf873a16d0f35598f505a4 SHA512 aab71cf4e4fb6632afd4607cbe5cdef6785c4ed3f1c7f67d6cef5487d1caee2f7652bfd974ba95a6a03e8d7809c94e291aca00c2fdf74ea29e118e1e30c947d5 |
29 |
DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 BLAKE2B 9defe133e3863be5ae07b7adb4bcb94688487e9dd9f5ab1f768d2f5942f30d05ff678f1ba74241d9bafde3584e3c68ffeae4978117aaa300e23165140e6a6d44 SHA512 361ecaa7dfe5bae0757e04215c564370eaf8e5260ead45007f9d70439c15701725c3cbcd76691a5191258bef24fd200ebd61347a3fd920d888137bfc98a16702 |
30 |
-DIST wxPython-docs-2.8.12.1.tar.bz2 2331363 BLAKE2B f3d640bb8a7da2880e8ec5c30797381320943a618ace7844818036d6a9137cbfd1187281e751efefb0cb3b39543dc85f833773abcc2334a226f815b93eacb5da SHA512 88591ef4f61bcbac29050d7dfecc230f7338cc006e7c3abc072b15da478e4fd994ab73ee5d072cb8b84f9de62ce182f1774354b0a7a4502ea639e59fdf965358 |
31 |
-DIST wxPython-newdocs-2.8.9.2.tar.bz2 1503913 BLAKE2B c56937a0f582ab123f5e6019aa8b84a56d04d6d18ccec6ab103c7443decc68f008585f71137e6da25c5d1d5c483845e688e5e175712312bc94b03876d0a986e6 SHA512 e114b2b44a7fd3ac292ca9735fb2e075459211384bc98d62ff2ba49e45111825101e74abd4af2ab0e5e52ede7b831641367c11a5c80e79f2da6ada3442463bfc |
32 |
-DIST wxPython-src-2.8.12.1.tar.bz2 31311482 BLAKE2B 33b3feb5f1182948badcd5695b35a68c673e36694a2db8c77b0b031b185c94c9f8bcf4753d9cbf8937e99a72f4c393d6f79850ed3d730af20a7263b97c620386 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 |
33 |
DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4 |
34 |
|
35 |
diff --git a/dev-python/wxpython/files/wxpython-2.8-cache-writable.patch b/dev-python/wxpython/files/wxpython-2.8-cache-writable.patch |
36 |
deleted file mode 100644 |
37 |
index 57f26b37c2e..00000000000 |
38 |
--- a/dev-python/wxpython/files/wxpython-2.8-cache-writable.patch |
39 |
+++ /dev/null |
40 |
@@ -1,20 +0,0 @@ |
41 |
-Use /tmp for cache files since the user won't have |
42 |
-write permissions on ${DOCDIR}. |
43 |
- |
44 |
-diff -Naurp docs-orig/viewdocs.py docs/viewdocs.py |
45 |
---- docs-orig/viewdocs.py 2008-09-28 15:59:16.000000000 -0600 |
46 |
-+++ docs/viewdocs.py 2009-01-18 00:16:27.000000000 -0600 |
47 |
-@@ -16,11 +16,11 @@ if not basePath: |
48 |
- |
49 |
- |
50 |
- # test for write access |
51 |
--if os.access(basePath, os.W_OK): |
52 |
-+if os.access('/tmp', os.W_OK): |
53 |
- |
54 |
- # setup the args |
55 |
- args = ['', |
56 |
-- '--cache='+basePath, |
57 |
-+ '--cache=/tmp', |
58 |
- os.path.join(basePath, 'wx.zip'), |
59 |
- ] |
60 |
- |
61 |
|
62 |
diff --git a/dev-python/wxpython/files/wxpython-2.8-wxversion-demo.patch b/dev-python/wxpython/files/wxpython-2.8-wxversion-demo.patch |
63 |
deleted file mode 100644 |
64 |
index 97829198a0b..00000000000 |
65 |
--- a/dev-python/wxpython/files/wxpython-2.8-wxversion-demo.patch |
66 |
+++ /dev/null |
67 |
@@ -1,10 +0,0 @@ |
68 |
---- demo/demo.org 2005-04-28 03:00:13.431583384 +0000 |
69 |
-+++ demo/demo.py 2005-04-28 03:00:31.886777768 +0000 |
70 |
-@@ -1,4 +1,7 @@ |
71 |
- #!/usr/bin/env python |
72 |
- |
73 |
-+import wxversion |
74 |
-+wxversion.select("2.8") |
75 |
-+ |
76 |
- import Main |
77 |
- Main.main() |
78 |
|
79 |
diff --git a/dev-python/wxpython/files/wxpython-2.8.12-drop-categories.patch b/dev-python/wxpython/files/wxpython-2.8.12-drop-categories.patch |
80 |
deleted file mode 100644 |
81 |
index d860238e94d..00000000000 |
82 |
--- a/dev-python/wxpython/files/wxpython-2.8.12-drop-categories.patch |
83 |
+++ /dev/null |
84 |
@@ -1,37 +0,0 @@ |
85 |
-Fix QA issue wrt Bug 457586 |
86 |
-diff -ur wxPython-src-2.8.12.1.orig/wxPython/distrib/PyAlaMode.desktop wxPython-src-2.8.12.1/wxPython/distrib/PyAlaMode.desktop |
87 |
---- distrib/PyAlaMode.desktop 2007-07-19 06:33:55.000000000 +0800 |
88 |
-+++ distrib/PyAlaMode.desktop 2013-03-04 13:48:51.737419595 +0800 |
89 |
-@@ -5,4 +5,4 @@ |
90 |
- Icon=PyCrust.png |
91 |
- Terminal=false |
92 |
- Type=Application |
93 |
--Categories=Application;Development; |
94 |
-+Categories=Development; |
95 |
-diff -ur wxPython-src-2.8.12.1.orig/wxPython/distrib/PyCrust.desktop wxPython-src-2.8.12.1/wxPython/distrib/PyCrust.desktop |
96 |
---- distrib/PyCrust.desktop 2007-07-19 06:33:55.000000000 +0800 |
97 |
-+++ distrib/PyCrust.desktop 2013-03-04 13:49:12.209418445 +0800 |
98 |
-@@ -5,4 +5,4 @@ |
99 |
- Icon=PyCrust.png |
100 |
- Terminal=false |
101 |
- Type=Application |
102 |
--Categories=Application;Development; |
103 |
-+Categories=Development; |
104 |
-diff -ur wxPython-src-2.8.12.1.orig/wxPython/distrib/PyShell.desktop wxPython-src-2.8.12.1/wxPython/distrib/PyShell.desktop |
105 |
---- distrib/PyShell.desktop 2007-07-19 06:33:55.000000000 +0800 |
106 |
-+++ distrib/PyShell.desktop 2013-03-04 13:49:28.713417518 +0800 |
107 |
-@@ -5,4 +5,4 @@ |
108 |
- Icon=PyCrust.png |
109 |
- Terminal=false |
110 |
- Type=Application |
111 |
--Categories=Application;Development; |
112 |
-+Categories=Development; |
113 |
-diff -ur wxPython-src-2.8.12.1.orig/wxPython/distrib/XRCed.desktop wxPython-src-2.8.12.1/wxPython/distrib/XRCed.desktop |
114 |
---- distrib/XRCed.desktop 2007-07-19 06:33:55.000000000 +0800 |
115 |
-+++ distrib/XRCed.desktop 2013-03-04 13:49:46.345416526 +0800 |
116 |
-@@ -5,4 +5,4 @@ |
117 |
- Icon=XRCed.png |
118 |
- Terminal=false |
119 |
- Type=Application |
120 |
--Categories=Application;Development; |
121 |
-+Categories=Development; |
122 |
|
123 |
diff --git a/dev-python/wxpython/files/wxpython-2.8.12-drop-editra.patch b/dev-python/wxpython/files/wxpython-2.8.12-drop-editra.patch |
124 |
deleted file mode 100644 |
125 |
index 4b49f30a138..00000000000 |
126 |
--- a/dev-python/wxpython/files/wxpython-2.8.12-drop-editra.patch |
127 |
+++ /dev/null |
128 |
@@ -1,55 +0,0 @@ |
129 |
---- a/wxPython/setup.py |
130 |
-+++ b/wxPython/setup.py |
131 |
-@@ -887,20 +887,6 @@ WX_PKGLIST = [ 'wx', |
132 |
- 'wx.tools', |
133 |
- 'wx.tools.XRCed', |
134 |
- 'wx.tools.XRCed.plugins', |
135 |
-- 'wx.tools.Editra', |
136 |
-- 'wx.tools.Editra.src', |
137 |
-- 'wx.tools.Editra.src.autocomp', |
138 |
-- 'wx.tools.Editra.src.eclib', |
139 |
-- 'wx.tools.Editra.src.ebmlib', |
140 |
-- 'wx.tools.Editra.src.extern', |
141 |
-- 'wx.tools.Editra.src.extern.aui', |
142 |
-- 'wx.tools.Editra.src.extern.dexml', |
143 |
-- 'wx.tools.Editra.src.extern.pygments', |
144 |
-- 'wx.tools.Editra.src.extern.pygments.filters', |
145 |
-- 'wx.tools.Editra.src.extern.pygments.formatters', |
146 |
-- 'wx.tools.Editra.src.extern.pygments.lexers', |
147 |
-- 'wx.tools.Editra.src.extern.pygments.styles', |
148 |
-- 'wx.tools.Editra.src.syntax', |
149 |
- ] |
150 |
- |
151 |
- if not EGGing: |
152 |
-@@ -927,7 +913,6 @@ else: |
153 |
- opj('scripts/pywrap'), |
154 |
- opj('scripts/pywxrc'), |
155 |
- opj('scripts/xrced'), |
156 |
-- opj('scripts/editra'), |
157 |
- ] |
158 |
- if os.name == 'nt': |
159 |
- SCRIPTS.append( opj('scripts/genaxmodule') ) |
160 |
-@@ -941,15 +926,6 @@ DATA_FILES += find_data_files('wx/tools/XRCed', '*.txt', '*.xrc', '*.htb') |
161 |
- DATA_FILES += find_data_files('wx/tools/XRCed/plugins', '*.crx') |
162 |
- DATA_FILES += find_data_files('wx/tools/XRCed/plugins/bitmaps', '*.png') |
163 |
- |
164 |
--DATA_FILES += find_data_files('wx/tools/Editra/docs', '*.txt') |
165 |
--DATA_FILES += find_data_files('wx/tools/Editra/locale', '*.mo') |
166 |
--DATA_FILES += find_data_files('wx/tools/Editra/pixmaps', |
167 |
-- '*.png', '*.icns', '*.ico', 'README', 'AUTHORS', 'COPYING') |
168 |
--DATA_FILES += find_data_files('wx/tools/Editra/plugins', '*.egg') |
169 |
--DATA_FILES += find_data_files('wx/tools/Editra/src', 'README') |
170 |
--DATA_FILES += find_data_files('wx/tools/Editra/styles', '*.ess') |
171 |
--DATA_FILES += find_data_files('wx/tools/Editra/tests/syntax', '*') |
172 |
--DATA_FILES += find_data_files('wx/tools/Editra', '[A-Z]*', recursive=False) |
173 |
- |
174 |
- |
175 |
- ## import pprint |
176 |
-@@ -1000,7 +976,6 @@ if EGGing: |
177 |
- 'pyshell = wx.py.PyShell:main', |
178 |
- 'pywrap = wx.py.PyWrap:main', |
179 |
- 'helpviewer = wx.tools.helpviewer:main', |
180 |
-- 'editra = wx.tools.Editra.launcher:main', |
181 |
- 'xrced = wx.tools.XRCed.xrced:main', |
182 |
- ], |
183 |
- }, |
184 |
|
185 |
diff --git a/dev-python/wxpython/files/wxpython-2.8.9-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-2.8.9-wxversion-scripts.patch |
186 |
deleted file mode 100644 |
187 |
index 6a456781230..00000000000 |
188 |
--- a/dev-python/wxpython/files/wxpython-2.8.9-wxversion-scripts.patch |
189 |
+++ /dev/null |
190 |
@@ -1,191 +0,0 @@ |
191 |
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/PyAlaMode.desktop wxPython-src-2.8.9.2/wxPython/distrib/PyAlaMode.desktop |
192 |
---- wxPython-src-2.8.9.2-orig/wxPython/distrib/PyAlaMode.desktop 2007-07-18 16:33:55.000000000 -0600 |
193 |
-+++ wxPython-src-2.8.9.2/wxPython/distrib/PyAlaMode.desktop 2009-02-21 15:04:55.000000000 -0600 |
194 |
-@@ -1,8 +1,8 @@ |
195 |
- [Desktop Entry] |
196 |
--Name=PyAlaMode |
197 |
-+Name=PyAlaMode (2.8) |
198 |
- Comment=GUI Python Shell with Filling and editor windows |
199 |
--Exec=pyalamode |
200 |
--Icon=PyCrust.png |
201 |
-+Exec=pyalamode-2.8 |
202 |
-+Icon=/usr/share/pixmaps/PyCrust.png |
203 |
- Terminal=false |
204 |
- Type=Application |
205 |
- Categories=Application;Development; |
206 |
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/PyCrust.desktop wxPython-src-2.8.9.2/wxPython/distrib/PyCrust.desktop |
207 |
---- wxPython-src-2.8.9.2-orig/wxPython/distrib/PyCrust.desktop 2007-07-18 16:33:55.000000000 -0600 |
208 |
-+++ wxPython-src-2.8.9.2/wxPython/distrib/PyCrust.desktop 2009-02-21 15:06:42.000000000 -0600 |
209 |
-@@ -1,8 +1,8 @@ |
210 |
- [Desktop Entry] |
211 |
--Name=PyCrust |
212 |
-+Name=PyCrust (2.8) |
213 |
- Comment=GUI Python Shell with Filling |
214 |
--Exec=pycrust |
215 |
--Icon=PyCrust.png |
216 |
-+Exec=pycrust-2.8 |
217 |
-+Icon=/usr/share/pixmaps/PyCrust.png |
218 |
- Terminal=false |
219 |
- Type=Application |
220 |
- Categories=Application;Development; |
221 |
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/PyShell.desktop wxPython-src-2.8.9.2/wxPython/distrib/PyShell.desktop |
222 |
---- wxPython-src-2.8.9.2-orig/wxPython/distrib/PyShell.desktop 2007-07-18 16:33:55.000000000 -0600 |
223 |
-+++ wxPython-src-2.8.9.2/wxPython/distrib/PyShell.desktop 2009-02-21 15:08:19.000000000 -0600 |
224 |
-@@ -1,8 +1,8 @@ |
225 |
- [Desktop Entry] |
226 |
--Name=PyShell |
227 |
-+Name=PyShell (2.8) |
228 |
- Comment=GUI Python Shell |
229 |
--Exec=pyshell |
230 |
--Icon=PyCrust.png |
231 |
-+Exec=pyshell-2.8 |
232 |
-+Icon=/usr/share/pixmaps/PyCrust.png |
233 |
- Terminal=false |
234 |
- Type=Application |
235 |
- Categories=Application;Development; |
236 |
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/XRCed.desktop wxPython-src-2.8.9.2/wxPython/distrib/XRCed.desktop |
237 |
---- wxPython-src-2.8.9.2-orig/wxPython/distrib/XRCed.desktop 2007-07-18 16:33:55.000000000 -0600 |
238 |
-+++ wxPython-src-2.8.9.2/wxPython/distrib/XRCed.desktop 2009-02-21 15:09:22.000000000 -0600 |
239 |
-@@ -1,8 +1,8 @@ |
240 |
- [Desktop Entry] |
241 |
--Name=XRCed |
242 |
-+Name=XRCed (2.8) |
243 |
- Comment=wxPython XRC resource editor |
244 |
--Exec=xrced |
245 |
--Icon=XRCed.png |
246 |
-+Exec=xrced-2.8 |
247 |
-+Icon=/usr/share/pixmaps/XRCed.png |
248 |
- Terminal=false |
249 |
- Type=Application |
250 |
- Categories=Application;Development; |
251 |
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/editra wxPython-src-2.8.9.2/wxPython/scripts/editra |
252 |
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/editra 2008-02-29 14:32:17.000000000 -0600 |
253 |
-+++ wxPython-src-2.8.9.2/wxPython/scripts/editra 2009-02-21 15:03:24.000000000 -0600 |
254 |
-@@ -1,4 +1,6 @@ |
255 |
- #!/usr/bin/env python |
256 |
-+import wxversion |
257 |
-+wxversion.select("2.8") |
258 |
- |
259 |
- from wx.tools.Editra.launcher import main |
260 |
- main() |
261 |
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/genaxmodule wxPython-src-2.8.9.2/wxPython/scripts/genaxmodule |
262 |
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/genaxmodule 2008-02-29 14:32:17.000000000 -0600 |
263 |
-+++ wxPython-src-2.8.9.2/wxPython/scripts/genaxmodule 2009-02-21 15:03:24.000000000 -0600 |
264 |
-@@ -1,4 +1,6 @@ |
265 |
- #!/usr/bin/env python |
266 |
-+import wxversion |
267 |
-+wxversion.select("2.8") |
268 |
- |
269 |
- from wx.tools.genaxmodule import main |
270 |
- main() |
271 |
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/helpviewer wxPython-src-2.8.9.2/wxPython/scripts/helpviewer |
272 |
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/helpviewer 2007-07-18 16:33:55.000000000 -0600 |
273 |
-+++ wxPython-src-2.8.9.2/wxPython/scripts/helpviewer 2009-02-21 15:03:24.000000000 -0600 |
274 |
-@@ -1,4 +1,6 @@ |
275 |
- #!/usr/bin/env python |
276 |
-+import wxversion |
277 |
-+wxversion.select("2.8") |
278 |
- |
279 |
- from wx.tools.helpviewer import main |
280 |
- main() |
281 |
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/img2png wxPython-src-2.8.9.2/wxPython/scripts/img2png |
282 |
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/img2png 2007-07-18 16:33:55.000000000 -0600 |
283 |
-+++ wxPython-src-2.8.9.2/wxPython/scripts/img2png 2009-02-21 15:03:24.000000000 -0600 |
284 |
-@@ -1,4 +1,6 @@ |
285 |
- #!/usr/bin/env python |
286 |
-+import wxversion |
287 |
-+wxversion.select("2.8") |
288 |
- |
289 |
- from wx.tools.img2png import main |
290 |
- main() |
291 |
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/img2py wxPython-src-2.8.9.2/wxPython/scripts/img2py |
292 |
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/img2py 2008-02-29 14:32:17.000000000 -0600 |
293 |
-+++ wxPython-src-2.8.9.2/wxPython/scripts/img2py 2009-02-21 15:03:24.000000000 -0600 |
294 |
-@@ -1,4 +1,6 @@ |
295 |
- #!/usr/bin/env python |
296 |
-+import wxversion |
297 |
-+wxversion.select("2.8") |
298 |
- |
299 |
- from wx.tools.img2py import main |
300 |
- main() |
301 |
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/img2xpm wxPython-src-2.8.9.2/wxPython/scripts/img2xpm |
302 |
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/img2xpm 2007-07-18 16:33:55.000000000 -0600 |
303 |
-+++ wxPython-src-2.8.9.2/wxPython/scripts/img2xpm 2009-02-21 15:03:24.000000000 -0600 |
304 |
-@@ -1,4 +1,6 @@ |
305 |
- #!/usr/bin/env python |
306 |
-+import wxversion |
307 |
-+wxversion.select("2.8") |
308 |
- |
309 |
- from wx.tools.img2xpm import main |
310 |
- main() |
311 |
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalacarte wxPython-src-2.8.9.2/wxPython/scripts/pyalacarte |
312 |
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalacarte 2007-07-18 16:33:55.000000000 -0600 |
313 |
-+++ wxPython-src-2.8.9.2/wxPython/scripts/pyalacarte 2009-02-21 15:03:24.000000000 -0600 |
314 |
-@@ -1,4 +1,6 @@ |
315 |
- #!/usr/bin/env python |
316 |
-+import wxversion |
317 |
-+wxversion.select("2.8") |
318 |
- |
319 |
- from wx.py.PyAlaCarte import main |
320 |
- main() |
321 |
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalamode wxPython-src-2.8.9.2/wxPython/scripts/pyalamode |
322 |
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalamode 2007-07-18 16:33:55.000000000 -0600 |
323 |
-+++ wxPython-src-2.8.9.2/wxPython/scripts/pyalamode 2009-02-21 15:03:24.000000000 -0600 |
324 |
-@@ -1,4 +1,6 @@ |
325 |
- #!/usr/bin/env python |
326 |
-+import wxversion |
327 |
-+wxversion.select("2.8") |
328 |
- |
329 |
- from wx.py.PyAlaMode import main |
330 |
- main() |
331 |
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pycrust wxPython-src-2.8.9.2/wxPython/scripts/pycrust |
332 |
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/pycrust 2007-07-18 16:33:55.000000000 -0600 |
333 |
-+++ wxPython-src-2.8.9.2/wxPython/scripts/pycrust 2009-02-21 15:03:24.000000000 -0600 |
334 |
-@@ -1,4 +1,6 @@ |
335 |
- #!/usr/bin/env python |
336 |
-+import wxversion |
337 |
-+wxversion.select("2.8") |
338 |
- |
339 |
- from wx.py.PyCrust import main |
340 |
- main() |
341 |
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pyshell wxPython-src-2.8.9.2/wxPython/scripts/pyshell |
342 |
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/pyshell 2007-07-18 16:33:55.000000000 -0600 |
343 |
-+++ wxPython-src-2.8.9.2/wxPython/scripts/pyshell 2009-02-21 15:03:24.000000000 -0600 |
344 |
-@@ -1,4 +1,6 @@ |
345 |
- #!/usr/bin/env python |
346 |
-+import wxversion |
347 |
-+wxversion.select("2.8") |
348 |
- |
349 |
- from wx.py.PyShell import main |
350 |
- main() |
351 |
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pywrap wxPython-src-2.8.9.2/wxPython/scripts/pywrap |
352 |
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/pywrap 2007-07-18 16:33:55.000000000 -0600 |
353 |
-+++ wxPython-src-2.8.9.2/wxPython/scripts/pywrap 2009-02-21 15:03:24.000000000 -0600 |
354 |
-@@ -1,4 +1,6 @@ |
355 |
- #!/usr/bin/env python |
356 |
-+import wxversion |
357 |
-+wxversion.select("2.8") |
358 |
- |
359 |
- from wx.py.PyWrap import main |
360 |
- main() |
361 |
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pywxrc wxPython-src-2.8.9.2/wxPython/scripts/pywxrc |
362 |
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/pywxrc 2008-02-29 14:32:17.000000000 -0600 |
363 |
-+++ wxPython-src-2.8.9.2/wxPython/scripts/pywxrc 2009-02-21 15:09:58.000000000 -0600 |
364 |
-@@ -1,5 +1,7 @@ |
365 |
- #!/usr/bin/env python |
366 |
- |
367 |
-+import wxversion |
368 |
-+wxversion.select("2.8") |
369 |
- from wx.tools.pywxrc import main |
370 |
- main() |
371 |
- |
372 |
-diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/xrced wxPython-src-2.8.9.2/wxPython/scripts/xrced |
373 |
---- wxPython-src-2.8.9.2-orig/wxPython/scripts/xrced 2007-07-18 16:33:55.000000000 -0600 |
374 |
-+++ wxPython-src-2.8.9.2/wxPython/scripts/xrced 2009-02-21 15:03:24.000000000 -0600 |
375 |
-@@ -1,4 +1,6 @@ |
376 |
- #!/usr/bin/env python |
377 |
-+import wxversion |
378 |
-+wxversion.select("2.8") |
379 |
- |
380 |
- from wx.tools.XRCed.xrced import main |
381 |
- main() |
382 |
|
383 |
diff --git a/dev-python/wxpython/metadata.xml b/dev-python/wxpython/metadata.xml |
384 |
index d87904c379c..f6588d2f5c3 100644 |
385 |
--- a/dev-python/wxpython/metadata.xml |
386 |
+++ b/dev-python/wxpython/metadata.xml |
387 |
@@ -11,7 +11,6 @@ |
388 |
</maintainer> |
389 |
<use> |
390 |
<flag name="examples">Install interactive demo module browser and sample applets.</flag> |
391 |
- <flag name="doc">Install HTML wxWidgets docs and wxpython API reference.</flag> |
392 |
</use> |
393 |
<upstream> |
394 |
<remote-id type="sourceforge">wxpython</remote-id> |
395 |
|
396 |
diff --git a/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild b/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild |
397 |
deleted file mode 100644 |
398 |
index bb3bb88a6dd..00000000000 |
399 |
--- a/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild |
400 |
+++ /dev/null |
401 |
@@ -1,194 +0,0 @@ |
402 |
-# Copyright 1999-2018 Gentoo Foundation |
403 |
-# Distributed under the terms of the GNU General Public License v2 |
404 |
- |
405 |
-EAPI=5 |
406 |
- |
407 |
-PYTHON_COMPAT=( python2_7 ) |
408 |
-WX_GTK_VER="2.8" |
409 |
- |
410 |
-inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets |
411 |
- |
412 |
-MY_P="${P/wxpython-/wxPython-src-}" |
413 |
- |
414 |
-DESCRIPTION="A blending of the wxWindows C++ class library with Python" |
415 |
-HOMEPAGE="http://www.wxpython.org/" |
416 |
-SRC_URI=" |
417 |
- mirror://sourceforge/wxpython/${MY_P}.tar.bz2 |
418 |
- doc? ( |
419 |
- mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 |
420 |
- mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 ) |
421 |
- examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )" |
422 |
- |
423 |
-LICENSE="wxWinLL-3" |
424 |
-SLOT="2.8" |
425 |
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" |
426 |
-IUSE="cairo doc examples opengl" |
427 |
- |
428 |
-RDEPEND=" |
429 |
- dev-lang/python-exec:2[${PYTHON_USEDEP}] |
430 |
- >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X] |
431 |
- dev-libs/glib:2 |
432 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
433 |
- media-libs/libpng:0= |
434 |
- media-libs/tiff:0 |
435 |
- virtual/jpeg |
436 |
- x11-libs/gtk+:2 |
437 |
- x11-libs/pango[X] |
438 |
- cairo? ( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] ) |
439 |
- opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )" |
440 |
- |
441 |
-DEPEND="${RDEPEND} |
442 |
- virtual/pkgconfig" |
443 |
- |
444 |
-S="${WORKDIR}/${MY_P}/wxPython" |
445 |
-DOC_S="${WORKDIR}/wxPython-${PV}" |
446 |
- |
447 |
-# The hacky build system seems to be broken with out-of-source builds, |
448 |
-# and installs 'wx' package globally. |
449 |
-DISTUTILS_IN_SOURCE_BUILD=1 |
450 |
- |
451 |
-python_prepare_all() { |
452 |
- sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed" |
453 |
- |
454 |
- if use doc; then |
455 |
- cd "${DOC_S}" || die |
456 |
- epatch "${FILESDIR}"/${PN}-${SLOT}-cache-writable.patch |
457 |
- fi |
458 |
- |
459 |
- if use examples; then |
460 |
- cd "${DOC_S}" || die |
461 |
- epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch |
462 |
- fi |
463 |
- |
464 |
- cd "${S}" || die |
465 |
- |
466 |
- local PATCHES=( |
467 |
- "${FILESDIR}"/${PN}-2.8.9-wxversion-scripts.patch |
468 |
- # drop editra - we have it as a separate package now |
469 |
- "${FILESDIR}"/${PN}-2.8.12-drop-editra.patch |
470 |
- "${FILESDIR}"/${PN}-2.8.12-drop-categories.patch |
471 |
- "${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch |
472 |
- # fix handling egg_info command |
473 |
- "${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch |
474 |
- ) |
475 |
- |
476 |
- distutils-r1_python_prepare_all |
477 |
-} |
478 |
- |
479 |
-python_configure_all() { |
480 |
- append-flags -fno-strict-aliasing |
481 |
- # Workaround, buildsystem uses CFLAGS as CXXFLAGS |
482 |
- export CFLAGS="${CXXFLAGS}" |
483 |
- need-wxwidgets unicode |
484 |
- |
485 |
- mydistutilsargs=( |
486 |
- WX_CONFIG="${WX_CONFIG}" |
487 |
- WXPORT=gtk2 |
488 |
- UNICODE=1 |
489 |
- BUILD_GLCANVAS=$(usex opengl 1 0) |
490 |
- ) |
491 |
-} |
492 |
- |
493 |
-python_compile() { |
494 |
- # We need to have separate libdirs due to hackery, bug #455332. |
495 |
- distutils-r1_python_compile \ |
496 |
- build --build-purelib "${BUILD_DIR}"/lib.common |
497 |
-} |
498 |
- |
499 |
-python_install() { |
500 |
- distutils-r1_python_install \ |
501 |
- build --build-purelib "${BUILD_DIR}"/lib.common |
502 |
- |
503 |
- # adjust the filenames for wxPython slots. |
504 |
- local file |
505 |
- for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do |
506 |
- mv "${file}" "${file}-${SLOT}" || die |
507 |
- done |
508 |
- cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die |
509 |
- for file in *; do |
510 |
- mv "${file}" "${file}-${SLOT}" || die |
511 |
- |
512 |
- # wrappers are common to all impls, so a parallel run may |
513 |
- # move it for us. ln+rm is more failure-proof. |
514 |
- ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die |
515 |
- rm -f "${ED}usr/bin/${file}" |
516 |
- done |
517 |
-} |
518 |
- |
519 |
-python_install_all() { |
520 |
- dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt |
521 |
- |
522 |
- domenu distrib/{Py{AlaMode,Crust,Shell},XRCed}.desktop |
523 |
- newicon wx/py/PyCrust_32.png PyCrust.png |
524 |
- newicon wx/tools/XRCed/XRCed_32.png XRCed.png |
525 |
- |
526 |
- docdir=${D}usr/share/doc/${PF} |
527 |
- |
528 |
- if use doc; then |
529 |
- docinto docs |
530 |
- dodoc -r "${DOC_S}"/docs/. |
531 |
- # For some reason newer API docs aren't available so use 2.8.9.2's |
532 |
- dodoc -r "${WORKDIR}"/wxPython-2.8.9.2/docs/. |
533 |
- |
534 |
- docompress -x /usr/share/doc/${PF}/docs |
535 |
- fi |
536 |
- |
537 |
- if use examples; then |
538 |
- docinto demo |
539 |
- dodoc -r "${DOC_S}"/demo/. |
540 |
- docinto samples |
541 |
- dodoc -r "${DOC_S}"/samples/. |
542 |
- |
543 |
- [[ -e ${docdir}/samples/embedded/embedded ]] \ |
544 |
- && rm -f "${docdir}"/samples/embedded/embedded |
545 |
- |
546 |
- docompress -x /usr/share/doc/${PF}/{demo,samples} |
547 |
- fi |
548 |
- distutils-r1_python_install_all |
549 |
-} |
550 |
- |
551 |
-pkg_postinst() { |
552 |
- fdo-mime_desktop_database_update |
553 |
- |
554 |
- create_symlinks() { |
555 |
- alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" |
556 |
- alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" |
557 |
- } |
558 |
- python_foreach_impl create_symlinks |
559 |
- |
560 |
- echo |
561 |
- elog "Gentoo uses the Multi-version method for SLOT'ing." |
562 |
- elog "Developers, see this site for instructions on using" |
563 |
- elog "2.6 or 2.8 with your apps:" |
564 |
- elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" |
565 |
- if use doc; then |
566 |
- echo |
567 |
- elog "To access the general wxWidgets documentation, run" |
568 |
- elog "/usr/share/doc/${PF}/docs/viewdocs.py" |
569 |
- echo |
570 |
- elog "wxPython documentation is available by pointing a browser" |
571 |
- elog "at /usr/share/doc/${PF}/docs/api/index.html" |
572 |
- fi |
573 |
- if use examples; then |
574 |
- echo |
575 |
- elog "The demo.py app which contains hundreds of demo modules" |
576 |
- elog "with documentation and source code has been installed at" |
577 |
- elog "/usr/share/doc/${PF}/demo/demo.py" |
578 |
- echo |
579 |
- elog "Many more example apps and modules can be found in" |
580 |
- elog "/usr/share/doc/${PF}/samples/" |
581 |
- fi |
582 |
- echo |
583 |
- elog "Editra is not packaged with wxpython in Gentoo." |
584 |
- elog "You can find it in the tree as app-editors/editra" |
585 |
-} |
586 |
- |
587 |
-pkg_postrm() { |
588 |
- fdo-mime_desktop_database_update |
589 |
- |
590 |
- update_symlinks() { |
591 |
- alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" |
592 |
- alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" |
593 |
- } |
594 |
- python_foreach_impl update_symlinks |
595 |
-} |