62 files changed, 355 insertions, 247 deletions
diff --git a/meta-efl/recipes-efl/efl/ecore.inc b/meta-efl/recipes-efl/efl/ecore.inc
index bc4758acdc..9faaf3a533 100644
--- a/meta-efl/recipes-efl/efl/ecore.inc
+++ b/meta-efl/recipes-efl/efl/ecore.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Ecore is the Enlightenment application framework library"
 LICENSE = "MIT BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d6ff2c3c85de2faf5fd7dcd9ccfc8886"
-DEPENDS = "virtual/libiconv tslib curl eet evas glib-2.0 \
+DEPENDS = "virtual/libiconv tslib curl eet evas glib-2.0 gnutls \
           libxtst libxcomposite libxinerama libxscrnsaver libxdamage libxrandr libxcursor libxprintutil"
 DEPENDS_virtclass-native = "eet-native evas-native gettext-native"
 # optional
@@ -13,8 +13,8 @@ BBCLASSEXTEND = "native"
 INC_PR = "r0"
 do_configure_prepend() {
-        touch ${S}/po/Makefile.in.in || true
+    touch ${S}/po/Makefile.in.in || true
-        sed -i -e 's: po::g' ${S}/Makefile.am
+    sed -i -e 's: po::g' ${S}/Makefile.am
 }
 FILESPATHPKG =. "${BPN}-${PV}:${BPN}:"
diff --git a/meta-efl/recipes-efl/efl/ecore/0001-ecore_exe-fix-compilation-on-fedora-18.patch b/meta-efl/recipes-efl/efl/ecore/0001-ecore_exe-fix-compilation-on-fedora-18.patch
deleted file mode 100644
index 613cf5e478..0000000000
--- a/meta-efl/recipes-efl/efl/ecore/0001-ecore_exe-fix-compilation-on-fedora-18.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2ad957d5da1fc91faf7c2c6562139d19f29f5b9c Mon Sep 17 00:00:00 2001
-From: caro <caro@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
-Date: Fri, 22 Jun 2012 05:36:00 +0000
-Subject: [PATCH] ecore_exe: fix compilation on fedora 18.
-setpriority needs sys/resource.h. See:
-http://linux.die.net/man/2/setpriority
-I let sys/time.h, it does not hurt on linux and is anyway needed for BSD systems.
-git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk@72684 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---
- src/lib/ecore/ecore_exe.c |    7 ++-----
- 2 files changed, 6 insertions(+), 5 deletions(-)
-diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c
-index 7931a96..6db32a9 100644
--- a/src/lib/ecore/ecore_exe.c
-+++ b/src/lib/ecore/ecore_exe.c
-@@ -2,11 +2,6 @@
- # include <config.h>
- #endif
- 
-#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
-# include <sys/time.h>
-# include <sys/resource.h>
-#endif
-
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -14,6 +9,8 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <sys/time.h>
-+#include <sys/resource.h>
- 
- #ifdef HAVE_SYS_PRCTL_H
- # include <sys/prctl.h>
-- 
-1.7.8.6
diff --git a/meta-efl/recipes-efl/efl/ecore/fix-ecore-fb-initialization.patch b/meta-efl/recipes-efl/efl/ecore/fix-ecore-fb-initialization.patch
index a2ce285266..55773a3b98 100644
--- a/meta-efl/recipes-efl/efl/ecore/fix-ecore-fb-initialization.patch
+++ b/meta-efl/recipes-efl/efl/ecore/fix-ecore-fb-initialization.patch
@@ -1,4 +1,4 @@
-From c36cd1201711560b914e567922903083c3b46ff1 Mon Sep 17 00:00:00 2001
+From 657571197c9d369e12ae31b6777a1929fe3680ef Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 29 Oct 2011 00:16:55 +0200
 Subject: [PATCH] ecore-fb: fix ts init
@@ -11,31 +11,31 @@ get at least a working touchscreen w/ tslib again.
 Signed-off-by: Michael 'Mickey' Lauer <mlauer@vanille-media.de>
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- src/lib/ecore_fb/ecore_fb.c |    4 ++++
+ ecore/src/lib/ecore_fb/ecore_fb.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
 diff --git a/src/lib/ecore_fb/ecore_fb.c b/src/lib/ecore_fb/ecore_fb.c
-index ca7d73d..5b99989 100644
+index 5b2b84b..a1904b3 100644
 --- a/src/lib/ecore_fb/ecore_fb.c
 +++ b/src/lib/ecore_fb/ecore_fb.c
-@@ -39,6 +39,9 @@ ecore_fb_init(const char *name __UNUSED__)
+@@ -46,6 +46,9 @@ ecore_fb_init(const char *name __UNUSED__)
    if (!ecore_fb_vt_init())
       return --_ecore_fb_init_count;
 
 +   if (!ecore_fb_ts_init())
 +      return --_ecore_fb_init_count;
 +
-    _ecore_fb_size_get(&_ecore_fb_console_w, &_ecore_fb_console_h);
+    if (!oldhand)
- 
+      {
-    return _ecore_fb_init_count;
+         oldhand = signal(SIGINT, nosigint);
-@@ -59,6 +62,7 @@ ecore_fb_shutdown(void)
+@@ -77,6 +80,7 @@ ecore_fb_shutdown(void)
-    if (--_ecore_fb_init_count != 0)
+         oldhand = NULL;
-       return _ecore_fb_init_count;
+      }
- 
+    
 +   ecore_fb_ts_shutdown();
    ecore_fb_vt_shutdown();
 
    return _ecore_fb_init_count;
 -- 
