Version bump. Now SLOT'd

(Portage version: 2.0.51.20-r5)

5 files changed, 155 insertions, 8 deletions

diff --git a/dev-python/wxpython/files/digest-wxpython-2.4.2.4-r1 b/dev-python/wxpython/files/digest-wxpython-2.4.2.4-r2
index a2e3b4a3aac2..a2e3b4a3aac2 100644
--- a/dev-python/wxpython/files/digest-wxpython-2.4.2.4-r1
+++ b/dev-python/wxpython/files/digest-wxpython-2.4.2.4-r2
diff --git a/dev-python/wxpython/files/digest-wxpython-2.5.3.1 b/dev-python/wxpython/files/digest-wxpython-2.5.3.1
deleted file mode 100644
index c27f171ba09b..000000000000
--- a/dev-python/wxpython/files/digest-wxpython-2.5.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3e3ed31f756a93f2d53725c4e0a18ba9 wxPython-src-2.5.3.1.tar.gz 15906505
diff --git a/dev-python/wxpython/files/digest-wxpython-2.6.0.0 b/dev-python/wxpython/files/digest-wxpython-2.6.0.0
new file mode 100644
index 000000000000..2433c94af3eb
--- /dev/null
+++ b/dev-python/wxpython/files/digest-wxpython-2.6.0.0
@@ -0,0 +1 @@
+MD5 6cb6517546e983e3d730708e0de0ed10 wxPython-src-2.6.0.0.tar.gz 18372673
diff --git a/dev-python/wxpython/files/scripts-multiver-2.6.0.0.diff b/dev-python/wxpython/files/scripts-multiver-2.6.0.0.diff
new file mode 100644
index 000000000000..24586a60eafa
--- /dev/null
+++ b/dev-python/wxpython/files/scripts-multiver-2.6.0.0.diff
@@ -0,0 +1,147 @@
+diff -cr scripts/helpviewer scripts.mine/helpviewer
+*** scripts/helpviewer	Wed Nov 12 21:03:49 2003
+--- scripts.mine/helpviewer	Wed Apr 27 04:07:31 2005
+***************
+*** 1,4 ****
+--- 1,7 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  from wx.tools.helpviewer import main
+  main()
+diff -cr scripts/img2png scripts.mine/img2png
+*** scripts/img2png	Wed Nov 12 21:03:49 2003
+--- scripts.mine/img2png	Wed Apr 27 04:07:04 2005
+***************
+*** 1,5 ****
+--- 1,8 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  from wx.tools.img2png import main
+  main()
+  
+diff -cr scripts/img2py scripts.mine/img2py
+*** scripts/img2py	Wed Nov 12 21:03:49 2003
+--- scripts.mine/img2py	Wed Apr 27 04:07:36 2005
+***************
+*** 1,5 ****
+--- 1,8 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  import sys
+  from wx.tools.img2py import main
+  main(sys.argv[1:])
+diff -cr scripts/img2xpm scripts.mine/img2xpm
+*** scripts/img2xpm	Wed Nov 12 21:03:49 2003
+--- scripts.mine/img2xpm	Wed Apr 27 04:07:14 2005
+***************
+*** 1,5 ****
+--- 1,8 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  from wx.tools.img2xpm import main
+  main()
+  
+diff -cr scripts/pyalacarte scripts.mine/pyalacarte
+*** scripts/pyalacarte	Wed Jul  2 23:12:38 2003
+--- scripts.mine/pyalacarte	Wed Apr 27 04:07:40 2005
+***************
+*** 1,4 ****
+--- 1,7 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  from wx.py.PyAlaCarte import main
+  main()
+diff -cr scripts/pyalamode scripts.mine/pyalamode
+*** scripts/pyalamode	Wed Jul  2 23:12:37 2003
+--- scripts.mine/pyalamode	Wed Apr 27 04:07:21 2005
+***************
+*** 1,4 ****
+--- 1,7 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  from wx.py.PyAlaMode import main
+  main()
+diff -cr scripts/pycrust scripts.mine/pycrust
+*** scripts/pycrust	Wed Jul  2 23:12:37 2003
+--- scripts.mine/pycrust	Wed Apr 27 04:07:43 2005
+***************
+*** 1,4 ****
+--- 1,7 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  from wx.py.PyCrust import main
+  main()
+diff -cr scripts/pyshell scripts.mine/pyshell
+*** scripts/pyshell	Wed Jul  2 23:12:37 2003
+--- scripts.mine/pyshell	Wed Apr 27 04:07:25 2005
+***************
+*** 1,4 ****
+--- 1,7 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  from wx.py.PyShell import main
+  main()
+diff -cr scripts/pywrap scripts.mine/pywrap
+*** scripts/pywrap	Wed Jul  2 23:12:37 2003
+--- scripts.mine/pywrap	Wed Apr 27 04:07:46 2005
+***************
+*** 1,4 ****
+--- 1,7 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  from wx.py.PyWrap import main
+  main()
+diff -cr scripts/pywxrc scripts.mine/pywxrc
+*** scripts/pywxrc	Mon Oct  4 20:03:33 2004
+--- scripts.mine/pywxrc	Wed Apr 27 04:07:28 2005
+***************
+*** 1,5 ****
+--- 1,8 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  from wx.tools.pywxrc import main
+  main()
+  
+diff -cr scripts/xrced scripts.mine/xrced
+*** scripts/xrced	Wed Nov 12 21:03:49 2003
+--- scripts.mine/xrced	Wed Apr 27 04:07:49 2005
+***************
+*** 1,4 ****
+--- 1,7 ----
+  #!/usr/bin/env python
+  
++ import wxversion
++ wxversion.select("2.6")
++ 
+  from wx.tools.XRCed.xrced import main
+  main()
diff --git a/dev-python/wxpython/files/wxpy-config.py b/dev-python/wxpython/files/wxpy-config.py
index 5dc424b8e8ac..1ea9fda72adb 100755
--- a/dev-python/wxpython/files/wxpy-config.py
+++ b/dev-python/wxpython/files/wxpy-config.py
@@ -13,17 +13,17 @@
 
  Examples:
 
-    wx-2.4.2-gtk2-ansi
-    wx-2.4.2-gtk2-unicode
-    wx-2.5.3-gtk
+    wx-2.4-gtk2-ansi
+    wx-2.4-gtk2-unicode
+    wx-2.6-gtk
 
  It is strongly suggested you use a 2.4* version as the system default
  because most stable wxPython applications are known to work with it.
- Applications that only work with 2.5* can use this code to
- select 2.5*
+ Applications that only work with 2.6* can use this code to
+ select 2.6*
 
      import wxversion
-     wxversion.select("2.5")
+     wxversion.select("2.6")
      import wx
 
  See this documentation for more info if you're a wxPython developer:
@@ -40,7 +40,7 @@ PYVER = sys.version[0:3]
 SITE_PKGS = "/usr/lib/python%s/site-packages" % PYVER
 
 ENCODINGS = ["gtk2-ansi", "gtk2-unicode", "gtk-ansi"]
-WX_VERSIONS = ["2.4.2", "2.5.3"]
+WX_VERSIONS = ["2.4", "2.6"]
 
 
 def versions_installed():