54 files changed, 206 insertions, 275 deletions

diff --git a/meta-efl/recipes-efl/efl/ecore-1.2.1/fix-ecore-fb-initialization.patch b/meta-efl/recipes-efl/efl/ecore-1.2.1/fix-ecore-fb-initialization.patch
deleted file mode 100644
index a2ce28526..000000000
--- a/meta-efl/recipes-efl/efl/ecore-1.2.1/fix-ecore-fb-initialization.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From c36cd1201711560b914e567922903083c3b46ff1 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
-
-Upstream-Status: Pending
-
-The whole ecore-fb init logic is somewhat flawed; with this patch we
-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 ++++
- 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
---- 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__)
-    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);
- 
-    return _ecore_fb_init_count;
-@@ -59,6 +62,7 @@ ecore_fb_shutdown(void)
-    if (--_ecore_fb_init_count != 0)
-       return _ecore_fb_init_count;
- 
-+   ecore_fb_ts_shutdown();
-    ecore_fb_vt_shutdown();
- 
-    return _ecore_fb_init_count;
--- 
-1.7.7.1
-
diff --git a/meta-efl/recipes-efl/efl/ecore.inc b/meta-efl/recipes-efl/efl/ecore.inc
index 1c8da1822..9faaf3a53 100644
--- a/meta-efl/recipes-efl/efl/ecore.inc
+++ b/meta-efl/recipes-efl/efl/ecore.inc
@@ -10,7 +10,7 @@ DEPENDS_virtclass-native = "eet-native evas-native gettext-native"
 inherit efl gettext
 
 BBCLASSEXTEND = "native"
-INC_PR = "r1"
+INC_PR = "r0"
 
 do_configure_prepend() {
     touch ${S}/po/Makefile.in.in || true
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 613cf5e47..000000000
--- 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_1.2.1.bb b/meta-efl/recipes-efl/efl/ecore_1.2.1.bb
deleted file mode 100644
index bec47a7e6..000000000
--- 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-alpha.bb b/meta-efl/recipes-efl/efl/ecore_1.6.99-alpha.bb
new file mode 100644
index 000000000..33e39764a
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/ecore_1.6.99-alpha.bb
@@ -0,0 +1,13 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRCVER = "1.7.0-alpha"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+  file://fix-ecore-fb-initialization.patch \
+"
+
+SRC_URI[md5sum] = "c40c25f2638677191bb95a628743209d"
+SRC_URI[sha256sum] = "8742fdcb725ac1494650577f75bbd36d3bf42d8d5c1f8d96a9d541f310a46c44"
diff --git a/meta-efl/recipes-efl/efl/ecore_svn.bb b/meta-efl/recipes-efl/efl/ecore_svn.bb
index ad724d0e7..e00a0ccac 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.1+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 cca9c5ea2..ae558f00d 100644
--- a/meta-efl/recipes-efl/efl/edbus.inc
+++ b/meta-efl/recipes-efl/efl/edbus.inc
@@ -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 91371157d..000000000
--- 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-alpha.bb b/meta-efl/recipes-efl/efl/edbus_1.6.99-alpha.bb
new file mode 100644
index 000000000..7b56e128d
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/edbus_1.6.99-alpha.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] = "6833e32681db6630a4a50d98cf5cac88"
+SRC_URI[sha256sum] = "8810a40568df9c068c1606821f24a95fb409e0f99459a45b18ee07077f432cc2"
diff --git a/meta-efl/recipes-efl/efl/edbus_svn.bb b/meta-efl/recipes-efl/efl/edbus_svn.bb
index b99f79dad..06cf95063 100644
--- a/meta-efl/recipes-efl/efl/edbus_svn.bb
+++ b/meta-efl/recipes-efl/efl/edbus_svn.bb
@@ -1,16 +1,11 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.1+svnr${SRCPV}"
+PV = "1.6.99+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
-# it needs to be disabled, because creates circular dependency on elementary
-EXTRA_OECONF += "--disable-edbus-performance-test"
-
 SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
 "
 S = "${WORKDIR}/${SRCNAME}"