-1.7.7.1
+1.7.8.6
diff --git a/meta-efl/recipes-efl/efl/ecore_1.2.1.bb b/meta-efl/recipes-efl/efl/ecore_1.2.1.bb
deleted file mode 100644
index bec47a7e68..0000000000
--- a/meta-efl/recipes-efl/efl/ecore_1.2.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.1"
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \
-  file://fix-ecore-fb-initialization.patch \
-  file://0001-ecore_exe-fix-compilation-on-fedora-18.patch \
-"
-SRC_URI[md5sum] = "557f8411d323b14ed7bf1be368ab302a"
-SRC_URI[sha256sum] = "78d8374e5f901f1dd4c89e99508a5a3470b8a0cb2510ab5b7e45d670e6621ef8"
diff --git a/meta-efl/recipes-efl/efl/ecore_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/ecore_1.6.99-beta.bb
new file mode 100644
index 0000000000..084b00888f
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/ecore_1.6.99-beta.bb
@@ -0,0 +1,13 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-beta"
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+  file://fix-ecore-fb-initialization.patch \
+"
+SRC_URI[md5sum] = "12360540b2b8d46022cbf228c3bdef07"
+SRC_URI[sha256sum] = "e3683d4b9be01347c564065bed36a77c6f42db56be7ea3cb6029a3b532afa1cb"
diff --git a/meta-efl/recipes-efl/efl/ecore_svn.bb b/meta-efl/recipes-efl/efl/ecore_svn.bb
index 05cc9db196..e00a0ccac2 100644
--- a/meta-efl/recipes-efl/efl/ecore_svn.bb
+++ b/meta-efl/recipes-efl/efl/ecore_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.6.99+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/edbus.inc b/meta-efl/recipes-efl/efl/edbus.inc
index ad20c8c783..ae558f00de 100644
--- a/meta-efl/recipes-efl/efl/edbus.inc
+++ b/meta-efl/recipes-efl/efl/edbus.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
-DEPENDS = "dbus ecore"
+DEPENDS = "dbus ecore eina"
 LICENSE = "MIT BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=550b8cea13dacc4bf00508a8cce1074c"
@@ -14,6 +14,8 @@ INC_PR = "r0"
 SRCNAME = "e_dbus"
 EXTRA_OECONF += "--enable-build-test-gui"
+# it needs to be disabled, because creates circular dependency on elementary
+EXTRA_OECONF += "--disable-edbus-performance-test"
 PACKAGES =+ "${PN}-enotify ${PN}-edbus ${PN}-enm ${PN}-ehal ${PN}-econnman ${PN}-eofono ${PN}-eukit ${PN}-ebluez ${PN}-test-gui"
 FILES_${PN}-enotify = "${libdir}/libenotify.so.* ${bindir}/e-notify-send"
@@ -25,3 +27,5 @@ FILES_${PN}-eofono = "${libdir}/libeofono.so.*"
 FILES_${PN}-eukit = "${libdir}/libeukit.so.*"
 FILES_${PN}-ebluez = "${libdir}/libebluez.so.*"
 FILES_${PN}-test-gui = "${bindir}/e_dbus_hal"
+FILES_${PN} += "${datadir}/e_dbus/logo.png"
diff --git a/meta-efl/recipes-efl/efl/edbus_1.2.0.bb b/meta-efl/recipes-efl/efl/edbus_1.2.0.bb
deleted file mode 100644
index 91371157dd..0000000000
--- a/meta-efl/recipes-efl/efl/edbus_1.2.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \
-"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-SRC_URI[md5sum] = "19dc0e43cd9defd5b8fdc7c8610bfe2c"
-SRC_URI[sha256sum] = "2f72b3710ae66604e37e6f6b20857caae9e2ddc7002fa402806dce14b6acbd4c"
diff --git a/meta-efl/recipes-efl/efl/edbus_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/edbus_1.6.99-beta.bb
new file mode 100644
index 0000000000..c070549f0d
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/edbus_1.6.99-beta.bb
@@ -0,0 +1,12 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-beta"
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+SRC_URI[md5sum] = "542a8931b85675e497df0c290103ca87"
+SRC_URI[sha256sum] = "e63fe9c67d3ec5b6bed06a4c49f70fbb93e30481f36f35ca2ee9810cbaf85868"
diff --git a/meta-efl/recipes-efl/efl/edbus_svn.bb b/meta-efl/recipes-efl/efl/edbus_svn.bb
index 594de4a16f..06cf950634 100644
--- a/meta-efl/recipes-efl/efl/edbus_svn.bb
+++ b/meta-efl/recipes-efl/efl/edbus_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.6.99+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/edje-fpu.inc b/meta-efl/recipes-efl/efl/edje-fpu.inc
index 1af86e3cc0..dc39fa9c04 100644
--- a/meta-efl/recipes-efl/efl/edje-fpu.inc
+++ b/meta-efl/recipes-efl/efl/edje-fpu.inc
@@ -1,6 +1,6 @@
 def get_edje_fpu_setting(bb, d):
