From 32efe609e50b4a4a82adb0544c5a192610de101e Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Tue, 1 May 2007 12:23:31 +0000 Subject: Remove old version and stale patches (Portage version: 2.1.2.5) --- dev-python/wxpython/ChangeLog | 7 +- dev-python/wxpython/files/digest-wxpython-2.6.1.0 | 3 - .../wxpython/files/scripts-multiver-2.6.0.0.diff | 147 ------- dev-python/wxpython/files/wxversion.py | 430 --------------------- dev-python/wxpython/wxpython-2.6.1.0.ebuild | 138 ------- 5 files changed, 6 insertions(+), 719 deletions(-) delete mode 100644 dev-python/wxpython/files/digest-wxpython-2.6.1.0 delete mode 100644 dev-python/wxpython/files/scripts-multiver-2.6.0.0.diff delete mode 100644 dev-python/wxpython/files/wxversion.py delete mode 100644 dev-python/wxpython/wxpython-2.6.1.0.ebuild (limited to 'dev-python') diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog index 5c336e453f16..622d32cbdc38 100644 --- a/dev-python/wxpython/ChangeLog +++ b/dev-python/wxpython/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/wxpython # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.56 2007/05/01 09:45:22 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.57 2007/05/01 12:23:31 leio Exp $ + + 01 May 2007; Mart Raudsepp + -files/scripts-multiver-2.6.0.0.diff, -files/wxversion.py, + -wxpython-2.6.1.0.ebuild: + Remove old version and stale patches 01 May 2007; Torsten Veller Manifest: Recreated old Manifest. Fix #176649. diff --git a/dev-python/wxpython/files/digest-wxpython-2.6.1.0 b/dev-python/wxpython/files/digest-wxpython-2.6.1.0 deleted file mode 100644 index e35c38ce2443..000000000000 --- a/dev-python/wxpython/files/digest-wxpython-2.6.1.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 3408f80ef091cfb8a46be4ed70fb0475 wxPython-src-2.6.1.0.tar.gz 18452406 -RMD160 211b6bad3b9062180e67cf13e40c810b1e3fff9b wxPython-src-2.6.1.0.tar.gz 18452406 -SHA256 cd4f03fcd1a9e8c27881414e83ceb66ce07ca9fe0d42292830a9f9894e4c4335 wxPython-src-2.6.1.0.tar.gz 18452406 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 deleted file mode 100644 index 24586a60eafa..000000000000 --- a/dev-python/wxpython/files/scripts-multiver-2.6.0.0.diff +++ /dev/null @@ -1,147 +0,0 @@ -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/wxversion.py b/dev-python/wxpython/files/wxversion.py deleted file mode 100644 index bd0202e4030f..000000000000 --- a/dev-python/wxpython/files/wxversion.py +++ /dev/null @@ -1,430 +0,0 @@ -#---------------------------------------------------------------------- -# Name: wxversion -# Purpose: Allows a wxPython program to search for alternate -# installations of the wxPython packages and modify sys.path -# so they will be found when "import wx" is done. -# -# Author: Robin Dunn -# -# Created: 24-Sept-2004 -# RCS-ID: $Id: wxversion.py,v 1.1 2004/11/13 04:08:20 pythonhead Exp $ -# Copyright: (c) 2004 by Total Control Software -# Licence: wxWindows license -#---------------------------------------------------------------------- - -""" -If you have more than one version of wxPython installed this module -allows your application to choose which version of wxPython will be -imported when it does 'import wx'. You use it like this:: - - import wxversion - wxversion.select('2.4') - import wx - -Or additional build options can also be selected, like this:: - - import wxversion - wxversion.select('2.5.3-unicode') - import wx - -Of course the default wxPython version can also be controlled by -setting PYTHONPATH or by editing the wx.pth path configuration file, -but using wxversion will allow an application to manage the version -selection itself rather than depend on the user to setup the -environment correctly. - -It works by searching the sys.path for directories matching wx-* and -then comparing them to what was passed to the select function. If a -match is found then that path is inserted into sys.path. - -NOTE: If you are making a 'bundle' of your application with a tool -like py2exe then you should *not* use the wxversion module since it -looks at the filesystem for the directories on sys.path, it will fail -in a bundled environment. Instead you should simply ensure that the -version of wxPython that you want is found by default on the sys.path -when making the bundled version by setting PYTHONPATH. Then that -version will be included in your bundle and your app will work as -expected. Py2exe and the others usually have a way to tell at runtime -if they are running from a bundle or running raw, so you can check -that and only use wxversion if needed. For example, for py2exe:: - - if not hasattr(sys, 'frozen'): - import wxversion - wxversion.select('2.5') - import wx - -More documentation on wxversion and multi-version installs can be -found at: http://wiki.wxpython.org/index.cgi/MultiVersionInstalls - -""" - -import sys, os, glob, fnmatch - - -_selected = None -class VersionError(Exception): - pass - -#---------------------------------------------------------------------- - -def select(versions): - """ - Search for a wxPython installation that matches version. If one - is found then sys.path is modified so that version will be - imported with a 'import wx', otherwise a VersionError exception is - raised. This funciton should only be caled once at the begining - of the application before wxPython is imported. - - :param version: Specifies the version to look for, it can - either be a string or a list of strings. Each - string is compared to the installed wxPythons - and the best match is inserted into the - sys.path, allowing an 'import wx' to find that - version. - - The version string is composed of the dotted - version number (at least 2 of the 4 components) - optionally followed by hyphen ('-') separated - options (wx port, unicode/ansi, flavour, etc.) A - match is determined by how much of the installed - version matches what is given in the version - parameter. If the version number components don't - match then the score is zero, otherwise the score - is increased for every specified optional component - that is specified and that matches. - """ - if type(versions) == str: - versions = [versions] - - global _selected - if _selected is not None: - # A version was previously selected, ensure that it matches - # this new request - for ver in versions: - if _selected.Score(_wxPackageInfo(ver)) > 0: - return - # otherwise, raise an exception - raise VersionError("A previously selected wx version does not match the new request.") - - # If we get here then this is the first time wxversion is used, - # ensure that wxPython hasn't been imported yet. - if sys.modules.has_key('wx') or sys.modules.has_key('wxPython'): - raise VersionError("wxversion.select() must be called before wxPython is imported") - - # Look for a matching version and manipulate the sys.path as - # needed to allow it to be imported. - installed = _find_installed(True) - bestMatch = _get_best_match(installed, versions) - - if bestMatch is None: - raise VersionError("Requested version of wxPython not found") - - sys.path.insert(0, bestMatch.pathname) - _selected = bestMatch - -#---------------------------------------------------------------------- - -UPDATE_URL = "http://wxPython.org/" -#UPDATE_URL = "http://sourceforge.net/project/showfiles.php?group_id=10718" - - -def ensureMinimal(minVersion): - """ - Checks to see if the default version of wxPython is greater-than - or equal to `minVersion`. If not then it will try to find an - installed version that is >= minVersion. If none are available - then a message is displayed that will inform the user and will - offer to open their web browser to the wxPython downloads page, - and will then exit the application. - """ - assert type(minVersion) == str - - # ensure that wxPython hasn't been imported yet. - if sys.modules.has_key('wx') or sys.modules.has_key('wxPython'): - raise VersionError("wxversion.ensureMinimal() must be called before wxPython is imported") - - bestMatch = None - minv = _wxPackageInfo(minVersion) - defaultPath = _find_default() - if defaultPath: - defv = _wxPackageInfo(defaultPath, True) - if defv >= minv: - bestMatch = defv - - if bestMatch is None: - installed = _find_installed() - if installed: - # The list is in reverse sorted order, so if the first one is - # big enough then choose it - if installed[0] >= minv: - bestMatch = installed[0] - - if bestMatch is None: - import wx, webbrowser - versions = "\n".join([" "+ver for ver in getInstalled()]) - app = wx.PySimpleApp() - result = wx.MessageBox("This application requires a version of wxPython " - "greater than or equal to %s, but a matching version " - "was not found.\n\n" - "You currently have these version(s) installed:\n%s\n\n" - "Would you like to download a new version of wxPython?\n" - % (minVersion, versions), - "wxPython Upgrade Needed", style=wx.YES_NO) - if result == wx.YES: - webbrowser.open(UPDATE_URL) - app.MainLoop() - sys.exit() - - sys.path.insert(0, bestMatch.pathname) - _selected = bestMatch - - -#---------------------------------------------------------------------- - -def checkInstalled(versions): - """ - Check if there is a version of wxPython installed that matches one - of the versions given. Returns True if so, False if not. This - can be used to determine if calling `select` will succeed or not. - - :param version: Same as in `select`, either a string or a list - of strings specifying the version(s) to check - for. - """ - - if type(versions) == str: - versions = [versions] - installed = _find_installed() - bestMatch = _get_best_match(installed, versions) - return bestMatch is not None - -#---------------------------------------------------------------------- - -def getInstalled(): - """ - Returns a list of strings representing the installed wxPython - versions that are found on the system. - """ - installed = _find_installed() - return [os.path.basename(p.pathname)[3:] for p in installed] - - - -#---------------------------------------------------------------------- -# private helpers... - -def _get_best_match(installed, versions): - bestMatch = None - bestScore = 0 - for pkg in installed: - for ver in versions: - score = pkg.Score(_wxPackageInfo(ver)) - if score > bestScore: - bestMatch = pkg - bestScore = score - return bestMatch - - -_pattern = "wx-[0-9].*" -def _find_installed(removeExisting=False): - installed = [] - toRemove = [] - for pth in sys.path: - - # empty means to look in the current dir - if not pth: - pth = '.' - - # skip it if it's not a package dir - if not os.path.isdir(pth): - continue - - base = os.path.basename(pth) - - # if it's a wx path that's already in the sys.path then mark - # it for removal and then skip it - if fnmatch.fnmatchcase(base, _pattern): - toRemove.append(pth) - continue - - # now look in the dir for matching subdirs - for name in glob.glob(os.path.join(pth, _pattern)): - # make sure it's a directory - if not os.path.isdir(name): - continue - # and has a wx subdir - if not os.path.exists(os.path.join(name, 'wx')): - continue - installed.append(_wxPackageInfo(name, True)) - - if removeExisting: - for rem in toRemove: - del sys.path[sys.path.index(rem)] - - installed.sort() - installed.reverse() - return installed - - -# Scan the sys.path looking for either a directory matching _pattern, -# or a wx.pth file -def _find_default(): - for pth in sys.path: - # empty means to look in the current dir - if not pth: - pth = '.' - - # skip it if it's not a package dir - if not os.path.isdir(pth): - continue - - # does it match the pattern? - base = os.path.basename(pth) - if fnmatch.fnmatchcase(base, _pattern): - return pth - - for pth in sys.path: - if not pth: - pth = '.' - if not os.path.isdir(pth): - continue - if os.path.exists(os.path.join(pth, 'wx.pth')): - base = open(os.path.join(pth, 'wx.pth')).read() - return os.path.join(pth, base) - - return None - - -class _wxPackageInfo(object): - def __init__(self, pathname, stripFirst=False): - self.pathname = pathname - base = os.path.basename(pathname) - segments = base.split('-') - if stripFirst: - segments = segments[1:] - self.version = tuple([int(x) for x in segments[0].split('.')]) - self.options = segments[1:] - - - def Score(self, other): - score = 0 - - # whatever number of version components given in other must - # match exactly - minlen = min(len(self.version), len(other.version)) - if self.version[:minlen] != other.version[:minlen]: - return 0 - score += 1 - - for opt in other.options: - if opt in self.options: - score += 1 - return score - - - - def __lt__(self, other): - return self.version < other.version or \ - (self.version == other.version and self.options < other.options) - def __le__(self, other): - return self.version <= other.version or \ - (self.version == other.version and self.options <= other.options) - - def __gt__(self, other): - return self.version > other.version or \ - (self.version == other.version and self.options > other.options) - def __ge__(self, other): - return self.version >= other.version or \ - (self.version == other.version and self.options >= other.options) - - def __eq__(self, other): - return self.version == other.version and self.options == other.options - - - -#---------------------------------------------------------------------- - -if __name__ == '__main__': - import pprint - - #ensureMinimal('2.5') - #pprint.pprint(sys.path) - #sys.exit() - - - def test(version): - # setup - savepath = sys.path[:] - - #test - select(version) - print "Asked for %s:\t got: %s" % (version, sys.path[0]) - pprint.pprint(sys.path) - print - - # reset - sys.path = savepath[:] - global _selected - _selected = None - - - # make some test dirs - names = ['wx-2.4', - 'wx-2.5.2', - 'wx-2.5.2.9-gtk2-unicode', - 'wx-2.5.2.9-gtk-ansi', - 'wx-2.5.1', - 'wx-2.5.2.8-gtk2-unicode', - 'wx-2.5.3'] - for name in names: - d = os.path.join('/tmp', name) - os.mkdir(d) - os.mkdir(os.path.join(d, 'wx')) - - # setup sys.path to see those dirs - sys.path.append('/tmp') - - - # now run some tests - pprint.pprint( getInstalled()) - print checkInstalled("2.4") - print checkInstalled("2.5-unicode") - print checkInstalled("2.99-bogus") - print "Current sys.path:" - pprint.pprint(sys.path) - print - - test("2.4") - test("2.5") - test("2.5-gtk2") - test("2.5.2") - test("2.5-ansi") - test("2.5-unicode") - - # There isn't a unicode match for this one, but it will give the best - # available 2.4. Should it give an error instead? I don't think so... - test("2.4-unicode") - - # Try asking for multiple versions - test(["2.6", "2.5.3", "2.5.2-gtk2"]) - - try: - # expecting an error on this one - test("2.6") - except VersionError, e: - print "Asked for 2.6:\t got Exception:", e - - # check for exception when incompatible versions are requested - try: - select("2.4") - select("2.5") - except VersionError, e: - print "Asked for incompatible versions, got Exception:", e - - # cleanup - for name in names: - d = os.path.join('/tmp', name) - os.rmdir(os.path.join(d, 'wx')) - os.rmdir(d) - - diff --git a/dev-python/wxpython/wxpython-2.6.1.0.ebuild b/dev-python/wxpython/wxpython-2.6.1.0.ebuild deleted file mode 100644 index 897fb139bf1f..000000000000 --- a/dev-python/wxpython/wxpython-2.6.1.0.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.1.0.ebuild,v 1.11 2007/01/05 22:12:48 dirtyepic Exp $ - -inherit python wxwidgets eutils multilib - -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.gz" - -LICENSE="wxWinLL-3" -SLOT="2.6" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" -IUSE="gtk gtk2 unicode opengl" - -RDEPEND=">=dev-lang/python-2.1 - =x11-libs/wxGTK-2.6* - !=x11-libs/gtk+-2.0 - >=x11-libs/pango-1.2 - >=dev-libs/glib-2.0 ) - unicode? ( >=x11-libs/gtk+-2.0 - >=x11-libs/pango-1.2 - >=dev-libs/glib-2.0 ) - !gtk2? ( =x11-libs/gtk+-1.2* - =dev-libs/glib-1.2* ) - media-libs/libpng - media-libs/jpeg - media-libs/tiff - >=sys-libs/zlib-1.1.4 - opengl? ( >=dev-python/pyopengl-2.0.0.44 ) - ! ${D}/${site_pkgs}/wx.pth || \ - die "Couldn't create wx.pth" - - fi - - cp ${FILESDIR}/wxpy-config.py ${D}/${site_pkgs}/ - - #Add ${PV} suffix to all /usr/bin/* programs to avoid clobbering SLOT'd - for filename in ${D}/usr/bin/* ; do - mv ${filename} ${filename}-2.6 - done -} - -pkg_postinst() { - - elog "Gentoo now uses the Multi-version method for SLOT'ing" - elog "Developers see this site for instructions on using 2.4 or 2.6" - elog "with your apps:" - elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" -} -- cgit v1.2.3-65-gdbad