Merge branch 'org.openembedded.dev' of new.openembedded.org:openembedded into org.openembedded.dev

8 files changed, 42 insertions, 9 deletions

diff --git a/recipes/python/python-epsilon_svn.bb b/recipes/python/python-epsilon_svn.bb
index 9f535e5fd7..7aa3370804 100644
--- a/recipes/python/python-epsilon_svn.bb
+++ b/recipes/python/python-epsilon_svn.bb
@@ -2,4 +2,4 @@ require python-efl.inc
 DEPENDS += "epsilon python-ecore"
 RDEPENDS += "python-ecore"
 
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/OLD/BINDINGS/python;module=${PN};proto=http"
+SRC_URI = "svn://svn.enlightenment.org/svn/e/OLD/BINDINGS/python;module=${PN};proto=http"
diff --git a/recipes/python/python-etk_svn.bb b/recipes/python/python-etk_svn.bb
index ba082d873b..dc821c64d4 100644
--- a/recipes/python/python-etk_svn.bb
+++ b/recipes/python/python-etk_svn.bb
@@ -4,7 +4,7 @@ RDEPENDS += "python-evas python-ecore python-edje python-numeric python-math etk
 PV = "0.1.1+svnr${SRCPV}"
 PR = "ml1"
 
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/OLD/BINDINGS/python;module=${PN};proto=http"
+SRC_URI = "svn://svn.enlightenment.org/svn/e/OLD/BINDINGS/python;module=${PN};proto=http"
 
 do_stage() {         
 	distutils_stage_all 
diff --git a/recipes/python/python-gst/python-path.patch b/recipes/python/python-gst/python-path.patch
index 6cbad8cc5f..5256ddd0ec 100644
--- a/recipes/python/python-gst/python-path.patch
+++ b/recipes/python/python-gst/python-path.patch
@@ -2,7 +2,7 @@ Index: gst-python-0.10.10/acinclude.m4
 ===================================================================
 --- gst-python-0.10.10.orig/acinclude.m4
 +++ gst-python-0.10.10/acinclude.m4
-@@ -43,16 +43,20 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+@@ -43,16 +43,21 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
  [AC_REQUIRE([AM_PATH_PYTHON])
  AC_MSG_CHECKING(for headers required to compile python extensions)
  dnl deduce PYTHON_INCLUDES
@@ -15,6 +15,7 @@ Index: gst-python-0.10.10/acinclude.m4
 +       [  --with-python-includes=DIR  path to Python includes], py_exec_prefix=$withval)
 +if test x$py_exec_prefix != x; then
 + PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
++ py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
  else
 -  PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
 -  if test "$py_prefix" != "$py_exec_prefix"; then
@@ -23,7 +24,7 @@ Index: gst-python-0.10.10/acinclude.m4
 + py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
 + py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
 + PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-+if test "$py_prefix" != "$py_exec_prefix"; then
++ if test "$py_prefix" != "$py_exec_prefix"; then
 +   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
 + fi
  fi
diff --git a/recipes/python/python-gst_0.10.17.bb b/recipes/python/python-gst_0.10.17.bb
index 6b3a147f14..b0b552b7e1 100644
--- a/recipes/python/python-gst_0.10.17.bb
+++ b/recipes/python/python-gst_0.10.17.bb
@@ -3,6 +3,8 @@ SECTION = "devel/python"
 LICENSE = "LGPL"
 DEPENDS = "gstreamer gst-plugins-base python-pygobject"
 
+PR = "r1"
+
 SRC_URI = "\
   http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
   file://python-path.patch;patch=1 \
diff --git a/recipes/python/python-paste_1.7.2.bb b/recipes/python/python-paste_1.7.2.bb
new file mode 100644
index 0000000000..28c59fb39d
--- /dev/null
+++ b/recipes/python/python-paste_1.7.2.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Tools for using a Web Server Gateway Interface stack"
+HOMEPAGE = "http://pythonpaste.org/"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "MIT"
+SRCNAME = "Paste"
+PR = "r0"
+
+SRC_URI = "http://pypi.python.org/packages/source/P/${SRCNAME}/${SRCNAME}-${PV}.tar.gz;name=paste"
+SRC_URI[paste.md5sum] = "a6a58d08dc4bff91d5d1c519d2277f8a"
+SRC_URI[paste.sha256sum] = "67dde086f0aa84c3ec2452cd65d05d19a050ec2ba56483b1614bdbfd82b3b2b8"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
diff --git a/recipes/python/python-phoneutils_git.bb b/recipes/python/python-phoneutils_git.bb
index c616a2beed..2c6fca1ed1 100644
--- a/recipes/python/python-phoneutils_git.bb
+++ b/recipes/python/python-phoneutils_git.bb
@@ -3,6 +3,7 @@ SECTION = "devel/python"
 DEPENDS = "libphone-utils python-cython-native python-pyrex-native"
 RDEPENDS = "libphone-utils"
 
+SRCREV = "8a7c719e0c3f1f8c10f77f17422da02d7177f0dd"
 PV = "0.0.2+gitr${SRCREV}"
 PR = "r2"
 
diff --git a/recipes/python/python-pygobject-native_2.20.0.bb b/recipes/python/python-pygobject-native_2.20.0.bb
index 918ffa2643..409481c2bf 100644
--- a/recipes/python/python-pygobject-native_2.20.0.bb
+++ b/recipes/python/python-pygobject-native_2.20.0.bb
@@ -1,11 +1,11 @@
 require python-pygobject_${PV}.bb
 
+inherit native
+
 DEPENDS = "python-native glib-2.0-native"
 
 PARALLEL_MAKE = ""
 
-inherit native
-
 SRC_URI = "\
   ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
 #  file://python-path.patch;patch=1 \
@@ -13,7 +13,11 @@ SRC_URI = "\
 
 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"
 
-do_stage_append() {
-	install -d ${STAGING_BINDIR}
-	install -m 0755 gobject/generate-constants ${STAGING_BINDIR}/gobject-generate-constants
+do_configure_prepend() {
+	unset PYTHONPATH
+}
+
+do_install_append() {
+	install -d ${D}${bindir}
+	install -m 0755 gobject/generate-constants ${D}${bindir}/gobject-generate-constants
 }
diff --git a/recipes/python/python-pysqlite2-native_2.4.0.bb b/recipes/python/python-pysqlite2-native_2.4.0.bb
new file mode 100644
index 0000000000..0a7d667dca
--- /dev/null
+++ b/recipes/python/python-pysqlite2-native_2.4.0.bb
@@ -0,0 +1,10 @@
+require python-pysqlite2_${PV}.bb
+inherit native
+DEPENDS = "python-native sqlite3-native"
+RDEPENDS = ""
+
+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}
+}