-        if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+    if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
-                return "--enable-fixed-point"
+        return "--enable-fixed-point"
-        return ""
+    return ""
diff --git a/meta-efl/recipes-efl/efl/edje.inc b/meta-efl/recipes-efl/efl/edje.inc
index 311fb52688..6f50ea8fbc 100644
--- a/meta-efl/recipes-efl/efl/edje.inc
+++ b/meta-efl/recipes-efl/efl/edje.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "Edje is the Enlightenment graphical design & layout library"
-DEPENDS = "lua5.1 eet evas ecore embryo edje-native eina libsndfile1"
+DEPENDS = "lua5.1 eet evas ecore embryo edje-native eina libsndfile1 eio"
 DEPENDS_virtclass-native = "lua5.1-native evas-native ecore-native eet-native embryo-native eina-native"
 DEPENDS_virtclass-nativesdk = "evas-native ecore-native eet-native embryo-native eina-native"
 # GPLv2 because of epp in PN-utils
@@ -12,19 +12,19 @@ BBCLASSEXTEND = "native nativesdk"
 INC_PR = "r0"
 do_configure_prepend_virtclass-native() {
-        sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c
+    sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c
-        sed -i 's: cpp -I: /usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c
+    sed -i 's: cpp -I: /usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c
-        sed -i 's:\"gcc -I:\"/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c
+    sed -i 's:\"gcc -I:\"/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c
 }
 # The new lua stuff is a bit broken...
 do_configure_append() {
-        for i in $(find "${S}" -name "Makefile") ; do
+    for i in $(find "${S}" -name "Makefile") ; do
-                sed -i -e 's:-L/usr/local/lib::g'  $i
+        sed -i -e 's:-L/usr/local/lib::g'  $i
-        done
+    done
 }
 do_compile_append() {
-        sed -i -e s:local/::g -e 's:-L${STAGING_LIBDIR}::g' ${S}/edje.pc
+    sed -i -e s:local/::g -e 's:-L${STAGING_LIBDIR}::g' ${S}/edje.pc
 }
 # gain some extra performance at the expense of RAM - generally i'd say bad
@@ -60,6 +60,7 @@ FILES_${PN}-utils = "\
  ${datadir}/edje/include/edje.inc \
 "
-FILES_${PN} += "${libdir}/${PN}/modules/*/*/module.so"
+FILES_${PN} += "${libdir}/${PN}/modules/*/*/module.so \
+                ${datadir}/mime/packages/edje.xml"
 FILES_${PN}-dev += "${libdir}/${PN}/modules/*/*/module.la"
 FILES_${PN}-dbg += "${libdir}/${PN}/modules/*/*/.debug"
diff --git a/meta-efl/recipes-efl/efl/edje_1.2.1.bb b/meta-efl/recipes-efl/efl/edje_1.2.1.bb
deleted file mode 100644
index 8f22e50972..0000000000
--- a/meta-efl/recipes-efl/efl/edje_1.2.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \
-"
-SRC_URI[md5sum] = "b9df053b327cb41d2de2485bd596bb44"
-SRC_URI[sha256sum] = "b793e98e9f65dfe7d007563e9d4cba84807a4473dfa9c94cdaee1ed9752cf6e0"
diff --git a/meta-efl/recipes-efl/efl/edje_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/edje_1.6.99-beta.bb
new file mode 100644
index 0000000000..eaccde9cf5
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/edje_1.6.99-beta.bb
@@ -0,0 +1,12 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-beta"
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+SRC_URI[md5sum] = "07c1bdb6766391fa972e2f1a4c480413"
+SRC_URI[sha256sum] = "7bbad4db88e82a6e0206942c859d4bbbba261cbaa4530f343664538456eef7c9"
diff --git a/meta-efl/recipes-efl/efl/edje_svn.bb b/meta-efl/recipes-efl/efl/edje_svn.bb
index 594de4a16f..06cf950634 100644
--- a/meta-efl/recipes-efl/efl/edje_svn.bb
+++ b/meta-efl/recipes-efl/efl/edje_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.6.99+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/eet.inc b/meta-efl/recipes-efl/efl/eet.inc
index de17e058f8..0f6a9fe105 100644
--- a/meta-efl/recipes-efl/efl/eet.inc
+++ b/meta-efl/recipes-efl/efl/eet.inc
@@ -16,3 +16,9 @@ EXTRA_OECONF = "\
  --enable-old-eet-file-format \
  --disable-assert \
 "
+PACKAGES =+ "${PN}-utils"
+FILES_${PN}-utils = "\
+  ${bindir}/${PN} \
+"
diff --git a/meta-efl/recipes-efl/efl/eet_1.6.1.bb b/meta-efl/recipes-efl/efl/eet_1.6.1.bb
deleted file mode 100644
index 36894eac90..0000000000
--- a/meta-efl/recipes-efl/efl/eet_1.6.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \
-"
-SRC_URI[md5sum] = "eaa6c1088b60d2177b57554690507eb7"
-SRC_URI[sha256sum] = "376056473e2d5d1873381b5782f50f7755ab8d1243f113f02c0e147f36203807"
diff --git a/meta-efl/recipes-efl/efl/eet_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/eet_1.6.99-beta.bb
new file mode 100644
index 0000000000..7c5a655953
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/eet_1.6.99-beta.bb
@@ -0,0 +1,12 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-beta"
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+SRC_URI[md5sum] = "1103a2a0e5022c42dcb4ccacc5db8881"
+SRC_URI[sha256sum] = "156aa6ef6880cf45b25c6cb45bf659ebb2e9bb207c11a479f504cd795c030c6b"
diff --git a/meta-efl/recipes-efl/efl/eet_svn.bb b/meta-efl/recipes-efl/efl/eet_svn.bb
index e9de45c8ac..06cf950634 100644
--- a/meta-efl/recipes-efl/efl/eet_svn.bb
+++ b/meta-efl/recipes-efl/efl/eet_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 SRCREV = "${EFL_SRCREV}"
-PV = "1.6.0+svnr${SRCPV}"
+PV = "1.6.99+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/eeze.inc b/meta-efl/recipes-efl/efl/eeze.inc
index 1b0f489371..5d523c9916 100644
--- a/meta-efl/recipes-efl/efl/eeze.inc
+++ b/meta-efl/recipes-efl/efl/eeze.inc
@@ -6,7 +6,7 @@ DEPENDS = "ecore eet udev"
 inherit efl
 BBCLASSEXTEND = "native"
