Remove unused patches.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

5 files changed, 7 insertions, 289 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 7485c000ec41..88ce7f7d3a83 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/wxpython
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.124 2009/08/30 17:09:43 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.125 2009/09/06 20:22:16 idl0r Exp $
+
+  06 Sep 2009; Christian Ruppert <idl0r@gentoo.org>
+  -files/wxpython-2.8.7-wxversion-scripts.patch,
+  -files/wxpython-2.8.8.1-musthaveapp.patch, -files/wxpy-config.py:
+  Remove unused patches.
 
   30 Aug 2009; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.8.10.1.ebuild:
   Revert usage of += operators. They're a bash-3.1 feature and PMS is stuck
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index e045420d24fe..2fd413354eb2 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,14 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX scripts-multiver-2.6.1.0.diff 3373 RMD160 377cfeba11d5c91106d8ab57c50ed7534d3004b6 SHA1 1191dc7b4dd560dfc0843c44d823c0971dabd70c SHA256 504cb13fe5e13d75274fc965be2d78618fae99693ff6b8c1cf0ff50852cf8084
-AUX wxpy-config.py 3265 RMD160 c090972f980b4380c113b1c6e7328dd2b5565194 SHA1 5947fa3cdd4bb8689ae822c0079b4b12652cf329 SHA256 1097d2b169f3c97f149032f5f647e1920d89288dc91981ad85b2d3ae28baf8ef
 AUX wxpython-2.8-cache-writable.patch 538 RMD160 1d627cfae8a819850d6f6807b6547b138e63e5a0 SHA1 e6c4e5732f2a3792bea50a9ff51d233569ca490e SHA256 caf371fdd36ae60b36754f6fa66df3887c3ee2e1dd509f8cc8bc92525942f429
 AUX wxpython-2.8-drop-editra.patch 2276 RMD160 dc3b1e9fbf57d5c5c4c97c6f6ccaf1bc00d5ebf9 SHA1 755549eea057f3f84ffdd19c3d7ea8f1ed7a3ca8 SHA256 b54b8ddf0f50e0d6c214d7e7d7105389a160a633ee2307b2f4a4c09b40a65f28
 AUX wxpython-2.8-wxversion-demo.patch 219 RMD160 5ec8b5179fe03493786965849494adb0f697eb23 SHA1 92ccb9e099def1ff9ff842b5bfbbd769c1d06c6e SHA256 19618386cf750f56051541c403153bf1c7e90764199e53818eb0c9557d026f1c
-AUX wxpython-2.8.7-wxversion-scripts.patch 5398 RMD160 adfc0a4e6f5c2d250a286797497f196c8d9245b5 SHA1 baef1948662b0e2456cca1132cdc34f51425bc03 SHA256 5bfac59e5f88a9dd40d0a98e02a10709093814a7961fd61f75b0a37d5d0ec14a
 AUX wxpython-2.8.8-wxversion-scripts.patch 5388 RMD160 8c51be3ac56ea90889eaff571ede147fc8ef536a SHA1 d1737d4b82dcb4c180c0698c619b1c9bf06fa58f SHA256 0f911b437f638004b05c9d53ba9ca6498b9d85c793da3ba40787365cad079175
-AUX wxpython-2.8.8.1-musthaveapp.patch 670 RMD160 5559f0157923a729c7375e3013a86bfb2a72a5e9 SHA1 752137c1ebf5ea79960825327c14a83d7b4fa1ed SHA256 833aeeb168b78e6c32f4ece8dae6b3749250aa83eaeec07065420a425a5df8af
 AUX wxpython-2.8.9-wxversion-scripts.patch 7730 RMD160 e93c7b883b1ad22011df069d8d6ad24938ea8b07 SHA1 cf05e834a6e4325f51881f62113922e3aa20f5c4 SHA256 55b1caa38295338dda3cc9ebfa4e43eb3be76959a0ee9b23a7b81085d80d7ba6
 DIST wxPython-demo-2.8.10.1.tar.bz2 3605257 RMD160 00aa54621e3b0a16c2f77bb8b7663a64328c5e75 SHA1 2dc2df3ae3180866715ee7a2e9c2eb5bd7231ab2 SHA256 b2f15413e117547344a4b80db8bf6d2750c333454fcea427b38c9b62793643a0
 DIST wxPython-demo-2.8.9.1.tar.bz2 2989325 RMD160 39637183f4579e721e8d7354cd318146de1919c5 SHA1 ae06559ddb30a9ccc94db424e71b76d4aef16753 SHA256 7d9a9d276de5b27fce97ff319a442c7d68f754156207a57b6e0aa89c3f6882a8
