python-traits: new recipe; explicitly typed attributes for Python

Signed-off-by: Andrew Straw <strawman@astraw.com>

4 files changed, 48 insertions, 4 deletions

diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc
index 615a8976bd..5ca6f83859 100644
--- a/packages/python/python-2.5-manifest.inc
+++ b/packages/python/python-2.5-manifest.inc
@@ -1,5 +1,5 @@
 # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file.
-# Generator: 'generate-manifest-2.5.py' Version 20081102 (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
+# Generator: './generate-manifest-2.5.py' Version 20081209 (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
 # Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
 
  
@@ -171,7 +171,7 @@ FILES_python-fcntl="${libdir}/python2.5/lib-dynload/fcntl.so "
 DESCRIPTION_python-netclient="Python Internet Protocol Clients"
 PR_python-netclient="ml0"
 RDEPENDS_python-netclient="python-core python-crypt python-datetime python-io python-lang python-logging python-mime"
-FILES_python-netclient="${libdir}/python2.5/*Cookie*.* ${libdir}/python2.5/base64.* ${libdir}/python2.5/cookielib.* ${libdir}/python2.5/ftplib.* ${libdir}/python2.5/gopherlib.* ${libdir}/python2.5/hmac.* ${libdir}/python2.5/httplib.* ${libdir}/python2.5/mimetypes.* ${libdir}/python2.5/nntplib.* ${libdir}/python2.5/poplib.* ${libdir}/python2.5/smtplib.* ${libdir}/python2.5/telnetlib.* ${libdir}/python2.5/urllib.* ${libdir}/python2.5/urllib2.* ${libdir}/python2.5/urlparse.* "
+FILES_python-netclient="${libdir}/python2.5/*Cookie*.* ${libdir}/python2.5/base64.* ${libdir}/python2.5/cookielib.* ${libdir}/python2.5/ftplib.* ${libdir}/python2.5/gopherlib.* ${libdir}/python2.5/hmac.* ${libdir}/python2.5/httplib.* ${libdir}/python2.5/mimetypes.* ${libdir}/python2.5/nntplib.* ${libdir}/python2.5/poplib.* ${libdir}/python2.5/smtplib.* ${libdir}/python2.5/telnetlib.* ${libdir}/python2.5/urllib.* ${libdir}/python2.5/urllib2.* ${libdir}/python2.5/urlparse.* ${libdir}/python2.5/uuid.* "
 
 DESCRIPTION_python-pprint="Python Pretty-Print Support"
 PR_python-pprint="ml0"
@@ -234,7 +234,7 @@ RDEPENDS_python-mime="python-core python-io"
 FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* "
 
 DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support"
-PR_python-sqlite3="ml2"
+PR_python-sqlite3="ml0"
 RDEPENDS_python-sqlite3="python-core python-datetime python-lang python-crypt python-io python-threading python-zlib"
 FILES_python-sqlite3="${libdir}/python2.5/lib-dynload/_sqlite3.so ${libdir}/python2.5/sqlite3/dbapi2.* ${libdir}/python2.5/sqlite3/__init__.* "
 
diff --git a/packages/python/python-traits/fix-import-pyface.diff b/packages/python/python-traits/fix-import-pyface.diff
new file mode 100644
index 0000000000..969a18ef30
--- /dev/null
+++ b/packages/python/python-traits/fix-import-pyface.diff
@@ -0,0 +1,26 @@
+diff -r -u Traits-3.0.2.orig/enthought/traits/ui/ui_traits.py Traits-3.0.2/enthought/traits/ui/ui_traits.py
+--- Traits-3.0.2.orig/enthought/traits/ui/ui_traits.py	2008-09-15 13:15:58.000000000 -0700
++++ Traits-3.0.2/enthought/traits/ui/ui_traits.py	2008-11-27 14:55:05.000000000 -0800
+@@ -147,8 +147,6 @@
+     """
+     global image_resource_cache
+     
+-    from enthought.pyface.image_resource import ImageResource
+-    
+     if not isinstance( value, basestring ):
+         return value
+         
+@@ -168,7 +166,12 @@
+             except:
+                 result = None
+         else:
+-            result = ImageResource( value, search_path = [ search_path ] )
++            try:
++                from enthought.pyface.image_resource import ImageResource
++            except ImportError:
++                result = None
++            else:
++                result = ImageResource( value, search_path = [ search_path ] )
+             
+         image_resource_cache[ key ] = result
+             
diff --git a/packages/python/python-traits_3.0.2.bb b/packages/python/python-traits_3.0.2.bb
new file mode 100644
index 0000000000..901ecc115a
--- /dev/null
+++ b/packages/python/python-traits_3.0.2.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Explicitly typed attributes for Python"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "BSD"
+PR = "as0"
+
+SRC_URI = "http://pypi.python.org/packages/source/T/Traits/Traits-3.0.2.tar.gz \
+           file://fix-import-pyface.diff;patch=1 \
+          "
+
+S = "${WORKDIR}/Traits-${PV}"
+
+RDEPENDS = "python-netclient"
+
+inherit setuptools
+
+FILES_${PN}-dbg += "/usr/lib/python2.5/site-packages/enthought/traits/.debug"
+FILES_${PN}-dbg += "/usr/lib/python2.5/site-packages/enthought/traits/protocols/.debug"
diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb
index a943f6a1ac..a405c49bb0 100644
--- a/packages/python/python_2.5.2.bb
+++ b/packages/python/python_2.5.2.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib"
 DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
 # bump this on every change in contrib/python/generate-manifest-2.5.py
-PR = "ml17"
+PR = "ml18"
 
 PYTHON_MAJMIN = "2.5"