merge of '52d8aacaac0c09d6552f9d5d66a8cab47c65d4a7'

     and '903edcf621d6b2974f60aceef8e79c2816561136'

19 files changed, 57 insertions, 128 deletions

diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index deac4e9225..ae83f51473 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -81,6 +81,7 @@ SRCDATE_engrave ?= "${EFL_SRCDATE}"
 SRCDATE_evolve-native ?= "${EFL_SRCDATE}"
 SRCDATE_evolve ?= "${EFL_SRCDATE}"
 SRCDATE_gevas2 ?= "${EFL_SRCDATE}"
+SRCDATE_imlib2 ?= "${EFL_SRCDATE}"
 
 # Enlightenment Bindings
 SRCDATE_eflpp ?= "${EFL_SRCDATE}"
diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb
index d9c2b83b79..feb940f4ec 100644
--- a/packages/efl1/edbus_cvs.bb
+++ b/packages/efl1/edbus_cvs.bb
@@ -1,16 +1,19 @@
 DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
-DEPENDS = "dbus ecore"
+DEPENDS = "dbus ecore efreet ewl"
 LICENSE = "MIT BSD"
 PV = "0.1.0.042+cvs${SRCDATE}"
-PR = "r2"
+PR = "r3"
 
 inherit efl_library
 
 SRC_URI = "${E_CVS};module=e17/libs/e_dbus"
 S = "${WORKDIR}/e_dbus"
 
-PACKAGES =+ "${PN}-enotify ${PN}-edbus ${PN}-enm ${PN}-ehal"
+EXTRA_OECONF = "--enable-build-test-gui"
+
+PACKAGES =+ "${PN}-enotify ${PN}-edbus ${PN}-enm ${PN}-ehal ${PN}-test-gui"
 FILES_${PN}-enotify = "${libdir}/libenotify.so.*"
 FILES_${PN}-edbus = "${libdir}/libedbus.so.*"
 FILES_${PN}-enm = "${libdir}/libenm.so.*"
 FILES_${PN}-ehal = "${libdir}/libehal.so.*"
+FILES_${PN}-test-gui = "${bindir}/e_dbus_hal"
diff --git a/packages/efl1/emotion_cvs.bb b/packages/efl1/emotion_cvs.bb
index 36a5065e7a..7ee7c384d6 100644
--- a/packages/efl1/emotion_cvs.bb
+++ b/packages/efl1/emotion_cvs.bb
@@ -2,14 +2,13 @@ DESCRIPTION = "The Enlightenment multimedia library"
 LICENSE = "MIT BSD"
 # we no longer build the libxine backend, since the gstreamer backend seems more promising
 DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base"
-RRECOMMENDS_${PN} = "emotion-backend-gstreamer"
 PV = "0.1.0+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 inherit efl_library
 
 EXTRA_OECONF = "--disable-xine --enable-gstreamer"
 
-PACKAGES =+ "emotion-backend-gstreamer emotion-test"
+PACKAGES =+ "emotion-backend-gstreamer"
 FILES_emotion-backend-gstreamer = "${libdir}/emotion/*.so"