-INC_PR = "r1"
+INC_PR = "r0"
 # Some upgrade path tweaking
 AUTO_LIBNAME_PKGS = ""
diff --git a/meta-efl/recipes-efl/efl/eeze_1.2.0.bb b/meta-efl/recipes-efl/efl/eeze_1.2.0.bb
deleted file mode 100644
index 9fb4e89a57..0000000000
--- a/meta-efl/recipes-efl/efl/eeze_1.2.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \
-"
-SRC_URI[md5sum] = "4a5a12514e8c2de5d88d31bf4c34cac4"
-SRC_URI[sha256sum] = "4df8ace51385ab15932c856b121b14fb93f2f5a87a08004078fdff5fee451cec"
diff --git a/meta-efl/recipes-efl/efl/eeze_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/eeze_1.6.99-beta.bb
new file mode 100644
index 0000000000..446503e66d
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/eeze_1.6.99-beta.bb
@@ -0,0 +1,12 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-beta"
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+SRC_URI[md5sum] = "b557e2e6c5988abf0695474b5763520b"
+SRC_URI[sha256sum] = "b9c1262bc8e45b83c7b3643f9aefcebc88518953e4d4967ca655f1b325aac6ea"
diff --git a/meta-efl/recipes-efl/efl/eeze_svn.bb b/meta-efl/recipes-efl/efl/eeze_svn.bb
index 594de4a16f..06cf950634 100644
--- a/meta-efl/recipes-efl/efl/eeze_svn.bb
+++ b/meta-efl/recipes-efl/efl/eeze_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.6.99+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/efreet.inc b/meta-efl/recipes-efl/efl/efreet.inc
index 9aaeaa72da..6c6852606e 100644
--- a/meta-efl/recipes-efl/efl/efreet.inc
+++ b/meta-efl/recipes-efl/efl/efreet.inc
@@ -3,7 +3,7 @@ DEPENDS = "ecore"
 LICENSE = "MIT BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9594ec75c5a57e71fccedcbe10dd3ef4"
-inherit efl
+inherit efl gettext
 INC_PR = "r0"
diff --git a/meta-efl/recipes-efl/efl/efreet_1.2.0.bb b/meta-efl/recipes-efl/efl/efreet_1.2.0.bb
deleted file mode 100644
index d1c850a592..0000000000
--- a/meta-efl/recipes-efl/efl/efreet_1.2.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \
-"
-SRC_URI[md5sum] = "20fc8b8d364f518adf6d92c2e31650f9"
-SRC_URI[sha256sum] = "cc23bfc65528e3bc7ba078db739653d95bd9b255d565b09745a161d338d699e4"
diff --git a/meta-efl/recipes-efl/efl/efreet_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/efreet_1.6.99-beta.bb
new file mode 100644
index 0000000000..330de4e676
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/efreet_1.6.99-beta.bb
@@ -0,0 +1,12 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-beta"
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+SRC_URI[md5sum] = "35f4475b81da6b9bf9b3c022fd0947ab"
+SRC_URI[sha256sum] = "b24ee9d2624804b3828b6458eddaf3e74c3d2deac58e15e33e6b183d60989a75"
diff --git a/meta-efl/recipes-efl/efl/efreet_svn.bb b/meta-efl/recipes-efl/efl/efreet_svn.bb
index 594de4a16f..06cf950634 100644
--- a/meta-efl/recipes-efl/efl/efreet_svn.bb
+++ b/meta-efl/recipes-efl/efl/efreet_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.6.99+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/eina_1.2.1.bb b/meta-efl/recipes-efl/efl/eina_1.2.1.bb
deleted file mode 100644
index 4714db8c87..0000000000
--- a/meta-efl/recipes-efl/efl/eina_1.2.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \
-"
-SRC_URI[md5sum] = "5dc2712b71f202d32c07394ad253a071"
-SRC_URI[sha256sum] = "013ee257f4be3acfb94ef3f2e5b06aedd48ed528e66833fb5e3ca71479912bea"
diff --git a/meta-efl/recipes-efl/efl/eina_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/eina_1.6.99-beta.bb
new file mode 100644
index 0000000000..1a3632c839
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/eina_1.6.99-beta.bb
@@ -0,0 +1,12 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-beta"
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+SRC_URI[md5sum] = "f5e123fdb6fb905c69f2f1f54bfe6257"
+SRC_URI[sha256sum] = "051ebf7c4534c4d12f1aaaac7aa91cd877a2498e4c22336db8b07433c27f18c4"
diff --git a/meta-efl/recipes-efl/efl/eina_svn.bb b/meta-efl/recipes-efl/efl/eina_svn.bb
index 594de4a16f..06cf950634 100644
--- a/meta-efl/recipes-efl/efl/eina_svn.bb
+++ b/meta-efl/recipes-efl/efl/eina_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.6.99+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/eio_1.0.1.bb b/meta-efl/recipes-efl/efl/eio_1.0.1.bb
deleted file mode 100644
index 54a35a8a08..0000000000
--- a/meta-efl/recipes-efl/efl/eio_1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \
-"
-SRC_URI[md5sum] = "a079913877d79417bc06dfecbf57c949"
-SRC_URI[sha256sum] = "8a7079bf1e980e0d00fa9656e641e4a8a5aabf66986e76dcf06882ccf9623ed0"
diff --git a/meta-efl/recipes-efl/efl/eio_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/eio_1.6.99-beta.bb
new file mode 100644
index 0000000000..01613183ae
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/eio_1.6.99-beta.bb
@@ -0,0 +1,12 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-beta"
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+SRC_URI[md5sum] = "5346403eca950b6f8f1c886451e75ab8"
+SRC_URI[sha256sum] = "2cc78170277654e57cc69b49856da3c8ede425f4c8fdf4df702f46184806ac3f"
diff --git a/meta-efl/recipes-efl/efl/eio_svn.bb b/meta-efl/recipes-efl/efl/eio_svn.bb
index f43c47fc5a..06cf950634 100644
--- a/meta-efl/recipes-efl/efl/eio_svn.bb
+++ b/meta-efl/recipes-efl/efl/eio_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 SRCREV = "${EFL_SRCREV}"
-PV = "1.0.0+svnr${SRCPV}"
+PV = "1.6.99+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb b/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb
index d764e96f2a..8fb2dab043 100644
--- a/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb
+++ b/meta-efl/recipes-efl/efl/elementary-theme-efenniht_svn.bb
@@ -26,12 +26,12 @@ SRC_URI += "file://LICENSE"
 S = "${WORKDIR}/${SRCNAME}"
 do_compile() {
-        ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/images -id ${WORKDIR}/themes/ ${S}/elm-efenniht.edc -o ${S}/elm-efenniht.edj
+    ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/images -id ${WORKDIR}/themes/ ${S}/elm-efenniht.edc -o ${S}/elm-efenniht.edj
 }
 do_install() {
-        install -d ${D}${datadir}/elementary/themes/
+    install -d ${D}${datadir}/elementary/themes/
-        install -m 0644 ${S}/elm-efenniht.edj ${D}${datadir}/elementary/themes/
+    install -m 0644 ${S}/elm-efenniht.edj ${D}${datadir}/elementary/themes/
 }
 FILES_${PN} = "${datadir}/elementary/themes/"
