Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

7 files changed, 52 insertions, 9 deletions

diff --git a/packages/python/python-coherence_svn.bb b/packages/python/python-coherence_svn.bb
index e6f5fafb53..031067672e 100644
--- a/packages/python/python-coherence_svn.bb
+++ b/packages/python/python-coherence_svn.bb
@@ -3,17 +3,23 @@ SECTION = "devel/python"
 LICENSE = "MIT"
 HOMEPAGE = "http://coherence.beebits.net/wiki"
 
-PR = "r6"
+PR = "r1"
+
 PV = "0.6.0+svnr${SRCREV}"
 
 inherit setuptools
 
+DISTUTILS_INSTALL_ARGS = "--root=${D} \
+    --prefix=${prefix} \
+    --install-data=${datadir}"
+
 SRC_URI = "svn://coherence.beebits.net/svn/trunk;module=Coherence;proto=https"
 S = "${WORKDIR}/Coherence"
 
 FILES_${PN} += "${datadir}"
 RDEPENDS_${PN} += "python-twisted-pair python-divmodepsilon python-nevow python-gst python-dbus \
-	python-configobj python-twisted python-twisted-core python-misc python-zopeinterface \
-	zope python-modules python-pygobject python-gdata python-inotify"
+	python-configobj python-twisted python-twisted-core python-twisted-protocols python-misc \
+	python-zopeinterface zope python-modules python-pygobject python-gdata python-inotify \
+	python-divmodaxiom"
 
 
diff --git a/packages/python/python-divmodaxiom_0.5.30.bb b/packages/python/python-divmodaxiom_0.5.30.bb
new file mode 100644
index 0000000000..94c8a5317b
--- /dev/null
+++ b/packages/python/python-divmodaxiom_0.5.30.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "An object oriented database"
+LICENSE = "MIT"
+
+REALPN = "Axiom"
+
+DEPENDS += "python-divmodepsilon-native"
+
+require divmod.inc
diff --git a/packages/python/python-divmodepsilon-native_0.5.11.bb b/packages/python/python-divmodepsilon-native_0.5.11.bb
new file mode 100644
index 0000000000..185708b611
--- /dev/null
+++ b/packages/python/python-divmodepsilon-native_0.5.11.bb
@@ -0,0 +1,11 @@
+require python-divmodepsilon_${PV}.bb
+inherit native
+
+DEPENDS = "python-native python-twisted-native zope-native"
+
+do_stage() {
+    BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+    STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
+        ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
+}
+
diff --git a/packages/python/python-pycrypto_git.bb b/packages/python/python-pycrypto_git.bb
new file mode 100644
index 0000000000..9e6eecbebd
--- /dev/null
+++ b/packages/python/python-pycrypto_git.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "A collection of cryptographic algorithms and protocols"
+SECTION = "devel/python"
+PRIORITY = "optional"
+DEPENDS = "gmp"
+SRCNAME = "pycrypto"
+LICENSE = "pycrypto"
+PR = "ml0"
+
+PV = "2.0.1+gitr${SRCREV}"
+SRC_URI = "git://git.pycrypto.org:9419/crypto/pycrypto-2.x.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
+
+inherit distutils
diff --git a/packages/python/python-pyflakes_0.2.1.bb b/packages/python/python-pyflakes_0.3.0.bb
index 8be6d54478..4a6580ea05 100644
--- a/packages/python/python-pyflakes_0.2.1.bb
+++ b/packages/python/python-pyflakes_0.3.0.bb
@@ -4,9 +4,9 @@ HOMEPAGE = "http://divmod.org/projects/pyflakes"
 PRIORITY = "optional"
 LICENSE = "BSD"
 SRCNAME = "pyflakes"
-PR = "ml1"
+PR = "ml0"
 
-SRC_URI = "http://www.divmod.org/static/projects/pyflakes/pyflakes-${PV}.tar.gz"
+SRC_URI = "http://pypi.python.org/packages/source/p/pyflakes/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/packages/python/python-pygobject_2.16.0.bb b/packages/python/python-pygobject_2.16.0.bb
index ef9fe0e6c8..d7bd1c041f 100644
--- a/packages/python/python-pygobject_2.16.0.bb
+++ b/packages/python/python-pygobject_2.16.0.bb
@@ -2,9 +2,7 @@ DESCRIPTION = "Python GObject bindings"
 SECTION = "devel/python"
 LICENSE = "LGPL"
 DEPENDS = "python-pygobject-native-${PV}"
-PR = "ml1"
-
-DEFAULT_PREFERENCE = "-1"
+PR = "ml2"
 
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 
@@ -32,6 +30,8 @@ do_stage() {
 
 PACKAGES += "${PN}-lib"
 
+RDEPENDS_${PN} += "python-textutils"
+
 FILES_${PN} = "${libdir}/python*"
 FILES_${PN}-lib = "${libdir}/lib*.so.*"
 FILES_${PN}-dev += "${bindir} ${datadir}"
diff --git a/packages/python/python_2.6.1.bb b/packages/python/python_2.6.1.bb
index 8c3f3544a8..ae9f8ee725 100644
--- a/packages/python/python_2.6.1.bb
+++ b/packages/python/python_2.6.1.bb
@@ -1,7 +1,7 @@
 require python.inc
 DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib"
 DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
-PR = "ml2"
+PR = "ml3"
 
 SRC_URI = "\
   http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
@@ -27,6 +27,11 @@ S = "${WORKDIR}/Python-${PV}"
 
 inherit autotools
 
+# The 3 lines below are copied from the libffi recipe, ctypes ships its own copy of the libffi sources
+#Somehow gcc doesn't set __SOFTFP__ when passing -mfloatabi=softp :(
+TARGET_CC_ARCH_append_armv6 = " -D__SOFTFP__"
+TARGET_CC_ARCH_append_armv7a = " -D__SOFTFP__"
+
 #
 # copy config.h and an appropriate Makefile for distutils.sysconfig
 # which laters uses the information out of these to compile extensions