-
-FILES_${PN} += "${datadir}/e_dbus/logo.png"
diff --git a/meta-efl/recipes-efl/efl/edje.inc b/meta-efl/recipes-efl/efl/edje.inc
index b3011b4d2..6f50ea8fb 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
@@ -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 8f22e5097..000000000
--- 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-alpha.bb b/meta-efl/recipes-efl/efl/edje_1.6.99-alpha.bb
new file mode 100644
index 000000000..1ba83c01e
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/edje_1.6.99-alpha.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] = "b4c063f673394bda3f24b1a894001224"
+SRC_URI[sha256sum] = "4b8aeb5e59b493e9cfce30c91acf9b55f4774b417349c8291fda6e35265ee311"
diff --git a/meta-efl/recipes-efl/efl/edje_svn.bb b/meta-efl/recipes-efl/efl/edje_svn.bb
index 435b899cb..06cf95063 100644
--- a/meta-efl/recipes-efl/efl/edje_svn.bb
+++ b/meta-efl/recipes-efl/efl/edje_svn.bb
@@ -1,15 +1,11 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.1+svnr${SRCPV}"
+PV = "1.6.99+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
-DEPENDS += "eio"
-
 SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
 "
 S = "${WORKDIR}/${SRCNAME}"
-
-FILES_${PN} += "${datadir}/mime/packages/edje.xml"
diff --git a/meta-efl/recipes-efl/efl/eet.inc b/meta-efl/recipes-efl/efl/eet.inc
index 089e92e22..0f6a9fe10 100644
--- a/meta-efl/recipes-efl/efl/eet.inc
+++ b/meta-efl/recipes-efl/efl/eet.inc
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=da947f414a2ca4323245f1abb1980953"
 inherit efl
 
 BBCLASSEXTEND = "native"
-INC_PR = "r1"
+INC_PR = "r0"
 
 EXTRA_OECONF = "\
   --enable-openssl \
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 36894eac9..000000000
--- 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-alpha.bb b/meta-efl/recipes-efl/efl/eet_1.6.99-alpha.bb
new file mode 100644
index 000000000..39663f9ac
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/eet_1.6.99-alpha.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] = "06a65f37117607ba24e4f4a9d3420f0a"
+SRC_URI[sha256sum] = "29b6717404131b30882ae5f7947f5705da972f07576ad4c6c6c378a7592b5f68"
diff --git a/meta-efl/recipes-efl/efl/eet_svn.bb b/meta-efl/recipes-efl/efl/eet_svn.bb
index de8af5fe8..06cf95063 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.1+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 1b0f48937..5d523c991 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 9fb4e89a5..000000000
--- 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-alpha.bb b/meta-efl/recipes-efl/efl/eeze_1.6.99-alpha.bb
new file mode 100644
index 000000000..4f8ecb4f1
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/eeze_1.6.99-alpha.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] = "25c36ea710d61b2f6a732ec44f9f5dbb"
+SRC_URI[sha256sum] = "3440e11e9edbe234d207a8791a6c6502968ce642bd8d4821da77be71c11bd432"
diff --git a/meta-efl/recipes-efl/efl/eeze_svn.bb b/meta-efl/recipes-efl/efl/eeze_svn.bb
index 720703e7c..06cf95063 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.1+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 9aaeaa72d..6c6852606 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 d1c850a59..000000000
--- 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-alpha.bb b/meta-efl/recipes-efl/efl/efreet_1.6.99-alpha.bb
new file mode 100644
index 000000000..afe123a45
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/efreet_1.6.99-alpha.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] = "d18062fb8831334323b00123fe93ac5b"
+SRC_URI[sha256sum] = "28372b8b3c064fc0f6c50964d1199aee28b06102d796c1546de7c7bf8d41b97c"
diff --git a/meta-efl/recipes-efl/efl/efreet_svn.bb b/meta-efl/recipes-efl/efl/efreet_svn.bb
index 503dc528a..06cf95063 100644
--- a/meta-efl/recipes-efl/efl/efreet_svn.bb
+++ b/meta-efl/recipes-efl/efl/efreet_svn.bb
@@ -1,9 +1,7 @@
 require ${BPN}.inc
 