diff --git a/meta-efl/recipes-efl/efl/elementary.inc b/meta-efl/recipes-efl/efl/elementary.inc
index 50c708dbd2..34338e865d 100644
--- a/meta-efl/recipes-efl/efl/elementary.inc
+++ b/meta-efl/recipes-efl/efl/elementary.inc
@@ -1,11 +1,11 @@
 DESCRIPTION = "EFL based widget set for mobile devices"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=10a051c72424b80bc784a3903651b43b"
-DEPENDS = "eet-native efreet evas ecore edje eet edbus ethumb poppler"
+DEPENDS = "eet-native efreet evas ecore edje eet edbus ethumb poppler eio"
 inherit efl gettext
-INC_PR = "r1"
+INC_PR = "r0"
 EXTRA_OECONF = "\
  --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
diff --git a/meta-efl/recipes-efl/efl/elementary_1.0.1.bb b/meta-efl/recipes-efl/efl/elementary_1.0.1.bb
deleted file mode 100644
index d4e3960fde..0000000000
--- a/meta-efl/recipes-efl/efl/elementary_1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \
-"
-SRC_URI[md5sum] = "df978462103b1b6a5af374ea22296d80"
-SRC_URI[sha256sum] = "24af1521fee4a18e1039a908e5f9aefa2f767854c5075d06bb5d268cfde1e2be"
diff --git a/meta-efl/recipes-efl/efl/elementary_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/elementary_1.6.99-beta.bb
new file mode 100644
index 0000000000..c0ba6fa620
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/elementary_1.6.99-beta.bb
@@ -0,0 +1,12 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-beta"
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+SRC_URI[md5sum] = "cd0bbf6e93e521b0416d91e521bf81fd"
+SRC_URI[sha256sum] = "f52ef395c341eaf68f844c038ce25512869ebd22f9abc86c9d32f1cf5e91c1df"
diff --git a/meta-efl/recipes-efl/efl/elementary_svn.bb b/meta-efl/recipes-efl/efl/elementary_svn.bb
index f43c47fc5a..06cf950634 100644
--- a/meta-efl/recipes-efl/efl/elementary_svn.bb
+++ b/meta-efl/recipes-efl/efl/elementary_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 SRCREV = "${EFL_SRCREV}"
-PV = "1.0.0+svnr${SRCPV}"
+PV = "1.6.99+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/embryo_1.2.0.bb b/meta-efl/recipes-efl/efl/embryo_1.2.0.bb
deleted file mode 100644
index d3956acdd9..0000000000
--- a/meta-efl/recipes-efl/efl/embryo_1.2.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \
-"
-SRC_URI[md5sum] = "6c070a16d61141d695397fc248e6176e"
-SRC_URI[sha256sum] = "432838f5f02c86da785beff0a1e0210a1d3f28121bfb6d6c70300839df31a70c"
diff --git a/meta-efl/recipes-efl/efl/embryo_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/embryo_1.6.99-beta.bb
new file mode 100644
index 0000000000..f9391bdb40
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/embryo_1.6.99-beta.bb
@@ -0,0 +1,12 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-beta"
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+SRC_URI[md5sum] = "2236f174981c94c4ad22c8e488d2187e"
+SRC_URI[sha256sum] = "fe5339132ec514070af52243954bcb20408a12adfbe07d67d1c338fa3b1dc154"
diff --git a/meta-efl/recipes-efl/efl/embryo_svn.bb b/meta-efl/recipes-efl/efl/embryo_svn.bb
index 594de4a16f..06cf950634 100644
--- a/meta-efl/recipes-efl/efl/embryo_svn.bb
+++ b/meta-efl/recipes-efl/efl/embryo_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.6.99+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/emotion.inc b/meta-efl/recipes-efl/efl/emotion.inc
index 20a88525e9..08a24b26f6 100644
--- a/meta-efl/recipes-efl/efl/emotion.inc
+++ b/meta-efl/recipes-efl/efl/emotion.inc
@@ -2,9 +2,9 @@ DESCRIPTION = "The Enlightenment multimedia library"
 LICENSE = "MIT BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=69f44058245ce5c596d56bb622d5dabd"
 # we no longer build the libxine backend, since the gstreamer backend seems more promising
