diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/wxpython | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-python/wxpython')
20 files changed, 1952 insertions, 0 deletions
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest new file mode 100644 index 000000000000..1381f3bed3ee --- /dev/null +++ b/dev-python/wxpython/Manifest @@ -0,0 +1,13 @@ +DIST wxPython-demo-2.8.12.1.tar.bz2 3906851 SHA256 252282193a80590b9eab436bef322701b21d35ad03b4b6ebb4824241ff947b5a SHA512 aab71cf4e4fb6632afd4607cbe5cdef6785c4ed3f1c7f67d6cef5487d1caee2f7652bfd974ba95a6a03e8d7809c94e291aca00c2fdf74ea29e118e1e30c947d5 WHIRLPOOL e9eb0803350e3dac8c5f2228a3f4d54a26ae4c4307c924729bbdff712747419fdfaa155d83ef1bea7dcb849dbacf9f48c323bf7997ed1df85f182ba3878d1324 +DIST wxPython-demo-2.9.4.0.tar.bz2 3992754 SHA256 c1a57ef7c71ea1a332df98b80cfa7ba178ef6dcd24a31393dff905a145ba8b7b SHA512 dac61d9bb09deffd54c89c1a09803968a4c4b2951a00ebb4d618a2a1b48775c62e3ddf2c642e9005d7362fdeab44c07bc2a38bc96dc94a5c891982847d0c19fe WHIRLPOOL 2093d3d0f81c15b7ca1a346fae29429952d299f8e33d5c2e356846bd98df890b731fe4ef0311ec32b7a913a4038aa8881396d9878dde98322136ccb5244a867b +DIST wxPython-demo-3.0.0.0.tar.bz2 3991989 SHA256 426aaf20c7b01f5e9fbd7bd41455441bb126585f5544a848a5fa060e07f7b443 SHA512 4fe8a87faacac99c54c4fcbdb707c9790b49f485186e1741cc1ba05e955e474ca4ea31ff704a57e73b32b4fad310ef490066743d1c6ad4339191cde2daec255d WHIRLPOOL c6a2b12111572164474083f66dd0e2eff12e4faea5ce880767bfba3de493e8d56e6747c659ff1a3d533d0f6bcde1d5c9daabb9bccb2148278cdce074f5ddcbae +DIST wxPython-demo-3.0.1.1.tar.bz2 3991248 SHA256 bb264db3369c7228f0356f1ad64f6a9ca3000b167bc1ce3fee94d3d2fa20d069 SHA512 b75ca80b5a247f5c97691c4c77c36d64ebe82d94803cd8d687b2110e9de290067c7da893797ae13d0a9f42a4da83170b630dcdeb9460657355c43005dfeac89a WHIRLPOOL 3db15c676252f4f96b585271d0ef005b84cbb4538f01db53e18c587b33fdfc5b57da40d9ba2f2c467063de79c81ed6440982fe5e21547a21fbe2d7d4e252f69c +DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 SHA256 8bf195138744898b4b6fbe11f52f7ee2f6319c2e3adf832917769b2e2d4994f3 SHA512 361ecaa7dfe5bae0757e04215c564370eaf8e5260ead45007f9d70439c15701725c3cbcd76691a5191258bef24fd200ebd61347a3fd920d888137bfc98a16702 WHIRLPOOL a944790a4c7b38dc8d8d28c7def50f765cd5566118d801cb576a0ab9d8370a803f8feedbf3211d0352dd838c92d9d4f092eaf6d78354a1974f2345304dd7b2e1 +DIST wxPython-docs-2.8.12.1.tar.bz2 2331363 SHA256 1dfae3a74b91e2003856eed51698c51094f1a4e6688633ae61af7a22fa8a0ddb SHA512 88591ef4f61bcbac29050d7dfecc230f7338cc006e7c3abc072b15da478e4fd994ab73ee5d072cb8b84f9de62ce182f1774354b0a7a4502ea639e59fdf965358 WHIRLPOOL 97bc66c8f781b5092e2274edc0b9bac35c21c91a66e4c0da75d543dc471f25d02334b28a5afe4ad0681b7a018a93f08b6ef5d3c6afd127ccfc24da208252cd89 +DIST wxPython-newdocs-2.8.9.2.tar.bz2 1503913 SHA256 890b6b7ca37ba7aaa27f9716ea9992ac75ed8150e83939506e3c47f86e7f37a8 SHA512 e114b2b44a7fd3ac292ca9735fb2e075459211384bc98d62ff2ba49e45111825101e74abd4af2ab0e5e52ede7b831641367c11a5c80e79f2da6ada3442463bfc WHIRLPOOL 91ccbe19e8311f0404fb0096efff68750fa0c3b505d05c9278e0488e138788dc399ff2345e13c712126475957a1c1fcc53556d70cd9c835524207be5758a6e2b +DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 WHIRLPOOL 94f91d359f755a0f805588303e8507b2f1404a7f4af73777f85366265df9f76ca89ac29bff491cffd752b707645952a4f7f2bb12fa7e30f3e7d3728147a9c99d +DIST wxPython-src-2.9.4.0.tar.bz2 50827671 SHA256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be SHA512 100dd4474bc2508e9a80aed6f08d295e2697926e29c5789e1f6aa7c303921e1c5de2574c3eddde568804da8fc670d0214ef225d46f34a3006d0a947423d01fbf WHIRLPOOL feff68600a40a8f02492e91049ecdd1a1865ee6db8024112aa3a85a7eff616f26653c418a8ffde77121e2bf7d2c7090c5b91896f9a2de8eb980573af2ca65507 +DIST wxPython-src-2.9.4.1.patch 3768 SHA256 075e3a7b1cf69dd2bb20010717505d2508c74bc81658540f3e6d8c4fbf0a6b85 SHA512 4a5254a5bb9c246b75095e3cc0b849073e3cc71ff15ab7fb1db6ecfe71359800b9e1a5493bc39ce5b1f338cdc1d142ce84641611d458a8da4315f3c8a6aef3ba WHIRLPOOL 9bec06da4824fe56c172f4f417966681d1ffbf173dcb54f1579e9a484377bc76c45b4f2389911bbb17eff2476cfca786d68d9524856b21accc64b4dffafb1811 +DIST wxPython-src-3.0.0.0.tar.bz2 57831792 SHA256 af88695e820dd914e8375dc91ecb736f6fb605979bb38460ace61bbea494dc11 SHA512 9328f46817e0c1670a6be5d10347c8a7110c42a5332c5c35eb11ed0412d8dddeb15727d98606bb6c699af961cee171c41b82b1f24f3de25463259106660f7387 WHIRLPOOL 7865997e22db366a41bae8a5d5c47e4f46b20d17871377243abced3a6550c46588ea1d5a426d826ccf011c62898f87d6a55a14ac9b4153af4e0795d5f180a647 +DIST wxPython-src-3.0.1.1.tar.bz2 58139645 SHA256 d51463fe760e2fc00271678700c216809f9db32a6081a1808bd4b7c884dc0a32 SHA512 71f75c1e36c9ac27c15d768f69662b18ff1c66ad111ef6ef8579dfdb5296d7c37ffce9f60000afeac289cd6288980037d3a7eb3ea8d6d25e619d8692cf41b914 WHIRLPOOL bb03b78048b368b1c2f5a8b8689aecf412953ff789b2a8d2ef4826112fdc6bff8ed881255d05859ac07f915dd1070f6147d6bfdd97b0ab4b0939c024df3b855a +DIST wxPython-src-3.0.2.0.tar.bz2 58304944 SHA256 d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61 SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4 WHIRLPOOL 89cdef12c9ef96044adba0340d47b699e685eaec581a4e7d68f3b95a0890715e29b1f5362027df0f3f8b5b1587e8fe404a7fa88049ece9677dd8316fbdf2e41d diff --git a/dev-python/wxpython/files/wxpython-2.8-cache-writable.patch b/dev-python/wxpython/files/wxpython-2.8-cache-writable.patch new file mode 100644 index 000000000000..57f26b37c2e8 --- /dev/null +++ b/dev-python/wxpython/files/wxpython-2.8-cache-writable.patch @@ -0,0 +1,20 @@ +Use /tmp for cache files since the user won't have +write permissions on ${DOCDIR}. + +diff -Naurp docs-orig/viewdocs.py docs/viewdocs.py +--- docs-orig/viewdocs.py 2008-09-28 15:59:16.000000000 -0600 ++++ docs/viewdocs.py 2009-01-18 00:16:27.000000000 -0600 +@@ -16,11 +16,11 @@ if not basePath: + + + # test for write access +-if os.access(basePath, os.W_OK): ++if os.access('/tmp', os.W_OK): + + # setup the args + args = ['', +- '--cache='+basePath, ++ '--cache=/tmp', + os.path.join(basePath, 'wx.zip'), + ] + diff --git a/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch b/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch new file mode 100644 index 000000000000..5e4221d51506 --- /dev/null +++ b/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch @@ -0,0 +1,16 @@ +Portage preserve-libs removes the linker name (.so) of a library but leaves +the soname (.so.4) and realname (.so.4.0) installed. findLib searches for +mywxlibname.* and returns true if anything is found. Disaster ensues. + + +--- a/wxPython/config.py ++++ b/wxPython/config.py +@@ -612,7 +612,7 @@ def findLib(name, libdirs): + dirs = libdirs[:] + for d in dirs: + p = os.path.join(d, name) +- if glob.glob(p+'*') != []: ++ if glob.glob(p+'*.so') != []: + return True + return False + diff --git a/dev-python/wxpython/files/wxpython-2.8-wxversion-demo.patch b/dev-python/wxpython/files/wxpython-2.8-wxversion-demo.patch new file mode 100644 index 000000000000..97829198a0b2 --- /dev/null +++ b/dev-python/wxpython/files/wxpython-2.8-wxversion-demo.patch @@ -0,0 +1,10 @@ +--- demo/demo.org 2005-04-28 03:00:13.431583384 +0000 ++++ demo/demo.py 2005-04-28 03:00:31.886777768 +0000 +@@ -1,4 +1,7 @@ + #!/usr/bin/env python + ++import wxversion ++wxversion.select("2.8") ++ + import Main + Main.main() diff --git a/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch b/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch new file mode 100644 index 000000000000..9555bb57ef44 --- /dev/null +++ b/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch @@ -0,0 +1,48 @@ +--- a/wxPython/setup.py ++++ b/wxPython/setup.py +@@ -887,13 +887,6 @@ WX_PKGLIST = [ 'wx', + 'wx.tools', + 'wx.tools.XRCed', + 'wx.tools.XRCed.plugins', +- 'wx.tools.Editra', +- 'wx.tools.Editra.src', +- 'wx.tools.Editra.src.autocomp', +- 'wx.tools.Editra.src.eclib', +- 'wx.tools.Editra.src.ebmlib', +- 'wx.tools.Editra.src.extern', +- 'wx.tools.Editra.src.syntax', + ] + + if not EGGing: +@@ -920,7 +913,6 @@ else: + opj('scripts/pywrap'), + opj('scripts/pywxrc'), + opj('scripts/xrced'), +- opj('scripts/editra'), + ] + if os.name == 'nt': + SCRIPTS.append( opj('scripts/genaxmodule') ) +@@ -934,15 +926,6 @@ DATA_FILES += find_data_files('wx/tools/XRCed', '*.txt', '*.xrc', '*.htb') + DATA_FILES += find_data_files('wx/tools/XRCed/plugins', '*.crx') + DATA_FILES += find_data_files('wx/tools/XRCed/plugins/bitmaps', '*.png') + +-DATA_FILES += find_data_files('wx/tools/Editra/docs', '*.txt') +-DATA_FILES += find_data_files('wx/tools/Editra/locale', '*.mo') +-DATA_FILES += find_data_files('wx/tools/Editra/pixmaps', +- '*.png', '*.icns', '*.ico', 'README', 'AUTHORS', 'COPYING') +-DATA_FILES += find_data_files('wx/tools/Editra/plugins', '*.egg') +-DATA_FILES += find_data_files('wx/tools/Editra/src', 'README') +-DATA_FILES += find_data_files('wx/tools/Editra/styles', '*.ess') +-DATA_FILES += find_data_files('wx/tools/Editra/tests/syntax', '*') +-DATA_FILES += find_data_files('wx/tools/Editra', '[A-Z]*', recursive=False) + + + ## import pprint +@@ -993,7 +976,6 @@ if EGGing: + 'pyshell = wx.py.PyShell:main', + 'pywrap = wx.py.PyWrap:main', + 'helpviewer = wx.tools.helpviewer:main', +- 'editra = wx.tools.Editra.launcher:main', + 'xrced = wx.tools.XRCed.xrced:main', + ], + }, 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 new file mode 100644 index 000000000000..d860238e94de --- /dev/null +++ b/dev-python/wxpython/files/wxpython-2.8.12-drop-categories.patch @@ -0,0 +1,37 @@ +Fix QA issue wrt Bug 457586 +diff -ur wxPython-src-2.8.12.1.orig/wxPython/distrib/PyAlaMode.desktop wxPython-src-2.8.12.1/wxPython/distrib/PyAlaMode.desktop +--- distrib/PyAlaMode.desktop 2007-07-19 06:33:55.000000000 +0800 ++++ distrib/PyAlaMode.desktop 2013-03-04 13:48:51.737419595 +0800 +@@ -5,4 +5,4 @@ + Icon=PyCrust.png + Terminal=false + Type=Application +-Categories=Application;Development; ++Categories=Development; +diff -ur wxPython-src-2.8.12.1.orig/wxPython/distrib/PyCrust.desktop wxPython-src-2.8.12.1/wxPython/distrib/PyCrust.desktop +--- distrib/PyCrust.desktop 2007-07-19 06:33:55.000000000 +0800 ++++ distrib/PyCrust.desktop 2013-03-04 13:49:12.209418445 +0800 +@@ -5,4 +5,4 @@ + Icon=PyCrust.png + Terminal=false + Type=Application +-Categories=Application;Development; ++Categories=Development; +diff -ur wxPython-src-2.8.12.1.orig/wxPython/distrib/PyShell.desktop wxPython-src-2.8.12.1/wxPython/distrib/PyShell.desktop +--- distrib/PyShell.desktop 2007-07-19 06:33:55.000000000 +0800 ++++ distrib/PyShell.desktop 2013-03-04 13:49:28.713417518 +0800 +@@ -5,4 +5,4 @@ + Icon=PyCrust.png + Terminal=false + Type=Application +-Categories=Application;Development; ++Categories=Development; +diff -ur wxPython-src-2.8.12.1.orig/wxPython/distrib/XRCed.desktop wxPython-src-2.8.12.1/wxPython/distrib/XRCed.desktop +--- distrib/XRCed.desktop 2007-07-19 06:33:55.000000000 +0800 ++++ distrib/XRCed.desktop 2013-03-04 13:49:46.345416526 +0800 +@@ -5,4 +5,4 @@ + Icon=XRCed.png + Terminal=false + Type=Application +-Categories=Application;Development; ++Categories=Development; 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 new file mode 100644 index 000000000000..4b49f30a1385 --- /dev/null +++ b/dev-python/wxpython/files/wxpython-2.8.12-drop-editra.patch @@ -0,0 +1,55 @@ +--- a/wxPython/setup.py ++++ b/wxPython/setup.py +@@ -887,20 +887,6 @@ WX_PKGLIST = [ 'wx', + 'wx.tools', + 'wx.tools.XRCed', + 'wx.tools.XRCed.plugins', +- 'wx.tools.Editra', +- 'wx.tools.Editra.src', +- 'wx.tools.Editra.src.autocomp', +- 'wx.tools.Editra.src.eclib', +- 'wx.tools.Editra.src.ebmlib', +- 'wx.tools.Editra.src.extern', +- 'wx.tools.Editra.src.extern.aui', +- 'wx.tools.Editra.src.extern.dexml', +- 'wx.tools.Editra.src.extern.pygments', +- 'wx.tools.Editra.src.extern.pygments.filters', +- 'wx.tools.Editra.src.extern.pygments.formatters', +- 'wx.tools.Editra.src.extern.pygments.lexers', +- 'wx.tools.Editra.src.extern.pygments.styles', +- 'wx.tools.Editra.src.syntax', + ] + + if not EGGing: +@@ -927,7 +913,6 @@ else: + opj('scripts/pywrap'), + opj('scripts/pywxrc'), + opj('scripts/xrced'), +- opj('scripts/editra'), + ] + if os.name == 'nt': + SCRIPTS.append( opj('scripts/genaxmodule') ) +@@ -941,15 +926,6 @@ DATA_FILES += find_data_files('wx/tools/XRCed', '*.txt', '*.xrc', '*.htb') + DATA_FILES += find_data_files('wx/tools/XRCed/plugins', '*.crx') + DATA_FILES += find_data_files('wx/tools/XRCed/plugins/bitmaps', '*.png') + +-DATA_FILES += find_data_files('wx/tools/Editra/docs', '*.txt') +-DATA_FILES += find_data_files('wx/tools/Editra/locale', '*.mo') +-DATA_FILES += find_data_files('wx/tools/Editra/pixmaps', +- '*.png', '*.icns', '*.ico', 'README', 'AUTHORS', 'COPYING') +-DATA_FILES += find_data_files('wx/tools/Editra/plugins', '*.egg') +-DATA_FILES += find_data_files('wx/tools/Editra/src', 'README') +-DATA_FILES += find_data_files('wx/tools/Editra/styles', '*.ess') +-DATA_FILES += find_data_files('wx/tools/Editra/tests/syntax', '*') +-DATA_FILES += find_data_files('wx/tools/Editra', '[A-Z]*', recursive=False) + + + ## import pprint +@@ -1000,7 +976,6 @@ if EGGing: + 'pyshell = wx.py.PyShell:main', + 'pywrap = wx.py.PyWrap:main', + 'helpviewer = wx.tools.helpviewer:main', +- 'editra = wx.tools.Editra.launcher:main', + 'xrced = wx.tools.XRCed.xrced:main', + ], + }, diff --git a/dev-python/wxpython/files/wxpython-2.8.12.1-disable-egging-mode.patch b/dev-python/wxpython/files/wxpython-2.8.12.1-disable-egging-mode.patch new file mode 100644 index 000000000000..1497a2c70761 --- /dev/null +++ b/dev-python/wxpython/files/wxpython-2.8.12.1-disable-egging-mode.patch @@ -0,0 +1,34 @@ +From c4072ed7bc923039e544319f52d0761b7a4600a4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Mon, 22 Apr 2013 18:02:37 +0200 +Subject: [PATCH] Trigger 'EGGing' mode only by 'bdist_egg' and not 'egg_info'. + +We use the 'egg_info' command to explicitly enforce temporary EGG file +location outside the source tree on Gentoo. As a result, our build +command activates the 'EGGing' mode and wxPython is not installed +properly. + +I believe that the 'EGGing' mode should be activated only by an explicit +call to 'bdist_egg' command where the expected files are actually +created. The 'egg_info' command is a more broad one and is often used +implicitly, e.g. by the 'install' command. +--- + config.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config.py b/config.py +index 4fbd83f..b45707d 100644 +--- a/config.py ++++ b/config.py +@@ -23,7 +23,7 @@ + import sys, os, glob, fnmatch, tempfile + import subprocess + +-EGGing = 'bdist_egg' in sys.argv or 'egg_info' in sys.argv ++EGGing = 'bdist_egg' in sys.argv + if not EGGing: + from distutils.core import setup, Extension + else: +-- +1.8.1.5 + 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 new file mode 100644 index 000000000000..6a4567812308 --- /dev/null +++ b/dev-python/wxpython/files/wxpython-2.8.9-wxversion-scripts.patch @@ -0,0 +1,191 @@ +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/PyAlaMode.desktop wxPython-src-2.8.9.2/wxPython/distrib/PyAlaMode.desktop +--- wxPython-src-2.8.9.2-orig/wxPython/distrib/PyAlaMode.desktop 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/distrib/PyAlaMode.desktop 2009-02-21 15:04:55.000000000 -0600 +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=PyAlaMode ++Name=PyAlaMode (2.8) + Comment=GUI Python Shell with Filling and editor windows +-Exec=pyalamode +-Icon=PyCrust.png ++Exec=pyalamode-2.8 ++Icon=/usr/share/pixmaps/PyCrust.png + Terminal=false + Type=Application + Categories=Application;Development; +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/PyCrust.desktop wxPython-src-2.8.9.2/wxPython/distrib/PyCrust.desktop +--- wxPython-src-2.8.9.2-orig/wxPython/distrib/PyCrust.desktop 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/distrib/PyCrust.desktop 2009-02-21 15:06:42.000000000 -0600 +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=PyCrust ++Name=PyCrust (2.8) + Comment=GUI Python Shell with Filling +-Exec=pycrust +-Icon=PyCrust.png ++Exec=pycrust-2.8 ++Icon=/usr/share/pixmaps/PyCrust.png + Terminal=false + Type=Application + Categories=Application;Development; +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/PyShell.desktop wxPython-src-2.8.9.2/wxPython/distrib/PyShell.desktop +--- wxPython-src-2.8.9.2-orig/wxPython/distrib/PyShell.desktop 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/distrib/PyShell.desktop 2009-02-21 15:08:19.000000000 -0600 +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=PyShell ++Name=PyShell (2.8) + Comment=GUI Python Shell +-Exec=pyshell +-Icon=PyCrust.png ++Exec=pyshell-2.8 ++Icon=/usr/share/pixmaps/PyCrust.png + Terminal=false + Type=Application + Categories=Application;Development; +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/XRCed.desktop wxPython-src-2.8.9.2/wxPython/distrib/XRCed.desktop +--- wxPython-src-2.8.9.2-orig/wxPython/distrib/XRCed.desktop 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/distrib/XRCed.desktop 2009-02-21 15:09:22.000000000 -0600 +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=XRCed ++Name=XRCed (2.8) + Comment=wxPython XRC resource editor +-Exec=xrced +-Icon=XRCed.png ++Exec=xrced-2.8 ++Icon=/usr/share/pixmaps/XRCed.png + Terminal=false + Type=Application + Categories=Application;Development; +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/editra wxPython-src-2.8.9.2/wxPython/scripts/editra +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/editra 2008-02-29 14:32:17.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/editra 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.tools.Editra.launcher import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/genaxmodule wxPython-src-2.8.9.2/wxPython/scripts/genaxmodule +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/genaxmodule 2008-02-29 14:32:17.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/genaxmodule 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.tools.genaxmodule import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/helpviewer wxPython-src-2.8.9.2/wxPython/scripts/helpviewer +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/helpviewer 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/helpviewer 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.tools.helpviewer import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/img2png wxPython-src-2.8.9.2/wxPython/scripts/img2png +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/img2png 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/img2png 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.tools.img2png import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/img2py wxPython-src-2.8.9.2/wxPython/scripts/img2py +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/img2py 2008-02-29 14:32:17.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/img2py 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.tools.img2py import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/img2xpm wxPython-src-2.8.9.2/wxPython/scripts/img2xpm +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/img2xpm 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/img2xpm 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.tools.img2xpm import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalacarte wxPython-src-2.8.9.2/wxPython/scripts/pyalacarte +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalacarte 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/pyalacarte 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.py.PyAlaCarte import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalamode wxPython-src-2.8.9.2/wxPython/scripts/pyalamode +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalamode 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/pyalamode 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.py.PyAlaMode import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pycrust wxPython-src-2.8.9.2/wxPython/scripts/pycrust +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/pycrust 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/pycrust 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.py.PyCrust import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pyshell wxPython-src-2.8.9.2/wxPython/scripts/pyshell +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/pyshell 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/pyshell 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.py.PyShell import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pywrap wxPython-src-2.8.9.2/wxPython/scripts/pywrap +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/pywrap 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/pywrap 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.py.PyWrap import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pywxrc wxPython-src-2.8.9.2/wxPython/scripts/pywxrc +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/pywxrc 2008-02-29 14:32:17.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/pywxrc 2009-02-21 15:09:58.000000000 -0600 +@@ -1,5 +1,7 @@ + #!/usr/bin/env python + ++import wxversion ++wxversion.select("2.8") + from wx.tools.pywxrc import main + main() + +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/xrced wxPython-src-2.8.9.2/wxPython/scripts/xrced +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/xrced 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/xrced 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.tools.XRCed.xrced import main + main() diff --git a/dev-python/wxpython/files/wxpython-2.9-wxversion-demo.patch b/dev-python/wxpython/files/wxpython-2.9-wxversion-demo.patch new file mode 100644 index 000000000000..c928ae27d851 --- /dev/null +++ b/dev-python/wxpython/files/wxpython-2.9-wxversion-demo.patch @@ -0,0 +1,10 @@ +--- demo/demo.org ++++ demo/demo.py +@@ -1,4 +1,7 @@ + #!/usr/bin/env python + ++import wxversion ++wxversion.select("2.9") ++ + import Main + Main.main() diff --git a/dev-python/wxpython/files/wxpython-2.9-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-2.9-wxversion-scripts.patch new file mode 100644 index 000000000000..d037cc95decc --- /dev/null +++ b/dev-python/wxpython/files/wxpython-2.9-wxversion-scripts.patch @@ -0,0 +1,221 @@ +--- a/distrib/PyAlaMode.desktop ++++ b/distrib/PyAlaMode.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=PyAlaMode ++Name=PyAlaMode (2.9) + Comment=GUI Python Shell with Filling and editor windows +-Exec=pyalamode +-Icon=PyCrust.png ++Exec=pyalamode-2.9 ++Icon=/usr/share/pixmaps/PyCrust-2.9.png + Terminal=false + Type=Application + Categories=Application;Development; +--- a/distrib/PyCrust.desktop ++++ b/distrib/PyCrust.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=PyCrust ++Name=PyCrust (2.9) + Comment=GUI Python Shell with Filling +-Exec=pycrust +-Icon=PyCrust.png ++Exec=pycrust-2.9 ++Icon=/usr/share/pixmaps/PyCrust-2.9.png + Terminal=false + Type=Application + Categories=Application;Development; +--- a/distrib/PyShell.desktop ++++ b/distrib/PyShell.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=PyShell ++Name=PyShell (2.9) + Comment=GUI Python Shell +-Exec=pyshell +-Icon=PyCrust.png ++Exec=pyshell-2.9 ++Icon=/usr/share/pixmaps/PyCrust-2.9.png + Terminal=false + Type=Application + Categories=Application;Development; +--- a/distrib/PySlices.desktop ++++ b/distrib/PySlices.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=PySlices ++Name=PySlices (2.9) + Comment=GUI Python Shell with Filling +-Exec=pyslices +-Icon=PySlices.png ++Exec=pyslices-2.9 ++Icon=/usr/share/pixmaps/PySlices-2.9.png + Terminal=false + Type=Application + Categories=Application;Development; +--- a/distrib/PySlicesShell.desktop ++++ b/distrib/PySlicesShell.desktop +@@ -1,9 +1,9 @@ + + [Desktop Entry] +-Name=PySlicesShell ++Name=PySlicesShell (2.9) + Comment=GUI Python Shell +-Exec=pysliceshell +-Icon=PySlices.png ++Exec=pysliceshell-2.9 ++Icon=/usr/share/pixmaps/PySlices-2.9.png + Terminal=false + Type=Application + Categories=Application;Development; +--- a/distrib/XRCed.desktop ++++ b/distrib/XRCed.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=XRCed ++Name=XRCed (2.9) + Comment=wxPython XRC resource editor +-Exec=xrced +-Icon=XRCed.png ++Exec=xrced-2.9 ++Icon=/usr/share/pixmaps/XRCed-2.9.png + Terminal=false + Type=Application + Categories=Application;Development; +--- a/scripts/editra ++++ b/scripts/editra +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.tools.Editra.launcher import main + main() +--- a/scripts/genaxmodule ++++ b/scripts/genaxmodule +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.tools.genaxmodule import main + main() +--- a/scripts/helpviewer ++++ b/scripts/helpviewer +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.tools.helpviewer import main + main() +--- a/scripts/img2png ++++ b/scripts/img2png +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.tools.img2png import main + main() +--- a/scripts/img2py ++++ b/scripts/img2py +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.tools.img2py import main + main() +--- a/scripts/img2xpm ++++ b/scripts/img2xpm +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.tools.img2xpm import main + main() +--- a/scripts/pyalacarte ++++ b/scripts/pyalacarte +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.py.PyAlaCarte import main + main() +--- a/scripts/pyalamode ++++ b/scripts/pyalamode +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.py.PyAlaMode import main + main() +--- a/scripts/pycrust ++++ b/scripts/pycrust +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.py.PyCrust import main + main() +--- a/scripts/pyshell ++++ b/scripts/pyshell +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.py.PyShell import main + main() +--- a/scripts/pyslices ++++ b/scripts/pyslices +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.py.PySlices import main + main() +--- a/scripts/pysliceshell ++++ b/scripts/pysliceshell +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.py.PySlicesShell import main + main() +--- a/scripts/pywrap ++++ b/scripts/pywrap +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.py.PyWrap import main + main() +--- a/scripts/pywxrc ++++ b/scripts/pywxrc +@@ -1,5 +1,7 @@ + #!/usr/bin/env python + ++import wxversion ++wxversion.select("2.9") + from wx.tools.pywxrc import main + main() + +--- a/scripts/xrced ++++ b/scripts/xrced +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.tools.XRCed.xrced import main + main() 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 new file mode 100644 index 000000000000..7067af9eee79 --- /dev/null +++ b/dev-python/wxpython/files/wxpython-2.9.4.1-wxversion-scripts.patch @@ -0,0 +1,211 @@ +--- a/distrib/PyAlaMode.desktop ++++ b/distrib/PyAlaMode.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=PyAlaMode ++Name=PyAlaMode (2.9) + Comment=GUI Python Shell with Filling and editor windows +-Exec=pyalamode +-Icon=PyCrust ++Exec=pyalamode-2.9 ++Icon=PyCrust-2.9 + Terminal=false + Type=Application + Categories=Development; +--- a/distrib/PyCrust.desktop ++++ b/distrib/PyCrust.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=PyCrust ++Name=PyCrust (2.9) + Comment=GUI Python Shell with Filling +-Exec=pycrust +-Icon=PyCrust ++Exec=pycrust-2.9 ++Icon=PyCrust-2.9 + Terminal=false + Type=Application + Categories=Development; +--- a/distrib/PyShell.desktop ++++ b/distrib/PyShell.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=PyShell ++Name=PyShell (2.9) + Comment=GUI Python Shell +-Exec=pyshell +-Icon=PyCrust ++Exec=pyshell-2.9 ++Icon=PyCrust-2.9 + Terminal=false + Type=Application + Categories=Development; +--- a/distrib/PySlices.desktop ++++ b/distrib/PySlices.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=PySlices ++Name=PySlices (2.9) + Comment=GUI Python Shell with Filling +-Exec=pyslices +-Icon=PySlices ++Exec=pyslices-2.9 ++Icon=PySlices-2.9 + Terminal=false + Type=Application + Categories=Development; +--- a/distrib/PySlicesShell.desktop ++++ b/distrib/PySlicesShell.desktop +@@ -1,9 +1,8 @@ +- + [Desktop Entry] +-Name=PySlicesShell ++Name=PySlicesShell (2.9) + Comment=GUI Python Shell +-Exec=pysliceshell +-Icon=PySlices ++Exec=pysliceshell-2.9 ++Icon=PySlices-2.9 + Terminal=false + Type=Application + Categories=Development; +--- a/distrib/XRCed.desktop ++++ b/distrib/XRCed.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=XRCed ++Name=XRCed (2.9) + Comment=wxPython XRC resource editor +-Exec=xrced +-Icon=XRCed ++Exec=xrced-2.9 ++Icon=XRCed-2.9 + Terminal=false + Type=Application + Categories=Development; +--- a/scripts/genaxmodule ++++ b/scripts/genaxmodule +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.tools.genaxmodule import main + main() +--- a/scripts/helpviewer ++++ b/scripts/helpviewer +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.tools.helpviewer import main + main() +--- a/scripts/img2png ++++ b/scripts/img2png +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.tools.img2png import main + main() +--- a/scripts/img2py ++++ b/scripts/img2py +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.tools.img2py import main + main() +--- a/scripts/img2xpm ++++ b/scripts/img2xpm +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.tools.img2xpm import main + main() +--- a/scripts/pyalacarte ++++ b/scripts/pyalacarte +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.py.PyAlaCarte import main + main() +--- a/scripts/pyalamode ++++ b/scripts/pyalamode +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.py.PyAlaMode import main + main() +--- a/scripts/pycrust ++++ b/scripts/pycrust +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.py.PyCrust import main + main() +--- a/scripts/pyshell ++++ b/scripts/pyshell +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.py.PyShell import main + main() +--- a/scripts/pyslices ++++ b/scripts/pyslices +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.py.PySlices import main + main() +--- a/scripts/pysliceshell ++++ b/scripts/pysliceshell +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.py.PySlicesShell import main + main() +--- a/scripts/pywrap ++++ b/scripts/pywrap +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.py.PyWrap import main + main() +--- a/scripts/pywxrc ++++ b/scripts/pywxrc +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.tools.pywxrc import main + main() +--- a/scripts/xrced ++++ b/scripts/xrced +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.9") + + from wx.tools.XRCed.xrced import main + main() diff --git a/dev-python/wxpython/files/wxpython-3.0-wxversion-demo.patch b/dev-python/wxpython/files/wxpython-3.0-wxversion-demo.patch new file mode 100644 index 000000000000..a4f6b0b07a3c --- /dev/null +++ b/dev-python/wxpython/files/wxpython-3.0-wxversion-demo.patch @@ -0,0 +1,10 @@ +--- demo/demo.org ++++ demo/demo.py +@@ -1,4 +1,7 @@ + #!/usr/bin/env python + ++import wxversion ++wxversion.select("3.0") ++ + import Main + Main.main() diff --git a/dev-python/wxpython/files/wxpython-3.0.0.0-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-3.0.0.0-wxversion-scripts.patch new file mode 100644 index 000000000000..9f0cb8922267 --- /dev/null +++ b/dev-python/wxpython/files/wxpython-3.0.0.0-wxversion-scripts.patch @@ -0,0 +1,211 @@ +--- a/distrib/PyAlaMode.desktop ++++ b/distrib/PyAlaMode.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=PyAlaMode ++Name=PyAlaMode (3.0) + Comment=GUI Python Shell with Filling and editor windows +-Exec=pyalamode +-Icon=PyCrust ++Exec=pyalamode-3.0 ++Icon=PyCrust-3.0 + Terminal=false + Type=Application + Categories=Development; +--- a/distrib/PyCrust.desktop ++++ b/distrib/PyCrust.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=PyCrust ++Name=PyCrust (3.0) + Comment=GUI Python Shell with Filling +-Exec=pycrust +-Icon=PyCrust ++Exec=pycrust-3.0 ++Icon=PyCrust-3.0 + Terminal=false + Type=Application + Categories=Development; +--- a/distrib/PyShell.desktop ++++ b/distrib/PyShell.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=PyShell ++Name=PyShell (3.0) + Comment=GUI Python Shell +-Exec=pyshell +-Icon=PyCrust ++Exec=pyshell-3.0 ++Icon=PyCrust-3.0 + Terminal=false + Type=Application + Categories=Development; +--- a/distrib/PySlices.desktop ++++ b/distrib/PySlices.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=PySlices ++Name=PySlices (3.0) + Comment=GUI Python Shell with Filling +-Exec=pyslices +-Icon=PySlices ++Exec=pyslices-3.0 ++Icon=PySlices-3.0 + Terminal=false + Type=Application + Categories=Development; +--- a/distrib/PySlicesShell.desktop ++++ b/distrib/PySlicesShell.desktop +@@ -1,9 +1,8 @@ +- + [Desktop Entry] +-Name=PySlicesShell ++Name=PySlicesShell (3.0) + Comment=GUI Python Shell +-Exec=pysliceshell +-Icon=PySlices ++Exec=pysliceshell-3.0 ++Icon=PySlices-3.0 + Terminal=false + Type=Application + Categories=Development; +--- a/distrib/XRCed.desktop ++++ b/distrib/XRCed.desktop +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=XRCed ++Name=XRCed (3.0) + Comment=wxPython XRC resource editor +-Exec=xrced +-Icon=XRCed ++Exec=xrced-3.0 ++Icon=XRCed-3.0 + Terminal=false + Type=Application + Categories=Development; +--- a/scripts/genaxmodule ++++ b/scripts/genaxmodule +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("3.0") + + from wx.tools.genaxmodule import main + main() +--- a/scripts/helpviewer ++++ b/scripts/helpviewer +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("3.0") + + from wx.tools.helpviewer import main + main() +--- a/scripts/img2png ++++ b/scripts/img2png +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("3.0") + + from wx.tools.img2png import main + main() +--- a/scripts/img2py ++++ b/scripts/img2py +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("3.0") + + from wx.tools.img2py import main + main() +--- a/scripts/img2xpm ++++ b/scripts/img2xpm +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("3.0") + + from wx.tools.img2xpm import main + main() +--- a/scripts/pyalacarte ++++ b/scripts/pyalacarte +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("3.0") + + from wx.py.PyAlaCarte import main + main() +--- a/scripts/pyalamode ++++ b/scripts/pyalamode +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("3.0") + + from wx.py.PyAlaMode import main + main() +--- a/scripts/pycrust ++++ b/scripts/pycrust +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("3.0") + + from wx.py.PyCrust import main + main() +--- a/scripts/pyshell ++++ b/scripts/pyshell +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("3.0") + + from wx.py.PyShell import main + main() +--- a/scripts/pyslices ++++ b/scripts/pyslices +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("3.0") + + from wx.py.PySlices import main + main() +--- a/scripts/pysliceshell ++++ b/scripts/pysliceshell +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("3.0") + + from wx.py.PySlicesShell import main + main() +--- a/scripts/pywrap ++++ b/scripts/pywrap +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("3.0") + + from wx.py.PyWrap import main + main() +--- a/scripts/pywxrc ++++ b/scripts/pywxrc +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("3.0") + + from wx.tools.pywxrc import main + main() +--- a/scripts/xrced ++++ b/scripts/xrced +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("3.0") + + from wx.tools.XRCed.xrced import main + main() diff --git a/dev-python/wxpython/metadata.xml b/dev-python/wxpython/metadata.xml new file mode 100644 index 000000000000..a9a6cc28e75b --- /dev/null +++ b/dev-python/wxpython/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>wxwidgets</herd> + <herd>python</herd> + <use> + <flag name="examples">Install interactive demo module browser and sample applets.</flag> + <flag name="doc">Install HTML wxWidgets docs and wxpython API reference.</flag> + </use> + <upstream> + <remote-id type="sourceforge">wxpython</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild b/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild new file mode 100644 index 000000000000..9862c009da14 --- /dev/null +++ b/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild @@ -0,0 +1,195 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +WX_GTK_VER="2.8" + +inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets + +MY_P="${P/wxpython-/wxPython-src-}" + +DESCRIPTION="A blending of the wxWindows C++ class library with Python" +HOMEPAGE="http://www.wxpython.org/" +SRC_URI=" + mirror://sourceforge/wxpython/${MY_P}.tar.bz2 + doc? ( + mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 + mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 ) + examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )" + +LICENSE="wxWinLL-3" +SLOT="2.8" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" +IUSE="cairo doc examples opengl" + +RDEPEND=" + dev-lang/python-exec:2[${PYTHON_USEDEP}] + >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X] + dev-libs/glib:2 + dev-python/setuptools[${PYTHON_USEDEP}] + media-libs/libpng:0= + media-libs/tiff:0 + virtual/jpeg + x11-libs/gtk+:2 + x11-libs/pango[X] + cairo? ( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] ) + opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )" + +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}/wxPython" +DOC_S="${WORKDIR}/wxPython-${PV}" + +# The hacky build system seems to be broken with out-of-source builds, +# and installs 'wx' package globally. +DISTUTILS_IN_SOURCE_BUILD=1 + +python_prepare_all() { + sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed" + + if use doc; then + cd "${DOC_S}" || die + epatch "${FILESDIR}"/${PN}-${SLOT}-cache-writable.patch + fi + + if use examples; then + cd "${DOC_S}" || die + epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch + fi + + cd "${S}" || die + + local PATCHES=( + "${FILESDIR}"/${PN}-2.8.9-wxversion-scripts.patch + # drop editra - we have it as a separate package now + "${FILESDIR}"/${PN}-2.8.12-drop-editra.patch + "${FILESDIR}"/${PN}-2.8.12-drop-categories.patch + "${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch + # fix handling egg_info command + "${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch + ) + + distutils-r1_python_prepare_all +} + +python_configure_all() { + append-flags -fno-strict-aliasing + # Workaround, buildsystem uses CFLAGS as CXXFLAGS + export CFLAGS="${CXXFLAGS}" + need-wxwidgets unicode + + mydistutilsargs=( + WX_CONFIG="${WX_CONFIG}" + WXPORT=gtk2 + UNICODE=1 + BUILD_GLCANVAS=$(usex opengl 1 0) + ) +} + +python_compile() { + # We need to have separate libdirs due to hackery, bug #455332. + distutils-r1_python_compile \ + build --build-purelib "${BUILD_DIR}"/lib.common +} + +python_install() { + distutils-r1_python_install \ + build --build-purelib "${BUILD_DIR}"/lib.common + + # adjust the filenames for wxPython slots. + local file + for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do + mv "${file}" "${file}-${SLOT}" || die + done + cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die + for file in *; do + mv "${file}" "${file}-${SLOT}" || die + + # wrappers are common to all impls, so a parallel run may + # move it for us. ln+rm is more failure-proof. + ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die + rm -f "${ED}usr/bin/${file}" + done +} + +python_install_all() { + dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt + + domenu distrib/{Py{AlaMode,Crust,Shell},XRCed}.desktop + newicon wx/py/PyCrust_32.png PyCrust.png + newicon wx/tools/XRCed/XRCed_32.png XRCed.png + + docdir=${D}usr/share/doc/${PF} + + if use doc; then + docinto docs + dodoc -r "${DOC_S}"/docs/. + # For some reason newer API docs aren't available so use 2.8.9.2's + dodoc -r "${WORKDIR}"/wxPython-2.8.9.2/docs/. + + docompress -x /usr/share/doc/${PF}/docs + fi + + if use examples; then + docinto demo + dodoc -r "${DOC_S}"/demo/. + docinto samples + dodoc -r "${DOC_S}"/samples/. + + [[ -e ${docdir}/samples/embedded/embedded ]] \ + && rm -f "${docdir}"/samples/embedded/embedded + + docompress -x /usr/share/doc/${PF}/{demo,samples} + fi + distutils-r1_python_install_all +} + +pkg_postinst() { + fdo-mime_desktop_database_update + + create_symlinks() { + alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" + alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" + } + python_foreach_impl create_symlinks + + echo + elog "Gentoo uses the Multi-version method for SLOT'ing." + elog "Developers, see this site for instructions on using" + elog "2.6 or 2.8 with your apps:" + elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" + if use doc; then + echo + elog "To access the general wxWidgets documentation, run" + elog "/usr/share/doc/${PF}/docs/viewdocs.py" + echo + elog "wxPython documentation is available by pointing a browser" + elog "at /usr/share/doc/${PF}/docs/api/index.html" + fi + if use examples; then + echo + elog "The demo.py app which contains hundreds of demo modules" + elog "with documentation and source code has been installed at" + elog "/usr/share/doc/${PF}/demo/demo.py" + echo + elog "Many more example apps and modules can be found in" + elog "/usr/share/doc/${PF}/samples/" + fi + echo + elog "Editra is not packaged with wxpython in Gentoo." + elog "You can find it in the tree as app-editors/editra" +} + +pkg_postrm() { + fdo-mime_desktop_database_update + + update_symlinks() { + alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" + alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" + } + python_foreach_impl update_symlinks +} diff --git a/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild b/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild new file mode 100644 index 000000000000..cd309a630855 --- /dev/null +++ b/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild @@ -0,0 +1,168 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +WX_GTK_VER="2.9" + +inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets + +MY_PN="wxPython-src" + +DESCRIPTION="A blending of the wxWindows C++ class library with Python" +HOMEPAGE="http://www.wxpython.org/" +SRC_URI=" + mirror://sourceforge/wxpython/${MY_PN}-2.9.4.0.tar.bz2 + examples? ( mirror://sourceforge/wxpython/wxPython-demo-2.9.4.0.tar.bz2 ) + mirror://sourceforge/wxpython/${MY_PN}-2.9.4.1.patch" + +LICENSE="wxWinLL-3" +SLOT="2.9" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="cairo examples opengl" + +RDEPEND=" + dev-lang/python-exec:2[${PYTHON_USEDEP}] + >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X] + dev-libs/glib:2 + dev-python/setuptools[${PYTHON_USEDEP}] + media-libs/libpng:0= + media-libs/tiff:0 + virtual/jpeg + x11-libs/gtk+:2 + x11-libs/pango[X] + cairo? ( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] ) + opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )" + +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}/${MY_PN}-2.9.4.0/wxPython" +DOC_S="${WORKDIR}/wxPython-2.9.4.0" + +# The hacky build system seems to be broken with out-of-source builds, +# and installs 'wx' package globally. +DISTUTILS_IN_SOURCE_BUILD=1 + +python_prepare_all() { + sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed" + + cd .. || die + epatch "${DISTDIR}"/${MY_PN}-${PV}.patch + + if use examples; then + cd "${DOC_S}" + epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch + fi + + cd "${S}" || die + local PATCHES=( + "${FILESDIR}"/${P}-wxversion-scripts.patch + # drop editra - we have it as a separate package now + "${FILESDIR}"/${PN}-2.8.11-drop-editra.patch + "${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch + # fix handling egg_info command + "${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch + ) + + distutils-r1_python_prepare_all +} + +src_configure() { + append-flags -fno-strict-aliasing + need-wxwidgets unicode + + mydistutilsargs=( + WX_CONFIG="${WX_CONFIG}" + WXPORT=gtk2 + UNICODE=1 + BUILD_GLCANVAS=$(usex opengl 1 0) + ) +} + +python_compile() { + # We need to have separate libdirs due to hackery, bug #455332. + distutils-r1_python_compile \ + build --build-purelib "${BUILD_DIR}"/lib.common +} + +python_install() { + distutils-r1_python_install \ + build --build-purelib "${BUILD_DIR}"/lib.common + + # adjust the filenames for wxPython slots. + local file + for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do + mv "${file}" "${file}-${SLOT}" || die + done + cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die + for file in *; do + mv "${file}" "${file}-${SLOT}" || die + + # wrappers are common to all impls, so a parallel run may + # move it for us. ln+rm is more failure-proof. + ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die + rm -f "${ED}usr/bin/${file}" + done +} + +python_install_all() { + dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt + + for x in {Py{AlaMode,Crust,Shell},XRCed}; do + newmenu distrib/${x}.desktop ${x}-${SLOT}.desktop + done + newicon wx/py/PyCrust_32.png PyCrust-${SLOT}.png + newicon wx/py/PySlices_32.png PySlices-${SLOT}.png + newicon wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png + + if use examples; then + docinto demo + dodoc -r "${DOC_S}"/demo/. + docinto samples + dodoc -r "${DOC_S}"/samples/. + + [[ -e ${docdir}/samples/embedded/embedded ]] \ + && rm -f "${docdir}"/samples/embedded/embedded + + docompress -x /usr/share/doc/${PF}/{demo,samples} + fi + distutils-r1_python_install_all +} + +pkg_postinst() { + fdo-mime_desktop_database_update + + create_symlinks() { + alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" + alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" + } + python_foreach_impl create_symlinks + + echo + elog "Gentoo uses the Multi-version method for SLOT'ing." + elog "Developers, see this site for instructions on using" + elog "2.8 or 2.9 with your apps:" + elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" + if use examples; then + echo + elog "The demo.py app which contains demo modules with" + elog "documentation and source code has been installed at" + elog "/usr/share/doc/${PF}/demo/demo.py" + echo + elog "More example apps and modules can be found in" + elog "/usr/share/doc/${PF}/samples/" + fi +} + +pkg_postrm() { + fdo-mime_desktop_database_update + + update_symlinks() { + alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" + alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" + } + python_foreach_impl update_symlinks +} diff --git a/dev-python/wxpython/wxpython-3.0.0.0.ebuild b/dev-python/wxpython/wxpython-3.0.0.0.ebuild new file mode 100644 index 000000000000..e318a4067d3a --- /dev/null +++ b/dev-python/wxpython/wxpython-3.0.0.0.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +WX_GTK_VER="3.0" + +inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets + +MY_PN="wxPython-src" + +DESCRIPTION="A blending of the wxWindows C++ class library with Python" +HOMEPAGE="http://www.wxpython.org/" +SRC_URI=" + mirror://sourceforge/wxpython/${MY_PN}-${PV}.tar.bz2 + examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )" + +LICENSE="wxWinLL-3" +SLOT="3.0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="cairo examples libnotify opengl" + +RDEPEND=" + dev-lang/python-exec:2[${PYTHON_USEDEP}] + >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}=[libnotify=,opengl?,tiff,X] + dev-libs/glib:2 + dev-python/setuptools[${PYTHON_USEDEP}] + media-libs/libpng:0= + media-libs/tiff:0 + virtual/jpeg + x11-libs/gtk+:2 + x11-libs/pango[X] + cairo? ( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] ) + opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )" + +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}/${MY_PN}-${PV}/wxPython" +DOC_S="${WORKDIR}/wxPython-${PV}" + +# The hacky build system seems to be broken with out-of-source builds, +# and installs 'wx' package globally. +DISTUTILS_IN_SOURCE_BUILD=1 + +python_prepare_all() { + sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed" + + if use examples; then + cd "${DOC_S}" + epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch + fi + + cd "${S}" + local PATCHES=( + "${FILESDIR}"/${P}-wxversion-scripts.patch + # drop editra - we have it as a separate package now + "${FILESDIR}"/${PN}-2.8.11-drop-editra.patch + "${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch + # fix handling egg_info command + "${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch + ) + + distutils-r1_python_prepare_all +} + +src_configure() { + need-wxwidgets unicode + + mydistutilsargs=( + WX_CONFIG="${WX_CONFIG}" + WXPORT=gtk2 + UNICODE=1 + BUILD_GLCANVAS=$(usex opengl 1 0) + ) +} + +python_compile() { + # We need to have separate libdirs due to hackery, bug #455332. + distutils-r1_python_compile \ + build --build-purelib "${BUILD_DIR}"/lib.common +} + +python_install() { + distutils-r1_python_install \ + build --build-purelib "${BUILD_DIR}"/lib.common + + # adjust the filenames for wxPython slots. + local file + for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do + mv "${file}" "${file}-${SLOT}" || die + done + cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die + for file in *; do + mv "${file}" "${file}-${SLOT}" || die + + # wrappers are common to all impls, so a parallel run may + # move it for us. ln+rm is more failure-proof. + ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die + rm -f "${ED}usr/bin/${file}" + done +} + +python_install_all() { + dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt + + for x in {Py{AlaMode,Crust,Shell},XRCed}; do + newmenu distrib/${x}.desktop ${x}-${SLOT}.desktop + done + newicon wx/py/PyCrust_32.png PyCrust-${SLOT}.png + newicon wx/py/PySlices_32.png PySlices-${SLOT}.png + newicon wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png + + if use examples; then + docinto demo + dodoc -r "${DOC_S}"/demo/. + docinto samples + dodoc -r "${DOC_S}"/samples/. + + [[ -e ${docdir}/samples/embedded/embedded ]] \ + && rm -f "${docdir}"/samples/embedded/embedded + + docompress -x /usr/share/doc/${PF}/{demo,samples} + fi + distutils-r1_python_install_all +} + +pkg_postinst() { + fdo-mime_desktop_database_update + + create_symlinks() { + alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" + alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" + } + python_foreach_impl create_symlinks + + echo + elog "Gentoo uses the Multi-version method for SLOT'ing." + elog "Developers, see this site for instructions on using" + elog "it with your apps:" + elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" + if use examples; then + echo + elog "The demo.py app which contains demo modules with" + elog "documentation and source code has been installed at" + elog "/usr/share/doc/${PF}/demo/demo.py" + echo + elog "More example apps and modules can be found in" + elog "/usr/share/doc/${PF}/samples/" + fi +} + +pkg_postrm() { + fdo-mime_desktop_database_update + + update_symlinks() { + alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" + alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" + } + python_foreach_impl update_symlinks +} diff --git a/dev-python/wxpython/wxpython-3.0.1.1.ebuild b/dev-python/wxpython/wxpython-3.0.1.1.ebuild new file mode 100644 index 000000000000..fe6a82dce9a1 --- /dev/null +++ b/dev-python/wxpython/wxpython-3.0.1.1.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +WX_GTK_VER="3.0" + +inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets + +MY_PN="wxPython-src" + +DESCRIPTION="A blending of the wxWindows C++ class library with Python" +HOMEPAGE="http://www.wxpython.org/" +SRC_URI=" + mirror://sourceforge/wxpython/${MY_PN}-${PV}.tar.bz2 + examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )" + +LICENSE="wxWinLL-3" +SLOT="3.0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="cairo examples libnotify opengl" + +RDEPEND=" + dev-lang/python-exec:2[${PYTHON_USEDEP}] + >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}=[libnotify=,opengl?,tiff,X] + dev-libs/glib:2 + dev-python/setuptools[${PYTHON_USEDEP}] + media-libs/libpng:0= + media-libs/tiff:0 + virtual/jpeg + x11-libs/gtk+:2 + x11-libs/pango[X] + cairo? ( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] ) + opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )" + +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}/${MY_PN}-${PV}/wxPython" +DOC_S="${WORKDIR}/wxPython-${PV}" + +# The hacky build system seems to be broken with out-of-source builds, +# and installs 'wx' package globally. +DISTUTILS_IN_SOURCE_BUILD=1 + +python_prepare_all() { + sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed" + + if use examples; then + cd "${DOC_S}" + epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch + fi + + cd "${S}" + local PATCHES=( + "${FILESDIR}"/${PN}-3.0.0.0-wxversion-scripts.patch + # drop editra - we have it as a separate package now + "${FILESDIR}"/${PN}-2.8.11-drop-editra.patch + "${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch + # fix handling egg_info command + "${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch + ) + + distutils-r1_python_prepare_all +} + +src_configure() { + need-wxwidgets unicode + + mydistutilsargs=( + WX_CONFIG="${WX_CONFIG}" + WXPORT=gtk2 + UNICODE=1 + BUILD_GLCANVAS=$(usex opengl 1 0) + ) +} + +python_compile() { + # We need to have separate libdirs due to hackery, bug #455332. + distutils-r1_python_compile \ + build --build-purelib "${BUILD_DIR}"/lib.common +} + +python_install() { + distutils-r1_python_install \ + build --build-purelib "${BUILD_DIR}"/lib.common + + # adjust the filenames for wxPython slots. + local file + for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do + mv "${file}" "${file}-${SLOT}" || die + done + cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die + for file in *; do + mv "${file}" "${file}-${SLOT}" || die + + # wrappers are common to all impls, so a parallel run may + # move it for us. ln+rm is more failure-proof. + ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die + rm -f "${ED}usr/bin/${file}" + done +} + +python_install_all() { + dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt + + for x in {Py{AlaMode,Crust,Shell},XRCed}; do + newmenu distrib/${x}.desktop ${x}-${SLOT}.desktop + done + newicon wx/py/PyCrust_32.png PyCrust-${SLOT}.png + newicon wx/py/PySlices_32.png PySlices-${SLOT}.png + newicon wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png + + if use examples; then + docinto demo + dodoc -r "${DOC_S}"/demo/. + docinto samples + dodoc -r "${DOC_S}"/samples/. + + [[ -e ${docdir}/samples/embedded/embedded ]] \ + && rm -f "${docdir}"/samples/embedded/embedded + + docompress -x /usr/share/doc/${PF}/{demo,samples} + fi + distutils-r1_python_install_all +} + +pkg_postinst() { + fdo-mime_desktop_database_update + + create_symlinks() { + alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" + alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" + } + python_foreach_impl create_symlinks + + echo + elog "Gentoo uses the Multi-version method for SLOT'ing." + elog "Developers, see this site for instructions on using" + elog "it with your apps:" + elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" + if use examples; then + echo + elog "The demo.py app which contains demo modules with" + elog "documentation and source code has been installed at" + elog "/usr/share/doc/${PF}/demo/demo.py" + echo + elog "More example apps and modules can be found in" + elog "/usr/share/doc/${PF}/samples/" + fi +} + +pkg_postrm() { + fdo-mime_desktop_database_update + + update_symlinks() { + alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" + alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" + } + python_foreach_impl update_symlinks +} diff --git a/dev-python/wxpython/wxpython-3.0.2.0.ebuild b/dev-python/wxpython/wxpython-3.0.2.0.ebuild new file mode 100644 index 000000000000..dc0329cfc5d1 --- /dev/null +++ b/dev-python/wxpython/wxpython-3.0.2.0.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +WX_GTK_VER="3.0" + +inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets + +MY_PN="wxPython-src" + +DESCRIPTION="A blending of the wxWindows C++ class library with Python" +HOMEPAGE="http://www.wxpython.org/" +SRC_URI=" + mirror://sourceforge/wxpython/${MY_PN}-${PV}.tar.bz2 + examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )" + +LICENSE="wxWinLL-3" +SLOT="3.0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="cairo examples libnotify opengl" + +RDEPEND=" + dev-lang/python-exec:2[${PYTHON_USEDEP}] + >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}=[libnotify=,opengl?,tiff,X] + dev-libs/glib:2 + dev-python/setuptools[${PYTHON_USEDEP}] + media-libs/libpng:0= + media-libs/tiff:0 + virtual/jpeg + x11-libs/gtk+:2 + x11-libs/pango[X] + cairo? ( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] ) + opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )" + +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}/${MY_PN}-${PV}/wxPython" +DOC_S="${WORKDIR}/wxPython-${PV}" + +# The hacky build system seems to be broken with out-of-source builds, +# and installs 'wx' package globally. +DISTUTILS_IN_SOURCE_BUILD=1 + +python_prepare_all() { + sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed" + + if use examples; then + cd "${DOC_S}" + epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch + fi + + cd "${S}" + local PATCHES=( + "${FILESDIR}"/${PN}-3.0.0.0-wxversion-scripts.patch + # drop editra - we have it as a separate package now + "${FILESDIR}"/${PN}-2.8.11-drop-editra.patch + "${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch + # fix handling egg_info command + "${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch + ) + + distutils-r1_python_prepare_all +} + +src_configure() { + need-wxwidgets unicode + + mydistutilsargs=( + WX_CONFIG="${WX_CONFIG}" + WXPORT=gtk2 + UNICODE=1 + BUILD_GLCANVAS=$(usex opengl 1 0) + ) +} + +python_compile() { + # We need to have separate libdirs due to hackery, bug #455332. + distutils-r1_python_compile \ + build --build-purelib "${BUILD_DIR}"/lib.common +} + +python_install() { + distutils-r1_python_install \ + build --build-purelib "${BUILD_DIR}"/lib.common + + # adjust the filenames for wxPython slots. + local file + for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do + mv "${file}" "${file}-${SLOT}" || die + done + cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die + for file in *; do + mv "${file}" "${file}-${SLOT}" || die + + # wrappers are common to all impls, so a parallel run may + # move it for us. ln+rm is more failure-proof. + ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die + rm -f "${ED}usr/bin/${file}" + done +} + +python_install_all() { + dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt + + for x in {Py{AlaMode,Crust,Shell},XRCed}; do + newmenu distrib/${x}.desktop ${x}-${SLOT}.desktop + done + newicon wx/py/PyCrust_32.png PyCrust-${SLOT}.png + newicon wx/py/PySlices_32.png PySlices-${SLOT}.png + newicon wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png + + if use examples; then + docinto demo + dodoc -r "${DOC_S}"/demo/. + docinto samples + dodoc -r "${DOC_S}"/samples/. + + [[ -e ${docdir}/samples/embedded/embedded ]] \ + && rm -f "${docdir}"/samples/embedded/embedded + + docompress -x /usr/share/doc/${PF}/{demo,samples} + fi + distutils-r1_python_install_all +} + +pkg_postinst() { + fdo-mime_desktop_database_update + + create_symlinks() { + alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" + alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" + } + python_foreach_impl create_symlinks + + echo + elog "Gentoo uses the Multi-version method for SLOT'ing." + elog "Developers, see this site for instructions on using" + elog "it with your apps:" + elog "http://wiki.wxpython.org/MultiVersionInstalls" + if use examples; then + echo + elog "The demo.py app which contains demo modules with" + elog "documentation and source code has been installed at" + elog "/usr/share/doc/${PF}/demo/demo.py" + echo + elog "More example apps and modules can be found in" + elog "/usr/share/doc/${PF}/samples/" + fi +} + +pkg_postrm() { + fdo-mime_desktop_database_update + + update_symlinks() { + alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" + alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" + } + python_foreach_impl update_symlinks +} |