merge of '52d8aacaac0c09d6552f9d5d66a8cab47c65d4a7'

     and '903edcf621d6b2974f60aceef8e79c2816561136'

8 files changed, 28 insertions, 11 deletions

diff --git a/packages/python/python-ecore_cvs.bb b/packages/python/python-ecore_cvs.bb
index 73c4b7ea00..663551f3a4 100644
--- a/packages/python/python-ecore_cvs.bb
+++ b/packages/python/python-ecore_cvs.bb
@@ -1,9 +1,9 @@
 require python-efl.inc
 DEPENDS += "python-evas ecore"
+RDEPENDS += "python-evas"
 PV = "0.2.1+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 do_stage() {
     distutils_stage_all
 }
-
diff --git a/packages/python/python-edbus_cvs.bb b/packages/python/python-edbus_cvs.bb
index dc4b09cee8..75bdc7ff80 100644
--- a/packages/python/python-edbus_cvs.bb
+++ b/packages/python/python-edbus_cvs.bb
@@ -1,7 +1,8 @@
 require python-efl.inc
 DEPENDS += "edbus python-dbus"
+RDEPENDS += "python-dbus"
 PV = "0.1.1+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${E_CVS};module=e17/proto/python-efl/python-e_dbus"
 S = "${WORKDIR}/python-e_dbus"
diff --git a/packages/python/python-edje_cvs.bb b/packages/python/python-edje_cvs.bb
index 3ee4b1decd..144fcfddde 100644
--- a/packages/python/python-edje_cvs.bb
+++ b/packages/python/python-edje_cvs.bb
@@ -1,5 +1,5 @@
 require python-efl.inc
 DEPENDS += "edje python-evas"
+RDEPENDS += "python-evas"
 PV = "0.2.1+cvs${SRCDATE}"
-PR = "r0"
-
+PR = "r2"
diff --git a/packages/python/python-epsilon_cvs.bb b/packages/python/python-epsilon_cvs.bb
index f979159b49..55ba0c1346 100644
--- a/packages/python/python-epsilon_cvs.bb
+++ b/packages/python/python-epsilon_cvs.bb
@@ -1,4 +1,5 @@
 require python-efl.inc
 DEPENDS += "epsilon python-ecore"
+RDEPENDS += "python-ecore"
 PV = "0.2.1+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
diff --git a/packages/python/python-formencode_svn.bb b/packages/python/python-formencode_svn.bb
index 80a1ba2e5b..97dd5be64b 100644
--- a/packages/python/python-formencode_svn.bb
+++ b/packages/python/python-formencode_svn.bb
@@ -5,9 +5,9 @@ LICENSE = "LGPL"
 DEPENDS = "sqlite3"
 SRCNAME = "FormEncode"
 PV = "0.4+svnr${SRCREV}"
-PR = "ml0"
+PR = "ml1"
 
-inherit distutils
+inherit setuptools
 
 SRC_URI = "svn://svn.colorstudy.com/FormEncode;module=trunk;proto=http"
 
diff --git a/packages/python/python-pygtk/prevent_to_get_display_during_import.patch b/packages/python/python-pygtk/prevent_to_get_display_during_import.patch
new file mode 100644
index 0000000000..db3469ef57
--- /dev/null
+++ b/packages/python/python-pygtk/prevent_to_get_display_during_import.patch
@@ -0,0 +1,14 @@
+Index: pygtk-2.10.4/gtk/__init__.py
+===================================================================
+--- pygtk-2.10.4.orig/gtk/__init__.py	2007-11-27 19:27:05.000000000 -0300
++++ pygtk-2.10.4/gtk/__init__.py	2007-11-27 19:28:22.000000000 -0300
+@@ -78,7 +78,8 @@
+ 
+ keysyms = LazyModule('keysyms', locals())
+ 
+-_init()
++if not hasattr(sys.modules['__main__'], 'python_launcher_enabled'):
++    init()
+ 
+ # CAPI
+ _PyGtk_API = _gtk._PyGtk_API
diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb
index 57dc48aa77..645aad11e0 100644
--- a/packages/python/python-pygtk_2.10.4.bb
+++ b/packages/python/python-pygtk_2.10.4.bb
@@ -6,10 +6,11 @@ RDEPENDS = "python-shell python-pycairo python-pygobject"
 PROVIDES = "python-pygtk2"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
-PR = "ml6"
+PR = "ml7"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${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://acinclude.m4"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-sqlobject_0.9.1.bb b/packages/python/python-sqlobject_0.9.1.bb
index db8dfd4aff..90c88a4650 100644
--- a/packages/python/python-sqlobject_0.9.1.bb
+++ b/packages/python/python-sqlobject_0.9.1.bb
@@ -7,9 +7,9 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 RDEPENDS = "python-formencode"
 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 distutils
+inherit setuptools