-DEPENDS = "eet eeze evas ecore edje gstreamer gst-plugins-base"
+DEPENDS = "eet eeze evas ecore edje gstreamer gst-plugins-base eio"
-INC_PR = "r1"
+INC_PR = "r0"
 inherit efl
diff --git a/meta-efl/recipes-efl/efl/emotion_1.0.1.bb b/meta-efl/recipes-efl/efl/emotion_1.0.1.bb
deleted file mode 100644
index c142b5bd0b..0000000000
--- a/meta-efl/recipes-efl/efl/emotion_1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \
-"
-SRC_URI[md5sum] = "6bed064cc88b060e79e9418c557eac8c"
-SRC_URI[sha256sum] = "e8f95696c87731b26a199990f190476acd94da103c6538f76ade30abd0db850d"
diff --git a/meta-efl/recipes-efl/efl/emotion_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/emotion_1.6.99-beta.bb
new file mode 100644
index 0000000000..4ad06900d2
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/emotion_1.6.99-beta.bb
@@ -0,0 +1,12 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-beta"
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+SRC_URI[md5sum] = "7b8719248d5745683201bbf11b8d510f"
+SRC_URI[sha256sum] = "f802272d9a7a4678aef736ca24ef1818dbd9f8524c963da6c5680abdf71d05e4"
diff --git a/meta-efl/recipes-efl/efl/emotion_svn.bb b/meta-efl/recipes-efl/efl/emotion_svn.bb
index f43c47fc5a..06cf950634 100644
--- a/meta-efl/recipes-efl/efl/emotion_svn.bb
+++ b/meta-efl/recipes-efl/efl/emotion_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 SRCREV = "${EFL_SRCREV}"
-PV = "1.0.0+svnr${SRCPV}"
+PV = "1.6.99+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/elsa/0001-pam-use-common-auth-instead-of-system-auth.patch b/meta-efl/recipes-efl/efl/entrance/0001-pam-use-common-auth-instead-of-system-auth.patch
index a9beea0b74..a82d1ed3c8 100644
--- a/meta-efl/recipes-efl/efl/elsa/0001-pam-use-common-auth-instead-of-system-auth.patch
+++ b/meta-efl/recipes-efl/efl/entrance/0001-pam-use-common-auth-instead-of-system-auth.patch
@@ -1,21 +1,18 @@
-From 27dc9147a822d69be90edd0d137b80c0c609d5d2 Mon Sep 17 00:00:00 2001
+From 14396c52a2556b1ab778a310a318ec19c2829735 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Thu, 24 Nov 2011 13:25:33 +0100
 Subject: [PATCH] pam: use common-auth instead of system-auth
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- PROTO/elsa/data/elsa |    8 ++++----
+ PROTO/entrance/data/entrance |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/data/elsa b/data/elsa
+diff --git a/data/entrance b/data/entrance
-index 3476d55..47d29222 100644
+index 872c83d..2b98c3a 100644
--- a/data/elsa
+--- a/data/entrance
-+++ b/data/elsa
+++ b/data/entrance
-@@ -1,7 +1,7 @@
+@@ -1,4 +1,4 @@
- # File autogenerated by pamd_mimic in pam eclass
- 
- 
 -auth   include         system-auth
 -account        include         system-auth
 -password       include         system-auth
@@ -25,5 +22,5 @@ index 3476d55..47d29222 100644
 +password       include         common-password
 +session        include         common-session
 -- 
-1.7.8.rc3
+1.7.8.6
diff --git a/meta-efl/recipes-efl/efl/elsa_svn.bb b/meta-efl/recipes-efl/efl/entrance_svn.bb
index e23a694dbb..585d552c2c 100644
--- a/meta-efl/recipes-efl/efl/elsa_svn.bb
+++ b/meta-efl/recipes-efl/efl/entrance_svn.bb
@@ -4,8 +4,6 @@ LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SECTION = "e/apps"
-PR = "r2"
 inherit e gettext
 SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};protocol=http;scmdata=keep \
  file://0001-pam-use-common-auth-instead-of-system-auth.patch \
@@ -18,6 +16,6 @@ PV = "0.0.4+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
 RDEPENDS_${PN} += "${PN}-themes sessreg xauth"
-CONFFILES_${PN} += "${sysconfdir}/elsa.conf"
+CONFFILES_${PN} += "${sysconfdir}/entrance.conf"
 RCONFLICTS_${PN} += "xserver-nodm-init"
 RREPLACES_${PN} += "xserver-nodm-init"
