From: Michael Mrozek <EvilDragon@openpandora.org>
Date: Sat, 14 Dec 2013 11:32:03 +0000 (+0100)
Subject: python: Even more updates for 2.7.2
X-Git-Tag: sz_160~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=136524d4f951cca55e55230459376d82f1e2220e;p=openembedded.git

python: Even more updates for 2.7.2
---

diff --git a/recipes/python/divmod.inc b/recipes/python/divmod.inc
index 20be1b2e38..37b99c1967 100644
--- a/recipes/python/divmod.inc
+++ b/recipes/python/divmod.inc
@@ -1,5 +1,7 @@
 SRC_URI = "http://divmod.org/trac/attachment/wiki/SoftwareReleases/${REALPN}-${PV}.tar.gz?format=raw"
 
+INC_PR = "r0"
+
 DEPENDS += "python-twisted-native"
 
 do_unpack2() {
diff --git a/recipes/python/pydes_1.3.1.bb b/recipes/python/pydes_1.3.1.bb
index b266538b42..f2c6fbb3bb 100644
--- a/recipes/python/pydes_1.3.1.bb
+++ b/recipes/python/pydes_1.3.1.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "Python DES implementation"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL"
-RDEPENDS = "python"
+RDEPENDS_${PN} = "python"
 
-PR = "r1"
+PR = "r2"
 ARCH_pydes = "all"
 
 SRC_URI = "http://twhiteman.netfirms.com/pyDES/pyDes-1.3.1.tar.gz"
@@ -15,3 +15,6 @@ S = ${WORKDIR}/pyDes-1.3.1
 
 
 
+
+SRC_URI[md5sum] = "e499fdde54e98be87324c0322311e034"
+SRC_URI[sha256sum] = "4f1aae18f2aabb3559b8878d95a7228ebe6633fc4a88905935354ccdf2accc32"
diff --git a/recipes/python/pyring_1.1.10.bb b/recipes/python/pyring_1.1.10.bb
index 211801debf..2bdc111b4e 100644
--- a/recipes/python/pyring_1.1.10.bb
+++ b/recipes/python/pyring_1.1.10.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "Python keyring"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL"
-RDEPENDS = "python python-pygtk python-xml python-netclient python-numeric pydes"
+RDEPENDS_${PN} = "python python-pygtk python-xml python-netclient python-numeric pydes"
+PR = "r1"
 
 ARCH_pyring = "all"
 
@@ -19,3 +20,6 @@ do_configure_prepend() {
 
 FILES_${PN} += "${datadir}"
 
+
+SRC_URI[md5sum] = "d6d2a16ccd1562b2ae63314f30a4ebf9"
+SRC_URI[sha256sum] = "45b73399b8affd1a81ecd370d37e066c046c49e1777b43d0affe6b520082a604"
diff --git a/recipes/python/pyrtm_0.2.bb b/recipes/python/pyrtm_0.2.bb
index a5a6fb2e2f..1d7342f065 100644
--- a/recipes/python/pyrtm_0.2.bb
+++ b/recipes/python/pyrtm_0.2.bb
@@ -13,3 +13,6 @@ SRCNAME = "pyrtm"
 inherit distutils
 
 PACKAGE_ARCH = "all"
+
+SRC_URI[md5sum] = "34423f39caf7df8a9db8e243be9cf1a0"
+SRC_URI[sha256sum] = "d9d46d096a38cb692b55f4ee9f364d54348298e9497b11c1ef057539b5de1567"
diff --git a/recipes/python/python-2.6-manifest.inc b/recipes/python/python-2.6-manifest.inc
index cee12c866c..febaaa22bf 100644
--- a/recipes/python/python-2.6-manifest.inc
+++ b/recipes/python/python-2.6-manifest.inc
@@ -1,268 +1,272 @@
 
 # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file.
-# Generator: '../../contrib/python/generate-manifest-2.6.py' Version 20091004 (C) 2002-2009 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
+# Generator: 'contrib/python/generate-manifest-2.6.py' Version 20110222 (C) 2002-2010 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
 # Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
 
  
 
-PROVIDES+="python-profile python-threading python-distutils python-doctest python-stringold python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-json python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-multiprocessing python-robotparser python-compile python-debugger python-pkgutil python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
+PROVIDES+="${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-core-dbg ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib "
 
-PACKAGES="python-core-dbg python-profile python-threading python-distutils python-doctest python-stringold python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-resource python-json python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-multiprocessing python-robotparser python-compile python-debugger python-pkgutil python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-modules"
+PACKAGES="${PN}-core-dbg ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib ${PN}-modules"
 
-DESCRIPTION_python-profile="Python Basic Profiling Support"
-RDEPENDS_python-profile="python-core python-textutils"
-FILES_python-profile="${libdir}/python2.6/profile.* ${libdir}/python2.6/pstats.* ${libdir}/python2.6/cProfile.* ${libdir}/python2.6/lib-dynload/_lsprof.so "
+DESCRIPTION_${PN}-audio="Python Audio Handling"
+RDEPENDS_${PN}-audio="${PN}-core"
+FILES_${PN}-audio="${libdir}/python2.6/wave.* ${libdir}/python2.6/chunk.* ${libdir}/python2.6/sndhdr.* ${libdir}/python2.6/lib-dynload/ossaudiodev.so ${libdir}/python2.6/lib-dynload/audioop.so "
 
-DESCRIPTION_python-threading="Python Threading & Synchronization Support"
-RDEPENDS_python-threading="python-core python-lang"
-FILES_python-threading="${libdir}/python2.6/_threading_local.* ${libdir}/python2.6/dummy_thread.* ${libdir}/python2.6/dummy_threading.* ${libdir}/python2.6/mutex.* ${libdir}/python2.6/threading.* ${libdir}/python2.6/Queue.* "
+DESCRIPTION_${PN}-bsddb="Python Berkeley Database Bindings"
+RDEPENDS_${PN}-bsddb="${PN}-core"
+FILES_${PN}-bsddb="${libdir}/python2.6/bsddb ${libdir}/python2.6/lib-dynload/_bsddb.so "
 
-DESCRIPTION_python-distutils="Python Distribution Utilities"
-RDEPENDS_python-distutils="python-core"
-FILES_python-distutils="${libdir}/python2.6/config ${libdir}/python2.6/distutils "
+DESCRIPTION_${PN}-codecs="Python Codecs, Encodings & i18n Support"
+RDEPENDS_${PN}-codecs="${PN}-core ${PN}-lang"
+FILES_${PN}-codecs="${libdir}/python2.6/codecs.* ${libdir}/python2.6/encodings ${libdir}/python2.6/gettext.* ${libdir}/python2.6/locale.* ${libdir}/python2.6/lib-dynload/_locale.so ${libdir}/python2.6/lib-dynload/unicodedata.so ${libdir}/python2.6/stringprep.* ${libdir}/python2.6/xdrlib.* "
 
-DESCRIPTION_python-doctest="Python framework for running examples in docstrings."
-RDEPENDS_python-doctest="python-core python-lang python-io python-re python-unittest python-debugger python-difflib"
-FILES_python-doctest="${libdir}/python2.6/doctest.* "
+DESCRIPTION_${PN}-compile="Python Bytecode Compilation Support"
+RDEPENDS_${PN}-compile="${PN}-core"
+FILES_${PN}-compile="${libdir}/python2.6/py_compile.* ${libdir}/python2.6/compileall.* "
 
-DESCRIPTION_python-stringold="Python String APIs [deprecated]"
-RDEPENDS_python-stringold="python-core python-re"
-FILES_python-stringold="${libdir}/python2.6/lib-dynload/strop.so ${libdir}/python2.6/string.* "
+DESCRIPTION_${PN}-compiler="Python Compiler Support"
+RDEPENDS_${PN}-compiler="${PN}-core"
+FILES_${PN}-compiler="${libdir}/python2.6/compiler "
 
-DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"
-RDEPENDS_python-codecs="python-core python-lang"
-FILES_python-codecs="${libdir}/python2.6/codecs.* ${libdir}/python2.6/encodings ${libdir}/python2.6/gettext.* ${libdir}/python2.6/locale.* ${libdir}/python2.6/lib-dynload/_locale.so ${libdir}/python2.6/lib-dynload/unicodedata.so ${libdir}/python2.6/stringprep.* ${libdir}/python2.6/xdrlib.* "
+DESCRIPTION_${PN}-compression="Python High Level Compression Support"
+RDEPENDS_${PN}-compression="${PN}-core ${PN}-zlib"
+FILES_${PN}-compression="${libdir}/python2.6/gzip.* ${libdir}/python2.6/zipfile.* ${libdir}/python2.6/tarfile.* ${libdir}/python2.6/lib-dynload/bz2.so "
 
-DESCRIPTION_python-ctypes="Python C Types Support"
-RDEPENDS_python-ctypes="python-core"
-FILES_python-ctypes="${libdir}/python2.6/ctypes ${libdir}/python2.6/lib-dynload/_ctypes.so "
+DESCRIPTION_${PN}-core="Python Interpreter and core modules (needed!)"
+RDEPENDS_${PN}-core=""
+FILES_${PN}-core="${libdir}/python2.6/__future__.* ${libdir}/python2.6/_abcoll.* ${libdir}/python2.6/abc.* ${libdir}/python2.6/copy.* ${libdir}/python2.6/copy_reg.* ${libdir}/python2.6/ConfigParser.* ${libdir}/python2.6/genericpath.* ${libdir}/python2.6/getopt.* ${libdir}/python2.6/linecache.* ${libdir}/python2.6/new.* ${libdir}/python2.6/os.* ${libdir}/python2.6/posixpath.* ${libdir}/python2.6/struct.* ${libdir}/python2.6/warnings.* ${libdir}/python2.6/site.* ${libdir}/python2.6/stat.* ${libdir}/python2.6/UserDict.* ${libdir}/python2.6/UserList.* ${libdir}/python2.6/UserString.* ${libdir}/python2.6/lib-dynload/binascii.so ${libdir}/python2.6/lib-dynload/_struct.so ${libdir}/python2.6/lib-dynload/time.so ${libdir}/python2.6/lib-dynload/xreadlines.so ${libdir}/python2.6/types.* ${libdir}/python2.6/platform.* ${bindir}/python* "
 
-DESCRIPTION_python-pickle="Python Persistence Support"
-RDEPENDS_python-pickle="python-core python-codecs python-io python-re"
-FILES_python-pickle="${libdir}/python2.6/pickle.* ${libdir}/python2.6/shelve.* ${libdir}/python2.6/lib-dynload/cPickle.so "
+DESCRIPTION_${PN}-core-dbg="Python core module debug information"
+RDEPENDS_${PN}-core-dbg="${PN}-core"
+FILES_${PN}-core-dbg="${libdir}/python2.6/config/.debug ${libdir}/python2.6/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug "
 
-DESCRIPTION_python-datetime="Python Calendar and Time support"
-RDEPENDS_python-datetime="python-core python-codecs"
-FILES_python-datetime="${libdir}/python2.6/_strptime.* ${libdir}/python2.6/calendar.* ${libdir}/python2.6/lib-dynload/datetime.so "
+DESCRIPTION_${PN}-crypt="Python Basic Cryptographic and Hashing Support"
+RDEPENDS_${PN}-crypt="${PN}-core"
+FILES_${PN}-crypt="${libdir}/python2.6/hashlib.* ${libdir}/python2.6/md5.* ${libdir}/python2.6/sha.* ${libdir}/python2.6/lib-dynload/crypt.so ${libdir}/python2.6/lib-dynload/_hashlib.so ${libdir}/python2.6/lib-dynload/_sha256.so ${libdir}/python2.6/lib-dynload/_sha512.so "
 
-DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
-RDEPENDS_python-core=""
-FILES_python-core="${libdir}/python2.6/__future__.* ${libdir}/python2.6/_abcoll.* ${libdir}/python2.6/abc.* ${libdir}/python2.6/copy.* ${libdir}/python2.6/copy_reg.* ${libdir}/python2.6/ConfigParser.* ${libdir}/python2.6/genericpath.* ${libdir}/python2.6/getopt.* ${libdir}/python2.6/linecache.* ${libdir}/python2.6/new.* ${libdir}/python2.6/os.* ${libdir}/python2.6/posixpath.* ${libdir}/python2.6/struct.* ${libdir}/python2.6/warnings.* ${libdir}/python2.6/site.* ${libdir}/python2.6/stat.* ${libdir}/python2.6/UserDict.* ${libdir}/python2.6/UserList.* ${libdir}/python2.6/UserString.* ${libdir}/python2.6/lib-dynload/binascii.so ${libdir}/python2.6/lib-dynload/_struct.so ${libdir}/python2.6/lib-dynload/time.so ${libdir}/python2.6/lib-dynload/xreadlines.so ${libdir}/python2.6/types.* ${bindir}/python* "
+DESCRIPTION_${PN}-ctypes="Python C Types Support"
+RDEPENDS_${PN}-ctypes="${PN}-core"
+FILES_${PN}-ctypes="${libdir}/python2.6/ctypes ${libdir}/python2.6/lib-dynload/_ctypes.so "
 
-DESCRIPTION_python-io="Python Low-Level I/O"
-RDEPENDS_python-io="python-core python-math"
-FILES_python-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* "
+DESCRIPTION_${PN}-curses="Python Curses Support"
+RDEPENDS_${PN}-curses="${PN}-core"
+FILES_${PN}-curses="${libdir}/python2.6/curses ${libdir}/python2.6/lib-dynload/_curses.so ${libdir}/python2.6/lib-dynload/_curses_panel.so "
 
-DESCRIPTION_python-compiler="Python Compiler Support"
-RDEPENDS_python-compiler="python-core"
-FILES_python-compiler="${libdir}/python2.6/compiler "
+DESCRIPTION_${PN}-datetime="Python Calendar and Time support"
+RDEPENDS_${PN}-datetime="${PN}-core ${PN}-codecs"
+FILES_${PN}-datetime="${libdir}/python2.6/_strptime.* ${libdir}/python2.6/calendar.* ${libdir}/python2.6/lib-dynload/datetime.so "
 
-DESCRIPTION_python-compression="Python High Level Compression Support"
-RDEPENDS_python-compression="python-core python-zlib"
-FILES_python-compression="${libdir}/python2.6/gzip.* ${libdir}/python2.6/zipfile.* ${libdir}/python2.6/tarfile.* ${libdir}/python2.6/lib-dynload/bz2.so "
+DESCRIPTION_${PN}-db="Python File-Based Database Support"
+RDEPENDS_${PN}-db="${PN}-core"
+FILES_${PN}-db="${libdir}/python2.6/anydbm.* ${libdir}/python2.6/dumbdbm.* ${libdir}/python2.6/whichdb.* "
 
-DESCRIPTION_python-re="Python Regular Expression APIs"
-RDEPENDS_python-re="python-core"
-FILES_python-re="${libdir}/python2.6/re.* ${libdir}/python2.6/sre.* ${libdir}/python2.6/sre_compile.* ${libdir}/python2.6/sre_constants* ${libdir}/python2.6/sre_parse.* "
+DESCRIPTION_${PN}-debugger="Python Debugger"
+RDEPENDS_${PN}-debugger="${PN}-core ${PN}-io ${PN}-lang ${PN}-re ${PN}-stringold ${PN}-shell ${PN}-pprint"
+FILES_${PN}-debugger="${libdir}/python2.6/bdb.* ${libdir}/python2.6/pdb.* "
 
-DESCRIPTION_python-xmlrpc="Python XMLRPC Support"
-RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang"
-FILES_python-xmlrpc="${libdir}/python2.6/xmlrpclib.* ${libdir}/python2.6/SimpleXMLRPCServer.* "
+DESCRIPTION_${PN}-dev="Python Development Package"
+RDEPENDS_${PN}-dev="${PN}-core"
+FILES_${PN}-dev="${includedir} ${libdir}/libpython2.6.so "
 
-DESCRIPTION_python-terminal="Python Terminal Controlling Support"
-RDEPENDS_python-terminal="python-core python-io"
-FILES_python-terminal="${libdir}/python2.6/pty.* ${libdir}/python2.6/tty.* "
+DESCRIPTION_${PN}-difflib="Python helpers for computing deltas between objects."
+RDEPENDS_${PN}-difflib="${PN}-lang ${PN}-re"
+FILES_${PN}-difflib="${libdir}/python2.6/difflib.* "
 
-DESCRIPTION_python-email="Python Email Support"
-RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image python-netclient"
-FILES_python-email="${libdir}/python2.6/imaplib.* ${libdir}/python2.6/email "
+DESCRIPTION_${PN}-distutils="Python Distribution Utilities"
+RDEPENDS_${PN}-distutils="${PN}-core"
+FILES_${PN}-distutils="${libdir}/python2.6/config ${libdir}/python2.6/distutils "
 
-DESCRIPTION_python-image="Python Graphical Image Handling"
-RDEPENDS_python-image="python-core"
-FILES_python-image="${libdir}/python2.6/colorsys.* ${libdir}/python2.6/imghdr.* ${libdir}/python2.6/lib-dynload/imageop.so ${libdir}/python2.6/lib-dynload/rgbimg.so "
+DESCRIPTION_${PN}-doctest="Python framework for running examples in docstrings."
+RDEPENDS_${PN}-doctest="${PN}-core ${PN}-lang ${PN}-io ${PN}-re ${PN}-unittest ${PN}-debugger ${PN}-difflib"
+FILES_${PN}-doctest="${libdir}/python2.6/doctest.* "
 
-DESCRIPTION_python-tests="Python Tests"
-RDEPENDS_python-tests="python-core"
-FILES_python-tests="${libdir}/python2.6/test "
+DESCRIPTION_${PN}-elementtree="Python elementree"
+RDEPENDS_${PN}-elementtree="${PN}-core"
+FILES_${PN}-elementtree="${libdir}/python2.6/lib-dynload/_elementtree.so "
 
-DESCRIPTION_python-core-dbg="Python core module debug information"
-RDEPENDS_python-core-dbg="python-core"
-FILES_python-core-dbg="${libdir}/python2.6/config/.debug ${libdir}/python2.6/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug "
+DESCRIPTION_${PN}-email="Python Email Support"
+RDEPENDS_${PN}-email="${PN}-core ${PN}-io ${PN}-re ${PN}-mime ${PN}-audio ${PN}-image ${PN}-netclient"
+FILES_${PN}-email="${libdir}/python2.6/imaplib.* ${libdir}/python2.6/email "
 
-DESCRIPTION_python-resource="Python Resource Control Interface"
-RDEPENDS_python-resource="python-core"
-FILES_python-resource="${libdir}/python2.6/lib-dynload/resource.so "
+DESCRIPTION_${PN}-fcntl="Python's fcntl Interface"
+RDEPENDS_${PN}-fcntl="${PN}-core"
+FILES_${PN}-fcntl="${libdir}/python2.6/lib-dynload/fcntl.so "
 
-DESCRIPTION_python-json="Python JSON Support"
-RDEPENDS_python-json="python-core python-math python-re"
-FILES_python-json="${libdir}/python2.6/json "
+DESCRIPTION_${PN}-gdbm="Python GNU Database Support"
+RDEPENDS_${PN}-gdbm="${PN}-core"
+FILES_${PN}-gdbm="${libdir}/python2.6/lib-dynload/gdbm.so "
 
-DESCRIPTION_python-devel="Python Development Package"
-RDEPENDS_python-devel="python-core"
-FILES_python-devel="${includedir} ${libdir}/libpython2.6.so ${libdir}/python2.6/config "
+DESCRIPTION_${PN}-hotshot="Python Hotshot Profiler"
+RDEPENDS_${PN}-hotshot="${PN}-core"
+FILES_${PN}-hotshot="${libdir}/python2.6/hotshot ${libdir}/python2.6/lib-dynload/_hotshot.so "
 
-DESCRIPTION_python-difflib="Python helpers for computing deltas between objects."
-RDEPENDS_python-difflib="python-lang python-re"
-FILES_python-difflib="${libdir}/python2.6/difflib.* "
+DESCRIPTION_${PN}-html="Python HTML Processing"
+RDEPENDS_${PN}-html="${PN}-core"
+FILES_${PN}-html="${libdir}/python2.6/formatter.* ${libdir}/python2.6/htmlentitydefs.* ${libdir}/python2.6/htmllib.* ${libdir}/python2.6/markupbase.* ${libdir}/python2.6/sgmllib.* "
 
-DESCRIPTION_python-math="Python Math Support"
-RDEPENDS_python-math="python-core"
-FILES_python-math="${libdir}/python2.6/lib-dynload/cmath.so ${libdir}/python2.6/lib-dynload/math.so ${libdir}/python2.6/lib-dynload/_random.so ${libdir}/python2.6/random.* ${libdir}/python2.6/sets.* "
+DESCRIPTION_${PN}-idle="Python Integrated Development Environment"
+RDEPENDS_${PN}-idle="${PN}-core ${PN}-tkinter"
+FILES_${PN}-idle="${bindir}/idle ${libdir}/python2.6/idlelib "
 
-DESCRIPTION_python-syslog="Python Syslog Interface"
-RDEPENDS_python-syslog="python-core"
-FILES_python-syslog="${libdir}/python2.6/lib-dynload/syslog.so "
+DESCRIPTION_${PN}-image="Python Graphical Image Handling"
+RDEPENDS_${PN}-image="${PN}-core"
+FILES_${PN}-image="${libdir}/python2.6/colorsys.* ${libdir}/python2.6/imghdr.* ${libdir}/python2.6/lib-dynload/imageop.so ${libdir}/python2.6/lib-dynload/rgbimg.so "
 
-DESCRIPTION_python-hotshot="Python Hotshot Profiler"
-RDEPENDS_python-hotshot="python-core"
-FILES_python-hotshot="${libdir}/python2.6/hotshot ${libdir}/python2.6/lib-dynload/_hotshot.so "
+DESCRIPTION_${PN}-io="Python Low-Level I/O"
+RDEPENDS_${PN}-io="${PN}-core ${PN}-math"
+FILES_${PN}-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/ssl.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* "
 
-DESCRIPTION_python-unixadmin="Python Unix Administration Support"
-RDEPENDS_python-unixadmin="python-core"
-FILES_python-unixadmin="${libdir}/python2.6/lib-dynload/nis.so ${libdir}/python2.6/lib-dynload/grp.so ${libdir}/python2.6/lib-dynload/pwd.so ${libdir}/python2.6/getpass.* "
+DESCRIPTION_${PN}-json="Python JSON Support"
+RDEPENDS_${PN}-json="${PN}-core ${PN}-math ${PN}-re"
+FILES_${PN}-json="${libdir}/python2.6/json "
 
-DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
-RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
-FILES_python-textutils="${libdir}/python2.6/lib-dynload/_csv.so ${libdir}/python2.6/csv.* ${libdir}/python2.6/optparse.* ${libdir}/python2.6/textwrap.* "
+DESCRIPTION_${PN}-lang="Python Low-Level Language Support"
+RDEPENDS_${PN}-lang="${PN}-core"
+FILES_${PN}-lang="${libdir}/python2.6/lib-dynload/_bisect.so ${libdir}/python2.6/lib-dynload/_collections.so ${libdir}/python2.6/lib-dynload/_heapq.so ${libdir}/python2.6/lib-dynload/_weakref.so ${libdir}/python2.6/lib-dynload/_functools.so ${libdir}/python2.6/lib-dynload/array.so ${libdir}/python2.6/lib-dynload/itertools.so ${libdir}/python2.6/lib-dynload/operator.so ${libdir}/python2.6/lib-dynload/parser.so ${libdir}/python2.6/atexit.* ${libdir}/python2.6/bisect.* ${libdir}/python2.6/code.* ${libdir}/python2.6/codeop.* ${libdir}/python2.6/collections.* ${libdir}/python2.6/dis.* ${libdir}/python2.6/functools.* ${libdir}/python2.6/heapq.* ${libdir}/python2.6/inspect.* ${libdir}/python2.6/keyword.* ${libdir}/python2.6/opcode.* ${libdir}/python2.6/symbol.* ${libdir}/python2.6/repr.* ${libdir}/python2.6/token.* ${libdir}/python2.6/tokenize.* ${libdir}/python2.6/traceback.* ${libdir}/python2.6/weakref.* "
 
-DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings"
-RDEPENDS_python-tkinter="python-core"
-FILES_python-tkinter="${libdir}/python2.6/lib-dynload/_tkinter.so ${libdir}/python2.6/lib-tk "
+DESCRIPTION_${PN}-logging="Python Logging Support"
+RDEPENDS_${PN}-logging="${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN}-stringold"
+FILES_${PN}-logging="${libdir}/python2.6/logging "
 
-DESCRIPTION_python-gdbm="Python GNU Database Support"
-RDEPENDS_python-gdbm="python-core"
-FILES_python-gdbm="${libdir}/python2.6/lib-dynload/gdbm.so "
+DESCRIPTION_${PN}-mailbox="Python Mailbox Format Support"
+RDEPENDS_${PN}-mailbox="${PN}-core ${PN}-mime"
+FILES_${PN}-mailbox="${libdir}/python2.6/mailbox.* "
 
-DESCRIPTION_python-elementtree="Python elementree"
-RDEPENDS_python-elementtree="python-core"
-FILES_python-elementtree="${libdir}/python2.6/lib-dynload/_elementtree.so "
+DESCRIPTION_${PN}-math="Python Math Support"
+RDEPENDS_${PN}-math="${PN}-core"
+FILES_${PN}-math="${libdir}/python2.6/lib-dynload/cmath.so ${libdir}/python2.6/lib-dynload/math.so ${libdir}/python2.6/lib-dynload/_random.so ${libdir}/python2.6/random.* ${libdir}/python2.6/sets.* "
 
-DESCRIPTION_python-fcntl="Python's fcntl Interface"
-RDEPENDS_python-fcntl="python-core"
-FILES_python-fcntl="${libdir}/python2.6/lib-dynload/fcntl.so "
+DESCRIPTION_${PN}-mime="Python MIME Handling APIs"
+RDEPENDS_${PN}-mime="${PN}-core ${PN}-io"
+FILES_${PN}-mime="${libdir}/python2.6/mimetools.* ${libdir}/python2.6/uu.* ${libdir}/python2.6/quopri.* ${libdir}/python2.6/rfc822.* "
 
-DESCRIPTION_python-netclient="Python Internet Protocol Clients"
-RDEPENDS_python-netclient="python-core python-crypt python-datetime python-io python-lang python-logging python-mime"
-FILES_python-netclient="${libdir}/python2.6/*Cookie*.* ${libdir}/python2.6/base64.* ${libdir}/python2.6/cookielib.* ${libdir}/python2.6/ftplib.* ${libdir}/python2.6/gopherlib.* ${libdir}/python2.6/hmac.* ${libdir}/python2.6/httplib.* ${libdir}/python2.6/mimetypes.* ${libdir}/python2.6/nntplib.* ${libdir}/python2.6/poplib.* ${libdir}/python2.6/smtplib.* ${libdir}/python2.6/telnetlib.* ${libdir}/python2.6/urllib.* ${libdir}/python2.6/urllib2.* ${libdir}/python2.6/urlparse.* ${libdir}/python2.6/uuid.* ${libdir}/python2.6/rfc822.* ${libdir}/python2.6/mimetools.* "
+DESCRIPTION_${PN}-mmap="Python Memory-Mapped-File Support"
+RDEPENDS_${PN}-mmap="${PN}-core ${PN}-io"
+FILES_${PN}-mmap="${libdir}/python2.6/lib-dynload/mmap.so "
 
-DESCRIPTION_python-pprint="Python Pretty-Print Support"
-RDEPENDS_python-pprint="python-core"
-FILES_python-pprint="${libdir}/python2.6/pprint.* "
+DESCRIPTION_${PN}-multiprocessing="Python Multiprocessing Support"
+RDEPENDS_${PN}-multiprocessing="${PN}-core ${PN}-io ${PN}-lang"
+FILES_${PN}-multiprocessing="${libdir}/python2.6/lib-dynload/_multiprocessing.so ${libdir}/python2.6/multiprocessing "
 
-DESCRIPTION_python-netserver="Python Internet Protocol Servers"
-RDEPENDS_python-netserver="python-core python-netclient"
-FILES_python-netserver="${libdir}/python2.6/cgi.* ${libdir}/python2.6/*HTTPServer.* ${libdir}/python2.6/SocketServer.* "
+DESCRIPTION_${PN}-netclient="Python Internet Protocol Clients"
+RDEPENDS_${PN}-netclient="${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime"
+FILES_${PN}-netclient="${libdir}/python2.6/*Cookie*.* ${libdir}/python2.6/base64.* ${libdir}/python2.6/cookielib.* ${libdir}/python2.6/ftplib.* ${libdir}/python2.6/gopherlib.* ${libdir}/python2.6/hmac.* ${libdir}/python2.6/httplib.* ${libdir}/python2.6/mimetypes.* ${libdir}/python2.6/nntplib.* ${libdir}/python2.6/poplib.* ${libdir}/python2.6/smtplib.* ${libdir}/python2.6/telnetlib.* ${libdir}/python2.6/urllib.* ${libdir}/python2.6/urllib2.* ${libdir}/python2.6/urlparse.* ${libdir}/python2.6/uuid.* ${libdir}/python2.6/rfc822.* ${libdir}/python2.6/mimetools.* "
 
-DESCRIPTION_python-curses="Python Curses Support"
-RDEPENDS_python-curses="python-core"
-FILES_python-curses="${libdir}/python2.6/curses ${libdir}/python2.6/lib-dynload/_curses.so ${libdir}/python2.6/lib-dynload/_curses_panel.so "
+DESCRIPTION_${PN}-netserver="Python Internet Protocol Servers"
+RDEPENDS_${PN}-netserver="${PN}-core ${PN}-netclient"
+FILES_${PN}-netserver="${libdir}/python2.6/cgi.* ${libdir}/python2.6/*HTTPServer.* ${libdir}/python2.6/SocketServer.* "
 
-DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon"
-RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime"
-FILES_python-smtpd="${bindir}/smtpd.* "
+DESCRIPTION_${PN}-numbers="Python Number APIs"
+RDEPENDS_${PN}-numbers="${PN}-core ${PN}-lang ${PN}-re"
+FILES_${PN}-numbers="${libdir}/python2.6/decimal.* ${libdir}/python2.6/numbers.* "
 
-DESCRIPTION_python-html="Python HTML Processing"
-RDEPENDS_python-html="python-core"
-FILES_python-html="${libdir}/python2.6/formatter.* ${libdir}/python2.6/htmlentitydefs.* ${libdir}/python2.6/htmllib.* ${libdir}/python2.6/markupbase.* ${libdir}/python2.6/sgmllib.* "
+DESCRIPTION_${PN}-pickle="Python Persistence Support"
+RDEPENDS_${PN}-pickle="${PN}-core ${PN}-codecs ${PN}-io ${PN}-re"
+FILES_${PN}-pickle="${libdir}/python2.6/pickle.* ${libdir}/python2.6/shelve.* ${libdir}/python2.6/lib-dynload/cPickle.so "
 
-DESCRIPTION_python-readline="Python Readline Support"
-RDEPENDS_python-readline="python-core"
-FILES_python-readline="${libdir}/python2.6/lib-dynload/readline.so ${libdir}/python2.6/rlcompleter.* "
+DESCRIPTION_${PN}-pkgutil="Python Package Extension Utility Support"
+RDEPENDS_${PN}-pkgutil="${PN}-core"
+FILES_${PN}-pkgutil="${libdir}/python2.6/pkgutil.* "
 
-DESCRIPTION_python-subprocess="Python Subprocess Support"
-RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle"
-FILES_python-subprocess="${libdir}/python2.6/subprocess.* "
+DESCRIPTION_${PN}-pprint="Python Pretty-Print Support"
+RDEPENDS_${PN}-pprint="${PN}-core"
+FILES_${PN}-pprint="${libdir}/python2.6/pprint.* "
 
-DESCRIPTION_python-pydoc="Python Interactive Help Support"
-RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
-FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.6/pydoc.* "
+DESCRIPTION_${PN}-profile="Python Basic Profiling Support"
+RDEPENDS_${PN}-profile="${PN}-core ${PN}-textutils"
+FILES_${PN}-profile="${libdir}/python2.6/profile.* ${libdir}/python2.6/pstats.* ${libdir}/python2.6/cProfile.* ${libdir}/python2.6/lib-dynload/_lsprof.so "
 
-DESCRIPTION_python-logging="Python Logging Support"
-RDEPENDS_python-logging="python-core python-io python-lang python-pickle python-stringold"
-FILES_python-logging="${libdir}/python2.6/logging "
+DESCRIPTION_${PN}-pydoc="Python Interactive Help Support"
+RDEPENDS_${PN}-pydoc="${PN}-core ${PN}-lang ${PN}-stringold ${PN}-re"
+FILES_${PN}-pydoc="${bindir}/pydoc ${libdir}/python2.6/pydoc.* "
 
-DESCRIPTION_python-mailbox="Python Mailbox Format Support"
-RDEPENDS_python-mailbox="python-core python-mime"
-FILES_python-mailbox="${libdir}/python2.6/mailbox.* "
+DESCRIPTION_${PN}-re="Python Regular Expression APIs"
+RDEPENDS_${PN}-re="${PN}-core"
+FILES_${PN}-re="${libdir}/python2.6/re.* ${libdir}/python2.6/sre.* ${libdir}/python2.6/sre_compile.* ${libdir}/python2.6/sre_constants* ${libdir}/python2.6/sre_parse.* "
 
-DESCRIPTION_python-xml="Python basic XML support."
-RDEPENDS_python-xml="python-core python-re"
-FILES_python-xml="${libdir}/python2.6/lib-dynload/pyexpat.so ${libdir}/python2.6/xml ${libdir}/python2.6/xmllib.* "
+DESCRIPTION_${PN}-readline="Python Readline Support"
+RDEPENDS_${PN}-readline="${PN}-core"
+FILES_${PN}-readline="${libdir}/python2.6/lib-dynload/readline.so ${libdir}/python2.6/rlcompleter.* "
 
-DESCRIPTION_python-mime="Python MIME Handling APIs"
-RDEPENDS_python-mime="python-core python-io"
-FILES_python-mime="${libdir}/python2.6/mimetools.* ${libdir}/python2.6/uu.* ${libdir}/python2.6/quopri.* ${libdir}/python2.6/rfc822.* "
+DESCRIPTION_${PN}-resource="Python Resource Control Interface"
+RDEPENDS_${PN}-resource="${PN}-core"
+FILES_${PN}-resource="${libdir}/python2.6/lib-dynload/resource.so "
 
-DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support"
-RDEPENDS_python-sqlite3="python-core python-datetime python-lang python-crypt python-io python-threading python-zlib"
-FILES_python-sqlite3="${libdir}/python2.6/lib-dynload/_sqlite3.so ${libdir}/python2.6/sqlite3/dbapi2.* ${libdir}/python2.6/sqlite3/__init__.* ${libdir}/python2.6/sqlite3/dump.* "
+DESCRIPTION_${PN}-robotparser="Python robots.txt parser"
+RDEPENDS_${PN}-robotparser="${PN}-core ${PN}-netclient"
+FILES_${PN}-robotparser="${libdir}/python2.6/robotparser.* "
 
-DESCRIPTION_python-sqlite3-tests="Python Sqlite3 Database Support Tests"
-RDEPENDS_python-sqlite3-tests="python-core python-sqlite3"
-FILES_python-sqlite3-tests="${libdir}/python2.6/sqlite3/test "
+DESCRIPTION_${PN}-shell="Python Shell-Like Functionality"
+RDEPENDS_${PN}-shell="${PN}-core ${PN}-re"
+FILES_${PN}-shell="${libdir}/python2.6/cmd.* ${libdir}/python2.6/commands.* ${libdir}/python2.6/dircache.* ${libdir}/python2.6/fnmatch.* ${libdir}/python2.6/glob.* ${libdir}/python2.6/popen2.* ${libdir}/python2.6/shlex.* ${libdir}/python2.6/shutil.* "
 
-DESCRIPTION_python-unittest="Python Unit Testing Framework"
-RDEPENDS_python-unittest="python-core python-stringold python-lang"
-FILES_python-unittest="${libdir}/python2.6/unittest.* "
+DESCRIPTION_${PN}-smtpd="Python Simple Mail Transport Daemon"
+RDEPENDS_${PN}-smtpd="${PN}-core ${PN}-netserver ${PN}-email ${PN}-mime"
+FILES_${PN}-smtpd="${bindir}/smtpd.* "
 
-DESCRIPTION_python-multiprocessing="Python Multiprocessing Support"
-RDEPENDS_python-multiprocessing="python-core python-io python-lang"
-FILES_python-multiprocessing="${libdir}/python2.6/lib-dynload/_multiprocessing.so ${libdir}/python2.6/multiprocessing "
+DESCRIPTION_${PN}-sqlite3="Python Sqlite3 Database Support"
+RDEPENDS_${PN}-sqlite3="${PN}-core ${PN}-datetime ${PN}-lang ${PN}-crypt ${PN}-io ${PN}-threading ${PN}-zlib"
+FILES_${PN}-sqlite3="${libdir}/python2.6/lib-dynload/_sqlite3.so ${libdir}/python2.6/sqlite3/dbapi2.* ${libdir}/python2.6/sqlite3/__init__.* ${libdir}/python2.6/sqlite3/dump.* "
 
-DESCRIPTION_python-robotparser="Python robots.txt parser"
-RDEPENDS_python-robotparser="python-core python-netclient"
-FILES_python-robotparser="${libdir}/python2.6/robotparser.* "
+DESCRIPTION_${PN}-sqlite3-tests="Python Sqlite3 Database Support Tests"
+RDEPENDS_${PN}-sqlite3-tests="${PN}-core ${PN}-sqlite3"
+FILES_${PN}-sqlite3-tests="${libdir}/python2.6/sqlite3/test "
 
-DESCRIPTION_python-compile="Python Bytecode Compilation Support"
-RDEPENDS_python-compile="python-core"
-FILES_python-compile="${libdir}/python2.6/py_compile.* ${libdir}/python2.6/compileall.* "
+DESCRIPTION_${PN}-stringold="Python String APIs [deprecated]"
+RDEPENDS_${PN}-stringold="${PN}-core ${PN}-re"
+FILES_${PN}-stringold="${libdir}/python2.6/lib-dynload/strop.so ${libdir}/python2.6/string.* "
 
-DESCRIPTION_python-debugger="Python Debugger"
-RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell python-pprint"
-FILES_python-debugger="${libdir}/python2.6/bdb.* ${libdir}/python2.6/pdb.* "
+DESCRIPTION_${PN}-subprocess="Python Subprocess Support"
+RDEPENDS_${PN}-subprocess="${PN}-core ${PN}-io ${PN}-re ${PN}-fcntl ${PN}-pickle"
+FILES_${PN}-subprocess="${libdir}/python2.6/subprocess.* "
 
-DESCRIPTION_python-pkgutil="Python Package Extension Utility Support"
-RDEPENDS_python-pkgutil="python-core"
-FILES_python-pkgutil="${libdir}/python2.6/pkgutil.* "
+DESCRIPTION_${PN}-syslog="Python Syslog Interface"
+RDEPENDS_${PN}-syslog="${PN}-core"
+FILES_${PN}-syslog="${libdir}/python2.6/lib-dynload/syslog.so "
 
-DESCRIPTION_python-shell="Python Shell-Like Functionality"
-RDEPENDS_python-shell="python-core python-re"
-FILES_python-shell="${libdir}/python2.6/cmd.* ${libdir}/python2.6/commands.* ${libdir}/python2.6/dircache.* ${libdir}/python2.6/fnmatch.* ${libdir}/python2.6/glob.* ${libdir}/python2.6/popen2.* ${libdir}/python2.6/shlex.* ${libdir}/python2.6/shutil.* "
+DESCRIPTION_${PN}-terminal="Python Terminal Controlling Support"
+RDEPENDS_${PN}-terminal="${PN}-core ${PN}-io"
+FILES_${PN}-terminal="${libdir}/python2.6/pty.* ${libdir}/python2.6/tty.* "
 
-DESCRIPTION_python-bsddb="Python Berkeley Database Bindings"
-RDEPENDS_python-bsddb="python-core"
-FILES_python-bsddb="${libdir}/python2.6/bsddb ${libdir}/python2.6/lib-dynload/_bsddb.so "
+DESCRIPTION_${PN}-tests="Python Tests"
+RDEPENDS_${PN}-tests="${PN}-core"
+FILES_${PN}-tests="${libdir}/python2.6/test "
 
-DESCRIPTION_python-mmap="Python Memory-Mapped-File Support"
-RDEPENDS_python-mmap="python-core python-io"
-FILES_python-mmap="${libdir}/python2.6/lib-dynload/mmap.so "
+DESCRIPTION_${PN}-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
+RDEPENDS_${PN}-textutils="${PN}-core ${PN}-io ${PN}-re ${PN}-stringold"
+FILES_${PN}-textutils="${libdir}/python2.6/lib-dynload/_csv.so ${libdir}/python2.6/csv.* ${libdir}/python2.6/optparse.* ${libdir}/python2.6/textwrap.* "
 
-DESCRIPTION_python-zlib="Python zlib Support."
-RDEPENDS_python-zlib="python-core"
-FILES_python-zlib="${libdir}/python2.6/lib-dynload/zlib.so "
+DESCRIPTION_${PN}-threading="Python Threading & Synchronization Support"
+RDEPENDS_${PN}-threading="${PN}-core ${PN}-lang"
+FILES_${PN}-threading="${libdir}/python2.6/_threading_local.* ${libdir}/python2.6/dummy_thread.* ${libdir}/python2.6/dummy_threading.* ${libdir}/python2.6/mutex.* ${libdir}/python2.6/threading.* ${libdir}/python2.6/Queue.* "
 
-DESCRIPTION_python-db="Python File-Based Database Support"
-RDEPENDS_python-db="python-core"
-FILES_python-db="${libdir}/python2.6/anydbm.* ${libdir}/python2.6/dumbdbm.* ${libdir}/python2.6/whichdb.* "
+DESCRIPTION_${PN}-tkinter="Python Tcl/Tk Bindings"
+RDEPENDS_${PN}-tkinter="${PN}-core"
+FILES_${PN}-tkinter="${libdir}/python2.6/lib-dynload/_tkinter.so ${libdir}/python2.6/lib-tk "
 
-DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support"
-RDEPENDS_python-crypt="python-core"
-FILES_python-crypt="${libdir}/python2.6/hashlib.* ${libdir}/python2.6/md5.* ${libdir}/python2.6/sha.* ${libdir}/python2.6/lib-dynload/crypt.so ${libdir}/python2.6/lib-dynload/_hashlib.so ${libdir}/python2.6/lib-dynload/_sha256.so ${libdir}/python2.6/lib-dynload/_sha512.so "
+DESCRIPTION_${PN}-unittest="Python Unit Testing Framework"
+RDEPENDS_${PN}-unittest="${PN}-core ${PN}-stringold ${PN}-lang"
+FILES_${PN}-unittest="${libdir}/python2.6/unittest.* "
 
-DESCRIPTION_python-idle="Python Integrated Development Environment"
-RDEPENDS_python-idle="python-core python-tkinter"
-FILES_python-idle="${bindir}/idle ${libdir}/python2.6/idlelib "
+DESCRIPTION_${PN}-unixadmin="Python Unix Administration Support"
+RDEPENDS_${PN}-unixadmin="${PN}-core"
+FILES_${PN}-unixadmin="${libdir}/python2.6/lib-dynload/nis.so ${libdir}/python2.6/lib-dynload/grp.so ${libdir}/python2.6/lib-dynload/pwd.so ${libdir}/python2.6/getpass.* "
 
-DESCRIPTION_python-lang="Python Low-Level Language Support"
-RDEPENDS_python-lang="python-core"
-FILES_python-lang="${libdir}/python2.6/lib-dynload/_bisect.so ${libdir}/python2.6/lib-dynload/_collections.so ${libdir}/python2.6/lib-dynload/_heapq.so ${libdir}/python2.6/lib-dynload/_weakref.so ${libdir}/python2.6/lib-dynload/_functools.so ${libdir}/python2.6/lib-dynload/array.so ${libdir}/python2.6/lib-dynload/itertools.so ${libdir}/python2.6/lib-dynload/operator.so ${libdir}/python2.6/lib-dynload/parser.so ${libdir}/python2.6/atexit.* ${libdir}/python2.6/bisect.* ${libdir}/python2.6/code.* ${libdir}/python2.6/codeop.* ${libdir}/python2.6/collections.* ${libdir}/python2.6/dis.* ${libdir}/python2.6/functools.* ${libdir}/python2.6/heapq.* ${libdir}/python2.6/inspect.* ${libdir}/python2.6/keyword.* ${libdir}/python2.6/opcode.* ${libdir}/python2.6/symbol.* ${libdir}/python2.6/repr.* ${libdir}/python2.6/token.* ${libdir}/python2.6/tokenize.* ${libdir}/python2.6/traceback.* ${libdir}/python2.6/linecache.* ${libdir}/python2.6/weakref.* "
+DESCRIPTION_${PN}-xml="Python basic XML support."
+RDEPENDS_${PN}-xml="${PN}-core ${PN}-elementtree ${PN}-re"
+FILES_${PN}-xml="${libdir}/python2.6/lib-dynload/pyexpat.so ${libdir}/python2.6/xml ${libdir}/python2.6/xmllib.* "
 
-DESCRIPTION_python-audio="Python Audio Handling"
-RDEPENDS_python-audio="python-core"
-FILES_python-audio="${libdir}/python2.6/wave.* ${libdir}/python2.6/chunk.* ${libdir}/python2.6/sndhdr.* ${libdir}/python2.6/lib-dynload/ossaudiodev.so ${libdir}/python2.6/lib-dynload/audioop.so "
+DESCRIPTION_${PN}-xmlrpc="Python XMLRPC Support"
+RDEPENDS_${PN}-xmlrpc="${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang"
+FILES_${PN}-xmlrpc="${libdir}/python2.6/xmlrpclib.* ${libdir}/python2.6/SimpleXMLRPCServer.* "
 
-DESCRIPTION_python-modules="All Python modules"
-RDEPENDS_python-modules="python-profile python-threading python-distutils python-doctest python-stringold python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-resource python-json python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-multiprocessing python-robotparser python-compile python-debugger python-pkgutil python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio  "
-ALLOW_EMPTY_python-modules = "1"
+DESCRIPTION_${PN}-zlib="Python zlib Support."
+RDEPENDS_${PN}-zlib="${PN}-core"
+FILES_${PN}-zlib="${libdir}/python2.6/lib-dynload/zlib.so "
+
+DESCRIPTION_${PN}-modules="All Python modules"
+RDEPENDS_${PN}-modules="${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib  "
+ALLOW_EMPTY_${PN}-modules = "1"
 
 
diff --git a/recipes/python/python-ao_0.82.bb b/recipes/python/python-ao_0.82.bb
index 98c8af40e0..3b385271b7 100644
--- a/recipes/python/python-ao_0.82.bb
+++ b/recipes/python/python-ao_0.82.bb
@@ -17,3 +17,6 @@ do_configure_prepend() {
 	echo "ao_lib_dir = ${STAGING_LIBDIR}" >>Setup
 	echo "ao_include_dir = ${STAGING_INCDIR}" >>Setup
 }
+
+SRC_URI[md5sum] = "8e00f5154401a6f6d99efd20606e2819"
+SRC_URI[sha256sum] = "9a444518252f6d747e76a219e5efbc05b4e1742260a7419da9ddf93a519b30c5"
diff --git a/recipes/python/python-blipapi_0.02.04.bb b/recipes/python/python-blipapi_0.02.04.bb
index bc8ad58800..be80a30079 100644
--- a/recipes/python/python-blipapi_0.02.04.bb
+++ b/recipes/python/python-blipapi_0.02.04.bb
@@ -3,10 +3,13 @@ AUTHOR = "Marcin Sztolcman <marcin@urzenia.net>"
 HOMEPAGE = "http://blipapi.googlecode.com/"
 DEPENDS = "python-setuptools"
 LICENSE = "GPL"
-RDEPENDS += "python-json"
-PR = "r0"
+RDEPENDS_${PN} += "python-json"
+PR = "r1"
 inherit setuptools
 
 SRC_URI = "http://blipapi.googlecode.com/files/BlipApiPY-0.02.04.tar.bz2"
 S = "${WORKDIR}/blipapi"
 
+
+SRC_URI[md5sum] = "38892df4239376e51300e5455a319664"
+SRC_URI[sha256sum] = "b433ec324dbc0c63966cb383e370225afaf4eb5abf97471a49a5e893ceffb818"
diff --git a/recipes/python/python-cheetah_2.0.1.bb b/recipes/python/python-cheetah_2.0.1.bb
index 8777aaf719..f57e7029a6 100644
--- a/recipes/python/python-cheetah_2.0.1.bb
+++ b/recipes/python/python-cheetah_2.0.1.bb
@@ -3,11 +3,18 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "MIT"
 SRCNAME = "Cheetah"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/cheetahtemplate/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
-RDEPENDS = "python-pickle python-pprint"
+DEPENDS = "python"
+RDEPENDS_${PN} = "python-pickle python-pprint"
+
+NATIVE_INSTALL_WORKS = "1"
+BBCLASSEXTEND = "native"
+
+SRC_URI[md5sum] = "7845a2950ea850a13c488a26b61ac50a"
+SRC_URI[sha256sum] = "70b618a03506831f59ba1ff8433907ee8d4ead5fc9f1b3f610d384e08a26938c"
diff --git a/recipes/python/python-cjson_1.0.5.bb b/recipes/python/python-cjson_1.0.5.bb
index 4f7e1e1fdf..cb31e9d4e0 100644
--- a/recipes/python/python-cjson_1.0.5.bb
+++ b/recipes/python/python-cjson_1.0.5.bb
@@ -6,3 +6,6 @@ PR = "0"
 SRC_URI = "http://pypi.python.org/packages/source/p/python-cjson/python-cjson-${PV}.tar.gz"
 
 inherit distutils
+
+SRC_URI[md5sum] = "4d55b66ecdf0300313af9d030d9644a3"
+SRC_URI[sha256sum] = "85bbe7a9fb6617e24bb4dbef528af8ef6eae07f8809dcd05ec926142feca7714"
diff --git a/recipes/python/python-coherence_0.6.2.bb b/recipes/python/python-coherence_0.6.2.bb
index 54eed59574..40cc1a226f 100644
--- a/recipes/python/python-coherence_0.6.2.bb
+++ b/recipes/python/python-coherence_0.6.2.bb
@@ -18,3 +18,6 @@ RDEPENDS_${PN} += "python-twisted-pair python-divmodepsilon python-nevow python-
 	python-divmodaxiom"
 
 
+
+SRC_URI[md5sum] = "feaeeaa68cae420c0c365c3c27b2a21e"
+SRC_URI[sha256sum] = "1cb99720527ea0a5906f5e75152634b1797ff44bcc31f4014285bd5da41589cc"
diff --git a/recipes/python/python-coherence_0.6.6.2.bb b/recipes/python/python-coherence_0.6.6.2.bb
index fd41b409d2..4a3d251271 100644
--- a/recipes/python/python-coherence_0.6.6.2.bb
+++ b/recipes/python/python-coherence_0.6.6.2.bb
@@ -18,3 +18,6 @@ RDEPENDS_${PN} += "python-twisted-pair python-divmodepsilon python-nevow python-
 	python-divmodaxiom"
 
 
+
+SRC_URI[md5sum] = "d7a1b4abf6831c61e37a3b9e2bdc560a"
+SRC_URI[sha256sum] = "0b54a6ba88c1ff6274aadb68ff37b8a3961b4c6acf5ded291c5dea936a311ba4"
diff --git a/recipes/python/python-configobj_4.5.3.bb b/recipes/python/python-configobj_4.5.3.bb
index 89ea344bae..7eb2a26840 100644
--- a/recipes/python/python-configobj_4.5.3.bb
+++ b/recipes/python/python-configobj_4.5.3.bb
@@ -8,3 +8,6 @@ inherit distutils
 S = "${WORKDIR}/configobj-${PV}"
 
 
+
+SRC_URI[md5sum] = "6e2b37301439705831bd510d2a198431"
+SRC_URI[sha256sum] = "4276fcc96d81f0ba923f3a8c44c3cb55ac72c00fa79d35f1e3ccb4d410b3d7c5"
diff --git a/recipes/python/python-constraint_1.1.bb b/recipes/python/python-constraint_1.1.bb
index 06c6a909a4..adccd5dc3a 100644
--- a/recipes/python/python-constraint_1.1.bb
+++ b/recipes/python/python-constraint_1.1.bb
@@ -11,3 +11,6 @@ SRC_URI = "http://labix.org/download/python-constraint/python-constraint-${PV}.t
 
 inherit distutils
 
+
+SRC_URI[md5sum] = "975e5449d6670dd19498bb9ec4856d39"
+SRC_URI[sha256sum] = "0d904161351a8e55b272ed9691b12dca4278bed62fde53ba2a36f479996db910"
diff --git a/recipes/python/python-daap_0.7.1.bb b/recipes/python/python-daap_0.7.1.bb
index e3ddde1116..bf1faea6db 100644
--- a/recipes/python/python-daap_0.7.1.bb
+++ b/recipes/python/python-daap_0.7.1.bb
@@ -2,11 +2,15 @@ DESCRIPTION = "A pure Python DAAP client implementation"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "LGPL"
+PR = "r1"
 
 inherit distutils
 
 SRC_URI = "http://jerakeen.org/files/PythonDaap-${PV}.tar.gz"
 S = "${WORKDIR}/PythonDaap-${PV}"
 
-RDEPENDS = "python-compression"
+RDEPENDS_${PN} = "python-compression"
 
+
+SRC_URI[md5sum] = "b3db3d60b0ee83f5f23101d2c3bb99e0"
+SRC_URI[sha256sum] = "ea1d3a8141654781a0df31e6607c4722436fa33eb2e9934492770b3b61be8122"
diff --git a/recipes/python/python-dateutil_1.4.1.bb b/recipes/python/python-dateutil_1.4.1.bb
index 204c48d190..50ad8dab89 100644
--- a/recipes/python/python-dateutil_1.4.1.bb
+++ b/recipes/python/python-dateutil_1.4.1.bb
@@ -18,3 +18,6 @@ RDEPENDS_${PN} = "\
   python-core \
   python-datetime \
 "
+
+SRC_URI[md5sum] = "2a5f25ab12fcefcf0b21348f2d47595a"
+SRC_URI[sha256sum] = "74b615c6a55b4421187feba1633fc233e7c5ebdd7abe9b092447a32946823357"
diff --git a/recipes/python/python-dialog_2.7.bb b/recipes/python/python-dialog_2.7.bb
index 9d66d297e0..38100f9089 100644
--- a/recipes/python/python-dialog_2.7.bb
+++ b/recipes/python/python-dialog_2.7.bb
@@ -9,3 +9,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.bz2"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "19e68b362fe61ef84b981d53d96f0735"
+SRC_URI[sha256sum] = "5f7dbcbd28eebadc736d957b9511a87ad5570c8fc822c8123a42e7259773cb7f"
diff --git a/recipes/python/python-divmodaxiom_0.5.30.bb b/recipes/python/python-divmodaxiom_0.5.30.bb
index 94c8a5317b..fb7990b685 100644
--- a/recipes/python/python-divmodaxiom_0.5.30.bb
+++ b/recipes/python/python-divmodaxiom_0.5.30.bb
@@ -6,3 +6,8 @@ REALPN = "Axiom"
 DEPENDS += "python-divmodepsilon-native"
 
 require divmod.inc
+
+PR = "${INC_PR}.1"
+
+SRC_URI[md5sum] = "8f0b3a27770e487ad08f4fafdccc4495"
+SRC_URI[sha256sum] = "4a4217e70e01e11d357c2c2c23bc72d244a78fa40a401cca48cd5f0a619c7060"
diff --git a/recipes/python/python-divmodepsilon_0.5.11.bb b/recipes/python/python-divmodepsilon_0.5.11.bb
index 5184b69252..04a4e8ae84 100644
--- a/recipes/python/python-divmodepsilon_0.5.11.bb
+++ b/recipes/python/python-divmodepsilon_0.5.11.bb
@@ -5,3 +5,10 @@ REALPN = "Epsilon"
 
 require divmod.inc
 
+PR = "${INC_PR}.1"
+
+NATIVE_INSTALL_WORKS = "1"
+BBCLASSEXTEND = "native"
+
+SRC_URI[md5sum] = "39710dfdeb42e51c953b17b6cded163e"
+SRC_URI[sha256sum] = "a5907a3b7584d63be30b3f79b0422b2b0778e73c053be9ac5a11004f1c9097dc"
diff --git a/recipes/python/python-django_1.0.2.bb b/recipes/python/python-django_1.0.2.bb
index 572e1906a9..918acc0946 100644
--- a/recipes/python/python-django_1.0.2.bb
+++ b/recipes/python/python-django_1.0.2.bb
@@ -27,3 +27,6 @@ RDEPENDS_${PN} = "\
   python-unixadmin \
   python-xml \
 "
+
+SRC_URI[md5sum] = "89353e3749668778f1370d2e444f3adc"
+SRC_URI[sha256sum] = "50a5d228743a69a682899b20141194bf8fd3fd75eaf33ba5f2932f43ea93ea0d"
diff --git a/recipes/python/python-docutils_0.5.bb b/recipes/python/python-docutils_0.5.bb
index 2fc7184b83..547b3a21bd 100644
--- a/recipes/python/python-docutils_0.5.bb
+++ b/recipes/python/python-docutils_0.5.bb
@@ -2,9 +2,17 @@ DESCRIPTION = "Text processing system"
 HOMEPAGE = "http://docutils.sourceforge.net"
 SECTION = "devel/python"
 LICENSE = "PSF"
-PR = "ml0"
+PR = "ml1"
+
+DEPENDS = "python"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/docutils/docutils-${PV}.tar.gz"
 S = "${WORKDIR}/docutils-${PV}"
 
 inherit distutils
+
+NATIVE_INSTALL_WORKS = "1"
+BBCLASSEXTEND = "native"
+
+SRC_URI[md5sum] = "dd72dac92fc8e3eb0f48c3effeef80f6"
+SRC_URI[sha256sum] = "747cf984edfca0575addbb42453274a1bdd98ec7780bd37a883dc8b2a66a610e"
diff --git a/recipes/python/python-dweba_0.9.9+1.0.0pre14.bb b/recipes/python/python-dweba_0.9.9+1.0.0pre14.bb
index ddc5979eab..cbff28c622 100644
--- a/recipes/python/python-dweba_0.9.9+1.0.0pre14.bb
+++ b/recipes/python/python-dweba_0.9.9+1.0.0pre14.bb
@@ -12,3 +12,6 @@ SRC_URI = "http://www.threekong.com/download/dweba/dweba-${RPV}.tar.gz"
 S = "${WORKDIR}/dweba-${RPV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "6f0bd0bcda35c6a96cc3853f16ba82d4"
+SRC_URI[sha256sum] = "ea32ca58b6500d9061177da23ef03f918ef0c5bbbdd082a843f4834cef9c4957"
diff --git a/recipes/python/python-ecore_svn.bb b/recipes/python/python-ecore_svn.bb
index 94daaf1dd4..7d7fbbab0d 100644
--- a/recipes/python/python-ecore_svn.bb
+++ b/recipes/python/python-ecore_svn.bb
@@ -1,8 +1,4 @@
 require python-efl.inc
 SRCREV = "${EFL_SRCREV}"
 DEPENDS += "python-evas ecore"
-RDEPENDS += "python-evas"
-
-do_stage() {
-    distutils_stage_all
-}
+RDEPENDS_${PN} += "python-evas"
diff --git a/recipes/python/python-edbus_svn.bb b/recipes/python/python-edbus_svn.bb
index 00fffeda74..801cc2d599 100644
--- a/recipes/python/python-edbus_svn.bb
+++ b/recipes/python/python-edbus_svn.bb
@@ -1,7 +1,5 @@
 require python-efl.inc
 SRCREV = "${EFL_SRCREV}"
 DEPENDS += "edbus python-dbus"
-RDEPENDS += "python-dbus"
-
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/BINDINGS/python;module=python-e_dbus;proto=http"
-S = "${WORKDIR}/python-e_dbus"
+RDEPENDS_${PN} += "python-dbus"
+SRCNAME = "python-e_dbus"
diff --git a/recipes/python/python-edje/0001-fix-unicode-conversion.patch b/recipes/python/python-edje/0001-fix-unicode-conversion.patch
index 7964e097d1..3b0cdc627c 100644
--- a/recipes/python/python-edje/0001-fix-unicode-conversion.patch
+++ b/recipes/python/python-edje/0001-fix-unicode-conversion.patch
@@ -11,7 +11,7 @@ diff --git a/edje/edje.c_edje_object.pxi b/edje/edje.c_edje_object.pxi
 index 0f4da68..21c237e 100644
 --- a/edje/edje.c_edje_object.pxi
 +++ b/edje/edje.c_edje_object.pxi
-@@ -391,17 +391,20 @@ cdef public class Edje(evas.c_evas.Object) [object PyEdje, type PyEdje_Type]:
+@@ -415,17 +415,20 @@
          else:
              raise TypeError("func must be callable or None")
  
@@ -26,7 +26,7 @@ index 0f4da68..21c237e 100644
      def part_text_get(self, char *part):
 -        "@rtype: str"
 +        "@rtype: unicode"
-         cdef char *s
+         cdef const_char_ptr s
          s = edje_object_part_text_get(self.obj, part)
          if s == NULL:
              return None
@@ -34,8 +34,5 @@ index 0f4da68..21c237e 100644
 -            return s
 +            return s.decode("utf8")
  
-     def part_swallow(self, char *part, c_evas.Object obj):
-         """Swallows an object into the edje
--- 
-1.5.6.3
-
+     def part_text_select_all(self, char *part):
+         edje_object_part_text_select_all(self.obj, part)
diff --git a/recipes/python/python-edje_svn.bb b/recipes/python/python-edje_svn.bb
index 2c087cabfd..09cfbb01c3 100644
--- a/recipes/python/python-edje_svn.bb
+++ b/recipes/python/python-edje_svn.bb
@@ -1,6 +1,6 @@
 require python-efl.inc
 SRCREV = "${EFL_SRCREV}"
 DEPENDS += "edje python-evas"
-RDEPENDS += "python-evas"
+RDEPENDS_${PN} += "python-evas"
 
-SRC_URI += "file://0001-fix-unicode-conversion.patch;patch=1"
+SRC_URI += "file://0001-fix-unicode-conversion.patch"
diff --git a/recipes/python/python-efl.inc b/recipes/python/python-efl.inc
index 9ed7a4cb98..f816305763 100644
--- a/recipes/python/python-efl.inc
+++ b/recipes/python/python-efl.inc
@@ -1,19 +1,28 @@
 DESCRIPTION = "${PN} bindings"
 LICENSE = "BSD"
 AUTHOR = "Gustavo Sverzut Barbieri <barbieri@gmail.com>"
-HOMEPAGE = "http://www.enlightenment.org"
 # NOTE: Due to a bug in distutils, even if we don't use pyrex but cython,
 # we need to build pyrex otherwise cython doesn't get called to build
 # the extension modules.
 DEPENDS = "python-cython-native python-pyrex-native python-numeric eina"
-RDEPENDS += "python-lang"
-PV = "0.3.1+svnr${SRCPV}"
-PR = "ml0"
+RDEPENDS_${PN} += "python-lang"
+PV = "0.7.3+svnr${SRCPV}"
+PR = "ml1"
 
-inherit setuptools
+# necessary to let the call for python-config succeed
+export BUILD_SYS
+export HOST_SYS
 
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/BINDINGS/python;module=${PN};proto=http"
-S = "${WORKDIR}/${PN}"
+inherit e-base autotools pkgconfig distutils-base
+
+SRC_URI = "${E_SVN}/trunk/BINDINGS/python;module=${SRCNAME};proto=http"
+S = "${WORKDIR}/${SRCNAME}"
+
+
+do_configure_prepend() {
+	# prefix CYTHON_.*_INCLUDEDIR with path to STAGING_DIR_HOST also use $PKG_CONFIG instead of pkg-config directly
+        sed -i "s#\`\$PKG_CONFIG --variable=includedir \"python-evas#${STAGING_DIR_HOST}\`\$PKG_CONFIG --variable=includedir \"python-evas#g" ${S}/configure.ac
+}
 
 do_install_append() {
 	if [ -e examples ]; then
@@ -27,8 +36,7 @@ do_install_append() {
 		cd ${S}
 		install -d ${D}${datadir}/${PN}/
 		cp -a examples ${D}${datadir}/${PN}/
-		find ${D}${datadir}/${PN}/examples -name "CVS" | xargs rm -rf
-		find ${D}${datadir}/${PN}/examples -name ".cvsignore" | xargs rm -f
+		find ${D}${datadir}/${PN}/examples -name ".svn" | xargs rm -rf
 	fi
 }
 
diff --git a/recipes/python/python-egenix-mx-base_3.1.1.bb b/recipes/python/python-egenix-mx-base_3.1.1.bb
index aba3a710c7..d177161778 100644
--- a/recipes/python/python-egenix-mx-base_3.1.1.bb
+++ b/recipes/python/python-egenix-mx-base_3.1.1.bb
@@ -17,3 +17,6 @@ export LIB = "${STAGING_LIBDIR}"
 
 FILES_${PN} += "${datadir}"
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/mx/*/*/.debug"
+
+SRC_URI[md5sum] = "d0f3b1adca33a68867bf50f000060cd6"
+SRC_URI[sha256sum] = "a0d03208e335610defc3049d8dd03f4ec7fcf477f44c4897b3f68adc478237ee"
diff --git a/recipes/python/python-elementary_svn.bb b/recipes/python/python-elementary_svn.bb
index ad82e04813..ea184d03a4 100644
--- a/recipes/python/python-elementary_svn.bb
+++ b/recipes/python/python-elementary_svn.bb
@@ -1,10 +1,4 @@
 require python-efl.inc
 SRCREV = "${EFL_SRCREV}"
-DEPENDS += "elementary"
-RDEPENDS += "python-evas python-ecore python-edje" 
-PV = "0.1+svnr${SRCPV}"
-PR = "ml0"
-
-do_stage() {         
-	distutils_stage_all 
-}  
+DEPENDS += "elementary python-evas"
+RDEPENDS_${PN} += "python-evas python-ecore python-edje" 
diff --git a/recipes/python/python-emotion_svn.bb b/recipes/python/python-emotion_svn.bb
index 38e1355ff4..9f558f868e 100644
--- a/recipes/python/python-emotion_svn.bb
+++ b/recipes/python/python-emotion_svn.bb
@@ -1,4 +1,4 @@
 require python-efl.inc
 SRCREV = "${EFL_SRCREV}"
 DEPENDS += "emotion python-evas"
-RDEPENDS += "python-ecore"
+RDEPENDS_${PN} += "python-ecore"
diff --git a/recipes/python/python-epydoc_3.0.1.bb b/recipes/python/python-epydoc_3.0.1.bb
index 36d22ad5a0..73194cf9f9 100644
--- a/recipes/python/python-epydoc_3.0.1.bb
+++ b/recipes/python/python-epydoc_3.0.1.bb
@@ -4,9 +4,18 @@ PRIORITY = "optional"
 LICENSE = "MIT" 
 HOMEPAGE = "http://epydoc.sourceforge.net/" 
 SRCNAME = "epydoc" 
-DEPENDS = "python" 
+DEPENDS += "python"
+DEPENDS_virtclass-native += "python-native"
+PR = "r2"
  
 SRC_URI = "http://downloads.sourceforge.net/project/${SRCNAME}/${SRCNAME}/${PV}/${SRCNAME}-${PV}.tar.gz" 
 S = "${WORKDIR}/${SRCNAME}-${PV}" 
  
 inherit distutils 
+
+SRC_URI[md5sum] = "cdd6f6c76dd8bab5e653a343a0544294"
+SRC_URI[sha256sum] = "d4e5c8d90937d01b05170f592c1fa9b29e9ed0498dfe7f0eb2a3af61725b6ad1"
+
+BBCLASSEXTEND = "native"
+
+NATIVE_INSTALL_WORKS = "1"
diff --git a/recipes/python/python-evas_svn.bb b/recipes/python/python-evas_svn.bb
index d2568bae60..1aaec71fad 100644
--- a/recipes/python/python-evas_svn.bb
+++ b/recipes/python/python-evas_svn.bb
@@ -1,8 +1,3 @@
 require python-efl.inc
 SRCREV = "${EFL_SRCREV}"
 DEPENDS += "evas"
-
-do_stage() {
-	distutils_stage_all
-	distutils_stage_headers
-}
diff --git a/recipes/python/python-fam_1.1.1.bb b/recipes/python/python-fam_1.1.1.bb
index 0a49402973..eb013851d4 100644
--- a/recipes/python/python-fam_1.1.1.bb
+++ b/recipes/python/python-fam_1.1.1.bb
@@ -4,11 +4,14 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "fam"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
 
 inherit distutils
 
-RDEPENDS = "fam python-core python-io"
+RDEPENDS_${PN} = "fam python-core python-io"
 
+
+SRC_URI[md5sum] = "f6c760c6d8e5ea69a3fce029f7973558"
+SRC_URI[sha256sum] = "139f069a4455560a8c68c4c18569f2cb453eeda33d522862f7a4af13932d9cdc"
diff --git a/recipes/python/python-flup_1.0.2.bb b/recipes/python/python-flup_1.0.2.bb
index d5f865da11..344533a994 100644
--- a/recipes/python/python-flup_1.0.2.bb
+++ b/recipes/python/python-flup_1.0.2.bb
@@ -9,3 +9,6 @@ SRC_URI = "http://pypi.python.org/packages/source/f/${SRCNAME}/${SRCNAME}-${PV}.
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
+
+SRC_URI[md5sum] = "24dad7edc5ada31dddd49456ee8d5254"
+SRC_URI[sha256sum] = "4bad317a5fc1ce3d4fe5e9b6d846ec38a8023e16876785d4f88102f2c8097dd9"
diff --git a/recipes/python/python-fnorb_1.3.bb b/recipes/python/python-fnorb_1.3.bb
index 15ae037ca6..b298862c5a 100644
--- a/recipes/python/python-fnorb_1.3.bb
+++ b/recipes/python/python-fnorb_1.3.bb
@@ -9,3 +9,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/fnorb/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "7de1500c7ef6592a603890b45e23261b"
+SRC_URI[sha256sum] = "d4380ab7fa8b8a9f564592b4e07c96117abd2d3f677b8a73c824cf4f904aa294"
diff --git a/recipes/python/python-formencode_1.2.1.bb b/recipes/python/python-formencode_1.2.1.bb
index 99d0537e78..3f1f752998 100644
--- a/recipes/python/python-formencode_1.2.1.bb
+++ b/recipes/python/python-formencode_1.2.1.bb
@@ -9,3 +9,6 @@ inherit setuptools
 
 SRC_URI = "http://pypi.python.org/packages/source/F/FormEncode/FormEncode-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+SRC_URI[md5sum] = "7030996497f3cf012bc9e99b4ca3e920"
+SRC_URI[sha256sum] = "be21e3d5fa2edd1f5ff5952f67e6574dae15a027b26415910dfe813902fd5985"
diff --git a/recipes/python/python-fpconst_0.7.2.bb b/recipes/python/python-fpconst_0.7.2.bb
index 13e2377e02..3d20578988 100644
--- a/recipes/python/python-fpconst_0.7.2.bb
+++ b/recipes/python/python-fpconst_0.7.2.bb
@@ -13,3 +13,6 @@ SRC_URI = "http://pypi.python.org/packages/source/f/fpconst/${SRCNAME}-${PV}.tar
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "10ba9e04129af23108d24c22c3a698b1"
+SRC_URI[sha256sum] = "bd54e294c056c6d52b2037e91d7b2782d6805b24a74923dc80e1c9107acac707"
diff --git a/recipes/python/python-fugrep_0.50.bb b/recipes/python/python-fugrep_0.50.bb
index 9df257388d..181cf6d86f 100644
--- a/recipes/python/python-fugrep_0.50.bb
+++ b/recipes/python/python-fugrep_0.50.bb
@@ -9,3 +9,6 @@ SRC_URI = "http://www.j-raedler.de/media/Software/FuGrep-${PV}.zip"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "83b738d805e17c226f43bbac453a0631"
+SRC_URI[sha256sum] = "14b0fb8ce8a97a0bf7d8f5be57f6bb67dc9e5273f1f465f3babe994c44db3d87"
diff --git a/recipes/python/python-fuse_0.2.bb b/recipes/python/python-fuse_0.2.bb
index 099a0e386a..fcb6af60ff 100644
--- a/recipes/python/python-fuse_0.2.bb
+++ b/recipes/python/python-fuse_0.2.bb
@@ -11,3 +11,6 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 inherit distutils
 
 FILES_${PN}-dbg += "${libdir}/python*/site-packages/fuseparts/.debu*"
+
+SRC_URI[md5sum] = "68be744e71a42cd8a92905a49f346278"
+SRC_URI[sha256sum] = "89f3e9ac096759e10b6292632216c9653d7e35c2c99847267173d94afdf85b92"
diff --git a/recipes/python/python-fusil_1.1.bb b/recipes/python/python-fusil_1.1.bb
index f67612eb45..77320c84f2 100644
--- a/recipes/python/python-fusil_1.1.bb
+++ b/recipes/python/python-fusil_1.1.bb
@@ -20,3 +20,6 @@ RDEPENDS_${PN} = "\
   python-resource \
   python-subprocess \
 "
+
+SRC_URI[md5sum] = "e7dfc39fd169e8ba72b0aeb304acb25b"
+SRC_URI[sha256sum] = "85f9a52578c9af3d2a062097144cb6dc507fff7df7e286479010e65cf6b6f23d"
diff --git a/recipes/python/python-gdata_1.2.4.bb b/recipes/python/python-gdata_1.2.4.bb
index 2e7e424976..464023149f 100644
--- a/recipes/python/python-gdata_1.2.4.bb
+++ b/recipes/python/python-gdata_1.2.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Google Data APIs Python Client Library"
 SECTION = "devel/python"
 LICENSE = "Apache"
 HOMEPAGE = "http://code.google.com/p/gdata-python-client/"
-PR = "r0"
+PR = "r1"
 
 inherit distutils
 
@@ -11,5 +11,8 @@ S = "${WORKDIR}/gdata.py-${PV}"
 
 FILES_${PN} += "${datadir}"
 
-RDEPENDS = "python-elementtree"
+RDEPENDS_${PN} = "python-elementtree"
 
+
+SRC_URI[md5sum] = "521f33a377d64f8a6505ba119415b787"
+SRC_URI[sha256sum] = "fc5ddb8f76b17abd728721a0e0177ea35f55a70106f44dc9010b22eceb06abde"
diff --git a/recipes/python/python-gmpy_1.0.1.bb b/recipes/python/python-gmpy_1.0.1.bb
index a5f064261b..f72cec1543 100644
--- a/recipes/python/python-gmpy_1.0.1.bb
+++ b/recipes/python/python-gmpy_1.0.1.bb
@@ -10,3 +10,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-sources-101.zip"
 S = "${WORKDIR}/${SRCNAME}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "7b2e951912d4bee9613c35244ca32673"
+SRC_URI[sha256sum] = "5cd061fa5d4906d6aa7183393c98d070dc689cbb946c13bebab6d6e4ecdc2231"
diff --git a/recipes/python/python-gnosis_1.2.2.bb b/recipes/python/python-gnosis_1.2.2.bb
index c4ee333990..d0fb2ed30c 100644
--- a/recipes/python/python-gnosis_1.2.2.bb
+++ b/recipes/python/python-gnosis_1.2.2.bb
@@ -10,3 +10,6 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
+
+SRC_URI[md5sum] = "729984e5858fa626359a8d6447a24bae"
+SRC_URI[sha256sum] = "5673927f18790511f2a01004a51110e167f7950e7accf9e1bc6832a4bfed4feb"
diff --git a/recipes/python/python-gst_0.10.10.bb b/recipes/python/python-gst_0.10.10.bb
index 0de87d6f42..f875939c39 100644
--- a/recipes/python/python-gst_0.10.10.bb
+++ b/recipes/python/python-gst_0.10.10.bb
@@ -6,8 +6,8 @@ PR = "ml4"
 
 SRC_URI = "\
   http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
-  file://python-path.patch;patch=1 \
-  file://import-gobject-instead-of-pygtk.patch;patch=1 \
+  file://python-path.patch \
+  file://import-gobject-instead-of-pygtk.patch \
 "
 S = "${WORKDIR}/gst-python-${PV}"
 
@@ -22,10 +22,6 @@ do_configure_prepend() {
     install -m 0644 ${S}/common/m4/*.m4 ${S}/m4/
 }
 
-do_stage() {
-	autotools_stage_all
-}
-
 PACKAGES =+ "${PN}-examples"
 
 FILES_${PN} += "${datadir}/gst-python"
@@ -35,3 +31,6 @@ FILES_${PN}-dev += "\
 "
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/"
 FILES_${PN}-examples = "${datadir}/gst-python/0.10/examples"
+
+SRC_URI[md5sum] = "6183d61e434b5d34f232248a35571627"
+SRC_URI[sha256sum] = "c875753a6cccd40a79f5824ea5ec51ee4615a4f22103e4adfc6a0221bf615d8e"
diff --git a/recipes/python/python-gst_0.10.17.bb b/recipes/python/python-gst_0.10.17.bb
index b0b552b7e1..c3a33cd1b9 100644
--- a/recipes/python/python-gst_0.10.17.bb
+++ b/recipes/python/python-gst_0.10.17.bb
@@ -7,8 +7,8 @@ PR = "r1"
 
 SRC_URI = "\
   http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
-  file://python-path.patch;patch=1 \
-  file://import-gobject-instead-of-pygtk.patch;patch=1 \
+  file://python-path.patch \
+  file://import-gobject-instead-of-pygtk.patch \
 "
 S = "${WORKDIR}/gst-python-${PV}"
 
@@ -26,10 +26,6 @@ do_configure_prepend() {
     install -m 0644 ${S}/common/m4/*.m4 ${S}/m4/
 }
 
-do_stage() {
-	autotools_stage_all
-}
-
 PACKAGES =+ "${PN}-examples"
 
 FILES_${PN} += "${datadir}/gst-python"
@@ -39,3 +35,6 @@ FILES_${PN}-dev += "\
 "
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/ ${libdir}/gstreamer-0.10/.debug/"
 FILES_${PN}-examples = "${datadir}/gst-python/0.10/examples"
+
+SRC_URI[md5sum] = "3998753de6500ee8c18ce1456df43df6"
+SRC_URI[sha256sum] = "70cef839b429dcea0cae342d24bc2e0e5deae01e902a8858e2c7dd76a724cde9"
diff --git a/recipes/python/python-imaging_1.1.6.bb b/recipes/python/python-imaging_1.1.6.bb
index 03e0330e1c..ffb5300b84 100644
--- a/recipes/python/python-imaging_1.1.6.bb
+++ b/recipes/python/python-imaging_1.1.6.bb
@@ -3,12 +3,12 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "freetype jpeg tiff"
-RDEPENDS = "python-lang python-stringold"
+RDEPENDS_${PN} = "python-lang python-stringold"
 SRCNAME = "Imaging"
-PR = "ml1"
+PR = "ml2"
 
 SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \
-           file://path.patch;patch=1"
+           file://path.patch"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
@@ -28,3 +28,6 @@ do_install() {
     install -m 0644 ${S}/Docs/* ${D}${datadir}/doc/${PN}/html/
 
 }
+
+SRC_URI[md5sum] = "3a9b5c20ca52f0a9900512d2c7347622"
+SRC_URI[sha256sum] = "7dd7358ab519161967c838df27465282d180a3206f693ba2db64273d688b3f90"
diff --git a/recipes/python/python-imdbpy_3.9.bb b/recipes/python/python-imdbpy_3.9.bb
index 72d30fb89b..4cbec22c80 100644
--- a/recipes/python/python-imdbpy_3.9.bb
+++ b/recipes/python/python-imdbpy_3.9.bb
@@ -12,3 +12,6 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 inherit distutils
 
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/imdb/parser/common/.debug"
+
+SRC_URI[md5sum] = "8c7bef46f54451c809ffd99e2f1eee2d"
+SRC_URI[sha256sum] = "b677e2f0539b90d1c0a844b9ab0f19ac41424c7c2b9335d17695765f2d7b1b80"
diff --git a/recipes/python/python-iniparse-native_0.2.3.bb b/recipes/python/python-iniparse-native_0.2.3.bb
index 68dd2184a8..be3b57e7aa 100644
--- a/recipes/python/python-iniparse-native_0.2.3.bb
+++ b/recipes/python/python-iniparse-native_0.2.3.bb
@@ -1,8 +1,8 @@
 require python-iniparse_${PV}.bb
 inherit native
 DEPENDS = "python-native"
-RDEPENDS = ""
-PR = "r1"
+RDEPENDS_${PN} = ""
+PR = "r2"
 
 do_stage() {
 	distutils_stage_all
diff --git a/recipes/python/python-iniparse_0.2.3.bb b/recipes/python/python-iniparse_0.2.3.bb
index 27a38f4249..543b754d95 100644
--- a/recipes/python/python-iniparse_0.2.3.bb
+++ b/recipes/python/python-iniparse_0.2.3.bb
@@ -9,3 +9,6 @@ SRC_URI = "http://iniparse.googlecode.com/files/iniparse-${PV}.tar.gz"
 S = "${WORKDIR}/iniparse-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "194a04cc93fe123f244ca33e7724bdf6"
+SRC_URI[sha256sum] = "f1252122f09cc63a57843ec1b8a51ce30c7bfcbc857f476a996b374006433a48"
diff --git a/recipes/python/python-inotify_0.1.0.bb b/recipes/python/python-inotify_0.1.0.bb
index 13031d31a7..05c51ac297 100644
--- a/recipes/python/python-inotify_0.1.0.bb
+++ b/recipes/python/python-inotify_0.1.0.bb
@@ -8,3 +8,6 @@ SRC_URI = "http://rudd-o.com/wp-content/uploads/projects/files/python-inotify/py
 
 inherit distutils
 
+
+SRC_URI[md5sum] = "361bcab2f0cd57cdaf6fe6fe433778b0"
+SRC_URI[sha256sum] = "22557b44a693918d2a4a4b267b22dd2baa542539e225e3999e1a2b1bf91b954a"
diff --git a/recipes/python/python-irclib_0.4.6.bb b/recipes/python/python-irclib_0.4.6.bb
index e416156e92..e104029dc6 100644
--- a/recipes/python/python-irclib_0.4.6.bb
+++ b/recipes/python/python-irclib_0.4.6.bb
@@ -9,3 +9,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/python-irclib/python-irclib-${PV}.tar.gz"
 
 inherit distutils
 
+
+SRC_URI[md5sum] = "7e4fc4b5382c6b54ede8b6e29270cba8"
+SRC_URI[sha256sum] = "f1f472a698966b0350857b20fc7f6dd86e4a1f83870edfbe30eb36552b449680"
diff --git a/recipes/python/python-ldap_2.3.9.bb b/recipes/python/python-ldap_2.3.9.bb
index 8a605e49e4..de7d633855 100644
--- a/recipes/python/python-ldap_2.3.9.bb
+++ b/recipes/python/python-ldap_2.3.9.bb
@@ -4,8 +4,12 @@ PRIORITY = "optional"
 LICENSE = "Python-style" 
 HOMEPAGE = "http://www.python-ldap.org/" 
 DEPENDS = "python openldap" 
+PR = "r1"
  
 SRC_URI = "http://pypi.python.org/packages/source/p/${PN}/${PN}-${PV}.tar.gz \ 
-           file://setup.cfg.patch;patch=1"  
+           file://setup.cfg.patch"  
  
 inherit setuptools  
+
+SRC_URI[md5sum] = "a9f9f16338288d118a1ae6266c993247"
+SRC_URI[sha256sum] = "62f75b21c5ee744408c9d8b59878328b3bdf47899d30e8abf0c09b3ffb893ed4"
diff --git a/recipes/python/python-libgmail_0.1.11.bb b/recipes/python/python-libgmail_0.1.11.bb
index b0fcb1f83f..6a650e49d6 100644
--- a/recipes/python/python-libgmail_0.1.11.bb
+++ b/recipes/python/python-libgmail_0.1.11.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://libgmail.sourceforge.net/"
 PRIORITY = "optional"
 LICENSE = "GPL"
 SRCNAME = "libgmail"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
@@ -19,7 +19,7 @@ do_install() {
 	done
 }
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
   python-core \
   python-netclient \
   python-email \
@@ -29,3 +29,6 @@ RDEPENDS = "\
   python-pickle \
 "
 
+
+SRC_URI[md5sum] = "247477ac98b39658fdcdee8d65639e51"
+SRC_URI[sha256sum] = "2d94f1230f591dfa6d1b726338063f28b89b2f82ba5b866ab077c86c598de43e"
diff --git a/recipes/python/python-logilab-common_0.37.1.bb b/recipes/python/python-logilab-common_0.37.1.bb
index 1f8c41e883..6764a54cbc 100644
--- a/recipes/python/python-logilab-common_0.37.1.bb
+++ b/recipes/python/python-logilab-common_0.37.1.bb
@@ -12,3 +12,6 @@ SRC_URI = "ftp://ftp.logilab.fr/pub/common/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "39561a45c74f8ff11e2ddd872f4ee5bc"
+SRC_URI[sha256sum] = "c5974c1e98bed62bb3153a8144069c43229c6b208ef599bc77c84fb493c2291b"
diff --git a/recipes/python/python-m2crypto/m2crypto-0.20.2-openssl-1.0.0.patch b/recipes/python/python-m2crypto/m2crypto-0.20.2-openssl-1.0.0.patch
new file mode 100644
index 0000000000..3809e5b656
--- /dev/null
+++ b/recipes/python/python-m2crypto/m2crypto-0.20.2-openssl-1.0.0.patch
@@ -0,0 +1,713 @@
+--- SWIG/_aes.i
++++ SWIG/_aes.i
+@@ -76,7 +76,7 @@
+         AES_encrypt((const unsigned char *)in, out, key);
+     else
+         AES_decrypt((const unsigned char *)in, out, key);
+-    return PyString_FromStringAndSize(out, outlen);
++    return PyString_FromStringAndSize((char*)out, outlen);
+ }
+ 
+ int AES_type_check(AES_KEY *key) {
+--- SWIG/_evp.i
++++ SWIG/_evp.i
+@@ -4,6 +4,9 @@
+ 
+ Portions Copyright (c) 2004-2007 Open Source Applications Foundation.
+ Author: Heikki Toivonen
++
++Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved.
++
+ */
+ 
+ %include <openssl/opensslconf.h>
+@@ -180,7 +183,7 @@
+ 
+     PKCS5_PBKDF2_HMAC_SHA1(passbuf, passlen, saltbuf, saltlen, iter,
+                            keylen, key);
+-    ret = PyString_FromStringAndSize(key, keylen);
++    ret = PyString_FromStringAndSize((char*)key, keylen);
+     OPENSSL_cleanse(key, keylen);
+     return ret;
+ }
+@@ -339,7 +342,7 @@
+     klen = EVP_BytesToKey(cipher, md, (unsigned char *)sbuf, 
+         (unsigned char *)dbuf, dlen, iter, 
+         key, NULL); /* Since we are not returning IV no need to derive it */
+-    ret = PyString_FromStringAndSize(key, klen);
++    ret = PyString_FromStringAndSize((char*)key, klen);
+     return ret;
+ }
+ 
+@@ -435,7 +438,7 @@
+         PyErr_SetString(_evp_err, ERR_reason_error_string(ERR_get_error()));
+         return NULL;
+     }
+-    ret = PyString_FromStringAndSize(sigbuf, siglen);
++    ret = PyString_FromStringAndSize((char*)sigbuf, siglen);
+     OPENSSL_cleanse(sigbuf, siglen);
+     OPENSSL_free(sigbuf);
+     return ret;
+@@ -513,7 +516,7 @@
+         PyErr_SetString(PyExc_ValueError, "EVP_PKEY as DER failed");
+         return NULL; 
+     }
+-    der = PyString_FromStringAndSize(pp, len);
++    der = PyString_FromStringAndSize((char*)pp, len);
+     OPENSSL_free(pp);
+     return der;
+ }
+--- SWIG/_m2crypto.i
++++ SWIG/_m2crypto.i
+@@ -3,6 +3,9 @@
+  *
+  * Portions created by Open Source Applications Foundation (OSAF) are
+  * Copyright (C) 2004-2006 OSAF. All Rights Reserved.
++ *
++ * Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved.
++ *
+  */
+ 
+ %module(threads=1) _m2crypto
+@@ -38,6 +41,19 @@
+ #define CONST098
+ #endif
+ 
++/* Bring in STACK_OF macro definition */
++%include <openssl/safestack.h>
++
++/* Bring in LHASH_OF macro definition */
++/* XXX Can't include lhash.h where LHASH_OF is defined, because it includes
++   XXX stdio.h etc. which we fail to include. So we have to (re)define
++   XXX LHASH_OF here instead.
++%include <openssl/lhash.h>
++*/
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#define LHASH_OF(type) struct lhash_st_##type
++#endif
++
+ %include constraints.i
+ %include _threads.i
+ %include _lib.i
+--- SWIG/_pkcs7.i
++++ SWIG/_pkcs7.i
+@@ -12,7 +12,7 @@
+ %apply Pointer NONNULL { EVP_CIPHER * };
+ %apply Pointer NONNULL { EVP_PKEY * };
+ %apply Pointer NONNULL { PKCS7 * };
+-%apply Pointer NONNULL { STACK * };
++%apply Pointer NONNULL { STACK_OF(X509) * };
+ %apply Pointer NONNULL { X509 * };
+ 
+ %rename(pkcs7_new) PKCS7_new;
+@@ -54,8 +54,8 @@
+ 
+ %threadallow pkcs7_encrypt;
+ %inline %{
+-PKCS7 *pkcs7_encrypt(STACK *stack, BIO *bio, EVP_CIPHER *cipher, int flags) {
+-    return PKCS7_encrypt((STACK_OF(X509) *)stack, bio, cipher, flags);
++PKCS7 *pkcs7_encrypt(STACK_OF(X509) *stack, BIO *bio, EVP_CIPHER *cipher, int flags) {
++    return PKCS7_encrypt(stack, bio, cipher, flags);
+ }
+ 
+ PyObject *pkcs7_decrypt(PKCS7 *pkcs7, EVP_PKEY *pkey, X509 *cert, int flags) {
+@@ -96,14 +96,14 @@
+ 
+ %threadallow pkcs7_sign1;
+ %inline %{
+-PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK *stack, BIO *bio, int flags) {
+-    return PKCS7_sign(x509, pkey, (STACK_OF(X509) *)stack, bio, flags);
++PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK_OF(X509) *stack, BIO *bio, int flags) {
++    return PKCS7_sign(x509, pkey, stack, bio, flags);
+ }
+ %}
+ 
+ %threadallow pkcs7_verify1;
+ %inline %{
+-PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, BIO *data, int flags) {
++PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, BIO *data, int flags) {
+     int outlen;
+     char *outbuf;
+     BIO *bio;
+@@ -113,7 +113,7 @@
+         PyErr_SetString(PyExc_MemoryError, "pkcs7_verify1");
+         return NULL;
+     }
+-    if (!PKCS7_verify(pkcs7, (STACK_OF(X509) *)stack, store, data, bio, flags)) {
++    if (!PKCS7_verify(pkcs7, stack, store, data, bio, flags)) {
+         PyErr_SetString(_pkcs7_err, ERR_reason_error_string(ERR_get_error()));
+         BIO_free(bio);
+         return NULL;
+@@ -131,7 +131,7 @@
+     return ret;
+ }
+ 
+-PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, int flags) {
++PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, int flags) {
+     return pkcs7_verify1(pkcs7, stack, store, NULL, flags);
+ }
+ %}
+@@ -229,7 +229,7 @@
+ }
+ 
+ /* return STACK_OF(X509)* */     
+-STACK *pkcs7_get0_signers(PKCS7 *p7, STACK *certs, int flags) {     
++STACK_OF(X509) *pkcs7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags) {     
+     return PKCS7_get0_signers(p7, certs, flags);      
+ }
+ 
+--- SWIG/_rand.i
++++ SWIG/_rand.i
+@@ -87,7 +87,7 @@
+         Py_INCREF(Py_None);
+         return Py_None;
+     } else {
+-        PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize(blob, n));
++        PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize((char*)blob, n));
+         PyMem_Free(blob);
+         PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong((long)ret));
+         return tuple;
+--- SWIG/_ssl.i
++++ SWIG/_ssl.i
+@@ -3,6 +3,9 @@
+ /*
+ ** Portions created by Open Source Applications Foundation (OSAF) are
+ ** Copyright (C) 2004-2005 OSAF. All Rights Reserved.
++**
++** Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved.
++**
+ */
+ /* $Id: m2crypto-0.20.2-openssl-1.0.0.patch,v 1.1 2010/04/30 18:21:16 arfrever Exp $ */
+ 
+@@ -17,13 +20,17 @@
+ %apply Pointer NONNULL { SSL_CTX * };
+ %apply Pointer NONNULL { SSL * };
+ %apply Pointer NONNULL { SSL_CIPHER * };
+-%apply Pointer NONNULL { STACK * };
++%apply Pointer NONNULL { STACK_OF(SSL_CIPHER) * };
++%apply Pointer NONNULL { STACK_OF(X509) * };
+ %apply Pointer NONNULL { BIO * };
+ %apply Pointer NONNULL { DH * };
+ %apply Pointer NONNULL { RSA * };
+ %apply Pointer NONNULL { EVP_PKEY *};
+ %apply Pointer NONNULL { PyObject *pyfunc };
+ 
++%rename(ssl_get_ciphers) SSL_get_ciphers;
++extern STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *ssl);
++
+ %rename(ssl_get_version) SSL_get_version;
+ extern const char *SSL_get_version(CONST SSL *);
+ %rename(ssl_get_error) SSL_get_error;
+@@ -668,28 +675,24 @@
+     return SSL_CIPHER_get_bits(c, NULL);
+ }
+ 
+-STACK *ssl_get_ciphers(SSL *ssl) {
+-    return (STACK *)SSL_get_ciphers(ssl);
+-}
+-
+-int sk_ssl_cipher_num(STACK *stack) {
+-    return sk_num(stack);
++int sk_ssl_cipher_num(STACK_OF(SSL_CIPHER) *stack) {
++    return sk_SSL_CIPHER_num(stack);
+ }
+ 
+-SSL_CIPHER *sk_ssl_cipher_value(STACK *stack, int idx) {
+-    return (SSL_CIPHER *)sk_value(stack, idx);
++SSL_CIPHER *sk_ssl_cipher_value(STACK_OF(SSL_CIPHER) *stack, int idx) {
++    return sk_SSL_CIPHER_value(stack, idx);
+ }
+ 
+-STACK *ssl_get_peer_cert_chain(SSL *ssl) {
+-    return (STACK *)SSL_get_peer_cert_chain(ssl);
++STACK_OF(X509) *ssl_get_peer_cert_chain(SSL *ssl) {
++    return SSL_get_peer_cert_chain(ssl);
+ }
+ 
+-int sk_x509_num(STACK *stack) {
+-    return sk_num(stack);
++int sk_x509_num(STACK_OF(X509) *stack) {
++    return sk_X509_num(stack);
+ }
+ 
+-X509 *sk_x509_value(STACK *stack, int idx) {
+-    return (X509 *)sk_value(stack, idx);
++X509 *sk_x509_value(STACK_OF(X509) *stack, int idx) {
++    return sk_X509_value(stack, idx);
+ }
+ %}
+ 
+--- SWIG/_util.i
++++ SWIG/_util.i
+@@ -48,7 +48,7 @@
+         PyErr_SetString(_util_err, ERR_reason_error_string(ERR_get_error()));
+         return NULL;
+     }
+-    obj = PyString_FromStringAndSize(ret, len);
++    obj = PyString_FromStringAndSize((char*)ret, len);
+     OPENSSL_free(ret);
+     return obj;
+ }
+--- SWIG/_x509.i
++++ SWIG/_x509.i
+@@ -3,6 +3,9 @@
+ /*
+ ** Portions created by Open Source Applications Foundation (OSAF) are
+ ** Copyright (C) 2004-2005 OSAF. All Rights Reserved.
++**
++** Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved.
++**
+ */
+ /* $Id: m2crypto-0.20.2-openssl-1.0.0.patch,v 1.1 2010/04/30 18:21:16 arfrever Exp $   */
+ 
+@@ -148,8 +151,15 @@
+ extern int X509_NAME_print_ex(BIO *, X509_NAME *, int, unsigned long);
+ %rename(x509_name_print_ex_fp) X509_NAME_print_ex_fp;
+ extern int X509_NAME_print_ex_fp(FILE *, X509_NAME *, int, unsigned long);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++%rename(x509_name_hash) X509_NAME_hash_old;
++extern unsigned long X509_NAME_hash_old(X509_NAME *);
++#else
+ %rename(x509_name_hash) X509_NAME_hash;
+ extern unsigned long X509_NAME_hash(X509_NAME *);
++#endif
++
+ %rename(x509_name_get_index_by_nid) X509_NAME_get_index_by_NID;
+ extern int X509_NAME_get_index_by_NID(X509_NAME *, int, int);
+ 
+@@ -171,7 +181,7 @@
+     if (PyString_Check($input)) {
+         Py_ssize_t len;
+ 
+-        $1 = PyString_AsString($input); 
++        $1 = (unsigned char *)PyString_AsString($input); 
+         len = PyString_Size($input);
+         if (len > INT_MAX) {
+             PyErr_SetString(PyExc_ValueError, "object too large");
+@@ -184,7 +194,7 @@
+     }
+ }
+ %rename(x509_name_entry_set_data) X509_NAME_ENTRY_set_data;
+-extern int X509_NAME_ENTRY_set_data( X509_NAME_ENTRY *, int, CONST unsigned char *, int);
++extern int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *, int, CONST unsigned char *, int);
+ %typemap(in) (CONST unsigned char *, int);
+ 
+ %rename(x509_req_new) X509_REQ_new;
+@@ -230,7 +240,7 @@
+ %rename(x509_store_ctx_free) X509_STORE_CTX_free;
+ extern void X509_STORE_CTX_free(X509_STORE_CTX *);
+ %rename(x509_store_ctx_get1_chain) X509_STORE_CTX_get1_chain;
+-extern STACK *X509_STORE_CTX_get1_chain(X509_STORE_CTX *);
++extern STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *);
+ 
+ %rename(x509_extension_get_critical) X509_EXTENSION_get_critical;
+ extern int X509_EXTENSION_get_critical(X509_EXTENSION *);
+@@ -348,7 +358,7 @@
+         PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
+     }
+     else {     
+-        ret = PyString_FromStringAndSize(buf, len);
++        ret = PyString_FromStringAndSize((char*)buf, len);
+         OPENSSL_free(buf);
+     }
+     return ret;
+@@ -435,12 +445,12 @@
+ }
+ 
+ int x509_name_set_by_nid(X509_NAME *name, int nid, PyObject *obj) {
+-    return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, PyString_AsString(obj), -1, -1, 0);
++    return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, (unsigned char *)PyString_AsString(obj), -1, -1, 0);
+ }
+ 
+ /* x509_name_add_entry_by_txt */
+ int x509_name_add_entry_by_txt(X509_NAME *name, char *field, int type, char *bytes, int len, int loc, int set) {
+-    return X509_NAME_add_entry_by_txt(name, field, type, bytes, len, loc, set);
++    return X509_NAME_add_entry_by_txt(name, field, type, (unsigned char *)bytes, len, loc, set);
+ }
+ 
+ PyObject *x509_name_get_der(X509_NAME *name)
+@@ -450,23 +460,23 @@
+ }
+ 
+ /* sk_X509_new_null() is a macro returning "STACK_OF(X509) *". */
+-STACK *sk_x509_new_null(void) {
+-    return (STACK *)sk_X509_new_null();
++STACK_OF(X509) *sk_x509_new_null(void) {
++    return sk_X509_new_null();
+ }
+ 
+ /* sk_X509_free() is a macro. */
+-void sk_x509_free(STACK *stack) {
+-    sk_X509_free((STACK_OF(X509) *)stack);
++void sk_x509_free(STACK_OF(X509) *stack) {
++    sk_X509_free(stack);
+ }
+ 
+ /* sk_X509_push() is a macro. */
+-int sk_x509_push(STACK *stack, X509 *x509) {
+-    return sk_X509_push((STACK_OF(X509) *)stack, x509);
++int sk_x509_push(STACK_OF(X509) *stack, X509 *x509) {
++    return sk_X509_push(stack, x509);
+ }
+ 
+ /* sk_X509_pop() is a macro. */
+-X509 *sk_x509_pop(STACK *stack) {
+-    return sk_X509_pop((STACK_OF(X509) *)stack);
++X509 *sk_x509_pop(STACK_OF(X509) *stack) {
++    return sk_X509_pop(stack);
+ }
+ 
+ int x509_store_load_locations(X509_STORE *store, const char *file) {
+@@ -493,21 +503,29 @@
+     return X509_REQ_set_version(x, version);
+ }
+ 
+-int x509_req_add_extensions(X509_REQ *req, STACK *exts) {
+-    return X509_REQ_add_extensions(req, (STACK_OF(X509_EXTENSION) *)exts);
++int x509_req_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts) {
++    return X509_REQ_add_extensions(req, exts);
+ }
+ 
+-X509_NAME_ENTRY *x509_name_entry_create_by_txt( X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) {
+-    return X509_NAME_ENTRY_create_by_txt( ne, field, type, bytes, len);
++X509_NAME_ENTRY *x509_name_entry_create_by_txt(X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) {
++    return X509_NAME_ENTRY_create_by_txt( ne, field, type, (unsigned char *)bytes, len);
+ }
+ 
+-LHASH * 
+-x509v3_lhash(){ 
+-       return lh_new(NULL,NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++LHASH_OF(CONF_VALUE) 
++#else
++LHASH
++#endif
++*x509v3_lhash() { 
++    return lh_new(NULL, NULL); /* Should probably be lh_CONF_VALUE_new but won't compile. */
+ }
+ 
+ X509V3_CTX *
+-x509v3_set_conf_lhash(LHASH * lhash){
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++x509v3_set_conf_lhash(LHASH_OF(CONF_VALUE) * lhash) {
++#else
++x509v3_set_conf_lhash(LHASH                * lhash) {
++#endif
+       X509V3_CTX * ctx;
+       if (!(ctx=(X509V3_CTX *)PyMem_Malloc(sizeof(X509V3_CTX)))) {
+           PyErr_SetString(PyExc_MemoryError, "x509v3_set_conf_lhash");
+@@ -517,11 +535,20 @@
+       return ctx;
+ }
+ 
+-X509_EXTENSION *x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) {
++X509_EXTENSION *
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++x509v3_ext_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, char *name, char *value) {
++#else
++x509v3_ext_conf(LHASH                *conf, X509V3_CTX *ctx, char *name, char *value) {
++#endif
+       X509_EXTENSION * ext = NULL;
+       ext = X509V3_EXT_conf(conf, ctx, name, value); 
+       PyMem_Free(ctx); 
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++      lh_CONF_VALUE_free(conf);
++#else
+       lh_free(conf);
++#endif
+       return ext;
+ }
+ 
+@@ -543,33 +570,33 @@
+ }
+ 
+ /* sk_X509_EXTENSION_new_null is a macro. */
+-STACK *sk_x509_extension_new_null(void) {
+-    return (STACK *)sk_X509_EXTENSION_new_null();
++STACK_OF(X509_EXTENSION) *sk_x509_extension_new_null(void) {
++    return sk_X509_EXTENSION_new_null();
+ }
+ 
+ /* sk_X509_EXTENSION_free() is a macro. */
+-void sk_x509_extension_free(STACK *stack) {
+-    sk_X509_EXTENSION_free((STACK_OF(X509_EXTENSION) *)stack);
++void sk_x509_extension_free(STACK_OF(X509_EXTENSION) *stack) {
++    sk_X509_EXTENSION_free(stack);
+ }
+ 
+ /* sk_X509_EXTENSION_push() is a macro. */
+-int sk_x509_extension_push(STACK *stack, X509_EXTENSION *x509_ext) {
+-    return sk_X509_EXTENSION_push((STACK_OF(X509_EXTENSION) *)stack, x509_ext);
++int sk_x509_extension_push(STACK_OF(X509_EXTENSION) *stack, X509_EXTENSION *x509_ext) {
++    return sk_X509_EXTENSION_push(stack, x509_ext);
+ }
+ 
+ /* sk_X509_EXTENSION_pop() is a macro. */
+-X509_EXTENSION *sk_x509_extension_pop(STACK *stack) {
+-    return sk_X509_EXTENSION_pop((STACK_OF(X509_EXTENSION) *)stack);
++X509_EXTENSION *sk_x509_extension_pop(STACK_OF(X509_EXTENSION) *stack) {
++    return sk_X509_EXTENSION_pop(stack);
+ }
+ 
+ /* sk_X509_EXTENSION_num() is a macro. */
+-int sk_x509_extension_num(STACK *stack) {
+-    return sk_X509_EXTENSION_num((STACK_OF(X509_EXTENSION) *)stack);
++int sk_x509_extension_num(STACK_OF(X509_EXTENSION) *stack) {
++    return sk_X509_EXTENSION_num(stack);
+ }
+ 
+ /* sk_X509_EXTENSION_value() is a macro. */
+-X509_EXTENSION *sk_x509_extension_value(STACK *stack, int i) {
+-    return sk_X509_EXTENSION_value((STACK_OF(X509_EXTENSION) *)stack, i);
++X509_EXTENSION *sk_x509_extension_value(STACK_OF(X509_EXTENSION) *stack, int i) {
++    return sk_X509_EXTENSION_value(stack, i);
+ }
+ 
+ /* X509_STORE_CTX_get_app_data is a macro. */
+@@ -590,7 +617,7 @@
+ #define I2DTYPE int (*)()
+ #endif   
+ 
+-STACK *
++STACK_OF(X509) *
+ make_stack_from_der_sequence(PyObject * pyEncodedString){
+     STACK_OF(X509) *certs;
+     Py_ssize_t encoded_string_len;
+@@ -606,7 +633,7 @@
+         return NULL;
+     }
+ 
+-    certs = ASN1_seq_unpack((unsigned char *)encoded_string, encoded_string_len, (D2ITYPE)d2i_X509, (void(*)())X509_free ); 
++    certs = ASN1_seq_unpack_X509((unsigned char *)encoded_string, encoded_string_len, d2i_X509, X509_free ); 
+     if (!certs) {
+        PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
+        return NULL;
+@@ -616,13 +643,13 @@
+ }
+ 
+ PyObject *
+-get_der_encoding_stack(STACK * stack){
++get_der_encoding_stack(STACK_OF(X509) *stack){
+     PyObject * encodedString;
+     
+     unsigned char * encoding;
+     int len; 
+     
+-    encoding = ASN1_seq_pack((STACK_OF(X509)*) stack, (I2DTYPE)i2d_X509, NULL, &len); 
++    encoding = ASN1_seq_pack_X509(stack, i2d_X509, NULL, &len); 
+     if (!encoding) {
+        PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
+        return NULL;
+--- tests/alltests.py
++++ tests/alltests.py
+@@ -37,6 +37,7 @@
+         'tests.test_rc4',
+         'tests.test_rsa',
+         'tests.test_smime',
++        'tests.test_ssl_offline',
+         'tests.test_threading',
+         'tests.test_x509']
+     if os.name == 'posix':
+--- tests/test_smime.py
++++ tests/test_smime.py
+@@ -37,7 +37,7 @@
+         buf = BIO.MemoryBuffer(self.cleartext)
+         s = SMIME.SMIME()
+         s.load_key('tests/signer_key.pem', 'tests/signer.pem')
+-        p7 = s.sign(buf)
++        p7 = s.sign(buf, SMIME.PKCS7_DETACHED)
+         assert len(buf) == 0
+         assert p7.type() == SMIME.PKCS7_SIGNED, p7.type()
+         assert isinstance(p7, SMIME.PKCS7), p7
+@@ -73,9 +73,8 @@
+         
+         p7, data = SMIME.smime_load_pkcs7_bio(self.signed)
+         
+-        assert data.read() == self.cleartext
+         assert isinstance(p7, SMIME.PKCS7), p7
+-        v = s.verify(p7)
++        v = s.verify(p7, data)
+         assert v == self.cleartext
+     
+         t = p7.get0_signers(sk)
+@@ -95,7 +94,6 @@
+         s.set_x509_store(st)
+         
+         p7, data = SMIME.smime_load_pkcs7_bio(self.signed)
+-        assert data.read() == self.cleartext
+         assert isinstance(p7, SMIME.PKCS7), p7
+         self.assertRaises(SMIME.PKCS7_Error, s.verify, p7) # Bad signer
+ 
+@@ -169,7 +167,7 @@
+         s.set_cipher(SMIME.Cipher('des_ede3_cbc'))
+         
+         tmp = BIO.MemoryBuffer()
+-        s.write(tmp, p7, buf)
++        s.write(tmp, p7)
+ 
+         p7 = s.encrypt(tmp)
+         
+@@ -211,6 +209,7 @@
+         assert p7.write(f) == 1
+         f.close()
+ 
++        p7 = s.sign(BIO.MemoryBuffer('some text'), SMIME.PKCS7_DETACHED)
+         self.filenameSmime = 'tests/sig.p7s'
+         f = BIO.openfile(self.filenameSmime, 'wb')
+         assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1
+@@ -220,7 +219,7 @@
+         buf = BIO.MemoryBuffer()
+         assert SMIME.load_pkcs7(self.filename).write_der(buf) == 1
+         s = buf.read()
+-        assert len(s) == 1204, len(s)
++        assert len(s) in (1204, 1243), len(s)
+         
+     def test_load_pkcs7(self):
+         assert SMIME.load_pkcs7(self.filename).type() == SMIME.PKCS7_SIGNED
+--- tests/test_ssl_offline.py
++++ tests/test_ssl_offline.py
+@@ -0,0 +1,60 @@
++"""Unit tests for M2Crypto.SSL offline parts
++
++Copyright (C) 2006 Open Source Applications Foundation. All Rights Reserved.
++
++Copyright (C) 2009-2010 Heikki Toivonen. All Rights Reserved.
++"""
++
++import unittest, doctest
++from M2Crypto.SSL import Checker
++from M2Crypto import X509
++from M2Crypto import SSL
++from test_ssl import srv_host
++
++
++class CheckerTestCase(unittest.TestCase):
++    def test_checker(self):
++
++        check = Checker.Checker(host=srv_host,
++                                peerCertHash='7B754EFA41A264AAD370D43460BC8229F9354ECE')
++        x509 = X509.load_cert('tests/server.pem')
++        assert check(x509, srv_host)
++        self.assertRaises(Checker.WrongHost, check, x509, 'example.com')
++        
++        doctest.testmod(Checker)
++
++    
++class ContextTestCase(unittest.TestCase):
++    def test_ctx_load_verify_locations(self):
++        ctx = SSL.Context()
++        self.assertRaises(ValueError, ctx.load_verify_locations, None, None)
++        
++    def test_map(self):
++        from M2Crypto.SSL.Context import map, _ctxmap
++        assert isinstance(map(), _ctxmap)
++        ctx = SSL.Context()
++        assert map()
++        ctx.close()
++        assert map() is _ctxmap.singleton
++
++    def test_certstore(self):
++        ctx = SSL.Context()
++        ctx.set_verify(SSL.verify_peer | SSL.verify_fail_if_no_peer_cert, 9)
++        ctx.load_verify_locations('tests/ca.pem')
++        ctx.load_cert('tests/x509.pem')
++
++        store = ctx.get_cert_store()
++        assert isinstance(store, X509.X509_Store)
++
++
++def suite():
++    suite = unittest.TestSuite()
++    suite.addTest(unittest.makeSuite(CheckerTestCase))
++    suite.addTest(unittest.makeSuite(ContextTestCase))
++    return suite    
++
++
++if __name__ == '__main__':
++    Rand.load_file('randpool.dat', -1)
++    unittest.TextTestRunner().run(suite())
++    Rand.save_file('randpool.dat')
+--- tests/test_ssl.py
++++ tests/test_ssl.py
+@@ -2,7 +2,10 @@
+ 
+ """Unit tests for M2Crypto.SSL.
+ 
+-Copyright (c) 2000-2004 Ng Pheng Siong. All rights reserved."""
++Copyright (c) 2000-2004 Ng Pheng Siong. All rights reserved.
++
++Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved.
++"""
+ 
+ """
+ TODO
+@@ -405,8 +408,11 @@
+         try:
+             ctx = SSL.Context('sslv23', weak_crypto=1)
+             s = SSL.Connection(ctx)
+-            s.connect(self.srv_addr)
+-            self.failUnlessEqual(s.get_version(), 'SSLv2')
++            if m2.OPENSSL_VERSION_NUMBER < 0x10000000: # SSLv2 ciphers disabled by default in newer OpenSSL
++                s.connect(self.srv_addr)
++                self.failUnlessEqual(s.get_version(), 'SSLv2')
++            else:
++                self.assertRaises(SSL.SSLError, s.connect, self.srv_addr)
+             s.close()
+         finally:
+             self.stop_server(pid)
+@@ -1032,45 +1038,6 @@
+         # XXX need server to test against
+ 
+ 
+-class CheckerTestCase(unittest.TestCase):
+-    def test_checker(self):
+-        from M2Crypto.SSL import Checker
+-        from M2Crypto import X509
+-
+-        check = Checker.Checker(host=srv_host,
+-                                peerCertHash='7B754EFA41A264AAD370D43460BC8229F9354ECE')
+-        x509 = X509.load_cert('tests/server.pem')
+-        assert check(x509, srv_host)
+-        self.assertRaises(Checker.WrongHost, check, x509, 'example.com')
+-        
+-        import doctest
+-        doctest.testmod(Checker)
+-        
+-    
+-class ContextTestCase(unittest.TestCase):
+-    def test_ctx_load_verify_locations(self):
+-        ctx = SSL.Context()
+-        self.assertRaises(ValueError, ctx.load_verify_locations, None, None)
+-        
+-    def test_map(self):
+-        from M2Crypto.SSL.Context import map, _ctxmap
+-        assert isinstance(map(), _ctxmap)
+-        ctx = SSL.Context()
+-        assert map()
+-        ctx.close()
+-        assert map() is _ctxmap.singleton
+-
+-    def test_certstore(self):
+-        ctx = SSL.Context()
+-        ctx.set_verify(SSL.verify_peer | SSL.verify_fail_if_no_peer_cert, 9)
+-        ctx.load_verify_locations('tests/ca.pem')
+-        ctx.load_cert('tests/x509.pem')
+-
+-        from M2Crypto import X509
+-        store = ctx.get_cert_store()
+-        assert isinstance(store, X509.X509_Store)
+-
+-
+ class SessionTestCase(unittest.TestCase):
+     def test_session_load_bad(self):
+         self.assertRaises(SSL.SSLError, SSL.Session.load_session,
+@@ -1086,8 +1053,6 @@
+ 
+ def suite():
+     suite = unittest.TestSuite()
+-    suite.addTest(unittest.makeSuite(CheckerTestCase))
+-    suite.addTest(unittest.makeSuite(ContextTestCase))
+     suite.addTest(unittest.makeSuite(SessionTestCase))
+     suite.addTest(unittest.makeSuite(XmlRpcLibTestCase))
+     suite.addTest(unittest.makeSuite(FtpsLibTestCase))
diff --git a/recipes/python/python-mad_0.6.bb b/recipes/python/python-mad_0.6.bb
index 7ae43779e9..8cc0a8db4a 100644
--- a/recipes/python/python-mad_0.6.bb
+++ b/recipes/python/python-mad_0.6.bb
@@ -19,3 +19,6 @@ do_configure_prepend() {
 	echo "mad_lib_dir = ${STAGING_LIBDIR}" >>Setup
 	echo "mad_include_dir = ${STAGING_INCDIR}" >>Setup
 }
+
+SRC_URI[md5sum] = "a1405fb4b610348565c8d0e400c5ff18"
+SRC_URI[sha256sum] = "1c9fc529b78de7d26e9e47cf182c9f8bf43838d8f62a9c1773540d57f5ebc522"
diff --git a/recipes/python/python-mako_0.2.2.bb b/recipes/python/python-mako_0.2.2.bb
index 6b1b9595af..06e64792fc 100644
--- a/recipes/python/python-mako_0.2.2.bb
+++ b/recipes/python/python-mako_0.2.2.bb
@@ -10,3 +10,6 @@ SRC_URI = "http://pypi.python.org/packages/source/M/Mako/Mako-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
+
+SRC_URI[md5sum] = "ffeb24b3ee71b2e6354efad1136898bd"
+SRC_URI[sha256sum] = "858b2ad7850db5e477ab81d7f355f82df33d90e4ed23a235184f380a925f2813"
diff --git a/recipes/python/python-mysqldb_1.2.1.bb b/recipes/python/python-mysqldb_1.2.1.bb
index 9a9ca0fe56..ca5e217401 100644
--- a/recipes/python/python-mysqldb_1.2.1.bb
+++ b/recipes/python/python-mysqldb_1.2.1.bb
@@ -9,8 +9,8 @@ inherit distutils
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/mysql-python/MySQL-python-${PV}_p2.tar.gz \
-  file://mysqlpath.patch;patch=1 \
-  file://site.patch;patch=1 \
+  file://mysqlpath.patch \
+  file://site.patch \
 "
 S = "${WORKDIR}/${SRCNAME}-${PV}_p2"
 
@@ -18,3 +18,6 @@ do_install_append() {
     install -d ${D}${datadir}/doc/${PN}/
     install -m 0644 ${S}/doc/*.txt ${D}${datadir}/doc/${PN}/
 }
+
+SRC_URI[md5sum] = "e6b9ea21fd91cb4a5663304da727bb70"
+SRC_URI[sha256sum] = "59f44cd53cfa1189dcaa5bf2c48662d5765f347b03827feb807f4cd0ef18943e"
diff --git a/recipes/python/python-netfilter_0.5.5.bb b/recipes/python/python-netfilter_0.5.5.bb
index 17f3aaada0..affde9ace5 100644
--- a/recipes/python/python-netfilter_0.5.5.bb
+++ b/recipes/python/python-netfilter_0.5.5.bb
@@ -2,11 +2,14 @@ DESCRIPTION = "Python module to manage netfilter rules"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
-RDEPENDS = "iptables iptables-utils python-logging python-shell python-subprocess"
+RDEPENDS_${PN} = "iptables iptables-utils python-logging python-shell python-subprocess"
 SRCNAME = "python-netfilter"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "http://opensource.bolloretelecom.eu/files/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "058983355c399407be999d4e8c16cbe6"
+SRC_URI[sha256sum] = "bce93266c593d79d7083052a6cae516de3d6c3e5bda277f664785d30157b8ac7"
diff --git a/recipes/python/python-nevow_0.9.32.bb b/recipes/python/python-nevow_0.9.32.bb
index 155157c517..c36c60ee10 100644
--- a/recipes/python/python-nevow_0.9.32.bb
+++ b/recipes/python/python-nevow_0.9.32.bb
@@ -5,6 +5,11 @@ REALPN = "Nevow"
 
 require divmod.inc
 
+PR = "${INC_PR}.1"
+
 FILES_${PN} += "${datadir}"
 DEPENDS += "python-twisted-native"
 
+
+SRC_URI[md5sum] = "75828090af2b26f69fe4a7f148a400f6"
+SRC_URI[sha256sum] = "bc35ce187481db91f047055b3edbce49c14d291b1a2eb3e915e9c1c511620f9a"
diff --git a/recipes/python/python-numarray_1.1.1.bb b/recipes/python/python-numarray_1.1.1.bb
index 4e02294ebc..d378fbcd83 100644
--- a/recipes/python/python-numarray_1.1.1.bb
+++ b/recipes/python/python-numarray_1.1.1.bb
@@ -11,3 +11,6 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 inherit distutils
 
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/numarray/examples/*/.debug"
+
+SRC_URI[md5sum] = "40cec6ce8ca2e95a4fbc7a28879bf4a5"
+SRC_URI[sha256sum] = "7a6f7f2745cbcb02bf79cc7cd365a3f80679f2558dfaa378010675f40a7aff3b"
diff --git a/recipes/python/python-numeric_23.7.bb b/recipes/python/python-numeric_23.7.bb
index eab7371a1c..a49e0e156b 100644
--- a/recipes/python/python-numeric_23.7.bb
+++ b/recipes/python/python-numeric_23.7.bb
@@ -5,7 +5,7 @@ LICENSE = "PSF"
 PR = "ml1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/Numeric-${PV}.tar.gz \
-           file://no-lapack.patch;patch=1"
+           file://no-lapack.patch"
 S = "${WORKDIR}/Numeric-${PV}"
 
 inherit distutils
@@ -14,3 +14,6 @@ do_stage() {
 	cp -pPR Include/Numeric ${STAGING_INCDIR}
 }
 
+
+SRC_URI[md5sum] = "8054781c58ae9cf6fe498316860b5ea8"
+SRC_URI[sha256sum] = "33225097777e84dfed251aee1265a9c0dd0976854e83f60e778a670027b12e7c"
diff --git a/recipes/python/python-numpy/mipsel/config.h b/recipes/python/python-numpy/mipsel/config.h
new file mode 100644
index 0000000000..17ef186d56
--- /dev/null
+++ b/recipes/python/python-numpy/mipsel/config.h
@@ -0,0 +1,21 @@
+/* ./src.linux-i686-2.5/numpy/core/include/numpy/config.h */
+/* #define SIZEOF_SHORT 2 */
+/* #define SIZEOF_INT 4 */
+/* #define SIZEOF_LONG 4 */
+/* #define SIZEOF_FLOAT 4 */
+/* #define SIZEOF_DOUBLE 8 */
+#define SIZEOF_LONG_DOUBLE 12
+#define SIZEOF_PY_INTPTR_T 4
+/* #define SIZEOF_LONG_LONG 8 */
+#define SIZEOF_PY_LONG_LONG 8
+/* #define CHAR_BIT 8 */
+#define MATHLIB m
+#define HAVE_FLOAT_FUNCS
+#define HAVE_LOG1P
+#define HAVE_EXPM1
+#define HAVE_INVERSE_HYPERBOLIC
+#define HAVE_INVERSE_HYPERBOLIC_FLOAT
+#define HAVE_ISNAN
+#define HAVE_ISINF
+#define HAVE_RINT
+
diff --git a/recipes/python/python-numpy/mipsel/numpyconfig.h b/recipes/python/python-numpy/mipsel/numpyconfig.h
new file mode 100644
index 0000000000..c4bf6547f0
--- /dev/null
+++ b/recipes/python/python-numpy/mipsel/numpyconfig.h
@@ -0,0 +1,17 @@
+/* cat ./src.linux-i686-2.5/numpy/core/include/numpy/numpyconfig.h */
+/*
+ *  * This file is generated by numpy/core/setup.pyc. DO NOT EDIT 
+ *   */
+#define NPY_SIZEOF_SHORT 2 
+#define NPY_SIZEOF_INT 4 
+#define NPY_SIZEOF_LONG 4 
+#define NPY_SIZEOF_FLOAT 4 
+#define NPY_SIZEOF_DOUBLE 8 
+#define NPY_SIZEOF_LONGDOUBLE 12 
+#define NPY_SIZEOF_PY_INTPTR_T 4 
+#define NPY_NO_SMP 0
+
+#define NPY_SIZEOF_LONGLONG 8 
+#define NPY_SIZEOF_PY_LONG_LONG 8 
+/* #define CHAR_BIT 8 */
+
diff --git a/recipes/python/python-numpy_1.1.1.bb b/recipes/python/python-numpy_1.1.1.bb
index 157dadadaf..8594ea00b5 100644
--- a/recipes/python/python-numpy_1.1.1.bb
+++ b/recipes/python/python-numpy_1.1.1.bb
@@ -4,9 +4,11 @@ PRIORITY = "optional"
 LICENSE = "PSF"
 PR = "ml0"
 
+RDEPENDS_${PN} = "python-compiler python-mmap python-pkgutil python-pydoc python-unittest"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \
-           file://unbreak-assumptions.diff;patch=1 \
-	   file://trycompile.diff;patch=1 \
+           file://unbreak-assumptions.diff \
+	   file://trycompile.diff \
 	   file://config.h \
 	   file://numpyconfig.h \
 	  "
@@ -25,3 +27,6 @@ do_compile_prepend() {
 }
 
 
+
+SRC_URI[md5sum] = "af066b59a50bf5dbe1a14d6be3df6937"
+SRC_URI[sha256sum] = "d430273a77aed959c007595d969fefa36c59249807212d7d89f5d6cf2a701dd6"
diff --git a/recipes/python/python-ogg_1.3.bb b/recipes/python/python-ogg_1.3.bb
index d2d1d9e2ba..582e69994e 100644
--- a/recipes/python/python-ogg_1.3.bb
+++ b/recipes/python/python-ogg_1.3.bb
@@ -22,3 +22,6 @@ do_stage() {
 	install -d ${STAGING_INCDIR}/pyogg
 	install -m 0644 include/pyogg/pyogg.h ${STAGING_INCDIR}/pyogg/pyogg.h
 }
+
+SRC_URI[md5sum] = "45a4ecc4d0600661199e4040a81ea3fe"
+SRC_URI[sha256sum] = "10051f2894e901037dfa05b3c604fbdd76d891b9db2213a3c4f24ae79fbcc2a4"
diff --git a/recipes/python/python-pexpect_2.3.bb b/recipes/python/python-pexpect_2.3.bb
index 2195d8d5eb..ef2f538ddd 100644
--- a/recipes/python/python-pexpect_2.3.bb
+++ b/recipes/python/python-pexpect_2.3.bb
@@ -3,14 +3,14 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "PSF"
 SRCNAME = "pexpect"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
   python-core \
   python-io \
   python-terminal \
@@ -18,3 +18,6 @@ RDEPENDS = "\
   python-fcntl \
 "
 
+
+SRC_URI[md5sum] = "bf107cf54e67bc6dec5bea1f3e6a65c3"
+SRC_URI[sha256sum] = "d315e7f3a8544fd85034d7e17fd7c5854e8f0828f5791f83cf313f8fa5740b75"
diff --git a/recipes/python/python-phoneutils_git.bb b/recipes/python/python-phoneutils_git.bb
index 2c6fca1ed1..870404617d 100644
--- a/recipes/python/python-phoneutils_git.bb
+++ b/recipes/python/python-phoneutils_git.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "Python Bindings for libphone-utils"
 SECTION = "devel/python"
 DEPENDS = "libphone-utils python-cython-native python-pyrex-native"
-RDEPENDS = "libphone-utils"
+RDEPENDS_${PN} = "libphone-utils"
 
 SRCREV = "8a7c719e0c3f1f8c10f77f17422da02d7177f0dd"
-PV = "0.0.2+gitr${SRCREV}"
-PR = "r2"
+PV = "0.0.2+gitr${SRCPV}"
+PR = "r3"
 
 SRC_URI = "git://git.shr-project.org/repo/libphone-utils.git;protocol=http;branch=master"
 S = "${WORKDIR}/git/src/python"
diff --git a/recipes/python/python-psyco_1.6.bb b/recipes/python/python-psyco_1.6.bb
index 5c47e6971d..cb9f95b63f 100644
--- a/recipes/python/python-psyco_1.6.bb
+++ b/recipes/python/python-psyco_1.6.bb
@@ -3,7 +3,8 @@ HOMEPAGE = "http://psyco.sourceforge.net"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "PSF"
-RDEPENDS = "python-core"
+RDEPENDS_${PN} = "python-core"
+PR = "r1"
 SRCNAME = "psyco"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}-src.tar.gz"
@@ -12,3 +13,6 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 COMPATIBLE_HOST = 'i.86.*-linux'
 
 inherit distutils
+
+SRC_URI[md5sum] = "8816fca8ba521e05d18dde3e1a11b0bd"
+SRC_URI[sha256sum] = "529de83d76bc71e3334dc5e0b9f5eb8bb5cd095f8ac6dd3154771d50a7373718"
diff --git a/recipes/python/python-ptrace_0.5.bb b/recipes/python/python-ptrace_0.5.bb
index 55ec70f9dd..a3ef20482f 100644
--- a/recipes/python/python-ptrace_0.5.bb
+++ b/recipes/python/python-ptrace_0.5.bb
@@ -7,3 +7,6 @@ PR = "ml0"
 SRC_URI = "http://pypi.python.org/packages/source/p/python-ptrace/python-ptrace-${PV}.tar.gz"
 
 inherit distutils
+
+SRC_URI[md5sum] = "0df3d1c5109bb88d06575d70513a190c"
+SRC_URI[sha256sum] = "8ff2ec30050803e8b60cfb05d24fa32b3d175bffb81ef5919c3db4ac0f263df8"
diff --git a/recipes/python/python-pyalsa_1.0.16.bb b/recipes/python/python-pyalsa_1.0.16.bb
index 24bd27c242..df8da26bc9 100644
--- a/recipes/python/python-pyalsa_1.0.16.bb
+++ b/recipes/python/python-pyalsa_1.0.16.bb
@@ -10,3 +10,6 @@ SRC_URI = "ftp://ftp.alsa-project.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.bz2"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "a1f4d561fa5c41a570480f3f328559a2"
+SRC_URI[sha256sum] = "f2c9195284d3c3925d83424a9e24ac8ce96e706abced5d3007df57f9fe51518f"
diff --git a/recipes/python/python-pyalsaaudio_0.4.bb b/recipes/python/python-pyalsaaudio_0.4.bb
index 42b15ce5be..00d7d2407f 100644
--- a/recipes/python/python-pyalsaaudio_0.4.bb
+++ b/recipes/python/python-pyalsaaudio_0.4.bb
@@ -10,3 +10,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pyalsaaudio/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "b312c28efba7db0494836a79f0a49898"
+SRC_URI[sha256sum] = "07148ce16024724b17cc24c51d0f4fb78af214b09b7dc8dcb7b06e5647f4c582"
diff --git a/recipes/python/python-pybluez_0.15.bb b/recipes/python/python-pybluez_0.15.bb
index 17ffd385fc..8c98fe31a1 100644
--- a/recipes/python/python-pybluez_0.15.bb
+++ b/recipes/python/python-pybluez_0.15.bb
@@ -8,3 +8,6 @@ SRC_URI = "http://pybluez.googlecode.com/files/PyBluez-0.15.tar.gz"
 S = "${WORKDIR}/PyBluez-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "104ad743d4bc999796ceff4f39d1003a"
+SRC_URI[sha256sum] = "593912fdf122d9a1499767bc305ca7b3b688ace7edcb93f53e07202aa1242c58"
diff --git a/recipes/python/python-pybluez_0.16.bb b/recipes/python/python-pybluez_0.16.bb
index 44554d6ff1..64cc88786e 100644
--- a/recipes/python/python-pybluez_0.16.bb
+++ b/recipes/python/python-pybluez_0.16.bb
@@ -8,3 +8,6 @@ SRC_URI = "http://pybluez.googlecode.com/files/PyBluez-${PV}.tar.gz"
 S = "${WORKDIR}/PyBluez-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "2ce8ff0dbb94c6be14e92e9968f4c914"
+SRC_URI[sha256sum] = "cbe1f076a4947e29ded08ba9dd6dbbb86b25939fb4e50f508dd02f41681554e2"
diff --git a/recipes/python/python-pycairo_1.4.0.bb b/recipes/python/python-pycairo_1.4.0.bb
index 0cccd76d0f..94bb3380e4 100644
--- a/recipes/python/python-pycairo_1.4.0.bb
+++ b/recipes/python/python-pycairo_1.4.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "cairo"
 PR = "ml3"
 
 SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz \
-           file://fix-setup-py.patch;patch=1"
+           file://fix-setup-py.patch"
 S = "${WORKDIR}/pycairo-${PV}"
 
 inherit distutils pkgconfig
@@ -19,3 +19,6 @@ do_stage() {
 	install -d ${STAGING_INCDIR}
 	install -m 0644 cairo/pycairo.h ${STAGING_INCDIR}
 }
+
+SRC_URI[md5sum] = "e26e77919b606113f565d70036c1f504"
+SRC_URI[sha256sum] = "9212afffee727e39ae99406b5a59ab3248556bcfebfae24d8278313678147e32"
diff --git a/recipes/python/python-pycairo_1.8.0.bb b/recipes/python/python-pycairo_1.8.0.bb
index 4e3e4633ba..6f96ea8af4 100644
--- a/recipes/python/python-pycairo_1.8.0.bb
+++ b/recipes/python/python-pycairo_1.8.0.bb
@@ -4,12 +4,10 @@ HOMEPAGE = "http://cairographics.org/pycairo"
 LICENSE = "LGPL MPL"
 # cairo >= 1.8.0
 DEPENDS = "cairo"
-PR = "ml0"
-
-DEFAULT_PREFERENCE = "-1"
+PR = "ml4"
 
 SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz \
-           file://fix-setup-py.patch;patch=1"
+           file://fix-setup-py.patch"
 S = "${WORKDIR}/pycairo-${PV}"
 
 inherit distutils pkgconfig
@@ -18,7 +16,12 @@ do_configure_append() {
 	sed -e 's:@prefix@:${prefix}:' -e 's:@includedir@:\$\{prefix\}/include:' -e 's:@VERSION@:${PV}:' pycairo.pc.in > pycairo.pc
 }
 
-do_stage() {
-	install -d ${STAGING_INCDIR}
-	install -m 0644 cairo/pycairo.h ${STAGING_INCDIR}
+do_install_append() {
+	mv ${D}${datadir}/include/* ${D}${includedir}
+	mv ${D}${datadir}/lib/* ${D}${libdir}
+	install -d ${D}${includedir}/pycairo
+	ln -sf ..//pycairo.h ${D}${includedir}/pycairo/
 }
+
+SRC_URI[md5sum] = "847f5377c32228a656819f5bd18eb6b4"
+SRC_URI[sha256sum] = "a2272dafceb25ed9fedd0b10429dfec9c412b3b36eb6137f79c87e7d004036d4"
diff --git a/recipes/python/python-pycap_0.1.6.bb b/recipes/python/python-pycap_0.1.6.bb
index 63e19a4399..32fa1cb37e 100644
--- a/recipes/python/python-pycap_0.1.6.bb
+++ b/recipes/python/python-pycap_0.1.6.bb
@@ -1,12 +1,15 @@
 DESCRIPTION = "Python Packet Capture Library"
 SECTION = "devel/python"
 PRIORITY = "optional"
-RDEPENDS = "python-core"
+RDEPENDS_${PN} = "python-core"
 DEPENDS = "libpcap libnet"
 SRCNAME = "pycap"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "c90bc5382dede1a941e023e7bc27c473"
+SRC_URI[sha256sum] = "961e37f49afeda70d89c21830751548a2ac4912a35122bf70bf29091eef5c4a0"
diff --git a/recipes/python/python-pychecker_0.8.18.bb b/recipes/python/python-pychecker_0.8.18.bb
index 1b39b588ce..7b5af5e939 100644
--- a/recipes/python/python-pychecker_0.8.18.bb
+++ b/recipes/python/python-pychecker_0.8.18.bb
@@ -10,3 +10,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "ef156a631df46de150a364912f2e36c8"
+SRC_URI[sha256sum] = "6495fe464659b175cefce20b187de6904b97b065fd609445b932d9c49a75a024"
diff --git a/recipes/python/python-pycodes_1.2.bb b/recipes/python/python-pycodes_1.2.bb
index ce2cb17594..fa260422ec 100644
--- a/recipes/python/python-pycodes_1.2.bb
+++ b/recipes/python/python-pycodes_1.2.bb
@@ -8,7 +8,10 @@ SRCNAME = "pycodes"
 PR = "ml1"
 
 SRC_URI = "http://web.mit.edu/~emin/www/source_code/pycodes/pycodes-1-2.tar.gz \
-           file://no-docs.patch;patch=1"
+           file://no-docs.patch"
 S = "${WORKDIR}/${SRCNAME}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "c39e0ffea530cbf0b4f2aa6af6e81b66"
+SRC_URI[sha256sum] = "d203b4be819e20314576d5c26329862e7d371c84e8f192e31402a0b6d9e055aa"
diff --git a/recipes/python/python-pycrypto_2.0.1.bb b/recipes/python/python-pycrypto_2.0.1.bb
index 7300bbd60b..f1c94f42ac 100644
--- a/recipes/python/python-pycrypto_2.0.1.bb
+++ b/recipes/python/python-pycrypto_2.0.1.bb
@@ -10,3 +10,6 @@ SRC_URI = "http://www.amk.ca/files/python/crypto/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "4d5674f3898a573691ffb335e8d749cd"
+SRC_URI[sha256sum] = "b08d4ed54c9403c77778a3803e53a4f33f359b42d94f6f3e14abb1bf4941e6ea"
diff --git a/recipes/python/python-pycups_1.9.45.bb b/recipes/python/python-pycups_1.9.45.bb
index bd127d5559..4e28e68606 100644
--- a/recipes/python/python-pycups_1.9.45.bb
+++ b/recipes/python/python-pycups_1.9.45.bb
@@ -3,6 +3,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
 DEPENDS = "cups"
+PR = "r1"
 SRCNAME = "pycups"
 
 SRC_URI = "http://cyberelk.net/tim/data/pycups/pycups-${PV}.tar.bz2"
@@ -13,4 +14,7 @@ inherit distutils
 # used during compilation
 CFLAGS += -DVERSION=\\"${PV}\\"
 
-RDEPENDS = "python-core cups"
+RDEPENDS_${PN} = "python-core cups"
+
+SRC_URI[md5sum] = "ff634a6751f8a859ed26751bf03abef0"
+SRC_URI[sha256sum] = "ef6e576e5465da9c338ac8ff9f162825cfb7997359efc52e6a110c295a9f363b"
diff --git a/recipes/python/python-pycurl_7.18.2.bb b/recipes/python/python-pycurl_7.18.2.bb
index a38a4b5a27..560274dcb7 100644
--- a/recipes/python/python-pycurl_7.18.2.bb
+++ b/recipes/python/python-pycurl_7.18.2.bb
@@ -4,14 +4,17 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "curl-${PV}"
 SRCNAME = "pycurl"
-PR = "ml2"
+PR = "ml3"
 
 SRC_URI = "\
   http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz \
-  file://no-static-link.patch;patch=1 \
+  file://no-static-link.patch \
 "
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
-RDEPENDS = "python-core curl (>=${PV})"
+RDEPENDS_${PN} = "python-core curl (>= ${PV})"
+
+SRC_URI[md5sum] = "39210d56f1d5a75ac8dd6a2866a93dd5"
+SRC_URI[sha256sum] = "95d21bd61e03d22ee4ac18fc0b9040c163cb504c4b2cf1dc43c18f32508f6736"
diff --git a/recipes/python/python-pycurl_7.19.0.bb b/recipes/python/python-pycurl_7.19.0.bb
index 36d90d657c..643b54516f 100644
--- a/recipes/python/python-pycurl_7.19.0.bb
+++ b/recipes/python/python-pycurl_7.19.0.bb
@@ -4,11 +4,11 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "curl"
 SRCNAME = "pycurl"
-PR = "ml2"
+PR = "ml3"
 
 SRC_URI = "\
   http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz;name=archive \
-  file://no-static-link.patch;patch=1 \
+  file://no-static-link.patch \
 "
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 SRC_URI[archive.md5sum] = "919d58fe37e69fe87ce4534d8b6a1c7b"
@@ -16,4 +16,4 @@ SRC_URI[archive.sha256sum] = "eb782dfcc5a7c023539a077462b83c167e178128ee9f720166
 
 inherit distutils
 
-RDEPENDS = "python-core curl"
+RDEPENDS_${PN} = "python-core curl"
diff --git a/recipes/python/python-pyephem_3.7.3.3.bb b/recipes/python/python-pyephem_3.7.3.3.bb
index 885f285225..1ebd66493e 100644
--- a/recipes/python/python-pyephem_3.7.3.3.bb
+++ b/recipes/python/python-pyephem_3.7.3.3.bb
@@ -9,3 +9,6 @@ SRC_URI = "http://pypi.python.org/packages/source/p/pyephem/pyephem-${PV}.tar.gz
 S = "${WORKDIR}/pyephem-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "1e13d951bd46b98476d888bf6e1a06fa"
+SRC_URI[sha256sum] = "dd7aedbc9dade0ce25a2a5e2443790fb9d9a607446fb84932e653287b4f160b4"
diff --git a/recipes/python/python-pyfits_1.3.bb b/recipes/python/python-pyfits_1.3.bb
index cc874e1394..52509e1ac9 100644
--- a/recipes/python/python-pyfits_1.3.bb
+++ b/recipes/python/python-pyfits_1.3.bb
@@ -1,12 +1,15 @@
 DESCRIPTION = "PyFITS provides an interface to FITS formatted files under the Python scripting language."
 HOMEPAGE = "http://www.stsci.edu/resources/software_hardware/pyfits"
 AUTHOR = "Space Telescope Science Institute"
-RDEPENDS = "python-numpy"
+RDEPENDS_${PN} = "python-numpy"
 SECTION = "devel/python"
 LICENSE = "AURA"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "http://www.stsci.edu/resources/software_hardware/pyfits/pyfits-${PV}.tar.gz"
 S = "${WORKDIR}/pyfits-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "59c3c8c714336eab7760b7d320e124c3"
+SRC_URI[sha256sum] = "a6b01c9d75e7955765019581700bd6ac344457b327522facedaf4cff9e86093c"
diff --git a/recipes/python/python-pyflakes_0.3.0.bb b/recipes/python/python-pyflakes_0.3.0.bb
index 4a6580ea05..0c9b95e534 100644
--- a/recipes/python/python-pyflakes_0.3.0.bb
+++ b/recipes/python/python-pyflakes_0.3.0.bb
@@ -10,3 +10,6 @@ SRC_URI = "http://pypi.python.org/packages/source/p/pyflakes/${SRCNAME}-${PV}.ta
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "ec7eee3444214bda18e57b82175e1da7"
+SRC_URI[sha256sum] = "019b6d4b549306d013974678872aaf2453af3f02760175504dbe8a9f89db0a2c"
diff --git a/recipes/python/python-pyftpdlib_0.5.1.bb b/recipes/python/python-pyftpdlib_0.5.1.bb
index 201d7ab1a0..1983791607 100644
--- a/recipes/python/python-pyftpdlib_0.5.1.bb
+++ b/recipes/python/python-pyftpdlib_0.5.1.bb
@@ -2,11 +2,14 @@ DESCRIPTION = "FTP Server Library"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "MIT"
-PR = "ml0"
+PR = "ml1"
 
 inherit distutils
 
 SRC_URI = "http://pyftpdlib.googlecode.com/files/pyftpdlib-${PV}.tar.gz"
 S = "${WORKDIR}/pyftpdlib-${PV}"
 
-RDEPENDS = "python-netserver"
+RDEPENDS_${PN} = "python-netserver"
+
+SRC_URI[md5sum] = "f64ac67ebec1d8ab47c0766082617384"
+SRC_URI[sha256sum] = "6daed9475412eaab232e021ed76568c6520dacd75c58da406454139bef95c393"
diff --git a/recipes/python/python-pygame_1.9.1.bb b/recipes/python/python-pygame_1.9.1.bb
index bbeedda3a9..7f55a54a68 100644
--- a/recipes/python/python-pygame_1.9.1.bb
+++ b/recipes/python/python-pygame_1.9.1.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "Python libSDL Bindings"
 SECTION = "devel/python"
 HOMEPAGE = "http://www.pygame.org"
 LICENSE = "LGPL"
-DEPENDS = "libsdl-x11 libsdl-image libsdl-mixer libsdl-net libsdl-ttf python-numeric"
+DEPENDS = "virtual/libsdl libsdl-image libsdl-mixer libsdl-net libsdl-ttf python-numeric"
 DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'smpeg', d)}"
-RDEPENDS = "python-numeric"
+RDEPENDS_${PN} = "python-numeric"
 SRCNAME = "pygame"
-PR = "ml4"
+PR = "ml5"
 
 SRC_URI = "http://www.pygame.org/ftp/${SRCNAME}-${PV}release.tar.gz;name=archive"
 SRC_URI[archive.md5sum] = "1c4cdc708d17c8250a2d78ef997222fc"
diff --git a/recipes/python/python-pygobject-native_2.20.0.bb b/recipes/python/python-pygobject-native_2.20.0.bb
index 409481c2bf..dc2bcad2f6 100644
--- a/recipes/python/python-pygobject-native_2.20.0.bb
+++ b/recipes/python/python-pygobject-native_2.20.0.bb
@@ -3,12 +3,13 @@ require python-pygobject_${PV}.bb
 inherit native
 
 DEPENDS = "python-native glib-2.0-native"
+RDEPENDS_${PN} = ""
 
 PARALLEL_MAKE = ""
 
 SRC_URI = "\
   ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
-#  file://python-path.patch;patch=1 \
+#  file://python-path.patch \
 "
 
 export GOBJECT_INTROSPECTION_CFLAGS="-pthread -I${STAGING_INCDIR}/gobject-introspection-1.0 -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_LIBDIR}/glib-2.0/include"
@@ -21,3 +22,6 @@ do_install_append() {
 	install -d ${D}${bindir}
 	install -m 0755 gobject/generate-constants ${D}${bindir}/gobject-generate-constants
 }
+
+SRC_URI[md5sum] = "10e1fb79be3d698476a28b1e1b0c5640"
+SRC_URI[sha256sum] = "41e923a3f4426a3e19f6d154c424e3dac6f39defca77af602ac6272ce270fa81"
diff --git a/recipes/python/python-pygobject_2.20.0.bb b/recipes/python/python-pygobject_2.20.0.bb
index fb97e53600..19a60ab954 100644
--- a/recipes/python/python-pygobject_2.20.0.bb
+++ b/recipes/python/python-pygobject_2.20.0.bb
@@ -1,33 +1,35 @@
 DESCRIPTION = "Python GObject bindings"
 SECTION = "devel/python"
 LICENSE = "LGPL"
-DEPENDS = "libffi python-pygobject-native-${PV}"
+DEPENDS = "libffi python-pygobject-native-${PV} glib-2.0"
 PE = "1"
 
+PR = "r3"
+
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 
 SRC_URI = "\
   ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
-  file://generate-constants.patch;patch=1 \
+  file://generate-constants.patch \
 "
 S = "${WORKDIR}/pygobject-${PV}"
 
-FILESPATH = "${FILE_DIRNAME}/python-pygobject:${FILE_DIRNAME}/files"
-
 inherit autotools distutils-base pkgconfig
 
 # necessary to let the call for python-config succeed
 export BUILD_SYS
 export HOST_SYS
 
-export GOBJECT_INTROSPECTION_CFLAGS="-pthread -I${STAGING_INCDIR}/gobject-introspection-1.0 -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_LIBDIR}/glib-2.0/include"
+# It picks up the introspection pc for the host sysroot without a knob to disable it, so force it to false
+do_configure_prepend() {
+	sed -i 's:have_gobject_introspection=true:have_gobject_introspection=false:g' configure.ac
+}
 
-do_stage() {
-	autotools_stage_all
-	install -d ${STAGING_LIBDIR}/../share/pygobject/
-	cp -dpfR docs/* ${STAGING_LIBDIR}/../share/pygobject/
-	install -d ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
-	cp docs/style.css ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
+do_install_append() {
+	install -d ${D}${datadir}/pygobject/
+	cp -PpRfR docs/* ${D}${datadir}/pygobject/
+	install -d ${D}${datadir}/gtk-doc/html/pygobject/
+	cp docs/style.css ${D}${datadir}/gtk-doc/html/pygobject/
 }
 
 PACKAGES += "${PN}-lib"
@@ -38,3 +40,6 @@ FILES_${PN} = "${libdir}/python*"
 FILES_${PN}-lib = "${libdir}/lib*.so.*"
 FILES_${PN}-dev += "${bindir} ${datadir}"
 FILES_${PN}-dbg += "${libdir}/.debug"
+
+SRC_URI[md5sum] = "10e1fb79be3d698476a28b1e1b0c5640"
+SRC_URI[sha256sum] = "41e923a3f4426a3e19f6d154c424e3dac6f39defca77af602ac6272ce270fa81"
diff --git a/recipes/python/python-pygoogle_0.6.bb b/recipes/python/python-pygoogle_0.6.bb
index e3dee68706..5ecdb75bf7 100644
--- a/recipes/python/python-pygoogle_0.6.bb
+++ b/recipes/python/python-pygoogle_0.6.bb
@@ -5,12 +5,15 @@ SECTION = "devel/python"
 HOMEPAGE = "http://pygoogle.sourceforge.net/"
 PRIORITY = "optional"
 LICENSE = "PSF"
-RDEPENDS = "python-soappy"
+RDEPENDS_${PN} = "python-soappy"
 SRCNAME = "pygoogle"
-PR = "ml1"
+PR = "ml2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
+
+SRC_URI[md5sum] = "334e2d9e5a765ffa9769e2c4cdfcd110"
+SRC_URI[sha256sum] = "ad3f4530977a15e52b379ef301a4a80cf69a883f24dd6cebc5b47b3009c092a4"
diff --git a/recipes/python/python-pygtk-1.2_0.6.12.bb b/recipes/python/python-pygtk-1.2_0.6.12.bb
index 0b153ce1e5..677b8b9827 100644
--- a/recipes/python/python-pygtk-1.2_0.6.12.bb
+++ b/recipes/python/python-pygtk-1.2_0.6.12.bb
@@ -3,16 +3,16 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "devel/python"
 LICENSE = "LGPL"
 DEPENDS = "gtk+-1.2"
-RDEPENDS = "python-shell python-re"
+RDEPENDS_${PN} = "python-shell python-re"
 SRCNAME = "pygtk"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/python/v1.2/${SRCNAME}-${PV}.tar.gz \
-           file://remove-imlib-et-al.patch;patch=1 \
+           file://remove-imlib-et-al.patch \
            file://acinclude.m4"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-inherit autotools_stage pkgconfig distutils-base
+inherit autotools pkgconfig distutils-base
 
 EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
 
@@ -23,3 +23,6 @@ do_configure_prepend() {
 }
 
 FILES_${PN}-dev += "${datadir}/pygtk"
+
+SRC_URI[md5sum] = "31f0991a18708d47fa29583c0ad956f6"
+SRC_URI[sha256sum] = "7c95e6ae35d282fb333dc7b29bd91e543518ea7f3dfa11f21d52be0654234010"
diff --git a/recipes/python/python-pygtk_2.10.4.bb b/recipes/python/python-pygtk_2.10.4.bb
index 81cb5930f3..5826a56b36 100644
--- a/recipes/python/python-pygtk_2.10.4.bb
+++ b/recipes/python/python-pygtk_2.10.4.bb
@@ -2,18 +2,18 @@ DESCRIPTION = "Python GTK+ 2.10.x Bindings"
 SECTION = "devel/python"
 # needs gtk+ 2.10.x
 DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
-RDEPENDS = "python-shell python-pycairo python-pygobject"
+RDEPENDS_${PN} = "python-shell python-pycairo python-pygobject"
 PROVIDES = "python-pygtk2"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
-PR = "ml12"
+PR = "ml13"
 
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2 \
-           file://fix-gtkunixprint.patch;patch=1 \
-           file://prevent_to_get_display_during_import.patch;patch=1 \
-           file://nodocs.patch;patch=1 \
-           file://gdk_display.patch;patch=1;pnum=0 \
+           file://fix-gtkunixprint.patch \
+           file://prevent_to_get_display_during_import.patch \
+           file://nodocs.patch \
+           file://gdk_display.patch;striplevel=0 \
            file://acinclude.m4"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
@@ -63,3 +63,6 @@ do_stage() {
 	cp -pPr *.defs ${STAGING_DATADIR}/pygtk/2.0/defs/
 	cp -pPr gtk/*.defs ${STAGING_DATADIR}/pygtk/2.0/defs/
 }
+
+SRC_URI[md5sum] = "89afe242275a3fce57b4ffb5fadc5888"
+SRC_URI[sha256sum] = "ab9ad4481af435894db27e78010f6bbc21c62252dbe7a254121453419edde8f5"
diff --git a/recipes/python/python-pygtk_2.16.0.bb b/recipes/python/python-pygtk_2.16.0.bb
index e2b0602b47..699bd5d659 100644
--- a/recipes/python/python-pygtk_2.16.0.bb
+++ b/recipes/python/python-pygtk_2.16.0.bb
@@ -2,15 +2,15 @@ DESCRIPTION = "Python GTK+ 2.10.x Bindings"
 SECTION = "devel/python"
 # needs gtk+ 2.10.x
 DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
-RDEPENDS = "python-shell python-pycairo python-pygobject"
+RDEPENDS_${PN} = "python-shell python-pycairo python-pygobject"
 PROVIDES = "python-pygtk2"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
-PR = "r1"
+PR = "r3"
 
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2;name=pygtk \
-           file://fix-gtkunixprint.patch;patch=1 \
+           file://fix-gtkunixprint.patch \
            file://acinclude.m4"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
@@ -38,6 +38,8 @@ do_install_append() {
 	find ${D} -name "*.la"|xargs rm -f
 	rm -f ${D}/${bindir}/pygtk-codegen-2.0
 	rm -rf ${D}/${libdir}/pkgconfig
+	install -d ${D}${libdir}/pkgconfig
+	install -m 0644 ${S}/*.pc ${D}${libdir}/pkgconfig
 }
 
 # dirty fix #2: fix build system paths leaking in
@@ -56,3 +58,6 @@ FILES_${PN}-dev += "\
   ${bindir}/pygtk-* \
   ${datadir}/pygtk/2.0"
 
+
+SRC_URI[pygtk.md5sum] = "bd0d437fefd6d5390f5d770a495cd50c"
+SRC_URI[pygtk.sha256sum] = "7fae5e01af217a01738eae41c38ad7f86d1f538f444300d0fa2847aafb7444a8"
diff --git a/recipes/python/python-pygtk_2.6.3.bb b/recipes/python/python-pygtk_2.6.3.bb
index 01c50f9a52..e535f1b449 100644
--- a/recipes/python/python-pygtk_2.6.3.bb
+++ b/recipes/python/python-pygtk_2.6.3.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Python GTK+ Bindings"
 SECTION = "devel/python"
 DEPENDS = "gtk+-2.6.10 libglade"
-RDEPENDS = "python-shell"
+RDEPENDS_${PN} = "python-shell"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
-PR = "ml1"
+PR = "ml2"
 
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2 \
@@ -32,3 +32,6 @@ do_stage() {
 	cp -pPr *.defs ${STAGING_DATADIR}/pygtk/2.0/defs/
 	cp -pPr gtk/*.defs ${STAGING_DATADIR}/pygtk/2.0/defs/
 }
+
+SRC_URI[md5sum] = "5acd4a4f5807f93a80389c1e9af48808"
+SRC_URI[sha256sum] = "1cd8e9bb0a011317862aec90a03e562bebbbf7fcf865a8ff12992548cdda746d"
diff --git a/recipes/python/python-pygtksourceview_2.6.0.bb b/recipes/python/python-pygtksourceview_2.6.0.bb
index c91e52ac4c..01e110f8bb 100644
--- a/recipes/python/python-pygtksourceview_2.6.0.bb
+++ b/recipes/python/python-pygtksourceview_2.6.0.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 DEPENDS = "gtksourceview2 python-pygtk"
 SRCNAME = "pygtksourceview"
 LICENSE = "LGPL"
-PR = "r0"
+PR = "r1"
 
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtksourceview/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2"
@@ -14,5 +14,13 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit autotools pkgconfig distutils-base
 
-EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+do_configure_prepend() {
+	sed -i \
+		-e s:'`$PKG_CONFIG --variable=codegendir pygtk-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/codegen\":g \
+		${S}/configure.ac
+}
 
+FILES_${PN} += "${datadir}/pygtk/2.0/defs/gtksourceview2.defs"
+
+SRC_URI[md5sum] = "5587a1865bd5c785c6f34095c57cc96b"
+SRC_URI[sha256sum] = "77acb735fee997a1638c79256b9dcf592566d066b54a72eb4321909f98f66178"
diff --git a/recipes/python/python-pyid3lib_0.5.1.bb b/recipes/python/python-pyid3lib_0.5.1.bb
index 1d24b347c9..3a3e7bb274 100644
--- a/recipes/python/python-pyid3lib_0.5.1.bb
+++ b/recipes/python/python-pyid3lib_0.5.1.bb
@@ -8,8 +8,11 @@ PR = "r2"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/pyid3lib/${SRCNAME}-${PV}.tar.bz2\
-  file://gcc4-fix.patch;patch=1 \
+  file://gcc4-fix.patch \
 "
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "49818a591430e08057c27a11e4c40aef"
+SRC_URI[sha256sum] = "2a7bdd52c24ed0e70e4a2d82c697214c4ab5a70f94ea9e7934df15ca202d1169"
diff --git a/recipes/python/python-pylinda_0.6.bb b/recipes/python/python-pylinda_0.6.bb
index a43dd7e7f8..a0dac36f25 100644
--- a/recipes/python/python-pylinda_0.6.bb
+++ b/recipes/python/python-pylinda_0.6.bb
@@ -7,9 +7,12 @@ SRCNAME = "linda"
 PR = "r1"
 
 SRC_URI = "http://www.handhelds.org/~aquadran/distro/latest/sources/linda-${PV}.tar.gz \
-           file://honor-datadir.patch;patch=1"
+           file://honor-datadir.patch"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
 export LINDA_DATADIR = "${D}/${libdir}/${PYTHON_DIR}"
+
+SRC_URI[md5sum] = "c3e1b6c428218968e2963182c1df1fdc"
+SRC_URI[sha256sum] = "cba8ac22d77bbf8f6ed4a98933242b89ee2426cbc216f54415eafcac1274547a"
diff --git a/recipes/python/python-pylint_0.15.2.bb b/recipes/python/python-pylint_0.15.2.bb
index d0640607f0..dbcd24b423 100644
--- a/recipes/python/python-pylint_0.15.2.bb
+++ b/recipes/python/python-pylint_0.15.2.bb
@@ -6,11 +6,14 @@ SECTION = "devel/python"
 HOMEPAGE = "http://www.logilab.org/857"
 PRIORITY = "optional"
 LICENSE = "GPL"
-RDEPENDS = "python-logilab-common"
+RDEPENDS_${PN} = "python-logilab-common"
 SRCNAME = "pylint"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "ftp://ftp.logilab.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "98f3917fc4d0855c8f0eab9761533835"
+SRC_URI[sha256sum] = "868c8c105427047842883efc2b1693137fae52e78017a7ae98c2e37b7c1e3f80"
diff --git a/recipes/python/python-pylirc_0.0.5.bb b/recipes/python/python-pylirc_0.0.5.bb
index 5760c7682d..2c098646c4 100644
--- a/recipes/python/python-pylirc_0.0.5.bb
+++ b/recipes/python/python-pylirc_0.0.5.bb
@@ -9,3 +9,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pylirc/pylirc-${PV}.tar.gz"
 S = "${WORKDIR}/pylirc-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "4e3b6b50485610e273fededdb25b47ad"
+SRC_URI[sha256sum] = "a78315e1ddf5af61cf91000a4b2f8e2df0841edd97b2596b2e0c5505bf8330a2"
diff --git a/recipes/python/python-pymetar_0.14.bb b/recipes/python/python-pymetar_0.14.bb
index 7520b668bd..3aa4b58755 100644
--- a/recipes/python/python-pymetar_0.14.bb
+++ b/recipes/python/python-pymetar_0.14.bb
@@ -9,3 +9,6 @@ SRC_URI = "http://www.schwarzvogel.de/pkgs/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "024fb0b46c0cb8cf21d63c68d2014796"
+SRC_URI[sha256sum] = "46d21122cd200099271e8377cf40c7a4dd005b0a3867a792632715de812c47fe"
diff --git a/recipes/python/python-pymp3_0.3.4.bb b/recipes/python/python-pymp3_0.3.4.bb
index 371c662098..0d5940db30 100644
--- a/recipes/python/python-pymp3_0.3.4.bb
+++ b/recipes/python/python-pymp3_0.3.4.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "A Curses-based mp3 player. See http://damien.degois.info/PyMP3/"
 SECTION = "console/multimedia"
 PRIORITY = "optional"
-RDEPENDS = "python-core python-curses python-pyid3lib python-mad python-ao"
+RDEPENDS_${PN} = "python-core python-curses python-pyid3lib python-mad python-ao"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://www.vanille.de/mirror/PyMP3-0.3.4.tar.gz"
 S = "${WORKDIR}/PyMP3-0.3.4"
@@ -27,3 +27,6 @@ do_install() {
 }
 
 FILES_${PN} += " ${libdir}/${PYTHON_DIR}/site-packages/"
+
+SRC_URI[md5sum] = "28e884057750aa4f0da368678e5b20bd"
+SRC_URI[sha256sum] = "e534ea5505e2d0a571ca8baa4b34260953e796f6c762013756373f13411ebd6e"
diff --git a/recipes/python/python-pyode_1.2.0.bb b/recipes/python/python-pyode_1.2.0.bb
index be4b38acd5..3b00de84d3 100644
--- a/recipes/python/python-pyode_1.2.0.bb
+++ b/recipes/python/python-pyode_1.2.0.bb
@@ -8,7 +8,7 @@ SRCNAME = "PyODE"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pyode/${SRCNAME}-${PV}.tar.bz2 \
-           file://install.patch;patch=1"
+           file://install.patch"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
@@ -17,3 +17,6 @@ do_configure_prepend() {
 	ln -s ${STAGING_LIBDIR}/.. ../ode
 }
 
+
+SRC_URI[md5sum] = "ab72f3acc635371fd454978e5a97591c"
+SRC_URI[sha256sum] = "117c8f06012e0c0004e69527580a56fac3d814da1051ec1aa73d97d16b60279b"
diff --git a/recipes/python/python-pyopenssl_0.8.bb b/recipes/python/python-pyopenssl_0.8.bb
index b89d68f00d..bdbb6b2ca4 100644
--- a/recipes/python/python-pyopenssl_0.8.bb
+++ b/recipes/python/python-pyopenssl_0.8.bb
@@ -4,12 +4,19 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 SRCNAME = "pyOpenSSL"
 DEPENDS = "openssl"
-PR = "ml0"
+PR = "ml2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pyopenssl/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
-RDEPENDS = "python-threading"
+PACKAGES =+ "${PN}-tests"
+FILES_${PN}-tests = "${libdir}/${PYTHON_DIR}/site-packages/OpenSSL/test"
 
+RDEPENDS_${PN} = "python-threading"
+RDEPENDS_${PN}-tests = "${PN}"
+
+
+SRC_URI[md5sum] = "00377690f224d9e59c833fb0459603f4"
+SRC_URI[sha256sum] = "2284411d21f1031f08f23c4f49dc0a341e38b07833495d0fe21a87eb25f3ffe3"
diff --git a/recipes/python/python-pyrad_1.1.bb b/recipes/python/python-pyrad_1.1.bb
index a6b8e15fb3..064f4981e2 100644
--- a/recipes/python/python-pyrad_1.1.bb
+++ b/recipes/python/python-pyrad_1.1.bb
@@ -2,11 +2,14 @@ DESCRIPTION = "Python Radius Client and Server"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "BSD"
-RDEPENDS = "python-crypt"
+RDEPENDS_${PN} = "python-crypt"
 SRCNAME = "pyrad"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
+
+SRC_URI[md5sum] = "ab1502f8ccd7409ced757d78b0dee7df"
+SRC_URI[sha256sum] = "6a28096ae45261479048a0418b76ad5b6e370031ba8c773f495d8a2b018fc474"
diff --git a/recipes/python/python-pyraf_1.7.bb b/recipes/python/python-pyraf_1.7.bb
index d5f92e6c3e..ddbe4a135d 100644
--- a/recipes/python/python-pyraf_1.7.bb
+++ b/recipes/python/python-pyraf_1.7.bb
@@ -3,12 +3,15 @@ HOMEPAGE = "http://www.stsci.edu/resources/software_hardware/pyraf"
 AUTHOR = "Space Telescope Science Institute"
 SECTION = "devel/python"
 LICENSE = "AURA"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "ftp://ra.stsci.edu/pub/pyraf/release/pyraf-${PV}.tar.gz"
 S = "${WORKDIR}/pyraf-${PV}"
 
 inherit distutils
 
-RDEPENDS = "python-numarray"
+RDEPENDS_${PN} = "python-numarray"
 
+
+SRC_URI[md5sum] = "9a728aef7bebcd54abc103b00e2e1de6"
+SRC_URI[sha256sum] = "dc0f68f2d22cad2166ae3912e20713bb29df1e1450dff18eb426a74ef4087d2a"
diff --git a/recipes/python/python-pyrex_0.9.8.5.bb b/recipes/python/python-pyrex_0.9.8.5.bb
index 03468a0522..7a277ce17f 100644
--- a/recipes/python/python-pyrex_0.9.8.5.bb
+++ b/recipes/python/python-pyrex_0.9.8.5.bb
@@ -5,12 +5,21 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
 SRCNAME = "Pyrex"
-PR = "ml1"
+DEPENDS += "python"
+DEPENDS_virtclass-native += "python-native"
+PR = "ml2"
 
 SRC_URI = "\
   http://www.cosc.canterbury.ac.nz/greg.ewing/python/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
-  file://pyrex-fix-optimized-mode.patch;patch=1 \
+  file://pyrex-fix-optimized-mode.patch \
 "
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "3b3d8397c2c9a58fc59a90e2b49c651a"
+SRC_URI[sha256sum] = "dd60bc66b1627d3cbd0950499017dfd57a0705bb12493bb0de2a7b9b5c0873bc"
+
+BBCLASSEXTEND = "native"
+
+NATIVE_INSTALL_WORKS = "1"
diff --git a/recipes/python/python-pyro_3.8.1.bb b/recipes/python/python-pyro_3.8.1.bb
index 695d8fb7aa..809d417600 100644
--- a/recipes/python/python-pyro_3.8.1.bb
+++ b/recipes/python/python-pyro_3.8.1.bb
@@ -6,17 +6,17 @@ HOMEPAGE = "http://pyro.sourceforge.net"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "MIT"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/pyro/Pyro-${PV}.tar.gz \
-  file://pyro-unattended-install.patch;patch=1;pnum=0 \
+  file://pyro-unattended-install.patch;striplevel=0 \
 "
 S = "${WORKDIR}/Pyro-${PV}"
 
 inherit distutils
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
   python-crypt \
   python-io \
   python-lang \
@@ -29,3 +29,6 @@ RDEPENDS = "\
   python-threading \
 "
 
+
+SRC_URI[md5sum] = "8ab110b43f891c9664628133753c903a"
+SRC_URI[sha256sum] = "d9e8073c7abb0fd9a94ec72c48f5bf4673de8e9333082dce6954d18a2fe35efd"
diff --git a/recipes/python/python-pyrtc_git.bb b/recipes/python/python-pyrtc_git.bb
index 9b51189bf2..bd8452f298 100644
--- a/recipes/python/python-pyrtc_git.bb
+++ b/recipes/python/python-pyrtc_git.bb
@@ -1,16 +1,16 @@
+require ../freesmartphone/python-helpers.inc
+
 DESCRIPTION = "PyRTC is a python extension module that supports talking to the \
 RTC (Real Time Clock) found in most PCs and SOCs"
 SECTION = "devel/python"
-HOMEPAGE = "http://www.freesmartphone.org"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 LICENSE = "GPLv2"
 SRCNAME = "pyrtc"
 DEPENDS = "python-cython-native"
 SRCREV = "${FSO_PYTHONHELPERS_SRCREV}"
-PV = "1.0.0+gitr${SRCREV}"
+PV = "1.0.0+gitr${SRCPV}"
 PR = "ml1"
 
-SRC_URI = "git://git.freesmartphone.org/python-helpers.git;protocol=git;branch=master"
 S = "${WORKDIR}/git/${SRCNAME}"
 
 inherit distutils
diff --git a/recipes/python/python-pyserial_2.4.bb b/recipes/python/python-pyserial_2.4.bb
index 637a980e49..4e1b30f16f 100644
--- a/recipes/python/python-pyserial_2.4.bb
+++ b/recipes/python/python-pyserial_2.4.bb
@@ -3,7 +3,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "PSF"
 SRCNAME = "pyserial"
-PR = "ml1"
+PR = "ml2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
@@ -12,8 +12,11 @@ inherit setuptools
 
 # FIXME might stop packaging serialwin32 and serialjava files
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
   python-fcntl \
   python-io \
   python-stringold \
 "
+
+SRC_URI[md5sum] = "eec19df59fd75ba5a136992897f8e468"
+SRC_URI[sha256sum] = "6b6a9e3d2fd5978c92c843e0109918a4bcac481eecae316254481c0e0f7e73c8"
diff --git a/recipes/python/python-pysqlite2-native_2.4.0.bb b/recipes/python/python-pysqlite2-native_2.4.0.bb
index 0a7d667dca..7740628095 100644
--- a/recipes/python/python-pysqlite2-native_2.4.0.bb
+++ b/recipes/python/python-pysqlite2-native_2.4.0.bb
@@ -1,7 +1,7 @@
 require python-pysqlite2_${PV}.bb
 inherit native
 DEPENDS = "python-native sqlite3-native"
-RDEPENDS = ""
+RDEPENDS_${PN} = ""
 
 do_stage() {
     BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
diff --git a/recipes/python/python-pysqlite2_2.4.0.bb b/recipes/python/python-pysqlite2_2.4.0.bb
index 24b2668ec4..0419e5b28f 100644
--- a/recipes/python/python-pysqlite2_2.4.0.bb
+++ b/recipes/python/python-pysqlite2_2.4.0.bb
@@ -4,10 +4,10 @@ PRIORITY = "optional"
 LICENSE = "BSD"
 DEPENDS = "sqlite3"
 SRCNAME = "pysqlite"
-PR = "ml2"
+PR = "ml3"
 
-SRC_URI = "http://initd.org/pub/software/pysqlite/releases/2.4/${PV}/${SRCNAME}-${PV}.tar.gz \
-           file://fix-setup.patch;patch=1"
+SRC_URI = "http://www.ibiblio.org/pub/solaris/freeware/SOURCES/${SRCNAME}-${PV}.tar.gz \
+           file://fix-setup.patch"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
@@ -17,7 +17,7 @@ do_install_append() {
     mv ${D}${datadir}/pysqlite2-doc ${D}${datadir}/doc/${PN}
 }
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
  python-datetime \
  python-lang \
  python-crypt \
@@ -30,3 +30,6 @@ RDEPENDS = "\
 PACKAGES =+ "${PN}-tests"
 FILES_${PN}-tests = "${libdir}/${PYTHON_DIR}/pysqlite2/test"
 RDEPENDS_${PN}-tests = "${PN}"
+
+SRC_URI[md5sum] = "46b4590c51b9fb62cd0be1439646549e"
+SRC_URI[sha256sum] = "7e66c07d3eb93035f9272d01470e531a7c9f9d9751ad06f3a9c13b4f67c0a06a"
diff --git a/recipes/python/python-pytester_0.6.0.bb b/recipes/python/python-pytester_0.6.0.bb
index 8c9927f530..c77400ab5f 100644
--- a/recipes/python/python-pytester_0.6.0.bb
+++ b/recipes/python/python-pytester_0.6.0.bb
@@ -12,3 +12,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/meta-tools/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "8a7763e31e4cc3fdf9154c793dda3bc0"
+SRC_URI[sha256sum] = "7d17f07aa470cac6afc1b7e68745c1bf1767913ce52b401296e21cab245fe26b"
diff --git a/recipes/python/python-pyusb_0.4.1.bb b/recipes/python/python-pyusb_0.4.1.bb
index 5f70182e46..ea5b12d0d7 100644
--- a/recipes/python/python-pyusb_0.4.1.bb
+++ b/recipes/python/python-pyusb_0.4.1.bb
@@ -10,3 +10,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "9576c3e471e40e021fa44f36712bbd04"
+SRC_URI[sha256sum] = "9991a999170c533c10dbff227a9d617ef592fd579edfc21a55f0b715a7d329db"
diff --git a/recipes/python/python-pyvisa_1.3.bb b/recipes/python/python-pyvisa_1.3.bb
index 90bb00ef73..1bb3745bf6 100644
--- a/recipes/python/python-pyvisa_1.3.bb
+++ b/recipes/python/python-pyvisa_1.3.bb
@@ -13,3 +13,6 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 inherit setuptools
 
 export HOME=/tmp/foo
+
+SRC_URI[md5sum] = "19ecf6cfcd000392c8405eceb488efb0"
+SRC_URI[sha256sum] = "35fe5623906ebb8ebe27b2d5c9f793f2dce1698e32d8bdada3b69e42349994d8"
diff --git a/recipes/python/python-pyweather_0.7.0.bb b/recipes/python/python-pyweather_0.7.0.bb
index 9b98804ba3..ea33d3bd75 100644
--- a/recipes/python/python-pyweather_0.7.0.bb
+++ b/recipes/python/python-pyweather_0.7.0.bb
@@ -10,3 +10,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/meta-tools/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "ce547183f7b455d837d654a484b29a83"
+SRC_URI[sha256sum] = "fabdec4b04d50b50558b6062d35884c60b419e65b3738b08be07d729b6f3d46a"
diff --git a/recipes/python/python-pyxdg_0.15.bb b/recipes/python/python-pyxdg_0.15.bb
index 31c6f21ab4..67b6c979fc 100644
--- a/recipes/python/python-pyxdg_0.15.bb
+++ b/recipes/python/python-pyxdg_0.15.bb
@@ -1,9 +1,14 @@
 DESCRIPTION = "PyXDG is a python library to access freedesktop.org standards"
 SECTION = "devel/python"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.freedesktop.org/~lanius/pyxdg-${PV}.tar.gz"
+SRC_URI += "file://desktopentry-cmp.patch"
+
 S = "${WORKDIR}/pyxdg-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "86a5441285fc908145414b63348d11a3"
+SRC_URI[sha256sum] = "c2adf20955cb62af5c94622d0dd47fb82ee63da33c03d5a1f82337ba83044bb7"
diff --git a/recipes/python/python-pyxml_0.8.4.bb b/recipes/python/python-pyxml_0.8.4.bb
index 68eb7a3bb4..97440f2fec 100644
--- a/recipes/python/python-pyxml_0.8.4.bb
+++ b/recipes/python/python-pyxml_0.8.4.bb
@@ -3,12 +3,15 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "PSF"
 SRCNAME = "pyxml"
-PR = "ml1"
+PR = "ml2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pyxml/PyXML-${PV}.tar.gz"
 S = "${WORKDIR}/PyXML-${PV}"
 
 inherit distutils
 
-RDEPENDS = "python-xml python-netclient"
+RDEPENDS_${PN} = "python-xml python-netclient"
 
+
+SRC_URI[md5sum] = "1f7655050cebbb664db976405fdba209"
+SRC_URI[sha256sum] = "9fab66f9584fb8e67aebd8745a5c97bf1c5a2e2e461adf68862bcec64e448c13"
diff --git a/recipes/python/python-pyxmlrpc_0.8.8.3.bb b/recipes/python/python-pyxmlrpc_0.8.8.3.bb
index dea1989994..74748a9826 100644
--- a/recipes/python/python-pyxmlrpc_0.8.8.3.bb
+++ b/recipes/python/python-pyxmlrpc_0.8.8.3.bb
@@ -9,3 +9,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "d2aa74615aa9cf23413975a68613ffc1"
+SRC_URI[sha256sum] = "12527f130dd695184c44c6197deb619c26c9b5b31ce7699a5dd97e0ad2dd7bd1"
diff --git a/recipes/python/python-pyzeroconf_0.12.bb b/recipes/python/python-pyzeroconf_0.12.bb
index 4a8a9b018e..6c2764b757 100644
--- a/recipes/python/python-pyzeroconf_0.12.bb
+++ b/recipes/python/python-pyzeroconf_0.12.bb
@@ -16,3 +16,6 @@ do_install() {
 
    install -m 0644 Zeroconf.py ${D}${libdir}/${PYTHON_DIR}/site-packages/
 }
+
+SRC_URI[md5sum] = "e7180e9440d961c6aba5056fdd7997f0"
+SRC_URI[sha256sum] = "00689fa56dd87eb47b30565ab7561c94d2cde58372e267116889d2531d880b98"
diff --git a/recipes/python/python-rpyc_3.02.bb b/recipes/python/python-rpyc_3.02.bb
index d79f0d00a5..f3b3a16495 100644
--- a/recipes/python/python-rpyc_3.02.bb
+++ b/recipes/python/python-rpyc_3.02.bb
@@ -9,3 +9,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rpyc/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "4e855372c4a533b9ed605503156e6e04"
+SRC_URI[sha256sum] = "3dbd653b27fc855bf86dfe0ac06ed9bf59c8b85c9bcb4b5488528b30c59970f4"
diff --git a/recipes/python/python-scapy_2.0.0.9.bb b/recipes/python/python-scapy_2.0.0.9.bb
index ebe1223418..12cbf1b252 100644
--- a/recipes/python/python-scapy_2.0.0.9.bb
+++ b/recipes/python/python-scapy_2.0.0.9.bb
@@ -7,14 +7,17 @@ HOMEPAGE = "http://www.secdev.org/projects/scapy/"
 LICENSE = "GPL"
 PRIORITY = "optional"
 SRCNAME = "scapy"
-PR = "ml1"
+PR = "ml2"
 
 SRC_URI = "http://www.secdev.org/projects/scapy/files/scapy-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
   python-netclient \
   python-netserver \
 "
+
+SRC_URI[md5sum] = "953dc98dbd78fba3a80d554514581d26"
+SRC_URI[sha256sum] = "0431955a17cd687a28c9b005a6afbc11d8db9348cd4ec91c5600f4f662819e07"
diff --git a/recipes/python/python-scons-native_1.2.0.bb b/recipes/python/python-scons-native_1.2.0.bb
index 31bce5583d..bdad3ee018 100644
--- a/recipes/python/python-scons-native_1.2.0.bb
+++ b/recipes/python/python-scons-native_1.2.0.bb
@@ -1,7 +1,7 @@
 require python-scons_${PV}.bb
 inherit native
 DEPENDS = "python-native"
-RDEPENDS = ""
+RDEPENDS_${PN} = ""
 
 do_stage() {
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
@@ -12,3 +12,6 @@ do_stage() {
 do_install() {
 	:
 }
+
+SRC_URI[md5sum] = "53b6aa7281811717a57598e319441cf7"
+SRC_URI[sha256sum] = "2806451e02a42789decb6d08098b798b6b81a0a39d8d3b2fbdd3fe84ebd8a246"
diff --git a/recipes/python/python-scons_1.2.0.bb b/recipes/python/python-scons_1.2.0.bb
index dc5b40243e..67f6b35041 100644
--- a/recipes/python/python-scons_1.2.0.bb
+++ b/recipes/python/python-scons_1.2.0.bb
@@ -8,3 +8,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/scons/scons-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "53b6aa7281811717a57598e319441cf7"
+SRC_URI[sha256sum] = "2806451e02a42789decb6d08098b798b6b81a0a39d8d3b2fbdd3fe84ebd8a246"
diff --git a/recipes/python/python-scons_1.3.0.bb b/recipes/python/python-scons_1.3.0.bb
index 792e3a54f7..5a412cbfa0 100644
--- a/recipes/python/python-scons_1.3.0.bb
+++ b/recipes/python/python-scons_1.3.0.bb
@@ -1,8 +1,10 @@
 DESCRIPTION = "A Software Construction Tool"
 SECTION = "devel/python"
 PRIORITY = "optional"
-LICENSE = "GPL"
+LICENSE = "MIT"
+DEPENDS_virtclass-native = "python-native"
 SRCNAME = "scons"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/scons/scons-${PV}.tar.gz;name=scons \
            file://toolchain-from-env.SConscript \
@@ -21,3 +23,11 @@ do_install_append() {
 
 NATIVE_INSTALL_WORKS = "1"
 BBCLASSEXTEND = "native"
+
+RDEPENDS_${PN} = "python-shell \
+	       python-stringold \
+	       python-lang \
+	       python-io \
+	       python-fcntl \
+	       python-pickle \
+	       python-crypt"
diff --git a/recipes/python/python-setuptools_0.6c9.bb b/recipes/python/python-setuptools_0.6c9.bb
index 179129eb60..93eb4855dc 100644
--- a/recipes/python/python-setuptools_0.6c9.bb
+++ b/recipes/python/python-setuptools_0.6c9.bb
@@ -3,13 +3,14 @@ HOMEPAGE = "http://cheeseshop.python.org/pypi/setuptools"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "MIT"
-RDEPENDS = "python-distutils python-compression"
 SRCNAME = "setuptools"
-PR = "ml0"
+PR = "ml2"
+DEPENDS += "python"
+DEPENDS_virtclass-native += "python-native"
 
 SRC_URI = "\
   http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz\
-  file://fix-log-usage.patch;patch=1 \
+  file://fix-log-usage.patch \
 "
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
@@ -19,7 +20,14 @@ do_install_prepend() {
     install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
 }
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
   python-distutils \
   python-compression \
 "
+
+SRC_URI[md5sum] = "3864c01d9c719c8924c455714492295e"
+SRC_URI[sha256sum] = "e6190497301b6cb1484b9e6173723452c8df1b4cd9ea97af75c9589b1c34b3d8"
+
+BBCLASSEXTEND = "native"
+
+NATIVE_INSTALL_WORKS = "1"
diff --git a/recipes/python/python-sgmlop_1.1.bb b/recipes/python/python-sgmlop_1.1.bb
index dab075cc3b..5cb0f92d95 100644
--- a/recipes/python/python-sgmlop_1.1.bb
+++ b/recipes/python/python-sgmlop_1.1.bb
@@ -8,3 +8,6 @@ inherit distutils
 
 SRC_URI = "http://www.vanille.de/mirror/${SRCNAME}-${PV}.tar.bz2"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+SRC_URI[md5sum] = "45f77f33a6b2a5c09c28511ebb733b87"
+SRC_URI[sha256sum] = "7fd6495d6c3e8dac7ba086c68abed4930c958a94afc15359223074614559e462"
diff --git a/recipes/python/python-simplejson_2.0.7.bb b/recipes/python/python-simplejson_2.0.7.bb
index 7bfa44eb8e..d258f6a200 100644
--- a/recipes/python/python-simplejson_2.0.7.bb
+++ b/recipes/python/python-simplejson_2.0.7.bb
@@ -4,17 +4,20 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "MIT"
 SRCNAME = "simplejson"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "http://cheeseshop.python.org/packages/source/s/simplejson/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
   python-core \
   python-re \
   python-io \
   python-netserver \
 "
 
+
+SRC_URI[md5sum] = "9d02273f8615b8e3fceda891ffff10d1"
+SRC_URI[sha256sum] = "2b349ed73540f8ce68bdfa29e08e3dff9d885027bfa06d6a871a09fe381ddbbe"
diff --git a/recipes/python/python-sip.inc b/recipes/python/python-sip.inc
index 1267d07f59..04ef450acc 100644
--- a/recipes/python/python-sip.inc
+++ b/recipes/python/python-sip.inc
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
 AUTHOR = "Phil Thompson"
 LICENSE = "GPL"
 DEPENDS = "python"
-RDEPENDS = "python-core"
+RDEPENDS_${PN} = "python-core"
 
 SRC_URI = "http://www.riverbankcomputing.com/static/Downloads/sip4/sip-${PV}.tar.gz"
 
@@ -24,13 +24,15 @@ EXTRA_QMAKEVARS_POST += " TEMPLATE=lib \
 
 
 do_configure_prepend() {
-	cat siplib.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > siplib.pro
+	cat siplib.sbf.in | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, | sed s,@CFG_MODULE_BASENAME@,sip, > siplib.pro
+	cat siplib.c.in | sed s,@CFG_MODULE_BASENAME@,sip, > siplib.c
+	cat sip.h.in | sed -e s,@CFG_MODULE_NAME@,sip,g > sip.h
 }
 
 do_stage() {
 	install -d ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/
 	# sipconfig.py sipdistutils.py
-	install -m 0644 sip.h ${STAGING_INCDIR}/sip.h
+	install -m 0644 ../siplib/sip.h ${STAGING_INCDIR}/sip.h
 }
 
 do_install() {
diff --git a/recipes/python/python-soappy_0.11.6.bb b/recipes/python/python-soappy_0.11.6.bb
index fc7c49912c..3e48734cc7 100644
--- a/recipes/python/python-soappy_0.11.6.bb
+++ b/recipes/python/python-soappy_0.11.6.bb
@@ -3,12 +3,12 @@ SECTION = "devel/python"
 HOMEPAGE = "http://pywebsvcs.sourceforge.net/"
 PRIORITY = "optional"
 LICENSE = "BSD"
-RDEPENDS = "python-xml python-fpconst"
+RDEPENDS_${PN} = "python-xml python-fpconst"
 SRCNAME = "SOAPpy"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pywebsvcs/${SRCNAME}-${PV}.tar.gz \
-           file://fix-future.patch;patch=1 \
+           file://fix-future.patch \
            file://fpconst.py"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
@@ -17,3 +17,6 @@ inherit distutils
 do_compile_prepend() {
 	install -m 0644 ${WORKDIR}/fpconst.py ${S}/SOAPpy/fpconst.py
 }
+
+SRC_URI[md5sum] = "51ac835366badedd932c64f26fa8336b"
+SRC_URI[sha256sum] = "42c8cb3e42b439bc36b6ba3f090ddb72a214ca9264a2babf102c98731dea8e6a"
diff --git a/recipes/python/python-sphinx_0.5.1.bb b/recipes/python/python-sphinx_0.5.1.bb
index a1bc9dd9f7..1222cf2e6c 100644
--- a/recipes/python/python-sphinx_0.5.1.bb
+++ b/recipes/python/python-sphinx_0.5.1.bb
@@ -7,3 +7,6 @@ SRC_URI = "http://pypi.python.org/packages/source/S/Sphinx/Sphinx-${PV}.tar.gz"
 S = "${WORKDIR}/Sphinx-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "11456e362d75c1a4c5a5847921d3f4c7"
+SRC_URI[sha256sum] = "871c04e577625520091a2d3ea8ac09469ce2dcf7db9dbd6e54a57264879dac29"
diff --git a/recipes/python/python-sphinxsearch_0.1.bb b/recipes/python/python-sphinxsearch_0.1.bb
index dff93bc106..9e2839fa72 100644
--- a/recipes/python/python-sphinxsearch_0.1.bb
+++ b/recipes/python/python-sphinxsearch_0.1.bb
@@ -10,3 +10,6 @@ SRC_URI = "http://pypi.python.org/packages/source/s/sphinxsearch/${SRCNAME}-${PV
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "920deac1bd4d16fe1c5b51fe839140ab"
+SRC_URI[sha256sum] = "7fcf0aa2e5e08719b39aeb145d3b6e953a8643bb6fd5e8359303399493ee6c39"
diff --git a/recipes/python/python-spydi_0.9.7.bb b/recipes/python/python-spydi_0.9.7.bb
index 434b31d1d1..47d44a2bc0 100644
--- a/recipes/python/python-spydi_0.9.7.bb
+++ b/recipes/python/python-spydi_0.9.7.bb
@@ -12,3 +12,6 @@ SRC_URI = "http://lsc.fie.umich.mx/%7esadit/spyro/download/SPyDI-${PV}.tar.gz"
 S = "${WORKDIR}/SPyDI-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "9ca1c604330643fca1e3847f77ac8f0a"
+SRC_URI[sha256sum] = "67e939a8c3e0f33fd2de5945b9e1e50b522890df025560215d6ca56ea7204b15"
diff --git a/recipes/python/python-sqlalchemy_0.5.0.bb b/recipes/python/python-sqlalchemy_0.5.0.bb
index 5cba5b3a3d..dec4f8e18b 100644
--- a/recipes/python/python-sqlalchemy_0.5.0.bb
+++ b/recipes/python/python-sqlalchemy_0.5.0.bb
@@ -11,3 +11,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/sqlalchemy/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
+
+SRC_URI[md5sum] = "df49f403b2db3c54aace64aebe26cf90"
+SRC_URI[sha256sum] = "30c1649025f76e414400edd957f46b2932b5d3f8e2404779c76e693cb5776949"
diff --git a/recipes/python/python-sqlobject_0.10.4.bb b/recipes/python/python-sqlobject_0.10.4.bb
index 464cdd2c84..276c965fc8 100644
--- a/recipes/python/python-sqlobject_0.10.4.bb
+++ b/recipes/python/python-sqlobject_0.10.4.bb
@@ -6,11 +6,14 @@ HOMEPAGE = "http://www.sqlobject.org/"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 SRCNAME = "SQLObject"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
 
-RDEPENDS = "python-formencode"
+RDEPENDS_${PN} = "python-formencode"
+
+SRC_URI[md5sum] = "20039279c5b799c49e6496b9fe71f03f"
+SRC_URI[sha256sum] = "8204bf5aeaca5b72e6bf3bd11db440346f3ed6d13b856166e3b84c4b3ec7152f"
diff --git a/recipes/python/python-tlslite_0.3.8.bb b/recipes/python/python-tlslite_0.3.8.bb
index ae2d73c527..4985461cfb 100644
--- a/recipes/python/python-tlslite_0.3.8.bb
+++ b/recipes/python/python-tlslite_0.3.8.bb
@@ -6,9 +6,14 @@ HOMEPAGE = "http://trevp.net/tlslite/"
 PRIORITY = "optional"
 LICENSE = "PD"
 SRCNAME = "tlslite"
-PR = "ml1"
+PR = "ml2"
 
-SRC_URI = "http://trevp.net/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+# original url is dead, so it has been replaced with the gentoo one
+#SRC_URI = "http://trevp.net/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+SRC_URI = "http://gentoo.osuosl.org/distfiles/tlslite-0.3.8.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "5e1c19500e30fc7580939c18b435f937"
+SRC_URI[sha256sum] = "3d79170d8c3a662fa717b6401e8004208df113aaf3b18689bbeb704a23bf5b9f"
diff --git a/recipes/python/python-traits_3.0.3.bb b/recipes/python/python-traits_3.0.3.bb
index 9482a1b242..5f776a4560 100644
--- a/recipes/python/python-traits_3.0.3.bb
+++ b/recipes/python/python-traits_3.0.3.bb
@@ -2,17 +2,20 @@ DESCRIPTION = "Explicitly typed attributes for Python"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "BSD"
-PR = "ml0"
+PR = "ml1"
 
 inherit setuptools
 
 SRC_URI = "\
   http://pypi.python.org/packages/source/T/Traits/Traits-${PV}.tar.gz \
-#  file://fix-import-pyface.diff;patch=1 \
+#  file://fix-import-pyface.diff \
 "
 S = "${WORKDIR}/Traits-${PV}"
 
-RDEPENDS = "python-netclient"
+RDEPENDS_${PN} = "python-netclient"
 
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/enthought/traits/.debug"
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/enthought/traits/protocols/.debug"
+
+SRC_URI[md5sum] = "3b893056fadf3f0781b05b11413162ad"
+SRC_URI[sha256sum] = "77224e8464c01162b3afa54d8cec8304ba647fca26f037d454cb6a14e2757604"
diff --git a/recipes/python/python-twisted-native_8.2.0.bb b/recipes/python/python-twisted-native_8.2.0.bb
index d35b9f2482..4631fb0c4c 100644
--- a/recipes/python/python-twisted-native_8.2.0.bb
+++ b/recipes/python/python-twisted-native_8.2.0.bb
@@ -7,3 +7,6 @@ inherit native
 do_stage() {
 	distutils_stage_all
 }
+
+SRC_URI[md5sum] = "c85f151999df3ecf04c49a781b4438d2"
+SRC_URI[sha256sum] = "e0602bb05e31f6100b6f9ab35cfa93ab9f7a1c50a351a0ddfcd236a923bddfb0"
diff --git a/recipes/python/python-twisted_8.2.0.bb b/recipes/python/python-twisted_8.2.0.bb
index 78234187fb..3f8b657715 100644
--- a/recipes/python/python-twisted_8.2.0.bb
+++ b/recipes/python/python-twisted_8.2.0.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.twistedmatrix.com"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-PR = "r1"
+PR = "r3"
 
 SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Twisted/8.2/Twisted-${PV}.tar.bz2 "
 S = "${WORKDIR}/Twisted-${PV}"
@@ -30,7 +30,7 @@ PACKAGES += "\
   ${PN}-core \
 "
 
-RDEPENDS = "python-core python-zopeinterface"
+RDEPENDS_${PN} = "python-core python-zopeinterface"
 RDEPENDS_${PN} += "\
   ${PN}-bin \
   ${PN}-conch \
@@ -43,11 +43,17 @@ RDEPENDS_${PN} += "\
   ${PN}-words \
 "
 
+do_install_append() {
+	# remove some useless files before packaging
+	find ${D} -name "*.bat" -o -name "*.c" -o -name "*.h" -exec rm {} \;
+}
+
 ALLOW_EMPTY = "1"
 FILES_${PN} = ""
 
 FILES_${PN}-test = " \
   ${libdir}/${PYTHON_DIR}/site-packages/twisted/test \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/test \
 "
 
 FILES_${PN}-protocols = " \
@@ -210,3 +216,6 @@ FILES_${PN}-dbg += " \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/.debug \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/.debug \
 "
+
+SRC_URI[md5sum] = "c85f151999df3ecf04c49a781b4438d2"
+SRC_URI[sha256sum] = "e0602bb05e31f6100b6f9ab35cfa93ab9f7a1c50a351a0ddfcd236a923bddfb0"
diff --git a/recipes/python/python-urlgrabber-native_3.1.0.bb b/recipes/python/python-urlgrabber-native_3.1.0.bb
index 5c2af551c0..41ba9885d6 100644
--- a/recipes/python/python-urlgrabber-native_3.1.0.bb
+++ b/recipes/python/python-urlgrabber-native_3.1.0.bb
@@ -1,8 +1,8 @@
 require python-urlgrabber_${PV}.bb
 inherit native
 DEPENDS = "python-native"
-RDEPENDS = ""
-PR = "r1"
+RDEPENDS_${PN} = ""
+PR = "r2"
 
 do_stage() {
 	distutils_stage_all
diff --git a/recipes/python/python-urlgrabber_3.1.0.bb b/recipes/python/python-urlgrabber_3.1.0.bb
index a8ccf8ae57..08921e5de2 100644
--- a/recipes/python/python-urlgrabber_3.1.0.bb
+++ b/recipes/python/python-urlgrabber_3.1.0.bb
@@ -9,3 +9,6 @@ SRC_URI = "http://linux.duke.edu/projects/urlgrabber/download/urlgrabber-${PV}.t
 S = "${WORKDIR}/urlgrabber-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "2a92d8ce0d89c5e772a98e9b8dcd5b73"
+SRC_URI[sha256sum] = "34d48f4f4390ed06c0fc8fac580f6fe4cd2bfb3557ff0f11254a7bea25d353ca"
diff --git a/recipes/python/python-vobject_0.8.1c.bb b/recipes/python/python-vobject_0.8.1c.bb
index 87ff6b7fdd..a8426ececf 100644
--- a/recipes/python/python-vobject_0.8.1c.bb
+++ b/recipes/python/python-vobject_0.8.1c.bb
@@ -4,10 +4,13 @@ PRIORITY = "optional"
 LICENSE = "Apache License V2.0" 
 HOMEPAGE = "http://vobject.skyhouseconsulting.com/" 
 SRCNAME = "vobject" 
-RDEPENDS = "python python-dateutil"
-PR = "r1"
+RDEPENDS_${PN} = "python python-dateutil"
+PR = "r2"
 
 SRC_URI = "http://vobject.skyhouseconsulting.com/${SRCNAME}-${PV}.tar.gz" 
 S = "${WORKDIR}/${SRCNAME}-${PV}" 
 
 inherit setuptools  
+
+SRC_URI[md5sum] = "c9686dd74d39fdae140890d9c694c076"
+SRC_URI[sha256sum] = "594113117f2017ed837c8f3ce727616f9053baa5a5463a7420c8249b8fc556f5"
diff --git a/recipes/python/python-vorbis_1.4.bb b/recipes/python/python-vorbis_1.4.bb
index 69a341f4f8..5ff8d4a469 100644
--- a/recipes/python/python-vorbis_1.4.bb
+++ b/recipes/python/python-vorbis_1.4.bb
@@ -7,7 +7,7 @@ SRCNAME = "pyvorbis"
 PR = "ml0"
 
 SRC_URI = "http://www.andrewchatham.com/pyogg/download/${SRCNAME}-${PV}.tar.gz \
-           file://disable-oggcheck.patch;patch=1"
+           file://disable-oggcheck.patch"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
@@ -21,3 +21,6 @@ do_configure_prepend() {
 	echo "vorbis_lib_dir = ${STAGING_LIBDIR}" >>Setup
 	echo "vorbis_include_dir = ${STAGING_INCDIR}" >>Setup
 }
+
+SRC_URI[md5sum] = "b4921e792c0a74f75b9d3057df10ee7c"
+SRC_URI[sha256sum] = "a7154541cea58304feff30752243eab862131c7589d72c200c8ad722d3bf1647"
diff --git a/recipes/python/python-webdav_0.1.2.bb b/recipes/python/python-webdav_0.1.2.bb
index efc74f9183..7fa8e2d791 100644
--- a/recipes/python/python-webdav_0.1.2.bb
+++ b/recipes/python/python-webdav_0.1.2.bb
@@ -13,3 +13,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pythonwebdavlib/Python%20WebDAV%20Library%20-%2
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+SRC_URI[md5sum] = "8e49e0ecc5b4327c4f752a544ee10e1a"
+SRC_URI[sha256sum] = "72c029ad1e25de950f59c2f1812d009d2c1691b70e4b5b09f1af9006e8fd5f23"
diff --git a/recipes/python/python-webpy_0.31.bb b/recipes/python/python-webpy_0.31.bb
index 616e8b4c9b..75cfc5e002 100644
--- a/recipes/python/python-webpy_0.31.bb
+++ b/recipes/python/python-webpy_0.31.bb
@@ -2,16 +2,19 @@ DESCRIPTION = "A Lightweight Web Application Framework"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "PSF"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "http://webpy.org/static/web.py-${PV}.tar.gz"
 S = "${WORKDIR}/webpy"
 
 inherit distutils
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
   python-netserver \
   python-netclient \
   python-pprint \
 "
 
+
+SRC_URI[md5sum] = "439b0700f9f5d422e5db6f28c0f86b11"
+SRC_URI[sha256sum] = "01f30f86c9ea41e7fcc9bc4cabb17283de7dbf19c301254161a89dd0a73cb9f3"
diff --git a/recipes/python/python-xappy_0.5.bb b/recipes/python/python-xappy_0.5.bb
index 5c5f1ae6d1..90361e40ab 100644
--- a/recipes/python/python-xappy_0.5.bb
+++ b/recipes/python/python-xappy_0.5.bb
@@ -13,3 +13,6 @@ do_stage() {
 	distutils_stage_all
 }
 
+
+SRC_URI[md5sum] = "cc0c6d5a8f9346ad90bd5f8183789c96"
+SRC_URI[sha256sum] = "998d148114abb4ae68ef2c340d971dfe09ec581850a1f0fd7c856f3c9b397b3e"
diff --git a/recipes/python/python-xlib_0.14.bb b/recipes/python/python-xlib_0.14.bb
index eb29004223..953c5e6253 100644
--- a/recipes/python/python-xlib_0.14.bb
+++ b/recipes/python/python-xlib_0.14.bb
@@ -8,3 +8,6 @@ PR = "r1"
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz"
 
 inherit distutils
+
+SRC_URI[md5sum] = "a038c2f410d8445f3fa8f6dcd45659c5"
+SRC_URI[sha256sum] = "4771b0b6a605e0197ece5432fa601c61df724b32544239f463a867200f2160eb"
diff --git a/recipes/python/python.inc b/recipes/python/python.inc
index 7e61f795ba..c325b91753 100644
--- a/recipes/python/python.inc
+++ b/recipes/python/python.inc
@@ -4,7 +4,7 @@ LICENSE = "PSF"
 SECTION = "devel/python"
 PRIORITY = "optional"
 # bump this on every change in contrib/python/generate-manifest-2.6.py
-INC_PR = "ml8"
+INC_PR = "ml12"
 
 DEFAULT_PREFERENCE = "-26"
 
diff --git a/recipes/python/yum-metadata-parser-native_1.1.2.bb b/recipes/python/yum-metadata-parser-native_1.1.2.bb
index 15d26a18ce..ab4e577483 100644
--- a/recipes/python/yum-metadata-parser-native_1.1.2.bb
+++ b/recipes/python/yum-metadata-parser-native_1.1.2.bb
@@ -1,8 +1,8 @@
 require yum-metadata-parser_${PV}.bb
 inherit native
 DEPENDS = "python-native sqlite3-native glib-2.0-native libxml2-native"
-RDEPENDS = ""
-PR = "r1"
+RDEPENDS_${PN} = ""
+PR = "r2"
 
 do_stage() {
 	distutils_stage_all
diff --git a/recipes/python/yum-metadata-parser_1.1.2.bb b/recipes/python/yum-metadata-parser_1.1.2.bb
index 24de7615bc..c5216020bb 100644
--- a/recipes/python/yum-metadata-parser_1.1.2.bb
+++ b/recipes/python/yum-metadata-parser_1.1.2.bb
@@ -11,3 +11,6 @@ S = "${WORKDIR}/yum-metadata-parser-${PV}"
 TARGET_CFLAGS += "-I${STAGING_LIBDIR}/glib-2.0"
 
 inherit distutils
+
+SRC_URI[md5sum] = "13df226ef004ea78eebc59022720b536"
+SRC_URI[sha256sum] = "48b87110c3c46ad04209b358fded534eca3bfdc91b396d2549390dd51048be9f"