-inherit gettext
-
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.1+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 4714db8c8..000000000
--- 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-alpha.bb b/meta-efl/recipes-efl/efl/eina_1.6.99-alpha.bb
new file mode 100644
index 000000000..ba7bab3e8
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/eina_1.6.99-alpha.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] = "b4fdbb79b92496829b921d46762344ac"
+SRC_URI[sha256sum] = "51a7799ba61036072be646e1fcaa742d9c5f39bb499155012bc177a9f561f2b5"
diff --git a/meta-efl/recipes-efl/efl/eina_svn.bb b/meta-efl/recipes-efl/efl/eina_svn.bb
index 720703e7c..06cf95063 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.1+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 54a35a8a0..000000000
--- 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-alpha.bb b/meta-efl/recipes-efl/efl/eio_1.6.99-alpha.bb
new file mode 100644
index 000000000..f4de7af5e
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/eio_1.6.99-alpha.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] = "741d2a2211a66cba0986b1dbcc12118f"
+SRC_URI[sha256sum] = "1d3cbbc48b0970a8b7327d1d74ca44bc0a6f5852e26d348bc9793421675ca23f"
diff --git a/meta-efl/recipes-efl/efl/eio_svn.bb b/meta-efl/recipes-efl/efl/eio_svn.bb
index eb28d9ae1..06cf95063 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.1+svnr${SRCPV}"
+PV = "1.6.99+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/meta-efl/recipes-efl/efl/elementary.inc b/meta-efl/recipes-efl/efl/elementary.inc
index 50c708dbd..34338e865 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 d4e3960fd..000000000
--- 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-alpha.bb b/meta-efl/recipes-efl/efl/elementary_1.6.99-alpha.bb
new file mode 100644
index 000000000..235136038
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/elementary_1.6.99-alpha.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] = "7509fb6bc2d814066deed3d97c2d0118"
+SRC_URI[sha256sum] = "a262b9723f4491e4fbb43b285d7845a6dc8daab53d97e68cd8b0df69737ff69e"
diff --git a/meta-efl/recipes-efl/efl/elementary_svn.bb b/meta-efl/recipes-efl/efl/elementary_svn.bb
index fa8a8e85a..06cf95063 100644
--- a/meta-efl/recipes-efl/efl/elementary_svn.bb
+++ b/meta-efl/recipes-efl/efl/elementary_svn.bb
@@ -1,10 +1,9 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.0.1+svnr${SRCPV}"
+PV = "1.6.99+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
-DEPENDS += "eio"
 
 SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
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 d3956acdd..000000000
--- 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-alpha.bb b/meta-efl/recipes-efl/efl/embryo_1.6.99-alpha.bb
new file mode 100644
index 000000000..8cd4f8cb1
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/embryo_1.6.99-alpha.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] = "1505a60e8e446d55ab1887f3832063f2"
+SRC_URI[sha256sum] = "6b6999e29836c56f079f84617133cc9b8d9bb1ea826577eebdc29f7ebeb6ffe5"
diff --git a/meta-efl/recipes-efl/efl/embryo_svn.bb b/meta-efl/recipes-efl/efl/embryo_svn.bb
index 720703e7c..06cf95063 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.1+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 20a88525e..08a24b26f 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 c142b5bd0..000000000
--- 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-alpha.bb b/meta-efl/recipes-efl/efl/emotion_1.6.99-alpha.bb
new file mode 100644
index 000000000..d5f941229
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/emotion_1.6.99-alpha.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] = "55bea7e3c3e5d503a98f336d829b47bb"
+SRC_URI[sha256sum] = "b54e9ea93c248885b56e5b6dbf8161bf9cd04103dcd06d72eb2579d83a48ad7f"
diff --git a/meta-efl/recipes-efl/efl/emotion_svn.bb b/meta-efl/recipes-efl/efl/emotion_svn.bb
index bf75d9eeb..06cf95063 100644
--- a/meta-efl/recipes-efl/efl/emotion_svn.bb
+++ b/meta-efl/recipes-efl/efl/emotion_svn.bb
@@ -1,12 +1,10 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.0.1+svnr${SRCPV}"
+PV = "1.6.99+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
-DEPENDS += "eio"
-
 SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
 "