diff --git a/meta-efl/recipes-efl/efl/ethumb.inc b/meta-efl/recipes-efl/efl/ethumb.inc
index 0c3080c053..92a83eee4f 100644
--- a/meta-efl/recipes-efl/efl/ethumb.inc
+++ b/meta-efl/recipes-efl/efl/ethumb.inc
@@ -3,7 +3,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e6a6db9e80255adbafa16e817d9a4d8c"
 DEPENDS = "libexif eet-native evas ecore edje eet edbus emotion epdf"
-INC_PR = "r1"
+INC_PR = "r0"
 inherit efl
diff --git a/meta-efl/recipes-efl/efl/ethumb_1.0.1.bb b/meta-efl/recipes-efl/efl/ethumb_1.0.1.bb
deleted file mode 100644
index e976238a91..0000000000
--- a/meta-efl/recipes-efl/efl/ethumb_1.0.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \
-"
-SRC_URI[md5sum] = "20bd55bfa05d0c20e985f1031a683677"
-SRC_URI[sha256sum] = "67449d0521d3c806b57e4d8ea121089dcbdf4fbcc2fb451ae881bd05025f6715"
diff --git a/meta-efl/recipes-efl/efl/ethumb_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/ethumb_1.6.99-beta.bb
new file mode 100644
index 0000000000..0da0fb7965
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/ethumb_1.6.99-beta.bb
@@ -0,0 +1,12 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-beta"
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+SRC_URI[md5sum] = "37ec5542731ad088c495e0ee6d7889c8"
+SRC_URI[sha256sum] = "66bf53cee15549c4089307843f27a6a7e0c3bf7e576ab5091950ecc05009644a"
diff --git a/meta-efl/recipes-efl/efl/ethumb_svn.bb b/meta-efl/recipes-efl/efl/ethumb_svn.bb
index ac030144a3..892b298605 100644
--- a/meta-efl/recipes-efl/efl/ethumb_svn.bb
+++ b/meta-efl/recipes-efl/efl/ethumb_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 SRCREV = "${EFL_SRCREV}"
-PV = "1.0.0+svnr${SRCPV}"
+PV = "1.6.99+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc
new file mode 100644
index 0000000000..7556eb2ac3
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc
@@ -0,0 +1,33 @@
+DESCRIPTION = "Evas generic loaders"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=06568fc31423f3c8ad84f375e061c342"
+DEPENDS = "eina poppler librsvg cairo"
+inherit efl
+INC_PR = "r0"
+SRCNAME = "evas_generic_loaders"
+EXTRA_OECONF = " \
+  --enable-poppler \
+  --enable-svg \
+  --disable-gstreamer \
+  --disable-libraw \
+  --disable-spectre \
+"
+python populate_packages_prepend () {
+    bb.note( "splitting packages for evas generic loaders" )
+    basedir = bb.data.expand( '${libdir}/evas/utils', d )
+    do_split_packages(d, basedir, '^evas_image_loader\.(.*)$',
+    output_pattern = "evas-generic-loader-%s",
+    description = 'Evas generic loaders - module %s',
+    allow_dirs=True, recursive=False, extra_depends="" )
+}
+FILES_evas-generic-loader-xcf += "${libdir}/evas/utils/*.xcf.gz"
+FILES_${PN}-dbg += "${libdir}/evas/utils/.debug"
+PACKAGES_DYNAMIC = "evas-generic-loader-*"
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-beta.bb
new file mode 100644
index 0000000000..00956a83df
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-beta.bb
@@ -0,0 +1,12 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-beta"
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+SRC_URI[md5sum] = "f4353d2743d255cf30cd7b6f946087e3"
+SRC_URI[sha256sum] = "3dcc04689f89048ce1147698370dd51b854182b70c20704901ee1b3f03d4bd2a"
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb
new file mode 100644
index 0000000000..06cf950634
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb
@@ -0,0 +1,11 @@
+require ${BPN}.inc
+SRCREV = "${EFL_SRCREV}"
+PV = "1.6.99+svnr${SRCPV}"
+PR = "${INC_PR}.0"
+DEFAULT_PREFERENCE = "-1"
+SRC_URI = "\
+  ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
+"
+S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-efl/efl/evas.inc b/meta-efl/recipes-efl/efl/evas.inc
index b0a42ea6aa..89ae1a47fe 100644
--- a/meta-efl/recipes-efl/efl/evas.inc
+++ b/meta-efl/recipes-efl/efl/evas.inc
@@ -20,6 +20,15 @@ python populate_packages_prepend () {
        output_pattern = 'evas-' + plugin_type[:-1] + "-%s",
        description = 'Evas module %s',
        allow_dirs=True, recursive=False, extra_depends="" )