-FILES_emotion-test = "${bindir}/emotion_test ${datadir}"
+RRECOMMENDS_${PN} = "emotion-backend-gstreamer"
diff --git a/packages/efl1/epsilon/compile-fix.patch b/packages/efl1/epsilon/compile-fix.patch
deleted file mode 100644
index 1c42cc59c4..0000000000
--- a/packages/efl1/epsilon/compile-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- epsilon-0.3.0.004/src/lib/exiftags/exif.c~compile-fix
-+++ epsilon-0.3.0.004/src/lib/exiftags/exif.c
-@@ -48,7 +48,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
--#include <math.h>
- #include <float.h>
- #include <ctype.h>
- 
diff --git a/packages/efl1/epsilon/fix_alignment_error.patch b/packages/efl1/epsilon/fix_alignment_error.patch
new file mode 100644
index 0000000000..7a635bcf88
--- /dev/null
+++ b/packages/efl1/epsilon/fix_alignment_error.patch
@@ -0,0 +1,13 @@
+Index: epsilon/src/lib/exiftags/canon.c
+===================================================================
+--- epsilon.orig/src/lib/exiftags/canon.c	2007-12-03 17:45:27.000000000 -0300
++++ epsilon/src/lib/exiftags/canon.c	2007-12-03 17:46:59.000000000 -0300
+@@ -52,7 +52,7 @@
+ struct ccstm {
+ 	int32_t val;
+ 	struct descrip *table;
+-	const char descr[];
++	const char *descr;
+ };
+ 
+ 
diff --git a/packages/efl1/epsilon/server-is-not-client.patch b/packages/efl1/epsilon/server-is-not-client.patch
deleted file mode 100644
index e96e528b9e..0000000000
--- a/packages/efl1/epsilon/server-is-not-client.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /tmp/epsilon_private.h	2006-12-01 12:06:30.000000000 +0100
-+++ epsilon-0.3.0.007/src/include/epsilon_private.h	2006-12-01 12:07:10.928254000 +0100
-@@ -41,7 +41,7 @@
- Epsilon_Message *epsilon_message_new(int clientid, char *path, char *dst, int status);
- 
- int epsilon_ipc_client_send(Ecore_Con_Client *cl, Epsilon_Message *msg);
--int epsilon_ipc_server_send(Ecore_Con_Client *cl, Epsilon_Message *msg);
-+int epsilon_ipc_server_send(Ecore_Con_Server *srv, Epsilon_Message *msg);
- 
- Epsilon_Message *epsilon_ipc_consume(Epsilon_Ipc_End *end);
- 
diff --git a/packages/efl1/epsilon_cvs.bb b/packages/efl1/epsilon_cvs.bb
index 8c71ef3e3d..4674e1913c 100644
--- a/packages/efl1/epsilon_cvs.bb
+++ b/packages/efl1/epsilon_cvs.bb
@@ -4,9 +4,12 @@ LICENSE = "MIT BSD"
 # can also depend on xine for movie thumbnails
 DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native"
 PV = "0.3.0.012+cvs${SRCDATE}"
+PR = "r1"
 
 inherit efl_library
 
+SRC_URI += "file://fix_alignment_error.patch;patch=1"
+
 # a gstreamer thumbnailer would be nice now that we have emotion using gstreamer as well
 EXTRA_OECONF = "--disable-xine"
 