diff --git a/meta-efl/recipes-efl/efl/ethumb.inc b/meta-efl/recipes-efl/efl/ethumb.inc
index 0c3080c05..92a83eee4 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 e976238a9..000000000
--- 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-alpha.bb b/meta-efl/recipes-efl/efl/ethumb_1.6.99-alpha.bb
new file mode 100644
index 000000000..69f8e33fd
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/ethumb_1.6.99-alpha.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] = "356b996537136c6504daf1358509e5a8"
+SRC_URI[sha256sum] = "1bdeff24945f67c5685bd526a2ba7a951a97fe3aff8aea2f6efc9cf8503c431b"
diff --git a/meta-efl/recipes-efl/efl/ethumb_svn.bb b/meta-efl/recipes-efl/efl/ethumb_svn.bb
index f6b3f3e07..892b29860 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.1+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_1.2.0.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.2.0.bb
deleted file mode 100644
index de0ce1c05..000000000
--- a/meta-efl/recipes-efl/efl/evas-generic-loaders_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] = "340a8c2f42c82ecd10f0204cdb291a70"
-SRC_URI[sha256sum] = "9a3aad43269f34513765b04ed3e8db5a18d3545da010b2f6066aeaf90bf442d4"
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-alpha.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-alpha.bb
new file mode 100644
index 000000000..5ac0b94e2
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.6.99-alpha.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] = "e8444bb1ddebd337a8d0bd8a14d83951"
+SRC_URI[sha256sum] = "84f1d1e3b8a232c849f91ff70e2b5ad2154a5c2e9904469b3b1ec5b41dd700c7"
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb
index 594de4a16..06cf95063 100644
--- a/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb
+++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_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/evas.inc b/meta-efl/recipes-efl/efl/evas.inc
index 5254ee428..89ae1a47f 100644
--- a/meta-efl/recipes-efl/efl/evas.inc
+++ b/meta-efl/recipes-efl/efl/evas.inc
@@ -8,7 +8,7 @@ DEPENDS_virtclass-native = "freetype-native libxext-native libpng-native jpeg-na
 inherit efl
 
 BBCLASSEXTEND = "native"
-INC_PR = "r1"
+INC_PR = "r0"
 FILESPATHPKG =. "${BPN}-${PV}:${BPN}:"
 
 python populate_packages_prepend () {
@@ -42,6 +42,11 @@ FILES_${PN}-cserve2 += "${libexecdir}/evas_cserve2* ${libexecdir}/dummy_slave"
 PACKAGES += "${PN}-cserve2"
 PACKAGES_DYNAMIC = "evas-engine-* evas-loader-* evas-saver-* evas-cserve2-*"
 
+# 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 \
   evas-engine-software-generic \
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 ddac920bb..000000000
--- 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-alpha.bb b/meta-efl/recipes-efl/efl/evas_1.6.99-alpha.bb
new file mode 100644
index 000000000..df777f540
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/evas_1.6.99-alpha.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] = "3f4f1f87fa16dd4db121ce9c2e056131"
+SRC_URI[sha256sum] = "25a905c90650e8d53a2b0cf90ef453dc7410f0143fd2fe1c11f5ccd50e107f70"
diff --git a/meta-efl/recipes-efl/efl/evas_svn.bb b/meta-efl/recipes-efl/efl/evas_svn.bb
index fb0342f76..06cf95063 100644
--- a/meta-efl/recipes-efl/efl/evas_svn.bb
+++ b/meta-efl/recipes-efl/efl/evas_svn.bb
@@ -1,15 +1,10 @@
 require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
-PV = "1.2.1+svnr${SRCPV}"
-PR = "${INC_PR}.1"
+PV = "1.6.99+svnr${SRCPV}"
+PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
-# 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"
-
 SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
 "