+        
+        plugin_type = "cserve2"
+        bb.note( "splitting packages for evas %s..." % plugin_type )
+        basedir = bb.data.expand( '${libdir}/evas/%s/loaders' % plugin_type, d )
+        do_split_packages(d, basedir, '^(.*)',
+        output_pattern = 'evas-' + plugin_type + "-%s",
+        description = 'Evas csever2 loader module %s',
+        allow_dirs=True, recursive=False, extra_depends="" )
 }
 do_install_append() {
@@ -27,9 +36,16 @@ do_install_append() {
 }
 FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
-FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
+FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/ ${libdir}/evas/cserve2/loaders/*/*/.debug/"
+FILES_${PN}-cserve2 += "${libexecdir}/evas_cserve2* ${libexecdir}/dummy_slave"
+PACKAGES += "${PN}-cserve2"
+PACKAGES_DYNAMIC = "evas-engine-* evas-loader-* evas-saver-* evas-cserve2-*"
-PACKAGES_DYNAMIC = "evas-engine-* evas-loader-* evas-saver-*"
+# evas-loader-svg is gone as we don't have esvg and probably won't have anytime soon
+# http://www.intesis.hr/news/16-esvg-source
+# http://blog.gmane.org/gmane.comp.window-managers.enlightenment.user/page=3
+RRECOMMENDS_${PN} += "evas-loader-generic evas-generic-loader-svn"
 RRECOMMENDS_${PN} = " \
  evas-engine-fb \
diff --git a/meta-efl/recipes-efl/efl/evas_1.2.1.bb b/meta-efl/recipes-efl/efl/evas_1.2.1.bb
deleted file mode 100644
index ddac920bb0..0000000000
--- a/meta-efl/recipes-efl/efl/evas_1.2.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-PR = "${INC_PR}.0"
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \
-"
-SRC_URI[md5sum] = "830161bd790c2c5f17aa47e3a1c3abe1"
-SRC_URI[sha256sum] = "a019b410dba86e616163bafb6524d8734ac8c97aab7c41409f5176f23944bae6"
diff --git a/meta-efl/recipes-efl/efl/evas_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/evas_1.6.99-beta.bb
new file mode 100644
index 0000000000..c76185288a
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/evas_1.6.99-beta.bb
@@ -0,0 +1,12 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-beta"
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+SRC_URI[md5sum] = "0978e24b5ea5a0d0b5eb79a7f6d7d1af"
+SRC_URI[sha256sum] = "5bd52116499a5686023a563ed9102e815292786dff19d617d3cc92829c624caf"
diff --git a/meta-efl/recipes-efl/efl/evas_svn.bb b/meta-efl/recipes-efl/efl/evas_svn.bb
index 594de4a16f..06cf950634 100644
--- a/meta-efl/recipes-efl/efl/evas_svn.bb
+++ b/meta-efl/recipes-efl/efl/evas_svn.bb
@@ -1,7 +1,7 @@
 require ${BPN}.inc
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.0+svnr${SRCPV}"
+PV = "1.6.99+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
diff --git a/meta-efl/recipes-efl/efl/expedite.inc b/meta-efl/recipes-efl/efl/expedite.inc
new file mode 100644
index 0000000000..9399d82d04
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/expedite.inc
@@ -0,0 +1,28 @@
+DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas"
+DEPENDS = "eet evas"
+LICENSE = "MIT BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d70bc65d46237e4ef386beebe7d0fe5b"
+INC_PR = "r0"
+inherit e
+EXTRA_OECONF = "\
+  --x-includes=${STAGING_INCDIR}/X11 \
+  --x-libraries=${STAGING_LIBDIR} \
+  --enable-simple-x11 \
+\
+  --disable-opengl-glew \
+  --enable-software-x11 \
+  --enable-xrender-x11 \
+  --enable-software-16-x11 \
+  --enable-opengl-x11 \
+  --enable-fb \
+  --disable-software-ddraw \
+  --disable-software-16-ddraw \
+  --disable-direct3d \
+  --disable-software-sdl \
+"
+FILES_${PN} += "${datadir}"
+RDEPENDS_${PN} = "expedite-themes evas-engine-fb evas-engine-software-generic evas-engine-software-x11 evas-engine-gl-x11 evas-loader-png"
diff --git a/meta-efl/recipes-efl/efl/expedite_1.6.99-beta.bb b/meta-efl/recipes-efl/efl/expedite_1.6.99-beta.bb
new file mode 100644
index 0000000000..ffe654647d
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/expedite_1.6.99-beta.bb
@@ -0,0 +1,12 @@
+require ${BPN}.inc
+PR = "${INC_PR}.0"
+SRCVER = "1.7.0-alpha"
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+SRC_URI[md5sum] = "fdd425395b8380b5c3b39186f9ef7ff3"
+SRC_URI[sha256sum] = "738eed02cefa2c57cb7ac0fc8103d1680b6d3a4a17d620dd5fc503b0128bf1a5"
diff --git a/meta-efl/recipes-efl/efl/expedite_svn.bb b/meta-efl/recipes-efl/efl/expedite_svn.bb
new file mode 100644
index 0000000000..06cf950634
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/expedite_svn.bb
@@ -0,0 +1,11 @@
+require ${BPN}.inc
+SRCREV = "${EFL_SRCREV}"
+PV = "1.6.99+svnr${SRCPV}"
+PR = "${INC_PR}.0"
+DEFAULT_PREFERENCE = "-1"
+SRC_URI = "\
+  ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
+"
+S = "${WORKDIR}/${SRCNAME}"
diff --git a/meta-efl/recipes-efl/efl/imlib2_svn.bb b/meta-efl/recipes-efl/efl/imlib2_svn.bb
index 83de3fedca..4cc124e10a 100644
--- a/meta-efl/recipes-efl/efl/imlib2_svn.bb
+++ b/meta-efl/recipes-efl/efl/imlib2_svn.bb
@@ -12,8 +12,8 @@ SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep"
 S = "${WORKDIR}/${SRCNAME}"
 EXTRA_OECONF = "--with-x \
-                --x-includes=${STAGING_INCDIR} \
+                --x-includes=${STAGING_INCDIR} \
-                --x-libraries=${STAGING_LIBDIR} "
+                --x-libraries=${STAGING_LIBDIR} "
 # TODO: Use more fine granular version
 #OE_LT_RPATH_ALLOW=":${libdir}/imlib2/loaders:${libdir}/imlib2/filters:"