diff --git a/packages/efl1/evas/fix-configure.patch b/packages/efl1/evas/fix-configure.patch
deleted file mode 100644
index 1a5bf78e46..0000000000
--- a/packages/efl1/evas/fix-configure.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Index: evas/configure.in
-===================================================================
---- evas.orig/configure.in	2007-08-20 16:44:22.000000000 +0000
-+++ evas/configure.in	2007-08-20 16:49:08.000000000 +0000
-@@ -260,9 +260,7 @@
-   AC_CHECK_HEADER(X11/X.h,
-     [
-       AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend])
--      x_dir=${x_dir:-/usr/X11R6}
--      x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
--      x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
-+      x_libs="${x_libs} -lX11 -lXext"
-     ],
-     [
-       AC_MSG_RESULT(disabling software X11 engine)
-@@ -303,9 +301,7 @@
-   AC_CHECK_HEADER(X11/X.h,
-     [
-       AC_DEFINE(BUILD_ENGINE_SOFTWARE_16_X11, 1, [Software 16bit X11 Rendering Backend])
--      x_dir=${x_dir:-/usr/X11R6}
--      x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
--      x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
-+      x_libs="${x_libs} -lX11 -lXext"
-     ],
-     [
-       AC_MSG_RESULT(disabling software 16bit X11 engine)
-@@ -599,10 +595,7 @@
-       [
-         AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend])
-         AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support])
--        x_dir=${x_dir:-/usr/X11R6};
--        x_cflags=${x_cflags:--I$x_dir/include}
--        x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}"
--        gl_cflags="-I/usr/include"
-+        x_libs="${x_libs} -lX11 -lXext"
-         gl_libs="-lGL -lGLU -lpthread"
-         gl_dir=""
-       ],
-@@ -694,9 +687,7 @@
-       AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend])
-       AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true)
-       AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support])
--      x_dir="/usr/X11R6";
--      x_cflags="-I"$x_dir"/include"
--      x_libs="-L"$x_dir"/lib -lX11 -lXext"
-+      x_libs="${x_libs} -lX11 -lXext"
-     ], [
-       AM_CONDITIONAL(BUILD_ENGINE_CAIRO_X11, false)
-       AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, false)
-@@ -738,9 +729,7 @@
-       AC_CHECK_HEADER(X11/extensions/Xrender.h,
-         [
-           AC_DEFINE(BUILD_ENGINE_XRENDER_X11, 1, [XRender X11 Rendering Backend])
--          x_dir=${x_dir:-/usr/X11R6}
--          x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
--          x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender"
-+          x_libs="${x_libs} -lX11 -lXext -lXrender"
- 	],
- 	[
-           AC_MSG_RESULT(disabling xrender X11 engine)
-@@ -826,9 +815,7 @@
-     [
-       PKG_CHECK_MODULES(GLITZ, glitz glitz-glx,
- 	[
--          x_dir=${x_dir:-/usr/X11R6}
--          x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
--          x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
-+          x_libs="${x_libs} -lX11 -lXext"
-           AC_DEFINE(BUILD_ENGINE_GLITZ_X11, 1, [Glitz X11 Rendering Backend])
-         ],
-         [
diff --git a/packages/efl1/evas/pagesize.patch b/packages/efl1/evas/pagesize.patch
deleted file mode 100644
index 5efd16a96e..0000000000
--- a/packages/efl1/evas/pagesize.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/modules/engines/fb/evas_fb_main.c b/src/modules/engines/fb/evas_fb_main.c
-index e26c171..75e0743 100644
---- a/src/modules/engines/fb/evas_fb_main.c
-+++ b/src/modules/engines/fb/evas_fb_main.c
-@@ -530,7 +530,7 @@ fb_postinit(FB_Mode *mode)
-       fb_cleanup();
-       exit(1);
-     }
--  mode->mem_offset = (unsigned)(fb_fix.smem_start) & (~PAGE_MASK);
-+  mode->mem_offset = (unsigned)(fb_fix.smem_start) & (getpagesize()-1);
-   mode->mem = (unsigned char *)mmap(NULL, fb_fix.smem_len + mode->mem_offset,
- 				 PROT_WRITE | PROT_READ, MAP_SHARED, fb, 0);
-   if ((int)mode->mem == -1)
diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb
index 862cc51370..ebe604ec2b 100644
--- a/packages/efl1/evas_cvs.bb
+++ b/packages/efl1/evas_cvs.bb
@@ -47,6 +47,7 @@ EXTRA_OECONF = "\
 		--disable-convert-16-rgb-ipq	\
 		--enable-convert-16-rgb-rot-0	\
 		--enable-convert-16-rgb-rot-90	\
+		--disable-convert-16-rgb-rot-180 \
 		--enable-convert-16-rgb-rot-270	\
 		--enable-convert-24-rgb-888	\
 		--enable-convert-24-bgr-888	\
@@ -56,5 +57,6 @@ EXTRA_OECONF = "\
 		--enable-convert-32-bgrx-8888	\
 		--enable-convert-32-rgb-rot-0	\
 		--enable-convert-32-rgb-rot-90	\
+		--disable-convert-32-rgb-rot-180 \
 		--enable-convert-32-rgb-rot-270"
 
diff --git a/packages/efl1/imlib2_1.4.1.000.bb b/packages/efl1/imlib2_cvs.bb
index b0db13b5ce..e17f3c04c1 100644
--- a/packages/efl1/imlib2_1.4.1.000.bb
+++ b/packages/efl1/imlib2_cvs.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipu
 LICENSE = "BSD"
 # can also depend on tiff34, ungif or gif, z, bz2, id3tag
 DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
+PV = "1.4.1.000+cvs${SRCDATE}"
 PR = "r0"
 
 inherit efl_library
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