@@ -27,12 +21,5 @@ EBUILD wxpython-2.8.10.1.ebuild 5478 RMD160 98b1e3565a6acf6c47f40140dc4624e09d53
 EBUILD wxpython-2.8.9.1-r2.ebuild 3216 RMD160 81c085fb7b5db38d1ef8c2e2e43c83ddd1c22283 SHA1 bf719fe89f16927f854c13e2ac7336be5e881acb SHA256 42748d9f85f50d767875e0199cfbb553c4b1382293b07584ea695a3ac35752da
 EBUILD wxpython-2.8.9.1-r3.ebuild 4685 RMD160 9f51a2fd4fbee353486487abb432c0c8a1eed144 SHA1 75bf0a1345df4b8a1d15cbf5b0ae2d6e86e32544 SHA256 74eb85c5194df02157eaa2cf544adb5f4dee9f01a0097a31e61c889df3a15d71
 EBUILD wxpython-2.8.9.2.ebuild 4987 RMD160 b4d736425671002221c13a35e193fec8b2c225e5 SHA1 10fbb799fb24784522eee65acfef7f29aab420ac SHA256 719b20ad74d1751e357ecc36c0200ad9f8be3a4db1b01d5af13248ca5db30c1b
-MISC ChangeLog 23753 RMD160 380336187d402a151eaf634707fd08477ebe122a SHA1 9f805e1f9e974e0081fd167f0d8f28888a30d47a SHA256 ef5f1da3231cc7b0a3101f809ecac793cb59fa030383635025742865ae039b77
+MISC ChangeLog 23944 RMD160 97f89874a0fdaa1e6eb197e13b935cc6cfa49615 SHA1 d14fcda60508e2214773afe1e97a6b1dda7250fe SHA256 be060ab40575ad0ea4b11d6c3b00e2b0fd791fedb75ed38ce864113ca4d48d3b
 MISC metadata.xml 366 RMD160 3241adb1423f2ce702bc75172a071d7c24c335e3 SHA1 363953bc2e7c364bdc92278ce391df6820c8b063 SHA256 d90a8fa164deff1b8cfa28cf401483424addfceeca8cd35539b7f2bbb3280cff
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqasokACgkQiqiDRvmkBmJM3gCg6bKRvPTUYxPiEho62TipiQAn
-zxYAniAKfMRPR9GYuQWDCFHib4WwLgzA
-=w9w6
------END PGP SIGNATURE-----
diff --git a/dev-python/wxpython/files/wxpy-config.py b/dev-python/wxpython/files/wxpy-config.py
deleted file mode 100755
index 1ea9fda72adb..000000000000
--- a/dev-python/wxpython/files/wxpy-config.py
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/usr/bin/python
-
-# Author: Rob Cakebread - pythonhead \@ gentoo.org
-# Distributed under the terms of the GNU General Public License v2
-
-
-"""
- This utility lists versions of wxPython you have installed.
- It also lets you set the default wxPython version apps will use.
- The naming convention used is:
-
-     wx-{WX_GTK_VER}-{ENCODING}
-
- Examples:
-
-    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.6* can use this code to
- select 2.6*
-
-     import wxversion
-     wxversion.select("2.6")
-     import wx
-
- See this documentation for more info if you're a wxPython developer:
- http://wiki.wxpython.org/index.cgi/MultiVersionInstalls
-
-""" 
-
-import os
-import sys
-import optparse
-
-
-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.6"]
-
-
-def versions_installed():
-    """Return list of installed wxPython versions"""
-
-    installed = []
-    for v in WX_VERSIONS:
-        i = 0
-        for e in ENCODINGS:
-            ver = "wx-%s-%s" % (v, ENCODINGS[i])
-            if version_exists(ver):
-                installed.append(ver)
-            i += 1
-    return installed
-
-def get_default():
-    """Return version of system default wxPython"""
-    wxpath = "%s/wx.pth" % SITE_PKGS
-    if not os.path.exists(wxpath):
-        return None
-    try:
-        return open(wxpath, "r").read().strip()    
-    except:
-        return None
-
-
-def print_installed():
-    """Print list of wxPython versions installed"""
-    default = get_default()
-    all = versions_installed()
-    print "\nYou have these versions of wxPython installed:\n"
-    for v in all:
-        if v == default:
-            print v, "(System default)"
-        else:
-            print v
-
-def version_exists(version):
-    """Returns True if version of wxPython is installed"""
-    if os.path.exists(os.path.join(SITE_PKGS, version)):
-        return True
-
-def set_default(version):
-    """Sets default wxPython version"""
-
-    if os.getuid() != 0:
-        print "!!! ERROR - You must be root to change the default wxPython version."
-        sys.exit(1)
-
-    if version_exists(version):
-        try:
-            open(os.path.join(SITE_PKGS, "wx.pth"), "w").write(version)
-        except:
-            print "!!! ERROR - Failed to set %s as default wxPython version" % version
-            sys.exit(1)
-    else:
-            print "!!! ERROR - Version %s is not installed." % version
-            sys.exit(1)
-
-
-if __name__ == "__main__":
-
-    optParser = optparse.OptionParser()
-
-    optParser.add_option( "-s", action="store", dest="version", type="string",
-                            help="Set default wxPython version")
-
-    optParser.add_option( "-l", action="store_true", dest="list",
-                            help="List all wxPython versions installed.")
-
-    (options, remainingArgs) = optParser.parse_args()
-
-    if len(sys.argv) == 1:
-        optParser.print_help()
-        sys.exit(1)
-
-    if options.list:
-        print_installed()
-        sys.exit()
-
-    if options.version:
-        set_default(options.version)
diff --git a/dev-python/wxpython/files/wxpython-2.8.7-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-2.8.7-wxversion-scripts.patch
deleted file mode 100644
index dc6c97c1a0ae..000000000000
--- a/dev-python/wxpython/files/wxpython-2.8.7-wxversion-scripts.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -Naur wxPython-src-2.8.7.1-orig/wxPython/scripts/editra wxPython-src-2.8.7.1/wxPython/scripts/editra
---- wxPython-src-2.8.7.1-orig/wxPython/scripts/editra	2007-11-12 21:55:32.000000000 -0600
-+++ wxPython-src-2.8.7.1/wxPython/scripts/editra	2007-12-03 16:16:15.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
- 
- import sys, os
- import wx.tools
-diff -Naur wxPython-src-2.8.7.1-orig/wxPython/scripts/genaxmodule wxPython-src-2.8.7.1/wxPython/scripts/genaxmodule
---- wxPython-src-2.8.7.1-orig/wxPython/scripts/genaxmodule	2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.7.1/wxPython/scripts/genaxmodule	2007-12-03 16:16:26.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
- 
- import sys
- from wx.tools.genaxmodule import main
-diff -Naur wxPython-src-2.8.7.1-orig/wxPython/scripts/helpviewer wxPython-src-2.8.7.1/wxPython/scripts/helpviewer
---- wxPython-src-2.8.7.1-orig/wxPython/scripts/helpviewer	2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.7.1/wxPython/scripts/helpviewer	2007-12-03 16:16:35.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
- 
- from wx.tools.helpviewer import main
- main()
-diff -Naur wxPython-src-2.8.7.1-orig/wxPython/scripts/img2png wxPython-src-2.8.7.1/wxPython/scripts/img2png
---- wxPython-src-2.8.7.1-orig/wxPython/scripts/img2png	2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.7.1/wxPython/scripts/img2png	2007-12-03 16:16:42.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
- 
- from wx.tools.img2png import main
- main()
-diff -Naur wxPython-src-2.8.7.1-orig/wxPython/scripts/img2py wxPython-src-2.8.7.1/wxPython/scripts/img2py
---- wxPython-src-2.8.7.1-orig/wxPython/scripts/img2py	2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.7.1/wxPython/scripts/img2py	2007-12-03 16:16:52.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
- 
- import sys
- from wx.tools.img2py import main
-diff -Naur wxPython-src-2.8.7.1-orig/wxPython/scripts/img2xpm wxPython-src-2.8.7.1/wxPython/scripts/img2xpm
---- wxPython-src-2.8.7.1-orig/wxPython/scripts/img2xpm	2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.7.1/wxPython/scripts/img2xpm	2007-12-03 16:16:59.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
- 
- from wx.tools.img2xpm import main
- main()
-diff -Naur wxPython-src-2.8.7.1-orig/wxPython/scripts/pyalacarte wxPython-src-2.8.7.1/wxPython/scripts/pyalacarte
---- wxPython-src-2.8.7.1-orig/wxPython/scripts/pyalacarte	2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.7.1/wxPython/scripts/pyalacarte	2007-12-03 16:17:07.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
- 
- from wx.py.PyAlaCarte import main
- main()
-diff -Naur wxPython-src-2.8.7.1-orig/wxPython/scripts/pyalamode wxPython-src-2.8.7.1/wxPython/scripts/pyalamode
---- wxPython-src-2.8.7.1-orig/wxPython/scripts/pyalamode	2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.7.1/wxPython/scripts/pyalamode	2007-12-03 16:17:16.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
- 
- from wx.py.PyAlaMode import main
- main()
-diff -Naur wxPython-src-2.8.7.1-orig/wxPython/scripts/pycrust wxPython-src-2.8.7.1/wxPython/scripts/pycrust
---- wxPython-src-2.8.7.1-orig/wxPython/scripts/pycrust	2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.7.1/wxPython/scripts/pycrust	2007-12-03 16:17:28.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
- 
- from wx.py.PyCrust import main
- main()
-diff -Naur wxPython-src-2.8.7.1-orig/wxPython/scripts/pyshell wxPython-src-2.8.7.1/wxPython/scripts/pyshell
---- wxPython-src-2.8.7.1-orig/wxPython/scripts/pyshell	2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.7.1/wxPython/scripts/pyshell	2007-12-03 16:17:46.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
- 
- from wx.py.PyShell import main
- main()
-diff -Naur wxPython-src-2.8.7.1-orig/wxPython/scripts/pywrap wxPython-src-2.8.7.1/wxPython/scripts/pywrap
---- wxPython-src-2.8.7.1-orig/wxPython/scripts/pywrap	2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.7.1/wxPython/scripts/pywrap	2007-12-03 16:17:56.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
- 
- from wx.py.PyWrap import main
- main()
-diff -Naur wxPython-src-2.8.7.1-orig/wxPython/scripts/pywxrc wxPython-src-2.8.7.1/wxPython/scripts/pywxrc
---- wxPython-src-2.8.7.1-orig/wxPython/scripts/pywxrc	2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.7.1/wxPython/scripts/pywxrc	2007-12-03 16:18:02.000000000 -0600
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("2.8")
- import sys
- from wx.tools.pywxrc import main
- main(sys.argv[1:])
-diff -Naur wxPython-src-2.8.7.1-orig/wxPython/scripts/xrced wxPython-src-2.8.7.1/wxPython/scripts/xrced
---- wxPython-src-2.8.7.1-orig/wxPython/scripts/xrced	2007-07-18 16:33:55.000000000 -0600
-+++ wxPython-src-2.8.7.1/wxPython/scripts/xrced	2007-12-03 16:19:51.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.8.8.1-musthaveapp.patch b/dev-python/wxpython/files/wxpython-2.8.8.1-musthaveapp.patch
deleted file mode 100644
index d3ae2e90d48b..000000000000
--- a/dev-python/wxpython/files/wxpython-2.8.8.1-musthaveapp.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naurp wxPython-src-2.8.8.1-orig/wxPython/src/_config.i wxPython-src-2.8.8.1/wxPython/src/_config.i
---- wxPython-src-2.8.8.1-orig/wxPython/src/_config.i	2008-07-24 16:02:07.000000000 -0600
-+++ wxPython-src-2.8.8.1/wxPython/src/_config.i	2008-07-24 16:02:53.000000000 -0600
-@@ -391,7 +391,6 @@ time)", "");
- 
- //---------------------------------------------------------------------------
- 
--MustHaveApp(wxConfig);
- 
- DocStr(wxConfig,
- "This ConfigBase-derived class will use the registry on Windows,
-@@ -413,7 +412,6 @@ public:
- 
- 
- 
--MustHaveApp(wxFileConfig);
- 
- DocStr(wxFileConfig,
-        "This config class will use a file for storage on all platforms.", "");